metanorma-un 0.6.10 → 0.7.0

data/lib/isodoc/un/un.recommendation.xsl

@@ -1162,6 +1162,8 @@
 		
 		<title-list-figures lang="en">List of Figures</title-list-figures>
 		
+		<title-table-figures lang="en">Table of Figures</title-table-figures>
+		
 		<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
 		
 		<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
@@ -1434,6 +1436,11 @@
 		
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
+		
+		
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="note-p-style">
 		
 		
@@ -1594,13 +1601,20 @@
 		
 	</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:attribute-set><xsl:attribute-set name="toc-style">
+		<xsl:attribute name="line-height">135%</xsl:attribute>
+	</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="OLD_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"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']" mode="contents"/>
-	</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
+	</xsl:template><xsl:template name="processPrefaceSectionsDefault_Contents">
+		<xsl:for-each select="/*/*[local-name()='preface']/*">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="." mode="contents"/>
+		</xsl:for-each>
+	</xsl:template><xsl:template name="OLD_processMainSectionsDefault_Contents">
 		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" mode="contents"/>			
 		
 		<!-- Normative references  -->
@@ -1613,13 +1627,33 @@
 		<!-- Bibliography -->
 		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')] |       /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]" mode="contents"/>
 		
-	</xsl:template><xsl:template name="processPrefaceSectionsDefault">
+	</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
+		<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="." mode="contents"/>
+		</xsl:for-each>
+		
+		<xsl:for-each select="/*/*[local-name()='annex']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="." mode="contents"/>
+		</xsl:for-each>
+		
+		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="." mode="contents"/>
+		</xsl:for-each>
+	</xsl:template><xsl:template name="OLD_processPrefaceSectionsDefault">
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']"/>
-	</xsl:template><xsl:template name="processMainSectionsDefault">			
+	</xsl:template><xsl:template name="processPrefaceSectionsDefault">
+		<xsl:for-each select="/*/*[local-name()='preface']/*">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="."/>
+		</xsl:for-each>
+	</xsl:template><xsl:template name="OLD_processMainSectionsDefault">			
 		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/>
 		
 		<!-- Normative references  -->
@@ -1631,6 +1665,22 @@
 		<xsl:apply-templates select="/*/*[local-name()='annex']"/>
 		<!-- Bibliography -->
 		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"/>
+	</xsl:template><xsl:template name="processMainSectionsDefault">
+		<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="."/>
+			
+		</xsl:for-each>
+		
+		<xsl:for-each select="/*/*[local-name()='annex']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="."/>
+		</xsl:for-each>
+		
+		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="."/>
+		</xsl:for-each>
 	</xsl:template><xsl:template match="text()">
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="*[local-name()='br']">
@@ -2499,9 +2549,7 @@
 				
 				<!-- Table's note name (NOTE, for example) -->
 
-				<fo:inline padding-right="2mm">
-					
-				
+				<fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
 					
 					
 					
@@ -2516,6 +2564,7 @@
 						</xsl:if>
 					
 					
+					
 					<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 						
 				</fo:inline>
@@ -3121,6 +3170,8 @@
 			<xsl:if test="$font-size != ''">
 				<xsl:attribute name="font-size">
 					<xsl:choose>
+						<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
+						<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
 						<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
 						<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
 					</xsl:choose>
@@ -3937,6 +3988,7 @@
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="image-style">
 					
+					
 						<xsl:if test="ancestor::un:admonition">
 							<xsl:attribute name="margin-top">-12mm</xsl:attribute>
 							<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -4189,6 +4241,13 @@
 			</xsl:attribute>
 			<xsl:apply-templates mode="svg_update"/>
 		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][*[local-name() = 'svg']]" priority="3">
+		<xsl:variable name="name" select="ancestor::*[local-name() = 'figure']/*[local-name() = 'name']"/>
+		<xsl:for-each select="*[local-name() = 'svg']">
+			<xsl:call-template name="image_svg">
+				<xsl:with-param name="name" select="$name"/>
+			</xsl:call-template>
+		</xsl:for-each>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2">
 		<xsl:variable name="svg_content" select="document(@src)"/>
 		<xsl:variable name="name" select="ancestor::*[local-name() = 'figure']/*[local-name() = 'name']"/>
@@ -4293,7 +4352,7 @@
 			</fo:basic-link>
 		 </fo:block>
 	  </fo:block-container>
-	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">		
+	</xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">		
 		<xsl:apply-templates mode="contents"/>
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="bookmarks">		
@@ -4301,7 +4360,7 @@
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
 		<xsl:value-of select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="node()" mode="contents">
 		<xsl:apply-templates mode="contents"/>
@@ -4399,6 +4458,8 @@
 				
 				
 				
+				
+				
 			</fo:bookmark-tree>
 		</xsl:if>
 	</xsl:template><xsl:template name="insertFigureBookmarks">
@@ -4592,12 +4653,16 @@
 				<xsl:if test="$font-size != ''">
 					<xsl:attribute name="font-size">
 						<xsl:choose>
+							<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
+							<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
 							<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
 							<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
 						</xsl:choose>
 					</xsl:attribute>
 				</xsl:if>
 				
+				
+				
 				<xsl:apply-templates/>			
 			</fo:block>
 				
@@ -4950,6 +5015,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>
@@ -4978,8 +5044,8 @@
 		</xsl:if>
 	</xsl:template><xsl:variable name="localized.source">
 		<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">source</xsl:with-param>
-			</xsl:call-template>
+			<xsl:with-param name="key">source</xsl:with-param>
+		</xsl:call-template>
 	</xsl:variable><xsl:template match="*[local-name() = 'origin']">
 		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
 			<xsl:if test="normalize-space(@citeas) = ''">
@@ -4989,6 +5055,7 @@
 			<fo:inline xsl:use-attribute-sets="origin-style">
 				<xsl:apply-templates/>
 			</fo:inline>
+			
 			</fo:basic-link>
 	</xsl:template><xsl:template match="*[local-name() = 'modification']/*[local-name() = 'p']">
 		<fo:inline><xsl:apply-templates/></fo:inline>
@@ -5055,6 +5122,9 @@
 						
 					</xsl:if>	
 					
+					<xsl:variable name="citeas" select="java:replaceAll(java:java.lang.String.new(@citeas),'^\[?(.+?)\]?$','$1')"/> <!-- remove leading and trailing brackets -->
+					<xsl:variable name="text" select="normalize-space()"/>
+					
 					
             
 					<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
@@ -5067,7 +5137,9 @@
 							
 							
 						</xsl:if>
-
+						
+						
+						
 						<xsl:apply-templates/>
 					</fo:basic-link>
 							
@@ -5412,6 +5484,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
@@ -5580,9 +5653,97 @@
 		<fo:block-container border="1pt solid black" width="50%">
 			<fo:block> </fo:block>
 		</fo:block-container>
