metanorma-iso 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81070b729e77856b0d083c3be2d81856202fd3040a8fed0e62873144b9eefcec
-  data.tar.gz: 51d711e98ec5b9b998bf5e8efbddd2d1fafc726f2144b4a87cf6386b78d7c69e
+  metadata.gz: d0647a3daea24684073cb1e71bfbf231e56357153263b8722aad8bae15198743
+  data.tar.gz: 5ba4f09cba4bfe26b99f001b001cda9884df2bea21d8f81a8807df8528dcd2b2
 SHA512:
-  metadata.gz: 725b067fa1e85403afd5645149652b3047ec4bda0587ceee1da3613165c80547110c23a2225154f13ee3ed8bfe84a57f0fe5cd9e2a5b6f368e71e195877d5bb4
-  data.tar.gz: 1c9fede3fbdc0d623c02d247298d4dde37d96b1ac3051620f3aa167ebb2949268b5d1c3447e28533da1f48b23506b68f93a7adfdaa5c9713ba0dae065d369b6a
+  metadata.gz: 45a6c71aafc32fdb25ea35bfa95d5381a81ae5e21d2888d9ba65fb5c2789d7e770bb20cdf35765755251d725d6d84ffa7a85563d58acf216d0530f700b19f0ba
+  data.tar.gz: a77b5942e043bce247b7911746f7a7dd2ffc949761c22d696686ca4a9d8872835030b1cab3c833d277814cee24cb8e0d4c019f6f99d3f1bd960ab7ad7705d43b

data/Gemfile.devel

@@ -0,0 +1,2 @@
+#gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "main"
+

data/lib/isodoc/iso/html/style-human.css

@@ -935,6 +935,9 @@ td,
 th {
   padding: 1em !important; }
 
+table.rouge-line-table td, table.rouge-line-table th {
+  padding: 0em !important; }
+
 p.TableTitle {
   text-align: center;
   margin-top: 2.5em;

data/lib/isodoc/iso/html/style-human.scss

@@ -591,6 +591,10 @@ th {
     padding: 1em !important;
 }
 
+table.rouge-line-table td, table.rouge-line-table th {
+    padding: 0em !important;
+}
+
 p.TableTitle {
     text-align: center;
     margin-top: 2.5em;

data/lib/isodoc/iso/html/style-iso.css

@@ -971,6 +971,9 @@ td,
 th {
   padding: 1em !important; }
 
+table.rouge-line-table td, table.rouge-line-table th {
+  padding: 0em !important; }
+
 td > p:first-child, th > p:first-child {
   margin-top: 0em; }
 

data/lib/isodoc/iso/html/style-iso.scss

@@ -617,6 +617,10 @@ th {
     padding: 1em !important;
 }
 
+table.rouge-line-table td, table.rouge-line-table th {
+    padding: 0em !important;
+}
+
 td > p:first-child, th > p:first-child {
   margin-top: 0em;
 }

data/lib/isodoc/iso/html/wordstyle-dis.css

@@ -1910,10 +1910,10 @@ p.TOCTitle, li.TOCTitle, div.TOCTitle {
   margin: 39.7pt 53.85pt 1.0cm 53.85pt;
   mso-header-margin: 35.45pt;
   mso-footer-margin: 14.2pt;
-  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh1;
-  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1;
-  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1;
-  mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f1;
+  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1;
+  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1;
+  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ff1;
+  mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") ff1;
   mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1;
   mso-first-footer: url("file:///C:/Doc/FILENAME_files/header.html") ff1;
   mso-paper-source: 0; }

data/lib/isodoc/iso/html/wordstyle-dis.scss

@@ -1809,10 +1809,10 @@ p.TOCTitle, li.TOCTitle, div.TOCTitle
 	margin:39.7pt 53.85pt 1.0cm 53.85pt;
 	mso-header-margin:35.45pt;
 	mso-footer-margin:14.2pt;
-	mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh1;
-	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
-	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
-	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f1;
+	mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1;
+	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1;
+	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff1;
+	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff1;
 	mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1;
 	mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff1;
 	mso-paper-source:0;}

data/lib/isodoc/iso/iso.amendment.xsl

@@ -1974,12 +1974,16 @@
 			<xsl:attribute name="text-align">
 				<xsl:choose>
 					<!-- <xsl:when test="ancestor::iso:preface">justify</xsl:when> -->
-					<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+					<xsl:when test="@align = 'justified'">justify</xsl:when>
+					<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
 					<xsl:when test="ancestor::iso:td/@align"><xsl:value-of select="ancestor::iso:td/@align"/></xsl:when>
 					<xsl:when test="ancestor::iso:th/@align"><xsl:value-of select="ancestor::iso:th/@align"/></xsl:when>
 					<xsl:otherwise>justify</xsl:otherwise><!-- left -->
 				</xsl:choose>
 			</xsl:attribute>
+			<xsl:if test="@align = 'indent'">
+				<xsl:attribute name="margin-left">7mm</xsl:attribute>
+			</xsl:if>
 			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
 			<xsl:if test="count(ancestor::iso:li) = 1 and not(ancestor::iso:li[1]/following-sibling::iso:li) and not(following-sibling::iso:p)">
 				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
@@ -2326,14 +2330,14 @@
 	BUT DON'T put any another conditions together with $namespace = '...' (such conditions will be ignored). For another conditions, please use nested xsl:if or xsl:choose -->
 
 	<!--
-	<misc-container>
+	<metanorma-extension>
 		<presentation-metadata>
 			<papersize>letter</papersize>
 		</presentation-metadata>
-	</misc-container>
+	</metanorma-extension>
 	-->
 
-	<xsl:variable name="papersize" select="java:toLowerCase(java:java.lang.String.new(normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata']/*[local-name() = 'papersize'])))"/>
+	<xsl:variable name="papersize" select="java:toLowerCase(java:java.lang.String.new(normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata']/*[local-name() = 'papersize'])))"/>
 	<xsl:variable name="papersize_width_">
 		<xsl:choose>
 			<xsl:when test="$papersize = 'letter'">215.9</xsl:when>
@@ -2454,7 +2458,7 @@
 	<xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
 
 	<xsl:variable name="title-list-tables">
-		<xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
+		<xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
 		<xsl:value-of select="$toc_table_title"/>
 		<xsl:if test="normalize-space($toc_table_title) = ''">
 			<xsl:call-template name="getTitle">
@@ -2464,7 +2468,7 @@
 	</xsl:variable>
 
 	<xsl:variable name="title-list-figures">
-		<xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
+		<xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
 		<xsl:value-of select="$toc_figure_title"/>
 		<xsl:if test="normalize-space($toc_figure_title) = ''">
 			<xsl:call-template name="getTitle">
@@ -2474,7 +2478,7 @@
 	</xsl:variable>
 
 	<xsl:variable name="title-list-recommendations">
-		<xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
+		<xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
 		<xsl:value-of select="$toc_requirement_title"/>
 		<xsl:if test="normalize-space($toc_requirement_title) = ''">
 			<xsl:call-template name="getTitle">
@@ -2546,7 +2550,7 @@
 		<xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
 
 		<xsl:variable name="additional_fonts_">
-			<xsl:for-each select="//*[contains(local-name(), '-standard')][1]/*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value'] |       //*[contains(local-name(), '-standard')][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']">
+			<xsl:for-each select="//*[contains(local-name(), '-standard')][1]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value'] |       //*[contains(local-name(), '-standard')][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']">
 				<xsl:value-of select="."/><xsl:if test="position() != last()">, </xsl:if>
 			</xsl:for-each>
 		</xsl:variable>
@@ -3655,10 +3659,10 @@
 
 	<xsl:template name="processTablesFigures_Contents">
 		<xsl:param name="always"/>
-		<xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
+		<xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
 			<xsl:call-template name="processTables_Contents"/>
 		</xsl:if>
-		<xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
+		<xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
 			<xsl:call-template name="processFigures_Contents"/>
 		</xsl:if>
 	</xsl:template>
@@ -3966,6 +3970,9 @@
 					<xsl:if test="not(*[local-name() = 'name'])">
 						<xsl:attribute name="margin-top">12pt</xsl:attribute>
 					</xsl:if>
+					<xsl:if test="starts-with(@id, 'array_')">
+						<xsl:attribute name="margin-top">6pt</xsl:attribute>
+					</xsl:if>
 
 				<!-- end table block-container attributes -->
 
@@ -3996,6 +4003,8 @@
 								<xsl:attribute name="border"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
 							</xsl:if>
 
+						<xsl:call-template name="setBordersTableArray"/>
+
 					</xsl:element>
 				</xsl:variable>
 
@@ -4140,6 +4149,15 @@
 
 	</xsl:template>
 
+	<xsl:template name="setBordersTableArray">
+
+			<xsl:if test="starts-with(@id, 'array_') or starts-with(ancestor::*[local-name() = 'table'][1]/@id, 'array_')">
+				<!-- array - table without borders -->
+				<xsl:attribute name="border">none</xsl:attribute>
+			</xsl:if>
+
+	</xsl:template>
+
 	<xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
 		<xsl:param name="continued"/>
 		<xsl:if test="normalize-space() != ''">
@@ -4642,6 +4660,8 @@
 						<fo:table-row>
 							<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
 
+								<xsl:call-template name="setBordersTableArray"/>
+
 								<!-- fn will be processed inside 'note' processing -->
 
 								<!-- for BSI (not PAS) display Notes before footnotes -->
@@ -4818,6 +4838,8 @@
 					</xsl:when>
 				</xsl:choose>
 
+			<xsl:call-template name="setBordersTableArray"/>
+
 			<xsl:call-template name="setTableRowAttributes"/>
 
 			<xsl:apply-templates/>
@@ -4845,6 +4867,8 @@
 					<xsl:attribute name="border-top"><xsl:value-of select="$table-border"/></xsl:attribute>
 				</xsl:if>
 
+			<xsl:call-template name="setBordersTableArray"/>
+
 			<xsl:call-template name="setTableRowAttributes"/>
 			<xsl:apply-templates/>
 		</fo:table-row>
@@ -4869,6 +4893,8 @@
 					<xsl:attribute name="border-bottom"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
 				</xsl:if>
 
+			<xsl:call-template name="setBordersTableArray"/>
+
 			<xsl:if test="$lang = 'ar'">
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
@@ -4932,6 +4958,8 @@
 				</xsl:if>
 				<!-- <xsl:attribute name="page-break-inside">avoid</xsl:attribute> -->
 
+			<xsl:call-template name="setBordersTableArray"/>
+
 			<xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table -->
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
@@ -8675,7 +8703,7 @@
 	<!-- sourcecode  -->
 	<!-- =============== -->
 
-	<xsl:variable name="source-highlighter-css_" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'source-highlighter-css']"/>
+	<xsl:variable name="source-highlighter-css_" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'source-highlighter-css']"/>
 	<xsl:variable name="sourcecode_css_" select="java:org.metanorma.fop.Util.parseCSS($source-highlighter-css_)"/>
 	<xsl:variable name="sourcecode_css" select="xalan:nodeset($sourcecode_css_)"/>
 
