metanorma-jis 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1aab80a7925f249d9da43542593dcb44fbf35c6e444e47b43c2d409f6b5e6337
-  data.tar.gz: 0f25e20b71e7410dca4bdbc7f7484cea9926fd198d480a52a5213e19194af60b
+  metadata.gz: 1705b0a1189c3766e1a185447e7ca92fa6c55ceebcb394f12d51782dbbe98a6e
+  data.tar.gz: 9e549d8aaba6c21294d6314c980e79de90bd92f9172cf29f056199a5af1f135b
 SHA512:
-  metadata.gz: a3e77efa2a97c6faf8f6419d9d73d77b99da0682f668df17113516c75d7b8d33625ec56274a5996d576d8dffdf6816df2699ab9c080fcce06ee9be30e89c5fcc
-  data.tar.gz: cfc8462eb1314e15cd7c163d4f767c61a1b84631c1159851110398e559722e9dbadb743f3920c6255f868656c6573bab0748e0dcb9b2c9bd2cd479355c44ab93
+  metadata.gz: ef60ef6cce41c377a25975953d216a707b6621923b9d88a4202535b59a1bc7e9de8a6548be68718c51fb5df05c5e91a3f432b171f67f8e1112f3d42ddcd00cb3
+  data.tar.gz: 1adc24ff72b309f1ccea730e3a047fc89d9678e489ec8f3d62c1213a26513babe1890a67a571fa33b4c804426f91fffdee28661a89a40025434ed02b41ecab72

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

@@ -229,6 +229,46 @@ h6:hover > a.anchor,
 .inline-header:hover > a.anchor {
   visibility: visible; }
 
+/* collapsible snippets: collapsible before hidable */
+.hidable {
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out; }
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 12px 0;
+  margin: 0;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px; }
+
+.active, .collapsible:hover {
+  background-color: #555; }
+
+.collapsible:after {
+  content: '\25bc';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 12px;
+  margin-right: 12px; }
+
+.active:after {
+  content: "\25b2"; }
+
+/* collapsible: */
+.collapsible + .hidable {
+  margin-top: 0; }
+
+.collapsible:not(.active) + .hidable {
+  overflow: hidden;
+  padding: 0; }
+
 #standard-band {
   background-color: #0AC442; }
 

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

@@ -229,6 +229,46 @@ h6:hover > a.anchor,
 .inline-header:hover > a.anchor {
   visibility: visible; }
 
+/* collapsible snippets: collapsible before hidable */
+.hidable {
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out; }
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 12px 0;
+  margin: 0;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px; }
+
+.active, .collapsible:hover {
+  background-color: #555; }
+
+.collapsible:after {
+  content: '\25bc';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 12px;
+  margin-right: 12px; }
+
+.active:after {
+  content: "\25b2"; }
+
+/* collapsible: */
+.collapsible + .hidable {
+  margin-top: 0; }
+
+.collapsible:not(.active) + .hidable {
+  overflow: hidden;
+  padding: 0; }
+
 #standard-band {
   background-color: #0AC442; }
 

data/lib/isodoc/jis/i18n-en.yaml

@@ -6,6 +6,9 @@ commentary_page: Comm.
 JIS: 日本工業規格
 permission_footer: Duplication, reprinting, etc. without permission is prohibited by copyright law.
 chairperson: chairperson
+membership_table: Membership Table
+full_name: Full Name
+affiliation: Affiliation
 doctype_dict:
   international-standard: International standard
   japanese-industrial-standard: International standard

data/lib/isodoc/jis/i18n-ja.yaml

@@ -11,6 +11,9 @@ JIS: 日本工業規格
 draft_label: 案
 white-paper: 白紙
 chairperson: 委員会長
+membership_table: 構成表
+full_name: 氏名
+affiliation: 所属
 doctype_dict:
   international-standard: 日本産業規格
   japanese-industrial-standard: 日本産業規格

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

@@ -185,6 +185,11 @@
 				<xsl:apply-templates mode="update_xml_step1"/>
 			</xsl:variable>
 			<!-- DEBUG: updated_xml_step1=<xsl:copy-of select="$updated_xml_step1"/> -->
+			<!-- <xsl:message>start redirect</xsl:message>
+			<redirect:write file="update_xml_step1.xml">
+				<xsl:copy-of select="$updated_xml_step1"/>
+			</redirect:write>
+			<xsl:message>end redirect</xsl:message> -->
 
 			<xsl:variable name="updated_xml_step2_">
 				<xsl:apply-templates select="xalan:nodeset($updated_xml_step1)" mode="update_xml_step2"/>
@@ -246,87 +251,99 @@
 					<!-- Contents and preface pages -->
 					<!-- ========================== -->
 
-					<fo:page-sequence master-reference="document_toc" initial-page-number="1" force-page-count="no-force">
+					<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'clause' and @type = 'contributors')]">
+						<xsl:sort select="@displayorder" data-type="number"/>
 
-						<xsl:call-template name="insertHeaderFooter">
-							<xsl:with-param name="docidentifier" select="$docidentifier"/>
-							<xsl:with-param name="copyrightText" select="$copyrightText"/>
-							<xsl:with-param name="section">preface</xsl:with-param>
-							<xsl:with-param name="section_title">
-								<fo:inline font-family="IPAexGothic">
-									<xsl:text> </xsl:text>
-									<xsl:call-template name="getLocalizedString">
-										<xsl:with-param name="key">table_of_contents</xsl:with-param>
-									</xsl:call-template>
-								</fo:inline>
-							</xsl:with-param>
-						</xsl:call-template>
-
-						<fo:flow flow-name="xsl-region-body">
+						<xsl:choose>
+							<xsl:when test="local-name() = 'clause' and @type = 'toc'">
+								<fo:page-sequence master-reference="document_toc" force-page-count="no-force">
 
-							<xsl:if test="$debug = 'true'">
-								<xsl:text disable-output-escaping="yes">&lt;!--</xsl:text>
-									DEBUG
-									contents=<xsl:copy-of select="$contents"/>
-								<xsl:text disable-output-escaping="yes">--&gt;</xsl:text>
-							</xsl:if>
+									<xsl:if test="position() = 1">
+										<xsl:attribute name="initial-page-number">1</xsl:attribute>
+									</xsl:if>
 
-							<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() = 'clause'][@type = 'toc']">
-								<xsl:with-param name="num" select="$num"/>
-							</xsl:apply-templates>
+									<xsl:call-template name="insertHeaderFooter">
+										<xsl:with-param name="docidentifier" select="$docidentifier"/>
+										<xsl:with-param name="copyrightText" select="$copyrightText"/>
+										<xsl:with-param name="section">preface</xsl:with-param>
+										<xsl:with-param name="section_title">
+											<fo:inline font-family="IPAexGothic">
+												<xsl:text> </xsl:text>
+												<xsl:call-template name="getLocalizedString">
+													<xsl:with-param name="key">table_of_contents</xsl:with-param>
+												</xsl:call-template>
+											</fo:inline>
+										</xsl:with-param>
+									</xsl:call-template>
 
-							<xsl:if test="not(/*/*[local-name()='preface']/*[local-name() = 'clause'][@type = 'toc'])">
-								<fo:block><!-- prevent fop error for empty document --></fo:block>
-							</xsl:if>
+									<fo:flow flow-name="xsl-region-body">
 
-						</fo:flow>
+										<!-- <xsl:if test="$debug = 'true'">
+											<redirect:write file="contents_.xml">
+												<xsl:copy-of select="$contents"/>
+											</redirect:write>
+										</xsl:if> -->
 
-					</fo:page-sequence>
+										<xsl:apply-templates select=".">
+											<xsl:with-param name="num" select="$num"/>
+										</xsl:apply-templates>
 
-					<xsl:variable name="structured_xml_preface">
+										<!-- <xsl:if test="not(/*/*[local-name()='preface']/*[local-name() = 'clause'][@type = 'toc'])">
+											<fo:block> --><!-- prevent fop error for empty document --><!-- </fo:block>
+										</xsl:if> -->
 
-						<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() = 'foreword']" mode="linear_xml"/>
+									</fo:flow>
 
-					</xsl:variable>
+								</fo:page-sequence>
+							</xsl:when><!-- end ToC -->
+							<xsl:otherwise>
+								<xsl:variable name="structured_xml_preface">
+									<xsl:apply-templates select="." mode="linear_xml"/>
+								</xsl:variable>
 
-					<!-- structured_xml_preface=<xsl:copy-of select="$structured_xml_preface"/> -->
+								<xsl:variable name="paged_xml_preface_">
+									<xsl:call-template name="makePagedXML">
+										<xsl:with-param name="structured_xml" select="$structured_xml_preface"/>
+									</xsl:call-template>
+								</xsl:variable>
+								<xsl:variable name="paged_xml_preface" select="xalan:nodeset($paged_xml_preface_)"/>
 
-					<xsl:variable name="paged_xml_preface_">
-						<xsl:call-template name="makePagedXML">
-							<xsl:with-param name="structured_xml" select="$structured_xml_preface"/>
-						</xsl:call-template>
-					</xsl:variable>
-					<xsl:variable name="paged_xml_preface" select="xalan:nodeset($paged_xml_preface_)"/>
+								<xsl:if test="$paged_xml_preface/*[local-name()='page'] and count($paged_xml_preface/*[local-name()='page']/*) != 0">
+									<!-- Preface pages -->
+									<fo:page-sequence master-reference="document_preface" force-page-count="no-force">
 
-					<xsl:if test="$paged_xml_preface/*[local-name()='page'] and count($paged_xml_preface/*[local-name()='page']/*) != 0">
-						<!-- Preface pages -->
-						<fo:page-sequence master-reference="document_preface" force-page-count="no-force">
+										<xsl:if test="position() = 1">
+											<xsl:attribute name="initial-page-number">1</xsl:attribute>
+										</xsl:if>
 
-							<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:block>
-							</fo:static-content>
+										<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:block>
+										</fo:static-content>
 
-							<xsl:call-template name="insertHeaderFooter">
-								<xsl:with-param name="docidentifier" select="$docidentifier"/>
-								<xsl:with-param name="copyrightText" select="$copyrightText"/>
-								<xsl:with-param name="section">preface</xsl:with-param>
-							</xsl:call-template>
+										<xsl:call-template name="insertHeaderFooter">
+											<xsl:with-param name="docidentifier" select="$docidentifier"/>
+											<xsl:with-param name="copyrightText" select="$copyrightText"/>
+											<xsl:with-param name="section">preface</xsl:with-param>
+										</xsl:call-template>
 
-							<fo:flow flow-name="xsl-region-body">
+										<fo:flow flow-name="xsl-region-body">
 
-								<fo:block>
-									<xsl:for-each select="$paged_xml_preface/*[local-name()='page']">
-										<xsl:if test="position() != 1">
-											<fo:block break-after="page"/>
-										</xsl:if>
-										<xsl:apply-templates select="*" mode="page"/>
-									</xsl:for-each>
-								</fo:block>
-							</fo:flow>
-						</fo:page-sequence> <!-- END Preface pages -->
-					</xsl:if>
+											<fo:block>
+												<xsl:for-each select="$paged_xml_preface/*[local-name()='page']">
+													<xsl:if test="position() != 1">
+														<fo:block break-after="page"/>
+													</xsl:if>
+													<xsl:apply-templates select="*" mode="page"/>
+												</xsl:for-each>
+											</fo:block>
+										</fo:flow>
+									</fo:page-sequence> <!-- END Preface pages -->
+								</xsl:if>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:for-each>
 
 					<!-- Document type rendering -->
 					<fo:page-sequence master-reference="document_preface" force-page-count="no-force">
@@ -400,7 +417,12 @@
 							<xsl:copy-of select="./*"/>
 						</xsl:for-each>
 					</xsl:variable>
-					<!-- structured_xml=<xsl:copy-of select="$structured_xml" /> -->
+
+					<!-- <xsl:if test="$debug = 'true'">
+						<redirect:write file="structured_xml_.xml">
+							<xsl:copy-of select="$structured_xml"/>
+						</redirect:write>
+					</xsl:if> -->
 
 					<xsl:variable name="paged_xml">
 						<xsl:call-template name="makePagedXML">
@@ -1102,6 +1124,12 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'introduction']">
+		<fo:block id="{@id}">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'annex']" priority="2">
 		<fo:block id="{@id}">
 		</fo:block>
@@ -1399,12 +1427,16 @@
 
 	<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"/>
-			<xsl:with-param name="tag_close" select="$tag_font_en_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:variable name="text_en">
+			<xsl:element name="text" namespace="{$namespace_full}">
+				<xsl:call-template name="replace_text_tags">
+					<xsl:with-param name="tag_open" select="$tag_font_en_open"/>
+					<xsl:with-param name="tag_close" select="$tag_font_en_close"/>
+					<xsl:with-param name="text" select="$text_en_"/>
+				</xsl:call-template>
+			</xsl:element>
+		</xsl:variable>
+		<xsl:copy-of select="xalan:nodeset($text_en)/*[local-name() = 'text']/node()"/>
 	</xsl:template>
 
 	<!-- jis:term/jis:preferred2//text() | -->
@@ -1412,24 +1444,32 @@
 	<!-- <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: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:variable name="text_en">
+			<xsl:element name="text" namespace="{$namespace_full}">
+				<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>
+			</xsl:element>
+		</xsl:variable>
+		<xsl:copy-of select="xalan:nodeset($text_en)/*[local-name() = 'text']/node()"/>
 	</xsl:template>
 
 	<!-- for $contents -->
 	<xsl:template match="title/text()">
 		<xsl:variable name="regex_en_contents">([^\u00A0\u2002-\u200B\u3000-\u9FFF\uF900-\uFFFF\(\)]{1,})</xsl:variable>
 		<xsl:variable name="text_en_" select="java:replaceAll(java:java.lang.String.new(.), $regex_en_contents, 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:apply-templates select="xalan:nodeset($text_en)/text/node()"/>
+		<xsl:variable name="text_en">
+			<xsl:element name="text" namespace="{$namespace_full}">
+				<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>
+			</xsl:element>
+		</xsl:variable>
+		<xsl:apply-templates select="xalan:nodeset($text_en)/*[local-name() = 'text']/node()"/>
 	</xsl:template>
 
 	<!-- move example title to the first paragraph -->
@@ -1437,11 +1477,18 @@
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:element name="p" namespace="https://www.metanorma.org/ns/jis">
-				<xsl:value-of select="substring-after(jis:name/text(), ' — ')"/>
+				<xsl:value-of select="substring-after(jis:name/text()[1], ' — ')"/>
+				<xsl:apply-templates select="jis:name/text()[1]/following-sibling::node()" mode="update_xml_step1"/>
 			</xsl:element>
 			<xsl:apply-templates mode="update_xml_step1"/>
 		</xsl:copy>
 	</xsl:template>
+	<xsl:template match="jis:example/jis:name[contains(text(), ' — ')]" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates select="text()[1]" mode="update_xml_step1"/>
+		</xsl:copy>
+	</xsl:template>
 	<xsl:template match="jis:example/jis:name/text()" mode="update_xml_step1">
 		<xsl:variable name="example_name">
 			<xsl:choose>
@@ -1450,12 +1497,16 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:variable name="text_en_" select="java:replaceAll(java:java.lang.String.new($example_name), $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:variable name="text_en">
+			<xsl:element name="text" namespace="{$namespace_full}">
+				<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>
+			</xsl:element>
+		</xsl:variable>
+		<xsl:copy-of select="xalan:nodeset($text_en)/*[local-name() = 'text']/node()"/>
 	</xsl:template>
 
 	<xsl:template match="jis:eref//text()" mode="update_xml_step1">
@@ -1463,11 +1514,11 @@
 		<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:element name="{$element_name_font_en_bold}" namespace="{$namespace_full}"><xsl:value-of select="substring-before(., ':')"/></xsl:element>
+					<xsl:element name="{$element_name_font_en}" namespace="{$namespace_full}">:<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:element name="{$element_name_font_en_bold}" namespace="{$namespace_full}"><xsl:value-of select="."/></xsl:element>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -1475,12 +1526,16 @@
 			<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:variable name="text_en">
+				<xsl:element name="text" namespace="{$namespace_full}">
+					<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>
+				</xsl:element>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($text_en)/*[local-name() = 'text']/node()"/>
 		</xsl:for-each>
 	</xsl:template>
 
@@ -1489,12 +1544,16 @@
 	</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:variable name="text_en">
+			<xsl:element name="text" namespace="{$namespace_full}">
+				<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>
+			</xsl:element>
+		</xsl:variable>
+		<xsl:copy-of select="xalan:nodeset($text_en)/*[local-name() = 'text']/node()"/>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'font_en_bold'][normalize-space() != '']">
@@ -3429,13 +3488,35 @@
 			</xsl:for-each>
 		</xsl:element>
 
-		<xsl:call-template name="insertAnnexInSeparatePageSequences"/>
+		<xsl:call-template name="insertAnnexAndBibliographyInSeparatePageSequences"/>
 
-		<xsl:call-template name="insertBibliographyInSeparatePageSequences"/>
+		<!-- <xsl:call-template name="insertBibliographyInSeparatePageSequences"/> -->
 
 		<!-- <xsl:call-template name="insertIndexInSeparatePageSequences"/> -->
 	</xsl:template> <!-- END: insertMainSectionsInSeparatePageSequences -->
 
+	<xsl:template name="insertAnnexAndBibliographyInSeparatePageSequences">
+		<xsl:for-each select="/*/*[local-name()='annex'] |           /*/*[local-name()='bibliography']/*[not(@normative='true')] |           /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]] |          /*/*[local-name()='indexsect']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:choose>
+				<xsl:when test="local-name() = 'annex' or local-name() = 'indexsect'">
+					<xsl:element name="page_sequence" namespace="{$namespace_full}">
+						<xsl:attribute name="main_page_sequence"/>
+						<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+					</xsl:element>
+				</xsl:when>
+				<xsl:otherwise> <!-- bibliography -->
+					<xsl:element name="bibliography" namespace="{$namespace_full}"> <!-- save context element -->
+						<xsl:element name="page_sequence" namespace="{$namespace_full}">
+							<xsl:attribute name="main_page_sequence"/>
+							<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+						</xsl:element>
+					</xsl:element>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
+	</xsl:template>
+
 	<xsl:template name="insertAnnexInSeparatePageSequences">
 		<xsl:for-each select="/*/*[local-name()='annex']">
 			<xsl:sort select="@displayorder" data-type="number"/>
@@ -7639,18 +7720,33 @@
 
 	<xsl:template match="*[local-name()='localityStack']"/>
 
+	<xsl:variable name="pdfAttachmentsList_">
+		<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
+			<attachment filename="{@name}"/>
+		</xsl:for-each>
+	</xsl:variable>
+	<xsl:variable name="pdfAttachmentsList" select="xalan:nodeset($pdfAttachmentsList_)"/>
+
 	<xsl:template match="*[local-name()='link']" name="link">
+		<xsl:variable name="target_normalized" select="translate(@target, '\', '/')"/>
+		<xsl:variable name="target_attachment_name" select="substring-after($target_normalized, '_attachments/')"/>
 		<xsl:variable name="target">
 			<xsl:choose>
 				<xsl:when test="@updatetype = 'true'">
 					<xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
 				</xsl:when>
+				<!-- link to the PDF attachment -->
+				<xsl:when test="$pdfAttachmentsList//attachment[@filename = current()/@target]">
+					<xsl:value-of select="concat('url(embedded-file:', @target, ')')"/>
+				</xsl:when>
+				<!-- <xsl:when test="starts-with($target_normalized, '_') and contains($target_normalized, '_attachments/') and $pdfAttachmentsList//attachment[@filename = $target_attachment_name]">
+					<xsl:value-of select="concat('url(embedded-file:', $target_attachment_name, ')')"/>
+				</xsl:when>
 				<xsl:when test="contains(@target, concat('_', $inputxml_filename_prefix, '_attachments'))">
-					<!-- link to the PDF attachment -->
 					<xsl:variable name="target_" select="translate(@target, '\', '/')"/>
 					<xsl:variable name="target__" select="substring-after($target_, concat('_', $inputxml_filename_prefix, '_attachments', '/'))"/>
 					<xsl:value-of select="concat('url(embedded-file:', $target__, ')')"/>
-				</xsl:when>
+				</xsl:when> -->
 				<xsl:otherwise>
 					<xsl:value-of select="normalize-space(@target)"/>
 				</xsl:otherwise>
@@ -12244,6 +12340,19 @@
 		<xsl:copy-of select="."/>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			<xsl:if test="1 = 2"> <!-- remove attachment/text(), because attachments added in the template 'addPDFUAmeta' before applying 'update_xml_step1' -->
+				<xsl:variable name="name_filepath" select="concat($inputxml_basepath, @name)"/>
+				<xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($name_filepath)))"/>
+				<xsl:if test="$file_exists = 'false'"> <!-- copy attachment content only if file on disk doesnt exist -->
+					<xsl:value-of select="normalize-space(.)"/>
+				</xsl:if>
+			</xsl:if>
+		</xsl:copy>
+	</xsl:template>
+
 	<!-- add @id, mandatory for table auto-layout algorithm -->
 	<xsl:template match="*[local-name() = 'dl' or local-name() = 'table'][not(@id)]" mode="update_xml_step1">
 		<xsl:copy>
@@ -13221,11 +13330,13 @@
 		<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
 			<xsl:choose>
 				<xsl:when test="normalize-space() != ''">
-					<pdf:embedded-file src="{.}" filename="{@name}"/>
+					<xsl:variable name="src_attachment" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', '')"/> <!-- remove line breaks -->
+					<pdf:embedded-file src="{$src_attachment}" filename="{@name}"/>
 				</xsl:when>
 				<xsl:otherwise>
 					<!-- _{filename}_attachments -->
-					<xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, '_', $inputxml_filename_prefix, '_attachments', '/', @name, ')')"/>
+					<!-- <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, '_', $inputxml_filename_prefix, '_attachments', '/', @name, ')')"/> -->
+					<xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath , @name, ')')"/>
 					<pdf:embedded-file src="{$url}" filename="{@name}"/>
 				</xsl:otherwise>
 			</xsl:choose>

data/lib/isodoc/jis/metadata.rb

@@ -73,20 +73,23 @@ module IsoDoc
         investigative_committee(xml)
       end
 
+      def extract_role(role, desc)
+        <<~XPATH
+          //bibdata/contributor[xmlns:role/@type = '#{role}'][xmlns:role/description = '#{desc}' or xmlns:role/description = '#{desc.downcase}']
+        XPATH
+      end
+
       def investigative_organisation(xml)
-        xpath = "//bibdata/contributor" \
-          "[xmlns:role/@type = 'authorizer'][xmlns:role/description = " \
-          "'investigative organization']/organization/name"
-        org = xml.at(ns(xpath))
+        p = extract_role("authorizer", "Investigative organization")
+        org = xml.at(ns("#{p}/organization/name[@language = '#{@lang}']"))
+        org ||= xml.at(ns("#{p}/organization/name"))
         if org then set_encoded(:"investigative-organization", org)
         else set(:"investigative-organization", get[:publisher])
         end
       end
 
       def investigative_committee(xml)
-        xpath = "//bibdata/contributor" \
-          "[xmlns:role/@type = 'authorizer'][xmlns:role/description = " \
-          "'investigative committee']"
+        xpath = extract_role("authorizer", "Investigative committee")
         if o = xml.at(ns("#{xpath}/organization/name"))
           set_encoded(:"investigative-committee", o)
         elsif p = xml.at(ns("#{xpath}/person"))

data/lib/isodoc/jis/presentation_section.rb

@@ -22,7 +22,7 @@ module IsoDoc
         docxml.at(ns("//annex[@commentary = 'true']")) or return
         b = docxml.at(ns("//bibliography")) ||
           docxml.at(ns("//annex[last()]")).after(" ").next
-        docxml.xpath(ns("//annex[@commentary = 'true']")).reverse.each do |x|
+        docxml.xpath(ns("//annex[@commentary = 'true']")).reverse_each do |x|
           b.next = x.remove
         end
       end
@@ -42,17 +42,22 @@ module IsoDoc
         elem.previous = ret
       end
 
-      def toc_title_insert_pt(docxml)
-        ins = docxml.at(ns("//preface")) ||
+      def make_preface(docxml)
+        docxml.at(ns("//preface")) ||
           docxml.at(ns("//sections | //annex | //bibliography"))
             &.before("<preface> </preface>")
-            &.previous_element or return nil
+            &.previous_element
+      end
+
+      def toc_title_insert_pt(docxml)
+        ins = make_preface(docxml) or return nil
         ins.children.last.after(" ").next
       end
 
       def preface_rearrange(doc)
         move_introduction(doc)
         super
+        move_participants(doc)
       end
 
       def move_introduction(doc)
@@ -63,6 +68,45 @@ module IsoDoc
         dest.children.first.next = source
       end
 
+      def move_participants(doc)
+        p = doc.at(ns("//clause[@type = 'participants']")) or return
+        t = participant_table(p) or return
+        p.remove
+        ins = make_preface(doc) or return nil
+        ins.children.first.previous = t
+      end
+
+      def participant_table(clause)
+        s = clause.at(ns("./sourcecode")) or return nil
+        y = YAML.safe_load(s.children.to_xml(encoding: "UTF-8")) or return nil
+        y.is_a?(Array) or return nil
+        out1 = <<~OUTPUT
+          <clause id='_#{UUIDTools::UUID.random_create}'><title>#{@meta.get[:"investigative-committee"]} #{@i18n.membership_table}</title>
+          <table unnumbered='true'>
+          <thead>
+          <tr><th/><th>#{@i18n.full_name}</th><th>#{@i18n.affiliation}</th></tr>
+          </thead>
+          <tbody>
+        OUTPUT
+        out2 = <<~OUTPUT
+          </tbody></table></clause>
+        OUTPUT
+        "#{out1}#{participant_rows(y)}#{out2}"
+      end
+
+      def participant_rows(yaml)
+        yaml.map do |y|
+          r = y["role"] ? @i18n.l10n("(#{y['role']})") : ""
+          n = y["name"]
+          if n.is_a?(Hash)
+            n =
+              if @lang == "ja" then "#{n['surname']} #{n['givenname']}"
+              else "#{n['givenname']} #{n['surname']}" end
+          end
+          "<tr><td>#{r}</rd><td>#{n}</td><td>#{y['affiliation']}</td></tr>"
+        end.join("\n")
+      end
+
       def middle_title(docxml)
         s = docxml.at(ns("//sections")) or return
         elem = s.children.first

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -37,7 +37,7 @@ module IsoDoc
 
       def ol_depth(node)
         depth = node.ancestors("ol").size + 1
-        depth == 1 and return :alphabetic
+        depth == 1 and return :alphabet
         :arabic
       end
 

data/lib/isodoc/jis/word_cleanup.rb

@@ -7,14 +7,18 @@ module IsoDoc
         word_note_cleanup(docxml)
         boldface(docxml)
         super
-        move_to_inner_cover(docxml)
+      end
+
+      def word_remove_empty_sections(docxml)
+        move_to_inner_cover(docxml) # preempt by populating WordSection1
+        super
       end
 
       def move_to_inner_cover(docxml)
         source = docxml.at("//div[@type = 'inner-cover-note']")
         dest = docxml.at("//div[@id = 'boilerplate-inner-cover-note']")
         source && dest and dest.replace(source.remove)
-        source = docxml.at("//div[@type = 'contributors']")
+        source = docxml.at("//div[@type = 'participants']")
         dest = docxml.at("//div[@id = 'boilerplate-contributors']")
         source && dest and dest.replace(source.remove)
         docxml

data/lib/metanorma/jis/cleanup.rb

@@ -82,6 +82,37 @@ module Metanorma
         ::Metanorma::Standoc::Converter.instance_method(:ol_cleanup).bind(self)
           .call(doc)
       end
+
+      def biblio_reorder(xmldoc)
+        xmldoc.xpath("//references[@normative = 'true']").each do |r|
+          biblio_reorder1(r)
+        end
+      end
+
+      def pub_class_prep(bib)
+        iso = bib.at("#{PUBLISHER}[abbreviation = 'ISO']") ||
+          bib.at("#{PUBLISHER}[name = 'International Organization " \
+                                   "for Standardization']")
+        iec = bib.at("#{PUBLISHER}[abbreviation = 'IEC']") ||
+          bib.at("#{PUBLISHER}[name = 'International " \
+                                   "Electrotechnical Commission']")
+        jis = bib.at("#{PUBLISHER}[abbreviation = 'JIS']") ||
+          bib.at("#{PUBLISHER}[name = '#{pub_hash['ja']}']") ||
+          bib.at("#{PUBLISHER}[name = '#{pub_hash['en']}']")
+        [iso, iec, jis]
+      end
+
+      def pub_class(bib)
+        iso, iec, jis = pub_class_prep(bib)
+        jis && iec && iso and return 2
+        jis && iec and return 2
+        jis && iso and return 3
+        jis and return 1
+        iso && iec and return 4
+        iso and return 4
+        iec and return 5
+        6
+      end
     end
   end
 end

data/lib/metanorma/jis/front.rb

@@ -14,12 +14,12 @@ module Metanorma
       def metadata_author(node, xml)
         org_contributor(node, xml,
                         { source: ["publisher", "pub"], role: "author",
-                          default: JIS_HASH })
+                          default: pub_hash })
         personal_author(node, xml)
       end
 
       def metadata_publisher(node, xml)
-        [{ source: ["publisher", "pub"], role: "publisher", default: JIS_HASH },
+        [{ source: ["publisher", "pub"], role: "publisher", default: pub_hash },
          { role: "authorizer",
            source: ["investigative-organization"],
            desc: "Investigative organization" },
@@ -32,8 +32,9 @@ module Metanorma
 
       LANGS = %w(ja en).freeze
 
-      JIS_HASH =
-        { "ja" => "日本工業規格", "en" => "Japanese Industrial Standards" }.freeze
+      def pub_hash
+        { "ja" => "日本工業規格", "en" => "Japanese Industrial Standards" }
+      end
 
       def org_organization(node, xml, org)
         organization(xml, { name: org[:name], abbr: org[:abbr] }.compact,
@@ -92,9 +93,9 @@ module Metanorma
 
       def multiling_noko_value(value, tag, xml)
         if value.is_a?(Hash)
-          xml.send tag do |t|
-            value.each do |k, v|
-              t.variant v, language: k
+          value.each do |k, v|
+            xml.send tag, language: k do |x|
+              x << v
             end
           end
         elsif value.is_a?(Array)
@@ -119,7 +120,7 @@ module Metanorma
 
       def copyright_parse(node)
         opt = { source: ["copyright-holder", "publisher", "pub"],
-                role: "publisher", default: JIS_HASH }
+                role: "publisher", default: pub_hash }
         ret = org_attrs_parse(node, opt)
         ret.empty? and ret = [{ name: "-" }]
         ret

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.3.0".freeze
+    VERSION = "0.3.2".freeze
   end
 end
 

data/lib/relaton/render-jis/parse.rb

@@ -6,14 +6,15 @@ module Relaton
       class Parse < ::Relaton::Render::Iso::Parse
         def simple_or_host_xml2hash(doc, host)
           ret = super
-          ret.merge(home_standard: home_standard(doc, ret[:publisher_raw] || ret[:author_raw]))
+          ret.merge(home_standard: home_standard(doc, ret[:publisher_raw] ||
+                                                 ret[:author_raw]))
         end
 
         def home_standard(_doc, pubs)
           pubs&.any? do |r|
             ["International Organization for Standardization", "ISO",
              "International Electrotechnical Commission", "IEC",
-             "一般財団法人　日本規格協会", "JIS"]
+             "一般財団法人　日本規格協会", "Japanese Industrial Standards"]
               .include?(r[:nonpersonal])
           end
         end

data/metanorma-jis.gemspec

@@ -47,4 +47,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "vcr", "~> 6.1.0"
   spec.add_development_dependency "webmock"
+  spec.add_development_dependency "xml-c14n"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2024-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar
@@ -234,6 +234,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xml-c14n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   metanorma-jis lets you write JIS standards in AsciiDoc syntax.