metanorma-iso 1.10.3 → 1.10.4

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

@@ -9,7 +9,7 @@
 	
 	
 
-	<xsl:key name="kfn" match="iso:p/iso:fn" use="@reference"/>
+	<xsl:key name="kfn" match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])]" use="@reference"/>
 	
 	<xsl:key name="attachments" match="iso:eref[contains(@bibitemid, '.exp')]" use="@bibitemid"/>
 	
@@ -1686,69 +1686,19 @@
 	<xsl:template match="iso:li//iso:p//text()">
 		<xsl:choose>
 			<xsl:when test="contains(., '&#9;')">
+				<!-- <fo:inline white-space="pre"><xsl:value-of select="translate(., $thinspace, ' ')"/></fo:inline> -->
 				<fo:inline white-space="pre"><xsl:value-of select="."/></fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
+				<!-- <xsl:value-of select="translate(., $thinspace, ' ')"/> -->
 				<xsl:value-of select="."/>
 			</xsl:otherwise>
 		</xsl:choose>
 		
 	</xsl:template>
 	
-	<!--
-	<fn reference="1">
-			<p id="_8e5cf917-f75a-4a49-b0aa-1714cb6cf954">Formerly denoted as 15 % (m/m).</p>
-		</fn>
-	-->
 	
-	<xsl:variable name="p_fn">
-		<xsl:for-each select="//iso:p/iso:fn[generate-id(.)=generate-id(key('kfn',@reference)[1])]">
-			<!-- copy unique fn -->
-			<fn gen_id="{generate-id(.)}">
-				<xsl:copy-of select="@*"/>
-				<xsl:copy-of select="node()"/>
-			</fn>
-		</xsl:for-each>
-	</xsl:variable>
 	
-	<xsl:template match="iso:p/iso:fn" priority="2">
-		<xsl:variable name="gen_id" select="generate-id(.)"/>
-		<xsl:variable name="reference" select="@reference"/>
-		<xsl:variable name="number">
-			<!-- <xsl:number level="any" count="iso:p/iso:fn"/> -->
-			<xsl:value-of select="count(xalan:nodeset($p_fn)//fn[@reference = $reference]/preceding-sibling::fn) + 1"/>
-		</xsl:variable>
-		<xsl:choose>
-			<xsl:when test="xalan:nodeset($p_fn)//fn[@gen_id = $gen_id]">
-				<fo:footnote>
-					<fo:inline font-size="80%" keep-with-previous.within-line="always" vertical-align="super">
-						<fo:basic-link internal-destination="footnote_{@reference}_{$number}" fox:alt-text="footnote {@reference} {$number}">
-							<!-- <xsl:value-of select="@reference"/> -->
-							<xsl:value-of select="$number + count(//iso:bibitem[ancestor::iso:references[@normative='true']]/iso:note)"/><xsl:text>)</xsl:text>
-						</fo:basic-link>
-					</fo:inline>
-					<fo:footnote-body>
-						<fo:block font-size="10pt" margin-bottom="12pt">
-							<fo:inline id="footnote_{@reference}_{$number}" keep-with-next.within-line="always" padding-right="3mm"> <!-- font-size="60%"  alignment-baseline="hanging" -->
-								<xsl:value-of select="$number + count(//iso:bibitem[ancestor::iso:references[@normative='true']]/iso:note)"/><xsl:text>)</xsl:text>
-							</fo:inline>
-							<xsl:for-each select="iso:p">
-									<xsl:apply-templates/>
-							</xsl:for-each>
-						</fo:block>
-					</fo:footnote-body>
-				</fo:footnote>
-			</xsl:when>
-			<xsl:otherwise>
-				<fo:inline font-size="60%" keep-with-previous.within-line="always" vertical-align="super">
-					<fo:basic-link internal-destination="footnote_{@reference}_{$number}" fox:alt-text="footnote {@reference} {$number}">
-						<xsl:value-of select="$number + count(//iso:bibitem/iso:note)"/>
-					</fo:basic-link>
-				</fo:inline>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
 	<xsl:template match="iso:p/iso:fn/iso:p">
 		<xsl:apply-templates/>
 	</xsl:template>
@@ -2011,6 +1961,11 @@
 	<!-- End of Index processing -->
 	<!-- =================== -->
 	
+	<!-- <xsl:variable name="thinspace" select="'&#x2009;'"/>
+	<xsl:template match="text()[contains(., $thinspace)]">
+		<xsl:value-of select="translate(., $thinspace, ' ')"/>
+	</xsl:template> -->
+	
 	
 	<xsl:template name="insertHeaderFooter">
 		<xsl:param name="font-weight" select="'bold'"/>
@@ -2741,6 +2696,76 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="toc-style">
 		<xsl:attribute name="line-height">135%</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="fn-style">
+		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="fn-num-style">
+		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
+		
+		
+		
+		
+		
+		
+		
+		
+			<xsl:attribute name="font-size">80%</xsl:attribute>
+			<xsl:attribute name="vertical-align">super</xsl:attribute>
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</xsl:attribute-set><xsl:attribute-set name="fn-body-style">
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="font-style">normal</xsl:attribute>
+		<xsl:attribute name="text-indent">0</xsl:attribute>
+		<xsl:attribute name="start-indent">0</xsl:attribute>
+		
+		
+		
+		
+		
+		
+		
+		
+			<xsl:attribute name="font-size">10pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</xsl:attribute-set><xsl:attribute-set name="fn-body-num-style">
+		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
+		
+		
+		
+		
+		
+		
+		
+		
+			<xsl:attribute name="padding-right">3mm</xsl:attribute>
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
 	</xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:template name="OLD_processPrefaceSectionsDefault_Contents">
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -3783,6 +3808,104 @@
 		
 	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='name']" mode="process"/><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" mode="process">
 		<xsl:apply-templates/>
+	</xsl:template><xsl:template match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])]" priority="2" name="fn">
+	
+		<!-- list of footnotes to calculate actual footnotes number -->
+		<xsl:variable name="p_fn_">
+			<xsl:choose>
+				<xsl:when test="@current_fn_number"> <!-- for BSI, footnote reference number calculated already -->
+					<fn gen_id="{generate-id(.)}">
+						<xsl:copy-of select="@*"/>
+						<xsl:copy-of select="node()"/>
+					</fn>
+				</xsl:when>
+				<xsl:otherwise>
+					<!-- itetation for:
+					footnotes in bibdata/title
+					footnotes in bibliography
+					footnotes in document's body (except table's head/body/foot and figure text) 
+					-->
+					<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']/*[local-name() = 'note'][@type='title-footnote']">
+						<fn gen_id="{generate-id(.)}">
+							<xsl:copy-of select="@*"/>
+							<xsl:copy-of select="node()"/>
+						</fn>
+					</xsl:for-each>
+					<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* |       ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* |        ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] |       ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
+						<xsl:sort select="@displayorder" data-type="number"/>
+						<xsl:for-each select=".//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] |       .//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
+							<!-- copy unique fn -->
+							<fn gen_id="{generate-id(.)}">
+								<xsl:copy-of select="@*"/>
+								<xsl:copy-of select="node()"/>
+							</fn>
+						</xsl:for-each>
+					</xsl:for-each>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="p_fn" select="xalan:nodeset($p_fn_)"/>
+		
+		<xsl:variable name="gen_id" select="generate-id(.)"/>
+		<xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
+		<xsl:variable name="reference" select="@reference"/>
+		<!-- fn sequence number in document -->
+		<xsl:variable name="current_fn_number">
+			<xsl:choose>
+				<xsl:when test="@current_fn_number"><xsl:value-of select="@current_fn_number"/></xsl:when> <!-- for BSI -->
+				<xsl:otherwise>
+					<xsl:value-of select="count($p_fn//fn[@reference = $reference]/preceding-sibling::fn) + 1"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="current_fn_number_text">
+			<xsl:value-of select="$current_fn_number"/>
+			
+			
+				<xsl:text>)</xsl:text>
+			
+		</xsl:variable>
+		
+		<xsl:variable name="ref_id" select="concat('footnote_', $lang, '_', $reference, '_', $current_fn_number)"/>
+		<xsl:variable name="footnote_inline">
+			<fo:inline xsl:use-attribute-sets="fn-num-style">
+				
+				<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
+					<xsl:value-of select="$current_fn_number_text"/>
+				</fo:basic-link>
+			</fo:inline>
+		</xsl:variable>
+		<!-- DEBUG: p_fn=<xsl:copy-of select="$p_fn"/>
+		gen_id=<xsl:value-of select="$gen_id"/> -->
+		<xsl:choose>
+			<xsl:when test="normalize-space(@skip_footnote_body) = 'true'">
+				<xsl:copy-of select="$footnote_inline"/>
+			</xsl:when>
+			<xsl:when test="$p_fn//fn[@gen_id = $gen_id] or normalize-space(@skip_footnote_body) = 'false'">
+				<fo:footnote xsl:use-attribute-sets="fn-style">
+					<xsl:copy-of select="$footnote_inline"/>
+					<fo:footnote-body>
+						
+						<fo:block-container text-indent="0" start-indent="0">
+							
+							
+							<fo:block xsl:use-attribute-sets="fn-body-style">
+								
+								
+								<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
+									
+									<xsl:value-of select="$current_fn_number_text"/>
+								</fo:inline>
+								<xsl:apply-templates/>
+							</fo:block>
+						</fo:block-container>
+					</fo:footnote-body>
+				</fo:footnote>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:copy-of select="$footnote_inline"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template name="fn_display">
 		<xsl:variable name="references">
 			
@@ -3984,6 +4107,8 @@
 				
 			</fo:basic-link>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='fn']/text()[normalize-space() != '']">
+		<fo:inline><xsl:value-of select="."/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
 		<fo:inline>
 			<xsl:apply-templates/>
@@ -4997,22 +5122,6 @@
 			<xsl:if test="not(preceding-sibling::*[local-name() = 'p'])"><xsl:value-of select="$callout"/></xsl:if>
 			<xsl:apply-templates/>
 		</fo:inline>		
-	</xsl:template><xsl:template match="*[local-name() = 'modification']">
-		<xsl:variable name="title-modified">
-			
-				<xsl:call-template name="getLocalizedString">
-					<xsl:with-param name="key">modified</xsl:with-param>
-				</xsl:call-template>
-			
-			
-		</xsl:variable>
-		
-    <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
-		<xsl:choose>
-			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text>—</xsl:text></xsl:if></xsl:when>
-			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text> — </xsl:text></xsl:if></xsl:otherwise>
-		</xsl:choose>
-		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name() = 'xref']">
 		<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
 			
@@ -6253,60 +6362,69 @@
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>
 			</xsl:variable>
-			
-			<xsl:choose>
+			<xsl:copy-of select="$termsource_text"/>
+			<!-- <xsl:choose>
 				<xsl:when test="starts-with(normalize-space($termsource_text), '[')">
-					<!-- <xsl:apply-templates /> -->
 					<xsl:copy-of select="$termsource_text"/>
 				</xsl:when>
 				<xsl:otherwise>
-					
-					
+					<xsl:if test="$namespace = 'bsi'">
+						<xsl:choose>
+							<xsl:when test="$document_type = 'PAS' and starts-with(*[local-name() = 'origin']/@citeas, '[')"><xsl:text>{</xsl:text></xsl:when>
+							<xsl:otherwise><xsl:text>[</xsl:text></xsl:otherwise>
+						</xsl:choose>
+					</xsl:if>
+					<xsl:if test="$namespace = 'gb' or $namespace = 'iso' or $namespace = 'iec' or $namespace = 'itu' or $namespace = 'unece' or $namespace = 'unece-rec' or $namespace = 'nist-cswp'  or $namespace = 'nist-sp' or $namespace = 'ogc-white-paper' or $namespace = 'csa' or $namespace = 'csd' or $namespace = 'm3d' or $namespace = 'iho' or $namespace = 'bipm' or $namespace = 'jcgm'">
 						<xsl:text>[</xsl:text>
-					
-					<!-- <xsl:apply-templates />					 -->
+					</xsl:if>
 					<xsl:copy-of select="$termsource_text"/>
-					
-					
+					<xsl:if test="$namespace = 'bsi'">
+						<xsl:choose>
+							<xsl:when test="$document_type = 'PAS' and starts-with(*[local-name() = 'origin']/@citeas, '[')"><xsl:text>}</xsl:text></xsl:when>
+							<xsl:otherwise><xsl:text>]</xsl:text></xsl:otherwise>
+						</xsl:choose>
+					</xsl:if>
+					<xsl:if test="$namespace = 'gb' or $namespace = 'iso' or $namespace = 'iec' or $namespace = 'itu' or $namespace = 'unece' or $namespace = 'unece-rec' or $namespace = 'nist-cswp'  or $namespace = 'nist-sp' or $namespace = 'ogc-white-paper' or $namespace = 'csa' or $namespace = 'csd' or $namespace = 'm3d' or $namespace = 'iho' or $namespace = 'bipm' or $namespace = 'jcgm'">
 						<xsl:text>]</xsl:text>
-					
+					</xsl:if>
 				</xsl:otherwise>
-			</xsl:choose>
+			</xsl:choose> -->
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()">
 		<xsl:if test="normalize-space() != ''">
 			<xsl:value-of select="."/>
 		</xsl:if>
-	</xsl:template><xsl:variable name="localized.source">
-		<xsl:call-template name="getLocalizedString">
-			<xsl:with-param name="key">source</xsl:with-param>
-		</xsl:call-template>
-	</xsl:variable><xsl:template match="*[local-name() = 'origin']">
+	</xsl:template><xsl:template match="*[local-name() = 'termsource']/*[local-name() = 'strong'][1][following-sibling::*[1][local-name() = 'origin']]/text()">
+		<fo:inline>
+			
+			
+			<xsl:value-of select="."/>
+		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'origin']">
 		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
 			<xsl:if test="normalize-space(@citeas) = ''">
 				<xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
 			</xsl:if>
-			
-				
-				<fo:inline>
-					
-					
-					
-					
-					
-						<xsl:value-of select="$localized.source"/>
-						<xsl:text>: </xsl:text>
-					
-					
-					
-					
-				</fo:inline>
-			
 			<fo:inline xsl:use-attribute-sets="origin-style">
 				<xsl:apply-templates/>
 			</fo:inline>
+		</fo:basic-link>
+	</xsl:template><xsl:template match="*[local-name() = 'modification']">
+		<xsl:variable name="title-modified">
 			
-			</fo:basic-link>
+				<xsl:call-template name="getLocalizedString">
+					<xsl:with-param name="key">modified</xsl:with-param>
+				</xsl:call-template>
+			
+			
+		</xsl:variable>
+		
+    <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text>—</xsl:text></xsl:if></xsl:when>
+			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text> — </xsl:text></xsl:if></xsl:otherwise>
+		</xsl:choose>
+		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name() = 'modification']/*[local-name() = 'p']">
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name() = 'modification']/text()">
@@ -6935,7 +7053,31 @@
 		<fo:block-container border="1pt solid black" width="50%">
 			<fo:block> </fo:block>
 		</fo:block-container>
-	</xsl:template><xsl:template match="*[local-name() = 'toc']">
+	</xsl:template><xsl:variable name="toc_level">
+		<xsl:choose>
+			<xsl:when test="1 = 2"/> <!-- to do https://github.com/metanorma/mn-native-pdf/issues/337: if there is value in xml -->
+			<xsl:otherwise><!-- default value -->
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable><xsl:template match="*[local-name() = 'toc']">
 		<xsl:param name="colwidths"/>
 		<xsl:variable name="colwidths_">
 			<xsl:choose>
@@ -7575,4 +7717,14 @@
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:if>
+	</xsl:template><xsl:template name="setAltText">
+		<xsl:param name="value"/>
+		<xsl:attribute name="fox:alt-text">
+			<xsl:choose>
+				<xsl:when test="normalize-space($value) != ''">
+					<xsl:value-of select="$value"/>
+				</xsl:when>
+				<xsl:otherwise>_</xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
 	</xsl:template></xsl:stylesheet>

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -181,7 +181,7 @@ module IsoDoc
           (v = elem.at(ns("./definition/verbal-definition"))) &&
           v.elements.first.name == "p") or return
         v.elements.first.children.first.previous =
-          "<#{d.remove.children.to_xml}> "
+          "<#{d.remove.children.to_xml}> "
       end
 
       include Init

data/lib/isodoc/iso/word_convert.rb

@@ -124,9 +124,7 @@ module IsoDoc
 
       def termref_parse(node, out)
         out.p **termref_attrs do |p|
-          p << "[TERMREF]"
           node.children.each { |n| parse(n, p) }
-          p << "[/TERMREF]"
         end
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.10.3".freeze
+    VERSION = "1.10.4".freeze
   end
 end

data/spec/isodoc/postproc_spec.rb

@@ -48,7 +48,7 @@ RSpec.describe IsoDoc do
     expect(File.exist?("test.html")).to be true
     html = File.read("test.html", encoding: "UTF-8")
     expect(html).to include "<title>Cereals and pulses&#xA0;&#x2014; "\
-      "Specifications and test methods&#xA0;&#x2014; Rice</title>"
+                            "Specifications and test methods&#xA0;&#x2014; Rice</title>"
     expect(html).to match(%r{cdnjs\.cloudflare\.com/ajax/libs/mathjax/})
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
   end
@@ -77,7 +77,7 @@ RSpec.describe IsoDoc do
     expect(File.exist?("test.html")).to be true
     html = File.read("test.html", encoding: "UTF-8")
     expect(html).to include "title>Cereals and pulses&#xA0;&#x2014; "\
-      "Specifications and test methods&#xA0;&#x2014; Rice</title>"
+                            "Specifications and test methods&#xA0;&#x2014; Rice</title>"
     expect(html).to match(%r{cdnjs\.cloudflare\.com/ajax/libs/mathjax/})
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
   end
@@ -206,14 +206,10 @@ RSpec.describe IsoDoc do
                 <definition>
                   <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
                 </definition>
-                <termsource status="modified">
-                  <origin bibitemid="ISO7301" citeas="ISO 7301:2011" type="inline">
-                    <locality type="clause">
-                      <referenceFrom>3.1</referenceFrom>
-                    </locality>ISO 7301:2011, 3.1</origin>
-                  <modification>
-                    <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term &quot;cargo rice&quot; is shown as deprecated, and Note 1 to entry is not included here</p>
-                  </modification>
+                <termsource status="modified">[SOURCE:
+                  <origin bibitemid="ISO7301" citeas="ISO 7301:2011" type="inline"><locality type="clause">
+                      <referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>, modified &#x2013;
+                    The term &quot;cargo rice&quot; is shown as deprecated, and Note 1 to entry is not included here]
                 </termsource>
               </term>
             </terms>
@@ -226,23 +222,32 @@ RSpec.describe IsoDoc do
       .sub(%r{<br[^>]*>\s*<div class="colophon".*$}m, "")
 
     expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      <div class="WordSection3">
-        <p class="zzSTDTitle1"/>
-        <div>
-          <a id="_terms_and_definitions" name="_terms_and_definitions"/>
-          <h1>1
-            <span style="mso-tab-count:1">  </span>
-            Terms and Definitions</h1>
-          <p class="TermNum">
-            <a id="paddy1" name="paddy1"/>1.1</p>
-          <p class="Terms" style="text-align:left;">paddy</p>
-          <p class="Definition">
-            <a id="_eb29b35e-123e-4d1c-b50b-2714d41e747f" name="_eb29b35e-123e-4d1c-b50b-2714d41e747f"/>rice retaining its husk after threshing</p>
-          <p class="Source">[SOURCE:
-            <a href="#ISO7301">ISO 7301:2011, 3.1</a>
-            , modified — The term &quot;cargo rice&quot; is shown as deprecated, and Note 1 to entry is not included here]</p>
-        </div>
-      </div>
+           <div class='WordSection3'>
+         <p class='zzSTDTitle1'/>
+         <div>
+           <a name='_terms_and_definitions' id='_terms_and_definitions'/>
+           <h1>
+             1
+             <span style='mso-tab-count:1'>&#xA0; </span>
+              Terms and Definitions
+           </h1>
+           <p class='TermNum'>
+             <a name='paddy1' id='paddy1'/>
+             1.1
+           </p>
+           <p class='Terms' style='text-align:left;'>paddy</p>
+           <p class='Definition'>
+             <a name='_eb29b35e-123e-4d1c-b50b-2714d41e747f' id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'/>
+             rice retaining its husk after threshing
+           </p>
+           <p class='Source'>
+             [SOURCE:
+             <a href='#ISO7301'>ISO 7301:2011, 3.1</a>
+             , modified &#x2013; The term "cargo rice" is shown as deprecated, and Note
+             1 to entry is not included here]
+           </p>
+         </div>
+       </div>
     OUTPUT
   end
 
@@ -262,6 +267,84 @@ RSpec.describe IsoDoc do
     expect(word).to include('Content-Disposition: inline; filename="header.html"')
   end
 
+  it "populates HTML ToC" do
+    IsoDoc::Iso::HtmlConvert
+      .new(WORD_HTML_CSS.dup)
+      .convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <sections>
+            <clause id="A" inline-header="false" obligation="normative">
+              <title>1
+                <tab/>
+                Clause 4</title>
+              <clause id="N" inline-header="false" obligation="normative">
+                <title>1.1
+                  <tab/>
+                  Introduction
+                  <bookmark id="Q"/>
+                  to this
+                  <fn reference="1">
+                    <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p></fn>
+                </title>
+              </clause>
+              <clause id="O" inline-header="false" obligation="normative">
+                <title>1.2
+                  <tab/>
+                  Clause 4.2</title>
+                <p>A
+                  <fn reference="1">
+                    <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p></fn>
+                </p>
+              </clause>
+            </clause>
+            <clause id="P"><title>2<tab/>Clause 5</title>
+            <clause id="P1"><title>2.1<tab/>Clause 5.1</title></clause>
+            </clause>
+            <clause id="Q"><title>3<tab/>Clause 6</title></clause>
+          </sections>
+        </iso-standard>
+      INPUT
+
+    html = Nokogiri::XML(File.read("test.html", encoding: "UTF-8"))
+      .at("//div[@id = 'toc']").to_xml
+
+    expect(xmlpp(html))
+      .to be_equivalent_to xmlpp(<<~'OUTPUT')
+        <div id='toc'>
+          <ul>
+            <li class='h1'>
+              <div class='collapse-group'>
+                <a href='#toc0'>1 &#xA0; Clause 4</a>
+                <div class='collapse-button'/>
+              </div>
+              <ul class='content collapse'>
+                <li class='h2'>
+                  <a href='#toc1'> 1.1 &#xA0; Introduction to this </a>
+                </li>
+                <li class='h2'>
+                  <a href='#toc2'> 1.2 &#xA0; Clause 4.2</a>
+                </li>
+              </ul>
+            </li>
+            <li class='h1'>
+              <div class='collapse-group'>
+                <a href='#toc3'>2&#xA0; Clause 5</a>
+                <div class='collapse-button'/>
+              </div>
+              <ul class='content collapse'>
+                <li class='h2'>
+                  <a href='#toc4'> 2.1&#xA0; Clause 5.1</a>
+                </li>
+              </ul>
+            </li>
+            <li class='h1'>
+              <a href='#toc5'> 3&#xA0; Clause 6</a>
+            </li>
+          </ul>
+        </div>
+      OUTPUT
+  end
+
   it "populates Word ToC" do
     IsoDoc::Iso::WordConvert
       .new(WORD_HTML_CSS_WORDINTRO.dup)
@@ -886,7 +969,7 @@ RSpec.describe IsoDoc do
         </div>
       OUTPUT
     expect(word).to include '<p class="zzWarning">This document is not '\
-      "an ISO International Standard"
+                            "an ISO International Standard"
   end
 
   it "populates Word ToC" do