metanorma-jis 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 389469990940f3daa6877a9bfd6f3903ef3705e4a3bc0446de19e2d2c1a52930
-  data.tar.gz: b0cbac18b0e1cf0223d52ebe4cce6d2c7956a7a79a70e974369cf8d556c8bf9a
+  metadata.gz: ff66d75cdb79e4e5c5ac3ce3710fa330b966cb593b3091445a7a40e74c06d524
+  data.tar.gz: f85726ebe333f7d1195689ca2028f4cde3c2a4dc948a1de9307ebd5d5e0943bd
 SHA512:
-  metadata.gz: c14b13c90635a211a98d25a65850166c7d515aa49857ba99394664a571cee113f3c91db7e32c5ad523a51676b6a83536aec9fe8ccd0908c277bc1f748768e906
-  data.tar.gz: 5b6e900e60f71d0f4f4fb363269ef974fbdfa99690bc1a4292b8d05c20f195b7afe8878433368adbc95c5177a7b6f929f3d29cfb42c9da0a49f0bd690e5d189f
+  metadata.gz: 6f6554baeda3c8ab8e82da6f36e6500eb89d5d639dbaaba3e3970845e3d9e0ec007c931d8f5ca4a1b1b8060bf11ef46eb4d3ab4a9074d77e042fbaedb3141140
+  data.tar.gz: 7e3e2a87a2070fb32c477b6cb1dc678ef110f349a32a227f79a11b5b495e264adebab14babbfe6ac68602c5431c4d5f9be3aaa573ca113b0ec3d7f447b7a6096

data/lib/isodoc/jis/base_convert.rb

@@ -28,7 +28,7 @@ module IsoDoc
         out.p(class: "zzSTDTitle2") do |p|
           p << @meta.get[:docsubtitleintro]
           p << " &#x2014; " if @meta.get[:docsubtitleintro] && @meta.get[:docsubtitlemain]
-          p << @meta.get[:doctitlemain]
+          p << @meta.get[:docsubtitlemain]
           p << " &#x2014; " if @meta.get[:docsubtitlemain] && @meta.get[:docsubtitlepart]
         end
         a = @meta.get[:docsubtitlepart] and out.p(class: "zzSTDTitle2") do |p|

data/lib/isodoc/jis/html/isodoc.css

@@ -99,29 +99,27 @@ p.NormRef, li.NormRef, div.NormRef {
   mso-fareast-language: JA; }
 
 p.FigureTitle, li.FigureTitle, div.FigureTitle {
-  mso-style-name: "Figure Title";
+  mso-style-name: 図題（参考付図）;
+  /*  title (reference figure) */
   mso-style-unhide: no;
-  mso-style-qformat: yes;
-  mso-style-parent: "";
-  mso-style-parent: "List Paragraph";
-  mso-style-link: "Figure Title Char";
-  margin-top: 0cm;
+  mso-style-parent: 図題;
+  mso-style-next: 段落;
+  margin-top: 3.0pt;
   margin-right: 0cm;
-  margin-bottom: 6.0pt;
-  margin-left: 36.0pt;
-  mso-add-space: auto;
+  margin-bottom: 0cm;
+  margin-left: 0cm;
   text-align: center;
-  text-indent: -30.35pt;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  /*mso-list:l9 level1 lfo17;*/
-  tab-stops: 20.15pt;
+  line-height: 17.0pt;
+  mso-line-height-rule: exactly;
+  mso-pagination: none;
   font-size: {{normalfontsize}};
-  font-family: {{bodyfont}};
+  font-family: "Times New Roman",serif;
+  mso-fareast-font-family: {{headerfont}};
+  mso-font-kerning: 1.0pt;
+  mso-ansi-language: EN-US;
+  mso-fareast-language: JA;
   font-weight: bold;
-  mso-fareast-font-family: "SimSun",serif;
-  mso-bidi-font-family: {{bodyfont}};
-  mso-ansi-language: EN-GB; }
+  mso-bidi-font-weight: normal; }
 
 p.FigureTitleCxSpFirst, li.FigureTitleCxSpFirst, div.FigureTitleCxSpFirst {
   mso-style-name: "Figure TitleCxSpFirst";
@@ -404,28 +402,28 @@ p.SourceTitle {
   mso-ansi-language: EN-GB; }
 
 p.Tabletitle, li.Tabletitle, div.Tabletitle, p.ListTitle {
-  mso-style-name: "Table title";
+  mso-style-name: 表題（解説表）;
+  /* Title (explanatory table) */
   mso-style-unhide: no;
-  mso-style-qformat: yes;
-  mso-style-parent: "";
+  mso-style-parent: Title;
+  mso-style-next: 単位;
   margin-top: 0cm;
   margin-right: 0cm;
-  margin-bottom: 6.0pt;
-  margin-left: 36.0pt;
+  margin-bottom: 3.0pt;
+  margin-left: 0cm;
   text-align: center;
-  text-indent: -18.0pt;
-  line-height: 12.0pt;
-  page-break-after: avoid;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  /* mso-list:l8 level1 lfo16; */
-  tab-stops: 20.15pt;
+  line-height: 17.0pt;
+  mso-line-height-rule: exactly;
+  mso-pagination: none;
   font-size: {{normalfontsize}};
+  font-family: "Times New Roman",serif;
+  mso-fareast-font-family: {{headerfont}};
+  mso-font-kerning: 1.0pt;
+  mso-ansi-language: EN-US;
+  mso-fareast-language: JA;
   font-weight: bold;
-  font-family: {{bodyfont}};
-  mso-fareast-font-family: "SimSun",serif;
-  mso-bidi-font-family: {{bodyfont}};
-  mso-ansi-language: EN-GB; }
+  mso-bidi-font-weight: normal;
+  mso-no-proof: yes; }
 
 p.TabletitleCxSpFirst, li.TabletitleCxSpFirst, div.TabletitleCxSpFirst {
   mso-style-name: "Table titleCxSpFirst";
@@ -816,7 +814,7 @@ p.zzHelp, li.zzHelp, div.zzHelp {
   font-size: {{normalfontsize}};
   mso-bidi-font-size: 10.0pt;
   font-family: {{bodyfont}};
-  mso-fareast-font-family: "MS Mincho";
+  mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: "Times New Roman";
   color: green;
   mso-ansi-language: EN-GB;
@@ -957,7 +955,7 @@ p.zzSTDTitle1, li.zzSTDTitle1, div.zzSTDTitle1 {
   mso-pagination: none;
   font-size: 10.0pt;
   font-family: "Times New Roman",serif;
-  mso-fareast-font-family: "MS Gothic";
+  mso-fareast-font-family: {{headerfont}};
   mso-font-kerning: 1.0pt;
   mso-ansi-language: EN-US;
   mso-fareast-language: JA;
@@ -1356,20 +1354,28 @@ div.Example, td.Example {
   margin-bottom: 6.0pt; }
 
 p.Example, li.Example, div.Example {
+  mso-style-name: 例１;
+  /* Example 1 */
   mso-style-unhide: no;
-  mso-style-qformat: yes;
-  margin-top: 0cm;
+  mso-style-parent: "";
+  mso-style-next: 例１＿段落;
+  margin-top: 3.0pt;
   margin-right: 0cm;
-  margin-bottom: 6.0pt;
-  margin-left: 0cm;
+  margin-bottom: 0cm;
+  margin-left: 29.8pt;
   text-align: justify;
-  line-height: 12.0pt;
-  mso-pagination: widow-orphan;
-  /* tab-stops:20.15pt; */
-  mso-fareast-font-family: Calibri;
-  mso-bidi-font-family: "Times New Roman";
-  mso-ansi-language: EN-GB;
-  mso-fareast-language: EN-US; }
+  text-justify: inter-ideograph;
+  text-indent: -19.85pt;
+  line-height: 15.0pt;
+  mso-line-height-rule: exactly;
+  mso-pagination: none;
+  font-size: {{normalfontsize}};
+  font-family: "Times New Roman",serif;
+  mso-fareast-font-family: {{bodyfont}};
+  mso-font-kerning: 1.0pt;
+  mso-ansi-language: EN-US;
+  mso-fareast-language: JA;
+  mso-no-proof: yes; }
 
 span.ExampleChar {
   mso-style-name: "Example Char";
@@ -3917,29 +3923,6 @@ p.afffffffd, li.afffffffd, div.afffffffd {
   mso-bidi-font-weight: normal;
   mso-no-proof: yes; }
 
-p.afffffffe, li.afffffffe, div.afffffffe {
-  mso-style-name: 図題（参考付図）;
-  /*  title (reference figure) */
-  mso-style-unhide: no;
-  mso-style-parent: 図題;
-  mso-style-next: 段落;
-  margin-top: 3.0pt;
-  margin-right: 0cm;
-  margin-bottom: 0cm;
-  margin-left: 0cm;
-  text-align: center;
-  line-height: 17.0pt;
-  mso-line-height-rule: exactly;
-  mso-pagination: none;
-  font-size: {{normalfontsize}};
-  font-family: "Times New Roman",serif;
-  mso-fareast-font-family: {{headerfont}};
-  mso-font-kerning: 1.0pt;
-  mso-ansi-language: EN-US;
-  mso-fareast-language: JA;
-  font-weight: bold;
-  mso-bidi-font-weight: normal; }
-
 p.affffffff, li.affffffff, div.affffffff {
   mso-style-name: 図題（付図）;
   /* Subtitle (Appendix) */
@@ -7586,30 +7569,6 @@ p.afffffffffffffffff4, li.afffffffffffffffff4, div.afffffffffffffffff4 {
   mso-ansi-language: EN-US;
   mso-fareast-language: JA; }
 
-p.afffffffffffffffff5, li.afffffffffffffffff5, div.afffffffffffffffff5 {
-  mso-style-name: 表題（解説表）;
-  /* Title (explanatory table) */
-  mso-style-unhide: no;
-  mso-style-parent: Title;
-  mso-style-next: 単位;
-  margin-top: 0cm;
-  margin-right: 0cm;
-  margin-bottom: 3.0pt;
-  margin-left: 0cm;
-  text-align: center;
-  line-height: 17.0pt;
-  mso-line-height-rule: exactly;
-  mso-pagination: none;
-  font-size: {{normalfontsize}};
-  font-family: "Times New Roman",serif;
-  mso-fareast-font-family: {{headerfont}};
-  mso-font-kerning: 1.0pt;
-  mso-ansi-language: EN-US;
-  mso-fareast-language: JA;
-  font-weight: bold;
-  mso-bidi-font-weight: normal;
-  mso-no-proof: yes; }
-
 p.afffffffffffffffff6, li.afffffffffffffffff6, div.afffffffffffffffff6 {
   mso-style-name: 表題（解説付表）;
   /* Title (explanatory table) */
@@ -9193,30 +9152,6 @@ p.afffffffffffffffffffffd, li.afffffffffffffffffffffd, div.affffffffffffffffffff
   mso-bidi-font-weight: normal;
   mso-no-proof: yes; }
 
-p.afffffffffffffffffffffe, li.afffffffffffffffffffffe, div.afffffffffffffffffffffe {
-  mso-style-name: 例１;
-  /* Example 1 */
-  mso-style-unhide: no;
-  mso-style-parent: "";
-  mso-style-next: 例１＿段落;
-  margin-top: 3.0pt;
-  margin-right: 0cm;
-  margin-bottom: 0cm;
-  margin-left: 29.8pt;
-  text-align: justify;
-  text-justify: inter-ideograph;
-  text-indent: -19.85pt;
-  line-height: 15.0pt;
-  mso-line-height-rule: exactly;
-  mso-pagination: none;
-  font-size: {{normalfontsize}};
-  font-family: "Times New Roman",serif;
-  mso-fareast-font-family: {{bodyfont}};
-  mso-font-kerning: 1.0pt;
-  mso-ansi-language: EN-US;
-  mso-fareast-language: JA;
-  mso-no-proof: yes; }
-
 p.affffffffffffffffffffff, li.affffffffffffffffffffff, div.affffffffffffffffffffff {
   mso-style-name: 例１（番号のみ）;
   /* Example 1 (number only) */

data/lib/isodoc/jis/html/isodoc.scss

@@ -93,29 +93,27 @@ p.NormRef, li.NormRef, div.NormRef
         mso-ansi-language:EN-US;
         mso-fareast-language:JA;}
 p.FigureTitle, li.FigureTitle, div.FigureTitle
-	{mso-style-name:"Figure Title";
-	mso-style-unhide:no;
-	mso-style-qformat:yes;
-	mso-style-parent:"";
-	mso-style-parent:"List Paragraph";
-	mso-style-link:"Figure Title Char";
-	margin-top:0cm;
-	margin-right:0cm;
-	margin-bottom:6.0pt;
-	margin-left:36.0pt;
-	mso-add-space:auto;
-	text-align:center;
-	text-indent:-30.35pt;
-	line-height:12.0pt;
-	mso-pagination:widow-orphan;
-	/*mso-list:l9 level1 lfo17;*/
-	tab-stops:20.15pt;
-	font-size:$normalfontsize;
-	font-family:$bodyfont;
-    font-weight:bold;
-	mso-fareast-font-family:"SimSun",serif;
-	mso-bidi-font-family:$bodyfont;
-	mso-ansi-language:EN-GB;}
+        {mso-style-name:図題（参考付図）;
+        /*  title (reference figure) */
+        mso-style-unhide:no;
+        mso-style-parent:図題;
+        mso-style-next:段落;
+        margin-top:3.0pt;
+        margin-right:0cm;
+        margin-bottom:0cm;
+        margin-left:0cm;
+        text-align:center;
+        line-height:17.0pt;
+        mso-line-height-rule:exactly;
+        mso-pagination:none;
+        font-size:$normalfontsize;
+        font-family:"Times New Roman",serif;
+        mso-fareast-font-family:$headerfont;
+        mso-font-kerning:1.0pt;
+        mso-ansi-language:EN-US;
+        mso-fareast-language:JA;
+        font-weight:bold;
+        mso-bidi-font-weight:normal;}
 p.FigureTitleCxSpFirst, li.FigureTitleCxSpFirst, div.FigureTitleCxSpFirst
 	{mso-style-name:"Figure TitleCxSpFirst";
 	mso-style-unhide:no;
@@ -384,28 +382,28 @@ p.SourceTitle
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
 p.Tabletitle, li.Tabletitle, div.Tabletitle, p.ListTitle
-	{mso-style-name:"Table title";
+        {mso-style-name:表題（解説表）;
+        /* Title (explanatory table) */
         mso-style-unhide:no;
-	mso-style-qformat:yes;
-	mso-style-parent:"";
-	margin-top:0cm;
-	margin-right:0cm;
-	margin-bottom:6.0pt;
-	margin-left:36.0pt;
-	text-align:center;
-	text-indent:-18.0pt;
-	line-height:12.0pt;
-	page-break-after:avoid;
-	line-height:12.0pt;
-	mso-pagination:widow-orphan;
-	/* mso-list:l8 level1 lfo16; */
-	tab-stops:20.15pt;
-	font-size:$normalfontsize;
-	font-weight:bold;
-	font-family:$bodyfont;
-	mso-fareast-font-family:"SimSun",serif;
-	mso-bidi-font-family:$bodyfont;
-	mso-ansi-language:EN-GB;}
+        mso-style-parent:Title;
+        mso-style-next:単位;
+        margin-top:0cm;
+        margin-right:0cm;
+        margin-bottom:3.0pt;
+        margin-left:0cm;
+        text-align:center;
+        line-height:17.0pt;
+        mso-line-height-rule:exactly;
+        mso-pagination:none;
+        font-size:$normalfontsize;
+        font-family:"Times New Roman",serif;
+        mso-fareast-font-family:$headerfont;
+        mso-font-kerning:1.0pt;
+        mso-ansi-language:EN-US;
+        mso-fareast-language:JA;
+        font-weight:bold;
+        mso-bidi-font-weight:normal;
+        mso-no-proof:yes;}
 p.TabletitleCxSpFirst, li.TabletitleCxSpFirst, div.TabletitleCxSpFirst
 	{mso-style-name:"Table titleCxSpFirst";
 	mso-style-unhide:no;
@@ -778,7 +776,7 @@ p.zzHelp, li.zzHelp, div.zzHelp
 	font-size:$normalfontsize;
 	mso-bidi-font-size:10.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:"MS Mincho";
+	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:"Times New Roman";
 	color:green;
 	mso-ansi-language:EN-GB;
@@ -914,7 +912,7 @@ p.zzSTDTitle1, li.zzSTDTitle1, div.zzSTDTitle1
         mso-pagination:none;
         font-size:10.0pt;
         font-family:"Times New Roman",serif;
-        mso-fareast-font-family:"MS Gothic";
+        mso-fareast-font-family:$headerfont;
         mso-font-kerning:1.0pt;
         mso-ansi-language:EN-US;
         mso-fareast-language:JA;
@@ -1316,21 +1314,28 @@ div.Example, td.Example {
 }
 
 p.Example, li.Example, div.Example
-	{
-	mso-style-unhide:no;
-	mso-style-qformat:yes;
-	margin-top:0cm;
-	margin-right:0cm;
-	margin-bottom:6.0pt;
-	margin-left:0cm;
-	text-align:justify;
-	line-height:12.0pt;
-	mso-pagination:widow-orphan;
-	/* tab-stops:20.15pt; */
-	mso-fareast-font-family:Calibri;
-	mso-bidi-font-family:"Times New Roman";
-	mso-ansi-language:EN-GB;
-	mso-fareast-language:EN-US;}
+        {mso-style-name:例１;
+        /* Example 1 */
+        mso-style-unhide:no;
+        mso-style-parent:"";
+        mso-style-next:例１＿段落;
+        margin-top:3.0pt;
+        margin-right:0cm;
+        margin-bottom:0cm;
+        margin-left:29.8pt;
+        text-align:justify;
+        text-justify:inter-ideograph;
+        text-indent:-19.85pt;
+        line-height:15.0pt;
+        mso-line-height-rule:exactly;
+        mso-pagination:none;
+        font-size:$normalfontsize;
+        font-family:"Times New Roman",serif;
+        mso-fareast-font-family:$bodyfont;
+        mso-font-kerning:1.0pt;
+        mso-ansi-language:EN-US;
+        mso-fareast-language:JA;
+        mso-no-proof:yes;}
 span.ExampleChar
 	{mso-style-name:"Example Char";
 	mso-style-unhide:no;
@@ -3753,28 +3758,6 @@ p.afffffffd, li.afffffffd, div.afffffffd
 	font-weight:bold;
 	mso-bidi-font-weight:normal;
 	mso-no-proof:yes;}
-p.afffffffe, li.afffffffe, div.afffffffe
-	{mso-style-name:図題（参考付図）;
-	/*  title (reference figure) */
-	mso-style-unhide:no;
-	mso-style-parent:図題;
-	mso-style-next:段落;
-	margin-top:3.0pt;
-	margin-right:0cm;
-	margin-bottom:0cm;
-	margin-left:0cm;
-	text-align:center;
-	line-height:17.0pt;
-	mso-line-height-rule:exactly;
-	mso-pagination:none;
-	font-size:$normalfontsize;
-	font-family:"Times New Roman",serif;
-	mso-fareast-font-family:$headerfont;
-	mso-font-kerning:1.0pt;
-	mso-ansi-language:EN-US;
-	mso-fareast-language:JA;
-	font-weight:bold;
-	mso-bidi-font-weight:normal;}
 p.affffffff, li.affffffff, div.affffffff
 	{mso-style-name:図題（付図）;
 	/* Subtitle (Appendix) */
@@ -7260,29 +7243,6 @@ p.afffffffffffffffff4, li.afffffffffffffffff4, div.afffffffffffffffff4
 	mso-font-kerning:1.0pt;
 	mso-ansi-language:EN-US;
 	mso-fareast-language:JA;}
-p.afffffffffffffffff5, li.afffffffffffffffff5, div.afffffffffffffffff5
-	{mso-style-name:表題（解説表）;
-	/* Title (explanatory table) */
-	mso-style-unhide:no;
-	mso-style-parent:Title;
-	mso-style-next:単位;
-	margin-top:0cm;
-	margin-right:0cm;
-	margin-bottom:3.0pt;
-	margin-left:0cm;
-	text-align:center;
-	line-height:17.0pt;
-	mso-line-height-rule:exactly;
-	mso-pagination:none;
-	font-size:$normalfontsize;
-	font-family:"Times New Roman",serif;
-	mso-fareast-font-family:$headerfont;
-	mso-font-kerning:1.0pt;
-	mso-ansi-language:EN-US;
-	mso-fareast-language:JA;
-	font-weight:bold;
-	mso-bidi-font-weight:normal;
-	mso-no-proof:yes;}
 p.afffffffffffffffff6, li.afffffffffffffffff6, div.afffffffffffffffff6
 	{mso-style-name:表題（解説付表）;
 	/* Title (explanatory table) */
@@ -8793,29 +8753,6 @@ p.afffffffffffffffffffffd, li.afffffffffffffffffffffd, div.affffffffffffffffffff
 	font-weight:bold;
 	mso-bidi-font-weight:normal;
 	mso-no-proof:yes;}
-p.afffffffffffffffffffffe, li.afffffffffffffffffffffe, div.afffffffffffffffffffffe
-	{mso-style-name:例１;
-	/* Example 1 */
-	mso-style-unhide:no;
-	mso-style-parent:"";
-	mso-style-next:例１＿段落;
-	margin-top:3.0pt;
-	margin-right:0cm;
-	margin-bottom:0cm;
-	margin-left:29.8pt;
-	text-align:justify;
-	text-justify:inter-ideograph;
-	text-indent:-19.85pt;
-	line-height:15.0pt;
-	mso-line-height-rule:exactly;
-	mso-pagination:none;
-	font-size:$normalfontsize;
-	font-family:"Times New Roman",serif;
-	mso-fareast-font-family:$bodyfont;
-	mso-font-kerning:1.0pt;
-	mso-ansi-language:EN-US;
-	mso-fareast-language:JA;
-	mso-no-proof:yes;}
 p.affffffffffffffffffffff, li.affffffffffffffffffffff, div.affffffffffffffffffffff
 	{mso-style-name:例１（番号のみ）;
 	/* Example 1 (number only) */

data/lib/isodoc/jis/html_convert.rb

@@ -11,10 +11,15 @@ module IsoDoc
         @libdir = File.dirname(__FILE__)
       end
 
-      def default_fonts(options)
+      def convert1(docxml, filename, dir)
+        @options.merge!(default_fonts({})) # updated @script
+        super
+      end
+
+      def default_fonts(_options)
         {
-          bodyfont: (options[:script] == "Jpan" ? '"MS Mincho",serif' : '"Times New Roman",serif'),
-          headerfont: (options[:script] == "Jpan" ? '"MS Gothic",sans-serif' : '"Arial",sans-serif'),
+          bodyfont: (@script == "Jpan" ? '"MS Mincho",serif' : '"Times New Roman",serif'),
+          headerfont: (@script == "Jpan" ? '"MS Gothic",sans-serif' : '"Arial",sans-serif'),
           monospacefont: '"Courier New",monospace',
           monospacefontsize: "1.0em",
           footnotefontsize: "0.9em",
@@ -24,7 +29,7 @@ module IsoDoc
       def default_file_locations(_options)
         @libdir = File.dirname(__FILE__)
         {
-          htmlstylesheet: html_doc_path("htmlstyle.scss"),
+          htmlstylesheet: html_doc_path("style-iso.scss"),
           htmlcoverpage: html_doc_path("html_jis_titlepage.html"),
           htmlintropage: html_doc_path("html_jis_intro.html"),
         }

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

@@ -0,0 +1,13 @@
+under_preparation: Under preparation.
+doctype_dict:
+  international-standard: International standard
+  technical-specification: Technical specification
+  technical-report: Technical report
+  publicly-available-specification: Publicly Available Specification
+  international-workshop-agreement: International Workshop Agreement
+  guide: Guide
+  amendment: Amendment
+  technical-corrigendum: Technical Corrigendum
+  directive: Directive
+stage_dict:
+  international-standard: International standard

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

@@ -1,207 +1,4 @@
-term_def_boilerplate: 
-scope: 適用範囲
-symbolsabbrev: 記号及び略語
-abbrev: Abbreviated terms
-symbols: Symbols
-table_of_contents: 目次
-introduction: 序文
-foreword: まえがき
-abstract: Abstract
-acknowledgements: Acknowledgements
-termsdef: 用語及び定義
-termsdefsymbolsabbrev: Terms, definitions, symbols and abbreviated terms
-termsdefsymbols: Terms, definitions and symbols
-termsdefabbrev: Terms, definitions and abbreviated terms
-normref: 引用規格
-bibliography: 参考文献
-preface: Preface
-clause: 箇条
-annex: 附属書
-appendix: Appendix
-no_terms_boilerplate: |
-          <p>この規格には，定義する用語はない。</p>
-internal_terms_boilerplate: |
-        <p>この規格で用いる主な用語及び定義は，次による。</p>
-norm_with_refs_pref: 
-      次に掲げる引用規格は，この規格に引用されることによって，その一部又は全部がこの規格の要 求事項を構成している。これらの引用規格のうち，西暦年を付記してあるものは，記載の年の版を適 用し，その後の改正版(追補を含む。)は適用しない。西暦年の付記がない引用規格は，その最新版(追 補を含む。)を適用する。
-norm_empty_pref: 
-          この規格には，引用規格はない。
-external_terms_boilerplate: |
-          <p>この規格で用いる主な用語及び定義は，% による。</p>
-internal_external_terms_boilerplate: |
-          <p>この規格で用いる主な用語及び定義は，次によるほか，% による。</p>
-term_defined_in: "[term defined in %]"
-binary_and: "%1 and %2"
-multiple_and: "%1, and %2"
-binary_or: "%1 or %2"
-multiple_or: "%1, or %2"
-chain_and: "%1 and %2"
-chain_or: "%1 or %2"
-chain_from: "%1 from %2"
-chain_to: "%1 to %2"
-ordinal_keys: []
-SpelloutRules: spellout-ordinal
-note: 注記
-note_xref: 注記
-termnote: 注釈%
-list: List
-deflist: Definition List
-figure: 図
-diagram: Diagram
-formula: 式
-inequality: Formula
-table: 表
-requirement: 要求事項
-recommendation: 推奨事項
-permission: 許容事項
-box: Box
-index: 索引
-standard_no: 規格番号
-number: 番号
-# Modspec
-recommendationtest: Recommendation test
-requirementtest: Requirement test
-permissiontest: Permission test
-recommendationclass: Recommendations class
-requirementclass: Requirements class
-permissionclass: Permissions class
-abstracttest: Abstract test
-conformanceclass: Conformance class
-key: 記号説明
-example: 例
-example_xref: 例
-where: ここで，
-where_one: ここで，
-wholeoftext: Whole of text
-draft_label: draft
-inform_annex: 参考
-norm_annex: 規定
-modified: modified
-deprecated: DEPRECATED
-source: 出典
-and: and
-all_parts: 規格群
-edition_ordinal: "%Spellout edition"
-edition: edition
-version: version
-toc_figures: List of figures
-toc_tables: List of tables
-toc_recommendations: List of recommendations
-month_january: January
-month_february: February
-month_march: March
-month_april: April
-month_may: May
-month_june: June
-month_july: July
-month_august: August
-month_september: September
-month_october: October
-month_november: November
-month_december: December
-obligation: Obligation
-admonition: {
-  danger: Danger,
-  warning: Warning,
-  caution: Caution,
-  important: Important,
-  safety precautions: Safety Precautions,
-  editorial: Editorial Note
-}
-locality: {
-                      section: Section,
-                      clause: 箇条,
-                      subclause: 細分箇条,
-                      part: 部,
-                      paragraph: 段落,
-                      chapter: Chapter,
-                      page: Page,
-                      table: 表,
-                      annex: 附属書,
-                      figure: 図,
-                      example: 例,
-                      note: 注記,
-                      formula: 式,
-                    }
-grammar_abbrevs:
-  masculine: m
-  feminine: f
-  neuter: n
-  common: common
-  singular: sg
-  dual: dual
-  pl: pl
-  isPreposition: prep
-  isParticiple: part
-  isAdjective: adj
-  isAdverb: adv
-  isNoun: noun
-  isVerb: verb
-relatedterms:
-  deprecates: deprecates
-  supersedes: supersedes
-  narrower: narrower
-  broader: broader
-  equivalent: equivalent
-  compare: compare
-  contrast: contrast
-  see: see
-  seealso: see also
-inflection:
-  Clause:
-    sg: Clause
-    pl: Clauses
-  Annex:
-    sg: Annex
-    pl: Annexes
-  Appendix:
-    sg: Appendix
-    pl: Appendixes
-  Note:
-    sg: Note
-    pl: Notes
-  "Note % to entry":
-    sg: Note % to entry
-    pl: Notes % to entry
-  List:
-    sg: List
-    pl: Lists
-  Figure:
-    sg: Figure
-    pl: Figures
-  Formula:
-    sg: Formula
-    pl: Formulas
-  Table:
-    sg: Table
-    pl: Tables
-  Requirement:
-    sg: Requirement
-    pl: Requirements
-  Recommendation:
-    sg: Recommendation
-    pl: Recommendations
-  Permission:
-    sg: Permission
-    pl: Permissions
-  Example:
-    sg: Example
-    pl: Examples
-  Part:
-    sg: Part
-    pl: Parts
-  Section:
-    sg: Section
-    pl: Sections
-  Paragraph:
-    sg: Paragraph
-    pl: Paragraphs
-  Chapter:
-    sg: Chapter
-    pl: Chapters
-  Page:
-    sg: Page
-    pl: Pages
+under_preparation: 準備中。（掲載時のステージ％）。
 doctype_dict:
   international-standard: 日本産業規格
   technical-specification: 標準仕様書
@@ -212,3 +9,5 @@ doctype_dict:
   amendment: 追補
   technical-corrigendum: Technical Corrigendum
   directive: Directive
+stage_dict:
+  international-standard: 日本産業規格

data/lib/isodoc/jis/i18n.rb

@@ -2,8 +2,8 @@ module IsoDoc
   module JIS
     class I18n < IsoDoc::Iso::I18n
       def load_yaml1(lang, script)
-        y = if lang == "ja"
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-ja.yaml"))
+        y = if lang == "en"
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
             else
               YAML.load_file(File.join(File.dirname(__FILE__), "i18n-ja.yaml"))
             end

data/lib/isodoc/jis/metadata.rb

@@ -47,6 +47,8 @@ module IsoDoc
         set(:docsubtitleamd, @c.encode(tp[:amd].text, :hexadecimal)) if tp[:amd]
         set(:docsubtitlecorrlabel, corr_prefix(tn, lang)) if tn[:corr]
       end
+
+      PART_LABEL = { en: "Part", ja: "その" }.freeze
     end
   end
 end

data/lib/isodoc/jis/word_convert.rb

@@ -5,15 +5,36 @@ require_relative "init"
 
 module IsoDoc
   module JIS
-    class WordConvert < IsoDoc::WordConvert
+    class WordConvert < IsoDoc::Iso::WordConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
+        @libdir = File.dirname(__FILE__)
+      end
+
+      def init_dis(opt); end
+
+      def convert(input_filename, file = nil, debug = false,
+                output_filename = nil)
+        file = File.read(input_filename, encoding: "utf-8") if file.nil?
+        @openmathdelim, @closemathdelim = extract_delims(file)
+        docxml, filename, dir = convert_init(file, input_filename, debug)
+        result = convert1(docxml, filename, dir)
+        return result if debug
+
+        output_filename ||= "#{filename}.#{@suffix}"
+        postprocess(result, output_filename, dir)
+        FileUtils.rm_rf dir
       end
 
-      def default_fonts(options)
-        { bodyfont: (options[:script] == "Jpan" ? '"MS Mincho",serif' : '"Times New Roman",serif'),
-          headerfont: (options[:script] == "Jpan" ? '"MS Gothic",sans-serif' : '"Arial",sans-serif'),
+      def convert1(docxml, filename, dir)
+        @options.merge!(default_fonts({})) # updated @script
+        super
+      end
+
+      def default_fonts(_options)
+        { bodyfont: (@script == "Jpan" ? '"MS Mincho",serif' : '"Times New Roman",serif'),
+          headerfont: (@script == "Jpan" ? '"MS Gothic",sans-serif' : '"Arial",sans-serif'),
           monospacefont: '"Courier New",monospace',
           normalfontsize: "10.0pt",
           monospacefontsize: "9.0pt",
@@ -22,6 +43,7 @@ module IsoDoc
       end
 
       def default_file_locations(_options)
+        @libdir = File.dirname(__FILE__)
         { htmlstylesheet: html_doc_path("htmlstyle.scss"),
           htmlcoverpage: html_doc_path("html_jis_titlepage.html"),
           htmlintropage: html_doc_path("html_jis_intro.html"),
@@ -135,17 +157,38 @@ module IsoDoc
         end
       end
 
+      def annex_name(_annex, name, div)
+        preceding_floating_titles(name, div)
+        return if name.nil?
+
+        div.h1 class: "Annex" do |t|
+          name.children.each { |c2| parse(c2, t) }
+          clause_parse_subtitle(name, t)
+        end
+      end
+
       def new_styles(docxml)
         super
         biblio_paras(docxml)
+        heading_to_para(docxml)
       end
 
       def biblio_paras(docxml)
-        docxml.xpath("//div[@class = 'normref']//p[not(@class)]").each do |p|
+        docxml.xpath("//div[@class = 'normref']//" \
+                     "p[not(@class) or @class = 'MsoNormal']").each do |p|
           p["class"] = "NormRefText"
         end
       end
 
+      def heading_to_para(docxml)
+        docxml.xpath("//h1[@class = 'ForewordTitle']").each do |p|
+          p.name = "p"
+          p.xpath("../div/p[not(@class) or @class = 'MsoNormal']").each do |n|
+            n["class"] = "ForewordText"
+          end
+        end
+      end
+
       include BaseConvert
       include Init
     end

data/lib/metanorma/jis/converter.rb

@@ -12,6 +12,7 @@ module Metanorma
 
       def init_i18n(node)
         node.attr("language") or node.set_attr("language", "ja")
+        node.attr("language") == "jp" and node.set_attr("language", "ja")
         super
       end
 
@@ -37,6 +38,7 @@ module Metanorma
 
       def pdf_converter(node)
         return if node.attr("no-pdf")
+
         return
 
         if node.nil?

data/lib/metanorma/jis/front.rb

@@ -46,6 +46,17 @@ module Metanorma
           end
         end
       end
+
+      def title(node, xml)
+        %w(en ja).each do |lang|
+          at = { language: lang, format: "text/plain" }
+          title_full(node, xml, lang, at)
+          title_intro(node, xml, lang, at)
+          title_main(node, xml, lang, at)
+          title_part(node, xml, lang, at)
+          title_amd(node, xml, lang, at) if @amd
+        end
+      end
     end
   end
 end

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.0.1".freeze
+    VERSION = "0.0.2".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -254,6 +254,7 @@ files:
 - lib/isodoc/jis/html/wordstyle.css
 - lib/isodoc/jis/html/wordstyle.scss
 - lib/isodoc/jis/html_convert.rb
+- lib/isodoc/jis/i18n-en.yaml
 - lib/isodoc/jis/i18n-ja.yaml
 - lib/isodoc/jis/i18n.rb
 - lib/isodoc/jis/init.rb