metanorma-iso 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62383db44746d5687ee8f592669444896cb5f24b79265194a496ef11b0ad0c40
-  data.tar.gz: 8ce7b65a8d65719729bde2e6a78c442aef2281262b850e16e2bc8d6b3c3210d1
+  metadata.gz: f3fb4819b20d1155ffd0acf0fd579db499b4fbcc03339da743b1890ae41dfe95
+  data.tar.gz: 2b1d15d4c9b4a884727ac31588faee8adc2e902cb3ff84a8cdca8e6e70f7684b
 SHA512:
-  metadata.gz: c5b9244680bc5f548676e5a5b77e26456bbaa3f4bb47125a38053b19ca83a34ac7c37d23ccdc45b12dc568832e9c157f010dbc5417171efd41708b85187c484e
-  data.tar.gz: e5f05e8738f30968928dbebcadf19709da40afc102d909918f63517af96fae7cb92b4f8189952d02eb3f38ada00ed2078e38d096fab2ddecf1dc86d139b3faa2
+  metadata.gz: e5b8815b2c3426fa2ba8f804823cb04ae7ec3cc44468f602fa95e68658098c5bb53c1212a339774d9b78acb253e2cc38858f342cbb9d2f87a2a3d0163ca28414
+  data.tar.gz: 7f77370059f7c43b52fbc6555e8a49c3574fffa4928bd2e953f0356cda4906b32ddf674d2c04a3716daec6d17d5b054a83dfb73f21ce8e87fed8d5bbe09d5c04

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

@@ -638,7 +638,18 @@ h6,
 
 /* override for amendments */
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
-h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+h1:not(.AmendNewcontent *),
+h2:not(.AmendNewcontent *),
+h3:not(.AmendNewcontent *),
+h4:not(.AmendNewcontent *),
+h5:not(.AmendNewcontent *),
+h6:not(.AmendNewcontent *),
+.h1:not(.AmendNewcontent *),
+.h2:not(.AmendNewcontent *),
+.h3:not(.AmendNewcontent *),
+.h4:not(.AmendNewcontent *),
+.h5:not(.AmendNewcontent *),
+.h6:not(.AmendNewcontent *) {
   font-weight: normal;
   font-size: initial;
   font-style: italic;
@@ -1407,6 +1418,19 @@ ol > li > p::before {
   margin-right: auto;
 }
 
+.Quote .Quote {
+  margin-top: 0px;
+}
+
+.Quote .h1,
+.Quote .h2,
+.Quote .h3,
+.Quote .h4,
+.Quote .h5,
+.Quote .h6 {
+  margin-top: 0px;
+}
+
 /*
 3.12 Formulas
 */

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

@@ -185,7 +185,18 @@ h6,
 
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
 
-h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+h1:not(.AmendNewcontent *),
+h2:not(.AmendNewcontent *),
+h3:not(.AmendNewcontent *),
+h4:not(.AmendNewcontent *),
+h5:not(.AmendNewcontent *),
+h6:not(.AmendNewcontent *),
+.h1:not(.AmendNewcontent *),
+.h2:not(.AmendNewcontent *),
+.h3:not(.AmendNewcontent *),
+.h4:not(.AmendNewcontent *),
+.h5:not(.AmendNewcontent *),
+.h6:not(.AmendNewcontent *) {
     font-weight: normal;
     font-size: initial;
     font-style: italic;
@@ -711,6 +722,19 @@ ol>li>p::before {
     @include blockquoteBlock(#f7f7f7);
 }
 
+.Quote .Quote {
+  margin-top: 0px;
+}
+
+.Quote .h1, 
+.Quote .h2, 
+.Quote .h3, 
+.Quote .h4, 
+.Quote .h5, 
+.Quote .h6 {
+  margin-top: 0px;
+}
+
 /*
 3.12 Formulas
 */

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

@@ -595,7 +595,18 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
 }
 
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
-h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+h1:not(.AmendNewcontent *),
+h2:not(.AmendNewcontent *),
+h3:not(.AmendNewcontent *),
+h4:not(.AmendNewcontent *),
+h5:not(.AmendNewcontent *),
+h6:not(.AmendNewcontent *),
+.h1:not(.AmendNewcontent *),
+.h2:not(.AmendNewcontent *),
+.h3:not(.AmendNewcontent *),
+.h4:not(.AmendNewcontent *),
+.h5:not(.AmendNewcontent *),
+.h6:not(.AmendNewcontent *) {
   font-weight: normal;
   font-size: initial;
   font-style: italic;
@@ -1467,6 +1478,19 @@ ol > li > p::before {
   margin-right: auto;
 }
 
+.Quote .Quote {
+  margin-top: 0px;
+}
+
+.Quote .h1,
+.Quote .h2,
+.Quote .h3,
+.Quote .h4,
+.Quote .h5,
+.Quote .h6 {
+  margin-top: 0px;
+}
+
 /*
 3.12 Formulas
 */

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

@@ -136,7 +136,18 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
 
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
 
-h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+h1:not(.AmendNewcontent *),
+h2:not(.AmendNewcontent *),
+h3:not(.AmendNewcontent *),
+h4:not(.AmendNewcontent *),
+h5:not(.AmendNewcontent *),
+h6:not(.AmendNewcontent *),
+.h1:not(.AmendNewcontent *),
+.h2:not(.AmendNewcontent *),
+.h3:not(.AmendNewcontent *),
+.h4:not(.AmendNewcontent *),
+.h5:not(.AmendNewcontent *),
+.h6:not(.AmendNewcontent *) {
     font-weight: normal;
     font-size: initial;
     font-style: italic;
@@ -739,6 +750,19 @@ ol > li > p::before {
     @include blockquoteBlock(#f7f7f7);
 }
 
+.Quote .Quote {
+  margin-top: 0px;
+}
+
+.Quote .h1,
+.Quote .h2,
+.Quote .h3,
+.Quote .h4,
+.Quote .h5,
+.Quote .h6 {
+  margin-top: 0px;
+}
+
 /*
 3.12 Formulas
 */

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

@@ -4232,6 +4232,9 @@
 			<xsl:variable name="title">
 				<xsl:call-template name="getName"/>
 			</xsl:variable>
+			<xsl:variable name="variant_title">
+				<xsl:copy-of select="mn:variant-title[@type = 'toc']/node()"/>
+			</xsl:variable>
 
 			<xsl:variable name="root">
 				<xsl:if test="ancestor-or-self::mn:preface">preface</xsl:if>
@@ -4243,11 +4246,22 @@
 					<xsl:attribute name="level">1</xsl:attribute>
 				</xsl:if>
 				<mnx:title>
-					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
-						<xsl:with-param name="element">
-							<xsl:if test="$level = 1"><xsl:value-of select="$root"/></xsl:if>
-						</xsl:with-param>
-					</xsl:apply-templates>
+					<xsl:choose>
+						<xsl:when test="normalize-space($variant_title) != ''">
+							<xsl:apply-templates select="xalan:nodeset($variant_title)" mode="contents_item">
+								<xsl:with-param name="element">
+									<xsl:if test="$level = 1"><xsl:value-of select="$root"/></xsl:if>
+								</xsl:with-param>
+							</xsl:apply-templates>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
+								<xsl:with-param name="element">
+									<xsl:if test="$level = 1"><xsl:value-of select="$root"/></xsl:if>
+								</xsl:with-param>
+							</xsl:apply-templates>
+						</xsl:otherwise>
+					</xsl:choose>
 				</mnx:title>
 				<xsl:if test="$type != 'index'">
 					<xsl:apply-templates mode="contents"/>
@@ -6676,7 +6690,24 @@
 	<xsl:template match="mn:metanorma-extension/*[local-name() = 'UnitsML']" mode="update_xml_step1"/>
 
 	<!-- remove image/emf -->
-	<xsl:template match="mn:image/mn:emf" mode="update_xml_step1"/>
+	<xsl:template match="mn:image//mn:emf" mode="update_xml_step1"/>
+
+	<!-- https://github.com/metanorma/metanorma/issues/540 -->
+	<xsl:template match="mn:image[mn:altsource]" priority="3" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
+			<xsl:choose>
+				<xsl:when test="mn:altsource[contains(@tag, 'pdf')]">
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/@*" mode="update_xml_step1"/>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/node()" mode="update_xml_step1"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/@*" mode="update_xml_step1"/>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/node()" mode="update_xml_step1"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:copy>
+	</xsl:template>
 
 	<!-- remove preprocess-xslt -->
 	<xsl:template match="mn:preprocess-xslt" mode="update_xml_step1"/>
@@ -6938,6 +6969,15 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<!-- https://github.com/metanorma/metanorma-iso/issues/1535 -->
+	<xsl:template match="mn:ol[mn:fmt-ol]" mode="update_xml_step1">
+		<xsl:apply-templates select="mn:fmt-ol" mode="update_xml_step1"/>
+	</xsl:template>
+
+	<xsl:template match="mn:ul[mn:fmt-ul]" mode="update_xml_step1">
+		<xsl:apply-templates select="mn:fmt-ul" mode="update_xml_step1"/>
+	</xsl:template>
+
 	<!-- li/fmt-name -->
 	<xsl:template match="mn:li/mn:fmt-name" priority="2" mode="update_xml_step1">
 		<xsl:attribute name="label"><xsl:value-of select="."/></xsl:attribute>
@@ -10432,6 +10472,8 @@
 		</xsl:if>
 
 		<xsl:call-template name="setBordersTableArray"/>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-style -->
 
 	<xsl:attribute-set name="table-number-style">
@@ -10492,6 +10534,8 @@
 		</xsl:choose>
 
 		<xsl:call-template name="setBordersTableArray"/>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-header-row-style -->
 
 	<xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
@@ -10501,6 +10545,8 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_table-footer-row-style">
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-footer-row-style -->
 
 	<xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
@@ -10513,6 +10559,8 @@
 		</xsl:if>
 
 		<xsl:call-template name="setBordersTableArray"/>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-body-row-style -->
 
 	<xsl:attribute-set name="table-header-cell-style">
@@ -10543,6 +10591,16 @@
 		</xsl:if>
 
 		<xsl:call-template name="setTableCellAttributes"/>
+
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="display-align">before</xsl:attribute>
+			<xsl:attribute name="text-align">left</xsl:attribute>
+			<xsl:if test="following-sibling::*">
+				<xsl:attribute name="padding-right">4mm</xsl:attribute>
+			</xsl:if>
+			<xsl:call-template name="setNoBordersForTableList"/>
+		</xsl:if>
+
 	</xsl:template> <!-- refine_table-header-cell-style -->
 
 	<xsl:attribute-set name="table-cell-style">
@@ -10576,6 +10634,15 @@
 
 		<xsl:call-template name="setBordersTableArray"/>
 
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="display-align">before</xsl:attribute>
+			<xsl:attribute name="text-align">left</xsl:attribute>
+			<xsl:if test="following-sibling::*">
+				<xsl:attribute name="padding-right">4mm</xsl:attribute>
+			</xsl:if>
+			<xsl:call-template name="setNoBordersForTableList"/>
+		</xsl:if>
+
 	</xsl:template> <!-- refine_table-cell-style -->
 
 	<xsl:attribute-set name="table-footer-cell-style">
@@ -10591,6 +10658,8 @@
 		<xsl:if test="$layoutVersion = '2024'">
 			<xsl:attribute name="border-top"><xsl:value-of select="$table-border"/></xsl:attribute>
 		</xsl:if>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-footer-cell-style -->
 
 	<xsl:attribute-set name="table-note-style">
@@ -10643,6 +10712,16 @@
 	<xsl:template name="refine_table-fn-body-style">
 	</xsl:template>
 
+	<xsl:template name="setNoBordersForTableList">
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="border">none</xsl:attribute>
+			<xsl:attribute name="border-top">none</xsl:attribute>
+			<xsl:attribute name="border-bottom">none</xsl:attribute>
+			<xsl:attribute name="border-left">none</xsl:attribute>
+			<xsl:attribute name="border-right">none</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- ========================== -->
 	<!-- END Table styles -->
 	<!-- ========================== -->
@@ -16422,6 +16501,10 @@
 		</fo:list-item>
 	</xsl:template>
 
+	<xsl:template match="mn:fmt-ol | mn:fmt-ul">
+		<xsl:apply-templates/>
+	</xsl:template>
+
 	<!-- ===================================== -->
 	<!-- END Lists processing -->
 	<!-- ===================================== -->

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

@@ -4232,6 +4232,9 @@
 			<xsl:variable name="title">
 				<xsl:call-template name="getName"/>
 			</xsl:variable>
+			<xsl:variable name="variant_title">
+				<xsl:copy-of select="mn:variant-title[@type = 'toc']/node()"/>
+			</xsl:variable>
 
 			<xsl:variable name="root">
 				<xsl:if test="ancestor-or-self::mn:preface">preface</xsl:if>
@@ -4243,11 +4246,22 @@
 					<xsl:attribute name="level">1</xsl:attribute>
 				</xsl:if>
 				<mnx:title>
-					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
-						<xsl:with-param name="element">
-							<xsl:if test="$level = 1"><xsl:value-of select="$root"/></xsl:if>
-						</xsl:with-param>
-					</xsl:apply-templates>
+					<xsl:choose>
+						<xsl:when test="normalize-space($variant_title) != ''">
+							<xsl:apply-templates select="xalan:nodeset($variant_title)" mode="contents_item">
+								<xsl:with-param name="element">
+									<xsl:if test="$level = 1"><xsl:value-of select="$root"/></xsl:if>
+								</xsl:with-param>
+							</xsl:apply-templates>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
+								<xsl:with-param name="element">
+									<xsl:if test="$level = 1"><xsl:value-of select="$root"/></xsl:if>
+								</xsl:with-param>
+							</xsl:apply-templates>
+						</xsl:otherwise>
+					</xsl:choose>
 				</mnx:title>
 				<xsl:if test="$type != 'index'">
 					<xsl:apply-templates mode="contents"/>
@@ -6676,7 +6690,24 @@
 	<xsl:template match="mn:metanorma-extension/*[local-name() = 'UnitsML']" mode="update_xml_step1"/>
 
 	<!-- remove image/emf -->
-	<xsl:template match="mn:image/mn:emf" mode="update_xml_step1"/>
+	<xsl:template match="mn:image//mn:emf" mode="update_xml_step1"/>
+
+	<!-- https://github.com/metanorma/metanorma/issues/540 -->
+	<xsl:template match="mn:image[mn:altsource]" priority="3" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
+			<xsl:choose>
+				<xsl:when test="mn:altsource[contains(@tag, 'pdf')]">
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/@*" mode="update_xml_step1"/>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/node()" mode="update_xml_step1"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/@*" mode="update_xml_step1"/>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/node()" mode="update_xml_step1"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:copy>
+	</xsl:template>
 
 	<!-- remove preprocess-xslt -->
 	<xsl:template match="mn:preprocess-xslt" mode="update_xml_step1"/>
@@ -6938,6 +6969,15 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<!-- https://github.com/metanorma/metanorma-iso/issues/1535 -->
+	<xsl:template match="mn:ol[mn:fmt-ol]" mode="update_xml_step1">
+		<xsl:apply-templates select="mn:fmt-ol" mode="update_xml_step1"/>
+	</xsl:template>
+
+	<xsl:template match="mn:ul[mn:fmt-ul]" mode="update_xml_step1">
+		<xsl:apply-templates select="mn:fmt-ul" mode="update_xml_step1"/>
+	</xsl:template>
+
 	<!-- li/fmt-name -->
 	<xsl:template match="mn:li/mn:fmt-name" priority="2" mode="update_xml_step1">
 		<xsl:attribute name="label"><xsl:value-of select="."/></xsl:attribute>
@@ -10432,6 +10472,8 @@
 		</xsl:if>
 
 		<xsl:call-template name="setBordersTableArray"/>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-style -->
 
 	<xsl:attribute-set name="table-number-style">
@@ -10492,6 +10534,8 @@
 		</xsl:choose>
 
 		<xsl:call-template name="setBordersTableArray"/>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-header-row-style -->
 
 	<xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
@@ -10501,6 +10545,8 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_table-footer-row-style">
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-footer-row-style -->
 
 	<xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
@@ -10513,6 +10559,8 @@
 		</xsl:if>
 
 		<xsl:call-template name="setBordersTableArray"/>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-body-row-style -->
 
 	<xsl:attribute-set name="table-header-cell-style">
@@ -10543,6 +10591,16 @@
 		</xsl:if>
 
 		<xsl:call-template name="setTableCellAttributes"/>
+
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="display-align">before</xsl:attribute>
+			<xsl:attribute name="text-align">left</xsl:attribute>
+			<xsl:if test="following-sibling::*">
+				<xsl:attribute name="padding-right">4mm</xsl:attribute>
+			</xsl:if>
+			<xsl:call-template name="setNoBordersForTableList"/>
+		</xsl:if>
+
 	</xsl:template> <!-- refine_table-header-cell-style -->
 
 	<xsl:attribute-set name="table-cell-style">
@@ -10576,6 +10634,15 @@
 
 		<xsl:call-template name="setBordersTableArray"/>
 
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="display-align">before</xsl:attribute>
+			<xsl:attribute name="text-align">left</xsl:attribute>
+			<xsl:if test="following-sibling::*">
+				<xsl:attribute name="padding-right">4mm</xsl:attribute>
+			</xsl:if>
+			<xsl:call-template name="setNoBordersForTableList"/>
+		</xsl:if>
+
 	</xsl:template> <!-- refine_table-cell-style -->
 
 	<xsl:attribute-set name="table-footer-cell-style">
@@ -10591,6 +10658,8 @@
 		<xsl:if test="$layoutVersion = '2024'">
 			<xsl:attribute name="border-top"><xsl:value-of select="$table-border"/></xsl:attribute>
 		</xsl:if>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-footer-cell-style -->
 
 	<xsl:attribute-set name="table-note-style">
@@ -10643,6 +10712,16 @@
 	<xsl:template name="refine_table-fn-body-style">
 	</xsl:template>
 
+	<xsl:template name="setNoBordersForTableList">
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="border">none</xsl:attribute>
+			<xsl:attribute name="border-top">none</xsl:attribute>
+			<xsl:attribute name="border-bottom">none</xsl:attribute>
+			<xsl:attribute name="border-left">none</xsl:attribute>
+			<xsl:attribute name="border-right">none</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- ========================== -->
 	<!-- END Table styles -->
 	<!-- ========================== -->
@@ -16422,6 +16501,10 @@
 		</fo:list-item>
 	</xsl:template>
 
+	<xsl:template match="mn:fmt-ol | mn:fmt-ul">
+		<xsl:apply-templates/>
+	</xsl:template>
+
 	<!-- ===================================== -->
 	<!-- END Lists processing -->
 	<!-- ===================================== -->

data/lib/isodoc/iso/presentation_section.rb

@@ -144,6 +144,14 @@ module IsoDoc
       def move_norm_ref_to_sections(docxml)
         amd?(docxml) or super
       end
+
+      # number amend subclauses in amendments
+      def amend_subclause(clause, depth)
+        old_suppressheadingnumbers = @suppressheadingnumbers
+        @suppressheadingnumbers = false
+        super
+        @suppressheadingnumbers = old_suppressheadingnumbers
+      end
     end
   end
 end

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -31,9 +31,9 @@ module IsoDoc
         formula docxml
         admonition docxml
         source docxml
-        #list_to_table docxml
         ul docxml
         ol docxml
+        list_to_table docxml
         quote docxml
         permission docxml
         requirement docxml
@@ -113,9 +113,9 @@ module IsoDoc
 
       def formula_where(dlist)
         dlist.nil? and return
-        dlist.xpath(ns(".//dt")).size == 1 &&
+        (dlist.xpath(ns(".//dt")).size == 1 &&
           dlist.at(ns(".//dd"))&.elements&.size == 1 &&
-          dlist.at(ns(".//dd/p")) or return super
+          dlist.at(ns(".//dd/p"))) or return super
         formula_where_one(dlist)
       end
 
@@ -129,11 +129,7 @@ module IsoDoc
       def table1(elem)
         table1_key(elem)
         if elem["class"] == "modspec"
-          if n = elem.at(ns(".//fmt-name"))
-            n.remove.name = "name"
-            elem.add_first_child(n)
-          end
-          elem.at(ns("./thead"))&.remove
+          table1_modspec_name(elem)
           super
           elem.at(ns("./name"))&.remove
           table1_fmt_xref_modspec(elem)
@@ -141,15 +137,23 @@ module IsoDoc
         end
       end
 
+      def table1_modspec_name(elem)
+        if n = elem.at(ns(".//fmt-name"))
+          n.remove.name = "name"
+          elem.add_first_child(n)
+        end
+        elem.at(ns("./thead"))&.remove
+      end
+
       def table1_fmt_xref_modspec(elem)
         p = elem.parent.parent.at(ns("./fmt-xref-label")) or return
-        t = elem.at(ns("./fmt-xref-label"))&.remove or return
+        t = elem.at(ns("./fmt-xref-label")) or return
         n = t.at(ns("./span[@class='fmt-element-name'][2]")) or return
         while i = n.next
           i.remove
         end
         n.remove
-        p.children.first.previous = to_xml(t.children)
+        p.children.first.previous = to_xml(t.remove.children)
       end
 
       def table1_key(elem)
@@ -229,8 +233,8 @@ module IsoDoc
       end
 
       def url_note_process(data)
-        data[:type] == "standard" && data[:home_standard] == false &&
-          !data[:uri].blank? or return ""
+        (data[:type] == "standard" && data[:home_standard] == false &&
+          !data[:uri].blank?) or return ""
         id = "_#{UUIDTools::UUID.random_create}"
         @new_ids[id] = nil
         <<~XML

data/lib/isodoc/iso/word_convert.rb

@@ -51,21 +51,13 @@ module IsoDoc
 
       def convert(input_filename, file = nil, debug = false,
                 output_filename = nil)
-        if @dis && use_dis?(input_filename, file)
+        if @dis&.use_dis?(input_filename, file, @wordtemplate)
           swap_renderer(self, @dis, file, input_filename, debug)
           @dis.convert(input_filename, file, debug, output_filename)
         else super
         end
       end
 
-      def use_dis?(input_filename, file)
-        file ||= File.read(input_filename, encoding: "utf-8")
-        stage = Nokogiri::XML(file, &:huge)
-          .at(ns("//bibdata/status/stage"))&.text
-        (/^[4569].$/.match?(stage) && @wordtemplate != "simple") ||
-          (/^[0-3].$/.match?(stage) && @wordtemplate == "dis")
-      end
-
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
         xml.body(**body_attr) do |body|
@@ -132,7 +124,7 @@ module IsoDoc
         page_break(out)
         out.div do |div|
           div.h1(**bibliography_attrs) do |h1|
-            node&.at(ns("./fmt-title"))&.children&.each { |c2| parse(c2, h1) }
+            children_parse(node&.at(ns("./fmt-title")), h1)
           end
           biblio_list(node, div, true)
         end

data/lib/isodoc/iso/word_dis_convert.rb

@@ -5,6 +5,14 @@ module IsoDoc
     class WordDISConvert < WordConvert
       attr_accessor :bgstripcolor
 
+      def use_dis?(input_filename, file, wordtemplate)
+        file ||= File.read(input_filename, encoding: "utf-8")
+        stage = Nokogiri::XML(file, &:huge)
+          .at(ns("//bibdata/status/stage"))&.text
+        (/^[4569].$/.match?(stage) && wordtemplate != "simple") ||
+          (/^[0-3].$/.match?(stage) && wordtemplate == "dis")
+      end
+
       def default_file_locations(_options)
         { wordstylesheet: html_doc_path("wordstyle-dis.scss"),
           standardstylesheet: html_doc_path("isodoc-dis.scss"),