metanorma-m3aawg 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 520661f46047c4c0f2a11a5485a3b562d9c97f8c472c00c126ca2538c6d793ee
-  data.tar.gz: 3f2f195f6f220741ac8a64880c1d494676851478b69883318fc93a4f364c8203
+  metadata.gz: 9518c9b0243d2af6756c53c9e8c7ca134f47a27e8c1a7f3853e64afe5356c683
+  data.tar.gz: 2ed5fda8227b7437f18bf8e2c3d3e79a78d1d1991e011498fdd3f5c79ced59c7
 SHA512:
-  metadata.gz: 24da8605761b7e73c21a02c826818445428aba6db28227499cb361df4728e568966684d20a3e3324cd326adda656178be640c874fec970cdb2a1c9663a9b6634
-  data.tar.gz: 7addc8e4535ec7e32f2365e823c756b6ca6c0830eccf497c23fd7dcf9f75d35fea17360c28303726015295d5c1326454b9e039f7e9698668cd96f26f6ce1eafd
+  metadata.gz: 6918e142b7feb406bb74ce70ecb8c1b44ebc4cba50db0294e996f60abc75d671044acc10242ca73b455fba4fc3a2bbc5f71a67c19814094d014a26c35f820aa6
+  data.tar.gz: 93b117b5c02bed144d6cbf4a014525c3dfa946f4e6aef6288d251554d85fe534dbef17c75083dfde1d3d8d960a3aa558625166623737efb08a2d37a2314822f9

data/lib/isodoc/m3aawg/html/htmlstyle.css

@@ -138,6 +138,35 @@ a.FootnoteRef + a.FootnoteRef:before {
   color: red;
   text-decoration: line-through; }
 
+/* code highlighting with line numbers */
+table.rouge-line-table td.rouge-gutter {
+  -moz-user-select: none;
+  -ms-user-select: none;
+  -webkit-user-select: none;
+  user-select: none;
+  padding-right: 1em; }
+
+table.rouge-line-table td.rouge-code {
+  -moz-user-select: all;
+  -ms-user-select: all;
+  -webkit-user-select: all;
+  user-select: all; }
+
+table.rouge-line-table,
+table.rouge-line-table th,
+table.rouge-line-table td {
+  width: auto;
+  border: none;
+  margin: 0;
+  padding: 0;
+  font-size: 100%; }
+
+table.rouge-line-table pre {
+  margin: 0;
+  padding: 0;
+  overflow-x: visible;
+  font-size: 100%; }
+
 #standard-band {
   background-color: #0AC442; }
 
@@ -800,7 +829,7 @@ table {
   table th, table td {
     padding: 1em; }
   table td.header {
-    font-weigth: 400; }
+    font-weight: 400; }
   table th,
   table td {
     border: none !important;

data/lib/isodoc/m3aawg/m3aawg.policy.xsl

@@ -2,7 +2,7 @@
 
 	<xsl:output method="xml" encoding="UTF-8" indent="no"/>
 
-	<xsl:key name="kfn" match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])]" use="@reference"/>
+	<xsl:key name="kfn" match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure' or local-name() = 'localized-strings')] and not(ancestor::*[local-name() = 'name']))]" use="@reference"/>
 
 	<xsl:variable name="debug">false</xsl:variable>
 
@@ -3198,7 +3198,7 @@
 		</fn>
 	-->
 	<!-- footnotes in text (title, bibliography, main body, table's, figure's names), not for tables, figures -->
-	<xsl:template match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])]" priority="2" name="fn">
+	<xsl:template match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure')] and not(ancestor::*[local-name() = 'name']))]" priority="2" name="fn">
 
 		<!-- list of footnotes to calculate actual footnotes number -->
 		<xsl:variable name="p_fn_">
@@ -3255,8 +3255,7 @@
 				</fo:basic-link>
 			</fo:inline>
 		</xsl:variable>
-		<!-- DEBUG: p_fn=<xsl:copy-of select="$p_fn"/>
-		gen_id=<xsl:value-of select="$gen_id"/> -->
+
 		<xsl:choose>
 			<xsl:when test="normalize-space(@skip_footnote_body) = 'true'">
 				<xsl:copy-of select="$footnote_inline"/>
@@ -3311,7 +3310,7 @@
 					<!-- commented:
 					 .//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] |
 					 because 'fn' there is in biblio-tag -->
-					<xsl:for-each select=".//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
+					<xsl:for-each select=".//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure')] and not(ancestor::*[local-name() = 'name']))][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
 						<!-- copy unique fn -->
 						<fn gen_id="{generate-id(.)}">
 							<xsl:copy-of select="@*"/>
@@ -5858,7 +5857,9 @@
 
 									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $width_effective, $height_effective)"/>
 									<xsl:if test="number($scale) &lt; 100">
-										<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+
+												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+
 									</xsl:if>
 
 								</xsl:if>
@@ -6871,6 +6872,12 @@
 								</xsl:attribute>
 							</xsl:for-each>
 
+							<!-- remove margin between rows in the table with sourcecode line numbers -->
+							<xsl:if test="ancestor::*[local-name() = 'sourcecode'][@linenums = 'true'] and ancestor::*[local-name() = 'tr'][1]/following-sibling::*[local-name() = 'tr']">
+								<xsl:attribute name="margin-top">0pt</xsl:attribute>
+								<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+							</xsl:if>
+
 							<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
 						</fo:block>
 
@@ -6919,7 +6926,7 @@
 	</xsl:template>
 
 	<!-- outer table with line numbers for sourcecode -->
-	<xsl:template match="*[local-name()='table'][@type = 'sourcecode']" priority="2">
+	<xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] |  -->
 		<fo:block>
 			<fo:table width="100%" table-layout="fixed">
 				<xsl:copy-of select="@id"/>
@@ -6931,16 +6938,16 @@
 			</fo:table>
 		</fo:block>
 	</xsl:template>
-	<xsl:template match="*[local-name()='table'][@type = 'sourcecode']/*[local-name() = 'tbody']" priority="2">
+	<xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']/*[local-name() = 'tbody']" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode']/*[local-name() = 'tbody'] |  -->
 		<xsl:apply-templates/>
 	</xsl:template>
-	<xsl:template match="*[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr']" priority="2">
+	<xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr'] |  -->
 		<fo:table-row>
 			<xsl:apply-templates/>
 		</fo:table-row>
 	</xsl:template>
 	<!-- first td with line numbers -->
-	<xsl:template match="*[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr']/*[local-name()='td'][not(preceding-sibling::*)]" priority="2">
+	<xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']/*[local-name()='td'][not(preceding-sibling::*)]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
 		<fo:table-cell>
 			<fo:block>
 
@@ -6960,8 +6967,9 @@
 			</fo:block>
 		</fo:table-cell>
 	</xsl:template>
+
 	<!-- second td with sourcecode -->
-	<xsl:template match="*[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr']/*[local-name()='td'][preceding-sibling::*]" priority="2">
+	<xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']/*[local-name()='td'][preceding-sibling::*]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
 		<fo:table-cell>
 			<fo:block>
 				<xsl:apply-templates/>
@@ -7199,7 +7207,25 @@
 	<xsl:template match="*[local-name()='pre']" name="pre">
 		<fo:block xsl:use-attribute-sets="pre-style">
 			<xsl:copy-of select="@id"/>
-			<xsl:apply-templates/>
+			<xsl:choose>
+
+				<xsl:when test="ancestor::*[local-name() = 'sourcecode'][@linenums = 'true'] and ancestor::*[local-name()='td'][1][not(preceding-sibling::*)]"> <!-- pre in the first td in the table with @linenums = 'true' -->
+					<xsl:if test="ancestor::*[local-name() = 'tr'][1]/following-sibling::*[local-name() = 'tr']"> <!-- is current tr isn't last -->
+						<xsl:attribute name="margin-top">0pt</xsl:attribute>
+						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+					</xsl:if>
+					<fo:instream-foreign-object fox:alt-text="{.}" content-width="95%">
+						<math xmlns="http://www.w3.org/1998/Math/MathML">
+							<mtext><xsl:value-of select="."/></mtext>
+						</math>
+					</fo:instream-foreign-object>
+				</xsl:when>
+
+				<xsl:otherwise>
+					<xsl:apply-templates/>
+				</xsl:otherwise>
+
+			</xsl:choose>
 		</fo:block>
 	</xsl:template>
 	<!-- =============== -->

data/lib/isodoc/m3aawg/m3aawg.report.xsl

@@ -2,7 +2,7 @@
 
 	<xsl:output method="xml" encoding="UTF-8" indent="no"/>
 
-	<xsl:key name="kfn" match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])]" use="@reference"/>
+	<xsl:key name="kfn" match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure' or local-name() = 'localized-strings')] and not(ancestor::*[local-name() = 'name']))]" use="@reference"/>
 
 	<xsl:variable name="debug">false</xsl:variable>
 
@@ -3198,7 +3198,7 @@
 		</fn>
 	-->
 	<!-- footnotes in text (title, bibliography, main body, table's, figure's names), not for tables, figures -->
-	<xsl:template match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])]" priority="2" name="fn">
+	<xsl:template match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure')] and not(ancestor::*[local-name() = 'name']))]" priority="2" name="fn">
 
 		<!-- list of footnotes to calculate actual footnotes number -->
 		<xsl:variable name="p_fn_">
@@ -3255,8 +3255,7 @@
 				</fo:basic-link>
 			</fo:inline>
 		</xsl:variable>
-		<!-- DEBUG: p_fn=<xsl:copy-of select="$p_fn"/>
-		gen_id=<xsl:value-of select="$gen_id"/> -->
+
 		<xsl:choose>
 			<xsl:when test="normalize-space(@skip_footnote_body) = 'true'">
 				<xsl:copy-of select="$footnote_inline"/>
@@ -3311,7 +3310,7 @@
 					<!-- commented:
 					 .//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] |
 					 because 'fn' there is in biblio-tag -->
-					<xsl:for-each select=".//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
+					<xsl:for-each select=".//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure')] and not(ancestor::*[local-name() = 'name']))][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
 						<!-- copy unique fn -->
 						<fn gen_id="{generate-id(.)}">
 							<xsl:copy-of select="@*"/>
@@ -5858,7 +5857,9 @@
 
 									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $width_effective, $height_effective)"/>
 									<xsl:if test="number($scale) &lt; 100">
-										<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+
+												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+
 									</xsl:if>
 
 								</xsl:if>
@@ -6871,6 +6872,12 @@
 								</xsl:attribute>
 							</xsl:for-each>
 
+							<!-- remove margin between rows in the table with sourcecode line numbers -->
+							<xsl:if test="ancestor::*[local-name() = 'sourcecode'][@linenums = 'true'] and ancestor::*[local-name() = 'tr'][1]/following-sibling::*[local-name() = 'tr']">
+								<xsl:attribute name="margin-top">0pt</xsl:attribute>
+								<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+							</xsl:if>
+
 							<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
 						</fo:block>
 
@@ -6919,7 +6926,7 @@
 	</xsl:template>
 
 	<!-- outer table with line numbers for sourcecode -->
-	<xsl:template match="*[local-name()='table'][@type = 'sourcecode']" priority="2">
+	<xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] |  -->
 		<fo:block>
 			<fo:table width="100%" table-layout="fixed">
 				<xsl:copy-of select="@id"/>
@@ -6931,16 +6938,16 @@
 			</fo:table>
 		</fo:block>
 	</xsl:template>
-	<xsl:template match="*[local-name()='table'][@type = 'sourcecode']/*[local-name() = 'tbody']" priority="2">
+	<xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']/*[local-name() = 'tbody']" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode']/*[local-name() = 'tbody'] |  -->
 		<xsl:apply-templates/>
 	</xsl:template>
-	<xsl:template match="*[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr']" priority="2">
+	<xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr'] |  -->
 		<fo:table-row>
 			<xsl:apply-templates/>
 		</fo:table-row>
 	</xsl:template>
 	<!-- first td with line numbers -->
-	<xsl:template match="*[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr']/*[local-name()='td'][not(preceding-sibling::*)]" priority="2">
+	<xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']/*[local-name()='td'][not(preceding-sibling::*)]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
 		<fo:table-cell>
 			<fo:block>
 
@@ -6960,8 +6967,9 @@
 			</fo:block>
 		</fo:table-cell>
 	</xsl:template>
+
 	<!-- second td with sourcecode -->
-	<xsl:template match="*[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr']/*[local-name()='td'][preceding-sibling::*]" priority="2">
+	<xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']/*[local-name()='td'][preceding-sibling::*]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
 		<fo:table-cell>
 			<fo:block>
 				<xsl:apply-templates/>
@@ -7199,7 +7207,25 @@
 	<xsl:template match="*[local-name()='pre']" name="pre">
 		<fo:block xsl:use-attribute-sets="pre-style">
 			<xsl:copy-of select="@id"/>
-			<xsl:apply-templates/>
+			<xsl:choose>
+
+				<xsl:when test="ancestor::*[local-name() = 'sourcecode'][@linenums = 'true'] and ancestor::*[local-name()='td'][1][not(preceding-sibling::*)]"> <!-- pre in the first td in the table with @linenums = 'true' -->
+					<xsl:if test="ancestor::*[local-name() = 'tr'][1]/following-sibling::*[local-name() = 'tr']"> <!-- is current tr isn't last -->
+						<xsl:attribute name="margin-top">0pt</xsl:attribute>
+						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+					</xsl:if>
+					<fo:instream-foreign-object fox:alt-text="{.}" content-width="95%">
+						<math xmlns="http://www.w3.org/1998/Math/MathML">
+							<mtext><xsl:value-of select="."/></mtext>
+						</math>
+					</fo:instream-foreign-object>
+				</xsl:when>
+
+				<xsl:otherwise>
+					<xsl:apply-templates/>
+				</xsl:otherwise>
+
+			</xsl:choose>
 		</fo:block>
 	</xsl:template>
 	<!-- =============== -->

data/lib/metanorma/m3aawg/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module M3AAWG
-    VERSION = "2.2.1".freeze
+    VERSION = "2.2.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3aawg
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2022-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities