metanorma-jis 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 767a090a3aebe22d2d6f00eb901394cc4c03b2e0bd27cc742ed5474234dc3ae7
-  data.tar.gz: f3bf668006d08059015df61d5970c17cb812f95ab524e403d0be44570e7f6925
+  metadata.gz: e0390d5e28376c6e536985c4f658e4e939eb12931602991a787b01fe832c6f8f
+  data.tar.gz: 599457fe99595bec1161f38217eca0ef96eab8ba1a401a4b6e6ba3ddda01f5db
 SHA512:
-  metadata.gz: 415691142621e73ecad0196c8538ef4ee69a3101fb54273f93493c0ea8bf213f0d2e53b080f04834e39b85d282b043a59270b3332f37bc40e6511eeeebc4e7e1
-  data.tar.gz: 45c5df4d2172923555dd91a7071a06f113a2d7990608f755ee7cb9d8f7ddee1c00ec9a7b4197d09ad0d0308044ab1573ff65750913b5aedba29265880d1b0985
+  metadata.gz: d24345a27eb6dde003eadf90254a267c86ca19bfbd16a9e94093e7389a5ffc843bc05db82389480a01d387456f7e23247efb34fc0c46a2f3095ff7bef1d289ce
+  data.tar.gz: bccf625290d0f44d49d024fe409b1d4e1c01849bef810ecbdd5571f3f6753691d5dc6b877327c781e6f10e9516f07c1f1739bca8eb2b658d264594524dad4a9e

data/lib/html2doc/lists.rb

@@ -1,5 +1,5 @@
 class Html2Doc
-  class JIS < ::Html2Doc
+  class Jis < ::Html2Doc
     def list2para(list)
       return if list.xpath("./li").empty?
 

data/lib/isodoc/jis/base_convert.rb

@@ -2,7 +2,7 @@ require "isodoc"
 require "metanorma-iso"
 
 module IsoDoc
-  module JIS
+  module Jis
     module BaseConvert
       def termnote_parse(node, out)
         name = node.at(ns("./name"))&.remove

data/lib/isodoc/jis/figure.rb

@@ -1,5 +1,5 @@
 module IsoDoc
-  module JIS
+  module Jis
     class WordConvert < IsoDoc::Iso::WordConvert
       def figure_attrs(node)
         attr_code(id: node["id"], class: "MsoTableGrid",

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

@@ -82,6 +82,9 @@ p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
 p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
   font-size: {{monospacefontsize}}; }
 
+sub, sup {
+  font-size: 0.75em; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }

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

@@ -82,6 +82,9 @@ p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
 p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
   font-size: {{monospacefontsize}}; }
 
+sub, sup {
+  font-size: 0.75em; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }

data/lib/isodoc/jis/html_convert.rb

@@ -4,7 +4,7 @@ require_relative "base_convert"
 require_relative "init"
 
 module IsoDoc
-  module JIS
+  module Jis
     class HtmlConvert < IsoDoc::Iso::HtmlConvert
       def initialize(options)
         super

data/lib/isodoc/jis/i18n.rb

@@ -2,7 +2,7 @@ require "japanese_calendar"
 require "twitter_cldr"
 
 module IsoDoc
-  module JIS
+  module Jis
     class I18n < IsoDoc::Iso::I18n
       def jis_load_file(fname)
         f = File.join(File.dirname(__FILE__), fname)

data/lib/isodoc/jis/init.rb

@@ -3,7 +3,7 @@ require_relative "metadata"
 require_relative "i18n"
 
 module IsoDoc
-  module JIS
+  module Jis
     module Init
       def metadata_init(lang, script, locale, labels)
         @meta = Metadata.new(lang, script, locale, labels)
@@ -21,7 +21,7 @@ module IsoDoc
       end
 
       def bibrenderer(options = {})
-        ::Relaton::Render::JIS::General.new(options.merge(language: @lang,
+        ::Relaton::Render::Jis::General.new(options.merge(language: @lang,
                                                           i18nhash: @i18n.get))
       end
 

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

@@ -6,7 +6,10 @@
 
 	<xsl:variable name="debug">false</xsl:variable>
 
-	<xsl:variable name="isIgnoreComplexScripts">true</xsl:variable>
+	<!-- <xsl:variable name="isIgnoreComplexScripts">true</xsl:variable> -->
+
+	<xsl:variable name="vertical_layout" select="normalize-space(/*/jis:metanorma-extension/jis:presentation-metadata/jis:vertical-layout)"/>
+	<xsl:variable name="vertical_layout_rotate_clause_numbers" select="normalize-space(/*/jis:metanorma-extension/jis:presentation-metadata/jis:vertical-layout-rotate-clause-numbers)"/>
 
 	<xsl:variable name="contents_">
 		<xsl:variable name="bundle" select="count(//jis:jis-standard) &gt; 1"/>
@@ -67,21 +70,45 @@
 				</fo:simple-page-master>
 
 				<fo:simple-page-master master-name="first_page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
-					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
+					<xsl:if test="$vertical_layout = 'true'">
+						<xsl:attribute name="page-width"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
+						<xsl:attribute name="page-height"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
+					</xsl:if>
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm">
+						<xsl:if test="$vertical_layout = 'true'">
+							<xsl:attribute name="writing-mode">tb-rl</xsl:attribute>
+						</xsl:if>
+					</fo:region-body>
 					<fo:region-before region-name="header" extent="{$marginTop}mm"/>
 					<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
 					<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
 					<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
 				</fo:simple-page-master>
 				<fo:simple-page-master master-name="odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
-					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
+					<xsl:if test="$vertical_layout = 'true'">
+						<xsl:attribute name="page-width"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
+						<xsl:attribute name="page-height"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
+					</xsl:if>
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm">
+						<xsl:if test="$vertical_layout = 'true'">
+							<xsl:attribute name="writing-mode">tb-rl</xsl:attribute>
+						</xsl:if>
+					</fo:region-body>
 					<fo:region-before region-name="header-odd" extent="{$marginTop}mm"/>
 					<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
 					<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
 					<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
 				</fo:simple-page-master>
 				<fo:simple-page-master master-name="even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
-					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
+					<xsl:if test="$vertical_layout = 'true'">
+						<xsl:attribute name="page-width"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
+						<xsl:attribute name="page-height"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
+					</xsl:if>
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm">
+						<xsl:if test="$vertical_layout = 'true'">
+							<xsl:attribute name="writing-mode">tb-rl</xsl:attribute>
+						</xsl:if>
+					</fo:region-body>
 					<fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
 					<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
 					<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
@@ -89,7 +116,15 @@
 				</fo:simple-page-master>
 
 				<fo:simple-page-master master-name="first_page_toc" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
-					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
+					<xsl:if test="$vertical_layout = 'true'">
+						<xsl:attribute name="page-width"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
+						<xsl:attribute name="page-height"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
+					</xsl:if>
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm">
+						<xsl:if test="$vertical_layout = 'true'">
+							<xsl:attribute name="writing-mode">tb-rl</xsl:attribute>
+						</xsl:if>
+					</fo:region-body>
 					<fo:region-before region-name="header-odd-first" extent="{$marginTop}mm"/>
 					<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
 					<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
@@ -127,7 +162,15 @@
 				</fo:page-sequence-master>
 
 				<fo:simple-page-master master-name="commentary_first_page_even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
-					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
+					<xsl:if test="$vertical_layout = 'true'">
+						<xsl:attribute name="page-width"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
+						<xsl:attribute name="page-height"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
+					</xsl:if>
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm">
+						<xsl:if test="$vertical_layout = 'true'">
+							<xsl:attribute name="writing-mode">tb-rl</xsl:attribute>
+						</xsl:if>
+					</fo:region-body>
 					<fo:region-before region-name="header-commentary-even-first" extent="{$marginTop}mm"/>
 					<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
 					<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
@@ -135,7 +178,15 @@
 				</fo:simple-page-master>
 
 				<fo:simple-page-master master-name="commentary_first_page_odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
-					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
+					<xsl:if test="$vertical_layout = 'true'">
+						<xsl:attribute name="page-width"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
+						<xsl:attribute name="page-height"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
+					</xsl:if>
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm">
+						<xsl:if test="$vertical_layout = 'true'">
+							<xsl:attribute name="writing-mode">tb-rl</xsl:attribute>
+						</xsl:if>
+					</fo:region-body>
 					<fo:region-before region-name="header-commentary-odd-first" extent="{$marginTop}mm"/>
 					<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
 					<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
@@ -592,12 +643,22 @@
 								</xsl:when>
 								<xsl:otherwise>
 									<fo:list-block space-after="5pt">
+										<xsl:variable name="provisional-distance-between-starts">
+											<xsl:choose>
+												<xsl:when test="string-length(@section) = 1">5</xsl:when>
+												<xsl:when test="string-length(@section) &gt;= 2"><xsl:value-of select="5 + (string-length(@section) - 1) * 2"/></xsl:when>
+												<xsl:when test="@type = 'annex'">16</xsl:when>
+												<xsl:otherwise>5</xsl:otherwise>
+											</xsl:choose>
+										</xsl:variable>
 										<xsl:attribute name="provisional-distance-between-starts">
 											<xsl:choose>
-												<xsl:when test="string-length(@section) = 1">5mm</xsl:when>
-												<xsl:when test="string-length(@section) &gt;= 2"><xsl:value-of select="5 + (string-length(@section) - 1) * 2"/>mm</xsl:when>
-												<xsl:when test="@type = 'annex'">16mm</xsl:when>
-												<xsl:otherwise>5mm</xsl:otherwise>
+												<xsl:when test="$vertical_layout_rotate_clause_numbers = 'true'">
+													<xsl:value-of select="concat($provisional-distance-between-starts * 1.5, 'mm')"/>
+												</xsl:when>
+												<xsl:otherwise>
+													<xsl:value-of select="concat($provisional-distance-between-starts, 'mm')"/>
+												</xsl:otherwise>
 											</xsl:choose>
 										</xsl:attribute>
 										<fo:list-item>
@@ -1112,10 +1173,24 @@
 						<xsl:call-template name="extractSection"/>
 					</xsl:variable>
 					<xsl:if test="normalize-space($section) != ''">
-						<fo:inline font-family="Times New Roman" font-weight="bold">
-							<xsl:value-of select="$section"/>
-							<fo:inline padding-right="4mm"> </fo:inline>
-						</fo:inline>
+
+						<xsl:choose>
+							<xsl:when test="$vertical_layout_rotate_clause_numbers = 'true'">
+								<fo:inline font-family="Times New Roman" font-weight="bold">
+									<xsl:call-template name="insertVerticalChar">
+										<xsl:with-param name="str" select="$section"/>
+									</xsl:call-template>
+								</fo:inline>
+								<fo:inline padding-right="4mm"> </fo:inline>
+							</xsl:when>
+							<xsl:otherwise>
+								<fo:inline font-family="Times New Roman" font-weight="bold">
+									<xsl:value-of select="$section"/>
+									<fo:inline padding-right="4mm"> </fo:inline>
+								</fo:inline>
+							</xsl:otherwise>
+						</xsl:choose>
+
 					</xsl:if>
 
 					<xsl:call-template name="extractTitle"/>
@@ -1595,6 +1670,9 @@
 		<xsl:param name="section_title"/>
 		<fo:static-content flow-name="header-odd-first" role="artifact">
 			<fo:block-container font-family="Arial" font-size="9pt" height="26mm" display-align="after" text-align="right">
+				<xsl:if test="$vertical_layout = 'true'">
+					<xsl:attribute name="display-align">center</xsl:attribute>
+				</xsl:if>
 				<xsl:if test="$section = 'main'"><fo:block><fo:page-number/></fo:block></xsl:if>
 				<fo:block>
 					<xsl:copy-of select="$docidentifier"/>
@@ -1603,6 +1681,9 @@
 		</fo:static-content>
 		<fo:static-content flow-name="header-odd" role="artifact">
 			<fo:block-container font-family="Arial" font-size="9pt" height="26mm" display-align="after" text-align="right">
+				<xsl:if test="$vertical_layout = 'true'">
+					<xsl:attribute name="display-align">center</xsl:attribute>
+				</xsl:if>
 				<xsl:if test="$section = 'main' or $section = 'commentary'"><fo:block><fo:page-number/></fo:block></xsl:if>
 				<fo:block>
 					<xsl:copy-of select="$docidentifier"/>
@@ -1612,6 +1693,9 @@
 		</fo:static-content>
 		<fo:static-content flow-name="header-even" role="artifact">
 			<fo:block-container font-family="Arial" font-size="9pt" height="26mm" display-align="after">
+				<xsl:if test="$vertical_layout = 'true'">
+					<xsl:attribute name="display-align">center</xsl:attribute>
+				</xsl:if>
 				<xsl:if test="$section = 'main' or $section = 'commentary'"><fo:block><fo:page-number/></fo:block></xsl:if>
 				<fo:block>
 					<xsl:copy-of select="$docidentifier"/>
@@ -1622,6 +1706,9 @@
 
 		<fo:static-content flow-name="header-commentary-even-first" role="artifact">
 			<fo:block-container font-family="Arial" font-size="9pt" height="26mm" display-align="after" text-align="left">
+				<xsl:if test="$vertical_layout = 'true'">
+					<xsl:attribute name="display-align">center</xsl:attribute>
+				</xsl:if>
 				<fo:block><fo:page-number/></fo:block>
 				<fo:block> </fo:block>
 			</fo:block-container>
@@ -1629,6 +1716,9 @@
 
 		<fo:static-content flow-name="header-commentary-odd-first" role="artifact">
 			<fo:block-container font-family="Arial" font-size="9pt" height="26mm" display-align="after" text-align="right">
+				<xsl:if test="$vertical_layout = 'true'">
+					<xsl:attribute name="display-align">center</xsl:attribute>
+				</xsl:if>
 				<fo:block><fo:page-number/></fo:block>
 				<fo:block> </fo:block>
 			</fo:block-container>
@@ -1662,7 +1752,12 @@
 					</fo:block>
 				</xsl:if>
 				<!-- copyright restriction -->
-				<fo:block font-size="7pt" text-align="center" font-family="IPAexMincho" margin-bottom="13mm"><xsl:value-of select="$copyrightText"/></fo:block>
+				<fo:block font-size="7pt" text-align="center" font-family="IPAexMincho" margin-bottom="13mm">
+					<xsl:if test="$vertical_layout = 'true'">
+						<xsl:attribute name="margin-bottom">5mm</xsl:attribute>
+					</xsl:if>
+					<xsl:value-of select="$copyrightText"/>
+				</fo:block>
 			</fo:block-container>
 		</fo:static-content>
 	</xsl:template>
@@ -4865,6 +4960,7 @@
 
 			<fo:block role="SKIP">
 				<xsl:apply-templates/>
+				<xsl:if test="$isGenerateTableIF = 'false' and count(node()) = 0"> </xsl:if>
 			</fo:block>
 		</fo:table-cell>
 	</xsl:template> <!-- cell in table header row - 'th' -->
@@ -4928,6 +5024,8 @@
 
 				<xsl:if test="$isGenerateTableIF = 'true'"> <fo:inline id="{@id}_end">end</fo:inline></xsl:if> <!-- to determine width of text --> <!-- <xsl:value-of select="$hair_space"/> -->
 
+				<xsl:if test="$isGenerateTableIF = 'false' and count(node()) = 0"> </xsl:if>
+
 			</fo:block>
 		</fo:table-cell>
 	</xsl:template> <!-- td -->
@@ -4998,7 +5096,8 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:variable name="current_fn_number_text">
-			<xsl:value-of select="$current_fn_number"/>
+
+					<xsl:value-of select="$current_fn_number"/>
 
 				<fo:inline font-weight="normal">)</fo:inline>
 
@@ -5036,8 +5135,10 @@
 
 				<xsl:call-template name="insert_basic_link">
 					<xsl:with-param name="element">
-						<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}" role="Lbl">
-							<xsl:copy-of select="$current_fn_number_text"/>
+						<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}"> <!-- note: role="Lbl" removed in https://github.com/metanorma/mn2pdf/issues/291 -->
+							<fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
+								<xsl:copy-of select="$current_fn_number_text"/>
+							</fo:inline>
 						</fo:basic-link>
 					</xsl:with-param>
 				</xsl:call-template>
@@ -5329,7 +5430,7 @@
 
 			<xsl:call-template name="refine_fn-reference-style"/>
 
-			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
+			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="footnote {@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
 				<xsl:if test="ancestor::*[local-name()='table'][1]/@id"> <!-- for footnotes in tables -->
 					<xsl:attribute name="internal-destination">
 						<xsl:value-of select="concat(@reference, '_', ancestor::*[local-name()='table'][1]/@id)"/>
@@ -6338,9 +6439,19 @@
 		</fo:inline>
 	</xsl:template>
 
-	<xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
+	<xsl:template match="text()[ancestor::*[local-name()='smallcap']]" name="smallcaps">
+		<xsl:param name="txt"/>
 		<!-- <xsl:variable name="text" select="normalize-space(.)"/> --> <!-- https://github.com/metanorma/metanorma-iso/issues/1115 -->
-		<xsl:variable name="text" select="."/>
+		<xsl:variable name="text">
+			<xsl:choose>
+				<xsl:when test="$txt != ''">
+					<xsl:value-of select="$txt"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		<xsl:variable name="ratio_">
 			0.75
 		</xsl:variable>
@@ -7738,14 +7849,16 @@
 	<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="isLinkToEmbeddedFile" select="normalize-space(@attachment = 'true' and $pdfAttachmentsList//attachment[@filename = current()/@target])"/>
 		<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="@attachment = 'true' and $pdfAttachmentsList//attachment[@filename = current()/@target]">
-					<xsl:value-of select="concat('url(embedded-file:', @target, ')')"/>
+				<xsl:when test="$isLinkToEmbeddedFile = 'true'">
+					<xsl:variable name="target_file" select="java:org.metanorma.fop.Util.getFilenameFromPath(@target)"/>
+					<xsl:value-of select="concat('url(embedded-file:', $target_file, ')')"/>
 				</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, ')')"/>
@@ -7776,6 +7889,11 @@
 				<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
 			</xsl:if>
 
+			<xsl:if test="$isLinkToEmbeddedFile = 'true'">
+				<xsl:attribute name="color">inherit</xsl:attribute>
+				<xsl:attribute name="text-decoration">none</xsl:attribute>
+			</xsl:if>
+
 			<xsl:call-template name="refine_link-style"/>
 
 			<xsl:choose>
@@ -7783,9 +7901,15 @@
 					<xsl:apply-templates/>
 				</xsl:when>
 				<xsl:otherwise>
+					<xsl:variable name="alt_text">
+						<xsl:call-template name="getAltText"/>
+					</xsl:variable>
 					<xsl:call-template name="insert_basic_link">
 						<xsl:with-param name="element">
-							<fo:basic-link external-destination="{$target}" fox:alt-text="{$target}">
+							<fo:basic-link external-destination="{$target}" fox:alt-text="{$alt_text}">
+								<xsl:if test="$isLinkToEmbeddedFile = 'true'">
+									<xsl:attribute name="role">Annot</xsl:attribute>
+								</xsl:if>
 								<xsl:choose>
 									<xsl:when test="normalize-space(.) = ''">
 										<xsl:call-template name="add-zero-spaces-link-java">
@@ -7798,6 +7922,10 @@
 									</xsl:otherwise>
 								</xsl:choose>
 							</fo:basic-link>
+							<xsl:if test="$isLinkToEmbeddedFile = 'true'">
+								<!-- reserve space at right for PaperClip icon -->
+								<fo:inline keep-with-previous.within-line="always">        </fo:inline>
+							</xsl:if>
 						</xsl:with-param>
 					</xsl:call-template>
 				</xsl:otherwise>
@@ -7805,6 +7933,14 @@
 		</fo:inline>
 	</xsl:template> <!-- link -->
 
+	<xsl:template name="getAltText">
+		<xsl:choose>
+			<xsl:when test="normalize-space(.) = ''"><xsl:value-of select="@target"/></xsl:when>
+			<xsl:otherwise><xsl:value-of select="normalize-space(translate(normalize-space(), ' —', ' -'))"/></xsl:otherwise>
+			<!-- <xsl:otherwise><xsl:value-of select="@target"/></xsl:otherwise> -->
+		</xsl:choose>
+	</xsl:template>
+
 	<!-- ======================== -->
 	<!-- Appendix processing -->
 	<!-- ======================== -->
@@ -7835,7 +7971,7 @@
 	<xsl:template match="*[local-name() = 'callout']">
 		<xsl:choose>
 			<xsl:when test="normalize-space(@target) = ''">&lt;<xsl:apply-templates/>&gt;</xsl:when>
-			<xsl:otherwise><fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">&lt;<xsl:apply-templates/>&gt;</fo:basic-link></xsl:otherwise>
+			<xsl:otherwise><fo:basic-link internal-destination="{@target}" fox:alt-text="{normalize-space()}">&lt;<xsl:apply-templates/>&gt;</fo:basic-link></xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
 
@@ -7864,7 +8000,10 @@
 	<xsl:template match="*[local-name() = 'xref']">
 		<xsl:call-template name="insert_basic_link">
 			<xsl:with-param name="element">
-				<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
+				<xsl:variable name="alt_text">
+					<xsl:call-template name="getAltText"/>
+				</xsl:variable>
+				<fo:basic-link internal-destination="{@target}" fox:alt-text="{$alt_text}" xsl:use-attribute-sets="xref-style">
 					<xsl:if test="string-length(normalize-space()) &lt; 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[local-name() = 'table' or local-name() = 'dl'])">
 						<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
 					</xsl:if>
@@ -10337,12 +10476,14 @@
 
 					<xsl:when test="contains(normalize-space($fo_element), 'list')">
 
-						<xsl:variable name="provisional_distance_between_starts">
+						<xsl:variable name="provisional_distance_between_starts_">
 							<xsl:value-of select="10 + $text_indent"/>
 						</xsl:variable>
-						<xsl:variable name="indent">
+						<xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
+						<xsl:variable name="indent_">
 							<xsl:value-of select="$text_indent"/>
 						</xsl:variable>
+						<xsl:variable name="indent" select="normalize-space($indent_)"/>
 
 						<fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
 							<fo:list-item>
@@ -11059,14 +11200,17 @@
 			</xsl:when>
 			<xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
 
-				<xsl:variable name="label">
+				<xsl:variable name="type" select="../@type"/>
 
-					<xsl:variable name="type" select="../@type"/>
+				<xsl:variable name="label">
 
 					<xsl:variable name="style_prefix_">
 						<xsl:if test="$type = 'roman'">
 							 <!-- Example: (i) -->
 						</xsl:if>
+						<xsl:if test="$type = 'alphabet'">
+
+						</xsl:if>
 					</xsl:variable>
 					<xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
 
@@ -11092,13 +11236,15 @@
 					<xsl:if test="$style_prefix != '' and not(starts-with(@label, $style_prefix))">
 						<xsl:value-of select="$style_prefix"/>
 					</xsl:if>
+
 					<xsl:value-of select="@label"/>
+
 					<xsl:if test="not(java:endsWith(java:java.lang.String.new(@label),$style_suffix))">
 						<xsl:value-of select="$style_suffix"/>
 					</xsl:if>
 				</xsl:variable>
 
-				<xsl:value-of select="normalize-space($label)"/>
+						<xsl:value-of select="normalize-space($label)"/>
 
 			</xsl:when>
 			<xsl:otherwise> <!-- for ordered lists 'ol' -->
@@ -13416,9 +13562,15 @@
 		</x:xmpmeta>
 		<!-- add attachments -->
 		<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
-			<xsl:variable name="description" select="normalize-space(//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment'] = current()/@name]/*[local-name() = 'formattedref'])"/>
-
-			<pdf:embedded-file filename="{@name}">
+			<xsl:variable name="bibitem_attachment_" select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment'] = current()/@name]"/>
+			<xsl:variable name="bibitem_attachment" select="xalan:nodeset($bibitem_attachment_)"/>
+			<xsl:variable name="description" select="normalize-space($bibitem_attachment/*[local-name() = 'formattedref'])"/>
+			<xsl:variable name="filename" select="java:org.metanorma.fop.Util.getFilenameFromPath(@name)"/>
+			<!-- Todo: need update -->
+			<xsl:variable name="afrelationship" select="normalize-space($bibitem_attachment//*[local-name() = 'classification'][@type = 'pdf-AFRelationship'])"/>
+			<xsl:variable name="volatile" select="normalize-space($bibitem_attachment//*[local-name() = 'classification'][@type = 'pdf-volatile'])"/>
+
+			<pdf:embedded-file filename="{$filename}" link-as-file-annotation="true">
 				<xsl:attribute name="src">
 					<xsl:choose>
 						<xsl:when test="normalize-space() != ''">
@@ -13434,18 +13586,34 @@
 				<xsl:if test="$description != ''">
 					<xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
 				</xsl:if>
+				<xsl:if test="$afrelationship != ''">
+					<xsl:attribute name="afrelationship"><xsl:value-of select="$afrelationship"/></xsl:attribute>
+				</xsl:if>
+				<xsl:if test="$volatile != ''">
+					<xsl:attribute name="volatile"><xsl:value-of select="$volatile"/></xsl:attribute>
+				</xsl:if>
 			</pdf:embedded-file>
 		</xsl:for-each>
 		<!-- references to external attachments (no binary-encoded within the Metanorma XML file) -->
 		<xsl:if test="not(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment'])">
 			<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
 				<xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
+				<xsl:variable name="attachment_name" select="java:org.metanorma.fop.Util.getFilenameFromPath($attachment_path)"/>
 				<xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
 				<xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
-				<pdf:embedded-file src="{$url}" filename="{$attachment_path}">
+				<!-- Todo: need update -->
+				<xsl:variable name="afrelationship" select="normalize-space(.//*[local-name() = 'classification'][@type = 'pdf-AFRelationship'])"/>
+				<xsl:variable name="volatile" select="normalize-space(.//*[local-name() = 'classification'][@type = 'pdf-volatile'])"/>
+				<pdf:embedded-file src="{$url}" filename="{$attachment_name}" link-as-file-annotation="true">
 					<xsl:if test="$description != ''">
 						<xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
 					</xsl:if>
+					<xsl:if test="$afrelationship != ''">
+						<xsl:attribute name="afrelationship"><xsl:value-of select="$afrelationship"/></xsl:attribute>
+					</xsl:if>
+					<xsl:if test="$volatile != ''">
+						<xsl:attribute name="volatile"><xsl:value-of select="$volatile"/></xsl:attribute>
+					</xsl:if>
 				</pdf:embedded-file>
 			</xsl:for-each>
 		</xsl:if>
@@ -13465,6 +13633,12 @@
 	<!-- Get or calculate depth of the element -->
 	<xsl:template name="getLevel">
 		<xsl:param name="depth"/>
+		<!-- <xsl:message>
+			<xsl:choose>
+				<xsl:when test="local-name() = 'title'">title=<xsl:value-of select="."/></xsl:when>
+				<xsl:when test="local-name() = 'clause'">clause/title=<xsl:value-of select="*[local-name() = 'title']"/></xsl:when>
+			</xsl:choose>
+		</xsl:message> -->
 		<xsl:choose>
 			<xsl:when test="normalize-space(@depth) != ''">
 				<xsl:value-of select="@depth"/>
@@ -13485,8 +13659,48 @@
 						<xsl:when test="ancestor::*[local-name() = 'preface']">
 							<xsl:value-of select="$level_total - 2"/>
 						</xsl:when>
+						<xsl:when test="ancestor::*[local-name() = 'sections'] and self::*[local-name() = 'title']">
+							<!-- determine 'depth' depends on upper clause with title/@depth -->
+							<!-- <xsl:message>title=<xsl:value-of select="."/></xsl:message> -->
+							<xsl:variable name="clause_with_depth_depth" select="ancestor::*[local-name() = 'clause'][*[local-name() = 'title']/@depth][1]/*[local-name() = 'title']/@depth"/>
+							<!-- <xsl:message>clause_with_depth_depth=<xsl:value-of select="$clause_with_depth_depth"/></xsl:message> -->
+							<xsl:variable name="clause_with_depth_level" select="count(ancestor::*[local-name() = 'clause'][*[local-name() = 'title']/@depth][1]/ancestor::*)"/>
+							<!-- <xsl:message>clause_with_depth_level=<xsl:value-of select="$clause_with_depth_level"/></xsl:message> -->
+							<xsl:variable name="curr_level" select="count(ancestor::*) - 1"/>
+							<!-- <xsl:message>curr_level=<xsl:value-of select="$curr_level"/></xsl:message> -->
+							<!-- <xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[local-name() = 'clause'][2]/*[local-name() = 'title']/@depth)"/> -->
+							<xsl:variable name="curr_clause_depth" select="number($clause_with_depth_depth) + (number($curr_level) - number($clause_with_depth_level)) "/>
+							<!-- <xsl:message>curr_clause_depth=<xsl:value-of select="$curr_clause_depth"/></xsl:message> -->
+							<xsl:choose>
+								<xsl:when test="string(number($curr_clause_depth)) != 'NaN'">
+									<xsl:value-of select="number($curr_clause_depth)"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="$level_total - 2"/>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:when>
+						<xsl:when test="ancestor::*[local-name() = 'sections'] and self::*[local-name() = 'name'] and parent::*[local-name() = 'term']">
+							<xsl:variable name="upper_terms_depth" select="normalize-space(ancestor::*[local-name() = 'terms'][1]/*[local-name() = 'title']/@depth)"/>
+							<xsl:choose>
+								<xsl:when test="string(number($upper_terms_depth)) != 'NaN'">
+									<xsl:value-of select="number($upper_terms_depth + 1)"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="$level_total - 2"/>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:when>
 						<xsl:when test="ancestor::*[local-name() = 'sections']">
-							<xsl:value-of select="$level_total - 1"/>
+							<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[local-name() = 'clause' or local-name() = 'terms'][1]/*[local-name() = 'title']/@depth)"/>
+							<xsl:choose>
+								<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
+									<xsl:value-of select="number($upper_clause_depth + 1)"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="$level_total - 1"/>
+								</xsl:otherwise>
+							</xsl:choose>
 						</xsl:when>
 						<xsl:when test="ancestor::*[local-name() = 'bibliography']">
 							<xsl:value-of select="$level_total - 1"/>
@@ -13494,6 +13708,17 @@
 						<xsl:when test="parent::*[local-name() = 'annex']">
 							<xsl:value-of select="$level_total - 1"/>
 						</xsl:when>
+						<xsl:when test="ancestor::*[local-name() = 'annex'] and self::*[local-name() = 'title']">
+							<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[local-name() = 'clause'][2]/*[local-name() = 'title']/@depth)"/>
+							<xsl:choose>
+								<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
+									<xsl:value-of select="number($upper_clause_depth + 1)"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="$level_total - 1"/>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:when>
 						<xsl:when test="ancestor::*[local-name() = 'annex']">
 							<xsl:value-of select="$level_total"/>
 						</xsl:when>
@@ -13850,6 +14075,20 @@
 
 	<!-- END: insert cover page image -->
 
+	<xsl:template name="insertVerticalChar">
+		<xsl:param name="str"/>
+		<xsl:if test="string-length($str) &gt; 0">
+			<fo:inline-container writing-mode="lr-tb" text-align="center" alignment-baseline="central" reference-orientation="90" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
+				<fo:block-container width="1em">
+						<fo:block line-height="1em"><xsl:value-of select="substring($str,1,1)"/></fo:block>
+				</fo:block-container>
+			</fo:inline-container>
+			<xsl:call-template name="insertVerticalChar">
+				<xsl:with-param name="str" select="substring($str, 2)"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>
@@ -14137,4 +14376,18 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template match="@*|node()" mode="set_table_role_skip">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="set_table_role_skip"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[starts-with(local-name(), 'table')]" mode="set_table_role_skip">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="set_table_role_skip"/>
+			<xsl:attribute name="role">SKIP</xsl:attribute>
+			<xsl:apply-templates select="node()" mode="set_table_role_skip"/>
+		</xsl:copy>
+	</xsl:template>
+
 </xsl:stylesheet>

data/lib/isodoc/jis/metadata.rb

@@ -2,7 +2,7 @@ require "isodoc"
 require "metanorma-iso"
 
 module IsoDoc
-  module JIS
+  module Jis
     class Metadata < IsoDoc::Iso::Metadata
       def title(isoxml, _out)
         lang = @lang

data/lib/isodoc/jis/pdf_convert.rb

@@ -2,7 +2,7 @@ require_relative "base_convert"
 require "isodoc"
 
 module IsoDoc
-  module JIS
+  module Jis
     class PdfConvert < IsoDoc::XslfoPdfConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)

data/lib/isodoc/jis/presentation_section.rb

@@ -2,7 +2,7 @@ require_relative "init"
 require "isodoc"
 
 module IsoDoc
-  module JIS
+  module Jis
     class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
       def annex1(elem)
         elem["commentary"] == "true" and return commentary(elem)

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -4,7 +4,7 @@ require_relative "presentation_section"
 require_relative "../../relaton/render-jis/general"
 
 module IsoDoc
-  module JIS
+  module Jis
     class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
       def inline(docxml)
         super

data/lib/isodoc/jis/table.rb

@@ -1,5 +1,5 @@
 module IsoDoc
-  module JIS
+  module Jis
     class WordConvert < IsoDoc::Iso::WordConvert
       def make_table_footnote_target(out, fnid, fnref)
         attrs = { id: fnid, class: "TableFootnoteRef" }

data/lib/isodoc/jis/word_cleanup.rb

@@ -1,7 +1,7 @@
 require_relative "../../html2doc/lists"
 
 module IsoDoc
-  module JIS
+  module Jis
     class WordConvert < IsoDoc::Iso::WordConvert
       def word_cleanup(docxml)
         word_note_cleanup(docxml)
@@ -65,7 +65,7 @@ module IsoDoc
       def to_word1(result, filename, dir, header)
         result or return
         result = from_xhtml(result).gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
-        ::Html2Doc::JIS.new(
+        ::Html2Doc::Jis.new(
           filename: filename, imagedir: @localdir,
           stylesheet: @wordstylesheet&.path,
           header_file: header&.path, dir: dir,

data/lib/isodoc/jis/word_convert.rb

@@ -6,7 +6,7 @@ require_relative "figure"
 require_relative "table"
 
 module IsoDoc
-  module JIS
+  module Jis
     class WordConvert < IsoDoc::Iso::WordConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)

data/lib/isodoc/jis/xref.rb

@@ -1,5 +1,5 @@
 module IsoDoc
-  module JIS
+  module Jis
     class Counter < IsoDoc::XrefGen::Counter
       def ol_type(list, depth)
         return list["type"].to_sym if list["type"]

data/lib/metanorma/jis/biblio-standoc.rng

@@ -72,6 +72,9 @@ standards defining organization, and that is rendered in a distinct manner</a:do
 from other documents in the same doctype</a:documentation>
       </ref>
     </optional>
+    <ref name="flavor">
+      <a:documentation>Flavour of Metanorma used to process this document</a:documentation>
+    </ref>
     <optional>
       <ref name="editorialgroup">
         <a:documentation>Groups associated with the production of the standards document, typically within
@@ -113,6 +116,16 @@ a standards definition organization</a:documentation>
   <define name="DocumentSubtype">
     <text/>
   </define>
+  <define name="flavor">
+    <element name="flavor">
+      <ref name="MetanormaFlavor"/>
+    </element>
+  </define>
+  <define name="MetanormaFlavor">
+    <a:documentation>This is in fact an enum, as of this writing: standoc iso generic ietf ieee itu nist ogc csa cc iho ribose jis iec bsi bipm plateau.
+However we prefer not to hardcode it, given ongoing extension.</a:documentation>
+    <text/>
+  </define>
   <define name="editorialgroup">
     <a:documentation>A group associated with the production of the standards document, typically within
 a standards definition organization</a:documentation>

data/lib/metanorma/jis/biblio.rng

@@ -1382,18 +1382,7 @@ Applies whether the resource has already been created or not, and whether it is
   <define name="bdate">
     <a:documentation>Significant date in the lifecycle of the bibliographic item, including its production and its access</a:documentation>
     <element name="date">
-      <attribute name="type">
-        <a:documentation>The phase of the production of or access to a bibliographic item</a:documentation>
-        <choice>
-          <ref name="BibliographicDateType"/>
-          <text/>
-        </choice>
-      </attribute>
-      <optional>
-        <attribute name="text">
-          <a:documentation>An optional textual description of the date, especially when a Gregorian date is not applicable</a:documentation>
-        </attribute>
-      </optional>
+      <ref name="bDateAttributes"/>
       <optional>
         <choice>
           <group>
@@ -1416,6 +1405,20 @@ Applies whether the resource has already been created or not, and whether it is
       </optional>
     </element>
   </define>
+  <define name="bDateAttributes">
+    <attribute name="type">
+      <a:documentation>The phase of the production of or access to a bibliographic item</a:documentation>
+      <choice>
+        <ref name="BibliographicDateType"/>
+        <text/>
+      </choice>
+    </attribute>
+    <optional>
+      <attribute name="text">
+        <a:documentation>An optional textual description of the date, especially when a Gregorian date is not applicable</a:documentation>
+      </attribute>
+    </optional>
+  </define>
   <define name="docidentifier">
     <a:documentation>An identifier of a bibliographic item in an international standard scheme</a:documentation>
     <element name="docidentifier">
@@ -1884,6 +1887,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
+      <value>preliminaryDraftOf</value>
+      <value>hasPreliminaryDraft</value>
+      <value>revisionDraftOf</value>
+      <value>hasRevisionDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>

data/lib/metanorma/jis/cleanup.rb

@@ -1,6 +1,6 @@
 module Metanorma
-  module JIS
-    class Converter < ISO::Converter
+  module Jis
+    class Converter < Iso::Converter
       def norm_ref_preface(ref)
         if ref.at("./note[@type = 'boilerplate']")
           unwrap_boilerplate_clauses(ref, ".")

data/lib/metanorma/jis/converter.rb

@@ -5,8 +5,8 @@ require_relative "validate"
 require_relative "cleanup"
 
 module Metanorma
-  module JIS
-    class Converter < ISO::Converter
+  module Jis
+    class Converter < Iso::Converter
       XML_ROOT_TAG = "jis-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/jis".freeze
 
@@ -48,17 +48,17 @@ module Metanorma
 
       def html_converter(node)
         if node.nil?
-          IsoDoc::JIS::HtmlConvert.new({})
+          IsoDoc::Jis::HtmlConvert.new({})
         else
-          IsoDoc::JIS::HtmlConvert.new(html_extract_attributes(node))
+          IsoDoc::Jis::HtmlConvert.new(html_extract_attributes(node))
         end
       end
 
       def doc_converter(node)
         if node.nil?
-          IsoDoc::JIS::WordConvert.new({})
+          IsoDoc::Jis::WordConvert.new({})
         else
-          IsoDoc::JIS::WordConvert.new(doc_extract_attributes(node))
+          IsoDoc::Jis::WordConvert.new(doc_extract_attributes(node))
         end
       end
 
@@ -66,19 +66,19 @@ module Metanorma
         return if node.attr("no-pdf")
 
         if node.nil?
-          IsoDoc::JIS::PdfConvert.new({})
+          IsoDoc::Jis::PdfConvert.new({})
         else
-          IsoDoc::JIS::PdfConvert.new(pdf_extract_attributes(node))
+          IsoDoc::Jis::PdfConvert.new(pdf_extract_attributes(node))
         end
       end
 
       def presentation_xml_converter(node)
         if node.nil?
-          IsoDoc::JIS::PresentationXMLConvert.new({})
+          IsoDoc::Jis::PresentationXMLConvert.new({})
         else
-          IsoDoc::JIS::PresentationXMLConvert
+          IsoDoc::Jis::PresentationXMLConvert
             .new(doc_extract_attributes(node)
-            .merge(output_formats: ::Metanorma::JIS::Processor.new
+            .merge(output_formats: ::Metanorma::Jis::Processor.new
             .output_formats))
         end
       end

data/lib/metanorma/jis/front.rb

@@ -1,8 +1,8 @@
 require "pubid-jis"
 
 module Metanorma
-  module JIS
-    class Converter < ISO::Converter
+  module Jis
+    class Converter < Iso::Converter
       def org_abbrev
         super.merge("Japanese Industrial Standards" => "JIS")
       end

data/lib/metanorma/jis/processor.rb

@@ -1,7 +1,7 @@
 require "metanorma/processor"
 
 module Metanorma
-  module JIS
+  module Jis
     class Processor < Metanorma::Processor
 
       def initialize # rubocop:disable Lint/MissingSuper
@@ -31,20 +31,20 @@ module Metanorma
       end
 
       def version
-        "Metanorma::JIS #{Metanorma::JIS::VERSION}"
+        "Metanorma::Jis #{Metanorma::Jis::VERSION}"
       end
 
       def output(xml, inname, outname, format, options = {})
         options_preprocess(options)
         case format
         when :html
-          IsoDoc::JIS::HtmlConvert.new(options).convert(inname, xml, nil, outname)
+          IsoDoc::Jis::HtmlConvert.new(options).convert(inname, xml, nil, outname)
         when :doc
-          IsoDoc::JIS::WordConvert.new(options).convert(inname, xml, nil, outname)
+          IsoDoc::Jis::WordConvert.new(options).convert(inname, xml, nil, outname)
         when :pdf
-          IsoDoc::JIS::PdfConvert.new(options).convert(inname, xml, nil, outname)
+          IsoDoc::Jis::PdfConvert.new(options).convert(inname, xml, nil, outname)
         when :presentation
-          IsoDoc::JIS::PresentationXMLConvert.new(options).convert(inname, xml, nil, outname)
+          IsoDoc::Jis::PresentationXMLConvert.new(options).convert(inname, xml, nil, outname)
         else
           super
         end

data/lib/metanorma/jis/relaton-jis.rng

@@ -7,6 +7,7 @@
       </optional>
       <ref name="doctype"/>
       <ref name="editorialgroup"/>
+      <ref name="flavor"/>
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>

data/lib/metanorma/jis/validate.rb

@@ -1,6 +1,6 @@
 module Metanorma
-  module JIS
-    class Converter < ISO::Converter
+  module Jis
+    class Converter < Iso::Converter
       def doctype_validate(_xmldoc)
         %w(japanese-industrial-standard technical-report
            technical-specification amendment).include? @doctype or

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
-  module JIS
-    VERSION = "0.3.4".freeze
+  module Jis
+    VERSION = "0.3.6".freeze
   end
 end
 

data/lib/metanorma/jis.rb

@@ -1,6 +1,6 @@
 require_relative "./jis/processor"
 
 module Metanorma
-  module JIS
+  module Jis
   end
 end

data/lib/metanorma-jis.rb

@@ -11,6 +11,6 @@ require "metanorma"
 
 if defined? Metanorma::Registry
   require_relative "metanorma/jis"
-  Metanorma::Registry.instance.register(Metanorma::JIS::Processor)
+  Metanorma::Registry.instance.register(Metanorma::Jis::Processor)
 end
 

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

@@ -5,7 +5,7 @@ require_relative "parse"
 
 module Relaton
   module Render
-    module JIS
+    module Jis
       class General < ::Relaton::Render::Iso::General
         def config_loc
           YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
@@ -13,7 +13,7 @@ module Relaton
 
         def klass_initialize(_options)
           super
-          @parseklass = Relaton::Render::JIS::Parse
+          @parseklass = Relaton::Render::Jis::Parse
         end
 
         def render1(doc)

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

@@ -2,7 +2,7 @@ require "metanorma-iso"
 
 module Relaton
   module Render
-    module JIS
+    module Jis
       class Parse < ::Relaton::Render::Iso::Parse
         def simple_or_host_xml2hash(doc, host)
           ret = super

data/metanorma-jis.gemspec

@@ -6,7 +6,7 @@ require "metanorma/jis/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "metanorma-jis"
-  spec.version       = Metanorma::JIS::VERSION
+  spec.version       = Metanorma::Jis::VERSION
   spec.authors       = ["Ribose Inc."]
   spec.email         = ["open.source@ribose.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-16 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar