metanorma-iso 1.8.6 → 1.9.0

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

@@ -2099,88 +2099,6 @@
 		<xsl:text>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</xsl:text>
 	</xsl:variable>
 	
-		<xsl:template name="number-to-words">
-		<xsl:param name="number"/>
-		<xsl:variable name="words">
-			<words>
-				<word cardinal="1">One-</word>
-				<word ordinal="1">First </word>
-				<word cardinal="2">Two-</word>
-				<word ordinal="2">Second </word>
-				<word cardinal="3">Three-</word>
-				<word ordinal="3">Third </word>
-				<word cardinal="4">Four-</word>
-				<word ordinal="4">Fourth </word>
-				<word cardinal="5">Five-</word>
-				<word ordinal="5">Fifth </word>
-				<word cardinal="6">Six-</word>
-				<word ordinal="6">Sixth </word>
-				<word cardinal="7">Seven-</word>
-				<word ordinal="7">Seventh </word>
-				<word cardinal="8">Eight-</word>
-				<word ordinal="8">Eighth </word>
-				<word cardinal="9">Nine-</word>
-				<word ordinal="9">Ninth </word>
-				<word ordinal="10">Tenth </word>
-				<word ordinal="11">Eleventh </word>
-				<word ordinal="12">Twelfth </word>
-				<word ordinal="13">Thirteenth </word>
-				<word ordinal="14">Fourteenth </word>
-				<word ordinal="15">Fifteenth </word>
-				<word ordinal="16">Sixteenth </word>
-				<word ordinal="17">Seventeenth </word>
-				<word ordinal="18">Eighteenth </word>
-				<word ordinal="19">Nineteenth </word>
-				<word cardinal="20">Twenty-</word>
-				<word ordinal="20">Twentieth </word>
-				<word cardinal="30">Thirty-</word>
-				<word ordinal="30">Thirtieth </word>
-				<word cardinal="40">Forty-</word>
-				<word ordinal="40">Fortieth </word>
-				<word cardinal="50">Fifty-</word>
-				<word ordinal="50">Fiftieth </word>
-				<word cardinal="60">Sixty-</word>
-				<word ordinal="60">Sixtieth </word>
-				<word cardinal="70">Seventy-</word>
-				<word ordinal="70">Seventieth </word>
-				<word cardinal="80">Eighty-</word>
-				<word ordinal="80">Eightieth </word>
-				<word cardinal="90">Ninety-</word>
-				<word ordinal="90">Ninetieth </word>
-				<word cardinal="100">Hundred-</word>
-				<word ordinal="100">Hundredth </word>
-			</words>
-		</xsl:variable>
-
-		<xsl:variable name="ordinal" select="xalan:nodeset($words)//word[@ordinal = $number]/text()"/>
-
-		<xsl:choose>
-			<xsl:when test="$ordinal != ''">
-				<xsl:value-of select="$ordinal"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:choose>
-					<xsl:when test="$number &lt; 100">
-						<xsl:variable name="decade" select="concat(substring($number,1,1), '0')"/>
-						<xsl:variable name="digit" select="substring($number,2)"/>
-						<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $decade]/text()"/>
-						<xsl:value-of select="xalan:nodeset($words)//word[@ordinal = $digit]/text()"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<!-- more 100 -->
-						<xsl:variable name="hundred" select="substring($number,1,1)"/>
-						<xsl:variable name="digits" select="number(substring($number,2))"/>
-						<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $hundred]/text()"/>
-						<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = '100']/text()"/>
-						<xsl:call-template name="number-to-words">
-							<xsl:with-param name="number" select="$digits"/>
-						</xsl:call-template>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-	
 	<xsl:template name="printEdition">
 		<xsl:variable name="edition" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:edition)"/>
 		<xsl:text> </xsl:text>
@@ -3424,6 +3342,7 @@
 					<fo:table-row>
 						<fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
 							
+							
 								<xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
 							
 							
@@ -3436,6 +3355,10 @@
 							
 							
 							
+							
+							<!-- for BSI (not PAS) display Notes before footnotes -->
+							
+							
 							<!-- except gb  -->
 							
 								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
@@ -3461,6 +3384,10 @@
 							<!-- fn processing -->
 							<xsl:call-template name="fn_display"/>
 							
+							
+							<!-- for PAS display Notes after footnotes -->
+							
+							
 						</fo:table-cell>
 					</fo:table-row>
 				</fo:table-body>
@@ -3569,6 +3496,7 @@
 				</xsl:if>
 				<xsl:if test="$parent-name = 'tfoot'">
 					
+					
 						<xsl:attribute name="font-size">9pt</xsl:attribute>
 						<xsl:attribute name="border-left">solid black 1pt</xsl:attribute>
 						<xsl:attribute name="border-right">solid black 1pt</xsl:attribute>
@@ -3704,6 +3632,7 @@
 		
 			<fo:block font-size="10pt" margin-bottom="12pt">
 				
+				
 					<xsl:attribute name="font-size">9pt</xsl:attribute>
 					<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 				
@@ -3713,8 +3642,12 @@
 				
 				
 				
+				<!-- Table's note name (NOTE, for example) -->
+
 				<fo:inline padding-right="2mm">
 					
+				
+					
 					
 					
 					
@@ -3722,6 +3655,8 @@
 						
 				</fo:inline>
 				
+				
+				
 				<xsl:apply-templates mode="process"/>
 			</fo:block>
 		
@@ -3741,6 +3676,8 @@
 			<xsl:variable name="reference" select="@reference"/>
 			<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
 				<fo:block margin-bottom="12pt">
+				
+					
 					
 						<xsl:attribute name="font-size">9pt</xsl:attribute>
 						<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -3763,6 +3700,7 @@
 						<xsl:value-of select="@reference"/>
 						
 						
+						
 					</fo:inline>
 					<fo:inline>
 						
@@ -3918,6 +3856,7 @@
 				
 				<xsl:value-of select="@reference"/>
 				
+				
 			</fo:basic-link>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
@@ -4944,6 +4883,7 @@
 			
 			
 			
+			
 			<fo:block-container margin-left="0mm">
 				
 				
@@ -6151,9 +6091,10 @@
 											
 						
 					</xsl:if>	
-											
+					
+					
+            
 					<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
-						
 						<xsl:if test="normalize-space(@citeas) = ''">
 							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
 						</xsl:if>
@@ -6161,6 +6102,7 @@
 							
 							
 							
+							
 						</xsl:if>
 
 						<xsl:apply-templates/>
@@ -7105,4 +7047,100 @@
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+	</xsl:template><xsl:template name="number-to-words">
+		<xsl:param name="number"/>
+		<xsl:param name="first"/>
+		<xsl:if test="$number != ''">
+			<xsl:variable name="words">
+								<words>
+					<word cardinal="1">One-</word>
+					<word ordinal="1">First </word>
+					<word cardinal="2">Two-</word>
+					<word ordinal="2">Second </word>
+					<word cardinal="3">Three-</word>
+					<word ordinal="3">Third </word>
+					<word cardinal="4">Four-</word>
+					<word ordinal="4">Fourth </word>
+					<word cardinal="5">Five-</word>
+					<word ordinal="5">Fifth </word>
+					<word cardinal="6">Six-</word>
+					<word ordinal="6">Sixth </word>
+					<word cardinal="7">Seven-</word>
+					<word ordinal="7">Seventh </word>
+					<word cardinal="8">Eight-</word>
+					<word ordinal="8">Eighth </word>
+					<word cardinal="9">Nine-</word>
+					<word ordinal="9">Ninth </word>
+					<word ordinal="10">Tenth </word>
+					<word ordinal="11">Eleventh </word>
+					<word ordinal="12">Twelfth </word>
+					<word ordinal="13">Thirteenth </word>
+					<word ordinal="14">Fourteenth </word>
+					<word ordinal="15">Fifteenth </word>
+					<word ordinal="16">Sixteenth </word>
+					<word ordinal="17">Seventeenth </word>
+					<word ordinal="18">Eighteenth </word>
+					<word ordinal="19">Nineteenth </word>
+					<word cardinal="20">Twenty-</word>
+					<word ordinal="20">Twentieth </word>
+					<word cardinal="30">Thirty-</word>
+					<word ordinal="30">Thirtieth </word>
+					<word cardinal="40">Forty-</word>
+					<word ordinal="40">Fortieth </word>
+					<word cardinal="50">Fifty-</word>
+					<word ordinal="50">Fiftieth </word>
+					<word cardinal="60">Sixty-</word>
+					<word ordinal="60">Sixtieth </word>
+					<word cardinal="70">Seventy-</word>
+					<word ordinal="70">Seventieth </word>
+					<word cardinal="80">Eighty-</word>
+					<word ordinal="80">Eightieth </word>
+					<word cardinal="90">Ninety-</word>
+					<word ordinal="90">Ninetieth </word>
+					<word cardinal="100">Hundred-</word>
+					<word ordinal="100">Hundredth </word>
+				</words>
+			</xsl:variable>
+
+			<xsl:variable name="ordinal" select="xalan:nodeset($words)//word[@ordinal = $number]/text()"/>
+			
+			<xsl:variable name="value">
+				<xsl:choose>
+					<xsl:when test="$ordinal != ''">
+						<xsl:value-of select="$ordinal"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:choose>
+							<xsl:when test="$number &lt; 100">
+								<xsl:variable name="decade" select="concat(substring($number,1,1), '0')"/>
+								<xsl:variable name="digit" select="substring($number,2)"/>
+								<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $decade]/text()"/>
+								<xsl:value-of select="xalan:nodeset($words)//word[@ordinal = $digit]/text()"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<!-- more 100 -->
+								<xsl:variable name="hundred" select="substring($number,1,1)"/>
+								<xsl:variable name="digits" select="number(substring($number,2))"/>
+								<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $hundred]/text()"/>
+								<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = '100']/text()"/>
+								<xsl:call-template name="number-to-words">
+									<xsl:with-param name="number" select="$digits"/>
+								</xsl:call-template>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			<xsl:choose>
+				<xsl:when test="$first = 'true'">
+					<xsl:variable name="value_lc" select="java:toLowerCase(java:java.lang.String.new($value))"/>
+					<xsl:call-template name="capitalize">
+						<xsl:with-param name="str" select="$value_lc"/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="$value"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:if>
 	</xsl:template></xsl:stylesheet>

data/lib/isodoc/iso/isosts_convert.rb

@@ -1,31 +1,30 @@
 require "isodoc"
-require "mn2sts"
+require "mnconvert"
 
 module IsoDoc
   module Iso
-
     # A {Converter} implementation that generates HTML output, and a document
     # schema encapsulation of the document for validation
     #
     class IsoStsConvert < IsoDoc::XslfoPdfConvert
-      def initialize(options)
+      def initialize(_options)
         @libdir = File.dirname(__FILE__)
         @format = :isosts
         @suffix = "isosts.xml"
       end
 
-      def convert(input_filename, file = nil, debug = false, output_filename = nil)
-        file = File.read(input_filename, encoding: "utf-8") if file.nil?
-        docxml, filename, dir = convert_init(file, input_filename, debug)
-        /\.xml$/.match(input_filename) or
-          input_filename = Tempfile.open([filename, ".xml"], encoding: "utf-8") do |f|
-          f.write file
-          f.path
-        end
+      def convert(input_fname, file = nil, debug = false, output_fname = nil)
+        file = File.read(input_fname, encoding: "utf-8") if file.nil?
+        _, fname, dir = convert_init(file, input_fname, debug)
+        /\.xml$/.match(input_fname) or
+          input_fname = Tempfile.open([fname, ".xml"], encoding: "utf-8") do |f|
+            f.write file
+            f.path
+          end
         FileUtils.rm_rf dir
-        Mn2sts.convert(input_filename, output_filename || "#{filename}.#{@suffix}", iso: true)
+        MnConvert.convert(input_fname, output_fname || "#{fname}.#{@suffix}",
+                          MnConvert::InputFormat::MN, { output_format: :iso })
       end
     end
   end
 end
-

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -112,14 +112,58 @@ module IsoDoc
         end
       end
 
+      def concept(docxml)
+        docxml.xpath(ns("//terms//concept")).each_with_object({}) do |f, m|
+          concept_term(f, m)
+        end
+        docxml.xpath(ns("//concept")).each do |node|
+          concept_render(node, node["ital"] || "false", node["ref"] || "false")
+        end
+      end
+
+      def concept_term(node, seen)
+        term = node&.at(ns("./refterm"))&.to_xml
+        if term && seen[term]
+          concept_render(node, node["ital"] || "false", node["ref"] || "false")
+        else concept_render(node, node["ital"] || "true", node["ref"] || "true")
+        end
+        seen[term] = true if term
+        seen
+      end
+
+      def concept1_ref(node, ref)
+        if r = node.at(ns("./xref | ./eref | ./termref"))
+          return r.remove if ref == "false"
+
+          r.name == "termref" and
+            r.replace(@i18n.term_defined_in.sub(/%/, r.to_xml)) or
+            r.replace("(#{r.to_xml})")
+        end
+      end
+
       def concept1(node)
-        node&.at(ns("./refterm"))&.remove
-        node&.at(ns("./renderterm"))&.name = "em"
-        r = node.at(ns("./xref | ./eref | ./termref"))
-        r.name == "termref" and
-          r.replace(@i18n.term_defined_in.sub(/%/, r.to_xml)) or
-          r.replace("(#{r.to_xml})")
-        node.replace(node.children)
+        node.replace(node&.at(ns("./renderterm"))&.children ||
+                     node&.at(ns("./refterm"))&.children ||
+                     node.children)
+      end
+
+      # we're assuming terms and clauses in the right place for display,
+      # to cope with multiple terms sections
+
+      def display_order(docxml)
+        i = 0
+        i = display_order_xpath(docxml, "//preface/*", i)
+        i = display_order_at(docxml, "//clause[@type = 'scope']", i)
+        i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
+        # i = display_order_at(docxml, "//sections/terms | "\
+        # "//sections/clause[descendant::terms]", i)
+        # i = display_order_at(docxml, "//sections/definitions", i)
+        # i = display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml), i)
+        i = display_order_xpath(docxml, "//sections/clause[not(@type = 'scope')] | "\
+                                "//sections/terms | //sections/definitions", i)
+        i = display_order_xpath(docxml, "//annex", i)
+        i = display_order_xpath(docxml, @xrefs.klass.bibliography_xpath, i)
+        display_order_xpath(docxml, "//indexsect", i)
       end
 
       include Init

data/lib/isodoc/iso/sts_convert.rb

@@ -1,9 +1,8 @@
 require "isodoc"
-require "mn2sts"
+require "mnconvert"
 
 module IsoDoc
   module Iso
-
     class StsConvert < IsoDoc::XslfoPdfConvert
       def initialize(_options) # rubocop:disable Lint/MissingSuper
         @libdir = File.dirname(__FILE__)
@@ -14,14 +13,14 @@ module IsoDoc
       def convert(in_fname, file = nil, debug = false, out_fname = nil)
         file = File.read(in_fname, encoding: "utf-8") if file.nil?
         _docxml, filename, dir = convert_init(file, in_fname, debug)
-        unless /\.xml$/.match?(in_fname)
+        /\.xml$/.match?(in_fname) or
           in_fname = Tempfile.open([filename, ".xml"], encoding: "utf-8") do |f|
             f.write file
             f.path
           end
-        end
         FileUtils.rm_rf dir
-        Mn2sts.convert(in_fname, out_fname || "#{filename}.#{@suffix}")
+        Mnconvert.convert(in_fname, out_fname || "#{filename}.#{@suffix}",
+                          MnConvert::InputFormat::MN)
       end
     end
   end

data/lib/isodoc/iso/xref.rb

@@ -8,7 +8,7 @@ module IsoDoc
         if @klass.amd(doc)
           initial_anchor_names_amd(doc)
         else
-          super
+          initial_anchor_names1(doc)
         end
         introduction_names(doc.at(ns("//introduction")))
       end
@@ -26,6 +26,22 @@ module IsoDoc
         termexample_anchor_names(doc)
       end
 
+      def initial_anchor_names1(doc)
+        doc.xpath(ns("//preface/*")).each { |c| c.element? and preface_names(c) }
+        # potentially overridden in middle_section_asset_names()
+        sequential_asset_names(doc.xpath(ns("//preface/*")))
+        n = Counter.new
+        n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
+        n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
+        doc.xpath(ns("//sections/clause[not(@type = 'scope')] | "\
+                     "//sections/terms | //sections/definitions")).each do |c|
+          n = section_names(c, n, 1)
+        end
+        middle_section_asset_names(doc)
+        termnote_anchor_names(doc)
+        termexample_anchor_names(doc)
+      end
+
       # we can reference 0-number clauses in introduction
       def introduction_names(clause)
         return if clause.nil?