metanorma-ribose 1.7.11 → 1.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4423a7c71b556c5e8e1c55a7138d2ec726ce5cadf651399257673babd16c1028
-  data.tar.gz: 7ac8f96d06b7ab01133b964717a2adfc510c8b1244e269caffdd56877384652f
+  metadata.gz: 9e0b6229851d20c86d189c1df2d6441f87934af1f07414d4be2faddb5ca27a3a
+  data.tar.gz: 4da9b81ce4236372255702f0d4faf45aff59a61d8d09a260bd36ee4aacc5c142
 SHA512:
-  metadata.gz: ea7bebb996a4954622ee386c1d0a597475f7cfc3740bbfea9d9751a9d543cbe7b00fbc56b99c533aea12c9102721148583813b34d7088c5cb2005cd03694fd0a
-  data.tar.gz: 172b38f36ae63cd1de5d4555ae1c4dd9ead53f0ae522976e392f79d6c4594fc22ef1645f70df71b228297005ec2bf7e6f7f637de5bf1202dec2dee808ecd24d6
+  metadata.gz: 3159d509a3311d6f0fcb3e408519aa38fc1825694b3c4e867965ee8ef64a7040357d1f0c895b615aa04f14be0a257333ee5389d0082604c91cd550c4e7cbb115
+  data.tar.gz: a199158310f45541c93c37b297253dfabbfae1e71663d2de664b62f6bc30534acffc9533fe4e5b0d23c0319920fb2db539392500c2c0f45f88dd7a2de321b19c

data/lib/asciidoctor/ribose/isodoc.rng

@@ -1036,6 +1036,7 @@
       <ref name="svgmap"/>
       <ref name="inputform"/>
       <ref name="toc"/>
+      <ref name="passthrough"/>
     </choice>
   </define>
   <define name="toc">
@@ -1043,6 +1044,14 @@
       <ref name="ul"/>
     </element>
   </define>
+  <define name="passthrough">
+    <element name="passthrough">
+      <optional>
+        <attribute name="formats"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
   <define name="inputform">
     <element name="form">
       <attribute name="id">

data/lib/isodoc/ribose/ribose.standard.xsl

@@ -2064,13 +2064,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  -->
@@ -2083,13 +2090,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  -->
@@ -2101,6 +2128,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']">
@@ -4661,6 +4704,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']"/>
@@ -4765,7 +4815,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">		
@@ -5451,14 +5501,15 @@
 		</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) = ''">
 				<xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
 			</xsl:if>
 			
+				
 				<fo:inline>
 					
 					
@@ -5467,6 +5518,7 @@
 					
 					
 					
+					
 						<xsl:value-of select="$localized.source"/>
 						<xsl:text>: </xsl:text>
 					
@@ -5478,6 +5530,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>
@@ -5544,6 +5597,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}">
@@ -5556,7 +5612,9 @@
 							
 							
 						</xsl:if>
-
+						
+						
+						
 						<xsl:apply-templates/>
 					</fo:basic-link>
 							
@@ -6058,9 +6116,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/ribose/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ribose
-    VERSION = "1.7.11".freeze
+    VERSION = "1.7.12".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ribose
 version: !ruby/object:Gem::Version
-  version: 1.7.11
+  version: 1.7.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic