metanorma-iso 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3627f1a989c6d2de4b3cdb643cec42761bdc8fae0e2717d760d02abd1b78e195
-  data.tar.gz: 64820748297125b29676d224abacd67e27cbdf10198241dde7985bceaae263af
+  metadata.gz: 62383db44746d5687ee8f592669444896cb5f24b79265194a496ef11b0ad0c40
+  data.tar.gz: 8ce7b65a8d65719729bde2e6a78c442aef2281262b850e16e2bc8d6b3c3210d1
 SHA512:
-  metadata.gz: 3b553a3d16a9379f973d03592a38a84955579d5c44b2fe36cefbb350ef350b42312d951c6b75a35882a6ee50d336b145c0be36682c4913f48a89b150b439cad4
-  data.tar.gz: dfe4f25fa5c06fff908bf343cee16d355488d538df8906759f2c9b14076a574d09d183dfdafe16c2f6f84cb84ffa1257708fcc59d0719daf80358f9c6e93d56f
+  metadata.gz: c5b9244680bc5f548676e5a5b77e26456bbaa3f4bb47125a38053b19ca83a34ac7c37d23ccdc45b12dc568832e9c157f010dbc5417171efd41708b85187c484e
+  data.tar.gz: e5f05e8738f30968928dbebcadf19709da40afc102d909918f63517af96fae7cb92b4f8189952d02eb3f38ada00ed2078e38d096fab2ddecf1dc86d139b3faa2

data/lib/isodoc/iso/base_convert.rb

@@ -68,12 +68,6 @@ module IsoDoc
         end
       end
 
-      def admonition_class(node)
-        if node["type"] == "editorial" then "zzHelp"
-        else super
-        end
-      end
-
       def admonition_p_parse(node, div)
         admonition_name_in_first_para(node, div)
       end

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

@@ -319,6 +319,11 @@ svg {
   display: block; /* ← removes unwanted inline spacing */
 }
 
+/* style dfn by override in flavor */
+dfn {
+  font-style: inherit;
+}
+
 #standard-band {
   background-color: #0AC442;
 }
@@ -1439,16 +1444,13 @@ span.keyword {
 }
 
 .Admonition p,
-.admonition p,
-.zzHelp p {
+.admonition p {
   margin: 0;
 }
 
-div.zzHelp {
+div.Admonition.AdmonitionEditorial {
   color: green;
-  padding: 0.5em;
-  margin: 1.5em 0 1.5em 0;
-  text-align: left;
+  background-color: white;
 }
 
 /* Collapse TOC */

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

@@ -747,16 +747,14 @@ span.keyword {
 }
 
 .Admonition p,
-.admonition p,
-.zzHelp p {
+.admonition p
+{
     margin: 0;
 }
 
-div.zzHelp {
+div.Admonition.AdmonitionEditorial {
   color: green;
-  padding: 0.5em;
-  margin: 1.5em 0 1.5em 0;
-  text-align: left;
+  background-color: white;
 }
 
 /* Collapse TOC */

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

@@ -319,6 +319,11 @@ svg {
   display: block; /* ← removes unwanted inline spacing */
 }
 
+/* style dfn by override in flavor */
+dfn {
+  font-style: inherit;
+}
+
 #standard-band {
   background-color: #0AC442;
 }
@@ -1274,15 +1279,13 @@ figcaption, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
   text-align: left;
 }
 
-.Admonition p, .zzHelp p {
+.Admonition p {
   margin: 0;
 }
 
-div.zzHelp {
+div.Admonition.AdmonitionEditorial {
   color: green;
-  padding: 0.5em;
-  margin: 1.5em 0 1.5em 0;
-  text-align: left;
+  background-color: white;
 }
 
 /*

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

@@ -584,15 +584,13 @@ figure dl {
     text-align: left;
 }
 
-.Admonition p, .zzHelp p {
+.Admonition p {
     margin: 0;
 }
 
-div.zzHelp {
+div.Admonition.AdmonitionEditorial {
   color: green;
-  padding: 0.5em;
-  margin: 1.5em 0 1.5em 0;
-  text-align: left;
+  background-color: white;
 }
 
 

data/lib/isodoc/iso/html_convert.rb

@@ -115,7 +115,14 @@ module IsoDoc
 
       def ol_attrs(node)
         ret = super
-        ret.merge(class: OL_STYLE.invert[ret[:type]])
+        klass = OL_STYLE.invert[ret[:type]]
+        ret = ret.merge(class: klass)
+        if (start = node["start"]) && klass
+          start_val = start.to_i - 1
+          existing_style = ret[:style] ? "#{ret[:style]};" : ""
+          ret = ret.merge(style: "#{existing_style}counter-reset: #{klass} #{start_val}")
+        end
+        ret
       end
 
       include BaseConvert

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

@@ -2097,7 +2097,7 @@
 
 											<fo:block-container font-family="Cambria" line-height="1.1" role="SKIP" height="110mm">
 												<!-- for role see coment https://github.com/pdf-association/extension-brotli/issues/5#issuecomment-3931742869 -->
-												<fo:block margin-right="3.5mm"> <!-- role="SKIP" -->
+												<fo:block margin-right="3.5mm" role="P/Title"> <!-- role="SKIP" -->
 													<fo:block font-size="18pt" font-weight="bold" margin-top="2.5mm" role="SKIP"> <!-- role="H1" -->
 														<xsl:call-template name="insertTitlesLangMain"><xsl:with-param name="num" select="$num"/></xsl:call-template>
 													</fo:block>
@@ -2532,7 +2532,7 @@
 
 										<fo:block-container line-height="1.1" margin-top="3mm" role="SKIP">
 											<xsl:call-template name="insertTripleLine"/>
-											<fo:block margin-right="5mm"> <!-- role="SKIP" -->
+											<fo:block margin-right="5mm" role="P/Title"> <!-- role="SKIP" -->
 												<fo:block font-size="18pt" font-weight="bold" margin-top="6pt" role="SKIP"> <!-- role="H1" -->
 													<xsl:if test="$layoutVersion = '1989'">
 														<xsl:attribute name="font-size">16pt</xsl:attribute>
@@ -2782,7 +2782,7 @@
 													<fo:table-cell role="SKIP">
 														<xsl:call-template name="insertTripleLine"/>
 														<fo:block-container line-height="1.1" role="SKIP">
-															<fo:block margin-right="3.5mm"> <!-- role="SKIP" -->
+															<fo:block margin-right="3.5mm" role="P/Title"> <!-- role="SKIP" -->
 																<xsl:variable name="font_size">
 																	<xsl:choose>
 																		<xsl:when test="$layoutVersion = '1989'">16pt</xsl:when>
@@ -2929,7 +2929,7 @@
 
 								<xsl:call-template name="insertTripleLine"/>
 								<fo:block-container line-height="1.1" role="SKIP">
-									<fo:block margin-right="40mm"> <!-- role="SKIP" -->
+									<fo:block margin-right="40mm" role="P/Title"> <!-- role="SKIP" -->
 										<fo:block font-size="18pt" font-weight="bold" margin-top="12pt" role="SKIP"> <!--  role="H1" -->
 											<xsl:if test="$layoutVersion = '1989'">
 												<xsl:attribute name="font-size">16pt</xsl:attribute>
@@ -3010,7 +3010,7 @@
 								</fo:block>
 							</fo:block-container>
 
-							<fo:block-container font-size="16pt" role="P"> <!-- role="SKIP" -->
+							<fo:block-container font-size="16pt" role="P/Title"> <!-- role="SKIP" -->
 								<!-- Information and documentation — Codes for transcription systems  -->
 									<fo:block font-weight="bold" role="SKIP"> <!-- role="H1" -->
 										<xsl:call-template name="insertTitlesLangMain"><xsl:with-param name="num" select="$num"/></xsl:call-template>
@@ -3748,25 +3748,25 @@
 													</fo:block>
 												</fo:list-item-label>
 												<fo:list-item-body start-indent="body-start()" role="SKIP">
-													<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm" role="SKIP"> <!-- role="SKIP" role="Reference" -->
+													<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm" role="Reference"> <!-- role="SKIP" role="Reference" -->
 
 														<xsl:if test="$layoutVersion = '1987' and @type = 'section'">
 															<xsl:attribute name="font-weight">bold</xsl:attribute>
 														</xsl:if>
 
 														<!-- Reference/Link for title -->
-														<fo:wrapper role="Reference">
+														<!-- <fo:wrapper role="Reference"> -->
 															<fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}"> <!-- role="SKIP" -->
 																<xsl:if test="$layoutVersion = '1987' and @type = 'section'">
 																	<xsl:value-of select="concat(@section, ' ')"/>
 																</xsl:if>
 																<xsl:apply-templates select="mnx:title"/>
-															</fo:basic-link>
-														</fo:wrapper>
+															<!-- </fo:basic-link> -->
+														<!-- </fo:wrapper> -->
 
 														<!-- Reference/Link for page number -->
-														<fo:wrapper role="Reference">
-															<fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}">
+														<!-- <fo:wrapper role="Reference"> -->
+															<!-- <fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}"> -->
 																<fo:inline keep-together.within-line="always" role="SKIP">
 																	<fo:leader xsl:use-attribute-sets="toc-leader-style"><xsl:call-template name="refine_toc-leader-style"/></fo:leader>
 																	<fo:inline role="SKIP">
@@ -3784,7 +3784,7 @@
 																	</fo:inline>
 																</fo:inline>
 															</fo:basic-link>
-														</fo:wrapper>
+														<!-- </fo:wrapper> -->
 
 													</fo:block>
 												</fo:list-item-body>
@@ -3795,28 +3795,38 @@
 
 							</xsl:for-each>
 
-							<!-- List of Tables -->
-							<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:tables/mnx:table">
-								<xsl:if test="position() = 1">
-									<xsl:call-template name="insertListOf_Title">
-										<xsl:with-param name="title" select="$title-list-tables"/>
-									</xsl:call-template>
-								</xsl:if>
-								<xsl:call-template name="insertListOf_Item"/>
-							</xsl:for-each>
+						</xsl:if>
+					</fo:block>
 
-							<!-- List of Figures -->
-							<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:figures/mnx:figure">
-								<xsl:if test="position() = 1">
-									<xsl:call-template name="insertListOf_Title">
-										<xsl:with-param name="title" select="$title-list-figures"/>
-									</xsl:call-template>
-								</xsl:if>
-								<xsl:call-template name="insertListOf_Item"/>
-							</xsl:for-each>
+					<xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
+						<xsl:if test="$contents/mnx:doc[@num = $num]//mnx:tables/mnx:table">
+							<fo:block-container>
+								<!-- List of Tables -->
+								<xsl:call-template name="insertListOf_Title">
+									<xsl:with-param name="title" select="$title-list-tables"/>
+								</xsl:call-template>
+								<fo:block role="TOC">
+									<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:tables/mnx:table">
+										<xsl:call-template name="insertListOf_Item"/>
+									</xsl:for-each>
+								</fo:block>
+							</fo:block-container>
+						</xsl:if>
 
+						<xsl:if test="$contents/mnx:doc[@num = $num]//mnx:figures/mnx:figure">
+							<fo:block-container>
+								<!-- List of Figures -->
+								<xsl:call-template name="insertListOf_Title">
+									<xsl:with-param name="title" select="$title-list-figures"/>
+								</xsl:call-template>
+								<fo:block role="TOC">
+									<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:figures/mnx:figure">
+										<xsl:call-template name="insertListOf_Item"/>
+									</xsl:for-each>
+								</fo:block>
+							</fo:block-container>
 						</xsl:if>
-					</fo:block>
+					</xsl:if>
 				</fo:block-container>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -3890,9 +3900,9 @@
 						<xsl:with-param name="value" select="@alt-text"/>
 					</xsl:call-template>
 					<xsl:apply-templates select="." mode="contents"/>
-					<fo:inline keep-together.within-line="always">
+					<fo:inline keep-together.within-line="always" role="SKIP">
 						<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
-						<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
+						<fo:inline role="SKIP"><fo:page-number-citation ref-id="{@id}" role="SKIP"/></fo:inline>
 					</fo:inline>
 				</fo:basic-link>
 			</fo:wrapper>
@@ -4068,7 +4078,7 @@
 	<xsl:template match="mn:sections//mn:p[@class = 'zzSTDTitle1']" priority="4">
 		<xsl:choose>
 			<xsl:when test="$layoutVersion = '1951'">
-				<fo:block font-size="13pt" font-weight="bold" text-align="center" margin-top="49mm" margin-bottom="20mm" text-transform="uppercase" line-height="1.1" role="P">
+				<fo:block font-size="13pt" font-weight="bold" text-align="center" margin-top="49mm" margin-bottom="20mm" text-transform="uppercase" line-height="1.1" role="P/Title">
 					<xsl:if test="$revision_date_num &gt;= 19680101">
 						<xsl:attribute name="font-family">Arial</xsl:attribute>
 						<xsl:attribute name="font-size">10.5pt</xsl:attribute>
@@ -4103,7 +4113,7 @@
 			</xsl:when>
 			<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report'"/>
 			<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989'">
-				<fo:block font-size="16pt" font-weight="bold" margin-top="40pt" margin-bottom="40pt" line-height="1.1" role="P" span="all">
+				<fo:block font-size="16pt" font-weight="bold" margin-top="40pt" margin-bottom="40pt" line-height="1.1" role="P/Title" span="all">
 					<xsl:if test="following-sibling::*[1][self::mn:p][starts-with(@class, 'zzSTDTitle')]">
 						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 					</xsl:if>
@@ -4119,7 +4129,7 @@
 				</xsl:if>
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1" role="P">
+				<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1" role="P/Title">
 					<xsl:if test="$layoutVersion = '2024'">
 						<xsl:attribute name="margin-top">50pt</xsl:attribute>
 					</xsl:if>
@@ -4151,7 +4161,7 @@
 	<xsl:template match="mn:sections//mn:p[@class = 'zzSTDTitle2']" priority="4">
 		<!-- Example: <p class="zzSTDTitle2" displayorder="3">AMENDMENT 1: Mass fraction of extraneous matter, milled rice (nonglutinous), sample dividers and recommendations relating to storage and transport conditions</p> -->
 		<xsl:if test="$doctype = 'amendment'">
-			<fo:block font-size="18pt" margin-top="12pt" margin-bottom="20pt" margin-right="0mm" font-weight="normal" line-height="1.1" role="P">
+			<fo:block font-size="18pt" margin-top="12pt" margin-bottom="20pt" margin-right="0mm" font-weight="normal" line-height="1.1" role="P/Title">
 				<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989'">
 				<xsl:attribute name="font-size">16pt</xsl:attribute>
 			</xsl:if>
@@ -6339,18 +6349,21 @@
 
 	<xsl:attribute-set name="page-sequence-preface">
 		<xsl:attribute name="format">i</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- page-sequence-preface -->
 
 	<xsl:template name="refine_page-sequence-preface">
 		<xsl:param name="layoutVersion"/>
-	</xsl:template>
+		<xsl:param name="doctype"/>
+		<xsl:param name="num"/>
+		<xsl:param name="skip_force_page_count">false</xsl:param>
+	</xsl:template> <!-- refine_page-sequence-preface -->
 
 	<xsl:attribute-set name="page-sequence-main">
-
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- page-sequence-main -->
 
 	<xsl:template name="refine_page-sequence-main">
 		<xsl:param name="layoutVersion"/>
+		<xsl:param name="doctype"/>
 		<xsl:if test="position() = 1">
 			<xsl:attribute name="initial-page-number">1</xsl:attribute>
 		</xsl:if>
@@ -6358,7 +6371,7 @@
 			<xsl:attribute name="initial-page-number">auto</xsl:attribute>
 			<xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
 		</xsl:if>
-	</xsl:template>
+	</xsl:template> <!-- refine_page-sequence-main -->
 
 	<xsl:variable name="font_noto_sans">Noto Sans, Noto Sans HK, Noto Sans JP, Noto Sans KR, Noto Sans SC, Noto Sans TC</xsl:variable>
 	<xsl:variable name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable>
@@ -17753,6 +17766,7 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-style">
+		<xsl:copy-of select="@id"/>
 		<xsl:if test="$layoutVersion = '1987'">
 			<xsl:attribute name="font-size">9pt</xsl:attribute>
 			<xsl:attribute name="font-weight">normal</xsl:attribute>
@@ -17828,7 +17842,7 @@
 
 	<!-- List of Figures, Tables -->
 	<xsl:attribute-set name="toc-listof-title-style">
-		<xsl:attribute name="role">TOCI</xsl:attribute>
+		<xsl:attribute name="role">H2</xsl:attribute> <!-- TOCI -->
 		<xsl:attribute name="margin-top">5pt</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set>
@@ -17854,13 +17868,13 @@
 
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
-			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
+			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]"> <!--  or @type = 'toc' -->
 				<node id="{@id}"/>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
 
-		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
+		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]"> <!--  or @type = 'toc' -->
 			<xsl:sort select="@displayorder" data-type="number"/>
 
 			<!-- process Section's title -->
@@ -17873,6 +17887,23 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:template match="*[@type = 'toc'][mn:title or mn:fmt-title]" mode="contents" priority="2">
+		<xsl:variable name="title">
+			<xsl:call-template name="getName"/>
+		</xsl:variable>
+		<xsl:variable name="root">
+			<xsl:if test="ancestor-or-self::mn:preface">preface</xsl:if>
+			<xsl:if test="ancestor-or-self::mn:annex">annex</xsl:if>
+		</xsl:variable>
+		<mnx:item id="{@id}" level="1" section="" type="toc" root="{$root}" display="false">
+			<mnx:title>
+				<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
+					<xsl:with-param name="element" select="$root"/>
+				</xsl:apply-templates>
+			</mnx:title>
+		</mnx:item>
+	</xsl:template>
+
 	<xsl:template name="processMainSectionsDefault_Contents">
 
 		<xsl:variable name="nodes_sections_">
@@ -19887,16 +19918,17 @@
 	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
 	<xsl:template name="insert_basic_link">
 		<xsl:param name="element"/>
+		<xsl:param name="wrapper">true</xsl:param>
 		<xsl:variable name="element_node" select="xalan:nodeset($element)"/>
 		<xsl:variable name="external-destination" select="normalize-space(count($element_node/fo:basic-link/@external-destination[. != '']) = 1)"/>
 		<xsl:variable name="internal-destination" select="normalize-space(count($element_node/fo:basic-link/@internal-destination[. != '']) = 1)"/>
 		<xsl:choose>
-			<xsl:when test="$internal-destination = 'true'">
+			<xsl:when test="$internal-destination = 'true' and $wrapper = 'true'">
 				<fo:wrapper role="Reference">
 					<xsl:copy-of select="$element_node"/>
 				</fo:wrapper>
 			</xsl:when>
-			<xsl:when test="$external-destination = 'true'">
+			<xsl:when test="$internal-destination = 'true' or $external-destination = 'true'">
 				<xsl:copy-of select="$element_node"/>
 			</xsl:when>
 			<xsl:otherwise>

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

@@ -2097,7 +2097,7 @@
 
 											<fo:block-container font-family="Cambria" line-height="1.1" role="SKIP" height="110mm">
 												<!-- for role see coment https://github.com/pdf-association/extension-brotli/issues/5#issuecomment-3931742869 -->
-												<fo:block margin-right="3.5mm"> <!-- role="SKIP" -->
+												<fo:block margin-right="3.5mm" role="P/Title"> <!-- role="SKIP" -->
 													<fo:block font-size="18pt" font-weight="bold" margin-top="2.5mm" role="SKIP"> <!-- role="H1" -->
 														<xsl:call-template name="insertTitlesLangMain"><xsl:with-param name="num" select="$num"/></xsl:call-template>
 													</fo:block>
@@ -2532,7 +2532,7 @@
 
 										<fo:block-container line-height="1.1" margin-top="3mm" role="SKIP">
 											<xsl:call-template name="insertTripleLine"/>
-											<fo:block margin-right="5mm"> <!-- role="SKIP" -->
+											<fo:block margin-right="5mm" role="P/Title"> <!-- role="SKIP" -->
 												<fo:block font-size="18pt" font-weight="bold" margin-top="6pt" role="SKIP"> <!-- role="H1" -->
 													<xsl:if test="$layoutVersion = '1989'">
 														<xsl:attribute name="font-size">16pt</xsl:attribute>
@@ -2782,7 +2782,7 @@
 													<fo:table-cell role="SKIP">
 														<xsl:call-template name="insertTripleLine"/>
 														<fo:block-container line-height="1.1" role="SKIP">
-															<fo:block margin-right="3.5mm"> <!-- role="SKIP" -->
+															<fo:block margin-right="3.5mm" role="P/Title"> <!-- role="SKIP" -->
 																<xsl:variable name="font_size">
 																	<xsl:choose>
 																		<xsl:when test="$layoutVersion = '1989'">16pt</xsl:when>
@@ -2929,7 +2929,7 @@
 
 								<xsl:call-template name="insertTripleLine"/>
 								<fo:block-container line-height="1.1" role="SKIP">
-									<fo:block margin-right="40mm"> <!-- role="SKIP" -->
+									<fo:block margin-right="40mm" role="P/Title"> <!-- role="SKIP" -->
 										<fo:block font-size="18pt" font-weight="bold" margin-top="12pt" role="SKIP"> <!--  role="H1" -->
 											<xsl:if test="$layoutVersion = '1989'">
 												<xsl:attribute name="font-size">16pt</xsl:attribute>
@@ -3010,7 +3010,7 @@
 								</fo:block>
 							</fo:block-container>
 
-							<fo:block-container font-size="16pt" role="P"> <!-- role="SKIP" -->
+							<fo:block-container font-size="16pt" role="P/Title"> <!-- role="SKIP" -->
 								<!-- Information and documentation — Codes for transcription systems  -->
 									<fo:block font-weight="bold" role="SKIP"> <!-- role="H1" -->
 										<xsl:call-template name="insertTitlesLangMain"><xsl:with-param name="num" select="$num"/></xsl:call-template>
@@ -3748,25 +3748,25 @@
 													</fo:block>
 												</fo:list-item-label>
 												<fo:list-item-body start-indent="body-start()" role="SKIP">
-													<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm" role="SKIP"> <!-- role="SKIP" role="Reference" -->
+													<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm" role="Reference"> <!-- role="SKIP" role="Reference" -->
 
 														<xsl:if test="$layoutVersion = '1987' and @type = 'section'">
 															<xsl:attribute name="font-weight">bold</xsl:attribute>
 														</xsl:if>
 
 														<!-- Reference/Link for title -->
-														<fo:wrapper role="Reference">
+														<!-- <fo:wrapper role="Reference"> -->
 															<fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}"> <!-- role="SKIP" -->
 																<xsl:if test="$layoutVersion = '1987' and @type = 'section'">
 																	<xsl:value-of select="concat(@section, ' ')"/>
 																</xsl:if>
 																<xsl:apply-templates select="mnx:title"/>
-															</fo:basic-link>
-														</fo:wrapper>
+															<!-- </fo:basic-link> -->
+														<!-- </fo:wrapper> -->
 
 														<!-- Reference/Link for page number -->
-														<fo:wrapper role="Reference">
-															<fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}">
+														<!-- <fo:wrapper role="Reference"> -->
+															<!-- <fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}"> -->
 																<fo:inline keep-together.within-line="always" role="SKIP">
 																	<fo:leader xsl:use-attribute-sets="toc-leader-style"><xsl:call-template name="refine_toc-leader-style"/></fo:leader>
 																	<fo:inline role="SKIP">
@@ -3784,7 +3784,7 @@
 																	</fo:inline>
 																</fo:inline>
 															</fo:basic-link>
-														</fo:wrapper>
+														<!-- </fo:wrapper> -->
 
 													</fo:block>
 												</fo:list-item-body>
@@ -3795,28 +3795,38 @@
 
 							</xsl:for-each>
 
-							<!-- List of Tables -->
-							<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:tables/mnx:table">
-								<xsl:if test="position() = 1">
-									<xsl:call-template name="insertListOf_Title">
-										<xsl:with-param name="title" select="$title-list-tables"/>
-									</xsl:call-template>
-								</xsl:if>
-								<xsl:call-template name="insertListOf_Item"/>
-							</xsl:for-each>
+						</xsl:if>
+					</fo:block>
 
-							<!-- List of Figures -->
-							<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:figures/mnx:figure">
-								<xsl:if test="position() = 1">
-									<xsl:call-template name="insertListOf_Title">
-										<xsl:with-param name="title" select="$title-list-figures"/>
-									</xsl:call-template>
-								</xsl:if>
-								<xsl:call-template name="insertListOf_Item"/>
-							</xsl:for-each>
+					<xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
+						<xsl:if test="$contents/mnx:doc[@num = $num]//mnx:tables/mnx:table">
+							<fo:block-container>
+								<!-- List of Tables -->
+								<xsl:call-template name="insertListOf_Title">
+									<xsl:with-param name="title" select="$title-list-tables"/>
+								</xsl:call-template>
+								<fo:block role="TOC">
+									<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:tables/mnx:table">
+										<xsl:call-template name="insertListOf_Item"/>
+									</xsl:for-each>
+								</fo:block>
+							</fo:block-container>
+						</xsl:if>
 
+						<xsl:if test="$contents/mnx:doc[@num = $num]//mnx:figures/mnx:figure">
+							<fo:block-container>
+								<!-- List of Figures -->
+								<xsl:call-template name="insertListOf_Title">
+									<xsl:with-param name="title" select="$title-list-figures"/>
+								</xsl:call-template>
+								<fo:block role="TOC">
+									<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:figures/mnx:figure">
+										<xsl:call-template name="insertListOf_Item"/>
+									</xsl:for-each>
+								</fo:block>
+							</fo:block-container>
 						</xsl:if>
-					</fo:block>
+					</xsl:if>
 				</fo:block-container>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -3890,9 +3900,9 @@
 						<xsl:with-param name="value" select="@alt-text"/>
 					</xsl:call-template>
 					<xsl:apply-templates select="." mode="contents"/>
-					<fo:inline keep-together.within-line="always">
+					<fo:inline keep-together.within-line="always" role="SKIP">
 						<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
-						<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
+						<fo:inline role="SKIP"><fo:page-number-citation ref-id="{@id}" role="SKIP"/></fo:inline>
 					</fo:inline>
 				</fo:basic-link>
 			</fo:wrapper>
@@ -4068,7 +4078,7 @@
 	<xsl:template match="mn:sections//mn:p[@class = 'zzSTDTitle1']" priority="4">
 		<xsl:choose>
 			<xsl:when test="$layoutVersion = '1951'">
-				<fo:block font-size="13pt" font-weight="bold" text-align="center" margin-top="49mm" margin-bottom="20mm" text-transform="uppercase" line-height="1.1" role="P">
+				<fo:block font-size="13pt" font-weight="bold" text-align="center" margin-top="49mm" margin-bottom="20mm" text-transform="uppercase" line-height="1.1" role="P/Title">
 					<xsl:if test="$revision_date_num &gt;= 19680101">
 						<xsl:attribute name="font-family">Arial</xsl:attribute>
 						<xsl:attribute name="font-size">10.5pt</xsl:attribute>
@@ -4103,7 +4113,7 @@
 			</xsl:when>
 			<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report'"/>
 			<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989'">
-				<fo:block font-size="16pt" font-weight="bold" margin-top="40pt" margin-bottom="40pt" line-height="1.1" role="P" span="all">
+				<fo:block font-size="16pt" font-weight="bold" margin-top="40pt" margin-bottom="40pt" line-height="1.1" role="P/Title" span="all">
 					<xsl:if test="following-sibling::*[1][self::mn:p][starts-with(@class, 'zzSTDTitle')]">
 						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 					</xsl:if>
@@ -4119,7 +4129,7 @@
 				</xsl:if>
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1" role="P">
+				<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1" role="P/Title">
 					<xsl:if test="$layoutVersion = '2024'">
 						<xsl:attribute name="margin-top">50pt</xsl:attribute>
 					</xsl:if>
@@ -4151,7 +4161,7 @@
 	<xsl:template match="mn:sections//mn:p[@class = 'zzSTDTitle2']" priority="4">
 		<!-- Example: <p class="zzSTDTitle2" displayorder="3">AMENDMENT 1: Mass fraction of extraneous matter, milled rice (nonglutinous), sample dividers and recommendations relating to storage and transport conditions</p> -->
 		<xsl:if test="$doctype = 'amendment'">
-			<fo:block font-size="18pt" margin-top="12pt" margin-bottom="20pt" margin-right="0mm" font-weight="normal" line-height="1.1" role="P">
+			<fo:block font-size="18pt" margin-top="12pt" margin-bottom="20pt" margin-right="0mm" font-weight="normal" line-height="1.1" role="P/Title">
 				<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989'">
 				<xsl:attribute name="font-size">16pt</xsl:attribute>
 			</xsl:if>
@@ -6339,18 +6349,21 @@
 
 	<xsl:attribute-set name="page-sequence-preface">
 		<xsl:attribute name="format">i</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- page-sequence-preface -->
 
 	<xsl:template name="refine_page-sequence-preface">
 		<xsl:param name="layoutVersion"/>
-	</xsl:template>
+		<xsl:param name="doctype"/>
+		<xsl:param name="num"/>
+		<xsl:param name="skip_force_page_count">false</xsl:param>
+	</xsl:template> <!-- refine_page-sequence-preface -->
 
 	<xsl:attribute-set name="page-sequence-main">
-
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- page-sequence-main -->
 
 	<xsl:template name="refine_page-sequence-main">
 		<xsl:param name="layoutVersion"/>
+		<xsl:param name="doctype"/>
 		<xsl:if test="position() = 1">
 			<xsl:attribute name="initial-page-number">1</xsl:attribute>
 		</xsl:if>
@@ -6358,7 +6371,7 @@
 			<xsl:attribute name="initial-page-number">auto</xsl:attribute>
 			<xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
 		</xsl:if>
-	</xsl:template>
+	</xsl:template> <!-- refine_page-sequence-main -->
 
 	<xsl:variable name="font_noto_sans">Noto Sans, Noto Sans HK, Noto Sans JP, Noto Sans KR, Noto Sans SC, Noto Sans TC</xsl:variable>
 	<xsl:variable name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable>
@@ -17753,6 +17766,7 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-style">
+		<xsl:copy-of select="@id"/>
 		<xsl:if test="$layoutVersion = '1987'">
 			<xsl:attribute name="font-size">9pt</xsl:attribute>
 			<xsl:attribute name="font-weight">normal</xsl:attribute>
@@ -17828,7 +17842,7 @@
 
 	<!-- List of Figures, Tables -->
 	<xsl:attribute-set name="toc-listof-title-style">
-		<xsl:attribute name="role">TOCI</xsl:attribute>
+		<xsl:attribute name="role">H2</xsl:attribute> <!-- TOCI -->
 		<xsl:attribute name="margin-top">5pt</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set>
@@ -17854,13 +17868,13 @@
 
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
-			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
+			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]"> <!--  or @type = 'toc' -->
 				<node id="{@id}"/>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
 
-		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
+		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]"> <!--  or @type = 'toc' -->
 			<xsl:sort select="@displayorder" data-type="number"/>
 
 			<!-- process Section's title -->
@@ -17873,6 +17887,23 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:template match="*[@type = 'toc'][mn:title or mn:fmt-title]" mode="contents" priority="2">
+		<xsl:variable name="title">
+			<xsl:call-template name="getName"/>
+		</xsl:variable>
+		<xsl:variable name="root">
+			<xsl:if test="ancestor-or-self::mn:preface">preface</xsl:if>
+			<xsl:if test="ancestor-or-self::mn:annex">annex</xsl:if>
+		</xsl:variable>
+		<mnx:item id="{@id}" level="1" section="" type="toc" root="{$root}" display="false">
+			<mnx:title>
+				<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
+					<xsl:with-param name="element" select="$root"/>
+				</xsl:apply-templates>
+			</mnx:title>
+		</mnx:item>
+	</xsl:template>
+
 	<xsl:template name="processMainSectionsDefault_Contents">
 
 		<xsl:variable name="nodes_sections_">
@@ -19887,16 +19918,17 @@
 	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
 	<xsl:template name="insert_basic_link">
 		<xsl:param name="element"/>
+		<xsl:param name="wrapper">true</xsl:param>
 		<xsl:variable name="element_node" select="xalan:nodeset($element)"/>
 		<xsl:variable name="external-destination" select="normalize-space(count($element_node/fo:basic-link/@external-destination[. != '']) = 1)"/>
 		<xsl:variable name="internal-destination" select="normalize-space(count($element_node/fo:basic-link/@internal-destination[. != '']) = 1)"/>
 		<xsl:choose>
-			<xsl:when test="$internal-destination = 'true'">
+			<xsl:when test="$internal-destination = 'true' and $wrapper = 'true'">
 				<fo:wrapper role="Reference">
 					<xsl:copy-of select="$element_node"/>
 				</fo:wrapper>
 			</xsl:when>
-			<xsl:when test="$external-destination = 'true'">
+			<xsl:when test="$internal-destination = 'true' or $external-destination = 'true'">
 				<xsl:copy-of select="$element_node"/>
 			</xsl:when>
 			<xsl:otherwise>

data/lib/isodoc/iso/metadata.rb

@@ -27,7 +27,6 @@ module IsoDoc
         revdate = isoxml.at(ns("//bibdata/version/revision-date"))
         set(:revdate, revdate&.text)
         docstatus and docstatus1(isoxml, docstatus, published)
-        #docscheme = isoxml.at(ns("//presentation-metadata/document-scheme"))
         docscheme = get[:"presentation_metadata_document-scheme"]
         docscheme && !docscheme.empty? and set(:document_scheme, docscheme.first)
       end

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -31,6 +31,7 @@ module IsoDoc
         formula docxml
         admonition docxml
         source docxml
+        #list_to_table docxml
         ul docxml
         ol docxml
         quote docxml

data/lib/isodoc/iso/word_convert.rb

@@ -251,6 +251,12 @@ module IsoDoc
           .each { |n| parse(n, out) }
       end
 
+      def admonition_class(node)
+        if node["type"] == "editorial" then "zzHelp"
+        else super
+        end
+      end
+
       include BaseConvert
       include Init
     end

data/lib/metanorma/iso/base.rb

@@ -67,6 +67,8 @@ module Metanorma
       def ol_attrs(node)
         ret = super
         ret.delete(:type)
+        # test
+        #ret[:display] = node.attr("display")
         ret
       end
 

data/lib/metanorma/iso/biblio.rng

@@ -1939,10 +1939,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
-      <value>preliminaryDraftOf</value>
-      <value>hasPreliminaryDraft</value>
-      <value>revisionDraftOf</value>
-      <value>hasRevisionDraft</value>
+      <value>predecessorDraftOf</value>
+      <value>hasPredecessorDraft</value>
+      <value>successorDraftOf</value>
+      <value>hasSuccessorDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>

data/lib/metanorma/iso/isodoc.rng

@@ -641,8 +641,85 @@ This is done if the footnote reference is already presented in some other form,
         </ref>
       </zeroOrMore>
     </define>
+    <define name="altsource">
+      <a:documentation>Alternative file to use as media</a:documentation>
+      <element name="altsource">
+        <ref name="MediaAttributes"/>
+        <optional>
+          <attribute name="tag">
+            <a:documentation>Comma-delimited tag to indicate when the alternate file is to be used, 
+at minimum allows contain `html`, `doc`, `pdf` as the main target formats of Metanorma,
+and `default` for the fallback. The presence of an altsource tagged `default` is required</a:documentation>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="media">
+            <a:documentation>CSS media query to indicate when the alternate file is to be used</a:documentation>
+          </attribute>
+        </optional>
+      </element>
+    </define>
+    <define name="image">
+      <a:documentation>Container for image content</a:documentation>
+      <choice>
+        <element name="image">
+          <ref name="RequiredId"/>
+          <ref name="ImageAttributes">
+            <a:documentation>When specified along with altsource, ImageAttributes give the default image to be rendered</a:documentation>
+          </ref>
+          <ref name="ImageBody"/>
+        </element>
+        <element name="svg">
+          <a:documentation>Add svg mark up to image</a:documentation>
+          <oneOrMore>
+            <choice>
+              <text/>
+              <ref name="AnyElement"/>
+            </choice>
+          </oneOrMore>
+        </element>
+      </choice>
+    </define>
+    <define name="ImageAttributes">
+      <optional>
+        <ref name="MediaAttributes">
+          <a:documentation>If the image contains altsource, the media attributes are given on each of the altsource elements instead of the root node</a:documentation>
+        </ref>
+      </optional>
+      <ref name="MediaAccessibilityAttributes"/>
+      <optional>
+        <attribute name="width">
+          <a:documentation>Height of image</a:documentation>
+          <ref name="ImageSize"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="height">
+          <a:documentation>Width of image</a:documentation>
+          <ref name="ImageSize"/>
+        </attribute>
+      </optional>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="ImageBody">
+    <optional>
+      <element name="svg">
+        <a:documentation>image can contain SVG XML, which is used to access its identifiers within the Metanorma XML</a:documentation>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </optional>
+    <zeroOrMore>
+      <ref name="altsource">
+        <a:documentation>Alternative files to use as media</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="key">
     <a:documentation>Key to a table, figure, or formula</a:documentation>
     <element name="key">
@@ -930,34 +1007,6 @@ titlecase, or lowercase</a:documentation>
       <ref name="ReducedBibliographicItem"/>
     </element>
   </define>
-  <define name="image" combine="choice">
-    <choice>
-      <element name="image">
-        <ref name="RequiredId"/>
-        <ref name="ImageAttributes"/>
-        <optional>
-          <element name="svg">
-            <a:documentation>Allow svg in image/svg, for consistency</a:documentation>
-            <oneOrMore>
-              <choice>
-                <text/>
-                <ref name="AnyElement"/>
-              </choice>
-            </oneOrMore>
-          </element>
-        </optional>
-      </element>
-      <element name="svg">
-        <a:documentation>Add svg mark up to image</a:documentation>
-        <oneOrMore>
-          <choice>
-            <text/>
-            <ref name="AnyElement"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </choice>
-  </define>
   <define name="ParagraphFnBody" combine="interleave">
     <ref name="BlockSource">
       <a:documentation>Bibliographic source for the information in the paragraph

data/lib/metanorma/iso/validate.rb

@@ -8,7 +8,6 @@ require_relative "validate_list"
 require_relative "validate_xref"
 require "nokogiri"
 require "jing"
-require "iev"
 
 module Metanorma
   module Iso
@@ -24,13 +23,13 @@ module Metanorma
       def isosubgroup_validate(root)
         root.xpath("#{COMMITTEE_XPATH}[@type = 'Technical committee']/@subtype")
           .each do |t|
-            %w{TC PC JTC JPC}.include?(t.text) or
-              @log.add("ISO_2", nil, params: [t.text])
+          %w{TC PC JTC JPC}.include?(t.text) or
+            @log.add("ISO_2", nil, params: [t.text])
         end
         root.xpath("#{COMMITTEE_XPATH}[@type = 'Subcommittee']/@subtype")
           .each do |t|
-            %w{SC JSC}.include?(t.text) or
-              @log.add("ISO_3", nil, params: [t.text])
+          %w{SC JSC}.include?(t.text) or
+            @log.add("ISO_3", nil, params: [t.text])
         end
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.3.1".freeze
+    VERSION = "3.3.2".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   #spec.add_dependency "pubid-iso", "~> 0.7.0"
   spec.add_dependency "tokenizer", "~> 0.3.0"
 
+  spec.add_development_dependency "benchmark"
   spec.add_development_dependency "canon", "= 0.1.3"
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-02 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: canon
   requirement: !ruby/object:Gem::Requirement
@@ -299,19 +313,6 @@ files:
 - LICENSE
 - Makefile
 - README.adoc
-- lib/asciidoctor/iso/base.rb
-- lib/asciidoctor/iso/cleanup.rb
-- lib/asciidoctor/iso/converter.rb
-- lib/asciidoctor/iso/deprecated.rb
-- lib/asciidoctor/iso/front.rb
-- lib/asciidoctor/iso/front_id.rb
-- lib/asciidoctor/iso/section.rb
-- lib/asciidoctor/iso/validate.rb
-- lib/asciidoctor/iso/validate_image.rb
-- lib/asciidoctor/iso/validate_requirements.rb
-- lib/asciidoctor/iso/validate_section.rb
-- lib/asciidoctor/iso/validate_style.rb
-- lib/asciidoctor/iso/validate_title.rb
 - lib/html2doc/lists.rb
 - lib/isodoc/iso/base_convert.rb
 - lib/isodoc/iso/html/header-dis.html

data/lib/asciidoctor/iso/base.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/iso/deprecated"
-require "metanorma/iso/base"

data/lib/asciidoctor/iso/cleanup.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/iso/deprecated"
-require "metanorma/iso/cleanup"

data/lib/asciidoctor/iso/converter.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/iso/deprecated"
-require "metanorma/iso/converter"

data/lib/asciidoctor/iso/deprecated.rb

@@ -1,7 +0,0 @@
-warn "Please replace your references to Asciidoctor::ISO with Metanorma::ISO "\
-     "and your instances of require 'asciidoctor/iso' with "\
-     "require 'metanorma/iso'"
-
-exit 127 if ENV["METANORMA_DEPRECATION_FAIL"]
-
-Asciidoctor::ISO = Metanorma::ISO unless defined? Asciidoctor::ISO

data/lib/asciidoctor/iso/front.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/iso/deprecated"
-require "metanorma/iso/front"

data/lib/asciidoctor/iso/front_id.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/iso/deprecated"
-require "metanorma/iso/front_id"

data/lib/asciidoctor/iso/section.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/iso/deprecated"
-require "metanorma/iso/section"

data/lib/asciidoctor/iso/validate.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/iso/deprecated"
-require "metanorma/iso/validate"

data/lib/asciidoctor/iso/validate_image.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/iso/deprecated"
-require "metanorma/iso/validate_image"

data/lib/asciidoctor/iso/validate_requirements.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/iso/deprecated"
-require "metanorma/iso/validate_requirements"

data/lib/asciidoctor/iso/validate_section.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/iso/deprecated"
-require "metanorma/iso/validate_section"

data/lib/asciidoctor/iso/validate_style.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/iso/deprecated"
-require "metanorma/iso/validate_style"

data/lib/asciidoctor/iso/validate_title.rb

@@ -1,2 +0,0 @@
-require "asciidoctor/iso/deprecated"
-require "metanorma/iso/validate_title"