metanorma-jis 0.0.3 → 0.0.4

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

@@ -515,10 +515,10 @@
 
 				<fo:block-container text-align="center">
 					<!-- title -->
-					<fo:block role="H1" font-family="IPAexGothic" font-size="22pt" margin-top="27mm">規格票の様式及び作成方法</fo:block>
+					<fo:block role="H1" font-family="IPAexGothic" font-size="22pt" margin-top="27mm"><xsl:apply-templates select="/*/jis:bibdata/jis:title[@language = 'ja' and @type = 'main']/node()"/></fo:block>
 					<!-- docidentifier, 3 part: number, colon and year-->
-					<fo:block font-family="IPAexGothic" font-size="20pt" margin-top="15mm">JIS Z 8301<fo:inline baseline-shift="20%"><fo:inline font-size="10pt">：</fo:inline><fo:inline font-family="IPAexMincho" font-size="10pt">2019</fo:inline></fo:inline></fo:block>
-					<fo:block font-family="IPAexGothic" 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="IPAexGothic" font-size="20pt" margin-top="15mm"><fo:inline font-family="Arial">JIS Z 8301</fo:inline><fo:inline baseline-shift="20%"><fo:inline font-size="10pt">：</fo:inline><fo:inline font-family="Times New Roman" font-size="10pt">2019</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-container>
 
 				<fo:block-container absolute-position="fixed" left="0mm" top="200mm" height="69mm" text-align="center" display-align="after" font-family="IPAexMincho">
@@ -540,7 +540,7 @@
 
 			<fo:static-content flow-name="xsl-footnote-separator">
 				<fo:block text-align="center" margin-bottom="6pt">
-					<fo:leader leader-pattern="rule" leader-length="80mm"/>
+					<fo:leader leader-pattern="rule" leader-length="80mm" rule-style="solid" rule-thickness="0.3pt"/>
 				</fo:block>
 			</fo:static-content>
 
@@ -559,7 +559,7 @@
 							<fo:inline/>
 							<fo:footnote-body>
 								<fo:block font-size="8.5pt">
-									<xsl:apply-templates select="/*/*[local-name() = 'preface']/*[local-name() = 'clause'][@type = 'inner-cover-note']/*[not(local-name() = 'title')]"/>
+									<xsl:apply-templates select="/*/*[local-name() = 'preface']/*[local-name() = 'clause'][@type = 'inner-cover-note']"/> <!-- /*[not(local-name() = 'title')] -->
 								</fo:block>
 							</fo:footnote-body>
 						</fo:footnote>
@@ -653,6 +653,13 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'preface']/*[local-name() = 'clause']" priority="3">
+		<fo:block>
+			<xsl:call-template name="setId"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template match="*" priority="3" mode="page">
 		<xsl:call-template name="elementProcessing"/>
 	</xsl:template>
@@ -736,7 +743,7 @@
 		<xsl:variable name="margin-top">
 			<xsl:choose>
 				<xsl:when test="@ancestor = 'foreword' and $level = 1">9mm</xsl:when>
-				<xsl:when test="$level = 1">4.5mm</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>
 				<xsl:when test="@ancestor = 'bibliography' and $level = 2">0mm</xsl:when>
@@ -755,12 +762,13 @@
 
 		<xsl:variable name="margin-bottom">
 			<xsl:choose>
+				<xsl:when test="@ancestor = 'foreword' and $level = 1">9mm</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>
 				<xsl:when test="$level &gt;= 2">12pt</xsl:when>
 				<xsl:when test="@type = 'section-title'">6mm</xsl:when>
 				<xsl:when test="@inline-header = 'true'">0pt</xsl:when>
-				<xsl:when test="@ancestor = 'foreword' and $level = 1">9mm</xsl:when>
-				<xsl:when test="@ancestor = 'introduction' and $level = 1">5.5mm</xsl:when>
 				<xsl:when test="@ancestor = 'annex' and $level = 1">6mm</xsl:when>
 				<xsl:otherwise>0mm</xsl:otherwise>
 			</xsl:choose>
@@ -841,7 +849,9 @@
 				<xsl:variable name="element-name">fo:block</xsl:variable>
 
 				<xsl:element name="{$element-name}">
-					<xsl:call-template name="setBlockAttributes"/>
+					<xsl:call-template name="setBlockAttributes">
+						<xsl:with-param name="text_align_default">justify</xsl:with-param>
+					</xsl:call-template>
 					<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
 
 					<xsl:if test="not(parent::jis:note or parent::jis:li or ancestor::jis:table)">
@@ -867,10 +877,18 @@
 						<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
 					</xsl:if>
 
-					<xsl:if test="parent::jis:li or following-sibling::*[1][self::jis:ol or self::jis:ul]">
+					<xsl:if test="parent::jis:li or following-sibling::*[1][self::jis:ol or self::jis:ul or self::jis:note or self::jis:example]">
 						<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
 					</xsl:if>
 
+					<xsl:if test="parent::jis:td or parent::jis:th or parent::jis:dd">
+						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+					</xsl:if>
+
+					<xsl:if test="parent::jis:clause[@type = 'inner-cover-note']">
+						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+					</xsl:if>
+
 					<xsl:apply-templates>
 						<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
 					</xsl:apply-templates>
@@ -890,8 +908,6 @@
 
 	<xsl:template match="jis:termnote" priority="2">
 		<fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">
-			<xsl:attribute name="text-indent">0mm</xsl:attribute>
-			<xsl:attribute name="space-before">2pt</xsl:attribute>
 			<fo:list-block provisional-distance-between-starts="{14 + $text_indent}mm">
 				<fo:list-item>
 					<fo:list-item-label start-indent="{$text_indent}mm" end-indent="label-end()">
@@ -949,12 +965,17 @@
 	<!-- ========================= -->
 	<!-- Allocate non-Japanese text -->
 	<!-- ========================= -->
-	<!-- <name>注記  1</name> to <name>注記<font_en>  1</font_en></name> -->
-	<xsl:template match="jis:note/jis:name/text() |        jis:term/jis:preferred//text() |       jis:termnote/jis:name/text() |       jis:table/jis:name/text() |       jis:example/jis:name/text() |        jis:termexample/jis:name/text() |       jis:xref//text() |       jis:origin/text() |       jis:strong/text()" mode="update_xml_step1">
-		<xsl:variable name="regex_en">([^\u3000-\u9FFF\uF900-\uFFFF]{1,})</xsl:variable>
-		<xsl:variable name="element_name_font_en">font_en</xsl:variable>
-		<xsl:variable name="tag_font_en_open">###<xsl:value-of select="$element_name_font_en"/>###</xsl:variable>
-		<xsl:variable name="tag_font_en_close">###/<xsl:value-of select="$element_name_font_en"/>###</xsl:variable>
+
+	<xsl:variable name="regex_en">([^\u3000-\u9FFF\uF900-\uFFFF]{1,})</xsl:variable>
+
+	<xsl:variable name="element_name_font_en">font_en</xsl:variable>
+	<xsl:variable name="tag_font_en_open">###<xsl:value-of select="$element_name_font_en"/>###</xsl:variable>
+	<xsl:variable name="tag_font_en_close">###/<xsl:value-of select="$element_name_font_en"/>###</xsl:variable>
+	<xsl:variable name="element_name_font_en_bold">font_en_bold</xsl:variable>
+	<xsl:variable name="tag_font_en_bold_open">###<xsl:value-of select="$element_name_font_en_bold"/>###</xsl:variable>
+	<xsl:variable name="tag_font_en_bold_close">###/<xsl:value-of select="$element_name_font_en_bold"/>###</xsl:variable>
+
+	<xsl:template match="jis:p//text()[not(ancestor::jis:strong)] |       jis:dt/text()" mode="update_xml_step1">
 		<xsl:variable name="text_en_" select="java:replaceAll(java:java.lang.String.new(.), $regex_en, concat($tag_font_en_open,'$1',$tag_font_en_close))"/>
 		<xsl:variable name="text_en"><text><xsl:call-template name="replace_text_tags">
 			<xsl:with-param name="tag_open" select="$tag_font_en_open"/>
@@ -964,7 +985,59 @@
 		<xsl:copy-of select="xalan:nodeset($text_en)/text/node()"/>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'font_en']">
+	<!-- jis:term/jis:preferred2//text() | -->
+
+	<!-- <name>注記  1</name> to <name>注記<font_en>  1</font_en></name> -->
+	<xsl:template match="jis:title/text() |        jis:note/jis:name/text() |        jis:termnote/jis:name/text() |       jis:table/jis:name/text() |       jis:figure/jis:name/text() |       jis:example/jis:name/text() |        jis:termexample/jis:name/text() |       jis:xref//text() |       jis:origin/text()" mode="update_xml_step1">
+		<xsl:variable name="text_en_" select="java:replaceAll(java:java.lang.String.new(.), $regex_en, concat($tag_font_en_bold_open,'$1',$tag_font_en_bold_close))"/>
+		<xsl:variable name="text_en"><text><xsl:call-template name="replace_text_tags">
+			<xsl:with-param name="tag_open" select="$tag_font_en_bold_open"/>
+			<xsl:with-param name="tag_close" select="$tag_font_en_bold_close"/>
+			<xsl:with-param name="text" select="$text_en_"/>
+		</xsl:call-template></text></xsl:variable>
+		<xsl:copy-of select="xalan:nodeset($text_en)/text/node()"/>
+	</xsl:template>
+
+	<xsl:template match="jis:eref//text()" mode="update_xml_step1">
+		<!-- Example: JIS Z 8301:2011 to <font_en_bold>JIS Z 8301</font_en_bold><font_en>:2011</font_en> -->
+		<xsl:variable name="parts">
+			<xsl:choose>
+				<xsl:when test="contains(., ':')">
+					<xsl:element name="{$element_name_font_en_bold}"><xsl:value-of select="substring-before(., ':')"/></xsl:element>
+					<xsl:element name="{$element_name_font_en}">:<xsl:value-of select="substring-after(., ':')"/></xsl:element>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:element name="{$element_name_font_en_bold}"><xsl:value-of select="."/></xsl:element>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:for-each select="xalan:nodeset($parts)/*">
+			<xsl:variable name="tag_open">###<xsl:value-of select="local-name()"/>###</xsl:variable>
+			<xsl:variable name="tag_close">###/<xsl:value-of select="local-name()"/>###</xsl:variable>
+			<xsl:variable name="text_en_" select="java:replaceAll(java:java.lang.String.new(.), $regex_en, concat($tag_open,'$1',$tag_close))"/>
+			<xsl:variable name="text_en"><text><xsl:call-template name="replace_text_tags">
+				<xsl:with-param name="tag_open" select="$tag_open"/>
+				<xsl:with-param name="tag_close" select="$tag_close"/>
+				<xsl:with-param name="text" select="$text_en_"/>
+			</xsl:call-template></text></xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($text_en)/text/node()"/>
+		</xsl:for-each>
+	</xsl:template>
+
+	<xsl:template match="jis:strong" priority="2" mode="update_xml_step1">
+		<xsl:apply-templates mode="update_xml_step1"/>
+	</xsl:template>
+	<xsl:template match="jis:strong/text()" priority="2" mode="update_xml_step1">
+		<xsl:variable name="text_en_" select="java:replaceAll(java:java.lang.String.new(.), $regex_en, concat($tag_font_en_bold_open,'$1',$tag_font_en_bold_close))"/>
+		<xsl:variable name="text_en"><text><xsl:call-template name="replace_text_tags">
+			<xsl:with-param name="tag_open" select="$tag_font_en_bold_open"/>
+			<xsl:with-param name="tag_close" select="$tag_font_en_bold_close"/>
+			<xsl:with-param name="text" select="$text_en_"/>
+		</xsl:call-template></text></xsl:variable>
+		<xsl:copy-of select="xalan:nodeset($text_en)/text/node()"/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'font_en_bold']">
 		<fo:inline font-family="Times New Roman" font-weight="bold">
 			<xsl:if test="ancestor::*[local-name() = 'preferred']">
 				<xsl:attribute name="font-weight">normal</xsl:attribute>
@@ -973,6 +1046,15 @@
 		</fo:inline>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'font_en']">
+		<fo:inline font-family="Times New Roman">
+			<xsl:if test="ancestor::*[local-name() = 'preferred']">
+				<xsl:attribute name="font-weight">normal</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template>
+
 	<!-- ========================= -->
 	<!-- END: Allocate non-Japanese text -->
 	<!-- ========================= -->
@@ -1004,7 +1086,7 @@
 		<xsl:param name="section"/>
 		<xsl:param name="copyrightText"/>
 		<fo:static-content flow-name="footer">
-			<fo:block-container height="24.5mm" display-align="after">
+			<fo:block-container height="24mm" display-align="after">
 				<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>
@@ -1528,6 +1610,8 @@
 
 	<xsl:attribute-set name="example-p-style">
 
+			<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
+
 	</xsl:attribute-set> <!-- example-p-style -->
 
 	<xsl:attribute-set name="termexample-name-style">
@@ -1605,8 +1689,10 @@
 		<xsl:attribute name="padding-right">1mm</xsl:attribute>
 		<xsl:attribute name="display-align">center</xsl:attribute>
 
+			<xsl:attribute name="font-weight">normal</xsl:attribute>
 			<xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute>
 			<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
+			<xsl:attribute name="text-align">center</xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-header-cell-style -->
 
@@ -1686,11 +1772,17 @@
 	<!-- ========================== -->
 	<!-- Definition's list styles -->
 	<!-- ========================== -->
+
+	<xsl:attribute-set name="dl-block-style">
+
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="dt-row-style">
 
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="dt-cell-style">
+
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="dt-block-style">
@@ -1706,6 +1798,7 @@
 
 	<xsl:attribute-set name="dd-cell-style">
 		<xsl:attribute name="padding-left">2mm</xsl:attribute>
+
 	</xsl:attribute-set>
 
 	<!-- ========================== -->
@@ -1755,6 +1848,10 @@
 
 	<xsl:attribute-set name="termnote-style">
 
+			<xsl:attribute name="text-indent">0mm</xsl:attribute>
+			<xsl:attribute name="space-before">4pt</xsl:attribute>
+			<xsl:attribute name="space-after">4pt</xsl:attribute>
+
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="termnote-name-style">
@@ -1819,6 +1916,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:attribute-set name="figure-source-style">
+
+	</xsl:attribute-set>
+
 	<!-- Formula's styles -->
 	<xsl:attribute-set name="formula-style">
 		<xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -1935,6 +2036,7 @@
 	<xsl:attribute-set name="list-style">
 
 			<xsl:attribute name="provisional-distance-between-starts">7.5mm</xsl:attribute>
+			<xsl:attribute name="space-after">4pt</xsl:attribute>
 
 	</xsl:attribute-set> <!-- list-style -->
 
@@ -2331,7 +2433,7 @@
 
 	<xsl:template name="processTables_Contents">
 		<tables>
-			<xsl:for-each select="//*[local-name() = 'table'][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
+			<xsl:for-each select="//*[local-name() = 'table'][not(ancestor::*[local-name() = 'metanorma-extension'])][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
 				<table id="{@id}" alt-text="{*[local-name() = 'name']}">
 					<xsl:copy-of select="*[local-name() = 'name']"/>
 				</table>
@@ -2655,6 +2757,10 @@
 
 						<xsl:call-template name="setBordersTableArray"/>
 
+							<xsl:if test="ancestor::*[local-name()='preface']">
+								<xsl:attribute name="border">none</xsl:attribute>
+							</xsl:if>
+
 					</xsl:element>
 				</xsl:variable>
 
@@ -2675,7 +2781,7 @@
 						</xsl:attribute>
 					</xsl:for-each>
 
-					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/>
+					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] 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:if>
@@ -2719,7 +2825,7 @@
 									<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
 								</xsl:when>
 								<xsl:otherwise>
-									<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'dl')          and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note and dl which render separaterely -->
+									<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'dl') and not(local-name() = 'source')          and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
 								</xsl:otherwise>
 							</xsl:choose>
 
@@ -2803,6 +2909,11 @@
 		</xsl:if>
 	</xsl:template> <!-- table/name -->
 
+	<!-- SOURCE: ... -->
+	<xsl:template match="*[local-name()='table']/*[local-name() = 'source']" priority="2">
+		<xsl:call-template name="termsource"/>
+	</xsl:template>
+
 	<xsl:template name="calculate-columns-numbers">
 		<xsl:param name="table-row"/>
 		<xsl:variable name="columns-count" select="count($table-row/*)"/>
@@ -3159,7 +3270,7 @@
 		</fo:table-header>
 	</xsl:template> <!-- thead -->
 
-	<!-- template is using for iso, jcgm, bsi only -->
+	<!-- template is using for iec, iso, jcgm, bsi only -->
 	<xsl:template name="table-header-title">
 		<xsl:param name="cols-count"/>
 		<!-- row for title -->
@@ -3202,7 +3313,7 @@
 		<xsl:param name="colwidths"/>
 		<xsl:param name="colgroup"/>
 
-		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
+		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source']"/>
 
 		<xsl:variable name="isNoteOrFnExistShowAfterTable">
 
@@ -3272,6 +3383,7 @@
 
 										<xsl:apply-templates select="../*[local-name()='dl']"/>
 										<xsl:apply-templates select="../*[local-name()='note']"/>
+										<xsl:apply-templates select="../*[local-name()='source']"/>
 
 								<xsl:variable name="isDisplayRowSeparator">
 
@@ -3402,6 +3514,11 @@
 
 			<xsl:call-template name="setBordersTableArray"/>
 
+				<xsl:if test="ancestor::*[local-name() = 'preface']">
+					<xsl:attribute name="border-top">none</xsl:attribute>
+					<xsl:attribute name="border-bottom">none</xsl:attribute>
+				</xsl:if>
+
 			<xsl:call-template name="setTableRowAttributes"/>
 
 			<xsl:apply-templates/>
@@ -3468,8 +3585,14 @@
 				<xsl:with-param name="default">center</xsl:with-param>
 			</xsl:call-template>
 
+				<xsl:attribute name="text-align">center</xsl:attribute>
+
 			<xsl:call-template name="setBordersTableArray"/>
 
+				<xsl:if test="ancestor::*[local-name()='preface']">
+					<xsl:attribute name="border">none</xsl:attribute>
+				</xsl:if>
+
 			<xsl:if test="$lang = 'ar'">
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
@@ -3524,6 +3647,10 @@
 
 			<xsl:call-template name="setBordersTableArray"/>
 
+				<xsl:if test="ancestor::*[local-name() = 'preface']">
+					<xsl:attribute name="border">none</xsl:attribute>
+				</xsl:if>
+
 			<xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table -->
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
@@ -3721,7 +3848,11 @@
 							<fo:list-item>
 								<fo:list-item-label start-indent="{$text_indent}mm" end-indent="label-end()">
 									<fo:block>
-										<fo:inline font-size="9pt" font-family="IPAexGothic">注</fo:inline>
+										<fo:inline font-size="9pt" font-family="IPAexGothic">
+											<xsl:call-template name="getLocalizedString">
+												<xsl:with-param name="key">table_footnote</xsl:with-param>
+											</xsl:call-template>
+										</fo:inline>
 										<xsl:text> </xsl:text>
 										<fo:inline xsl:use-attribute-sets="table-fn-number-style">
 											<xsl:value-of select="@reference"/>
@@ -3914,7 +4045,7 @@
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
 		<!-- <dl><xsl:copy-of select="."/></dl> -->
-		<fo:block-container>
+		<fo:block-container xsl:use-attribute-sets="dl-block-style">
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
@@ -3922,6 +4053,18 @@
 						<xsl:attribute name="margin-left">0mm</xsl:attribute>
 					</xsl:if>
 
+			<xsl:if test="ancestor::*[local-name() = 'sourcecode']">
+				<!-- set font-size as sourcecode font-size -->
+				<xsl:variable name="sourcecode_attributes">
+					<xsl:call-template name="get_sourcecode_attributes"/>
+				</xsl:variable>
+				<xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@font-size">
+					<xsl:attribute name="{local-name()}">
+						<xsl:value-of select="."/>
+					</xsl:attribute>
+				</xsl:for-each>
+			</xsl:if>
+
 			<xsl:if test="parent::*[local-name() = 'note']">
 				<xsl:attribute name="margin-left">
 					<xsl:choose>
@@ -4355,6 +4498,7 @@
 		<xsl:param name="split_keep-within-line"/>
 
 		<fo:table-row xsl:use-attribute-sets="dt-row-style">
+
 			<xsl:call-template name="insert_dt_cell">
 				<xsl:with-param name="key_iso" select="$key_iso"/>
 				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
@@ -4376,6 +4520,7 @@
 				<!-- border is mandatory, to calculate real width -->
 				<xsl:attribute name="border">0.1pt solid black</xsl:attribute>
 				<xsl:attribute name="text-align">left</xsl:attribute>
+
 			</xsl:if>
 
 			<fo:block xsl:use-attribute-sets="dt-block-style">
@@ -4544,6 +4689,8 @@
 		<xsl:param name="split_keep-within-line"/>
 		<fo:inline font-weight="bold">
 
+				<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
+
 			<xsl:apply-templates>
 				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
 			</xsl:apply-templates>
@@ -4818,6 +4965,11 @@
 				<fo:inline>
 					<xsl:for-each select="$styles/style">
 						<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
+
+							<xsl:if test="@name = 'font-family' and . = 'MS Gothic'">
+								<xsl:attribute name="{@name}">IPAexGothic</xsl:attribute>
+							</xsl:if>
+
 					</xsl:for-each>
 					<xsl:apply-templates/>
 				</fo:inline>
@@ -6112,7 +6264,14 @@
 
 			<fo:block-container margin-left="0mm" margin-right="0mm">
 
-						<fo:list-block provisional-distance-between-starts="{14 + $text_indent}mm">
+						<fo:list-block>
+							<xsl:attribute name="provisional-distance-between-starts">
+								<xsl:choose>
+									<!-- if last char is digit -->
+									<xsl:when test="translate(substring(*[local-name() = 'name'], string-length(*[local-name() = 'name'])),'0123456789','') = ''"><xsl:value-of select="14 + $text_indent"/>mm</xsl:when>
+									<xsl:otherwise><xsl:value-of select="10 + $text_indent"/>mm</xsl:otherwise>
+								</xsl:choose>
+							</xsl:attribute>
 							<fo:list-item>
 								<fo:list-item-label start-indent="{$text_indent}mm" end-indent="label-end()">
 									<fo:block xsl:use-attribute-sets="note-name-style">
@@ -6307,6 +6466,13 @@
 		</fo:block>
 	</xsl:template>
 
+	<!-- SOURCE: ... -->
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'source']" priority="2">
+
+				<xsl:call-template name="termsource"/>
+
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'image']">
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
@@ -7436,9 +7602,11 @@
 								<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 							</xsl:if>
 
-							<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+							<xsl:apply-templates select="node()[not(local-name() = 'name' or local-name() = 'dl')]"/>
 						</fo:block>
 
+						<xsl:apply-templates select="*[local-name() = 'dl']"/> <!-- Key table -->
+
 								<xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
 
 					</fo:block-container>
@@ -7470,11 +7638,22 @@
 	<!-- add sourcecode highlighting -->
 	<xsl:template match="*[local-name()='sourcecode']//*[local-name()='span'][@class]" priority="2">
 		<xsl:variable name="class" select="@class"/>
+
+		<!-- Example: <1> -->
+		<xsl:variable name="is_callout">
+			<xsl:if test="parent::*[local-name() = 'dt']">
+				<xsl:variable name="dt_id" select="../@id"/>
+				<xsl:if test="ancestor::*[local-name() = 'sourcecode']//*[local-name() = 'callout'][@target = $dt_id]">true</xsl:if>
+			</xsl:if>
+		</xsl:variable>
+
 		<xsl:choose>
 			<xsl:when test="$sourcecode_css//class[@name = $class]">
 				<fo:inline>
 					<xsl:apply-templates select="$sourcecode_css//class[@name = $class]" mode="css"/>
+					<xsl:if test="$is_callout = 'true'">&lt;</xsl:if>
 					<xsl:apply-templates/>
+					<xsl:if test="$is_callout = 'true'">&gt;</xsl:if>
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
@@ -7898,6 +8077,10 @@
 		</fo:block>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'div']">
+		<fo:block><xsl:apply-templates/></fo:block>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] |           *[local-name() = 'div'][@type = 'requirement-inherit'] |           *[local-name() = 'div'][@type = 'recommendation-inherit'] |           *[local-name() = 'div'][@type = 'permission-inherit']">
 		<fo:block xsl:use-attribute-sets="inherit-style">
 			<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
@@ -8584,13 +8767,8 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'deprecates']">
-		<xsl:variable name="title-deprecated">
-			<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">deprecated</xsl:with-param>
-			</xsl:call-template>
-		</xsl:variable>
 		<fo:block xsl:use-attribute-sets="deprecates-style">
-			<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
+			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
@@ -9817,6 +9995,23 @@
 	<xsl:template match="*[local-name() = 'stem'] | *[local-name() = 'image']" mode="update_xml_step1">
 		<xsl:copy-of select="."/>
 	</xsl:template>
+
+	<!-- add @id, redundant for table auto-layout algorithm -->
+	<xsl:template match="*[local-name() = 'dl' or local-name() = 'table'][not(@id)]" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			<xsl:call-template name="add_id"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template name="add_id">
+		<xsl:if test="not(@id)">
+			<!-- add @id - first element with @id plus '_element_name' -->
+			<xsl:attribute name="id"><xsl:value-of select="(.//*[@id])[1]/@id"/>_<xsl:value-of select="local-name()"/></xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- =========================================================================== -->
 	<!-- END STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
 	<!-- =========================================================================== -->

data/lib/isodoc/jis/metadata.rb

@@ -49,6 +49,13 @@ module IsoDoc
       end
 
       PART_LABEL = { en: "Part", ja: "その" }.freeze
+
+      def docid(isoxml, _out)
+        id = isoxml.at(ns("//bibdata/docidentifier[@type = 'JIS']"))&.text or
+          return
+        set(:docnumber, id)
+        set(:docnumber_undated, id.sub(/:\d{4}$/, ""))
+      end
     end
   end
 end