metanorma-itu 2.4.7 → 2.4.8

data/lib/metanorma/itu/biblio.rng

@@ -122,6 +122,23 @@
       </oneOrMore>
     </choice>
   </define>
+  <define name="LocalizedMarkedUpString1">
+    <!-- multiple languages and scripts possible: comma delimit them if so -->
+    <ref name="LocalizedStringAttrs"/>
+    <oneOrMore>
+      <ref name="TextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="LocalizedMarkedUpString">
+    <choice>
+      <ref name="LocalizedMarkedUpString1"/>
+      <oneOrMore>
+        <element name="variant">
+          <ref name="LocalizedMarkedUpString1"/>
+        </element>
+      </oneOrMore>
+    </choice>
+  </define>
   <!--
     Unlike UML, change type to format: type is overloaded
     Would be need if plain were default value and could omit the attribute
@@ -204,10 +221,7 @@
   </define>
   <define name="roledescription">
     <element name="description">
-      <ref name="LocalizedStringAttrs"/>
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="LocalizedMarkedUpString"/>
     </element>
   </define>
   <define name="person">
@@ -332,10 +346,7 @@
   </define>
   <define name="affiliationdescription">
     <element name="description">
-      <ref name="LocalizedStringAttrs"/>
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="LocalizedMarkedUpString"/>
     </element>
   </define>
   <define name="organization">
@@ -384,7 +395,7 @@
   </define>
   <define name="logo">
     <element name="logo">
-      <ref name="image"/>
+      <ref name="image-no-id"/>
     </element>
   </define>
   <define name="depiction">
@@ -393,7 +404,7 @@
         <attribute name="scope"/>
       </optional>
       <zeroOrMore>
-        <ref name="image"/>
+        <ref name="image-no-id"/>
       </zeroOrMore>
     </element>
   </define>
@@ -946,10 +957,7 @@
     <optional>
       <attribute name="type"/>
     </optional>
-    <ref name="LocalizedStringAttrs"/>
-    <zeroOrMore>
-      <ref name="TextElement"/>
-    </zeroOrMore>
+    <ref name="LocalizedMarkedUpString"/>
   </define>
   <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
   <define name="TypedUri">
@@ -1040,10 +1048,7 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <ref name="LocalizedStringAttrs"/>
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="LocalizedMarkedUpString"/>
     </element>
   </define>
   <define name="docnumber">
@@ -1268,10 +1273,7 @@
       <optional>
         <attribute name="type"/>
       </optional>
-      <ref name="LocalizedStringAttrs"/>
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="LocalizedMarkedUpString"/>
     </element>
   </define>
   <define name="bibabstract">
@@ -1279,7 +1281,7 @@
       <ref name="LocalizedStringAttrs"/>
       <choice>
         <oneOrMore>
-          <ref name="BasicBlock"/>
+          <ref name="BasicBlockNoId"/>
         </oneOrMore>
         <oneOrMore>
           <ref name="TextElement"/>
@@ -1389,10 +1391,7 @@
       </attribute>
       <optional>
         <element name="description">
-          <ref name="LocalizedStringAttrs"/>
-          <oneOrMore>
-            <ref name="TextElement"/>
-          </oneOrMore>
+          <ref name="LocalizedMarkedUpString"/>
         </element>
       </optional>
       <element name="bibitem">

data/lib/metanorma/itu/converter.rb

@@ -35,11 +35,9 @@ module Metanorma
         super
       end
 
-      def doctype(node)
-        ret = node.attr("doctype")&.gsub(/\s+/, "-")&.downcase ||
-          "recommendation"
-        ret = "recommendation" if ret == "article"
-        ret
+      def init_misc(node)
+        super
+        @default_doctype = "recommendation"
       end
 
       def olist(node)

data/lib/metanorma/itu/front.rb

@@ -16,19 +16,18 @@ module Metanorma
         super + %w(complements)
       end
 
-      def title_attr(type, lang = "en")
-        { language: lang, format: "text/plain", type: type }
+      def insert_title(xml, type, lang, content)
+        attr = { language: lang, format: "text/plain", type: type }
+        xml.title **attr_code(attr) do |t|
+          t << Metanorma::Utils::asciidoc_sub(content)
+        end
       end
 
       def title_defaultlang(node, xml)
-        a = node.attr("title") || node.attr("title-#{@lang}")
-        xml.title **attr_code(title_attr("main", @lang)) do |t|
-          t << (Metanorma::Utils::asciidoc_sub(a) || node.title)
-        end
+        a = node.attr("title") || node.attr("title-#{@lang}") || node.title
+        insert_title(xml, "main", @lang, a)
         if a = node.attr("annextitle") || node.attr("annextitle-#{@lang}")
-          xml.title **attr_code(title_attr("annex", @lang)) do |t|
-            t << Metanorma::Utils::asciidoc_sub(a)
-          end
+          insert_title(xml, "annex", @lang, a)
         end
       end
 
@@ -37,9 +36,7 @@ module Metanorma
           /^(?:annex)?title-(?<lang>.+)$/ =~ k or next
           lang == @lang and next
           type = /^annex/.match?(k) ? "annex" : "main"
-          xml.title **attr_code(title_attr(type, lang)) do |t|
-            t << Metanorma::Utils::asciidoc_sub(v)
-          end
+          insert_title(xml, type, lang, v)
         end
       end
 
@@ -55,19 +52,14 @@ module Metanorma
 
       def other_title_defaultlang(node, xml, type)
         a = node.attr(type) || node.attr("#{type}-#{@lang}")
-        xml.title **attr_code(title_attr(type.sub(/-title/, ""), @lang)) do |t|
-          t << Metanorma::Utils::asciidoc_sub(a)
-        end
+        insert_title(xml, type.sub(/-title/, ""), @lang, a)
       end
 
       def other_title_otherlangs(node, xml, type)
         node.attributes.each do |k, v|
           m = /^#{type}-(?<lang>.+)$/.match(k) or next
           m[:lang] == @lang and next
-          xml.title **attr_code(title_attr(type.sub(/-title/, ""),
-                                           m[:lang])) do |t|
-            t << Metanorma::Utils::asciidoc_sub(v)
-          end
+          insert_title(xml, type.sub(/-title/, ""), m[:lang], v)
         end
       end
 
@@ -78,9 +70,7 @@ module Metanorma
       def org_abbrev
         if @i18n.get["ITU"]
           { @i18n.international_telecommunication_union => @i18n.get["ITU"] }
-        else
-          {}
-        end
+        else {} end
       end
 
       def metadata_committee(node, xml)
@@ -166,15 +156,15 @@ module Metanorma
       end
 
       def metadata_recommendationstatus(node, xml)
-        node.attr("recommendation-from") or return
+        node.attr("recommendation-from") || node.attr("approval-process") or
+          return
         xml.recommendationstatus do |s|
-          s.from node.attr("recommendation-from")
-          s.to node.attr("recommendation-to") if node.attr("recommendation-to")
-          if node.attr("approval-process")
-            s.approvalstage **{ process: node.attr("approval-process") } do |a|
-              a << node.attr("approval-status")
+          a = node.attr("recommendation-from") and s.from a
+          a = node.attr("recommendation-to") and s.to a
+          node.attr("approval-process") and
+            s.approvalstage **{ process: node.attr("approval-process") } do |x|
+              x << node.attr("approval-status")
             end
-          end
         end
       end
 
@@ -197,6 +187,12 @@ module Metanorma
         end
       end
 
+      def metadata_contribution(node, xml)
+        %w(timing).each do |k|
+          a = node.attr(k) and xml.send k, a
+        end
+      end
+
       def metadata_meeting_date(val, xml)
         xml.meeting_date do |m|
           d = val.split("/")
@@ -237,6 +233,7 @@ module Metanorma
         metadata_recommendationstatus(node, xml)
         metadata_ip_notice(node, xml)
         metadata_techreport(node, xml)
+        metadata_contribution(node, xml)
         structured_id(node, xml)
         metadata_coverpage_images(node, xml)
       end