metanorma-iso 1.6.1 → 1.7.4

data/lib/asciidoctor/iso/isostandard-amd.rng

@@ -39,6 +39,9 @@
           </choice>
         </attribute>
         <ref name="bibdata"/>
+        <optional>
+          <ref name="misccontainer"/>
+        </optional>
         <optional>
           <ref name="boilerplate"/>
         </optional>

data/lib/asciidoctor/iso/isostandard.rng

@@ -79,19 +79,6 @@
         </choice>
       </element>
     </define>
-    <define name="ul">
-      <element name="ul">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <oneOrMore>
-          <ref name="ul_li"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </element>
-    </define>
     <define name="sections">
       <element name="sections">
         <zeroOrMore>
@@ -192,17 +179,6 @@
         </zeroOrMore>
       </element>
     </define>
-    <define name="definition">
-      <element name="definition">
-        <oneOrMore>
-          <choice>
-            <ref name="paragraph"/>
-            <ref name="figure"/>
-            <ref name="formula"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
     <define name="annex">
       <element name="annex">
         <optional>
@@ -333,6 +309,11 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="inline-header">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -341,6 +322,12 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="number"/>
+      </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <ref name="section-title"/>
       </optional>
@@ -358,57 +345,6 @@
         </oneOrMore>
       </choice>
     </define>
-    <define name="table">
-      <element name="table">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <optional>
-          <attribute name="width"/>
-        </optional>
-        <optional>
-          <attribute name="unnumbered">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="number"/>
-        </optional>
-        <optional>
-          <attribute name="subsequence"/>
-        </optional>
-        <optional>
-          <attribute name="alt"/>
-        </optional>
-        <optional>
-          <attribute name="summary"/>
-        </optional>
-        <optional>
-          <attribute name="uri">
-            <data type="anyURI"/>
-          </attribute>
-        </optional>
-        <optional>
-          <ref name="colgroup"/>
-        </optional>
-        <optional>
-          <ref name="tname"/>
-        </optional>
-        <optional>
-          <ref name="thead"/>
-        </optional>
-        <ref name="tbody"/>
-        <optional>
-          <ref name="tfoot"/>
-        </optional>
-        <zeroOrMore>
-          <ref name="table-note"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="dl"/>
-        </optional>
-      </element>
-    </define>
   </include>
   <!-- end overrides -->
   <!--
@@ -428,6 +364,9 @@
       <zeroOrMore>
         <ref name="termdocsource"/>
       </zeroOrMore>
+      <optional>
+        <ref name="misccontainer"/>
+      </optional>
       <optional>
         <ref name="boilerplate"/>
       </optional>
@@ -439,6 +378,9 @@
         <ref name="annex"/>
       </zeroOrMore>
       <ref name="bibliography"/>
+      <zeroOrMore>
+        <ref name="indexsect"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="horizontal">
@@ -527,28 +469,6 @@
       <ref name="Clause-Section"/>
     </element>
   </define>
-  <define name="ul_li">
-    <element name="li">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="uncheckedcheckbox">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="checkedcheckbox">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <oneOrMore>
-        <ref name="BasicBlock"/>
-      </oneOrMore>
-    </element>
-  </define>
   <define name="stagename">
     <element name="stagename">
       <text/>

data/lib/asciidoctor/iso/validate.rb

@@ -147,7 +147,7 @@ module Asciidoctor
       end
 
       # DRG directives 3.7; but anticipated by standoc
-      def figure_validate(xmldoc)
+      def subfigure_validate(xmldoc)
         xmldoc.xpath("//figure//figure").each do |f|
           { footnote: "fn", note: "note", key: "dl" }.each do |k, v|
             f.xpath(".//#{v}").each do |n|
@@ -157,6 +157,73 @@ module Asciidoctor
         end
       end
 
+      def image_name_prefix(xmldoc)
+        std = xmldoc&.at("//bibdata/ext/structuredidentifier/project-number") or return
+        num = xmldoc&.at("//bibdata/docnumber")&.text or return
+        ed = xmldoc&.at("//bibdata/edition")&.text || "1"
+        prefix = num
+        part = std["part"] and prefix += "-#{std['part']}"
+        prefix += "_ed#{ed}"
+        amd = std["amendment"] and prefix += "amd#{amd}"
+        prefix
+      end
+
+      def image_name_suffix(xmldoc)
+        case xmldoc&.at("//bibdata/language")&.text
+        when "fr" then "_f"
+        when "de" then "_d"
+        when "ru" then "_r"
+        when "es" then "_s"
+        when "ar" then "_a"
+        when "en" then "_e"
+        else
+          "_e"
+        end
+      end
+
+      def disjunct_error(i, cond1, cond2, msg1, msg2)
+        cond1 && !cond2 and @log.add("Style", i, "image name #{i['src']} #{msg1}")
+        !cond1 && cond2 and @log.add("Style", i, "image name #{i['src']} #{msg2}")
+      end
+
+      def image_name_validate1(i, prefix)
+        m = %r[(SL)?#{prefix}fig(?<tab>Tab)?(?<annex>[A-Z])?(Text)?(?<num>\d+)
+            (?<subfig>[a-z])?(?<key>_key\d+)?(?<lang>_[a-z])?$]x.match(File.basename(i["src"], ".*"))
+        if m.nil?
+          @log.add("Style", i, "image name #{i['src']} does not match DRG requirements")
+          return
+        end
+        warn i['src']
+        disjunct_error(i, i.at("./ancestor::table"), !m[:tab].nil?,
+                       "is under a table but is not so labelled", "is labelled as under a table but is not")
+        disjunct_error(i, i.at("./ancestor::annex"), !m[:annex].nil?,
+                       "is under an annex but is not so labelled", "is labelled as under an annex but is not")
+        disjunct_error(i, i.xpath("./ancestor::figure").size > 1, !m[:subfig].nil?,
+                       "does not have a subfigure letter but is a subfigure",
+                       "has a subfigure letter but is not a subfigure")
+        lang = image_name_suffix(i.document.root)
+        (m[:lang] || "_e") == lang or @log.add("Style", i, "image name #{i['src']} expected to have suffix #{lang}")
+      end
+
+      # DRG directives 3.2
+      def image_name_validate(xmldoc)
+        prefix = image_name_prefix(xmldoc) or return
+        xmldoc.xpath("//image").each do |i|
+          next if i["src"].start_with?("data:")
+          if /^ISO_\d+_/.match(File.basename(i["src"]))
+          elsif /^(SL)?#{prefix}fig/.match(File.basename(i["src"]))
+            image_name_validate1(i, prefix)
+          else
+            @log.add("Style", i, "image name #{i['src']} does not match DRG requirements: expect #{prefix}fig")
+          end
+        end
+      end
+
+      def figure_validate(xmldoc)
+        image_name_validate(xmldoc)
+        subfigure_validate(xmldoc)
+      end
+
       def bibdata_validate(doc)
         doctype_validate(doc)
         script_validate(doc)

data/lib/asciidoctor/iso/validate_title.rb

@@ -3,9 +3,13 @@ require "metanorma-standoc"
 module Asciidoctor
   module ISO
     class Converter < Standoc::Converter
+      def title_lang_part(doc, part, lang)
+        doc.at("//bibdata/title[@type='title-#{part}' and @language='#{lang}']")
+      end
+
       def title_intro_validate(root)
-        title_intro_en = root.at("//title[@type='title-intro' and @language='en']")
-        title_intro_fr = root.at("//title[@type='title-intro' and @language='fr']")
+        title_intro_en = title_lang_part(root, "intro", "en")
+        title_intro_fr = title_lang_part(root, "intro", "fr")
         if title_intro_en.nil? && !title_intro_fr.nil?
           @log.add("Style", title_intro_fr, "No English Title Intro!")
         end
@@ -15,8 +19,8 @@ module Asciidoctor
       end
 
       def title_main_validate(root)
-        title_main_en = root.at("//title[@type='title-main' and @language='en']")
-        title_main_fr = root.at("//title[@type='title-main' and @language='fr']")
+        title_main_en = title_lang_part(root, "main", "en")
+        title_main_fr = title_lang_part(root, "main", "fr")
         if title_main_en.nil? && !title_main_fr.nil?
           @log.add("Style", title_main_fr, "No English Title!")
         end
@@ -26,8 +30,8 @@ module Asciidoctor
       end
 
       def title_part_validate(root)
-        title_part_en = root.at("//title[@type='title-part' and @language='en']")
-        title_part_fr = root.at("//title[@type='title-part' and @language='fr']")
+        title_part_en = title_lang_part(root, "part", "en")
+        title_part_fr = title_lang_part(root, "part", "fr")
         (title_part_en.nil? && !title_part_fr.nil?) &&
           @log.add("Style", title_part_fr, "No English Title Part!")
         (!title_part_en.nil? && title_part_fr.nil?) &&
@@ -41,20 +45,22 @@ module Asciidoctor
         iec = root.at("//bibdata/contributor[role/@type = 'publisher']/"\
                       "organization[abbreviation = 'IEC' or "\
                       "name = 'International Electrotechnical Commission']")
-        @log.add("Style", docid, "Subpart defined on non-IEC document!") if subpart && !iec
+        subpart && !iec and
+          @log.add("Style", docid, "Subpart defined on non-IEC document!")
       end
 
       # ISO/IEC DIR 2, 11.5.2
       def title_names_type_validate(root)
         doctypes = /International\sStandard | Technical\sSpecification |
         Publicly\sAvailable\sSpecification | Technical\sReport | Guide /xi
-        title_main_en = root.at("//title[@type='title-main' and @language='en']")
+        title_main_en = title_lang_part(root, "main", "en")
         if !title_main_en.nil? && doctypes.match(title_main_en.text)
           @log.add("Style", title_main_en, "Main Title may name document type")
         end
-        title_intro_en = root.at("//title[@type='title-intro' and @language='en']")
+        title_intro_en = title_lang_part(root, "intro", "en")
         if !title_intro_en.nil? && doctypes.match(title_intro_en.text)
-          @log.add("Style", title_intro_en, "Title Intro may name document type")
+          @log.add("Style", title_intro_en,
+                   "Title Intro may name document type")
         end
       end
 
@@ -64,8 +70,9 @@ module Asciidoctor
           title = s&.at("./title")&.text || s.name
           s.xpath("./clause | ./terms | ./references").each do |ss|
             subtitle = ss.at("./title")
-            !subtitle.nil? && !subtitle&.text&.empty? ||
-              @log.add("Style", ss, "#{title}: each first-level subclause must have a title")
+            !subtitle.nil? && !subtitle&.text&.empty? or
+              @log.add("Style", ss,
+                       "#{title}: each first-level subclause must have a title")
           end
         end
       end
@@ -82,7 +89,8 @@ module Asciidoctor
           withtitle = withtitle || (subtitle && !subtitle.text.empty?)
         end
         notitle && withtitle &&
-          @log.add("Style", nil, "#{label}: all subclauses must have a title, or none")
+          @log.add("Style", nil,
+                   "#{label}: all subclauses must have a title, or none")
       end
 
       def title_validate(root)

data/lib/isodoc/iso/base_convert.rb

@@ -152,6 +152,17 @@ module IsoDoc
           name and name.children.each { |n| parse(n, div) }
         end
       end
+
+      def middle(isoxml, out)
+        super
+        indexsect isoxml, out
+      end
+
+      def indexsect(isoxml, out)
+        isoxml.xpath(ns("//indexsect")).each do |i|
+          clause_parse(i, out)
+        end
+      end
     end
   end
 end

data/lib/isodoc/iso/html/header.html

@@ -74,7 +74,7 @@ mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draft
 
 <p class=MsoHeader style='margin-bottom:18.0pt'><span lang=EN-GB
 style='font-size:10.0pt;mso-bidi-font-size:11.0pt;font-weight:normal'>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}</span><span lang=EN-GB
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}</span><span lang=EN-GB
 style='font-weight:normal'><o:p></o:p></span></p>
 
 </div>
@@ -93,7 +93,7 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
 mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
 lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
 style='mso-tab-count:1'>                                                                                                                                                                           </span>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<o:p></o:p></span></p>
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
 
 </div>
 
@@ -129,7 +129,7 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
 style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
 style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
 1'>                                                                                                                                                                           </span>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<o:p></o:p></span></p>
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=ef2l>
@@ -144,12 +144,12 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
 style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
 style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
 1'>                                                                                                                                                                           </span>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<o:p></o:p></span></p>
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=f2>
 <p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
 style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
 </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
@@ -162,7 +162,7 @@ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
 
 <div style='mso-element:footer' id=f2l>
 <p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
 style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
 </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
@@ -186,7 +186,7 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
 mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
 lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
 style='mso-tab-count:1'>                                                                                                                                                                           </span>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<o:p></o:p></span></p>
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=ef3l>
@@ -202,12 +202,12 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
 mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
 lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
 style='mso-tab-count:1'>                                                                                                                                                                           </span>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<o:p></o:p></span></p>
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=f3>
 <p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
 style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
 mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
 PAGE<span style='mso-spacerun:yes'>   </span>\* MERGEFORMAT <span
@@ -221,7 +221,7 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span>
 
 <div style='mso-element:footer' id=f3l>
 <p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
 style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
 mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
 PAGE<span style='mso-spacerun:yes'>   </span>\* MERGEFORMAT <span
@@ -242,10 +242,10 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span>
 {% endif %}
 
 <p class=MsoFooter style='margin-top:0cm'><span lang=EN-AU style='font-size:
-10.0pt;mso-ansi-language:EN-AU'>{{ price_based_on | replace: "%", "<span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'> </span>NUMPAGES<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span><span style='mso-no-proof:yes'>26</span><span style='mso-element:field-end'></span>" }}</span></p>
+10.0pt;mso-ansi-language:EN-AU'>{{ labels["price_based_on"] | replace: "%", "<span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'> </span>NUMPAGES<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span><span style='mso-no-proof:yes'>26</span><span style='mso-element:field-end'></span>" }}</span></p>
 
 <p class=MsoFooter><span lang=EN-AU style='font-size:10.0pt;'>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<o:p></o:p></span></p>
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
 
 </div>