metanorma-iso 3.0.3 → 3.0.5

data/lib/isodoc/iso/presentation_section.rb

@@ -51,7 +51,7 @@ module IsoDoc
       # Redo Amendment annex subclause titles as numbered
       def clause(docxml)
         super
-        docxml.xpath(ns("//annex//appendix")).each { |f| clause1(f) }
+        # docxml.xpath(ns("//annex//appendix")).each { |f| clause1(f) }
         amd?(docxml) or return
         @suppressheadingnumbers = @oldsuppressheadingnumbers
         docxml.xpath(ns("//annex//clause | //annex//appendix")).each do |f|

data/lib/isodoc/iso/presentation_terms.rb

@@ -12,8 +12,8 @@ module IsoDoc
         (docxml.xpath(ns("//concept")) - docxml.xpath(ns("//term//concept")))
           .each do |node|
           node.ancestors("definition, termsource, related").empty? and
-          concept_render(node, ital: "false", ref: "false",
-                               linkref: "true", linkmention: "false")
+            concept_render(node, ital: "false", ref: "false",
+                                 linkref: "true", linkmention: "false")
         end
       end
 
@@ -23,7 +23,7 @@ module IsoDoc
           (f.xpath(ns(".//concept")) - f.xpath(ns(".//term//concept")))
             .each do |c|
               c.ancestors("definition, termsource, related").empty? and
-              concept_term1(c, m)
+                concept_term1(c, m)
             end
         end
       end

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -95,19 +95,19 @@ module IsoDoc
 
       def ol_depth(node)
         depth = node.ancestors(@iso_class ? "ol" : "ul, ol").size + 1
-        type = :alphabet
-        type = :arabic if [2, 7].include? depth
-        type = :roman if [3, 8].include? depth
-        type = :alphabet_upper if [4, 9].include? depth
-        type = :roman_upper if [5, 10].include? depth
-        type
+        @counter.ol_type(node, depth)
       end
 
       def note1(elem)
         elem["type"] == "units" and return
+        elem["type"] == "requirement" and return requirement_note1(elem)
         super
       end
 
+      def requirement_note1(elem)
+        elem["unnumbered"] = "true"
+      end
+
       def formula_where(dlist)
         dlist.nil? and return
         dlist.xpath(ns("./dt")).size == 1 &&
@@ -162,7 +162,7 @@ module IsoDoc
 
       def twitter_cldr_localiser_symbols
         { group: " ", fraction_group: " ",
-          fraction_group_digits: 3 }
+          fraction_group_digits: 3, decimal: "," }
       end
 
       def implicit_reference(bib)
@@ -184,6 +184,23 @@ module IsoDoc
         end
       end
 
+      def ul_label_list(_elem)
+        if @docscheme == "1951"
+          %w(–)
+        else
+          %w(—)
+        end
+      end
+
+      def ol_label_template(_elem)
+        ret = super
+        @docscheme == "1951" and
+          ret[:alphabet] = <<~SPAN.strip
+            <span class="fmt-label-delim">(</span>%<span class="fmt-label-delim">)</span>
+          SPAN
+        ret
+      end
+
       def fn_ref_label(fnote)
         if fnote.ancestors("table, figure").empty? ||
             !fnote.ancestors("name, fmt-name").empty?

data/lib/isodoc/iso/word_dis_convert.rb

@@ -117,8 +117,7 @@ module IsoDoc
 
       def authority_cleanup(docxml)
         super
-        if @meta.get[:stage_int].to_s[0] == "9" ||
-            @meta.get[:stage_int].to_s[0] == "6"
+        if ["9", "6"].include?(@meta.get[:stage_int].to_s[0])
           copyright_prf(docxml)
         else
           copyright_dis(docxml)
@@ -142,6 +141,14 @@ module IsoDoc
         end
         docxml.xpath("//p[@class = 'zzCopyrightHdr']")&.each(&:remove)
       end
+
+      def list_title_parse(node, out)
+        name = node.at(ns("./fmt-name")) or return
+        klass = node["key"] == "true" ? "KeyTitle" : "ListTitle"
+        out.p class: klass do |p|
+          name.children&.each { |n| parse(n, p) }
+        end
+      end
     end
   end
 end

data/lib/isodoc/iso/xref.rb

@@ -235,7 +235,8 @@ module IsoDoc
       end
 
       def uncountable_note?(note)
-        @anchors[note["id"]] || blank?(note["id"]) || note["type"] == "units"
+        @anchors[note["id"]] || blank?(note["id"]) || note["type"] == "units" ||
+          note["type"] == "requirement"
       end
 
       def note_anchor_names1(notes, counter)

data/lib/isodoc/iso/xref_section.rb

@@ -7,19 +7,20 @@ module IsoDoc
         clause.at(ns("./clause")) and
           @anchors[clause["id"]] = { label: nil, level: 1, type: "clause",
                                      xref: clause.at(ns("./title"))&.text }
-        #i = Counter.new(0, prefix: "0")
         i = clause_counter(0)
         clause.xpath(ns("./clause")).each do |c|
           section_names1(c, semx(clause, "0"), i.increment(c).print, 2)
         end
       end
 
-      def annex_names(clause, num)
+      # KILL
+      def annex_namesx(clause, num)
         appendix_names(clause, num)
         super
       end
 
-      def appendix_names(clause, _num)
+      # KILL
+      def appendix_namesx(clause, _num)
         i = clause_counter(0)
         clause.xpath(ns("./appendix")).each do |c|
           i.increment(c)
@@ -65,8 +66,8 @@ module IsoDoc
         @anchors[clause["id"]] = ret.merge(ret2)
       end
 
-      def appendix_names1(clause, parentnum, num, level, container)
-        #num = labelled_autonum(@labels["appendix"], num)
+      # KILL
+      def appendix_names1x(clause, parentnum, num, level, container)
         num = clause_number_semx(parentnum, clause, num)
         @anchors[clause["id"]] = { label: num, xref: num, level: level,
                                    container: container }

data/lib/metanorma/iso/basicdoc.rng

@@ -1701,16 +1701,22 @@ which can be bookmarks as well as block or section references</a:documentation>
     <a:documentation>Inline reference to a paragraph or paragraphs, appearing as a footnote.
 The target of a footnote is the location it is embedded in within the text</a:documentation>
     <element name="fn">
-      <attribute name="reference">
-        <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
-      </attribute>
-      <oneOrMore>
-        <ref name="paragraph">
-          <a:documentation>The content of the footnote</a:documentation>
-        </ref>
-      </oneOrMore>
+      <ref name="FnAttributes"/>
+      <ref name="FnBody"/>
     </element>
   </define>
+  <define name="FnBody">
+    <oneOrMore>
+      <ref name="paragraph">
+        <a:documentation>The content of the footnote</a:documentation>
+      </ref>
+    </oneOrMore>
+  </define>
+  <define name="FnAttributes">
+    <attribute name="reference">
+      <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
+    </attribute>
+  </define>
   <define name="callout">
     <a:documentation>Inline reference to a paragraph or paragraphs, appearing as annotation of source code</a:documentation>
     <element name="callout">

data/lib/metanorma/iso/biblio-standoc.rng

@@ -1,13 +1,14 @@
 <?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">
-  <!--
-    Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
-    of relaton
-    
-    Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
-    (SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
-  -->
   <include href="biblio.rng">
+    <!-- ALERT: we cannot have comments on root element, as they intervene with https://github.com/metanorma/metanorma/issues/437 fix -->
+    <!--
+      Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
+      of relaton
+      
+      Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
+      (SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
+    -->
     <define name="BibData">
       <a:documentation>The bibliographic description of a standardisation document</a:documentation>
       <ref name="StandardBibliographicItem"/>
@@ -91,6 +92,9 @@ a standards definition organization</a:documentation>
         <a:documentation>Representation of the identifier for the standardisation document, giving its individual semantic components</a:documentation>
       </ref>
     </zeroOrMore>
+    <ref name="DocumentImages">
+      <a:documentation>Coverpage and other images to be rendered with document</a:documentation>
+    </ref>
   </define>
   <define name="doctype">
     <a:documentation>Classification of the standardisation document</a:documentation>
@@ -268,6 +272,32 @@ and not those document components</a:documentation>
       </optional>
     </element>
   </define>
+  <define name="DocumentImages">
+    <zeroOrMore>
+      <element name="coverpage-image">
+        <a:documentation>Images to be displayed on the coverpage of the document</a:documentation>
+        <ref name="image-no-id"/>
+      </element>
+    </zeroOrMore>
+    <zeroOrMore>
+      <element name="innercoverpage-image">
+        <a:documentation>Images to be displayed on the inner coverpage of the document</a:documentation>
+        <ref name="image-no-id"/>
+      </element>
+    </zeroOrMore>
+    <zeroOrMore>
+      <element name="tocside-image">
+        <a:documentation>Images to be displayed on the Table of Contents page of the document</a:documentation>
+        <ref name="image-no-id"/>
+      </element>
+    </zeroOrMore>
+    <zeroOrMore>
+      <element name="backpage-image">
+        <a:documentation>Images to be displayed on the backpage of the document</a:documentation>
+        <ref name="image-no-id"/>
+      </element>
+    </zeroOrMore>
+  </define>
   <define name="StandardBibliographicItem">
     <ref name="BibliographicItem"/>
     <zeroOrMore>

data/lib/metanorma/iso/biblio.rng

@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  instantiations of this grammar may replace leaf strings
-  with more elaborated types; e.g. title (text) replaced with
-  title-main, title-intro, title-part; type replaced with
-  enum.
-  
-  some renaming at leaf nodes is permissible
-  
-  obligations can change both from optional to mandatory,
-  and from mandatory to optional; optional elements may
-  be omitted; freely positioned alternatives may be replaced
-  with strict ordering
-  
-  DO NOT introduce a namespace here. We do not want a distinct namespace
-  for these elements, and a distinct namespace for any grammar inheriting
-  these elements; we just want one namespace for any child grammars
-  of this.
--->
 <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">
+  <!--
+    ALERT: we cannot have comments on root element, as they intervene with https://github.com/metanorma/metanorma/issues/437 fix
+    
+    Instantiations of this grammar may replace leaf strings
+    with more elaborated types; e.g. title (text) replaced with
+    title-main, title-intro, title-part; type replaced with
+    enum.
+    
+    Some renaming at leaf nodes is permissible
+    
+    Obligations can change both from optional to mandatory,
+    and from mandatory to optional; optional elements may
+    be omitted; freely positioned alternatives may be replaced
+    with strict ordering
+    
+    DO NOT introduce a namespace here. We do not want a distinct namespace
+    for these elements, and a distinct namespace for any grammar inheriting
+    these elements; we just want one namespace for any child grammars
+    of this.
+  -->
   <!--
     https://www.myintervals.com/blog/2009/05/20/iso-8601-date-validation-that-doesnt-suck/
     iso8601date = xsd:string { pattern = "([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?" }
@@ -1241,6 +1243,11 @@ Refer to `BibliographicItem` for definitions</a:documentation>
   </define>
   <define name="formattedref">
     <element name="formattedref">
+      <optional>
+        <attribute name="format">
+          <a:documentation>format of formatted reference; Metanorma assumes references are formatted as Metanorma XML</a:documentation>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1812,6 +1819,11 @@ May be used to differentiate rendering of notes in bibliographies</a:documentati
     <a:documentation>Abstract of bibliographic item</a:documentation>
     <element name="abstract">
       <ref name="LocalizedStringAttributes"/>
+      <optional>
+        <attribute name="format">
+          <a:documentation>What format the formatted abstract is in. In Metanorma, assumed to be Metanorma XML</a:documentation>
+        </attribute>
+      </optional>
       <choice>
         <oneOrMore>
           <ref name="BasicBlockNoId">

data/lib/metanorma/iso/front.rb

@@ -16,7 +16,7 @@ module Metanorma
       end
 
       def metadata_ext_iso(node, xml)
-        structured_id(node, xml)
+        a = node.attr("horizontal") and xml.horizontal a
         metadata_stage(node, xml)
         @amd && a = node.attr("updates-document-type") and
           xml.updates_document_type a
@@ -53,11 +53,6 @@ module Metanorma
         end
       end
 
-      def metadata_flavor(node, xml)
-        super
-        a = node.attr("horizontal") and xml.horizontal a
-      end
-
       def metadata_status(node, xml)
         stage = get_stage(node)
         substage = get_substage(node)