metanorma-iso 2.1.3 → 2.1.4

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -2469,7 +2469,17 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-style">
 		
+			<xsl:attribute name="margin-top">6pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+			<xsl:attribute name="text-align">center</xsl:attribute>			
+			<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
+		
 		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
 		
@@ -2582,6 +2592,7 @@
 		
 			<xsl:attribute name="padding-right">5mm</xsl:attribute>
 		
+		
 				
 				
 	</xsl:attribute-set><xsl:variable name="table-border_">
@@ -2941,7 +2952,8 @@
 		
 		
 		
-				
+		
+		
 		
 					
 			<xsl:attribute name="margin-top">8pt</xsl:attribute>
@@ -2957,6 +2969,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="termnote-style">
 		
 		
+				
 		
 		
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -3394,7 +3407,10 @@
 		
 		
 		
-		
+		<!-- <xsl:if test="$namespace = 'ieee'">
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			<xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
+		</xsl:if> -->
 		
 		
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -4611,80 +4627,88 @@
 				</xsl:choose>
 			</xsl:variable>
 			
-			<fo:table keep-with-previous="always">
-				<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
-					<xsl:variable name="name" select="local-name()"/>
+			
+			<xsl:variable name="tableWithNotesAndFootnotes">
+			
+				<fo:table keep-with-previous="always">
+					<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
+						<xsl:variable name="name" select="local-name()"/>
+						<xsl:choose>
+							<xsl:when test="$name = 'border-top'">
+								<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
+							</xsl:when>
+							<xsl:when test="$name = 'border'">
+								<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+								<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:for-each>
+					
+					
+					
 					<xsl:choose>
-						<xsl:when test="$name = 'border-top'">
-							<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
-						</xsl:when>
-						<xsl:when test="$name = 'border'">
-							<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
-							<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
+						<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
+							<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
+								<fo:table-column column-width="{@width}"/>
+							</xsl:for-each>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+							<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
+							<xsl:call-template name="insertTableColumnWidth">
+								<xsl:with-param name="colwidths" select="$colwidths"/>
+							</xsl:call-template>
 						</xsl:otherwise>
 					</xsl:choose>
-				</xsl:for-each>
-				
-				
-				
-				<xsl:choose>
-					<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
-						<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
-							<fo:table-column column-width="{@width}"/>
-						</xsl:for-each>
-					</xsl:when>
-					<xsl:otherwise>
-						<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
-						<xsl:call-template name="insertTableColumnWidth">
-							<xsl:with-param name="colwidths" select="$colwidths"/>
-						</xsl:call-template>
-					</xsl:otherwise>
-				</xsl:choose>
-				
-				<fo:table-body>
-					<fo:table-row>
-						<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
-							
-							
+					
+					<fo:table-body>
+						<fo:table-row>
+							<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
+								
+								
 
-							
-							
-							<!-- fn will be processed inside 'note' processing -->
-							
-							
-							
-							
-							
-							
-							<!-- for BSI (not PAS) display Notes before footnotes -->
-							
-							
-							<!-- except gb and bsi  -->
-							
-									<xsl:apply-templates select="../*[local-name()='note']"/>
 								
-							
-							
-							<!-- horizontal row separator -->
-							
-							
-							<!-- fn processing -->
-							
-									<xsl:call-template name="table_fn_display"/>
 								
-							
-							
-							<!-- for PAS display Notes after footnotes -->
-							
-							
-						</fo:table-cell>
-					</fo:table-row>
-				</fo:table-body>
-				
-			</fo:table>
+								<!-- fn will be processed inside 'note' processing -->
+								
+								
+								
+								
+								
+								
+								<!-- for BSI (not PAS) display Notes before footnotes -->
+								
+								
+								<!-- except gb and bsi  -->
+								
+										<xsl:apply-templates select="../*[local-name()='note']"/>
+									
+								
+								
+								<!-- horizontal row separator -->
+								
+								
+								<!-- fn processing -->
+								
+										<xsl:call-template name="table_fn_display"/>
+									
+								
+								
+								<!-- for PAS display Notes after footnotes -->
+								
+								
+							</fo:table-cell>
+						</fo:table-row>
+					</fo:table-body>
+					
+				</fo:table>
+			</xsl:variable>
+			
+			<xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
+				<xsl:copy-of select="$tableWithNotesAndFootnotes"/>
+			</xsl:if>
 			
 			
 			
@@ -5040,6 +5064,7 @@
 		<xsl:variable name="footnote_inline">
 			<fo:inline xsl:use-attribute-sets="fn-num-style">
 				
+				
 				<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
 					<xsl:value-of select="$current_fn_number_text"/>
 				</fo:basic-link>
@@ -5061,8 +5086,12 @@
 							<fo:block xsl:use-attribute-sets="fn-body-style">
 								
 								
+								
 								<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
 									
+									
+									
+									
 									<xsl:value-of select="$current_fn_number_text"/>
 								</fo:inline>
 								<xsl:apply-templates/>
@@ -6777,6 +6806,8 @@
 			
 			
 			
+			
+			
 			<xsl:choose>
 				<xsl:when test="$target_text = ''">
 					<xsl:apply-templates/>
@@ -6984,6 +7015,7 @@
 				
 
 				
+				
 				<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 				<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
 				<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
@@ -7006,6 +7038,7 @@
 				<xsl:otherwise>
 					
 					
+					
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -7022,6 +7055,7 @@
 				</xsl:when>
 				<xsl:otherwise>
 					
+					
 						<xsl:text>:</xsl:text>
 					
 					
@@ -7802,6 +7836,9 @@
 			<fo:block xsl:use-attribute-sets="figure-name-style">
 				
 				
+				
+				
+				
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -7862,7 +7899,7 @@
 					<xsl:apply-templates/>
 				</xsl:otherwise>
 			</xsl:choose>
-	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
+	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref'] | *[local-name() = 'eref']" mode="contents">
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
 		<xsl:text> </xsl:text>
@@ -7938,6 +7975,9 @@
 						inherit<!-- 9 -->
 						
 						
+						<!-- <xsl:if test="$namespace = 'ieee'">							
+							<xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
+						</xsl:if> -->
 						
 								
 						
@@ -8216,6 +8256,8 @@
 				
 				<xsl:apply-templates/>
 				
+					<xsl:text>:</xsl:text>
+				
 			</fo:block>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']">
@@ -8382,10 +8424,14 @@
 	</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
 		<xsl:variable name="element">inline
 			
+			
 		</xsl:variable>		
 		<xsl:choose>			
 			<xsl:when test="contains($element, 'block')">
 				<fo:block xsl:use-attribute-sets="example-p-style">
+				
+					
+						
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:when>
@@ -8498,6 +8544,7 @@
 					</xsl:if>
 					<fo:block xsl:use-attribute-sets="example-p-style">
 						
+						
 						<xsl:apply-templates/>
 					</fo:block>
 				</fo:block-container>
@@ -8654,6 +8701,8 @@
 					
 					
 					
+					
+					
 					<fo:basic-link fox:alt-text="{@citeas}">
 						<xsl:if test="normalize-space(@citeas) = ''">
 							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
@@ -9070,6 +9119,8 @@
 				
 					
 				
+					
+				
 					<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 					<xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
 						<xsl:call-template name="append_add-style"/>
@@ -9327,7 +9378,7 @@
 				</fo:block>
 			
 
-	</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
 		
 		 <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or 
 			$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
@@ -9340,9 +9391,7 @@
 									
 											<xsl:value-of select="*[local-name()='docidentifier'][@type = 'metanorma-ordinal']"/>
 											<xsl:if test="not(*[local-name()='docidentifier'][@type = 'metanorma-ordinal'])">
-												
-														<xsl:number format="[1]" count="*[local-name()='bibitem'][not(@hidden = 'true')]"/>
-													
+												<xsl:number format="[1]" count="*[local-name()='bibitem'][not(@hidden = 'true')]"/>
 											</xsl:if>
 										
 								</fo:inline>
@@ -10213,7 +10262,7 @@
 					<dc:description>
 						<xsl:variable name="abstract">
 							
-									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>									
+									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>									
 								
 						</xsl:variable>
 						<xsl:value-of select="normalize-space($abstract)"/>

data/lib/isodoc/iso/metadata.rb

@@ -230,7 +230,7 @@ module IsoDoc
         ret = [ag]
         ret << sc_base(xml, "approvalgroup")
         ret << wg_base(xml, "approvalgroup")
-        set(:approvalgroup, ret)
+        set(:approvalgroup, ret.compact)
       end
 
       def secretariat(xml)

data/lib/isodoc/iso/word_dis_cleanup.rb

@@ -230,6 +230,14 @@ module IsoDoc
           end
         end
       end
+
+      def make_FigureWordToC(docxml)
+        super.sub(/FigureTitle,figuretitle/, "Figure title,Annex Figure Title")
+      end
+
+      def make_TableWordToC(docxml)
+        super.sub(/TableTitle,tabletitle/, "Table title,Annex Table Title")
+      end
     end
   end
 end

data/lib/metanorma/iso/base.rb

@@ -5,16 +5,10 @@ require "pathname"
 require "open-uri"
 require "isodoc"
 require "fileutils"
-require_relative "macros"
 
 module Metanorma
   module ISO
     class Converter < Standoc::Converter
-      Asciidoctor::Extensions.register do
-        block Metanorma::ISO::EditorAdmonitionBlock
-        treeprocessor Metanorma::ISO::EditorInlineAdmonitionBlock
-      end
-
       XML_ROOT_TAG = "iso-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/iso".freeze
 

data/lib/metanorma/iso/cleanup.rb

@@ -76,7 +76,8 @@ module Metanorma
         return 2 if bib.at("#{PUBLISHER}[abbreviation = 'IEC']")
         return 2 if bib.at("#{PUBLISHER}[name = 'International "\
                            "Electrotechnical Commission']")
-        return 3 if bib.at("./docidentifier[@type][not(#{OTHERIDS})]")
+        return 3 if bib.at("./docidentifier[@type][not(#{OTHERIDS})]") ||
+          bib.at("./docidentifier[not(@type)]")
 
         4
       end
@@ -98,7 +99,8 @@ module Metanorma
       def sort_biblio_key(bib)
         pubclass = pub_class(bib)
         num = bib&.at("./docnumber")&.text
-        id = bib&.at("./docidentifier[not(#{OTHERIDS})]")
+        id = bib&.at("./docidentifier[@primary]") ||
+          bib&.at("./docidentifier[not(#{OTHERIDS})]")
         metaid = bib&.at("./docidentifier[@type = 'metanorma']")&.text
         abbrid = metaid unless /^\[\d+\]$/.match?(metaid)
         /\d-(?<partid>\d+)/ =~ id&.text

data/lib/metanorma/iso/isodoc.rng

@@ -69,6 +69,17 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="AdmonitionType">
+      <choice>
+        <value>warning</value>
+        <value>note</value>
+        <value>tip</value>
+        <value>important</value>
+        <value>caution</value>
+        <value>statement</value>
+        <value>editorial</value>
+      </choice>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -116,6 +127,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="suppress_identifier">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <ref name="BibliographicItem"/>
       </element>
     </define>

data/lib/metanorma/iso/isostandard.rng

@@ -45,7 +45,9 @@
         <ref name="horizontal"/>
       </optional>
       <ref name="editorialgroup"/>
-      <ref name="approvalgroup"/>
+      <optional>
+        <ref name="approvalgroup"/>
+      </optional>
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.1.3".freeze
+    VERSION = "2.1.4".freeze
   end
 end

data/spec/isodoc/blocks_spec.rb

@@ -297,7 +297,7 @@ RSpec.describe IsoDoc do
           <iso-standard xmlns="http://riboseinc.com/isoxml" type='presentation'>
           <preface><foreword displayorder="1">
           <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="editorial">
-                         <p id='_e94663cc-2473-4ccc-9a72-983a74d989f2'>
+                         <p id='_e94663cc-2473-4ccc-9a72-983a74d989f2'>EDITORIAL NOTE — 
                  Only use paddy or parboiled rice for the
                  determination of husked rice yield.
                </p>
@@ -312,7 +312,7 @@ RSpec.describe IsoDoc do
              <div>
                <h1 class='ForewordTitle'>Foreword</h1>
                <div id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a' class='zzHelp'>
-                 <p>
+                 <p>EDITORIAL NOTE — 
                     Only use paddy or parboiled rice for the
                    determination of husked rice yield.
                  </p>
@@ -332,7 +332,7 @@ RSpec.describe IsoDoc do
       <div>
         <h1 class='ForewordTitle'>Foreword</h1>
         <div id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a' class='zzHelp'>
-          <p> Only use paddy or parboiled rice for the determination of husked rice yield. </p>
+          <p>EDITORIAL NOTE — Only use paddy or parboiled rice for the determination of husked rice yield. </p>
           <p class='ForewordText' id='_e94663cc-2473-4ccc-9a72-983a74d989f3'>Para 2.</p>
         </div>
       </div>

data/spec/isodoc/metadata_spec.rb

@@ -209,7 +209,6 @@ RSpec.describe IsoDoc::Iso::Metadata do
             </editorialgroup>
             <approvalgroup>
               <technical-committee number="34" type="ABC">Food products</technical-committee>
-              <subcommittee number="4" type="DEF">Cereals and pulses</subcommittee>
               <workgroup number="3" type="GHI">Rice Group</workgroup>
             </approvalgroup>
             <ics><code>1.2.3</code></ics>
@@ -224,7 +223,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
     INPUT
     output = <<~OUTPUT
       {:agency=>"ISO/IEC",
-      :approvalgroup=>["ABC 34", "DEF 4", "GHI 3"],
+      :approvalgroup=>["ABC 34", "GHI 3"],
       :docnumber=>"ISO/IEC/CD 17301-1-3",
       :docnumber_lang=>"ISO/IEC/CD 17301-1-3 (E)",
       :docnumber_reference=>"ISO/IEC/CD 17301-1-3 (E)",

data/spec/metanorma/blocks_spec.rb

@@ -621,37 +621,4 @@ RSpec.describe Metanorma::ISO do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
-
-  it "processes the macro for editorial notes" do
-    input = <<~INPUT
-      #{ASCIIDOC_BLANK_HDR}
-      EDITOR: Note1
-
-      [EDITOR]
-      ====
-      Note2
-      ====
-
-      [EDITOR]
-      Note3
-    INPUT
-    output = <<~OUTPUT
-      #{BLANK_HDR}
-         <sections>
-           <admonition id='_' type='editorial'>
-             <p id='_'>Note1</p>
-           </admonition>
-           <admonition id='_' type='editorial'>
-             <p id='_'>Note2</p>
-           </admonition>
-           <admonition id='_' type='editorial'>
-             <p id='_'>Note3</p>
-           </admonition>
-         </sections>
-      </iso-standard>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
-
 end