metanorma-itu 2.7.4 → 2.7.5

data/lib/isodoc/itu/presentation_section.rb

@@ -55,7 +55,8 @@ module IsoDoc
                                          lbl)}<br/>#{subhead}</p>"
       end
 
-      def middle_title(isoxml)
+      # KILL
+      def middle_titlex(isoxml)
         s = isoxml.at(ns("//sections")) or return
         # isoxml.at(ns("//note[@type = 'title-footnote']"))
         case @doctype
@@ -68,7 +69,18 @@ module IsoDoc
         # titfn and renumber_footnotes(isoxml)
       end
 
-      def middle_title_resolution(isoxml, out)
+      def middle_title_template
+        case @doctype
+        when "resolution"
+          middle_title_resolution
+        when "contribution"
+        else
+          middle_title_recommendation
+        end
+      end
+
+      # KILL
+      def middle_title_resolutionx(isoxml, out)
         res = isoxml.at(ns("//bibdata/title[@type = 'resolution']"))
         out.previous =
           "<p class='zzSTDTitle1' align='center'>#{res.children.to_xml}</p>"
@@ -77,6 +89,15 @@ module IsoDoc
         middle_title_resolution_subtitle(isoxml, out)
       end
 
+      def middle_title_resolution
+        <<~OUTPUT
+          <p class='zzSTDTitle1' align='center'>{{ resolutiontitle }}</p>
+          {% if doctitle %}<p class='zzSTDTitle2'>{{ doctitle }}</p>{% endif %}
+          <p align='center' class='zzSTDTitle2'><em>({{ resolutionplacedate }})</em><span id='_middle_title_footnotes'/></p>
+        OUTPUT
+      end
+
+      # KILL
       def middle_title_resolution_subtitle(isoxml, out)
         ret = "<p align='center' class='zzSTDTitle2'><em>("
         d = isoxml.at(ns("//bibdata/title[@type = 'resolution-placedate']"))
@@ -85,7 +106,8 @@ module IsoDoc
         out.previous = ret
       end
 
-      def middle_title_recommendation(isoxml, out)
+      # KILL
+      def middle_title_recommendationx(isoxml, out)
         ret = ""
         id = @meta.get[:docnumber_iso] and ret += <<~XML
           <p class='zzSTDTitle1'>#{@i18n.international_standard} #{id}</p>
@@ -96,6 +118,19 @@ module IsoDoc
         out.previous = ret
       end
 
+      def middle_title_recommendation
+        <<~OUTPUT
+          {% if docnumber_iso %}<p class='zzSTDTitle1'>{{ labels["international_standard"] }}
+            {{ docnumber_iso }}</p>{% endif %}
+          {% if docnumber %}<p class='zzSTDTitle1'>
+            {%- if unpublished and draft_new_doctype %}{{ draft_new_doctype }}{% else %}{{ doctype_display }}{% endif %}
+            {{ docnumber }}</p>{% endif %}
+          {% if doctitle %}<p class='zzSTDTitle2'>{{ doctitle }}<span id='_middle_title_footnotes'/></p>{% endif %}
+          {% if docsubtitle %}<p class='zzSTDTitle3'>{{ docsubtitle }}</p>{% endif %}
+        OUTPUT
+      end
+
+      # KILL
       def middle_title_recommendation_first_line
         ret = ""
         type = @meta.get[:doctype_display]
@@ -106,6 +141,7 @@ module IsoDoc
         ret
       end
 
+      # KILL
       def middle_title_recommendation_second_line(isoxml)
         ret = ""
         t = @meta.get[:doctitle] or return ret
@@ -114,6 +150,15 @@ module IsoDoc
         ret
       end
 
+      def middle_title(docxml)
+        super
+        ins = docxml.at(ns("//span[@id = '_middle_title_footnotes']")) or return
+        if fn = title_footnotes(docxml)
+          ins.replace(fn)
+        else ins.remove
+        end
+      end
+
       def title_footnotes(isoxml)
         ret = ""
         isoxml.xpath(ns("//note[@type = 'title-footnote']"))

data/lib/metanorma/itu/front.rb

@@ -17,19 +17,12 @@ module Metanorma
         super + %w(complements)
       end
 
-      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}") ||
           node.attr("doctitle")
-        insert_title(xml, "main", @lang, a)
+        add_title_xml(xml, a, @lang, "main")
         if a = node.attr("annextitle") || node.attr("annextitle-#{@lang}")
-          insert_title(xml, "annex", @lang, a)
+          add_title_xml(xml, a, @lang, "annex")
         end
       end
 
@@ -38,7 +31,7 @@ module Metanorma
           /^(?:annex)?title-(?<lang>.+)$/ =~ k or next
           lang == @lang and next
           type = /^annex/.match?(k) ? "annex" : "main"
-          insert_title(xml, type, lang, v)
+          add_title_xml(xml, v, lang, type)
         end
       end
 
@@ -54,14 +47,14 @@ module Metanorma
 
       def other_title_defaultlang(node, xml, type)
         a = node.attr(type) || node.attr("#{type}-#{@lang}")
-        insert_title(xml, type.sub(/-title/, ""), @lang, a)
+        add_title_xml(xml, a, @lang, type.sub(/-title/, ""))
       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
-          insert_title(xml, type.sub(/-title/, ""), m[:lang], v)
+          add_title_xml(xml, v, m[:lang], type.sub(/-title/, ""))
         end
       end
 

data/lib/metanorma/itu/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.1.2 -->
+<!-- VERSION v2.1.3 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -455,14 +455,7 @@ normative or informative references, some split references into sections organiz
           </ref>
         </zeroOrMore>
         <zeroOrMore>
-          <ref name="doc_bibitem">
-            <a:documentation>Bibliographic item cited in the document</a:documentation>
-          </ref>
-          <zeroOrMore>
-            <ref name="note">
-              <a:documentation>Annotation of the bibliographic item</a:documentation>
-            </ref>
-          </zeroOrMore>
+          <ref name="ReferenceEntry"/>
         </zeroOrMore>
         <zeroOrMore>
           <ref name="references">
@@ -604,18 +597,21 @@ gives an explicit page orientation</a:documentation>
         </element>
       </optional>
     </define>
-  </include>
-  <!-- end overrides -->
-  <define name="FnAttributes" combine="interleave">
-    <ref name="RequiredId"/>
-    <optional>
-      <attribute name="hiddenref">
-        <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
+    <define name="FnAttributes">
+      <ref name="RequiredId"/>
+      <optional>
+        <attribute name="hiddenref">
+          <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
 This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
-        <data type="boolean"/>
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="reference">
+        <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
       </attribute>
-    </optional>
-  </define>
+    </define>
+  </include>
+  <!-- end overrides -->
   <define name="TdAttributes" combine="interleave">
     <ref name="RequiredId"/>
     <optional>
@@ -853,6 +849,17 @@ titlecase, or lowercase</a:documentation>
       <value>informative</value>
     </choice>
   </define>
+  <define name="ReferenceEntry">
+    <a:documentation>Entry in bibliography</a:documentation>
+    <ref name="doc_bibitem">
+      <a:documentation>Bibliographic item cited in the document</a:documentation>
+    </ref>
+    <zeroOrMore>
+      <ref name="note">
+        <a:documentation>Annotation of the bibliographic item</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="doc_bibitem">
     <a:documentation>Standardisation document representation of bibliographic entry</a:documentation>
     <element name="bibitem">

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Itu
-    VERSION = "2.7.4".freeze
+    VERSION = "2.7.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.7.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-01 00:00:00.000000000 Z
+date: 2025-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc