metanorma-iso 2.2.2 → 2.2.3

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

@@ -121,8 +121,8 @@
 
 	<xsl:variable name="stagename-header-coverpage">
 		<xsl:choose>
-			<xsl:when test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAmd' or $stage-abbreviation = 'DAM'">DRAFT</xsl:when>
-			<xsl:when test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM'">FINAL DRAFT</xsl:when>
+			<xsl:when test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAmd' or $stage-abbreviation = 'DAM' or starts-with($stage-abbreviation, 'DTS') or starts-with($stage-abbreviation, 'DTR')">DRAFT</xsl:when>
+			<xsl:when test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM' or starts-with($stage-abbreviation, 'FDTS') or starts-with($stage-abbreviation, 'FDTR')">FINAL DRAFT</xsl:when>
 			<xsl:when test="$stage-abbreviation = 'PRF'"/>
 			<xsl:when test="$stage-abbreviation = 'IS'"/>
 			<xsl:otherwise>
@@ -980,9 +980,14 @@
 										</fo:table>
 									</fo:block-container>
 									<fo:block-container position="absolute" left="60mm" top="222mm" height="25mm" display-align="after">
-										<fo:block>
+										<fo:block margin-bottom="2mm">
 											<xsl:if test="$stage-abbreviation = 'PRF'">
-												<fo:block font-size="39pt" font-weight="bold"><xsl:value-of select="$proof-text"/></fo:block>
+												<fo:block font-size="36pt" font-weight="bold" margin-left="1mm">
+													<xsl:call-template name="add-letter-spacing">
+														<xsl:with-param name="text" select="$proof-text"/>
+														<xsl:with-param name="letter-spacing" select="0.65"/>
+													</xsl:call-template>
+												</fo:block>
 											</xsl:if>
 										</fo:block>
 									</fo:block-container>
@@ -1456,7 +1461,7 @@
 											<fo:block font-size="9pt"><xsl:value-of select="$copyrightText"/></fo:block>
 										</fo:table-cell>
 										<fo:table-cell>
-											<fo:block font-size="11pt" font-weight="bold" text-align="center">
+											<fo:block font-size="10pt" font-weight="bold" text-align="center">
 												<xsl:if test="$stage-abbreviation = 'PRF'">
 													<xsl:value-of select="$proof-text"/>
 												</xsl:if>
@@ -1676,6 +1681,7 @@
 		<xsl:variable name="display">
 			<xsl:choose>
 				<xsl:when test="ancestor-or-self::iso:annex and $level &gt;= 2">false</xsl:when>
+				<xsl:when test="ancestor-or-self::iso:introduction and $level &gt;= 2">false</xsl:when>
 				<xsl:when test="$section = '' and $type = 'clause'">false</xsl:when>
 				<xsl:when test="$level &lt;= $toc_level">true</xsl:when>
 				<xsl:otherwise>false</xsl:otherwise>
@@ -1796,6 +1802,7 @@
 			<xsl:choose>
 				<xsl:when test="ancestor::iso:annex and $level = 2">13pt</xsl:when>
 				<xsl:when test="ancestor::iso:annex and $level = 3">12pt</xsl:when>
+				<xsl:when test="ancestor::iso:introduction and $level &gt;= 2">11pt</xsl:when>
 				<xsl:when test="ancestor::iso:preface">16pt</xsl:when>
 				<xsl:when test="$level = 2">12pt</xsl:when>
 				<xsl:when test="$level &gt;= 3">11pt</xsl:when>
@@ -1822,19 +1829,30 @@
 				<xsl:element name="{$element-name}">
 					<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
 					<xsl:attribute name="font-weight">bold</xsl:attribute>
-					<xsl:attribute name="margin-top"> <!-- margin-top -->
+					<xsl:variable name="attribute-name-before">
+						<xsl:choose>
+							<xsl:when test="ancestor::iso:preface and $level = 1">margin-top</xsl:when> <!-- for Foreword and Introduction titles -->
+							<xsl:otherwise>space-before</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					<xsl:attribute name="{$attribute-name-before}"> <!-- space-before or margin-top -->
 						<xsl:choose>
+							<xsl:when test="ancestor::iso:introduction and $level &gt;= 2 and ../preceding-sibling::iso:clause">30pt</xsl:when>
 							<xsl:when test="ancestor::iso:preface">8pt</xsl:when>
 							<xsl:when test="$level = 2 and ancestor::iso:annex">18pt</xsl:when>
 							<xsl:when test="$level = 1">18pt</xsl:when>
-							<xsl:when test="$level &gt;= 3">3pt</xsl:when>
-							<xsl:when test="$level = ''">6pt</xsl:when><!-- 13.5pt -->
+							<xsl:when test="($level = 2 or $level = 3) and not(../preceding-sibling::iso:clause)">14pt</xsl:when> <!-- first title in 3rd level clause -->
+							<xsl:when test="$level = 3">14pt</xsl:when>
+							<xsl:when test="$level &gt; 3">3pt</xsl:when>
+							<xsl:when test="$level = ''">6pt</xsl:when>
 							<xsl:otherwise>12pt</xsl:otherwise>
 						</xsl:choose>
 					</xsl:attribute>
-					<xsl:attribute name="margin-bottom">
+					<xsl:attribute name="space-after"> <!-- margin-bottom -->
 						<xsl:choose>
+							<xsl:when test="ancestor::iso:introduction and $level &gt;= 2">8pt</xsl:when>
 							<xsl:when test="ancestor::iso:preface">18pt</xsl:when>
+							<xsl:when test="$level = 3">9pt</xsl:when>
 							<!-- <xsl:otherwise>12pt</xsl:otherwise> -->
 							<xsl:otherwise>8pt</xsl:otherwise>
 						</xsl:choose>
@@ -1900,9 +1918,26 @@
 				</xsl:choose>
 			</xsl:attribute>
 			<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>
+			</xsl:if>
 			<xsl:if test="starts-with(ancestor::*[local-name() = 'table'][1]/@type, 'recommend') and not(following-sibling::*[local-name() = 'p'])">
 				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 			</xsl:if>
+			<xsl:if test="parent::*[local-name() = 'td' or local-name() = 'th']">
+				<xsl:choose>
+					<xsl:when test="not(following-sibling::*)"> <!-- last paragraph in table cell -->
+						<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
+					</xsl:otherwise>
+				</xsl:choose>
+				<!-- Special case: if paragraph in 'strong', i.e. it's sub-header, then keeps with next -->
+				<xsl:if test="count(node()) = count(*[local-name() = 'strong']) and following-sibling::*">
+					<xsl:attribute name="keep-with-next">always</xsl:attribute>
+				</xsl:if>
+			</xsl:if>
 			<xsl:if test="@id">
 				<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
 			</xsl:if>
@@ -2061,7 +2096,7 @@
 								<fo:block><fo:page-number/></fo:block>
 							</fo:table-cell>
 							<fo:table-cell display-align="center">
-								<fo:block font-size="11pt" font-weight="bold" text-align="center">
+								<fo:block font-size="10pt" font-weight="bold" text-align="center">
 									<xsl:if test="$stage-abbreviation = 'PRF'">
 										<xsl:value-of select="$proof-text"/>
 									</xsl:if>
@@ -2114,7 +2149,7 @@
 								<fo:block><xsl:value-of select="$copyrightText"/></fo:block>
 							</fo:table-cell>
 							<fo:table-cell display-align="center">
-								<fo:block font-size="11pt" font-weight="bold" text-align="center">
+								<fo:block font-size="10pt" font-weight="bold" text-align="center">
 									<xsl:if test="$stage-abbreviation = 'PRF'">
 										<xsl:value-of select="$proof-text"/>
 									</xsl:if>
@@ -2589,6 +2624,14 @@
 
 	</xsl:attribute-set>
 
+	<xsl:attribute-set name="pre-style">
+		<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="permission-style">
 
 	</xsl:attribute-set>
@@ -2710,9 +2753,15 @@
 	<!-- ========================== -->
 	<xsl:variable name="table-border_">
 
+		1pt solid black
 	</xsl:variable>
 	<xsl:variable name="table-border" select="normalize-space($table-border_)"/>
 
+	<xsl:variable name="table-cell-border_">
+		0.5pt solid black
+	</xsl:variable>
+	<xsl:variable name="table-cell-border" select="normalize-space($table-cell-border_)"/>
+
 	<xsl:attribute-set name="table-container-style">
 		<xsl:attribute name="margin-left">0mm</xsl:attribute>
 		<xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -2726,10 +2775,8 @@
 	<xsl:attribute-set name="table-style">
 		<xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
 		<xsl:attribute name="table-layout">fixed</xsl:attribute>
-		<xsl:attribute name="margin-left">0mm</xsl:attribute>
-		<xsl:attribute name="margin-right">0mm</xsl:attribute>
 
-			<xsl:attribute name="border">1.5pt solid black</xsl:attribute>
+			<xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute>
 
 	</xsl:attribute-set><!-- table-style -->
 
@@ -2751,16 +2798,16 @@
 	<xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style">
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 
-			<xsl:attribute name="border-top">solid black 1pt</xsl:attribute>
-			<xsl:attribute name="border-bottom">solid black 1pt</xsl:attribute>
+			<xsl:attribute name="border-top"><xsl:value-of select="$table-border"/></xsl:attribute>
+			<xsl:attribute name="border-bottom"><xsl:value-of select="$table-border"/></xsl:attribute>
 
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
 
 			<xsl:attribute name="font-size">9pt</xsl:attribute>
-			<xsl:attribute name="border-left">solid black 1pt</xsl:attribute>
-			<xsl:attribute name="border-right">solid black 1pt</xsl:attribute>
+			<xsl:attribute name="border-left"><xsl:value-of select="$table-border"/></xsl:attribute>
+			<xsl:attribute name="border-right"><xsl:value-of select="$table-border"/></xsl:attribute>
 
 	</xsl:attribute-set>
 
@@ -2776,6 +2823,8 @@
 		<xsl:attribute name="display-align">center</xsl:attribute>
 
 			<xsl:attribute name="padding-top">1mm</xsl:attribute>
+			<xsl:attribute name="border-left"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
+			<xsl:attribute name="border-right"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-header-cell-style -->
 
@@ -2786,6 +2835,7 @@
 		<xsl:attribute name="padding-right">1mm</xsl:attribute>
 
 			<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
+			<xsl:attribute name="border"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-cell-style -->
 
@@ -2795,6 +2845,7 @@
 		<xsl:attribute name="padding-right">1mm</xsl:attribute>
 		<xsl:attribute name="padding-top">1mm</xsl:attribute>
 
+			<xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute>
 			<xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-footer-cell-style -->
@@ -3851,14 +3902,20 @@
 				<xsl:variable name="table_attributes">
 
 					<xsl:element name="table_attributes" use-attribute-sets="table-style">
+
+						<xsl:if test="$margin-side != 0">
+							<xsl:attribute name="margin-left">0mm</xsl:attribute>
+							<xsl:attribute name="margin-right">0mm</xsl:attribute>
+						</xsl:if>
+
 						<xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
 
 							<xsl:if test="*[local-name()='thead']">
-								<xsl:attribute name="border-top">1pt solid black</xsl:attribute>
+								<xsl:attribute name="border-top"><xsl:value-of select="$table-border"/></xsl:attribute>
 							</xsl:if>
 							<xsl:if test="ancestor::*[local-name() = 'table']">
 								<!-- for internal table in table cell -->
-								<xsl:attribute name="border">0.5pt solid black</xsl:attribute>
+								<xsl:attribute name="border"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
 							</xsl:if>
 
 					</xsl:element>
@@ -4393,6 +4450,12 @@
 		<fo:table-row>
 			<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black">
 
+					<xsl:attribute name="border-left">1pt solid white</xsl:attribute>
+					<xsl:attribute name="border-right">1pt solid white</xsl:attribute>
+					<xsl:attribute name="border-top">1pt solid white</xsl:attribute>
+					<!-- <xsl:attribute name="border-bottom">0.5pt solid white</xsl:attribute> -->
+					<xsl:attribute name="border-bottom">none</xsl:attribute>
+
 						<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
 							<xsl:with-param name="continued">true</xsl:with-param>
 						</xsl:apply-templates>
@@ -4654,12 +4717,12 @@
 
 				<xsl:choose>
 					<xsl:when test="position() = 1">
-						<xsl:attribute name="border-top">solid black 1.5pt</xsl:attribute>
-						<xsl:attribute name="border-bottom">solid black 1pt</xsl:attribute>
+						<xsl:attribute name="border-top"><xsl:value-of select="$table-border"/></xsl:attribute>
+						<xsl:attribute name="border-bottom"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
 					</xsl:when>
 					<xsl:when test="position() = last()">
-						<xsl:attribute name="border-top">solid black 1pt</xsl:attribute>
-						<xsl:attribute name="border-bottom">solid black 1.5pt</xsl:attribute>
+						<xsl:attribute name="border-top"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
+						<xsl:attribute name="border-bottom"><xsl:value-of select="$table-border"/></xsl:attribute>
 					</xsl:when>
 				</xsl:choose>
 
@@ -4682,6 +4745,14 @@
 	<xsl:template match="*[local-name()='tr']">
 		<fo:table-row xsl:use-attribute-sets="table-body-row-style">
 
+			<xsl:if test="*[local-name() = 'th']">
+				<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			</xsl:if>
+
+				<xsl:if test="position() = 1 and not(ancestor::*[local-name() = 'table']/*[local-name() = 'thead'])">
+					<xsl:attribute name="border-top"><xsl:value-of select="$table-border"/></xsl:attribute>
+				</xsl:if>
+
 			<xsl:call-template name="setTableRowAttributes"/>
 			<xsl:apply-templates/>
 		</fo:table-row>
@@ -4701,6 +4772,11 @@
 				<xsl:with-param name="default">center</xsl:with-param>
 			</xsl:call-template>
 
+				<xsl:if test="../parent::*[local-name() = 'tbody'] and (following-sibling::*[local-name() = 'td'] or preceding-sibling::*[local-name() = 'td'])">
+					<xsl:attribute name="border-top"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
+					<xsl:attribute name="border-bottom"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
+				</xsl:if>
+
 			<xsl:if test="$lang = 'ar'">
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
@@ -4759,6 +4835,10 @@
 				<xsl:if test="starts-with(ancestor::*[local-name() = 'table'][1]/@type, 'recommend')">
 					<xsl:attribute name="display-align">before</xsl:attribute>
 				</xsl:if>
+				<xsl:if test="ancestor::*[local-name() = 'tbody'] and not(../preceding-sibling::*[local-name() = 'tr']) and ancestor::*[local-name() = 'table'][1]/*[local-name() = 'thead']"> <!-- cells in 1st row in the table body, and if thead exists -->
+					<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
+				</xsl:if>
+				<!-- <xsl:attribute name="page-break-inside">avoid</xsl:attribute> -->
 
 			<xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table -->
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
@@ -6676,6 +6756,9 @@
 		<xsl:value-of select="substring($str, 2)"/>
 	</xsl:template>
 
+	<!-- ======================================= -->
+	<!-- math -->
+	<!-- ======================================= -->
 	<xsl:template match="mathml:math">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
@@ -6726,14 +6809,57 @@
 		<xsl:value-of select="$comment_text"/>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'asciimath']">
+		<xsl:param name="process" select="'false'"/>
+		<xsl:if test="$process = 'true'">
+			<xsl:apply-templates/>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'latexmath']"/>
+
+	<xsl:template name="getMathml_asciimath_text">
+		<xsl:variable name="asciimath" select="../*[local-name() = 'asciimath']"/>
+		<xsl:variable name="latexmath">
+
+		</xsl:variable>
+		<xsl:variable name="asciimath_text_following">
+			<xsl:choose>
+				<xsl:when test="normalize-space($latexmath) != ''">
+					<xsl:value-of select="$latexmath"/>
+				</xsl:when>
+				<xsl:when test="normalize-space($asciimath) != ''">
+					<xsl:value-of select="$asciimath"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="following-sibling::node()[1][self::comment()]"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="asciimath_text_">
+			<xsl:choose>
+				<xsl:when test="normalize-space($asciimath_text_following) != ''">
+					<xsl:value-of select="$asciimath_text_following"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(translate(.,' ⁢','  '))"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="asciimath_text_2" select="java:org.metanorma.fop.Util.unescape($asciimath_text_)"/>
+		<xsl:variable name="asciimath_text" select="java:trim(java:java.lang.String.new($asciimath_text_2))"/>
+		<xsl:value-of select="$asciimath_text"/>
+	</xsl:template>
+
 	<xsl:template name="mathml_instream_object">
-		<xsl:param name="comment_text"/>
+		<xsl:param name="asciimath_text"/>
 		<xsl:param name="mathml_content"/>
 
-		<xsl:variable name="comment_text_">
+		<xsl:variable name="asciimath_text_">
 			<xsl:choose>
-				<xsl:when test="normalize-space($comment_text) != ''"><xsl:value-of select="$comment_text"/></xsl:when>
-				<xsl:otherwise><xsl:call-template name="getMathml_comment_text"/></xsl:otherwise>
+				<xsl:when test="normalize-space($asciimath_text) != ''"><xsl:value-of select="$asciimath_text"/></xsl:when>
+				<!-- <xsl:otherwise><xsl:call-template name="getMathml_comment_text"/></xsl:otherwise> -->
+				<xsl:otherwise><xsl:call-template name="getMathml_asciimath_text"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
 
@@ -6757,10 +6883,10 @@
 			</xsl:attribute>
 
 			<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
-			<xsl:if test="normalize-space($comment_text_) != ''">
+			<xsl:if test="normalize-space($asciimath_text_) != ''">
 			<!-- put Mathin Alternate Text -->
 				<xsl:attribute name="fox:alt-text">
-					<xsl:value-of select="$comment_text_"/>
+					<xsl:value-of select="$asciimath_text_"/>
 				</xsl:attribute>
 			</xsl:if>
 			<!-- </xsl:if> -->
@@ -6833,6 +6959,29 @@
 		<xsl:value-of select="."/><xsl:value-of select="$zero_width_space"/>
 	</xsl:template>
 
+	<!-- Examples: 
+		<stem type="AsciiMath">x = 1</stem> 
+		<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
+		<stem type="AsciiMath"><asciimath>x = 1</asciimath><latexmath>x = 1</latexmath></stem>
+	-->
+	<xsl:template match="*[local-name() = 'stem'][@type = 'AsciiMath'][count(*) = 0]/text() | *[local-name() = 'stem'][@type = 'AsciiMath'][*[local-name() = 'asciimath']]" priority="3">
+		<fo:inline xsl:use-attribute-sets="mathml-style">
+
+			<xsl:choose>
+				<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates>
+						<xsl:with-param name="process">true</xsl:with-param>
+					</xsl:apply-templates>
+				</xsl:otherwise>
+			</xsl:choose>
+
+		</fo:inline>
+	</xsl:template>
+	<!-- ======================================= -->
+	<!-- END: math -->
+	<!-- ======================================= -->
+
 	<xsl:template match="*[local-name()='localityStack']"/>
 
 	<xsl:template match="*[local-name()='link']" name="link">
@@ -8181,9 +8330,9 @@
 		<xsl:apply-templates mode="contents_item"/>
 	</xsl:template>
 
-	<!-- ====== -->
-	<!-- sourcecode   -->
-	<!-- ====== -->
+	<!-- =============== -->
+	<!-- sourcecode  -->
+	<!-- =============== -->
 	<xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
 
 		<fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
@@ -8480,8 +8629,22 @@
 			</fo:block>
 		</xsl:if>
 	</xsl:template>
-	<!-- ====== -->
-	<!-- ====== -->
+	<!-- =============== -->
+	<!-- END sourcecode  -->
+	<!-- =============== -->
+
+	<!-- =============== -->
+	<!-- pre  -->
+	<!-- =============== -->
+	<xsl:template match="*[local-name()='pre']" name="pre">
+		<fo:block xsl:use-attribute-sets="pre-style">
+			<xsl:copy-of select="@id"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+	<!-- =============== -->
+	<!-- pre  -->
+	<!-- =============== -->
 
 	<!-- ========== -->
 	<!-- permission -->
@@ -9525,6 +9688,10 @@
 
 		<fo:list-block xsl:use-attribute-sets="list-style">
 
+				<xsl:if test="not(ancestor::*[local-name() = 'ul' or local-name() = 'ol'])">
+					<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+				</xsl:if>
+
 			<xsl:if test="*[local-name() = 'name']">
 				<xsl:attribute name="margin-top">0pt</xsl:attribute>
 			</xsl:if>
@@ -11143,13 +11310,14 @@
 	</xsl:template>
 
 	<xsl:template name="setId">
+		<xsl:param name="prefix"/>
 		<xsl:attribute name="id">
 			<xsl:choose>
 				<xsl:when test="@id">
-					<xsl:value-of select="@id"/>
+					<xsl:value-of select="concat($prefix, @id)"/>
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:value-of select="generate-id()"/>
+					<xsl:value-of select="concat($prefix, generate-id())"/>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>

data/lib/isodoc/iso/presentation_bibdata.rb

@@ -10,23 +10,28 @@ module IsoDoc
       def warning_for_missing_metadata(docxml)
         return unless @meta.get[:unpublished]
 
+        ret = warning_for_missing_metadata_create(docxml)
+        return if ret.empty?
+
+        warning_for_missing_metadata_post(docxml, ret)
+      end
+
+      def warning_for_missing_metadata_create(docxml)
         ret = ""
         docxml.at(ns("//bibdata/ext//secretariat")) or
           ret += "<p>Secretariat is missing.</p>"
         docxml.at(ns("//bibdata/ext//editorialgroup")) or
           ret += "<p>Editorial groups are missing.</p>"
-        docxml.at(ns("//bibdata/date[@type = 'published' or @type = 'issued' "\
+        docxml.at(ns("//bibdata/date[@type = 'published' or @type = 'issued' " \
                      "or @type = 'created']")) ||
           docxml.at(ns("//bibdata/version/revision-date")) or
           ret += "<p>Document date is missing.</p>"
-        return if ret.empty?
-
-        warning_for_missing_metadata1(docxml, ret)
+        ret
       end
 
-      def warning_for_missing_metadata1(docxml, ret)
+      def warning_for_missing_metadata_post(docxml, ret)
         id = UUIDTools::UUID.random_create
-        ret = "<review date='#{Date.today}' reviewer='Metanorma' id='_#{id}'>"\
+        ret = "<review date='#{Date.today}' reviewer='Metanorma' id='_#{id}'>" \
               "<p><strong>Metadata warnings:<strong></p> #{ret}</review>"
         ins = docxml.at(ns("//sections//title")) or return
         ins.children.first.previous = ret
@@ -65,9 +70,8 @@ module IsoDoc
         i18n.get["stage_dict"][stage.text].is_a?(Hash) or
           return hash_translate(bib, i18n.get["stage_dict"],
                                 "./status/stage", lang)
-        i18n.get["stage_dict"][stage.text][type&.text] and
-          tag_translate(stage, lang,
-                        i18n.get["stage_dict"][stage.text][type&.text])
+        stagetype = i18n.get["stage_dict"][stage.text][type&.text] and
+          tag_translate(stage, lang, stagetype)
       end
     end
   end

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -76,9 +76,11 @@ module IsoDoc
       end
 
       def clause(docxml)
-        docxml.xpath(ns("//clause[not(ancestor::annex)] | "\
-                        "//terms | //definitions | //references | "\
+        docxml.xpath(ns("//clause[not(ancestor::annex)] | " \
+                        "//terms | //definitions | //references | " \
                         "//preface/introduction[clause]")).each do |f|
+          f.parent.name == "annex" &&
+            @xrefs.klass.single_term_clause?(f.parent) and next
           clause1(f)
         end
       end
@@ -133,7 +135,7 @@ module IsoDoc
         i = display_order_at(docxml, "//clause[@type = 'scope']", i)
         i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
         i = display_order_xpath(docxml,
-                                "//sections/clause[not(@type = 'scope')] | "\
+                                "//sections/clause[not(@type = 'scope')] | " \
                                 "//sections/terms | //sections/definitions", i)
         i = display_order_xpath(docxml, "//annex", i)
         i = display_order_xpath(docxml, @xrefs.klass.bibliography_xpath, i)

data/lib/isodoc/iso/word_convert.rb

@@ -17,9 +17,11 @@ module IsoDoc
         init_dis(options)
       end
 
-      def init_dis(options)
-        @wordtemplate = options[:isowordtemplate]
-        @dis = ::IsoDoc::Iso::WordDISConvert.new(options)
+      def init_dis(opt)
+        @wordtemplate = opt[:isowordtemplate]
+        opt[:isowordbgstripcolor] ||= "true"
+        @dis = ::IsoDoc::Iso::WordDISConvert.new(opt)
+        @dis.bgstripcolor = opt[:isowordbgstripcolor]
       end
 
       def font_choice(options)
@@ -80,7 +82,7 @@ module IsoDoc
         stage = @meta.get[:stage_int]
         return if !stage.nil? && stage < 60
 
-        body.br **{ clear: "all", style: "page-break-before:left;"\
+        body.br **{ clear: "all", style: "page-break-before:left;" \
                                          "mso-break-type:section-break" }
         body.div **{ class: "colophon" } do |div|
         end

data/lib/isodoc/iso/word_dis_cleanup.rb

@@ -43,11 +43,32 @@ module IsoDoc
         example_style(docxml)
         dis_style_interactions(docxml)
         quote_style(docxml)
+        stripbgcolor(docxml)
+      end
+
+      def stripbgcolor(docxml)
+        @bgstripcolor == "true" or return
+        %w(aucollab audeg aufname aurole ausuffix ausurname bibarticle bibetal
+           bibfname bibfpage bibissue bibjournal biblpage bibnumber
+           biborganization bibsuppl bibsurname biburl bibvolume bibyear
+           citebib citeen citefig citefn citetbl bibextlink citeeq citetfn
+           auprefix citeapp citesec stddocNumber stddocPartNumber
+           stddocTitle aumember stdfootnote stdpublisher stdsection stdyear
+           stddocumentType bibalt-year bibbook bbichapterno bibchaptertitle
+           bibed-etal bibed-fname bibeditionno bibed-organization bibed-suffix
+           bibed-surname bibinstitution bibisbn biblocation bibpagecount
+           bibpatent bibpublisher bibreportnum bibschool bibseries bibseriesno
+           bibtrans stdsuppl citesection).each do |t|
+          docxml.xpath("//span[@class = '#{t}']").each do |s|
+            s["style"] ||= ""
+            s["style"] = "mso-pattern:none;#{s['style']}"
+          end
+        end
       end
 
       def dis_style_interactions(docxml)
-        docxml.xpath("//p[@class = 'Code' or @class = 'Code-' or "\
-                     "@class = 'Code--']"\
+        docxml.xpath("//p[@class = 'Code' or @class = 'Code-' or " \
+                     "@class = 'Code--']" \
                      "[following::p[@class = 'Examplecontinued']]").each do |p|
           p["style"] ||= ""
           p["style"] = "margin-bottom:12pt;#{p['style']}"
@@ -184,7 +205,7 @@ module IsoDoc
         docxml.xpath("//p[@id = 'boilerplate-address']")&.each do |p|
           p["class"] = "zzCopyright"
           p["style"] = "text-indent:20.15pt;"
-          p.replace(p.to_xml.gsub(%r{<br/>}, "</p>\n<p class='zzCopyright' "\
+          p.replace(p.to_xml.gsub(%r{<br/>}, "</p>\n<p class='zzCopyright' " \
                                              "style='text-indent:20.15pt;'>"))
         end
         docxml.xpath("//p[@class = 'zzCopyrightHdr']")&.each do |p|

data/lib/isodoc/iso/word_dis_convert.rb

@@ -3,6 +3,8 @@ require_relative "word_dis_cleanup"
 module IsoDoc
   module Iso
     class WordDISConvert < WordConvert
+      attr_accessor :bgstripcolor 
+
       def default_file_locations(_options)
         { wordstylesheet: html_doc_path("wordstyle-dis.scss"),
           standardstylesheet: html_doc_path("isodoc-dis.scss"),
@@ -19,7 +21,8 @@ module IsoDoc
         super
       end
 
-      def init_dis(options); end
+      def init_dis(opt)
+      end
 
       def convert1(docxml, filename, dir)
         update_coverpage(docxml)

data/lib/metanorma/iso/base.rb

@@ -30,7 +30,8 @@ module Metanorma
       end
 
       def doc_extract_attributes(node)
-        super.merge(isowordtemplate: node.attr("iso-word-template"))
+        super.merge(isowordtemplate: node.attr("iso-word-template"),
+                    isowordbgstripcolor: node.attr("iso-word-bg-strip-color"))
       end
 
       def pdf_converter(node)