metanorma-iec 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6f864a1028a766280c059aa02ec5e56a78806b0e2f2c4ae61efce3f0d254053
-  data.tar.gz: 6e7c6439b85da10d02dc1b9aaf518338e1dfe4cbb3e5b754a4d4c4ccfb3e222a
+  metadata.gz: 1927ece3a09c61d4d12c9f6daa48bbadf0168bee1bfcde52392123308c44edb6
+  data.tar.gz: 1c92e46aa15e727af3438267cf5f9e72d78c00a959a8bcc354f384d0cc21102b
 SHA512:
-  metadata.gz: 98311ebb5879d224265d355f83ea6f0d64044b3de4d185c6eda67a85705a40a1646e1ec0c6493f7dbf27269768dd6402e21da60639cb7bf880e1902bc463cca3
-  data.tar.gz: 3dcb74e07eaf077c4a6cacec0e60133ab8f53d8d2a4baa8f97d6becd0e20392b8b72ca20a3f73cb7262ded33e3a15d2388657aca308ce03917b80aa715382d4a
+  metadata.gz: 98fd5f51acfe167d57c8f465d69d2f8fe7c4c24fd1393ed1377b27c36735066fbe1b71aeb6970e4e16ede2ed98f7143c602a4b3a091ad19f8b799dd3618639fb
+  data.tar.gz: da6cd485af116325a064b085d0533a0f895129de6a240129b233d1b9ea278df14a8a4a3931218b3ab34c87250fbd88df2a94a2177d0925a37458c97c8c88b348

data/.rubocop.yml

@@ -7,4 +7,4 @@ inherit_from:
 # ...
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5

data/lib/isodoc/iec/base_convert.rb

@@ -18,8 +18,8 @@ module IsoDoc
           s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @i18n.foreword }
           @meta.get[:doctype] == "Amendment" or
             s.div **attr_code(class: "boilerplate_legal") do |s1|
-            b&.elements&.each { |e| parse(e, s1) }
-          end
+              b&.elements&.each { |e| parse(e, s1) }
+            end
           f&.elements&.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
@@ -40,12 +40,12 @@ module IsoDoc
           @meta.get[:doctitlepartlabel] and
             title2 = "#{@meta.get[:doctitlepartlabel]}: #{title2}"
         end
-        out.p(**{ class: "zzSTDTitle1" }) do |p| 
+        out.p(**{ class: "zzSTDTitle1" }) do |p|
           p.b { |b| b << title1 }
         end
         if @meta.get[:doctitlepart]
           out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&nbsp;" }
-          out.p(**{ class: "zzSTDTitle2" }) do |p| 
+          out.p(**{ class: "zzSTDTitle2" }) do |p|
             p.b { |b| b << title2 }
           end
         end
@@ -58,7 +58,7 @@ module IsoDoc
 
       def biblio_list(f, div, biblio)
         return super unless @is_iev
-        i = 0
+
         f.children.each do |b|
           parse(b, div) unless %w(title bibitem).include? b.name
         end
@@ -66,6 +66,7 @@ module IsoDoc
 
       def terms_parse(node, out)
         return super unless @is_iev
+
         page_break(out)
         out.div **attr_code(id: node["id"]) do |div|
           out.p(**{ class: "zzSTDTitle2" }) do |p|
@@ -81,12 +82,14 @@ module IsoDoc
 
       def termref_cleanup(docxml)
         return super unless @is_iev
-        docxml.
-          gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, "; ").
-          gsub(/\[TERMREF\]\s*/, l10n("#{@i18n.source}: ")).
-          gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/, l10n(", #{@i18n.modified} [/TERMREF]")).
-          gsub(/\s*\[\/TERMREF\]\s*/, l10n("")).
-          gsub(/\s*\[MODIFICATION\]/, l10n(", #{@i18n.modified} &mdash; "))
+
+        docxml
+          .gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, "; ")
+          .gsub(/\[TERMREF\]\s*/, l10n("#{@i18n.source}: "))
+          .gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/,
+                l10n(", #{@i18n.modified} [/TERMREF]"))
+          .gsub(/\s*\[\/TERMREF\]\s*/, l10n(""))
+          .gsub(/\s*\[MODIFICATION\]/, l10n(", #{@i18n.modified} &mdash; "))
       end
 
       def set_termdomain(termdomain)
@@ -95,13 +98,15 @@ module IsoDoc
 
       def term_suffix(node, out)
         return unless @is_iev
+
         domain = node&.at(ns("../domain"))&.text
         return unless domain
+
         out << ", &lt;#{domain}&gt;"
       end
 
       def deprecated_term_parse(node, out)
-        out.p **{ class: "DeprecatedTerms", style:"text-align:left;" } do |p|
+        out.p **{ class: "DeprecatedTerms", style: "text-align:left;" } do |p|
           p << l10n("#{@i18n.deprecated}: ")
           node.children.each { |c| parse(c, p) }
           term_suffix(node, p)
@@ -109,7 +114,7 @@ module IsoDoc
       end
 
       def admitted_term_parse(node, out)
-        out.p **{ class: "AltTerms", style:"text-align:left;" } do |p|
+        out.p **{ class: "AltTerms", style: "text-align:left;" } do |p|
           node.children.each { |c| parse(c, p) }
           term_suffix(node, p)
         end
@@ -117,7 +122,8 @@ module IsoDoc
 
       def term_parse(node, out)
         return super unless @is_iev
-        out.p **{ class: "Terms", style:"text-align:left;" } do |p|
+
+        out.p **{ class: "Terms", style: "text-align:left;" } do |p|
           node.children.each { |c| parse(c, p) }
           term_suffix(node, p)
         end

data/lib/isodoc/iec/html_convert.rb

@@ -14,14 +14,14 @@ module IsoDoc
       def default_fonts(options)
         {
           bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' : '"Arial",sans-serif'),
-        headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' : '"Arial",sans-serif'),
-        monospacefont: ('"Courier New",monospace'),
-        monospacefontsize: "1.0em",
-        footnotefontsize: "0.9em",
+          headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' : '"Arial",sans-serif'),
+          monospacefont: '"Courier New",monospace',
+          monospacefontsize: "1.0em",
+          footnotefontsize: "0.9em",
         }
       end
 
-      def default_file_locations(options)
+      def default_file_locations(_options)
         @libdir = File.dirname(__FILE__)
         {
           htmlstylesheet: html_doc_path("htmlstyle.scss"),
@@ -30,7 +30,7 @@ module IsoDoc
         }
       end
 
-      def htmlstyle(docxml)
+      def htmlstyle(_docxml)
         docxml = super
         b = docxml.at("div[@class = 'boilerplate_legal']/ol")
         b and b["type"] = "1"

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

@@ -2694,7 +2694,7 @@
 		
 		
 		
-		
+
 	</xsl:attribute-set><xsl:attribute-set name="example-style">
 		
 		
@@ -2753,6 +2753,7 @@
 		
 		
 				
+				
 	</xsl:attribute-set><xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 			
@@ -2774,6 +2775,8 @@
 		
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
+		
 	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
 		
 		
@@ -2821,6 +2824,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
 		
 		
@@ -2864,10 +2868,12 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">		
 		
 				
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="quote-style">		
 		
 		
@@ -2930,6 +2936,7 @@
 		
 		
 		
+
 		
 		
 		
@@ -3007,6 +3014,8 @@
 		<xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="list-style">
+		
 	</xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -3060,11 +3069,11 @@
 		<xsl:variable name="table">
 	
 			<xsl:variable name="simple-table">	
-				<xsl:call-template name="getSimpleTable"/>			
+				<xsl:call-template name="getSimpleTable"/>
 			</xsl:variable>
 		
 			<!-- <xsl:if test="$namespace = 'bipm'">
-				<fo:block>&#xA0;</fo:block>				
+				<fo:block>&#xA0;</fo:block>
 			</xsl:if> -->
 			
 			<!-- $namespace = 'iso' or  -->
@@ -3174,6 +3183,7 @@
 					
 									
 					
+					
 				</xsl:variable>
 				
 				
@@ -3315,6 +3325,9 @@
 			<fo:block xsl:use-attribute-sets="table-name-style">
 				
 				
+				
+				
+				
 				<xsl:choose>
 					<xsl:when test="$continued = 'true'"> 
 						<!-- <xsl:if test="$namespace = 'bsi'"></xsl:if> -->
@@ -3462,6 +3475,7 @@
 		<!-- font-weight="bold" -->
 		<fo:table-header>
 			
+			
 			<xsl:apply-templates/>
 		</fo:table-header>
 	</xsl:template><xsl:template name="table-header-title">
@@ -3737,6 +3751,10 @@
 				
 				
 				
+				
+				
+				
+				
 				<!-- <xsl:if test="$namespace = 'bipm'">
 					<xsl:attribute name="height">8mm</xsl:attribute>
 				</xsl:if> -->
@@ -3841,6 +3859,9 @@
 			
 			
 			
+			
+			
+			
 			<xsl:if test=".//*[local-name() = 'table']">
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
@@ -4080,6 +4101,7 @@
 			
 			
 			
+			
 			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
 				
 				
@@ -4398,6 +4420,7 @@
 		
 		<fo:table-row>
 			
+			
 			<fo:table-cell>
 				
 				<fo:block margin-top="6pt">
@@ -4417,6 +4440,7 @@
 					
 					
 					
+					
 					<xsl:apply-templates/>
 					<!-- <xsl:if test="$namespace = 'gb'">
 						<xsl:if test="ancestor::*[local-name()='formula']">
@@ -4964,7 +4988,15 @@
 		<xsl:copy>
 			<xsl:apply-templates select="@*|node()" mode="mathml"/>
 		</xsl:copy>
-		<mathml:mspace width="0.5ex"/>
+		<xsl:choose>
+			<!-- if in msub, then don't add space -->
+			<xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
+			<!-- if next char in digit,  don't add space -->
+			<xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
+			<xsl:otherwise>
+				<mathml:mspace width="0.5ex"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target">
 			<xsl:choose>
@@ -4992,6 +5024,7 @@
 					<xsl:attribute name="color">blue</xsl:attribute>
 				</xsl:if>
 			
+			
 			<xsl:choose>
 				<xsl:when test="$target_text = ''">
 					<xsl:apply-templates/>
@@ -5143,6 +5176,7 @@
 		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'termnote']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">			
+			
 			<fo:inline xsl:use-attribute-sets="termnote-name-style">
 				
 				<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
@@ -5218,6 +5252,7 @@
 			</xsl:call-template>
 			
 			<fo:block>
+				
 				<xsl:apply-templates/>
 			</fo:block>
 			<xsl:call-template name="fn_display_figure"/>
@@ -5502,6 +5537,7 @@
 		<xsl:if test="normalize-space() != ''">			
 			<fo:block xsl:use-attribute-sets="figure-name-style">
 				
+				
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -5582,6 +5618,7 @@
 	
 		<fo:block-container margin-left="0mm">
 			<xsl:copy-of select="@id"/>
+			
 			<xsl:if test="parent::*[local-name() = 'note']">
 				<xsl:attribute name="margin-left">
 					<xsl:choose>
@@ -5592,7 +5629,9 @@
 				
 			</xsl:if>
 			<fo:block-container margin-left="0mm">
-	
+		
+				
+				
 				<fo:block xsl:use-attribute-sets="sourcecode-style">
 					<xsl:variable name="_font-size">
 						
@@ -5621,10 +5660,14 @@
 						</xsl:choose>
 					</xsl:attribute>
 				</xsl:if>
-					<xsl:apply-templates/>			
-				</fo:block>
+				
+				<xsl:apply-templates/>			
+			</fo:block>
+				
+			
 				<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
 				
+				
 			</fo:block-container>
 		</fo:block-container>
 	</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
@@ -5970,6 +6013,8 @@
 					
 					
 					
+					
+					
 						<xsl:call-template name="getTitle">
 							<xsl:with-param name="name" select="'title-source'"/>
 						</xsl:call-template>
@@ -6197,6 +6242,7 @@
 			<xsl:call-template name="setId"/>
 			
 			
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'definitions']">
@@ -6443,17 +6489,17 @@
 		<xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
 		<xsl:choose>
 			<xsl:when test="normalize-space($_doc_ident) != ''">
-				<xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
+				<!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
 				<xsl:if test="$type != '' and not(contains($_doc_ident, $type))">
 					<xsl:value-of select="$type"/><xsl:text> </xsl:text>
-				</xsl:if>
+				</xsl:if> -->
 				<xsl:value-of select="$_doc_ident"/>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]/@type"/>
+				<!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]/@type"/>
 				<xsl:if test="$type != ''">
 					<xsl:value-of select="$type"/><xsl:text> </xsl:text>
-				</xsl:if>
+				</xsl:if> -->
 				<xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]"/>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -6959,4 +7005,14 @@
 				<xsl:value-of select="$align"/>
 			</xsl:when>
 		</xsl:choose>
+	</xsl:template><xsl:template name="setTextAlignment">
+		<xsl:param name="default">left</xsl:param>
+		<xsl:attribute name="text-align">
+			<xsl:choose>
+				<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+				<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
+				<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
 	</xsl:template></xsl:stylesheet>

data/lib/isodoc/iec/metadata.rb

@@ -16,7 +16,7 @@ module IsoDoc
           unpublished(docstatus.text) and
             set(:stageabbr, docstatus["abbreviation"])
         end
-        revdate = isoxml.at(ns("//version/revision-date"))
+        revdate = isoxml.at(ns("//bibdata/version/revision-date"))
         set(:revdate, revdate&.text)
       end
 

data/lib/isodoc/iec/pdf_convert.rb

@@ -13,7 +13,7 @@ module IsoDoc
         super
       end
 
-      def pdf_stylesheet(docxml)
+      def pdf_stylesheet(_docxml)
         "iec.international-standard.xsl"
       end
     end

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -7,8 +7,8 @@ module IsoDoc
       def clause(docxml)
         docxml.xpath(ns("//clause[not(ancestor::annex)] | "\
                         "//definitions | //references | "\
-                        "//preface/introduction[clause]")).
-        each do |f|
+                        "//preface/introduction[clause]"))
+          .each do |f|
           clause1(f)
         end
         docxml.xpath(ns("//terms")).each do |f|
@@ -16,27 +16,28 @@ module IsoDoc
         end
       end
 
-      def termclause1(f)
-        return clause1(f) unless @is_iev
-        return if @suppressheadingnumbers || f["unnumbered"]
-        lbl = @xrefs.anchor(f['id'], :label, true) or return
-        prefix_name(f, " ", "#{lbl}#{clausedelim}", "title")
+      def termclause1(elem)
+        return clause1(elem) unless @is_iev
+        return if @suppressheadingnumbers || elem["unnumbered"]
+
+        lbl = @xrefs.anchor(elem["id"], :label, true) or return
+        prefix_name(elem, " ", "#{lbl}#{clausedelim}", "title")
       end
 
-      def clause1(f)
-        IsoDoc::PresentationXMLConvert.instance_method(:clause1).bind(self).
-          call(f)
+      def clause1(elem)
+        IsoDoc::PresentationXMLConvert.instance_method(:clause1).bind(self)
+          .call(elem)
       end
 
-      def bibdata_i18n(b)
+      def bibdata_i18n(bib)
         fr = IsoDoc::Iec::I18n.new("fr", "Latn")
         en = IsoDoc::Iec::I18n.new("en", "Latn")
         [{ lang: "en", i18n: en }, { lang: "fr", i18n: fr }].each do |v|
-          hash_translate(b, v[:i18n].get["doctype_dict"], "./ext/doctype", v[:lang])
-          hash_translate(b, v[:i18n].get["stage_dict"], "./status/stage", v[:lang])
-          hash_translate(b, v[:i18n].get["substage_dict"], "./status/substage", v[:lang])
-          hash_translate(b, v[:i18n].get["function_dict"], "./ext/function", v[:lang])
-          hash_translate(b, v[:i18n].get["horizontal_dict"], "./ext/horizontal", v[:lang])
+          { doctype_dict: "./ext/doctype", stage_dict: "./status/stage",
+            substage_dict: "./status/substage", function_dict: "./ext/function",
+            horizontal_dict: "./ext/horizontal" }.each do |lbl, xpath|
+              hash_translate(bib, v[:i18n].get[lbl.to_s], xpath, v[:lang])
+            end
         end
       end
 
@@ -44,4 +45,3 @@ module IsoDoc
     end
   end
 end
-