+	</xsl:template><xsl:template match="*[local-name() = 'toc']">
+		<xsl:param name="colwidths"/>
+		<xsl:variable name="colwidths_">
+			<xsl:choose>
+				<xsl:when test="not($colwidths)">
+					<xsl:variable name="toc_table_simple">
+						<tbody>
+							<xsl:apply-templates mode="toc_table_width"/>
+						</tbody>
+					</xsl:variable>
+					<xsl:variable name="cols-count" select="count(xalan:nodeset($toc_table_simple)/*/tr[1]/td)"/>
+					<xsl:call-template name="calculate-column-widths">
+						<xsl:with-param name="cols-count" select="$cols-count"/>
+						<xsl:with-param name="table" select="$toc_table_simple"/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:copy-of select="$colwidths"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<fo:block role="TOCI" space-after="16pt">
+			<fo:table width="100%" table-layout="fixed">
+				<xsl:for-each select="xalan:nodeset($colwidths_)/column">
+					<fo:table-column column-width="proportional-column-width({.})"/>
+				</xsl:for-each>
+				<fo:table-body>
+					<xsl:apply-templates/>
+				</fo:table-body>
+			</fo:table>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'li']">
+		<fo:table-row min-height="5mm">
+			<xsl:apply-templates/>
+		</fo:table-row>
+	</xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'li']/*[local-name() = 'p']">
+		<xsl:apply-templates/>
+	</xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'xref']" priority="3">
+		<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>&#8220;9th CGPM, 1948:<tab/>decision to establish the SI&#8221;</xref> -->
+		<xsl:variable name="target" select="@target"/>
+		<xsl:for-each select="*[local-name() = 'tab']">
+			<xsl:variable name="current_id" select="generate-id()"/>
+			<fo:table-cell>
+				<fo:block>
+					<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
+						<xsl:for-each select="following-sibling::node()[not(self::*[local-name() = 'tab']) and preceding-sibling::*[local-name() = 'tab'][1][generate-id() = $current_id]]">
+							<xsl:choose>
+								<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
+								<xsl:otherwise><xsl:apply-templates select="."/></xsl:otherwise>
+							</xsl:choose>
+						</xsl:for-each>
+					</fo:basic-link>
+				</fo:block>
+			</fo:table-cell>
+		</xsl:for-each>
+		<!-- last column - for page numbers -->
+		<fo:table-cell text-align="right" font-size="10pt" font-weight="bold" font-family="Arial">
+			<fo:block>
+				<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
+					<fo:page-number-citation ref-id="{$target}"/>
+				</fo:basic-link>
+			</fo:block>
+		</fo:table-cell>
+	</xsl:template><xsl:template match="*" mode="toc_table_width">
+		<xsl:apply-templates mode="toc_table_width"/>
+	</xsl:template><xsl:template match="*[local-name() = 'clause'][@type = 'toc']/*[local-name() = 'title']" mode="toc_table_width"/><xsl:template match="*[local-name() = 'clause'][not(@type = 'toc')]/*[local-name() = 'title']" mode="toc_table_width"/><xsl:template match="*[local-name() = 'li']" mode="toc_table_width">
+		<tr>
+			<xsl:apply-templates mode="toc_table_width"/>
+		</tr>
+	</xsl:template><xsl:template match="*[local-name() = 'xref']" mode="toc_table_width">
+		<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>&#8220;9th CGPM, 1948:<tab/>decision to establish the SI&#8221;</xref> -->
+		<xsl:for-each select="*[local-name() = 'tab']">
+			<xsl:variable name="current_id" select="generate-id()"/>
+			<td>
+				<xsl:for-each select="following-sibling::node()[not(self::*[local-name() = 'tab']) and preceding-sibling::*[local-name() = 'tab'][1][generate-id() = $current_id]]">
+					<xsl:copy-of select="."/>
+				</xsl:for-each>
+			</td>
+		</xsl:for-each>
+		<td>333</td> <!-- page number, just for fill -->
 	</xsl:template><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
 		<fo:inline padding-right="5mm"> </fo:inline>
 		<fo:inline><xsl:apply-templates/></fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'blacksquare']" name="blacksquare">
+		<fo:inline padding-right="2.5mm" baseline-shift="5%">
+			<fo:instream-foreign-object content-height="2mm" content-width="2mm" fox:alt-text="Quad">
+					<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" viewBox="0 0 2 2">
+						<rect x="0" y="0" width="2" height="2" fill="black"/>
+					</svg>
+				</fo:instream-foreign-object>	
+		</fo:inline>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>

data/lib/metanorma/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.6.10".freeze
+    VERSION = "0.7.0".freeze
   end
 end

data/metanorma-unece.gemspec

@@ -30,8 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "roman-numerals"
   spec.add_dependency "twitter_cldr"
 
-  spec.add_dependency "isodoc", "~> 1.7.0"
-  spec.add_dependency "metanorma-standoc", "~> 1.10.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.11.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-un
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -52,34 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: isodoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Metanorma for UN.