metanorma-jis 0.0.10 → 0.1.1

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

@@ -459,7 +459,7 @@
 
 							<fo:flow flow-name="xsl-region-body">
 
-								<xsl:if test="position() = 1">
+								<!-- <xsl:if test="position() = 1">
 									<fo:table table-layout="fixed" width="100%">
 										<fo:table-column column-width="proportional-column-width(35)"/>
 										<fo:table-column column-width="proportional-column-width(97)"/>
@@ -467,14 +467,14 @@
 										<fo:table-column column-width="proportional-column-width(12)"/>
 										<fo:table-body>
 											<fo:table-row>
-												<fo:table-cell><fo:block/></fo:table-cell>
+												<fo:table-cell><fo:block></fo:block></fo:table-cell>
 												<fo:table-cell font-family="IPAexGothic" font-size="14pt" text-align="center">
 													<fo:block>
 														<xsl:call-template name="getLocalizedString">
 															<xsl:with-param name="key">doctype_dict.<xsl:value-of select="$doctype"/></xsl:with-param>
 														</xsl:call-template>
 													</fo:block>
-													</fo:table-cell>
+												</fo:table-cell>
 												<fo:table-cell text-align="right">
 													<fo:block font-family="Arial" font-size="16pt">
 														<xsl:value-of select="java:replaceAll(java:java.lang.String.new($docnumber), '^(JIS)(.*)', '$1')"/>
@@ -489,29 +489,29 @@
 														</fo:inline>
 													</fo:block>
 												</fo:table-cell>
-
+												
 											</fo:table-row>
 										</fo:table-body>
 									</fo:table>
-
+									
 									<fo:block font-family="IPAexGothic" font-size="19pt" text-align="center" margin-top="12mm" margin-bottom="4mm"><xsl:value-of select="$title_ja"/></fo:block>
 									<fo:block font-family="Arial" font-size="13pt" text-align="center" margin-bottom="10mm"><xsl:value-of select="$title_en"/></fo:block>
-
-								</xsl:if>
+									
+								</xsl:if> -->
 
 								<!-- Annex Commentary first page -->
-								<xsl:if test="$isCommentary = 'true'">
+								<!-- <xsl:if test="$isCommentary = 'true'"> -->
 
 									<!-- Example: JIS Z 8301：2019  -->
-									<fo:block font-family="IPAexGothic" font-size="15pt" text-align="center">
+									<!-- <fo:block font-family="IPAexGothic" font-size="15pt" text-align="center">
 										<fo:inline font-family="Arial">JIS <xsl:value-of select="$docidentifier_number"/></fo:inline>
 										<fo:inline baseline-shift="10%"><fo:inline font-size="10pt">：</fo:inline>
 										<fo:inline font-family="Times New Roman" font-size="10pt"><xsl:value-of select="$docidentifier_year"/></fo:inline></fo:inline>
-									</fo:block>
+									</fo:block> -->
 
 									<!-- title -->
-									<fo:block role="H1" font-family="IPAexGothic" font-size="16pt" text-align="center" margin-top="6mm"><xsl:value-of select="$title_ja"/></fo:block>
-								</xsl:if>
+									<!-- <fo:block role="H1" font-family="IPAexGothic" font-size="16pt" text-align="center" margin-top="6mm"><xsl:value-of select="$title_ja"/></fo:block> -->
+								<!-- </xsl:if> -->
 
 								<xsl:apply-templates select="*" mode="page"/>
 
@@ -653,16 +653,22 @@
 						<fo:inline baseline-shift="20%"><fo:inline font-size="10pt">：</fo:inline>
 						<fo:inline font-family="Times New Roman" font-size="10pt"><xsl:value-of select="$docidentifier_year"/></fo:inline></fo:inline>
 					</fo:block>
-					<fo:block font-family="Arial" font-size="14pt" margin-top="12mm"><fo:inline font-family="IPAexMincho">（</fo:inline>JSA<fo:inline font-family="IPAexMincho">）</fo:inline></fo:block>
+					<fo:block font-family="Arial" font-size="14pt" margin-top="12mm">
+						<fo:inline font-family="IPAexMincho">（</fo:inline>
+						<!-- JSA -->
+						<xsl:value-of select="/*/jis:bibdata/jis:copyright/jis:owner/jis:organization/jis:abbreviation"/>
+						<fo:inline font-family="IPAexMincho">）</fo:inline></fo:block>
 				</fo:block-container>
 
 				<fo:block-container absolute-position="fixed" left="0mm" top="200mm" height="69mm" text-align="center" display-align="after" font-family="IPAexMincho">
 					<!-- Revised on July 22, 2019 -->
 					<fo:block font-size="9pt">令和元年<fo:inline font-family="Times New Roman"> 7 </fo:inline>月<fo:inline font-family="Times New Roman"> 22 </fo:inline>日 改正</fo:block>
 					<!-- Japan Industrial Standards Survey Council deliberations -->
-					<fo:block font-size="14pt" margin-top="7mm">日本産業標準調査会 審議</fo:block>
+					<!-- 日本産業標準調査会 -->
+					<fo:block font-size="14pt" margin-top="7mm"><xsl:value-of select="/*/jis:bibdata/jis:contributor[jis:role/@type = 'authorizer']/jis:organization/jis:name/jis:variant[@language = 'ja']"/> 審議</fo:block>
 					<!-- (Issued by the Japan Standards Association) -->
-					<fo:block font-size="9pt" margin-top="6.5mm">（日本規格協会 発行）</fo:block>
+					<!-- 日本規格協会 -->
+					<fo:block font-size="9pt" margin-top="6.5mm">（<xsl:value-of select="/*/jis:bibdata/jis:contributor[jis:role/@type = 'publisher']/jis:organization/jis:name/jis:variant[@language = 'ja']"/> 発行）</fo:block>
 				</fo:block-container>
 			</fo:flow>
 		</fo:page-sequence>
@@ -704,6 +710,129 @@
 		</fo:page-sequence>
 	</xsl:template> <!-- insertInnerCoverPage -->
 
+	<xsl:template match="jis:p[@class = 'JapaneseIndustrialStandard']" priority="4">
+		<fo:table table-layout="fixed" width="100%">
+			<fo:table-column column-width="proportional-column-width(36)"/>
+			<fo:table-column column-width="proportional-column-width(92)"/>
+			<fo:table-column column-width="proportional-column-width(36)"/>
+			<fo:table-body>
+				<fo:table-row>
+					<fo:table-cell>
+						<fo:block> </fo:block>
+					</fo:table-cell>
+					<fo:table-cell font-family="IPAexGothic" font-size="14pt" text-align="center">
+						<fo:block><xsl:apply-templates/></fo:block>
+					</fo:table-cell>
+					<fo:table-cell padding-left="5mm">
+						<fo:block font-family="Arial" font-size="16pt">
+							<xsl:apply-templates select="jis:span[@class = 'JIS']">
+								<xsl:with-param name="process">true</xsl:with-param>
+							</xsl:apply-templates>
+						</fo:block>
+					</fo:table-cell>
+				</fo:table-row>
+			</fo:table-body>
+		</fo:table>
+	</xsl:template>
+
+	<xsl:template match="jis:p[@class = 'StandardNumber']" priority="4">
+		<fo:table table-layout="fixed" width="100%">
+			<fo:table-column column-width="proportional-column-width(36)"/>
+			<fo:table-column column-width="proportional-column-width(92)"/>
+			<fo:table-column column-width="proportional-column-width(36)"/>
+			<fo:table-body>
+				<fo:table-row>
+					<fo:table-cell>
+						<fo:block> </fo:block>
+					</fo:table-cell>
+					<fo:table-cell>
+						<fo:block> </fo:block>
+					</fo:table-cell>
+					<fo:table-cell>
+						<fo:block>
+							<xsl:apply-templates/>
+						</fo:block>
+					</fo:table-cell>
+				</fo:table-row>
+			</fo:table-body>
+		</fo:table>
+	</xsl:template>
+
+	<xsl:template match="jis:p[@class = 'StandardNumber']//text()[not(ancestor::jis:span)]" priority="4">
+		<fo:inline font-family="Arial" font-size="16pt">
+			<xsl:choose>
+				<xsl:when test="contains(., ':')">
+					<xsl:value-of select="substring-before(., ':')"/>
+					<fo:inline baseline-shift="10%" font-size="10pt" font-family="IPAexMincho">：</fo:inline>
+					<xsl:value-of select="substring-after(., ':')"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</fo:inline>
+	</xsl:template>
+
+	<xsl:template match="jis:p[@class = 'StandardNumber']/jis:span[@class = 'EffectiveYear']" priority="4">
+		<fo:inline font-size="10pt" baseline-shift="10%">
+			<fo:inline font-family="Times New Roman"><xsl:apply-templates/></fo:inline>
+		</fo:inline>
+	</xsl:template>
+
+	<xsl:template match="jis:p[@class = 'JapaneseIndustrialStandard']/jis:tab" priority="4"/>
+		<!-- <fo:inline role="SKIP" padding-right="0mm">&#x200B;</fo:inline>
+	</xsl:template> -->
+	<xsl:template match="jis:p[@class = 'JapaneseIndustrialStandard']/jis:span[@class = 'JIS']" priority="4">
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<fo:inline font-size="16pt" font-family="Arial"><xsl:apply-templates/></fo:inline>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="jis:p[@class = 'zzSTDTitle1']" priority="4">
+		<fo:block font-family="IPAexGothic" font-size="19pt" text-align="center" margin-top="12mm" margin-bottom="4mm">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
+	<xsl:template match="jis:p[@class = 'zzSTDTitle2']" priority="4">
+		<fo:block font-family="Arial" font-size="13pt" text-align="center" margin-bottom="10mm">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
+	<!-- for commentary annex -->
+	<xsl:template match="jis:p[@class = 'CommentaryStandardNumber']" priority="4">
+		<fo:block font-family="IPAexGothic" font-size="15pt" text-align="center">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
+	<xsl:template match="jis:p[@class = 'CommentaryStandardNumber']//text()[not(ancestor::jis:span)]" priority="4">
+		<fo:inline font-family="Arial">
+			<xsl:choose>
+				<xsl:when test="contains(., ':')">
+					<xsl:value-of select="substring-before(., ':')"/>
+					<fo:inline baseline-shift="10%" font-size="10pt" font-family="IPAexMincho">：</fo:inline>
+					<xsl:value-of select="substring-after(., ':')"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</fo:inline>
+	</xsl:template>
+
+	<xsl:template match="jis:p[@class = 'CommentaryStandardNumber']/jis:span[@class = 'CommentaryEffectiveYear']" priority="4">
+		<fo:inline baseline-shift="10%" font-family="Times New Roman" font-size="10pt"><xsl:apply-templates/></fo:inline>
+	</xsl:template>
+
+	<xsl:template match="jis:p[@class = 'CommentaryStandardName']" priority="4">
+		<fo:block role="H1" font-family="IPAexGothic" font-size="16pt" text-align="center" margin-top="6mm">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<!-- ============================= -->
 	<!-- CONTENTS                      -->
 	<!-- ============================= -->
@@ -842,7 +971,7 @@
 			<xsl:choose>
 				<xsl:when test="@type = 'section-title'">18pt</xsl:when>
 				<xsl:when test="@ancestor = 'foreword' and $level = '1'">14pt</xsl:when>
-				<xsl:when test="@ancestor = 'annex' and $level = '1' and preceding-sibling::*[1][local-name() = 'annex' and @commentary = 'true']">16pt</xsl:when>
+				<xsl:when test="@ancestor = 'annex' and $level = '1' and preceding-sibling::*[local-name() = 'annex'][1][@commentary = 'true']">16pt</xsl:when>
 				<xsl:when test="@ancestor = 'annex' and $level = '1'">14pt</xsl:when>
 				<!-- <xsl:when test="@ancestor = 'foreword' and $level &gt;= '2'">12pt</xsl:when>
 				<xsl:when test=". = 'Executive summary'">18pt</xsl:when>
@@ -879,7 +1008,7 @@
 		<xsl:variable name="margin-top">
 			<xsl:choose>
 				<xsl:when test="@ancestor = 'foreword' and $level = 1">9mm</xsl:when>
-				<xsl:when test="@ancestor = 'annex' and $level = '1' and preceding-sibling::*[1][local-name() = 'annex' and @commentary = 'true']">1mm</xsl:when>
+				<xsl:when test="@ancestor = 'annex' and $level = '1' and preceding-sibling::*[local-name() = 'annex'][1][@commentary = 'true']">1mm</xsl:when>
 				<xsl:when test="$level = 1">6.5mm</xsl:when>
 				<xsl:when test="@ancestor = 'foreword' and $level = 2">0mm</xsl:when>
 				<xsl:when test="@ancestor = 'annex' and $level = 2">4.5mm</xsl:when>
@@ -900,7 +1029,7 @@
 		<xsl:variable name="margin-bottom">
 			<xsl:choose>
 				<xsl:when test="@ancestor = 'foreword' and $level = 1">9mm</xsl:when>
-				<xsl:when test="@ancestor = 'annex' and $level = '1' and preceding-sibling::*[1][local-name() = 'annex' and @commentary = 'true']">7mm</xsl:when>
+				<xsl:when test="@ancestor = 'annex' and $level = '1' and preceding-sibling::*[local-name() = 'annex'][1][@commentary = 'true']">7mm</xsl:when>
 				<xsl:when test="$level = 1 and following-sibling::jis:clause">8pt</xsl:when>
 				<xsl:when test="$level = 1">12pt</xsl:when>
 				<xsl:when test="$level = 2 and following-sibling::jis:clause">8pt</xsl:when>
@@ -1167,7 +1296,7 @@
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'span'][@class = 'surname' or @class = 'givenname']" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'span'][@class = 'surname' or @class = 'givenname' or @class = 'JIS' or @class = 'EffectiveYear' or @class = 'CommentaryEffectiveYear']" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:apply-templates select="@* | node()" mode="update_xml_step1"/>
 		</xsl:copy>
@@ -1370,7 +1499,10 @@
 
 	<xsl:template match="*[local-name() = 'font_en'][normalize-space() != '']">
 		<xsl:if test="ancestor::*[local-name() = 'td' or local-name() = 'th']"><xsl:value-of select="$zero_width_space"/></xsl:if>
-		<fo:inline font-family="Times New Roman">
+		<fo:inline>
+			<xsl:if test="not(ancestor::jis:p[@class = 'zzSTDTitle2']) and not(ancestor::jis:span[@class = 'JIS'])">
+				<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
+			</xsl:if>
 			<xsl:if test="ancestor::*[local-name() = 'preferred']">
 				<xsl:attribute name="font-weight">normal</xsl:attribute>
 			</xsl:if>
@@ -1786,11 +1918,26 @@
 							<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
 						</xsl:if>
 
-						<xsl:value-of select="."/>
+						<xsl:variable name="font_family" select="."/>
 
-						<xsl:if test="$additional_fonts != ''">
-							<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
-						</xsl:if>
+						<xsl:choose>
+							<xsl:when test="$additional_fonts = ''">
+								<xsl:value-of select="$font_family"/>
+							</xsl:when>
+							<xsl:otherwise> <!-- $additional_fonts != '' -->
+								<xsl:choose>
+									<xsl:when test="contains($font_family, ',')">
+										<xsl:value-of select="substring-before($font_family, ',')"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$font_family"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:otherwise>
+						</xsl:choose>
 					</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
@@ -2018,6 +2165,7 @@
 		<xsl:attribute name="margin-right">0mm</xsl:attribute>
 
 			<xsl:attribute name="font-size">9pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-container-style -->
 
@@ -2181,6 +2329,10 @@
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 
+			<xsl:attribute name="font-size">inherit</xsl:attribute>
+			<xsl:attribute name="margin-bottom">1pt</xsl:attribute>
+			<xsl:attribute name="margin-left"><xsl:value-of select="$text_indent"/></xsl:attribute>
+
 	</xsl:attribute-set><!-- table-note-style -->
 
 	<xsl:template name="refine_table-note-style">
@@ -2191,7 +2343,7 @@
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 
 			<xsl:attribute name="font-size">inherit</xsl:attribute>
-			<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">1pt</xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-fn-style -->
 
@@ -2203,7 +2355,7 @@
 			<xsl:attribute name="font-size">67%</xsl:attribute>
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
 			<xsl:attribute name="vertical-align">super</xsl:attribute>
-			<xsl:attribute name="padding-right">3mm</xsl:attribute>
+			<xsl:attribute name="padding-right">0mm</xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-fn-number-style -->
 
@@ -3993,11 +4145,7 @@
 
 								<!-- except gb and bsi  -->
 
-										<xsl:apply-templates select="../*[local-name()='p']"/>
-										<xsl:apply-templates select="../*[local-name()='dl']"/>
-										<xsl:apply-templates select="../*[local-name()='note']"/>
-										<xsl:apply-templates select="../*[local-name()='example']"/>
-										<xsl:apply-templates select="../*[local-name()='source']"/>
+										<xsl:apply-templates select="../*[local-name()='p' or local-name()='dl' or local-name()='note' or local-name()='example' or local-name()='source']"/>
 
 								<xsl:variable name="isDisplayRowSeparator">
 
@@ -4268,21 +4416,21 @@
 
 	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
 
-		<fo:block xsl:use-attribute-sets="table-note-style">
-
-			<xsl:call-template name="refine_table-note-style"/>
-
-			<!-- Table's note/example name (NOTE, for example) -->
-			<fo:inline xsl:use-attribute-sets="table-note-name-style">
-
-				<xsl:call-template name="refine_table-note-name-style"/>
-
-				<xsl:apply-templates select="*[local-name() = 'name']"/>
-
-			</fo:inline>
-
-			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-		</fo:block>
+				<fo:list-block id="{@id}" xsl:use-attribute-sets="table-note-style" provisional-distance-between-starts="{9 + $text_indent}mm"> <!-- 12 -->
+					<fo:list-item>
+						<fo:list-item-label start-indent="{$text_indent}mm" end-indent="label-end()">
+							<fo:block>
+								<xsl:apply-templates select="*[local-name() = 'name']"/>
+							</fo:block>
+						</fo:list-item-label>
+						<fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="table-fn-body-style">
+							<fo:block>
+								<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+							</fo:block>
+						</fo:list-item-body>
+					</fo:list-item>
+				</fo:list-block>
+				<!-- jis -->
 
 	</xsl:template> <!-- table/note -->
 
@@ -4485,7 +4633,7 @@
 			<xsl:variable name="reference" select="@reference"/>
 			<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
 
-						<fo:list-block id="{@id}" xsl:use-attribute-sets="table-fn-style" provisional-distance-between-starts="{12 + $text_indent}mm">
+						<fo:list-block id="{@id}" xsl:use-attribute-sets="table-fn-style" provisional-distance-between-starts="{9 + $text_indent}mm"> <!-- 12 -->
 							<fo:list-item>
 								<fo:list-item-label start-indent="{$text_indent}mm" end-indent="label-end()">
 									<fo:block>
@@ -4501,7 +4649,7 @@
 										</fo:inline>
 									</fo:block>
 								</fo:list-item-label>
-								<fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="table-fn-body-style">&gt;
+								<fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="table-fn-body-style">
 									<fo:block>
 										<xsl:copy-of select="./node()"/>
 									</fo:block>
@@ -5363,6 +5511,9 @@
 	<!-- END Definition List -->
 	<!-- ===================== -->
 
+	<!-- default: ignore title in sections/p -->
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
+
 	<!-- ========================= -->
 	<!-- Rich text formatting -->
 	<!-- ========================= -->
@@ -7408,8 +7559,12 @@
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
-			<xsl:when test="ancestor::*[local-name() = 'title']">
+			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
 				<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>
+						<xsl:attribute name="padding-right">0mm</xsl:attribute>
+					</xsl:if>
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -7442,25 +7597,45 @@
 							<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: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: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:variable name="image_width_effective">
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-												<xsl:value-of select="$width_effective"/>
+									<xsl:choose>
+										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
+											<xsl:attribute name="scaling">non-uniform</xsl:attribute>
+										</xsl:when>
+										<xsl:otherwise>
 
-									</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="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
-									<xsl:if test="number($scale) &lt; 100">
+											<xsl:variable name="image_width_effective">
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+														<xsl:value-of select="$width_effective"/>
 
-									</xsl:if>
+											</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:if>
+										</xsl:otherwise>
+									</xsl:choose>
 
 								</xsl:if>
 
@@ -11122,7 +11297,7 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -135,7 +135,7 @@ module IsoDoc
       end
 
       def annex1(elem)
-        elem["commentary"] == "true" and return
+        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>"
@@ -157,21 +157,19 @@ module IsoDoc
         end
       end
 
-      def display_order(docxml)
-        i = 0
-        i = display_order_xpath(docxml, "//preface/*", i)
-        i = display_order_at(docxml, "//sections/introduction", i)
-        i = display_order_at(docxml, "//clause[@type = 'scope']", i)
-        i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
-        i = display_order_at(docxml, "//sections/terms | " \
-                                     "//sections/clause[descendant::terms]", i)
-        i = display_order_at(docxml, "//sections/definitions", i)
-        i = display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml), i)
-        i = display_order_xpath(docxml, "//annex[not(@commentary = 'true')]", i)
-        i = display_order_xpath(docxml, @xrefs.klass.bibliography_xpath, i)
-        i = display_order_xpath(docxml, "//annex[@commentary = 'true']", i)
-        i = display_order_xpath(docxml, "//indexsect", i)
-        display_order_xpath(docxml, "//colophon/*", i)
+      def commentary(elem)
+        t = elem.elements.first
+        commentary_title_hdr(t)
+        middle_title_main(t, "CommentaryStandardName")
+      end
+
+      def commentary_title_hdr(elem)
+        ret = <<~COMMENTARY
+          <p class="CommentaryStandardNumber">JIS #{@meta.get[:docnumber_undated]}
+        COMMENTARY
+        yr = @meta.get[:docyear] and
+          ret += ": <span class='CommentaryEffectiveYear'>#{yr}</span>"
+        elem.previous = ret
       end
 
       def tablesource(elem)
@@ -202,6 +200,60 @@ module IsoDoc
         dest.children.first.next = source
       end
 
+      def middle_title(docxml)
+        s = docxml.at(ns("//sections")) or return
+        elem = s.children.first
+        middle_title_hdr(elem)
+        middle_title_main(elem, "zzSTDTitle1")
+        middle_subtitle_main(elem)
+        # middle_title_amd(s.children.first)
+      end
+
+      def middle_title_hdr(out)
+        ret = "<p class='JapaneseIndustrialStandard'>#{@i18n.jis}"
+        @meta.get[:unpublished] and ret += @i18n.l10n("(#{@i18n.draft_label})")
+        ret += ("<tab/>" * 7)
+        ret += "<span class='JIS'>JIS</span></p>"
+        ret += "<p class='StandardNumber'><tab/>#{@meta.get[:docnumber_undated]}"
+        if yr = @meta.get[:docyear]
+          ret += ": <span class='EffectiveYear'>#{yr}</span>"
+        end
+        ret += "</p><p class='IDT'/>"
+        out.previous = ret
+      end
+
+      def middle_title_main(out, style)
+        t = @meta.get[:doctitlemain]
+        (t && !t.empty?) or return
+        ret = "<p class='#{style}'>#{@meta.get[:doctitleintro]}"
+        ret += " &#x2014; " if @meta.get[:doctitleintro] && t
+        ret += t
+        ret += " &#x2014; " if t && @meta.get[:doctitlepart]
+        ret += "</p>"
+        if a = @meta.get[:doctitlepart]
+          ret += "<p class='zzSTDTitle1'>"
+          b = @meta.get[:doctitlepartlabel] and ret += "#{b}: "
+          ret += "<br/><strong>#{a}</strong></p>"
+        end
+        out.previous = ret
+      end
+
+      def middle_subtitle_main(out)
+        t = @meta.get[:docsubtitlemain]
+        (t && !t.empty?) or return
+        ret = "<p class='zzSTDTitle2'>#{@meta.get[:docsubtitleintro]}"
+        ret += " &#x2014; " if @meta.get[:docsubtitleintro] && t
+        ret += @meta.get[:docsubtitlemain]
+        ret += " &#x2014; " if t && @meta.get[:docsubtitlepart]
+        ret += "</p>"
+        if a = @meta.get[:docsubtitlepart]
+          ret += "<p class='zzSTDTitle2'>"
+          b = @meta.get[:docsubtitlepartlabel] and ret += "#{b}: "
+          ret += "<br/><strong>#{a}</strong></p>"
+        end
+        out.previous = ret
+      end
+
       include Init
     end
   end