@@ -10741,8 +10769,8 @@
 
 	<xsl:variable name="toc_level">
 		<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
-		<xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels  Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
-		<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
+		<xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels  Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
+		<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
 		<xsl:choose>
 			<xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
 			<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when>  <!-- if there is value in xml -->
@@ -11846,6 +11874,7 @@
 			<xsl:choose>
 				<xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
 				<xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
+				<xsl:when test="$align = 'justified'">justify</xsl:when>
 				<xsl:when test="$align != '' and not($align = 'indent')"><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>

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

@@ -1974,12 +1974,16 @@
 			<xsl:attribute name="text-align">
 				<xsl:choose>
 					<!-- <xsl:when test="ancestor::iso:preface">justify</xsl:when> -->
-					<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+					<xsl:when test="@align = 'justified'">justify</xsl:when>
+					<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
 					<xsl:when test="ancestor::iso:td/@align"><xsl:value-of select="ancestor::iso:td/@align"/></xsl:when>
 					<xsl:when test="ancestor::iso:th/@align"><xsl:value-of select="ancestor::iso:th/@align"/></xsl:when>
 					<xsl:otherwise>justify</xsl:otherwise><!-- left -->
 				</xsl:choose>
 			</xsl:attribute>
+			<xsl:if test="@align = 'indent'">
+				<xsl:attribute name="margin-left">7mm</xsl:attribute>
+			</xsl:if>
 			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
 			<xsl:if test="count(ancestor::iso:li) = 1 and not(ancestor::iso:li[1]/following-sibling::iso:li) and not(following-sibling::iso:p)">
 				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
@@ -2326,14 +2330,14 @@
 	BUT DON'T put any another conditions together with $namespace = '...' (such conditions will be ignored). For another conditions, please use nested xsl:if or xsl:choose -->
 
 	<!--
-	<misc-container>
+	<metanorma-extension>
 		<presentation-metadata>
 			<papersize>letter</papersize>
 		</presentation-metadata>
-	</misc-container>
+	</metanorma-extension>
 	-->
 
-	<xsl:variable name="papersize" select="java:toLowerCase(java:java.lang.String.new(normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata']/*[local-name() = 'papersize'])))"/>
+	<xsl:variable name="papersize" select="java:toLowerCase(java:java.lang.String.new(normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata']/*[local-name() = 'papersize'])))"/>
 	<xsl:variable name="papersize_width_">
 		<xsl:choose>
 			<xsl:when test="$papersize = 'letter'">215.9</xsl:when>
@@ -2454,7 +2458,7 @@
 	<xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
 
 	<xsl:variable name="title-list-tables">
-		<xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
+		<xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
 		<xsl:value-of select="$toc_table_title"/>
 		<xsl:if test="normalize-space($toc_table_title) = ''">
 			<xsl:call-template name="getTitle">
@@ -2464,7 +2468,7 @@
 	</xsl:variable>
 
 	<xsl:variable name="title-list-figures">
-		<xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
+		<xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
 		<xsl:value-of select="$toc_figure_title"/>
 		<xsl:if test="normalize-space($toc_figure_title) = ''">
 			<xsl:call-template name="getTitle">
@@ -2474,7 +2478,7 @@
 	</xsl:variable>
 
 	<xsl:variable name="title-list-recommendations">
-		<xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
+		<xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
 		<xsl:value-of select="$toc_requirement_title"/>
 		<xsl:if test="normalize-space($toc_requirement_title) = ''">
 			<xsl:call-template name="getTitle">
@@ -2546,7 +2550,7 @@
 		<xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
 
 		<xsl:variable name="additional_fonts_">
-			<xsl:for-each select="//*[contains(local-name(), '-standard')][1]/*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value'] |       //*[contains(local-name(), '-standard')][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']">
+			<xsl:for-each select="//*[contains(local-name(), '-standard')][1]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value'] |       //*[contains(local-name(), '-standard')][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']">
 				<xsl:value-of select="."/><xsl:if test="position() != last()">, </xsl:if>
 			</xsl:for-each>
 		</xsl:variable>
@@ -3655,10 +3659,10 @@
 
 	<xsl:template name="processTablesFigures_Contents">
 		<xsl:param name="always"/>
-		<xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
+		<xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
 			<xsl:call-template name="processTables_Contents"/>
 		</xsl:if>
-		<xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
+		<xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
 			<xsl:call-template name="processFigures_Contents"/>
 		</xsl:if>
 	</xsl:template>
@@ -3966,6 +3970,9 @@
 					<xsl:if test="not(*[local-name() = 'name'])">
 						<xsl:attribute name="margin-top">12pt</xsl:attribute>
 					</xsl:if>
+					<xsl:if test="starts-with(@id, 'array_')">
+						<xsl:attribute name="margin-top">6pt</xsl:attribute>
+					</xsl:if>
 
 				<!-- end table block-container attributes -->
 
@@ -3996,6 +4003,8 @@
 								<xsl:attribute name="border"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
 							</xsl:if>
 
+						<xsl:call-template name="setBordersTableArray"/>
+
 					</xsl:element>
 				</xsl:variable>
 
@@ -4140,6 +4149,15 @@
 
 	</xsl:template>
 
+	<xsl:template name="setBordersTableArray">
+
+			<xsl:if test="starts-with(@id, 'array_') or starts-with(ancestor::*[local-name() = 'table'][1]/@id, 'array_')">
+				<!-- array - table without borders -->
+				<xsl:attribute name="border">none</xsl:attribute>
+			</xsl:if>
+
+	</xsl:template>
+
 	<xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
 		<xsl:param name="continued"/>
 		<xsl:if test="normalize-space() != ''">
@@ -4642,6 +4660,8 @@
 						<fo:table-row>
 							<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
 
+								<xsl:call-template name="setBordersTableArray"/>
+
 								<!-- fn will be processed inside 'note' processing -->
 
 								<!-- for BSI (not PAS) display Notes before footnotes -->
@@ -4818,6 +4838,8 @@
 					</xsl:when>
 				</xsl:choose>
 
+			<xsl:call-template name="setBordersTableArray"/>
+
 			<xsl:call-template name="setTableRowAttributes"/>
 
 			<xsl:apply-templates/>
@@ -4845,6 +4867,8 @@
 					<xsl:attribute name="border-top"><xsl:value-of select="$table-border"/></xsl:attribute>
 				</xsl:if>
 
+			<xsl:call-template name="setBordersTableArray"/>
+
 			<xsl:call-template name="setTableRowAttributes"/>
 			<xsl:apply-templates/>
 		</fo:table-row>
@@ -4869,6 +4893,8 @@
 					<xsl:attribute name="border-bottom"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
 				</xsl:if>
 
+			<xsl:call-template name="setBordersTableArray"/>
+
 			<xsl:if test="$lang = 'ar'">
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
@@ -4932,6 +4958,8 @@
 				</xsl:if>
 				<!-- <xsl:attribute name="page-break-inside">avoid</xsl:attribute> -->
 
+			<xsl:call-template name="setBordersTableArray"/>
+
 			<xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table -->
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
@@ -8675,7 +8703,7 @@
 	<!-- sourcecode  -->
 	<!-- =============== -->
 
-	<xsl:variable name="source-highlighter-css_" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'source-highlighter-css']"/>
+	<xsl:variable name="source-highlighter-css_" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'source-highlighter-css']"/>
 	<xsl:variable name="sourcecode_css_" select="java:org.metanorma.fop.Util.parseCSS($source-highlighter-css_)"/>
 	<xsl:variable name="sourcecode_css" select="xalan:nodeset($sourcecode_css_)"/>
 
@@ -10741,8 +10769,8 @@
 
 	<xsl:variable name="toc_level">
 		<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
-		<xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels  Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
-		<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
+		<xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels  Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
+		<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
 		<xsl:choose>
 			<xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
 			<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when>  <!-- if there is value in xml -->
@@ -11846,6 +11874,7 @@
 			<xsl:choose>
 				<xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
 				<xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
+				<xsl:when test="$align = 'justified'">justify</xsl:when>
 				<xsl:when test="$align != '' and not($align = 'indent')"><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>

data/lib/isodoc/iso/presentation_xref.rb

@@ -113,11 +113,11 @@ module IsoDoc
                 delim = " "
                 @xrefs.anchor(container, :label)
                 # 7 a) : Clause 7 a), but Clause 7 List 1 a)
-              else
-                anchor_xref(node, container)
+              else anchor_xref(node, container)
               end
 
-        l10n(ref + delim + linkend)
+        ref and linkend = ref + delim + linkend
+        l10n(linkend)
       end
 
       def expand_citeas(text)

data/lib/isodoc/iso/word_dis_cleanup.rb

@@ -204,46 +204,13 @@ module IsoDoc
         docxml
       end
 
-      def authority_cleanup(docxml)
-        super
-        if @meta.get[:stage_int].to_s[0] == "9" ||
-            @meta.get[:stage_int].to_s[0] == "6"
-          copyright_prf(docxml)
-        else
-          copyright_dis(docxml)
-        end
-      end
-
-      def copyright_prf(docxml)
-        docxml.xpath("//p[@id = 'boilerplate-address']")&.each do |p|
-          p["class"] = "zzCopyright"
-          p["style"] = "text-indent:20.15pt;"
-          p.replace(to_xml(p).gsub(%r{<br/>}, "</p>\n<p class='zzCopyright' " \
-                                              "style='text-indent:20.15pt;'>"))
-        end
-        docxml.xpath("//p[@class = 'zzCopyrightHdr']")&.each do |p|
-          # p["class"] = "zzCopyright"
-          p.remove
-        end
-      end
-
-      def copyright_dis(docxml)
-        docxml.xpath("//p[@id = 'boilerplate-address']")&.each do |p|
-          p["class"] = "zzCopyright"
-          p.replace(to_xml(p).gsub(%r{<br/>}, "</p>\n<p class='zzCopyright'>"))
-        end
-        docxml.xpath("//p[@class = 'zzCopyrightHdr']")&.each do |p|
-          p.remove
-        end
-      end
-
       def word_section_end_empty_para(docxml)
         docxml.at("//div[@class='WordSection1']/p[last()]").remove
       end
 
       def word_table_cell_para(docxml)
         docxml.xpath("//td | //th").each do |t|
-          s = t["header"] == "true" ? "Tableheader" : "Tablebody"
+          s = word_table_cell_para_style(t)
           t.delete("header")
           if t.at("./p |./div")
             t.xpath("./p | ./div").each { |p| p["class"] = s }
@@ -253,6 +220,12 @@ module IsoDoc
         end
       end
 
+      def word_table_cell_para_style(cell)
+        ret = cell["header"] == "true" ? "Tableheader" : "Tablebody"
+        cell["class"] == "rouge-code" and ret = "Code"
+        ret
+      end
+
       def table_toc_class
         ["Table title", "Tabletitle", "Annex Table Title", "AnnexTableTitle"] +
           super

data/lib/isodoc/iso/word_dis_convert.rb

@@ -3,7 +3,7 @@ require_relative "word_dis_cleanup"
 module IsoDoc
   module Iso
     class WordDISConvert < WordConvert
-      attr_accessor :bgstripcolor 
+      attr_accessor :bgstripcolor
 
       def default_file_locations(_options)
         { wordstylesheet: html_doc_path("wordstyle-dis.scss"),
@@ -21,8 +21,7 @@ module IsoDoc
         super
       end
 
-      def init_dis(opt)
-      end
+      def init_dis(opt); end
 
       def convert1(docxml, filename, dir)
         update_coverpage(docxml)
@@ -48,7 +47,7 @@ module IsoDoc
       end
 
       def span_parse(node, out)
-        out.span **{ class: node["class"] } do |x|
+        out.span class: node["class"] do |x|
           node.children.each { |n| parse(n, x) }
         end
       end
@@ -88,7 +87,7 @@ module IsoDoc
       end
 
       def middle_title_dis(out)
-        out.p(**{ class: "zzSTDTitle" }) do |p|
+        out.p(class: "zzSTDTitle") do |p|
           p << @meta.get[:doctitleintro]
           @meta.get[:doctitleintro] && @meta.get[:doctitlemain] and p << " &#x2014; "
           p << @meta.get[:doctitlemain]
@@ -104,7 +103,7 @@ module IsoDoc
       end
 
       def middle_title_dis_amd(para)
-        para.span(**{ style: "font-weight:normal" }) do |p|
+        para.span(style: "font-weight:normal") do |p|
           if a = @meta.get[:doctitleamdlabel]
             p << " #{a}"
             a = @meta.get[:doctitleamd] and p << ": #{a}"
@@ -114,6 +113,34 @@ module IsoDoc
           end
         end
       end
+
+      def authority_cleanup(docxml)
+        super
+        if @meta.get[:stage_int].to_s[0] == "9" ||
+            @meta.get[:stage_int].to_s[0] == "6"
+          copyright_prf(docxml)
+        else
+          copyright_dis(docxml)
+        end
+      end
+
+      def copyright_prf(docxml)
+        docxml.xpath("//p[@id = 'boilerplate-address']")&.each do |p|
+          p["class"] = "zzCopyright"
+          p["style"] = "text-indent:20.15pt;"
+          p.replace(to_xml(p).gsub(%r{<br/>}, "</p>\n<p class='zzCopyright' " \
+                                              "style='text-indent:20.15pt;'>"))
+        end
+        docxml.xpath("//p[@class = 'zzCopyrightHdr']")&.each(&:remove)
+      end
+
+      def copyright_dis(docxml)
+        docxml.xpath("//p[@id = 'boilerplate-address']")&.each do |p|
+          p["class"] = "zzCopyright"
+          p.replace(to_xml(p).gsub(%r{<br/>}, "</p>\n<p class='zzCopyright'>"))
+        end
+        docxml.xpath("//p[@class = 'zzCopyrightHdr']")&.each(&:remove)
+      end
     end
   end
 end

data/lib/metanorma/iso/biblio.rng

@@ -1316,7 +1316,7 @@
       <value>commentaryOf</value>
       <value>hasCommentary</value>
       <value>related</value>
-      <value>complements</value>
+      <value>hasComplement</value>
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>

data/lib/metanorma/iso/cleanup.rb

@@ -4,14 +4,14 @@ require "htmlentities"
 module Metanorma
   module ISO
     class Converter < Standoc::Converter
-      PRE_NORMREF_FOOTNOTES = "//preface//fn | "\
+      PRE_NORMREF_FOOTNOTES = "//preface//fn | " \
                               "//clause[@type = 'scope']//fn".freeze
 
       NORMREF_FOOTNOTES =
         "//references[@normative = 'true']//fn".freeze
 
       POST_NORMREF_FOOTNOTES =
-        "//sections//clause[not(@type = 'scope')]//fn | "\
+        "//sections//clause[not(@type = 'scope')]//fn | " \
         "//annex//fn | //references[@normative = 'false']//fn".freeze
 
       def other_footnote_renumber(xmldoc)
@@ -33,7 +33,7 @@ module Metanorma
       end
 
       def get_id_prefix(xmldoc)
-        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']"\
+        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']" \
                      "/organization").each_with_object([]) do |x, prefix|
           x1 = x.at("abbreviation")&.text || x.at("name")&.text
           # (x1 == "ISO" and prefix.unshift("ISO")) or prefix << x1
@@ -60,23 +60,21 @@ module Metanorma
       end
 
       TERM_CLAUSE =
-        "//sections//terms | "\
+        "//sections//terms | " \
         "//sections//clause[descendant::terms][not(descendant::definitions)]"
           .freeze
 
       PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze
 
-      OTHERIDS = "@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or "\
-                 "@type = 'ISBN'".freeze
-
       def pub_class(bib)
         return 1 if bib.at("#{PUBLISHER}[abbreviation = 'ISO']")
-        return 1 if bib.at("#{PUBLISHER}[name = 'International Organization "\
+        return 1 if bib.at("#{PUBLISHER}[name = 'International Organization " \
                            "for Standardization']")
         return 2 if bib.at("#{PUBLISHER}[abbreviation = 'IEC']")
-        return 2 if bib.at("#{PUBLISHER}[name = 'International "\
+        return 2 if bib.at("#{PUBLISHER}[name = 'International " \
                            "Electrotechnical Commission']")
-        return 3 if bib.at("./docidentifier[@type][not(#{OTHERIDS})]") ||
+        return 3 if bib.at("./docidentifier[@type]" \
+                           "[not(#{skip_docid} or @type = 'metanorma')]") ||
           bib.at("./docidentifier[not(@type)]")
 
         4
@@ -99,15 +97,15 @@ module Metanorma
         pubclass = pub_class(bib)
         num = bib&.at("./docnumber")&.text
         id = bib&.at("./docidentifier[@primary]") ||
-          bib&.at("./docidentifier[not(#{OTHERIDS})]")
+          bib&.at("./docidentifier[not(#{skip_docid} or @type = 'metanorma')]")
         metaid = bib&.at("./docidentifier[@type = 'metanorma']")&.text
         abbrid = metaid unless /^\[\d+\]$/.match?(metaid)
         /\d-(?<partid>\d+)/ =~ id&.text
         type = id["type"] if id
         title = bib&.at("./title[@type = 'main']")&.text ||
           bib&.at("./title")&.text || bib&.at("./formattedref")&.text
-        "#{pubclass} :: #{type} :: "\
-          "#{num.nil? ? abbrid : sprintf('%09d', num.to_i)} :: "\
+        "#{pubclass} :: #{type} :: " \
+          "#{num.nil? ? abbrid : sprintf('%09d', num.to_i)} :: " \
           "#{sprintf('%09d', partid.to_i)} :: #{id&.text} :: #{title}"
       end
 
@@ -148,7 +146,7 @@ module Metanorma
       end
 
       def unpublished_note(xmldoc)
-        xmldoc.xpath("//bibitem[not(./ancestor::bibitem)]"\
+        xmldoc.xpath("//bibitem[not(./ancestor::bibitem)]" \
                      "[not(note[@type = 'Unpublished-Status'])]").each do |b|
           next if pub_class(b) > 2
           next unless (s = b.at("./status/stage")) && (s.text.to_i < 60)
@@ -179,7 +177,7 @@ module Metanorma
 
       def replacement_standard(biblio)
         r = biblio.at("./relation[@type = 'updates']/bibitem") or return nil
-        id = r.at("./formattedref | ./docidentifier[@primary = 'true'] | "\
+        id = r.at("./formattedref | ./docidentifier[@primary = 'true'] | " \
                   "./docidentifier | ./formattedref") or return nil
         id.text
       end
@@ -234,7 +232,7 @@ module Metanorma
       end
 
       def extract_publishers(xmldoc)
-        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']/"\
+        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']/" \
                      "organization").each_with_object([]) do |p, m|
           x = p.at("./abbreviation") || p.at("./name") or next
           m << x.text

data/lib/metanorma/iso/isodoc.rng

@@ -1580,7 +1580,7 @@
     </element>
   </define>
   <define name="misccontainer">
-    <element name="misc-container">
+    <element name="metanorma-extension">
       <oneOrMore>
         <ref name="AnyElement"/>
       </oneOrMore>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.3.2".freeze
+    VERSION = "2.3.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-30 00:00:00.000000000 Z
+date: 2023-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -296,6 +296,7 @@ files:
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.devel
 - LICENSE
 - Makefile
 - README.adoc