metanorma-itu 1.3.8 → 1.3.9

data/lib/isodoc/itu/itu.technical-report.xsl

@@ -1891,7 +1891,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:element name="{$element-name}">
-			<xsl:attribute name="font-family">Courier</xsl:attribute>
+			<xsl:attribute name="font-family">Courier New</xsl:attribute>
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
 			<xsl:if test="local-name(..) != 'dt' and not(ancestor::itu:dd) and not(ancestor::itu:title)">
 				<xsl:attribute name="text-align">center</xsl:attribute>
@@ -2505,7 +2505,7 @@
 		
 		
 		
-			<xsl:attribute name="font-family">Courier</xsl:attribute>			
+			<xsl:attribute name="font-family">Courier New</xsl:attribute>			
 			<xsl:attribute name="margin-top">6pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		
@@ -2589,6 +2589,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -3070,6 +3071,8 @@
 						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
 					</xsl:if>
 					
+					
+					
 					<xsl:choose>
 						<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
 							<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
@@ -3357,9 +3360,9 @@
 				<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
 					<xsl:with-param name="continued">true</xsl:with-param>
 				</xsl:apply-templates>
-				<xsl:for-each select="ancestor::*[local-name()='table'][1]">
-					<xsl:call-template name="fn_name_display"/>
-				</xsl:for-each>
+				
+				
+				
 				
 			</fo:table-cell>
 		</fo:table-row>
@@ -3445,7 +3448,11 @@
 		
 		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
 		
-		<xsl:if test="$isNoteOrFnExist = 'true'">
+		<xsl:variable name="isNoteOrFnExistShowAfterTable">
+			
+		</xsl:variable>
+		
+		<xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
 		
 			<xsl:variable name="cols-count">
 				<xsl:choose>
@@ -3603,6 +3610,19 @@
 		
 		</fo:table-body>
 		
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
+		<xsl:choose>
+			<xsl:when test="substring-after(., '—') != ''">
+				<xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="."/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
+		<xsl:apply-templates mode="presentation_name"/>
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
+		<xsl:apply-templates select="."/>
 	</xsl:template><xsl:template match="*[local-name()='tr']">
 		<xsl:variable name="parent-name" select="local-name(..)"/>
 		<!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
@@ -3801,18 +3821,12 @@
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template name="fn_display">
 		<xsl:variable name="references">
+			
 			<xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
-				<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
-					
-						<xsl:if test="ancestor::*[local-name()='preface']">
-							<xsl:attribute name="preface">true</xsl:attribute>
-						</xsl:if>
-					
-					
-					<xsl:apply-templates/>
-				</fn>
+				<xsl:call-template name="create_fn"/>
 			</xsl:for-each>
 		</xsl:variable>
+		
 		<xsl:for-each select="xalan:nodeset($references)//fn">
 			<xsl:variable name="reference" select="@reference"/>
 			<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
@@ -3860,6 +3874,16 @@
 				</fo:block>
 			</xsl:if>
 		</xsl:for-each>
+	</xsl:template><xsl:template name="create_fn">
+		<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
+			
+				<xsl:if test="ancestor::*[local-name()='preface']">
+					<xsl:attribute name="preface">true</xsl:attribute>
+				</xsl:if>
+			
+			
+			<xsl:apply-templates/>
+		</fn>
 	</xsl:template><xsl:template name="fn_name_display">
 		<!-- <xsl:variable name="references">
 			<xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
@@ -4880,19 +4904,6 @@
 			<!-- replace start and end spaces to non-break space -->
 			<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
 		</xsl:copy>
-	</xsl:template><xsl:template match="mathml:mi[. = ',' and not(following-sibling::*[1][local-name() = 'mtext' and text() = ' '])]" mode="mathml">
-		<xsl:copy>
-			<xsl:apply-templates select="@*|node()" mode="mathml"/>
-		</xsl:copy>
-		<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>
@@ -6080,7 +6091,19 @@
 			</fo:inline>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
-		<fo:inline><xsl:apply-templates/></fo:inline>
+		<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>
+			<xsl:otherwise>
+				<fo:inline><xsl:apply-templates/></fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'example']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
 			
@@ -6657,7 +6680,6 @@
 	</xsl:template><xsl:template name="processBibitem">
 		
 		
-		<!-- end BIPM bibitem processing-->
 		
 		 
 		

data/lib/isodoc/itu/metadata.rb

@@ -3,7 +3,6 @@ require "twitter_cldr"
 
 module IsoDoc
   module ITU
-
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, labels)
         super
@@ -96,10 +95,10 @@ module IsoDoc
         lbl = oblig == "informative" ? @labels["appendix"] : @labels["annex"]
         dn and set(:annexid, @i18n.l10n("#{lbl} #{dn&.text}"))
         dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/amendment")) and
-          set(:amendmentid, @i18n.l10n("#{@labels["amendment"]} #{dn&.text}"))
+          set(:amendmentid, @i18n.l10n("#{@labels['amendment']} #{dn&.text}"))
         dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/corrigendum")) and
           set(:corrigendumid,
-              @i18n.l10n("#{@labels["corrigendum"]} #{dn&.text}"))
+              @i18n.l10n("#{@labels['corrigendum']} #{dn&.text}"))
       end
 
       def unpublished(status)
@@ -114,13 +113,17 @@ module IsoDoc
         pubdate = isoxml.at(ns("//bibdata/date[not(@format)][@type = 'published']")) ||
           isoxml.at(ns("//bibdata/copyright/from"))
         pubdate and set(:placedate_year,
-                        @labels["placedate"].sub(/%/, pubdate.text.sub(/^(\d\d\d\d).*$/, "\\1")))
+                        @labels["placedate"].sub(/%/,
+                                                 pubdate.text.sub(
+                                                   /^(\d\d\d\d).*$/, "\\1"
+                                                 )))
       end
 
       def monthyr(isodate)
         m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
         return isodate unless m && m[:yr] && m[:mo]
-        return "#{m[:mo]}/#{m[:yr]}"
+
+        "#{m[:mo]}/#{m[:yr]}"
       end
 
       def keywords(isoxml, _out)
@@ -149,6 +152,7 @@ module IsoDoc
       def ddMMMYYYY(isodate)
         m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)-(?<dd>\d\d)/.match isodate
         return isodate unless m && m[:yr] && m[:mo] && m[:dd]
+
         mmm = DateTime.parse(isodate).localize(@lang.to_sym).to_additional_s("MMM")
         @i18n.l10n("#{m[:dd]} #{mmm} #{m[:yr]}")
       end
@@ -184,9 +188,15 @@ module IsoDoc
           set(:meeting, a)
           set(:meeting_acronym, a)
         end
-        a = isoxml&.at(ns("//bibdata/ext/meeting/@acronym"))&.text and set(:meeting_acronym, a)
-        a = isoxml&.at(ns("//bibdata/ext/meeting-place"))&.text and set(:meeting_place, a)
-        a = isoxml&.at(ns("//bibdata/ext/intended-type"))&.text and set(:intended_type, a)
+        a = isoxml&.at(ns("//bibdata/ext/meeting/@acronym"))&.text and set(
+          :meeting_acronym, a
+        )
+        a = isoxml&.at(ns("//bibdata/ext/meeting-place"))&.text and set(
+          :meeting_place, a
+        )
+        a = isoxml&.at(ns("//bibdata/ext/intended-type"))&.text and set(
+          :intended_type, a
+        )
         a = isoxml&.at(ns("//bibdata/ext/source"))&.text and set(:source, a)
         meeting(isoxml)
       end
@@ -197,7 +207,8 @@ module IsoDoc
           set(:meeting_date, resolution ? ddMMMMYYYY(o, nil) : ddMMMYYYY(o))
         elsif f = isoxml&.at(ns("//bibdata/ext/meeting-date/from"))&.text
           t = isoxml&.at(ns("//bibdata/ext/meeting-date/to"))&.text
-          set(:meeting_date, resolution ? ddMMMMYYYY(f, t) : "#{ddMMMYYYY(f)}/#{ddMMMYYYY(t)}")
+          set(:meeting_date,
+              resolution ? ddMMMMYYYY(f, t) : "#{ddMMMYYYY(f)}/#{ddMMMYYYY(t)}")
         end
       end
     end

data/lib/metanorma/itu/processor.rb

@@ -21,10 +21,10 @@ module Metanorma
       def fonts_manifest
         {
           "Arial" => nil,
-          "Courier" => nil,
           "Courier New" => nil,
           "Times New Roman" => nil,
           "Source Han Sans" => nil,
+          "Source Han Sans Normal" => nil,
           "STIX Two Math" => nil,
         }
       end

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.3.8".freeze
+    VERSION = "1.3.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities