metanorma-jis 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65f86c5e987c2ebb3e29e79cf4257506cb59ad2e5b80036d0814b0b7e806de52
-  data.tar.gz: a873f22013e0ffb53706b5615c1297adff565ee6ae0184465456f7a4a081af73
+  metadata.gz: b368234d9277b29aa534c29eea939c9511d9151c7aa759fd9fbf819848c287c1
+  data.tar.gz: b51cccd52045311c34869ec041b5fd18781e2c0b4c0e9c8312e7fc1748d3fc30
 SHA512:
-  metadata.gz: '09aaa2e07d8cc7632b463c51d83a8b7d5ddd8056c636175ec1fcc9d4ca824ae7cb3c974e0ed39891c339a15706c99989f7c8dad583d1ece3985d54431a78c581'
-  data.tar.gz: f8dcb73f59c6bcd1757c6ebee5f9ee53c8185eecfe0ab1f5922fa9c52e0cce65d661b9ba1647c6cca148e475b0630f52d1697c79dca13833a95cce7f398c468f
+  metadata.gz: f1e43b3d65c7f723f2562e900a9f4b9dcc8304954d43b65db4fc7591e1949e2c0595965c00e8d2d6f5bd8ae478047501fc05ab7c0c9345e8e3bfb17235631d1b
+  data.tar.gz: f20a68b53311de5a77a38838d4c7805ff0746f18c9fbf450693eed3c74f58bac0d870f573238cb91d4a90beee6022d6457bedb198b4b7aa7562833d5f25fdc35

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

@@ -1583,6 +1583,9 @@
 		<xsl:param name="copyrightText"/>
 		<fo:static-content flow-name="footer">
 			<fo:block-container height="24mm" display-align="after">
+        <xsl:if test="$section = 'commentary'">
+          <xsl:attribute name="height">24.5mm</xsl:attribute>
+        </xsl:if>
 				<xsl:if test="$section = 'preface'">
 					<fo:block font-size="9pt" text-align="center" space-after="10pt">(<fo:inline font-family="Times New Roman"><fo:page-number/></fo:inline>)</fo:block>
 				</xsl:if>
@@ -1627,17 +1630,30 @@
 	<xsl:param name="add_math_as_text">true</xsl:param> <!-- add math in text behind svg formula, to copy-paste formula from PDF as text -->
 
 	<xsl:param name="table_if">false</xsl:param> <!-- generate extended table in IF for autolayout-algorithm -->
-	<xsl:param name="table_widths"/> <!-- path to xml with table's widths, generated on 1st pass, based on FOP Intermediate Format -->
+	<xsl:param name="table_widths"/> <!-- (debug: path to) xml with table's widths, generated on 1st pass, based on FOP Intermediate Format -->
 	<!-- Example: <tables>
-			<table id="table_if_tab-symdu" page-width="75"> - table id prefixed by 'table_if_' to simple search in IF 
-				<tbody>
-					<tr>
-						<td id="tab-symdu_1_1">
-							<p_len>6</p_len>
-							<p_len>100</p_len>  for 2nd paragraph
-							<word_len>6</word_len>
-							<word_len>20</word_len>
-						...
+		<table page-width="509103" id="table1" width_max="223561" width_min="223560">
+			<column width_max="39354" width_min="39354"/>
+			<column width_max="75394" width_min="75394"/>
+			<column width_max="108813" width_min="108813"/>
+			<tbody>
+				<tr>
+					<td width_max="39354" width_min="39354">
+						<p_len>39354</p_len>
+						<word_len>39354</word_len>
+					</td>
+					
+		OLD:
+			<tables>
+					<table id="table_if_tab-symdu" page-width="75"> - table id prefixed by 'table_if_' to simple search in IF 
+						<tbody>
+							<tr>
+								<td id="tab-symdu_1_1">
+									<p_len>6</p_len>
+									<p_len>100</p_len>  for 2nd paragraph
+									<word_len>6</word_len>
+									<word_len>20</word_len>
+								...
 	-->
 
 	<!-- for command line debug: <xsl:variable name="table_widths_from_if" select="document($table_widths)"/> -->
@@ -1857,6 +1873,9 @@
 	<xsl:variable name="hair_space"> </xsl:variable>
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
+	<xsl:variable name="cr">&#13;</xsl:variable>
+	<xsl:variable name="lf">
+</xsl:variable>
 
 	<xsl:template name="getTitle">
 		<xsl:param name="name"/>
@@ -2631,6 +2650,10 @@
 
 	<xsl:template name="refine_figure-block-style">
 
+			<xsl:if test="ancestor::*[local-name() = 'example'] or ancestor::*[local-name() = 'note']">
+				<xsl:attribute name="margin-left">0mm</xsl:attribute>
+			</xsl:if>
+
 	</xsl:template>
 
 	<xsl:attribute-set name="figure-style">
@@ -3509,6 +3532,20 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:param name="table_only_with_id"/><!-- Example: table1, for table auto-layout algorithm -->
+
+	<xsl:template match="*[local-name()='table']" priority="2">
+		<xsl:choose>
+			<xsl:when test="$table_only_with_id != '' and @id = $table_only_with_id">
+				<xsl:call-template name="table"/>
+			</xsl:when>
+			<xsl:when test="$table_only_with_id != ''"><fo:block/><!-- to prevent empty fo:block-container --></xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="table"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<xsl:template match="*[local-name()='table']" name="table">
 
 		<xsl:variable name="table-preamble">
@@ -3518,9 +3555,11 @@
 		<xsl:variable name="table">
 
 			<xsl:variable name="simple-table">
-				<xsl:call-template name="getSimpleTable">
-					<xsl:with-param name="id" select="@id"/>
-				</xsl:call-template>
+				<xsl:if test="$isGenerateTableIF = 'true' and $isApplyAutolayoutAlgorithm = 'true'">
+					<xsl:call-template name="getSimpleTable">
+						<xsl:with-param name="id" select="@id"/>
+					</xsl:call-template>
+				</xsl:if>
 			</xsl:variable>
 			<!-- <xsl:variable name="simple-table" select="xalan:nodeset($simple-table_)"/> -->
 
@@ -3616,9 +3655,9 @@
 						</xsl:attribute>
 					</xsl:for-each>
 
-					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
+					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'][not(@type = 'units')] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
 					<xsl:if test="$isNoteOrFnExist = 'true'">
-						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
+						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute><!-- set 0pt border, because there is a separete table below for footer -->
 					</xsl:if>
 
 					<xsl:choose>
@@ -3750,9 +3789,28 @@
 
 					</fo:block>
 
+					<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
+					<xsl:if test="$continued = 'true'">
+						<fo:block text-align="right">
+							<xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
+						</fo:block>
+					</xsl:if>
+					<!-- </xsl:if> -->
+
 		</xsl:if>
 	</xsl:template> <!-- table/name -->
 
+	<!-- workaround solution for https://github.com/metanorma/metanorma-iso/issues/1151#issuecomment-2033087938 -->
+	<xsl:template match="*[local-name()='table']/*[local-name() = 'note'][@type = 'units']/*[local-name() = 'p']/text()" priority="4">
+		<xsl:choose>
+			<xsl:when test="preceding-sibling::*[local-name() = 'br']">
+				<!-- remove CR or LF at start -->
+				<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'^(&#13;&#10;|&#13;|&#10;)', '')"/>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<!-- SOURCE: ... -->
 	<xsl:template match="*[local-name()='table']/*[local-name() = 'source']" priority="2">
 		<xsl:call-template name="termsource"/>
@@ -4163,7 +4221,7 @@
 		<xsl:param name="colwidths"/>
 		<xsl:param name="colgroup"/>
 
-		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
+		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
 
 		<xsl:variable name="isNoteOrFnExistShowAfterTable">
 
@@ -4233,7 +4291,7 @@
 
 								<!-- except gb and bsi  -->
 
-										<xsl:apply-templates select="../*[local-name()='p' or local-name()='dl' or local-name()='note' or local-name()='example' or local-name()='source']"/>
+										<xsl:apply-templates select="../*[local-name()='p' or local-name()='dl' or (local-name()='note' and not(@type = 'units')) or local-name()='example' or local-name()='source']"/>
 
 								<xsl:variable name="isDisplayRowSeparator">
 
@@ -4241,7 +4299,7 @@
 
 								<!-- horizontal row separator -->
 								<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
-									<xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
+									<xsl:if test="(../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
 										<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
 
 											<xsl:call-template name="setBordersTableArray"/>
@@ -4921,7 +4979,20 @@
 	<!-- Definition List -->
 	<!-- ===================== -->
 
-	<xsl:template match="*[local-name()='dl']">
+	<!-- for table auto-layout algorithm -->
+	<xsl:template match="*[local-name()='dl']" priority="2">
+		<xsl:choose>
+			<xsl:when test="$table_only_with_id != '' and @id = $table_only_with_id">
+				<xsl:call-template name="dl"/>
+			</xsl:when>
+			<xsl:when test="$table_only_with_id != ''"><fo:block/><!-- to prevent empty fo:block-container --></xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="dl"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template match="*[local-name()='dl']" name="dl">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
 		<!-- <dl><xsl:copy-of select="."/></dl> -->
@@ -6856,7 +6927,13 @@
 							<xsl:value-of select="$language_current_2"/>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+							<xsl:variable name="language_current_3" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'])"/>
+							<xsl:choose>
+								<xsl:when test="$language_current_3 != ''">
+									<xsl:value-of select="$language_current_3"/>
+								</xsl:when>
+								<xsl:otherwise>en</xsl:otherwise>
+							</xsl:choose>
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:otherwise>
@@ -7713,10 +7790,11 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'image']">
+		<xsl:param name="indent">0</xsl:param>
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
-			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
+			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']"> <!-- inline image ( 'image:path' in adoc, with one colon after image) -->
 				<fo:inline padding-left="1mm" padding-right="1mm">
 					<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
 						<xsl:attribute name="padding-left">0mm</xsl:attribute>
@@ -7725,7 +7803,43 @@
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
-					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
+
+					<xsl:variable name="scale">
+						<xsl:call-template name="getImageScale">
+							<xsl:with-param name="indent" select="$indent"/>
+						</xsl:call-template>
+					</xsl:variable>
+
+					<!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
+
+					<!-- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/> -->
+					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
+
+						<xsl:variable name="width">
+							<xsl:call-template name="setImageWidth"/>
+						</xsl:variable>
+						<xsl:if test="$width != ''">
+							<xsl:attribute name="width"><xsl:value-of select="$width"/></xsl:attribute>
+						</xsl:if>
+						<xsl:variable name="height">
+							<xsl:call-template name="setImageHeight"/>
+						</xsl:variable>
+						<xsl:if test="$height != ''">
+							<xsl:attribute name="height"><xsl:value-of select="$height"/></xsl:attribute>
+						</xsl:if>
+
+						<xsl:if test="$width = '' and $height = ''">
+							<xsl:if test="number($scale) &lt; 100">
+								<xsl:attribute name="content-width"><xsl:value-of select="number($scale)"/>%</xsl:attribute>
+								<!-- <xsl:attribute name="content-width">scale-to-fit</xsl:attribute>
+								<xsl:attribute name="content-height">100%</xsl:attribute>
+								<xsl:attribute name="width">100%</xsl:attribute>
+								<xsl:attribute name="scaling">uniform</xsl:attribute> -->
+							</xsl:if>
+						</xsl:if>
+
+					</fo:external-graphic>
+
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
@@ -7746,25 +7860,23 @@
 								<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
 								<xsl:attribute name="scaling">uniform</xsl:attribute>
 
-									<xsl:apply-templates select="." mode="cross_image"/>
+								<xsl:apply-templates select="." mode="cross_image"/>
 
 							</fo:instream-foreign-object>
 						</xsl:when>
 						<xsl:otherwise>
+							<!-- <fo:block>debug block image:
+							<xsl:variable name="scale">
+								<xsl:call-template name="getImageScale">
+									<xsl:with-param name="indent" select="$indent"/>
+								</xsl:call-template>
+							</xsl:variable>
+							<xsl:value-of select="concat('scale=', $scale,', indent=', $indent)"/>
+							</fo:block> -->
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
-								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
+								<xsl:if test="not(@mimetype = 'image/svg+xml') and (../*[local-name() = 'name'] or parent::*[local-name() = 'figure'][@unnumbered = 'true']) and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
-										<xsl:attribute name="width">
-											<xsl:value-of select="@width"/>
-										</xsl:attribute>
-									</xsl:if>
-
-									<xsl:if test="@height != '' and @height != 'auto'">
-										<xsl:attribute name="height">
-											<xsl:value-of select="@height"/>
-										</xsl:attribute>
-									</xsl:if>
+									<xsl:call-template name="setImageWidthHeight"/>
 
 									<xsl:choose>
 										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
@@ -7772,24 +7884,18 @@
 										</xsl:when>
 										<xsl:otherwise>
 
-											<xsl:variable name="img_src">
-												<xsl:choose>
-													<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
-													<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-												</xsl:choose>
+											<xsl:variable name="scale">
+												<xsl:call-template name="getImageScale">
+													<xsl:with-param name="indent" select="$indent"/>
+												</xsl:call-template>
 											</xsl:variable>
 
-											<xsl:variable name="image_width_effective">
-
-														<xsl:value-of select="$width_effective"/>
-
+											<xsl:variable name="scaleRatio">
+												1
 											</xsl:variable>
 
-											<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
 											<xsl:if test="number($scale) &lt; 100">
-
-														<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
-
+												<xsl:attribute name="content-width"><xsl:value-of select="number($scale) * number($scaleRatio)"/>%</xsl:attribute>
 											</xsl:if>
 										</xsl:otherwise>
 									</xsl:choose>
@@ -7805,6 +7911,62 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template name="setImageWidth">
+		<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
+			<xsl:value-of select="@width"/>
+		</xsl:if>
+	</xsl:template>
+	<xsl:template name="setImageHeight">
+		<xsl:if test="@height != '' and @height != 'auto'">
+			<xsl:value-of select="@height"/>
+		</xsl:if>
+	</xsl:template>
+	<xsl:template name="setImageWidthHeight">
+		<xsl:variable name="width">
+			<xsl:call-template name="setImageWidth"/>
+		</xsl:variable>
+		<xsl:if test="$width != ''">
+			<xsl:attribute name="width">
+				<xsl:value-of select="$width"/>
+			</xsl:attribute>
+		</xsl:if>
+		<xsl:variable name="height">
+			<xsl:call-template name="setImageHeight"/>
+		</xsl:variable>
+		<xsl:if test="$height != ''">
+			<xsl:attribute name="height">
+				<xsl:value-of select="$height"/>
+			</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template name="getImageScale">
+		<xsl:param name="indent"/>
+		<xsl:variable name="indent_left">
+			<xsl:choose>
+				<xsl:when test="$indent != ''"><xsl:value-of select="$indent"/></xsl:when>
+				<xsl:otherwise>0</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="img_src">
+			<xsl:choose>
+				<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+
+		<xsl:variable name="image_width_effective">
+
+					<xsl:value-of select="$width_effective - number($indent_left)"/>
+
+		</xsl:variable>
+		<!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
+		<xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
+		<xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
+		<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+		<xsl:value-of select="$scale"/>
+	</xsl:template>
+
 	<xsl:template name="image_src">
 		<xsl:choose>
 			<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
@@ -10473,6 +10635,7 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
+		<xsl:param name="indent">0</xsl:param>
 		<xsl:choose>
 			<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
 				<fo:block-container role="SKIP">
@@ -10487,7 +10650,9 @@
 
 					<fo:block-container margin-left="0mm" role="SKIP">
 						<fo:block>
-							<xsl:apply-templates select="." mode="list"/>
+							<xsl:apply-templates select="." mode="list">
+								<xsl:with-param name="indent" select="$indent"/>
+							</xsl:apply-templates>
 						</fo:block>
 					</fo:block-container>
 				</fo:block-container>
@@ -10500,7 +10665,9 @@
 							</xsl:if>
 							<fo:block-container margin-left="0mm" role="SKIP">
 								<fo:block>
-									<xsl:apply-templates select="." mode="list"/>
+									<xsl:apply-templates select="." mode="list">
+										<xsl:with-param name="indent" select="$indent"/>
+									</xsl:apply-templates>
 								</fo:block>
 							</fo:block-container>
 						</fo:block-container>
@@ -10587,6 +10754,13 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name()='li']">
+		<xsl:param name="indent">0</xsl:param>
+		<!-- <fo:list-item xsl:use-attribute-sets="list-item-style">
+			<fo:list-item-label end-indent="label-end()"><fo:block>x</fo:block></fo:list-item-label>
+			<fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
+				<fo:block>debug li indent=<xsl:value-of select="$indent"/></fo:block>
+			</fo:list-item-body>
+		</fo:list-item> -->
 		<fo:list-item xsl:use-attribute-sets="list-item-style">
 			<xsl:copy-of select="@id"/>
 
@@ -10611,7 +10785,9 @@
 
 					<xsl:call-template name="refine_list-item-body-style"/>
 
-					<xsl:apply-templates/>
+					<xsl:apply-templates>
+						<xsl:with-param name="indent" select="$indent"/>
+					</xsl:apply-templates>
 
 					<!-- <xsl:apply-templates select="node()[not(local-name() = 'note')]" />
 					
@@ -12888,6 +13064,4 @@
 		</xsl:if>
 	</xsl:template>
 
-	<!-- update -->
-
 </xsl:stylesheet>

data/lib/isodoc/jis/word_cleanup.rb

@@ -3,14 +3,6 @@ require_relative "../../html2doc/lists"
 module IsoDoc
   module JIS
     class WordConvert < IsoDoc::Iso::WordConvert
-      def postprocess(result, filename, dir)
-        filename = filename.sub(/\.doc$/, "")
-        header = generate_header(filename, dir)
-        result = from_xhtml(cleanup(to_xhtml(textcleanup(result))))
-        toWord(result, filename, dir, header)
-        @files_to_delete.each { |f| FileUtils.rm_f f }
-      end
-
       def word_cleanup(docxml)
         word_note_cleanup(docxml)
         boldface(docxml)
@@ -53,9 +45,12 @@ module IsoDoc
         end
       end
 
+      def postprocess_cleanup(result)
+        result = cleanup(to_xhtml(textcleanup(result)))
+        word_split(word_cleanup(result))
+      end
+
       def toWord(result, filename, dir, header)
-        result = word_split(word_cleanup(to_xhtml(result)))
-        @wordstylesheet = wordstylesheet_update
         result.each do |k, v|
           to_word1(v, "#{filename}#{k}", dir, header)
         end
@@ -89,11 +84,13 @@ module IsoDoc
       end
 
       def main_split(xml)
-        c = xml.at("//div[@class = 'WordSection1']")
-        c.next_element&.remove
-        c.remove
-        c = xml.at("//div[@class = 'WordSection2']")
-        c.elements.first.at("./br") and c.elements.first.remove
+        if c = xml.at("//div[@class = 'WordSection1']")
+          c.next_element&.remove
+          c.remove
+        end
+        if c = xml.at("//div[@class = 'WordSection2']")
+          c.elements.first.at("./br") and c.elements.first.remove
+        end
         xml
       end
 

data/lib/isodoc/jis/xref.rb

@@ -25,6 +25,20 @@ module IsoDoc
         l10n("#{title} #{num}<br/>#{obl}")
       end
 
+      def annex_name_anchors1(clause, num, level)
+        @anchors[clause["id"]] =
+          { xref: num, label: num, level: level,
+            subtype: "annex" }
+      end
+
+      def annex_names1(clause, num, level)
+        annex_name_anchors1(clause, num, level)
+        i = ::IsoDoc::XrefGen::Counter.new(0, prefix: "#{num}.")
+        clause.xpath(ns(SUBCLAUSES)).each do |c|
+          annex_names1(c, i.increment(c).print, level + 1)
+        end
+      end
+
       def clause_order_main(docxml)
         [
           { path: "//sections/introduction" },
@@ -97,14 +111,16 @@ module IsoDoc
 refer_list)
         c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
         list.xpath(ns("./li")).each do |li|
-          bare_label, label = list_item_value(li, c, depth,
-                                              { list_anchor: list_anchor, prev_label: prev_label, refer_list: refer_list })
+          bare_label, label =
+            list_item_value(li, c, depth, { list_anchor: list_anchor,
+                                            prev_label: prev_label, refer_list: depth == 1 ? refer_list : nil })
           li["id"] and @anchors[li["id"]] =
                          { label: bare_label, bare_xref: "#{bare_label})",
-                           xref: "#{label})", type: "listitem", refer_list:
-                                        refer_list, container: list_anchor[:container] }
+                           xref: "#{label})", type: "listitem",
+                           refer_list: refer_list, container: list_anchor[:container] }
           (li.xpath(ns(".//ol")) - li.xpath(ns(".//ol//ol"))).each do |ol|
-            list_item_anchor_names(ol, list_anchor, depth + 1, label, false)
+            list_item_anchor_names(ol, list_anchor, depth + 1, label,
+                                   refer_list)
           end
         end
       end

data/lib/isodoc/plateau/html_convert.rb

@@ -0,0 +1,10 @@
+module IsoDoc
+  module Plateau
+    class HtmlConvert < IsoDoc::JIS::HtmlConvert
+      def initialize(options)
+        super
+        @libdir = File.dirname(__FILE__)
+      end
+    end
+  end
+end

data/lib/isodoc/plateau/metadata.rb

@@ -0,0 +1,6 @@
+module IsoDoc
+  module Plateau
+    class Metadata < IsoDoc::JIS::Metadata
+    end
+  end
+end

data/lib/isodoc/plateau/pdf_convert.rb

@@ -0,0 +1,14 @@
+module IsoDoc
+  module Plateau
+    class PdfConvert < IsoDoc::JIS::PdfConvert
+      def initialize(options)
+        @libdir = File.dirname(__FILE__)
+        super
+      end
+
+      def pdf_stylesheet(_docxml)
+        "jis.international-standard.xsl"
+      end
+    end
+  end
+end

data/lib/isodoc/plateau/presentation_xml_convert.rb

@@ -0,0 +1,6 @@
+module IsoDoc
+  module Plateau
+    class PresentationXMLConvert < IsoDoc::JIS::PresentationXMLConvert
+    end
+  end
+end

data/lib/isodoc/plateau/word_convert.rb

@@ -0,0 +1,11 @@
+module IsoDoc
+  module Plateau
+    class WordConvert < IsoDoc::JIS::WordConvert
+      def initialize(options)
+        @libdir = File.dirname(__FILE__)
+        super
+        @libdir = File.dirname(__FILE__)
+      end
+    end
+  end
+end

data/lib/isodoc/plateau/xref.rb

@@ -0,0 +1,6 @@
+module IsoDoc
+  module Plateau
+    class Xref < IsoDoc::JIS::Xref
+    end
+  end
+end

data/lib/metanorma/jis/biblio.rng

@@ -95,7 +95,7 @@
       <text/>
     </element>
   </define>
-  <define name="LocalizedString1">
+  <define name="LocalizedStringAttrs">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -106,6 +106,10 @@
     <optional>
       <attribute name="script"/>
     </optional>
+  </define>
+  <define name="LocalizedString1">
+    <!-- multiple languages and scripts possible: comma delimit them if so -->
+    <ref name="LocalizedStringAttrs"/>
     <text/>
   </define>
   <define name="LocalizedString">
@@ -142,16 +146,8 @@
     <ref name="LocalizedStringOrXsAny"/>
   </define>
   <define name="LocalizedStringOrXsAny1">
-    <optional>
-      <!-- multiple languages and scripts possible: comma delimit them if so -->
-      <attribute name="language"/>
-    </optional>
-    <optional>
-      <attribute name="locale"/>
-    </optional>
-    <optional>
-      <attribute name="script"/>
-    </optional>
+    <!-- multiple languages and scripts possible: comma delimit them if so -->
+    <ref name="LocalizedStringAttrs"/>
     <oneOrMore>
       <choice>
         <text/>
@@ -208,6 +204,7 @@
   </define>
   <define name="roledescription">
     <element name="description">
+      <ref name="LocalizedStringAttrs"/>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -335,6 +332,7 @@
   </define>
   <define name="affiliationdescription">
     <element name="description">
+      <ref name="LocalizedStringAttrs"/>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -948,6 +946,7 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <ref name="LocalizedStringAttrs"/>
     <zeroOrMore>
       <ref name="TextElement"/>
     </zeroOrMore>
@@ -1041,15 +1040,7 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="locale"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
+      <ref name="LocalizedStringAttrs"/>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1277,6 +1268,7 @@
       <optional>
         <attribute name="type"/>
       </optional>
+      <ref name="LocalizedStringAttrs"/>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1284,9 +1276,15 @@
   </define>
   <define name="bibabstract">
     <element name="abstract">
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="LocalizedStringAttrs"/>
+      <choice>
+        <oneOrMore>
+          <ref name="BasicBlock"/>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="TextElement"/>
+        </oneOrMore>
+      </choice>
     </element>
   </define>
   <define name="copyright">
@@ -1391,6 +1389,7 @@
       </attribute>
       <optional>
         <element name="description">
+          <ref name="LocalizedStringAttrs"/>
           <oneOrMore>
             <ref name="TextElement"/>
           </oneOrMore>

data/lib/metanorma/jis/converter.rb

@@ -80,7 +80,8 @@ module Metanorma
         else
           IsoDoc::JIS::PresentationXMLConvert
             .new(doc_extract_attributes(node)
-            .merge(output_formats: ::Metanorma::JIS::Processor.new.output_formats))
+            .merge(output_formats: ::Metanorma::JIS::Processor.new
+            .output_formats))
         end
       end
     end

data/lib/metanorma/jis/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.0 -->
+<!-- VERSION v1.3.1 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -1346,38 +1346,41 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="Section-Attributes">
+    <optional>
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
+    <optional>
+      <attribute name="inline-header">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
+    <optional>
+      <attribute name="obligation">
+        <choice>
+          <value>normative</value>
+          <value>informative</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
   <define name="reference-clause">
     <element name="clause">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="number"/>
-      </optional>
-      <optional>
-        <attribute name="branch-number"/>
-      </optional>
-      <optional>
-        <attribute name="obligation">
-          <choice>
-            <value>normative</value>
-            <value>informative</value>
-          </choice>
-        </attribute>
-      </optional>
+      <ref name="Section-Attributes"/>
       <optional>
         <ref name="section-title"/>
       </optional>
@@ -1566,36 +1569,7 @@
     </element>
   </define>
   <define name="Content-Section">
-    <optional>
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="language"/>
-    </optional>
-    <optional>
-      <attribute name="script"/>
-    </optional>
-    <optional>
-      <attribute name="inline-header">
-        <data type="boolean"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="number"/>
-    </optional>
-    <optional>
-      <attribute name="branch-number"/>
-    </optional>
+    <ref name="Section-Attributes"/>
     <optional>
       <attribute name="type"/>
     </optional>
@@ -1617,39 +1591,10 @@
     </element>
   </define>
   <define name="Clause-Section">
-    <optional>
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="language"/>
-    </optional>
-    <optional>
-      <attribute name="script"/>
-    </optional>
-    <optional>
-      <attribute name="inline-header">
-        <data type="boolean"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-    </optional>
+    <ref name="Section-Attributes"/>
     <optional>
       <attribute name="type"/>
     </optional>
-    <optional>
-      <attribute name="number"/>
-    </optional>
-    <optional>
-      <attribute name="branch-number"/>
-    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1730,34 +1675,10 @@
   </define>
   <define name="terms">
     <element name="terms">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
+      <ref name="Section-Attributes"/>
       <optional>
         <attribute name="type"/>
       </optional>
-      <optional>
-        <attribute name="number"/>
-      </optional>
-      <optional>
-        <attribute name="branch-number"/>
-      </optional>
-      <optional>
-        <attribute name="obligation">
-          <choice>
-            <value>normative</value>
-            <value>informative</value>
-          </choice>
-        </attribute>
-      </optional>
       <optional>
         <ref name="section-title"/>
       </optional>

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.2.5".freeze
+    VERSION = "0.2.7".freeze
   end
 end
 

data/lib/metanorma/plateau/converter.rb

@@ -0,0 +1,55 @@
+module Metanorma
+  module Plateau
+    class Converter < JIS::Converter
+      register_for "plateau"
+
+      def version
+        flavour = "JIS"
+        Metanorma.versioned(Metanorma, flavour)[-1]::VERSION
+      end
+
+      def schema_version
+        f = File.read(File.join(File.dirname(__FILE__), "..", "jis", "isodoc.rng"))
+        m = / VERSION (v\S+)/.match(f)
+        m[1]
+      end
+
+      def html_converter(node)
+        if node.nil?
+          IsoDoc::Plateau::HtmlConvert.new({})
+        else
+          IsoDoc::Plateau::HtmlConvert.new(html_extract_attributes(node))
+        end
+      end
+
+      def doc_converter(node)
+        if node.nil?
+          IsoDoc::Plateau::WordConvert.new({})
+        else
+          IsoDoc::Plateau::WordConvert.new(doc_extract_attributes(node))
+        end
+      end
+
+      def pdf_converter(node)
+        return if node.attr("no-pdf")
+
+        if node.nil?
+          IsoDoc::Plateau::PdfConvert.new({})
+        else
+          IsoDoc::Plateau::PdfConvert.new(pdf_extract_attributes(node))
+        end
+      end
+
+      def presentation_xml_converter(node)
+        if node.nil?
+          IsoDoc::Plateau::PresentationXMLConvert.new({})
+        else
+          IsoDoc::Plateau::PresentationXMLConvert
+            .new(doc_extract_attributes(node)
+            .merge(output_formats: ::Metanorma::Plateau::Processor.new
+            .output_formats))
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/plateau/processor.rb

@@ -0,0 +1,57 @@
+require "metanorma/processor"
+
+module Metanorma
+  module Plateau
+    class Processor < Metanorma::JIS::Processor
+      def initialize # rubocop:disable Lint/MissingSuper
+        @short = :plateau
+        @input_format = :asciidoc
+        @asciidoctor_backend = :plateau
+      end
+
+      def output_formats
+        super.merge(
+          html: "html",
+          pdf: "pdf",
+          doc: "doc",
+        )
+      end
+
+      def fonts_manifest
+        {
+          "STIX Two Math" => nil,
+          "IPAexGothic" => nil,
+          "IPAexMincho" => nil,
+          "Courier New" => nil,
+          "Cambria Math" => nil,
+          "Times New Roman" => nil,
+          "Arial" => nil,
+        }
+      end
+
+      def version
+        "Metanorma::JIS #{Metanorma::JIS::VERSION}"
+      end
+
+      def output(xml, inname, outname, format, options = {})
+        options_preprocess(options)
+        case format
+        when :html
+          IsoDoc::Plateau::HtmlConvert.new(options).convert(inname, xml, nil,
+                                                            outname)
+        when :doc
+          IsoDoc::Plateau::WordConvert.new(options).convert(inname, xml, nil,
+                                                            outname)
+        when :pdf
+          IsoDoc::Plateau::PdfConvert.new(options).convert(inname, xml, nil,
+                                                           outname)
+        when :presentation
+          IsoDoc::Plateau::PresentationXMLConvert.new(options).convert(inname, xml,
+                                                                       nil, outname)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/plateau.rb

@@ -0,0 +1,6 @@
+require_relative "./plateau/processor"
+
+module Metanorma
+  module Plateau
+  end
+end

data/lib/metanorma-jis.rb

@@ -1,5 +1,6 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "metanorma/jis/converter"
+require_relative "metanorma/plateau/converter"
 require_relative "metanorma/jis/version"
 require "isodoc/jis/html_convert"
 require "isodoc/jis/word_convert"
@@ -7,10 +8,18 @@ require "isodoc/jis/pdf_convert"
 require "isodoc/jis/presentation_xml_convert"
 require "isodoc/jis/metadata"
 require "isodoc/jis/xref"
+require "isodoc/plateau/html_convert"
+require "isodoc/plateau/word_convert"
+require "isodoc/plateau/pdf_convert"
+require "isodoc/plateau/presentation_xml_convert"
+require "isodoc/plateau/metadata"
+require "isodoc/plateau/xref"
 require "metanorma"
 
 if defined? Metanorma::Registry
   require_relative "metanorma/jis"
   Metanorma::Registry.instance.register(Metanorma::JIS::Processor)
+  require_relative "metanorma/plateau"
+  Metanorma::Registry.instance.register(Metanorma::Plateau::Processor)
 end
 

data/metanorma-jis.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "japanese_calendar", "~> 0"
   spec.add_dependency "metanorma-iso", "~> 2.7.3"
-  spec.add_dependency "pubid-jis"
+  spec.add_dependency "pubid"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-25 00:00:00.000000000 Z
+date: 2024-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.7.3
 - !ruby/object:Gem::Dependency
-  name: pubid-jis
+  name: pubid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -282,6 +282,12 @@ files:
 - lib/isodoc/jis/word_cleanup.rb
 - lib/isodoc/jis/word_convert.rb
 - lib/isodoc/jis/xref.rb
+- lib/isodoc/plateau/html_convert.rb
+- lib/isodoc/plateau/metadata.rb
+- lib/isodoc/plateau/pdf_convert.rb
+- lib/isodoc/plateau/presentation_xml_convert.rb
+- lib/isodoc/plateau/word_convert.rb
+- lib/isodoc/plateau/xref.rb
 - lib/metanorma-jis.rb
 - lib/metanorma/jis.rb
 - lib/metanorma/jis/basicdoc.rng
@@ -300,6 +306,9 @@ files:
 - lib/metanorma/jis/reqt.rng
 - lib/metanorma/jis/validate.rb
 - lib/metanorma/jis/version.rb
+- lib/metanorma/plateau.rb
+- lib/metanorma/plateau/converter.rb
+- lib/metanorma/plateau/processor.rb
 - metanorma-jis.gemspec
 homepage: https://github.com/metanorma/metanorma-jis
 licenses: