metanorma-iso 2.3.4 → 2.3.6

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

@@ -19,6 +19,7 @@
 		</xsl:if>
 	</xsl:variable>
 	<xsl:variable name="docidentifierISO" select="normalize-space($docidentifierISO_)"/>
+	<xsl:variable name="docidentifierISO_with_break" select="java:replaceAll(java:java.lang.String.new($docidentifierISO),'^([^\d]+) (\d)', concat('$1', $linebreak, '$2'))"/> <!-- add line break before 1st sequence 'space digit' -->
 
 	<xsl:variable name="all_rights_reserved">
 		<xsl:call-template name="getLocalizedString">
@@ -856,7 +857,7 @@
 																<xsl:if test="$font-size != ''">
 																	<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
 																</xsl:if>
-																<xsl:value-of select="$docidentifierISO"/>
+																<xsl:value-of select="$docidentifierISO_with_break"/>
 															</fo:block>
 														</fo:table-cell>
 													</fo:table-row>
@@ -1105,7 +1106,7 @@
 												</fo:table-cell>
 												<fo:table-cell>
 													<fo:block text-align="right" font-weight="bold" margin-bottom="13mm">
-														<xsl:value-of select="$docidentifierISO"/>
+														<xsl:value-of select="$docidentifierISO_with_break"/>
 													</fo:block>
 												</fo:table-cell>
 											</fo:table-row>
@@ -4102,7 +4103,7 @@
 		<xsl:variable name="isDeleted" select="@deleted"/>
 
 		<xsl:choose>
-			<xsl:when test="@width">
+			<xsl:when test="@width and @width != 'full-page-width' and @width != 'text-width'">
 
 				<!-- centered table when table name is centered (see table-name-style) -->
 
@@ -4446,6 +4447,7 @@
 			This makes columns with large differences between minimum and maximum widths wider than columns with smaller differences. -->
 			<xsl:when test="(@width_max &gt; $page_width and @width_min &lt; $page_width) or (@width_min &gt;= $page_width)">
 				<!-- difference between the available space and the minimum table width -->
+				<_width_min><xsl:value-of select="@width_min"/></_width_min>
 				<xsl:variable name="W" select="$page_width - @width_min"/>
 				<W><xsl:value-of select="$W"/></W>
 				<!-- difference between maximum and minimum width of the table -->
@@ -5154,17 +5156,20 @@
 		<xsl:for-each select="xalan:nodeset($references)//fn">
 			<xsl:variable name="reference" select="@reference"/>
 			<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
-				<fo:block xsl:use-attribute-sets="table-fn-style">
 
-					<fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
+						<fo:block xsl:use-attribute-sets="table-fn-style">
 
-						<xsl:value-of select="@reference"/>
+							<fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
+
+								<xsl:value-of select="@reference"/>
+
+							</fo:inline>
+							<fo:inline xsl:use-attribute-sets="table-fn-body-style">
+								<xsl:copy-of select="./node()"/>
+							</fo:inline>
+
+						</fo:block>
 
-					</fo:inline>
-					<fo:inline xsl:use-attribute-sets="table-fn-body-style">
-						<xsl:copy-of select="./node()"/>
-					</fo:inline>
-				</fo:block>
 			</xsl:if>
 		</xsl:for-each>
 	</xsl:template>
@@ -5363,7 +5368,7 @@
 
 				<xsl:variable name="key_iso">
 
-						<xsl:if test="$parent = 'figure' or $parent = 'formula'">true</xsl:if>
+						<xsl:if test="$parent = 'figure' or $parent = 'formula' or ../@key = 'true'">true</xsl:if>
 					 <!-- and  (not(../@class) or ../@class !='pseudocode') -->
 				</xsl:variable>
 
@@ -6123,12 +6128,12 @@
 		<xsl:param name="value"/>
 		<xsl:variable name="add_width" select="string-length($value) * 20"/>
 		<xsl:variable name="maxwidth" select="60 + $add_width"/>
-			<fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-20%"><!-- alignment-baseline="middle" -->
-				<xsl:attribute name="height">5mm</xsl:attribute>
+			<fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-10%"><!-- alignment-baseline="middle" -->
+				<xsl:attribute name="height">3.5mm</xsl:attribute> <!-- 5mm -->
 				<xsl:attribute name="content-width">100%</xsl:attribute>
 				<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
 				<xsl:attribute name="scaling">uniform</xsl:attribute>
-				<svg xmlns="http://www.w3.org/2000/svg" width="{$maxwidth + 32}" height="80">
+				<!-- <svg xmlns="http://www.w3.org/2000/svg" width="{$maxwidth + 32}" height="80">
 					<g>
 						<xsl:if test="$type = 'closing' or $type = 'end'">
 							<xsl:attribute name="transform">scale(-1 1) translate(-<xsl:value-of select="$maxwidth + 32"/>,0)</xsl:attribute>
@@ -6142,6 +6147,27 @@
 						</xsl:if>
 						<xsl:value-of select="$kind"/><tspan dy="10" font-size="30pt"><xsl:value-of select="$value"/></tspan>
 					</text>
+				</svg> -->
+				<svg xmlns="http://www.w3.org/2000/svg" width="{$maxwidth + 32}" height="80">
+					<g>
+						<xsl:if test="$type = 'closing' or $type = 'end'">
+							<xsl:attribute name="transform">scale(-1 1) translate(-<xsl:value-of select="$maxwidth + 32"/>,0)</xsl:attribute>
+						</xsl:if>
+						<polyline points="0,2.5 {$maxwidth},2.5 {$maxwidth + 20},40 {$maxwidth},77.5 0,77.5" stroke="black" stroke-width="5" fill="white"/>
+						<line x1="9.5" y1="0" x2="9.5" y2="80" stroke="black" stroke-width="19"/>
+					</g>
+					<xsl:variable name="text_x">
+						<xsl:choose>
+							<xsl:when test="$type = 'closing' or $type = 'end'">28</xsl:when>
+							<xsl:otherwise>22</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					<text font-family="Arial" x="{$text_x}" y="50" font-size="40pt">
+						<xsl:value-of select="$kind"/>
+					</text>
+					<text font-family="Arial" x="{$text_x + 33}" y="65" font-size="38pt">
+						<xsl:value-of select="$value"/>
+					</text>
 				</svg>
 			</fo:instream-foreign-object>
 	</xsl:template>
@@ -6210,7 +6236,7 @@
 			</xsl:copy>
 		</xsl:template>
 
-		<xsl:template match="*[local-name() = 'pagebreak']" mode="landscape_portrait">
+		<xsl:template match="*[local-name() = 'pagebreak'][not(following-sibling::*[1][local-name() = 'pagebreak'])]" mode="landscape_portrait">
 
 			<!-- determine pagebreak is last element before </fo:flow> or not -->
 			<xsl:variable name="isLast">
@@ -6222,16 +6248,18 @@
 			<xsl:if test="contains($isLast, 'false')">
 
 				<xsl:variable name="orientation" select="normalize-space(@orientation)"/>
-				<xsl:variable name="tree">
+
+				<xsl:variable name="tree_">
 					<xsl:for-each select="ancestor::*[ancestor::fo:flow]">
 						<element pos="{position()}">
 							<xsl:value-of select="name()"/>
 						</element>
 					</xsl:for-each>
 				</xsl:variable>
+				<xsl:variable name="tree" select="xalan:nodeset($tree_)"/>
 
 				<!-- close fo:page-sequence (closing preceding fo elements) -->
-				<xsl:for-each select="xalan:nodeset($tree)//element">
+				<xsl:for-each select="$tree//element">
 					<xsl:sort data-type="number" order="descending" select="@pos"/>
 					<xsl:text disable-output-escaping="yes">&lt;/</xsl:text>
 						<xsl:value-of select="."/>
@@ -6242,7 +6270,6 @@
 
 				<!-- <pagebreak/> -->
 				<!-- create a new fo:page-sequence (opening fo elements) -->
-
 				<xsl:text disable-output-escaping="yes">&lt;fo:page-sequence master-reference="document</xsl:text><xsl:if test="$orientation != ''">-<xsl:value-of select="$orientation"/></xsl:if><xsl:text disable-output-escaping="yes">"&gt;</xsl:text>
 				<fo:static-content flow-name="xsl-footnote-separator">
 					<fo:block>
@@ -6252,7 +6279,7 @@
 				<xsl:call-template name="insertHeaderFooter"/>
 				<xsl:text disable-output-escaping="yes">&lt;fo:flow flow-name="xsl-region-body"&gt;</xsl:text>
 
-				<xsl:for-each select="xalan:nodeset($tree)//element">
+				<xsl:for-each select="$tree//element">
 					<xsl:text disable-output-escaping="yes">&lt;</xsl:text>
 						<xsl:value-of select="."/>
 						<xsl:for-each select="@*[local-name() != 'pos']">
@@ -6264,6 +6291,7 @@
 						</xsl:for-each>
 					<xsl:text disable-output-escaping="yes">&gt;</xsl:text>
 				</xsl:for-each>
+
 			</xsl:if>
 		</xsl:template>
 		<!-- ================================================================ -->
@@ -6465,18 +6493,23 @@
 
 	<xsl:template name="add-zero-spaces-java">
 		<xsl:param name="text" select="."/>
-		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, arrow right   -->
-		<xsl:variable name="text1" select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |→)','$1​')"/>
+
+		<!-- add zero-width space (#x200B) after dot with next non-digit -->
+		<xsl:variable name="text1" select="java:replaceAll(java:java.lang.String.new($text),'(\.)([^\d\s])','$1​$2')"/>
+		<!-- add zero-width space (#x200B) after characters: dash, equal, underscore, em dash, thin space, arrow right   -->
+		<xsl:variable name="text2" select="java:replaceAll(java:java.lang.String.new($text1),'(-|=|_|—| |→)','$1​')"/>
+		<!-- add zero-width space (#x200B) after characters: colon, if there aren't digits after -->
+		<xsl:variable name="text3" select="java:replaceAll(java:java.lang.String.new($text2),'(:)(\D)','$1​$2')"/>
 		<!-- add zero-width space (#x200B) after characters: 'great than' -->
-		<xsl:variable name="text2" select="java:replaceAll(java:java.lang.String.new($text1), '(\u003e)(?!\u003e)', '$1​')"/><!-- negative lookahead: 'great than' not followed by 'great than' -->
+		<xsl:variable name="text4" select="java:replaceAll(java:java.lang.String.new($text3), '(\u003e)(?!\u003e)', '$1​')"/><!-- negative lookahead: 'great than' not followed by 'great than' -->
 		<!-- add zero-width space (#x200B) before characters: 'less than' -->
-		<xsl:variable name="text3" select="java:replaceAll(java:java.lang.String.new($text2), '(?&lt;!\u003c)(\u003c)', '​$1')"/> <!-- (?<!\u003c)(\u003c) --> <!-- negative lookbehind: 'less than' not preceeded by 'less than' -->
+		<xsl:variable name="text5" select="java:replaceAll(java:java.lang.String.new($text4), '(?&lt;!\u003c)(\u003c)', '​$1')"/> <!-- (?<!\u003c)(\u003c) --> <!-- negative lookbehind: 'less than' not preceeded by 'less than' -->
 		<!-- add zero-width space (#x200B) before character: { -->
-		<xsl:variable name="text4" select="java:replaceAll(java:java.lang.String.new($text3), '(?&lt;!\W)(\{)', '​$1')"/> <!-- negative lookbehind: '{' not preceeded by 'punctuation char' -->
+		<xsl:variable name="text6" select="java:replaceAll(java:java.lang.String.new($text5), '(?&lt;!\W)(\{)', '​$1')"/> <!-- negative lookbehind: '{' not preceeded by 'punctuation char' -->
 		<!-- add zero-width space (#x200B) after character: , -->
-		<xsl:variable name="text5" select="java:replaceAll(java:java.lang.String.new($text4), '(\,)(?!\d)', '$1​')"/> <!-- negative lookahead: ',' not followed by digit -->
+		<xsl:variable name="text7" select="java:replaceAll(java:java.lang.String.new($text6), '(\,)(?!\d)', '$1​')"/> <!-- negative lookahead: ',' not followed by digit -->
 
-		<xsl:value-of select="$text5"/>
+		<xsl:value-of select="$text7"/>
 	</xsl:template>
 
 	<xsl:template name="add-zero-spaces-link-java">
@@ -6485,7 +6518,9 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
 		<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
 		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
-		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
+		<xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
+		<!-- remove zero-width space at the end -->
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url), '​$', '')"/>
 	</xsl:template>
 
 	<!-- add zero space after dash character (for table's entries) -->
@@ -6622,7 +6657,7 @@
 		</xsl:copy>
 	</xsl:template>
 
-	<xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p']) and not(*[local-name()='sourcecode'])]" mode="table-without-br">
+	<xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p']) and not(*[local-name()='sourcecode']) and not(*[local-name()='ul']) and not(*[local-name()='ol'])]" mode="table-without-br">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<p>
@@ -6698,6 +6733,14 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),' {2,}',' ')"/>
 	</xsl:template>
 
+	<xsl:template match="*[local-name()='th' or local-name()='td']//*[local-name() = 'ol' or local-name() = 'ul']" mode="table-without-br">
+		<xsl:apply-templates mode="table-without-br"/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name()='th' or local-name()='td']//*[local-name() = 'li']" mode="table-without-br">
+		<xsl:apply-templates mode="table-without-br"/>
+	</xsl:template>
+
 	<!-- mode="table-without-br" -->
 	<!-- ================================== -->
 	<!-- END: Step 0. replace <br/> to <p>...</p> -->
@@ -7522,7 +7565,7 @@
 					<xsl:attribute name="font-size">inherit</xsl:attribute>
 				</xsl:if>
 
-			<fo:block-container margin-left="0mm">
+			<fo:block-container margin-left="0mm" margin-right="0mm">
 
 						<fo:block>
 
@@ -7704,11 +7747,14 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
 
+			<!-- Example: Dimensions in millimeters -->
+			<xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
+
 			<fo:block xsl:use-attribute-sets="figure-style">
-				<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+				<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note' and @type = 'units')]"/>
 			</fo:block>
 			<xsl:call-template name="fn_display_figure"/>
-			<xsl:for-each select="*[local-name() = 'note']">
+			<xsl:for-each select="*[local-name() = 'note'][not(@type = 'units')]">
 				<xsl:call-template name="note"/>
 			</xsl:for-each>
 
@@ -7965,24 +8011,47 @@
 
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:block xsl:use-attribute-sets="image-style">
-					<fo:instream-foreign-object fox:alt-text="{$alt-text}">
-						<xsl:attribute name="width">100%</xsl:attribute>
-						<xsl:attribute name="content-height">100%</xsl:attribute>
-						<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
-						<xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
-						<xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
-						<!-- effective height 297 - 27.4 - 13 =  256.6 -->
-						<!-- effective width 210 - 12.5 - 25 = 172.5 -->
-						<!-- effective height / width = 1.48, 1.4 - with title -->
-						<xsl:if test="$svg_height &gt; ($svg_width * 1.4)"> <!-- for images with big height -->
-							<xsl:variable name="width" select="(($svg_width * 1.4) div $svg_height) * 100"/>
-							<xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
-						</xsl:if>
-						<xsl:attribute name="scaling">uniform</xsl:attribute>
-						<xsl:copy-of select="$svg_content"/>
-					</fo:instream-foreign-object>
-				</fo:block>
+
+				<xsl:variable name="element">
+					<xsl:choose>
+						<xsl:when test="ancestor::*[local-name() = 'tr'] and $isGenerateTableIF = 'true'">
+							<fo:inline xsl:use-attribute-sets="image-style" text-align="left"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<fo:block xsl:use-attribute-sets="image-style">
+								<xsl:if test="ancestor::*[local-name() = 'dt']">
+									<xsl:attribute name="text-align">left</xsl:attribute>
+								</xsl:if>
+							</fo:block>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+
+				<xsl:for-each select="xalan:nodeset($element)/*">
+					<xsl:copy>
+						<xsl:copy-of select="@*"/>
+					<!-- <fo:block xsl:use-attribute-sets="image-style"> -->
+						<fo:instream-foreign-object fox:alt-text="{$alt-text}">
+							<xsl:if test="$isGenerateTableIF = 'false'">
+								<xsl:attribute name="width">100%</xsl:attribute>
+							</xsl:if>
+							<xsl:attribute name="content-height">100%</xsl:attribute>
+							<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
+							<xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
+							<xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
+							<!-- effective height 297 - 27.4 - 13 =  256.6 -->
+							<!-- effective width 210 - 12.5 - 25 = 172.5 -->
+							<!-- effective height / width = 1.48, 1.4 - with title -->
+							<xsl:if test="$svg_height &gt; ($svg_width * 1.4)"> <!-- for images with big height -->
+								<xsl:variable name="width" select="(($svg_width * 1.4) div $svg_height) * 100"/>
+								<xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
+							</xsl:if>
+							<xsl:attribute name="scaling">uniform</xsl:attribute>
+							<xsl:copy-of select="$svg_content"/>
+						</fo:instream-foreign-object>
+					<!-- </fo:block> -->
+					</xsl:copy>
+				</xsl:for-each>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
@@ -8074,6 +8143,13 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<!-- For the structures like: <dt><image src="" mimetype="image/svg+xml" height="" width=""><svg xmlns="http://www.w3.org/2000/svg" ... -->
+	<xsl:template match="*[local-name() != 'figure']/*[local-name() = 'image'][*[local-name() = 'svg']]" priority="3">
+		<xsl:for-each select="*[local-name() = 'svg']">
+			<xsl:call-template name="image_svg"/>
+		</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']"/>
@@ -8212,6 +8288,8 @@
 		<xsl:value-of select="."/>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'add'][starts-with(., $ace_tag)]/text()" mode="bookmarks" priority="3"/>
+
 	<xsl:template match="node()" mode="contents">
 		<xsl:apply-templates mode="contents"/>
 	</xsl:template>
@@ -8519,7 +8597,15 @@
 							<xsl:value-of select="@section"/>
 							<xsl:text> </xsl:text>
 						</xsl:if>
-						<xsl:value-of select="normalize-space(title)"/>
+						<xsl:variable name="title">
+							<xsl:for-each select="title/node()">
+								<xsl:choose>
+									<xsl:when test="local-name() = 'add' and starts-with(., $ace_tag)"><!-- skip --></xsl:when>
+									<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+								</xsl:choose>
+							</xsl:for-each>
+						</xsl:variable>
+						<xsl:value-of select="normalize-space($title)"/>
 					</fo:bookmark-title>
 					<xsl:apply-templates mode="bookmark"/>
 				</fo:bookmark>
@@ -8545,6 +8631,12 @@
 	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
 	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']"/>
 
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note'][@type = 'units'] |         *[local-name() = 'image']/*[local-name() = 'note'][@type = 'units']" priority="2">
+		<fo:block text-align="right" keep-with-next="always">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<!-- ====== -->
 	<!-- ====== -->
 	<xsl:template match="*[local-name() = 'title']" mode="contents_item">
@@ -8694,6 +8786,10 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'add'][starts-with(., $ace_tag)]/text()" mode="contents_item" priority="2">
+		<xsl:value-of select="."/>
+	</xsl:template>
+
 	<!-- Note: to enable the addition of character span markup with semantic styling for DIS Word output -->
 	<xsl:template match="*[local-name() = 'span']" mode="contents_item">
 		<xsl:apply-templates mode="contents_item"/>
@@ -10922,7 +11018,6 @@
 					<xsl:if test="@type = 'editorial'">
 						<xsl:attribute name="color">green</xsl:attribute>
 						<xsl:attribute name="font-weight">normal</xsl:attribute>
-
 						<!-- <xsl:variable name="note-style">
 							<style xsl:use-attribute-sets="note-style"></style>
 						</xsl:variable>

data/lib/isodoc/iso/presentation_bibdata.rb

@@ -57,7 +57,7 @@ module IsoDoc
       def editorialgroup_identifier2(group, level)
         a = group.at(ns("./#{level}")) or return nil
         type = a["type"]
-        type.casecmp("other").zero? and type = ""
+        type&.casecmp("other")&.zero? and type = ""
         "#{type} #{a['number']}".strip
       end
 

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -215,6 +215,11 @@ module IsoDoc
         node.remove
       end
 
+      def note1(elem)
+        elem["type"] == "units" and return
+        super
+      end
+
       include Init
     end
   end

data/lib/isodoc/iso/word_cleanup.rb

@@ -5,7 +5,7 @@ module IsoDoc
         super
         xml.xpath("//div[@class = 'figure']//table[@class = 'dl']").each do |t|
           t["class"] = "figdl"
-          d = t.add_previous_sibling("<div class='figdl' "\
+          d = t.add_previous_sibling("<div class='figdl' " \
                                      "style='page-break-after:avoid;'/>")
           t.parent = d.first
         end
@@ -38,6 +38,16 @@ module IsoDoc
         word_annex_cleanup_h1(docxml)
         figure_style(docxml)
         new_styles(docxml)
+        index_cleanup(docxml)
+      end
+
+      def index_cleanup(docxml)
+        docxml.xpath("//div[@class = 'index']").each do |i|
+          i.xpath(".//p | .//li").each do |p|
+            p["style"] ||= ""
+            p["style"] += "margin-bottom:0px;"
+          end
+        end
       end
 
       def figure_style(docxml)
@@ -48,7 +58,7 @@ module IsoDoc
       end
 
       def quote_style(docxml)
-        docxml.xpath("//div[@class = 'Quote' or @class = 'Note' or "\
+        docxml.xpath("//div[@class = 'Quote' or @class = 'Note' or " \
                      "@class = 'Example' or @class = 'Admonition']").each do |d|
                        quote_style1(d)
                      end

data/lib/isodoc/iso/word_convert.rb

@@ -10,10 +10,6 @@ module IsoDoc
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
-        @wordToClevels = options[:doctoclevels].to_i
-        @wordToClevels = 3 if @wordToClevels.zero?
-        @htmlToClevels = options[:htmltoclevels].to_i
-        @htmlToClevels = 3 if @htmlToClevels.zero?
         init_dis(options)
       end
 
@@ -74,17 +70,41 @@ module IsoDoc
           make_body1(body, docxml)
           make_body2(body, docxml)
           make_body3(body, docxml)
+          indexsect(docxml, body)
           colophon(body, docxml)
         end
       end
 
+      def br(out, pagebreak)
+        out.br clear: "all", style: "page-break-before:#{pagebreak};" \
+                                    "mso-break-type:section-break"
+      end
+
       def colophon(body, _docxml)
         stage = @meta.get[:stage_int]
         return if !stage.nil? && stage < 60
 
-        body.br **{ clear: "all", style: "page-break-before:left;" \
-                                         "mso-break-type:section-break" }
-        body.div **{ class: "colophon" } do |div|
+        br(body, "left")
+        body.div class: "colophon" do |div|
+        end
+      end
+
+      def indexsect(isoxml, out)
+        isoxml.xpath(ns("//indexsect")).each do |i|
+          indexsect_title(i, out)
+          br(out, "auto")
+          out.div class: "index" do |div|
+            i.children.each do |e|
+              parse(e, div) unless e.name == "title"
+            end
+          end
+        end
+      end
+
+      def indexsect_title(clause, out)
+        br(out, "always")
+        out.div class: "WordSection3" do |div|
+          clause_name(nil, clause.at(ns("./title")), div, nil)
         end
       end
 
@@ -181,7 +201,7 @@ module IsoDoc
         return if name.nil?
 
         name&.at(ns("./strong"))&.remove # supplied by CSS list numbering
-        div.h1 **{ class: "Annex" } do |t|
+        div.h1 class: "Annex" do |t|
           annex_name1(name, t)
           clause_parse_subtitle(name, t)
         end
@@ -190,7 +210,7 @@ module IsoDoc
       def annex_name1(name, out)
         name.children.each do |c2|
           if c2.name == "span" && c2["class"] == "obligation"
-            out.span **{ style: "font-weight:normal;" } do |s|
+            out.span style: "font-weight:normal;" do |s|
               c2.children.each { |c3| parse(c3, s) }
             end
           else parse(c2, out)
@@ -204,6 +224,21 @@ module IsoDoc
         ret
       end
 
+      def table_parse(node, out)
+        @in_table = true
+        table_title_parse(node, out)
+        measurement_units(node, out)
+        out.div align: "center", class: "table_container" do |div|
+          div.table **table_attrs(node) do |t|
+            table_parse_core(node, t)
+            (dl = node.at(ns("./dl"))) && parse(dl, div)
+            node.xpath(ns("./note[not(@type = 'units')]"))
+              .each { |n| parse(n, div) }
+          end
+        end
+        @in_table = false
+      end
+
       include BaseConvert
       include Init
     end

data/lib/isodoc/iso/xref.rb

@@ -65,19 +65,24 @@ module IsoDoc
 
       def figure_anchor(elem, sublabel, label, klass)
         @anchors[elem["id"]] = anchor_struct(
-          (sublabel ? "#{label} #{sublabel}" : label),
+          "#{label}#{sublabel}",
           nil, @labels[klass] || klass.capitalize, klass, elem["unnumbered"]
         )
-        sublabel && elem["unnumbered"] != "true" and
+        !sublabel.empty? && elem["unnumbered"] != "true" and
           @anchors[elem["id"]][:label] = sublabel
       end
 
+      def subfigure_label(subfignum)
+        subfignum.zero? and return ""
+        " #{(subfignum + 96).chr})"
+      end
+
       def sequential_figure_names(clause)
         j = 0
         clause.xpath(ns(FIGURE_NO_CLASS)).noblank
           .each_with_object(IsoDoc::XrefGen::Counter.new) do |t, c|
           j = subfigure_increment(j, c, t)
-          sublabel = j.zero? ? nil : "#{(j + 96).chr})"
+          sublabel = subfigure_label(j)
           figure_anchor(t, sublabel, c.print, "figure")
         end
         sequential_figure_class_names(clause)
@@ -101,7 +106,7 @@ module IsoDoc
         clause.xpath(ns(FIGURE_NO_CLASS)).noblank.each do |t|
           j = subfigure_increment(j, c, t)
           label = "#{num}#{hiersep}#{c.print}"
-          sublabel = j.zero? ? nil : "#{(j + 96).chr})"
+          sublabel = subfigure_label(j)
           figure_anchor(t, sublabel, label, "figure")
         end
         hierarchical_figure_class_names(clause, num)
@@ -196,6 +201,19 @@ module IsoDoc
         super
         modspec_table_xrefs(clause) if @anchors_previous
       end
+
+      def uncountable_note?(note)
+        @anchors[note["id"]] || blank?(note["id"]) || note["type"] == "units"
+      end
+
+      def note_anchor_names1(notes, counter)
+        countable = notes.reject { |n| uncountable_note?(n) }
+        countable.each do |n|
+          @anchors[n["id"]] =
+            anchor_struct(increment_label(countable, n, counter), n,
+                          @labels["note_xref"], "note", false)
+        end
+      end
     end
   end
 end

data/lib/metanorma/iso/base.rb

@@ -56,9 +56,14 @@ module Metanorma
         @vocab = node.attr("docsubtype") == "vocabulary"
       end
 
+      def toc_default
+        { word_levels: 3, html_levels: 2 }
+      end
+
       def ol_attrs(node)
         attr_code(keep_attrs(node)
                   .merge(id: ::Metanorma::Utils::anchor_or_uuid(node),
+                         "explicit-type": olist_style(node.attributes[1]),
                          start: node.attr("start")))
       end