metanorma-jis 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd23629d8f1ef1a2c1e085333f8c23e79428cf6632dcf03532f198fcffbb60b5
-  data.tar.gz: c964a848b37d16c75e2885c34d5f764c1814e7613425eff785d3e0e322e6c017
+  metadata.gz: 52feb035503f2766a2c0281b2ea081358ca155ce13f606e9a0ce7641144c2bfa
+  data.tar.gz: 1f0cef17898c1245e14cece9fac7ff3fe1cabec0d4acac1d8b60e909867ef547
 SHA512:
-  metadata.gz: 510b2ed4ce3c5837a6497bc76cf886c947ee54281493ec258c14893b2748c3993545474a5a0dce6070c51a6d40949d15d3df55f07e5dfaf045dd516f00180b01
-  data.tar.gz: ca343cde45e15b8774eab8797fcd12039e7fc9ad8c68f033175ff1536114990b4303f6284ba7b24da4f667fea0b001626b436a39aa51e3b6c1763356f35540e8
+  metadata.gz: 473ff382fe45f94e9a7f10811f09e884de519482b43c8da4631ed357788b8d3743c8fde273f8f932d34196d1a11d7eb63782724afd716f243488115692eb32ac
+  data.tar.gz: daf7b6b8cab952334628287d116d49312f874be5d8ca1c593681ba0754f7f34b8bf0242c6fc1d94904a54bb47317e296a294410035d9c85ba034907708391cc6

data/lib/isodoc/jis/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;
 }
@@ -1444,16 +1449,12 @@ 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;
 }
 
 /* Collapse TOC */

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

@@ -752,16 +752,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;
 }
 
 /* Collapse TOC */

data/lib/isodoc/jis/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,12 @@ 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;
 }
 
 /*

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

@@ -584,15 +584,12 @@ 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;
 }
 
 

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

@@ -619,16 +619,8 @@
 
 								<xsl:if test="$paged_xml_preface/mn:page and count($paged_xml_preface/mn:page/*) != 0">
 									<!-- Preface pages -->
-									<fo:page-sequence master-reference="preface" force-page-count="no-force">
-
-										<xsl:if test="$vertical_layout = 'true'">
-											<xsl:attribute name="master-reference">document_vertical_layout</xsl:attribute>
-											<xsl:attribute name="format">一</xsl:attribute>
-										</xsl:if>
-
-										<xsl:if test="position() = 1">
-											<xsl:attribute name="initial-page-number">1</xsl:attribute>
-										</xsl:if>
+									<fo:page-sequence xsl:use-attribute-sets="page-sequence-preface">
+										<xsl:call-template name="refine_page-sequence-preface"/>
 
 										<fo:static-content flow-name="xsl-footnote-separator" role="artifact">
 											<fo:block text-align="center" margin-bottom="6pt">
@@ -681,7 +673,7 @@
 					<xsl:if test="not($vertical_layout = 'true') and not($doctype = 'technical-specification')">
 
 					<!-- Document type rendering -->
-					<fo:page-sequence master-reference="preface" force-page-count="no-force">
+					<fo:page-sequence xsl:use-attribute-sets="page-sequence-preface">
 						<xsl:call-template name="insertHeaderFooter">
 							<xsl:with-param name="docidentifier" select="$docidentifier"/>
 							<xsl:with-param name="copyrightText" select="$copyrightText"/>
@@ -777,33 +769,8 @@
 
 						<xsl:variable name="isCommentary" select="normalize-space(.//mn:annex[@commentary = 'true'] and 1 = 1)"/> <!-- true or false -->
 						<!-- DEBUG: <xsl:copy-of select="."/> -->
-						<fo:page-sequence master-reference="document" force-page-count="no-force">
-
-							<xsl:choose>
-								<xsl:when test="$vertical_layout = 'true'">
-									<xsl:attribute name="master-reference">document_vertical_layout</xsl:attribute>
-									<xsl:if test="position() = last()">
-										<xsl:attribute name="master-reference">document_vertical_layout_with_last</xsl:attribute>
-									</xsl:if>
-
-									<xsl:attribute name="format">一</xsl:attribute>
-									<!-- <xsl:attribute name="fox:number-conversion-features">&#x30A2;</xsl:attribute> -->
-								</xsl:when>
-								<xsl:otherwise>
-									<xsl:if test="position() = 1">
-										<xsl:attribute name="master-reference">document_first_section</xsl:attribute>
-									</xsl:if>
-									<xsl:if test="@orientation = 'landscape'">
-										<xsl:attribute name="master-reference">document-<xsl:value-of select="@orientation"/></xsl:attribute>
-									</xsl:if>
-									<xsl:if test="$isCommentary = 'true'">
-										<xsl:attribute name="master-reference">document_commentary_section</xsl:attribute>
-									</xsl:if>
-									<xsl:if test="position() = 1">
-										<xsl:attribute name="initial-page-number">1</xsl:attribute>
-									</xsl:if>
-								</xsl:otherwise>
-							</xsl:choose>
+						<fo:page-sequence xsl:use-attribute-sets="page-sequence-main">
+							<xsl:call-template name="refine_page-sequence-main"/>
 
 							<xsl:call-template name="insertFootnoteSeparatorCommon">
 								<xsl:with-param name="leader_length">15%</xsl:with-param>
@@ -1156,13 +1123,7 @@
 					<xsl:apply-templates select="mnx:title"/>
 				</fo:inline>
 				<fo:inline keep-together.within-line="always">
-					<fo:leader xsl:use-attribute-sets="toc-leader-style">
-						<xsl:if test="$vertical_layout = 'true'">
-							<xsl:attribute name="leader-pattern">rule</xsl:attribute>
-							<xsl:attribute name="rule-thickness">0.5pt</xsl:attribute>
-							<xsl:attribute name="baseline-shift">60%</xsl:attribute>
-						</xsl:if>
-					</fo:leader>
+					<fo:leader xsl:use-attribute-sets="toc-leader-style"><xsl:call-template name="refine_toc-leader-style"/></fo:leader>
 					<fo:inline>
 						<xsl:if test="not($vertical_layout = 'true')">
 							<xsl:attribute name="font-size">8pt</xsl:attribute>
@@ -1826,6 +1787,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>
@@ -1837,9 +1801,18 @@
 					<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="mode">contents</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="mode">contents</xsl:with-param>
+							</xsl:apply-templates>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
+								<xsl:with-param name="mode">contents</xsl:with-param>
+							</xsl:apply-templates>
+						</xsl:otherwise>
+					</xsl:choose>
 				</mnx:title>
 				<xsl:if test="$type != 'index'">
 					<xsl:apply-templates mode="contents"/>
@@ -5791,20 +5764,59 @@
 	</xsl:variable>
 
 	<xsl:attribute-set name="page-sequence-preface">
-		<xsl:attribute name="format">i</xsl:attribute>
-	</xsl:attribute-set>
+		<xsl:attribute name="master-reference">preface</xsl:attribute>
+		<xsl:attribute name="force-page-count">no-force</xsl:attribute>
+	</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:if test="$vertical_layout = 'true'">
+			<xsl:attribute name="master-reference">document_vertical_layout</xsl:attribute>
+			<xsl:attribute name="format">一</xsl:attribute>
+		</xsl:if>
 
-	<xsl:attribute-set name="page-sequence-main">
+		<xsl:if test="position() = 1">
+			<xsl:attribute name="initial-page-number">1</xsl:attribute>
+		</xsl:if>
+	</xsl:template> <!-- refine_page-sequence-preface -->
 
-	</xsl:attribute-set>
+	<xsl:attribute-set name="page-sequence-main">
+		<xsl:attribute name="master-reference">document</xsl:attribute>
+		<xsl:attribute name="force-page-count">no-force</xsl:attribute>
+	</xsl:attribute-set> <!-- page-sequence-main -->
 
 	<xsl:template name="refine_page-sequence-main">
 		<xsl:param name="layoutVersion"/>
-	</xsl:template>
+		<xsl:param name="doctype"/>
+		<xsl:choose>
+			<xsl:when test="$vertical_layout = 'true'">
+				<xsl:attribute name="master-reference">document_vertical_layout</xsl:attribute>
+				<xsl:if test="position() = last()">
+					<xsl:attribute name="master-reference">document_vertical_layout_with_last</xsl:attribute>
+				</xsl:if>
+				<xsl:attribute name="format">一</xsl:attribute>
+				<!-- <xsl:attribute name="fox:number-conversion-features">&#x30A2;</xsl:attribute> -->
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:if test="position() = 1">
+					<xsl:attribute name="master-reference">document_first_section</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="@orientation = 'landscape'">
+					<xsl:attribute name="master-reference">document-<xsl:value-of select="@orientation"/></xsl:attribute>
+				</xsl:if>
+				<xsl:variable name="isCommentary" select="normalize-space(.//mn:annex[@commentary = 'true'] and 1 = 1)"/>
+				<xsl:if test="$isCommentary = 'true'">
+					<xsl:attribute name="master-reference">document_commentary_section</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="position() = 1">
+					<xsl:attribute name="initial-page-number">1</xsl:attribute>
+				</xsl:if>
+			</xsl:otherwise>
+		</xsl:choose>
+	</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>
@@ -6109,7 +6121,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"/>
@@ -6337,6 +6366,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>
@@ -9668,6 +9706,8 @@
 		<xsl:if test="ancestor::mn:preface">
 			<xsl:attribute name="border">none</xsl:attribute>
 		</xsl:if>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-style -->
 
 	<xsl:attribute-set name="table-number-style">
@@ -9710,6 +9750,8 @@
 			<xsl:attribute name="border-top">none</xsl:attribute>
 			<xsl:attribute name="border-bottom">none</xsl:attribute>
 		</xsl:if>
+
+		<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">
@@ -9718,6 +9760,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">
@@ -9727,6 +9771,8 @@
 	<xsl:template name="refine_table-body-row-style">
 
 		<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">
@@ -9753,6 +9799,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">
@@ -9774,6 +9830,15 @@
 			<xsl:attribute name="border">none</xsl:attribute>
 		</xsl:if>
 
+		<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">
@@ -9786,6 +9851,8 @@
 	</xsl:attribute-set> <!-- table-footer-cell-style -->
 
 	<xsl:template name="refine_table-footer-cell-style">
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-footer-cell-style -->
 
 	<xsl:attribute-set name="table-note-style">
@@ -9835,6 +9902,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 -->
 	<!-- ========================== -->
@@ -15555,6 +15632,10 @@
 		</fo:list-item>
 	</xsl:template>
 
+	<xsl:template match="mn:fmt-ol | mn:fmt-ul">
+		<xsl:apply-templates/>
+	</xsl:template>
+
 	<!-- ===================================== -->
 	<!-- END Lists processing -->
 	<!-- ===================================== -->
@@ -16926,6 +17007,7 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-style">
+		<xsl:copy-of select="@id"/>
 		<xsl:if test="not($vertical_layout = 'true') and not($lang = 'en')">
 			<xsl:attribute name="font-family">IPAexGothic</xsl:attribute>
 		</xsl:if>
@@ -16987,6 +17069,11 @@
 	</xsl:attribute-set> <!-- END: toc-leader-style -->
 
 	<xsl:template name="refine_toc-leader-style">
+		<xsl:if test="$vertical_layout = 'true'">
+			<xsl:attribute name="leader-pattern">rule</xsl:attribute>
+			<xsl:attribute name="rule-thickness">0.5pt</xsl:attribute>
+			<xsl:attribute name="baseline-shift">60%</xsl:attribute>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:attribute-set name="toc-pagenumber-style">
@@ -17018,13 +17105,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 -->
@@ -17037,6 +17124,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_">
@@ -18893,16 +18997,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/jis/presentation_section.rb

@@ -6,11 +6,11 @@ module IsoDoc
     class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
       def annex1(elem)
         elem["commentary"] == "true" and return commentary(elem)
-        lbl = @xrefs.anchor(elem["id"], :label)
-        if t = elem.at(ns("./title"))
-          t.children = "<strong>#{to_xml(t.children)}</strong>"
-        end
-        prefix_name(elem, { caption: "<br/>" }, lbl, "title")
+        super
+      end
+
+      def annex_delim(_elem)
+        "<br/>"
       end
 
       def annex(docxml)
@@ -101,7 +101,7 @@ module IsoDoc
           %(#{@meta.get[:"investigative-committee"]} #{@i18n.membership_table})
         y = YAML.safe_load(s.children.to_xml(encoding: "UTF-8"))
         d = clause.at(ns("./key")) || clause.at(ns("./dl"))
-        s && y.is_a?(Array) or return [nil, nil, nil, nil]
+        (s && y.is_a?(Array)) or return [nil, nil, nil, nil]
         [s, t, y, d]
       end
 
@@ -111,7 +111,8 @@ module IsoDoc
           n = y["name"]
           if n.is_a?(Hash)
             n = if @lang == "ja" then "#{n['surname']} #{n['givenname']}"
-                else "#{n['givenname']} #{n['surname']}" end
+                else "#{n['givenname']} #{n['surname']}"
+                end
           end
           <<~XML
             <tr #{add_id_text}><td #{add_id_text}>#{r}</td><td #{add_id_text}>#{n}</td><td #{add_id_text}>#{y['affiliation']}</td></tr>

data/lib/isodoc/jis/word_cleanup.rb

@@ -64,7 +64,6 @@ module IsoDoc
 
       def to_word1(result, filename, dir, header)
         result or return
-        result = from_xhtml(result).gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
         ::Html2Doc::Jis.new(
           filename: filename, imagedir: @localdir,
           stylesheet: @wordstylesheet&.path,
@@ -76,7 +75,11 @@ module IsoDoc
 
       def word_split(xml)
         b = xml.dup
-        { _cover: cover_split(xml), "": main_split(b) }
+        { _cover: cover_split(xml),
+          "": main_split(b) }.transform_values do |x|
+            unescape_amp_in_hrefs(from_xhtml(x)
+              .gsub("-DOUBLE_HYPHEN_ESCAPE-", "--"))
+          end
       end
 
       def cover_split(xml)

data/lib/isodoc/jis/xref.rb

@@ -31,7 +31,7 @@ module IsoDoc
         @autonumbering_style == :japanese ? "\u30fb" : "."
       end
 
-      def clause_counter(num, opts = { })
+      def clause_counter(num = 0, opts = { })
         opts[:numerals] ||= @autonumbering_style
         opts[:separator] ||= clausesep
         super

data/lib/metanorma/jis/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/jis/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/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "1.0.4".freeze
+    VERSION = "1.0.6".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-02 00:00:00.000000000 Z
+date: 2026-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar