metanorma-jis 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bbc9bfd3ed93ebd4eb27838a31bae9b074c79c280f0eee5c476475de1239a9c
-  data.tar.gz: 3404f0677c547960ef888d5503ed89b942a21c33812bb3ae042c9ed7d09f5fdb
+  metadata.gz: b56f3b88aec817a7080654fe444dd0095357bff6cff8e87c2c1070cc76fbfe5d
+  data.tar.gz: 9118aa499de45316f061c65ed9119fc58db446c8053d088ab938554b0bbf7b3a
 SHA512:
-  metadata.gz: '0839e480d352f8971eda023631979408b4ac4f352b06673b17e5ee02f3280842c2e51a40b9cd1bb091494f54cc9cc4235453d8d8ee18458bad55f43fe9228ec3'
-  data.tar.gz: bcaf0551aa3d35711b213137019a580eb84ae83c4b13a409c76644fc2af6eb577e06d46acb65260a48699598537064a6354fb35072392137161405097bc22798
+  metadata.gz: 0b27df1700c813a49720e826ee77e6d58e62ca22b8afff0bbe6561d1a51a3403629490edfc254320bd98bae2399ba97197d90c3b590568b8c5d9e243c1ce8732
+  data.tar.gz: deeaef221cc6143155580d346cc16e62c1dd86190d523f907bfc5d5dd0216968323a04053fe147e34fae1be29dd6c87cac00471c5cebb9f2894a0c9dd24f669b

data/Gemfile

@@ -4,12 +4,6 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-group :development, :test do
-  gem "rspec"
-end
-
-if File.exist? "Gemfile.devel"
-  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
-end
-
 gemspec
+
+eval_gemfile("Gemfile.devel") rescue nil

data/lib/isodoc/jis/html/html_jis_intro.html

@@ -1,4 +1,5 @@
 <div id="boilerplate-copyright-destination"/>
+<div id="boilerplate-feedback-destination"/>
 
 <nav>
 

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

@@ -139,6 +139,14 @@ a.FootnoteRef, span.FootnoteRef {
   color: red;
   text-decoration: line-through; }
 
+ruby {
+  ruby-position: over;
+  -webkit-ruby-position: before; }
+
+ruby ruby {
+  ruby-position: under;
+  -webkit-ruby-position: after; }
+
 /* code highlighting with line numbers */
 table.rouge-line-table td.rouge-gutter {
   -moz-user-select: none;

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

@@ -139,6 +139,14 @@ a.FootnoteRef, span.FootnoteRef {
   color: red;
   text-decoration: line-through; }
 
+ruby {
+  ruby-position: over;
+  -webkit-ruby-position: before; }
+
+ruby ruby {
+  ruby-position: under;
+  -webkit-ruby-position: after; }
+
 /* code highlighting with line numbers */
 table.rouge-line-table td.rouge-gutter {
   -moz-user-select: none;

data/lib/isodoc/jis/html/word_jis_intro.html

@@ -2,7 +2,6 @@
 border-bottom-alt:solid windowtext .5pt;mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:
 solid windowtext .5pt;mso-border-right-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 0cm 4.0pt;
 margin-left:5.1pt;margin-right:5.1pt'>
-<div id="boilerplate-copyright-destination"/>
 </div>
 
 

data/lib/isodoc/jis/html/word_jis_titlepage.html

@@ -129,6 +129,7 @@ documentation.</span><span lang="EN-GB" style='font-size:10.0pt;mso-bidi-font-si
         <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
 </p>
 
-<div id="boilerplate-inner-cover-note"/>
+<div id="boilerplate-copyright-destination"/>
+<div id="boilerplate-feedback-destination"/>
 <div id="boilerplate-contributors"/>
 

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

@@ -5,8 +5,10 @@ commentary: Commentary
 commentary_page: Comm.
 JIS: 日本工業規格
 permission_footer: Duplication, reprinting, etc. without permission is prohibited by copyright law.
+chairperson: chairperson
 doctype_dict:
   international-standard: International standard
+  japanese-industrial-standard: International standard
   technical-specification: Technical specification
   technical-report: Technical report
   publicly-available-specification: Publicly Available Specification

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

@@ -3,16 +3,17 @@ cancelled_and_replaced: キャンセルされ、%に置き換えられました
 norm_with_refs_pref_all_dated: 次に掲げる引用規格は，この規格に引用されることによって，その一部又は全部がこの規格の要 求事項を構成している。これらの引用規格は，記載の年の版を適用し，その後の改正版(追補を含む。) は適用しない。
 norm_with_refs_pref_none_dated: 次に掲げる引用規格は，この規格に引用されることによって，その一部又は全部がこの規格の要求事項 を構成している。これらの引用規格は，その最新版(追補を含む。)を適用する。
 permission_footer: 著作権法により無断での複製，転載等は禁止されております。
-admitted: "代替用語"
+admitted: 代替用語
 table_footnote: 注
 commentary: 解説
 commentary_page: 解
 JIS: 日本工業規格
 draft_label: 案
 white-paper: 白紙
+chairperson: 委員会長
 doctype_dict:
   international-standard: 日本産業規格
-  japaanese-industrial-standard: 日本産業規格
+  japanese-industrial-standard: 日本産業規格
   technical-specification: 標準仕様書
   technical-report: 標準報告書
   publicly-available-specification: Publicly Available Specification

data/lib/isodoc/jis/i18n.rb

@@ -1,3 +1,6 @@
+require "japanese_calendar"
+require "twitter_cldr"
+
 module IsoDoc
   module JIS
     class I18n < IsoDoc::Iso::I18n
@@ -10,6 +13,28 @@ module IsoDoc
         y = load_file("i18n-#{yaml_lang(lang, script)}.yaml")
         y.empty? ? load_file("i18n-en.yaml").merge(super) : super.deep_merge(y)
       end
+
+      # use Japanese ordinals for era years
+      def japanese_date(date)
+        date.nil? and return date
+        d = date.split(/-/).map(&:to_i)
+        time = Date.new(*d)
+        yr = japanese_year(time)
+        case d.size
+        when 1 then yr
+        when 2 then yr + time.strftime("%-m月")
+        when 3 then yr + time.strftime("%-m月%-d日")
+        else date
+        end
+      end
+
+      def japanese_year(time)
+        era_yr = time.era_year.to_i.localize(:ja)
+          .to_rbnf_s("SpelloutRules", "spellout-numbering-year")
+        "#{time.strftime('%JN')}#{era_yr}年"
+      rescue
+        time.year.to_s
+      end
     end
   end
 end

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

@@ -277,6 +277,10 @@
 								<xsl:with-param name="num" select="$num"/>
 							</xsl:apply-templates>
 
+							<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>
 
 					</fo:page-sequence>
@@ -515,6 +519,10 @@
 
 								<xsl:apply-templates select="*" mode="page"/>
 
+								<xsl:if test="not(*)">
+									<fo:block><!-- prevent fop error for empty document --></fo:block>
+								</xsl:if>
+
 							</fo:flow>
 						</fo:page-sequence>
 					</xsl:for-each>
@@ -662,7 +670,8 @@
 
 				<fo:block-container absolute-position="fixed" left="0mm" top="200mm" height="69mm" text-align="center" display-align="after" font-family="IPAexMincho">
 					<!-- Revised on July 22, 2019 -->
-					<fo:block font-size="9pt">令和元年<fo:inline font-family="Times New Roman"> 7 </fo:inline>月<fo:inline font-family="Times New Roman"> 22 </fo:inline>日 改正</fo:block>
+					<!-- <fo:block font-size="9pt">令和元年<fo:inline font-family="Times New Roman"> 7 </fo:inline>月<fo:inline font-family="Times New Roman"> 22 </fo:inline>日 改正</fo:block> -->
+					<fo:block font-size="9pt"><xsl:apply-templates select="/*/jis:bibdata/jis:date[@type = 'published']/text()"/> 改正</fo:block>
 					<!-- Japan Industrial Standards Survey Council deliberations -->
 					<!-- 日本産業標準調査会 -->
 					<fo:block font-size="14pt" margin-top="7mm"><xsl:value-of select="/*/jis:bibdata/jis:contributor[jis:role/@type = 'authorizer']/jis:organization/jis:name/jis:variant[@language = 'ja']"/> 審議</fo:block>
@@ -700,7 +709,8 @@
 							<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']" /> -->
+									<xsl:apply-templates select="/*/*[local-name() = 'boilerplate']"/>
 								</fo:block>
 							</fo:footnote-body>
 						</fo:footnote>
@@ -1152,7 +1162,7 @@
 						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 					</xsl:if>
 
-					<xsl:if test="parent::jis:clause[@type = 'inner-cover-note']">
+					<xsl:if test="parent::jis:clause[@type = 'inner-cover-note'] or ancestor::jis:boilerplate">
 						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 					</xsl:if>
 
@@ -10021,14 +10031,16 @@
 
 	<xsl:template match="*[local-name() = 'annex']">
 		<fo:block break-after="page"/>
-		<fo:block id="{@id}">
+		<fo:block>
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
 			<xsl:call-template name="refine_annex_style"/>
 
 		</fo:block>
-		<xsl:apply-templates/>
+		<fo:block id="{@id}">
+			<xsl:apply-templates/>
+		</fo:block>
 	</xsl:template>
 
 	<xsl:template name="refine_annex_style">
@@ -10751,6 +10763,7 @@
 			$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
 				<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
 				<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
+
 					<fo:list-item>
 						<fo:list-item-label end-indent="label-end()">
 							<fo:block role="SKIP">
@@ -10953,10 +10966,10 @@
 
 	<xsl:variable name="toc_level">
 		<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
-		<xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels  Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
+		<xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf  Number of table of contents levels to render in PDF output; used to override :toclevels:-->
 		<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
 		<xsl:choose>
-			<xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
+			<xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
 			<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when>  <!-- if there is value in xml -->
 			<xsl:otherwise><!-- default value -->
 				2

data/lib/isodoc/jis/metadata.rb

@@ -5,25 +5,18 @@ module IsoDoc
   module JIS
     class Metadata < IsoDoc::Iso::Metadata
       def title(isoxml, _out)
-        lang = case @lang
-               when "ja", "en" then @lang
-               else "ja"
-               end
-        # intro, main, part, amd = title_parts(isoxml, lang)
+        lang = @lang
+        %w(en ja).include?(lang) or lang = "ja"
         tp = title_parts(isoxml, lang)
         tn = title_nums(isoxml)
-
-        set(:doctitlemain,
-            @c.encode(tp[:main] ? tp[:main].text : "", :hexadecimal))
+        set_encoded(:doctitlemain, tp[:main])
         main = compose_title(tp, tn, lang)
         set(:doctitle, main)
-        tp[:intro] and
-          set(:doctitleintro,
-              @c.encode(tp[:intro] ? tp[:intro].text : "", :hexadecimal))
+        set_encoded(:doctitleintro, tp[:intro])
         set(:doctitlepartlabel, part_prefix(tn, lang))
-        set(:doctitlepart, @c.encode(tp[:part].text, :hexadecimal)) if tp[:part]
+        set_encoded(:doctitlepart, tp[:part])
         set(:doctitleamdlabel, amd_prefix(tn, lang)) if tn[:amd]
-        set(:doctitleamd, @c.encode(tp[:amd].text, :hexadecimal)) if tp[:amd]
+        set_encoded(:doctitleamd, tp[:amd])
         set(:doctitlecorrlabel, corr_prefix(tn, lang)) if tn[:corr]
       end
 
@@ -31,23 +24,23 @@ module IsoDoc
         lang = @lang == "ja" ? "en" : "ja"
         tp = title_parts(isoxml, lang)
         tn = title_nums(isoxml)
-
-        set(:docsubtitlemain,
-            @c.encode(tp[:main] ? tp[:main].text : "", :hexadecimal))
+        set_encoded(:docsubtitlemain, tp[:main])
         main = compose_title(tp, tn, lang)
         set(:docsubtitle, main)
-        tp[:intro] and
-          set(:docsubtitleintro,
-              @c.encode(tp[:intro] ? tp[:intro].text : "", :hexadecimal))
+        set_encoded(:docsubtitleintro, tp[:intro])
         set(:docsubtitlepartlabel, part_prefix(tn, lang))
-        tp[:part] and
-          set(:docsubtitlepart,
-              @c.encode(tp[:part].text, :hexadecimal))
+        set_encoded(:docsubtitlepart, tp[:part])
         set(:docsubtitleamdlabel, amd_prefix(tn, lang)) if tn[:amd]
-        set(:docsubtitleamd, @c.encode(tp[:amd].text, :hexadecimal)) if tp[:amd]
+        set_encoded(:docsubtitleamd, tp[:amd])
         set(:docsubtitlecorrlabel, corr_prefix(tn, lang)) if tn[:corr]
       end
 
+      def set_encoded(name, field)
+        field or return
+        field.respond_to?(:text) and field = field.text
+        set(name, @c.encode(field, :hexadecimal))
+      end
+
       PART_LABEL = { en: "Part", ja: "その" }.freeze
 
       def docid(isoxml, _out)
@@ -56,6 +49,61 @@ module IsoDoc
         set(:docnumber, id)
         set(:docnumber_undated, id.sub(/:\d{4}$/, ""))
       end
+
+      def bibdate(isoxml, _out)
+        isoxml.xpath(ns("//bibdata/date")).each do |d|
+          val = Common::date_range(d)
+          @lang == "ja" and val = @i18n.japanese_date(val)
+          set("#{d['type'].gsub(/-/, '_')}date".to_sym, val)
+        end
+      end
+
+      def version(isoxml, out)
+        super
+        @lang == "ja" or return
+        revdate = @i18n.japanese_date(isoxml
+          .at(ns("//bibdata/version/revision-date"))&.text)
+        set(:revdate, revdate)
+        set(:draftinfo, draftinfo(get[:draft], revdate))
+      end
+
+      def agency(xml)
+        super
+        investigative_organisation(xml)
+        investigative_committee(xml)
+      end
+
+      def investigative_organisation(xml)
+        xpath = "//bibdata/contributor" \
+          "[xmlns:role/@type = 'authorizer'][xmlns:role/description = " \
+          "'investigative organization']/organization/name"
+        org = xml.at(ns(xpath))
+        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']"
+        if o = xml.at(ns("#{xpath}/organization/name"))
+          set_encoded(:"investigative-committee", o)
+        elsif p = xml.at(ns("#{xpath}/person"))
+          investigative_committee_person(p)
+        end
+      end
+
+      def investigative_committee_person(person)
+        n = extract_person_names([person])
+        pos = person.at(ns("./affiliation/name")) || @i18n.chairperson
+        org = person.at(ns("./affiliation/organization/name"))
+        set_encoded(:"investigative-committee", org)
+        unless n.empty?
+          set_encoded(:"investigative-committee-representative-role", pos)
+          set(:"investigative-committee-representative-name", n.first)
+        end
+      end
     end
   end
 end

data/lib/isodoc/jis/presentation_section.rb

@@ -0,0 +1,124 @@
+require_relative "init"
+require "isodoc"
+
+module IsoDoc
+  module JIS
+    class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
+      def annex1(elem)
+        elem["commentary"] == "true" and return commentary(elem)
+        lbl = @xrefs.anchor(elem["id"], :label)
+        if t = elem.at(ns("./title"))
+          t.children = "<strong>#{to_xml(t.children)}</strong>"
+        end
+        prefix_name(elem, "<br/>", lbl, "title")
+      end
+
+      def annex(docxml)
+        super
+        move_commentaries_to_end(docxml)
+      end
+
+      def move_commentaries_to_end(docxml)
+        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|
+          b.next = x.remove
+        end
+      end
+
+      def commentary(elem)
+        t = elem.elements.first
+        commentary_title_hdr(t)
+        middle_title_main(t, "CommentaryStandardName")
+      end
+
+      def commentary_title_hdr(elem)
+        ret = <<~COMMENTARY
+          <p class="CommentaryStandardNumber">JIS #{@meta.get[:docnumber_undated]}
+        COMMENTARY
+        yr = @meta.get[:docyear] and
+          ret += ": <span class='CommentaryEffectiveYear'>#{yr}</span>"
+        elem.previous = ret
+      end
+
+      def toc_title_insert_pt(docxml)
+        ins = docxml.at(ns("//preface")) ||
+          docxml.at(ns("//sections | //annex | //bibliography"))
+            &.before("<preface> </preface>")
+            &.previous_element or return nil
+        ins.children.last.after(" ").next
+      end
+
+      def preface_rearrange(doc)
+        move_introduction(doc)
+        super
+      end
+
+      def move_introduction(doc)
+        source = doc.at(ns("//preface/introduction")) or return
+        dest = doc.at(ns("//sections")) ||
+          doc.at(ns("//preface")).after("<sections> </sections>").next_element
+        dest.children.empty? and dest.children = " "
+        dest.children.first.next = source
+      end
+
+      def middle_title(docxml)
+        s = docxml.at(ns("//sections")) or return
+        elem = s.children.first
+        middle_title_hdr(elem)
+        middle_title_main(elem, "zzSTDTitle1")
+        middle_subtitle_main(elem, "zzSTDTitle2")
+        # middle_title_amd(s.children.first)
+      end
+
+      def middle_title_hdr(out)
+        ret = "<p class='JapaneseIndustrialStandard'>#{@i18n.jis}"
+        @meta.get[:unpublished] and ret += @i18n.l10n("(#{@i18n.draft_label})")
+        ret += ("<tab/>" * 7)
+        ret += "<span class='JIS'>JIS</span></p>"
+        ret += "<p class='StandardNumber'><tab/>#{@meta.get[:docnumber_undated]}"
+        if yr = @meta.get[:docyear]
+          ret += ": <span class='EffectiveYear'>#{yr}</span>"
+        end
+        ret += "</p><p class='IDT'/>"
+        out.previous = ret
+      end
+
+      def middle_title_main(out, style)
+        t = @meta.get[:doctitlemain]
+        (t && !t.empty?) or return
+        ret =
+          middle_title_para(style, :doctitleintro, :doctitlemain, :doctitlepart)
+        if a = @meta.get[:doctitlepart]
+          ret += "<p class='zzSTDTitle1'>"
+          b = @meta.get[:doctitlepartlabel] and ret += "#{b}: "
+          ret += "<br/><strong>#{a}</strong></p>"
+        end
+        out.previous = ret
+      end
+
+      def middle_subtitle_main(out, style)
+        t = @meta.get[:docsubtitlemain]
+        (t && !t.empty?) or return
+        ret = middle_title_para(style, :docsubtitleintro, :docsubtitlemain,
+                                :docsubtitlepart)
+        if a = @meta.get[:docsubtitlepart]
+          ret += "<p class='zzSTDTitle2'>"
+          b = @meta.get[:docsubtitlepartlabel] and ret += "#{b}: "
+          ret += "<br/><strong>#{a}</strong></p>"
+        end
+        out.previous = ret
+      end
+
+      def middle_title_para(style, intro, main, part)
+        ret = "<p class='#{style}'>#{@meta.get[intro]}"
+        ret += " &#x2014; " if @meta.get[intro] && @meta.get[main]
+        ret += @meta.get[main]
+        ret += " &#x2014; " if @meta.get[main] && @meta.get[part]
+        ret += "</p>"
+        ret
+      end
+    end
+  end
+end

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -1,5 +1,6 @@
 require_relative "init"
 require "isodoc"
+require_relative "presentation_section"
 
 module IsoDoc
   module JIS
@@ -134,44 +135,6 @@ module IsoDoc
         "<tr><td border='0' colspan='#{cols}'>#{elem}</td></tr>"
       end
 
-      def annex1(elem)
-        elem["commentary"] == "true" and return commentary(elem)
-        lbl = @xrefs.anchor(elem["id"], :label)
-        if t = elem.at(ns("./title"))
-          t.children = "<strong>#{to_xml(t.children)}</strong>"
-        end
-        prefix_name(elem, "<br/>", lbl, "title")
-      end
-
-      def annex(docxml)
-        super
-        move_commentaries_to_end(docxml)
-      end
-
-      def move_commentaries_to_end(docxml)
-        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|
-          b.next = x.remove
-        end
-      end
-
-      def commentary(elem)
-        t = elem.elements.first
-        commentary_title_hdr(t)
-        middle_title_main(t, "CommentaryStandardName")
-      end
-
-      def commentary_title_hdr(elem)
-        ret = <<~COMMENTARY
-          <p class="CommentaryStandardNumber">JIS #{@meta.get[:docnumber_undated]}
-        COMMENTARY
-        yr = @meta.get[:docyear] and
-          ret += ": <span class='CommentaryEffectiveYear'>#{yr}</span>"
-        elem.previous = ret
-      end
-
       def tablesource(elem)
         while elem&.next_element&.name == "source"
           elem << "; #{to_xml(elem.next_element.remove.children)}"
@@ -179,82 +142,15 @@ module IsoDoc
         elem.children = l10n("#{@i18n.source}: #{to_xml(elem.children).strip}")
       end
 
-      def toc_title_insert_pt(docxml)
-        ins = docxml.at(ns("//preface")) ||
-          docxml.at(ns("//sections | //annex | //bibliography"))
-            &.before("<preface> </preface>")
-            &.previous_element or return nil
-        ins.children.last.after(" ").next
-      end
-
-      def preface_rearrange(doc)
-        move_introduction(doc)
+      def bibdata_i18n(bibdata)
         super
+        @lang == "ja" and date_translate(bibdata)
       end
 
-      def move_introduction(doc)
-        source = doc.at(ns("//preface/introduction")) or return
-        dest = doc.at(ns("//sections")) ||
-          doc.at(ns("//preface")).after("<sections> </sections>").next_element
-        dest.children.empty? and dest.children = " "
-        dest.children.first.next = source
-      end
-
-      def middle_title(docxml)
-        s = docxml.at(ns("//sections")) or return
-        elem = s.children.first
-        middle_title_hdr(elem)
-        middle_title_main(elem, "zzSTDTitle1")
-        middle_subtitle_main(elem, "zzSTDTitle2")
-        # middle_title_amd(s.children.first)
-      end
-
-      def middle_title_hdr(out)
-        ret = "<p class='JapaneseIndustrialStandard'>#{@i18n.jis}"
-        @meta.get[:unpublished] and ret += @i18n.l10n("(#{@i18n.draft_label})")
-        ret += ("<tab/>" * 7)
-        ret += "<span class='JIS'>JIS</span></p>"
-        ret += "<p class='StandardNumber'><tab/>#{@meta.get[:docnumber_undated]}"
-        if yr = @meta.get[:docyear]
-          ret += ": <span class='EffectiveYear'>#{yr}</span>"
-        end
-        ret += "</p><p class='IDT'/>"
-        out.previous = ret
-      end
-
-      def middle_title_main(out, style)
-        t = @meta.get[:doctitlemain]
-        (t && !t.empty?) or return
-        ret =
-          middle_title_para(style, :doctitleintro, :doctitlemain, :doctitlepart)
-        if a = @meta.get[:doctitlepart]
-          ret += "<p class='zzSTDTitle1'>"
-          b = @meta.get[:doctitlepartlabel] and ret += "#{b}: "
-          ret += "<br/><strong>#{a}</strong></p>"
-        end
-        out.previous = ret
-      end
-
-      def middle_subtitle_main(out, style)
-        t = @meta.get[:docsubtitlemain]
-        (t && !t.empty?) or return
-        ret = middle_title_para(style, :docsubtitleintro, :docsubtitlemain,
-                                :docsubtitlepart)
-        if a = @meta.get[:docsubtitlepart]
-          ret += "<p class='zzSTDTitle2'>"
-          b = @meta.get[:docsubtitlepartlabel] and ret += "#{b}: "
-          ret += "<br/><strong>#{a}</strong></p>"
+      def date_translate(bibdata)
+        bibdata.xpath(ns("./date")).each do |d|
+          d.children = @i18n.japanese_date(d.text.strip)
         end
-        out.previous = ret
-      end
-
-      def middle_title_para(style, intro, main, part)
-        ret = "<p class='#{style}'>#{@meta.get[intro]}"
-        ret += " &#x2014; " if @meta.get[intro] && @meta.get[main]
-        ret += @meta.get[main]
-        ret += " &#x2014; " if @meta.get[main] && @meta.get[part]
-        ret += "</p>"
-        ret
       end
 
       include Init

data/lib/metanorma/jis/basicdoc.rng

@@ -95,8 +95,89 @@
       <ref name="pagebreak"/>
       <ref name="hr"/>
       <ref name="bookmark"/>
+      <ref name="amend"/>
     </choice>
   </define>
+  <define name="amend">
+    <element name="amend">
+      <ref name="AmendType"/>
+    </element>
+  </define>
+  <define name="AmendType">
+    <optional>
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+    </optional>
+    <attribute name="change">
+      <choice>
+        <value>add</value>
+        <value>modify</value>
+        <value>delete</value>
+        <value>replace</value>
+      </choice>
+    </attribute>
+    <optional>
+      <attribute name="path"/>
+    </optional>
+    <optional>
+      <attribute name="path_end"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <element name="location">
+        <zeroOrMore>
+          <choice>
+            <ref name="locality"/>
+            <ref name="localityStack"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </optional>
+    <optional>
+      <element name="description">
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
+      </element>
+    </optional>
+    <optional>
+      <element name="newcontent">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
+      </element>
+    </optional>
+    <zeroOrMore>
+      <ref name="classification"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contributor"/>
+    </zeroOrMore>
+  </define>
+  <define name="classification">
+    <element name="classification">
+      <ref name="classification_tag"/>
+      <ref name="classification_value"/>
+    </element>
+  </define>
+  <define name="classification_tag">
+    <element name="tag">
+      <text/>
+    </element>
+  </define>
+  <define name="classification_value">
+    <element name="value">
+      <text/>
+    </element>
+  </define>
   <define name="paragraph">
     <element name="p">
       <ref name="ParagraphType"/>
@@ -715,27 +796,36 @@
   </define>
   <define name="ruby">
     <element name="ruby">
-      <zeroOrMore>
-        <choice>
-          <ref name="PureTextElement"/>
-          <ref name="rp"/>
-          <ref name="rt"/>
-        </choice>
-      </zeroOrMore>
+      <choice>
+        <ref name="ruby_pronunciation"/>
+        <ref name="ruby_annotation"/>
+      </choice>
+      <choice>
+        <text/>
+        <ref name="ruby"/>
+      </choice>
     </element>
   </define>
-  <define name="rp">
-    <element name="rp">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
+  <define name="ruby_pronunciation">
+    <element name="pronunciation">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
     </element>
   </define>
-  <define name="rt">
-    <element name="rt">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
+  <define name="ruby_annotation">
+    <element name="annotation">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
     </element>
   </define>
   <define name="br">
@@ -930,18 +1020,12 @@
     </optional>
     <optional>
       <attribute name="width">
-        <choice>
-          <data type="int"/>
-          <value>auto</value>
-        </choice>
+        <ref name="ImageSize"/>
       </attribute>
     </optional>
     <optional>
       <attribute name="height">
-        <choice>
-          <data type="int"/>
-          <value>auto</value>
-        </choice>
+        <ref name="ImageSize"/>
       </attribute>
     </optional>
     <optional>
@@ -956,6 +1040,14 @@
       </attribute>
     </optional>
   </define>
+  <define name="ImageSize">
+    <choice>
+      <data type="string">
+        <param name="pattern">\d+([.]\d+)?(%?)</param>
+      </data>
+      <value>auto</value>
+    </choice>
+  </define>
   <define name="video">
     <element name="video">
       <attribute name="id">

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

@@ -9,11 +9,42 @@
   -->
   <include href="biblio.rng">
     <define name="BibData">
-      <ref name="BibliographicItem"/>
+      <ref name="StandardBibliographicItem"/>
       <optional>
         <ref name="ext"/>
       </optional>
     </define>
+    <define name="docrelation">
+      <element name="relation">
+        <attribute name="type">
+          <ref name="DocRelationType"/>
+        </attribute>
+        <optional>
+          <element name="description">
+            <ref name="FormattedString"/>
+          </element>
+        </optional>
+        <element name="bibitem">
+          <ref name="StandardReducedBibliographicItem"/>
+        </element>
+        <choice>
+          <zeroOrMore>
+            <ref name="locality"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="localityStack"/>
+          </zeroOrMore>
+        </choice>
+        <choice>
+          <zeroOrMore>
+            <ref name="sourceLocality"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="sourceLocalityStack"/>
+          </zeroOrMore>
+        </choice>
+      </element>
+    </define>
   </include>
   <define name="ext">
     <element name="ext">
@@ -161,4 +192,16 @@
       </optional>
     </element>
   </define>
+  <define name="StandardBibliographicItem">
+    <ref name="BibliographicItem"/>
+    <zeroOrMore>
+      <ref name="amend"/>
+    </zeroOrMore>
+  </define>
+  <define name="StandardReducedBibliographicItem">
+    <ref name="ReducedBibliographicItem"/>
+    <zeroOrMore>
+      <ref name="amend"/>
+    </zeroOrMore>
+  </define>
 </grammar>

data/lib/metanorma/jis/biblio.rng

@@ -241,6 +241,9 @@
     </element>
   </define>
   <define name="FullNameType">
+    <optional>
+      <ref name="name_abbreviation"/>
+    </optional>
     <choice>
       <group>
         <zeroOrMore>
@@ -266,6 +269,11 @@
       <ref name="variantname"/>
     </zeroOrMore>
   </define>
+  <define name="name_abbreviation">
+    <element name="abbreviation">
+      <ref name="LocalizedString"/>
+    </element>
+  </define>
   <define name="prefix">
     <element name="prefix">
       <ref name="LocalizedString"/>
@@ -870,6 +878,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="btitle">
     <element name="title">

data/lib/metanorma/jis/boilerplate-en.adoc

@@ -0,0 +1,12 @@
+== copyright-statement
+
+Competent Minister: Minister of Economy, Trade and Industry Established: October 31, 1951 Revised: {{ revdate }}
+Date of publication in the Official Gazette: {{ announceddate }}
+Draft creator: Japanese Standards Association
+(Mita MT Building, 3-13-12 Mita, Minato-ku, Tokyo 108-0073 Tel: 03-4231-8530)
+Investigative Working Group: {{ investigative-organization }} {{ investigative-committee }}
+{% if investigative-committee-representative-name %}({{ investigative-committee-representative-role | capitalize }}: {{ investigative-committee-representative-name }}){% endif %}
+
+== feedback-statement
+
+Any comments or questions regarding this standard should be directed to the above drafter or the International Standardization Division, Industrial Science and Technology Policy and Environment Bureau, Ministry of Economy, Trade and Industry (Tokyo 100-8901 Tokyo, Japan). Please contact 1-3-1 Kasumigaseki, Chiyoda-ku, Tokyo. In accordance with the provisions of the Industrial Standardization Law, Japanese Industrial Standards shall be reviewed by the Japan Industrial Standards Committee by the date when at least five years have passed. It will be put up for discussion and promptly confirmed, amended or repealed.

data/lib/metanorma/jis/boilerplate-ja.adoc

@@ -0,0 +1,18 @@
+== copyright-statement
+
+主 務 大 臣:経済産業大臣 制定:昭和 26.10.31 改正:{{ revdate }}
+
+官 報 掲 載 日:{{ announceddate }}
+
+原 案 作 成 者:一般財団法人日本規格協会
+
+(〒108-0073 東京都港区三田 3-13-12 三田 MT ビル TEL 03-4231-8530)
+
+審 議 部 会:{{ investigative-organization }}{{ investigative-committee }}{% if investigative-committee-representative-name %}({{ investigative-committee-representative-role }} {{ investigative-committee-representative-name }}){% endif %}
+
+== feedback-statement
+
+
+この規格についての意見又は質問は，上記原案作成者又は経済産業省産業技術環境局 国際標準課(〒100-8901 東京 都千代田区霞が関 1-3-1)にご連絡ください。
+
+なお，日本産業規格は，産業標準化法の規定によって，少なくとも 5 年を経過する日までに日本産業標準調査会の審 議に付され，速やかに，確認，改正又は廃止されます。

data/lib/metanorma/jis/cleanup.rb

@@ -61,6 +61,22 @@ module Metanorma
           n.delete("keep-separate")
         end
       end
+
+      def bibdata_cleanup(xmldoc)
+        super
+        bibdata_supply_chairperson_role(xmldoc)
+      end
+
+      def bibdata_supply_chairperson_role(xmldoc)
+        xpath =
+          "//bibdata/contributor" \
+          "[role/@type = 'authorizer'][role/description = " \
+          "'investigative committee']/person/affiliation"
+        xmldoc.xpath(xpath).each do |a|
+          a.at("./name") or next
+          a.children.first.previous = "<name>#{@i18n.chairperson}</name>"
+        end
+      end
     end
   end
 end

data/lib/metanorma/jis/converter.rb

@@ -25,10 +25,6 @@ module Metanorma
         ret
       end
 
-      def boilerplate_file(_x_orig)
-        File.join(@libdir, "jis_intro_jp.xml")
-      end
-
       def section_attributes(node)
         ret = super
         if node.attr("style") == "appendix" && node.level == 1 &&
@@ -44,6 +40,10 @@ module Metanorma
           .merge("keep-separate": node.attr("keep-separate")))
       end
 
+      def boilerplate_file(_x_orig)
+        File.join(@libdir, "boilerplate-#{@lang}.adoc")
+      end
+
       def html_converter(node)
         if node.nil?
           IsoDoc::JIS::HtmlConvert.new({})

data/lib/metanorma/jis/front.rb

@@ -15,8 +15,7 @@ module Metanorma
         org_contributor(node, xml,
                         { source: ["publisher", "pub"], role: "author",
                           default: JIS_HASH })
-        node.attr("doctype") == "expert-commentary" and
-          personal_author(node, xml)
+        personal_author(node, xml)
       end
 
       def metadata_publisher(node, xml)
@@ -160,7 +159,7 @@ module Metanorma
       end
 
       def iso_id_params_core(node)
-        pub = (node.attr("publisher") || "JIS").split(/[;,]/)
+        pub = iso_id_pub(node)
         ret = { number: node.attr("docnumber") || "0",
                 part: node.attr("partnumber"),
                 series: node.attr("docseries"),

data/lib/metanorma/jis/isodoc.rng

@@ -17,10 +17,19 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.9 -->
+<!-- VERSION v1.2.12 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
+    <define name="amend">
+      <element name="amend">
+        <ref name="BlockAttributes"/>
+        <ref name="AmendType"/>
+        <zeroOrMore>
+          <ref name="autonumber"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="admonition">
       <element name="admonition">
         <attribute name="type">
@@ -2319,69 +2328,6 @@
       <ref name="CitationType"/>
     </element>
   </define>
-  <define name="amend">
-    <element name="amend">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <attribute name="change">
-        <choice>
-          <value>add</value>
-          <value>modify</value>
-          <value>delete</value>
-          <value>replace</value>
-        </choice>
-      </attribute>
-      <optional>
-        <attribute name="path"/>
-      </optional>
-      <optional>
-        <attribute name="path_end"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <ref name="BlockAttributes"/>
-      <optional>
-        <element name="location">
-          <zeroOrMore>
-            <ref name="locality"/>
-          </zeroOrMore>
-        </element>
-      </optional>
-      <zeroOrMore>
-        <ref name="autonumber"/>
-      </zeroOrMore>
-      <optional>
-        <element name="description">
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-        </element>
-      </optional>
-      <optional>
-        <element name="newcontent">
-          <optional>
-            <attribute name="id">
-              <data type="ID"/>
-            </attribute>
-          </optional>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-        </element>
-      </optional>
-      <optional>
-        <element name="description">
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-        </element>
-      </optional>
-    </element>
-  </define>
   <define name="autonumber">
     <element name="autonumber">
       <attribute name="type">

data/lib/metanorma/jis/reqt.rng

@@ -207,20 +207,4 @@
       <value>permission</value>
     </choice>
   </define>
-  <define name="classification">
-    <element name="classification">
-      <ref name="classification_tag"/>
-      <ref name="classification_value"/>
-    </element>
-  </define>
-  <define name="classification_tag">
-    <element name="tag">
-      <text/>
-    </element>
-  </define>
-  <define name="classification_value">
-    <element name="value">
-      <text/>
-    </element>
-  </define>
 </grammar>

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.1.5".freeze
+    VERSION = "0.2.0".freeze
   end
 end
 

data/metanorma-jis.gemspec

@@ -27,10 +27,11 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features|bin|.github)/}) \
     || f.match(%r{Rakefile|bin/rspec})
   end
-  spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
+  spec.test_files = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-iso", "~> 2.6.0"
+  spec.add_dependency "japanese_calendar", "~> 0"
+  spec.add_dependency "metanorma-iso", "~> 2.7.0"
   spec.add_dependency "pubid-jis"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-10 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: japanese_calendar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: pubid-jis
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +276,7 @@ files:
 - lib/isodoc/jis/jis.international-standard.xsl
 - lib/isodoc/jis/metadata.rb
 - lib/isodoc/jis/pdf_convert.rb
+- lib/isodoc/jis/presentation_section.rb
 - lib/isodoc/jis/presentation_xml_convert.rb
 - lib/isodoc/jis/table.rb
 - lib/isodoc/jis/word_cleanup.rb
@@ -272,6 +287,8 @@ files:
 - lib/metanorma/jis/basicdoc.rng
 - lib/metanorma/jis/biblio-standoc.rng
 - lib/metanorma/jis/biblio.rng
+- lib/metanorma/jis/boilerplate-en.adoc
+- lib/metanorma/jis/boilerplate-ja.adoc
 - lib/metanorma/jis/cleanup.rb
 - lib/metanorma/jis/converter.rb
 - lib/metanorma/jis/front.rb