metanorma-jis 0.0.4 → 0.0.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (21) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/jis/base_convert.rb +2 -0
  3. data/lib/isodoc/jis/html/header.html +70 -33
  4. data/lib/isodoc/jis/html/html_jis_intro.html +0 -1
  5. data/lib/isodoc/jis/html/isodoc.css +1 -1
  6. data/lib/isodoc/jis/html/isodoc.scss +1 -1
  7. data/lib/isodoc/jis/html/word_jis_intro.html +0 -7
  8. data/lib/isodoc/jis/html/wordstyle.css +11 -14
  9. data/lib/isodoc/jis/html/wordstyle.scss +11 -14
  10. data/lib/isodoc/jis/html_convert.rb +1 -1
  11. data/lib/isodoc/jis/jis.international-standard.xsl +1020 -213
  12. data/lib/isodoc/jis/presentation_xml_convert.rb +22 -0
  13. data/lib/isodoc/jis/word_convert.rb +12 -22
  14. data/lib/metanorma/jis/cleanup.rb +23 -0
  15. data/lib/metanorma/jis/converter.rb +5 -0
  16. data/lib/metanorma/jis/isodoc.rng +16 -7
  17. data/lib/metanorma/jis/isostandard.rng +5 -8
  18. data/lib/metanorma/jis/jis.rng +6 -9
  19. data/lib/metanorma/jis/version.rb +1 -1
  20. data/metanorma-jis.gemspec +2 -0
  21. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6bf51e10fbc568a6c14c9e8b4192e16f90b5dd093aff54cdc0fbdb9ef11566bb
4
- data.tar.gz: 060bddc60dd35141b7143e36a1cd66bc4ef89b9db9fc0b5d385ea9171d3baa8b
3
+ metadata.gz: 2deb627472d547ff5755c88eccb3ed147fc90a448c9e5bd6119af4c581832070
4
+ data.tar.gz: a7fb6ba59aca19da4ef1ad5cc0446df04594a59f0d52d98c737a646a99179768
5
5
  SHA512:
6
- metadata.gz: fa5e35fcdff0101c14bd5f3d713560aa8e5236e055288e328b4024268bc9e62b1fbd399d75a388b337a7779be50939fc96438cedf691106f6ef77aca56921dd6
7
- data.tar.gz: 55665ed144401a91526a924d27a8b2134b818581627663e371fec91fe1ccf60afb384838364dfd3986798f093e03818cd9e0e9983f6371227d9b427f9b1aab5d
6
+ metadata.gz: 1d582ff1fd8d7bd736c7ffe34bf755c41d4e8a7a653712d1459f46c38c29a9075cb2678aed3f70e65ac799c95d7949d7c12f33eb1f23f72120a10ff26f182eca
7
+ data.tar.gz: aa7135025671160bee74f3fbc51dc2edfd79d6b11bafa05fc5dae20924a918a4389871e8a0f6c8662caf7a9015466bfbd6601008b664d78520eac6ce6d5a705e
data/lib/isodoc/jis/base_convert.rb CHANGED
@@ -105,6 +105,8 @@ module IsoDoc
105
105
  def middle(isoxml, out)
106
106
  middle_title(isoxml, out)
107
107
  middle_admonitions(isoxml, out)
108
+ i = isoxml.at(ns("//sections/introduction")) and
109
+ introduction i, out
108
110
  scope isoxml, out, 0
109
111
  norm_ref isoxml, out, 0
110
112
  clause_etc isoxml, out, 0
data/lib/isodoc/jis/html/header.html CHANGED
@@ -279,48 +279,85 @@ lang=EN-US style='mso-ansi-language:EN-US'><o:p></o:p></span></p>
279
279
 
280
280
  </div>
281
281
 
282
- <div style='mso-element:footer' id=f3><w:Sdt SdtDocPart="t"
283
- DocPartType="Page Numbers (Bottom of Page)" DocPartUnique="t" ID="-152760932">
284
- <div style='mso-element:frame;mso-element-wrap:none;mso-element-anchor-vertical:
285
- paragraph;mso-element-anchor-horizontal:margin;mso-element-left:outside;
286
- mso-element-top:.05pt;mso-height-rule:exactly'>
287
- <table cellspacing=0 cellpadding=0 hspace=0 vspace=0 align=right>
288
- <tr>
289
- <td valign=top align=left style='padding-top:0cm;padding-right:0cm;
290
- padding-bottom:0cm;padding-left:0cm'>
291
- <p class=MsoFooter style='mso-element:frame;mso-element-wrap:none;
292
- mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal:margin;
293
- mso-element-left:outside;mso-element-top:.05pt;mso-height-rule:exactly'><!--[if supportFields]><span
294
- class=MsoPageNumber><span lang=EN-US><span style='mso-element:field-begin'></span><span
295
- style='mso-spacerun:yes'> </span>PAGE <span style='mso-element:field-separator'></span></span></span><![endif]--><span
296
- class=MsoPageNumber><span lang=EN-US>1</span></span><!--[if supportFields]><span
297
- class=MsoPageNumber><span lang=EN-US><span style='mso-element:field-end'></span></span></span><![endif]--><span
298
- class=MsoPageNumber><span lang=EN-US><o:p></o:p><w:sdtPr></w:sdtPr></span></span></p>
299
- </td>
300
- </tr>
301
- </table>
302
- </div>
303
- <![if !supportTextWrap]><br clear=ALL>
304
- <![endif]></w:Sdt>
282
+ <div style='mso-element:header' id=h3>
283
+
284
+ <p class=MsoHeader align=right style='text-align:right'><!--[if supportFields]><span class=MsoPageNumber><span
285
+ lang=EN-HK style='font-family:"Arial",sans-serif;mso-bidi-font-family:"Times New Roman"'><span
286
+ style='mso-element:field-begin'></span><span
287
+ style='mso-spacerun:yes'> </span>PAGE <span style='mso-element:field-separator'></span></span></span><![endif]--><span
288
+ class=MsoPageNumber><span lang=EN-HK style='font-family:"Arial",sans-serif;
289
+ mso-bidi-font-family:"Times New Roman"'><span style='mso-no-proof:yes'>2</span></span></span><!--[if supportFields]><span
290
+ class=MsoPageNumber><span lang=EN-HK style='font-family:"Arial",sans-serif;
291
+ mso-bidi-font-family:"Times New Roman"'><span style='mso-element:field-end'></span></span></span><![endif]--></p>
292
+
293
+ <p class=MsoHeader align=right style='text-align:right'><span lang=EN-HK>{{ docnumber }}</span><span lang=ZH-TW
294
+ style='font-family:"MS Gothic";mso-ascii-font-family:Arial;mso-hansi-font-family:
295
+ Arial'>　</span><span lang=ZH-TW
296
+ style='font-family:"MS Gothic";mso-ascii-font-family:Arial;mso-hansi-font-family:Arial;mso-ansi-language:EN-US'>{{ labels["commentary"]}}</span><span
297
+ lang=EN-US style='mso-ansi-language:EN-US'><o:p></o:p></span></p>
298
+
299
+ </div>
300
+
301
+
302
+ <div style='mso-element:footer' id=ef3>
303
+
304
+ <p class=MsoFooter><span lang=JA style='font-family:"MS Gothic";mso-ascii-font-family:"Times New Roman";mso-hansi-font-family:"Times New Roman";font-weight:normal'>{{ labels["commentary_page"] }}</span><span
305
+ lang=JA style='font-family:"MS Mincho";mso-ascii-font-family:"Times New Roman";
306
+ mso-hansi-font-family:"Times New Roman"'>　</span><!--[if supportFields]><span
307
+ lang=EN-US style='mso-fareast-font-family:ヒラギノ角ゴ5;font-weight:normal'><span
308
+ style='mso-element:field-begin'></span> = <span style='mso-element:field-begin'></span><span
309
+ style='mso-spacerun:yes'> </span>PAGE \* Arabic \* MERGEFORMAT <span
310
+ style='mso-element:field-separator'></span><span style='mso-element:field-end'></span> - <span style='mso-element:field-begin'></span><span
311
+ style='mso-spacerun:yes'> </span>PAGEREF PRECOMMENTARYPAGEREF  <span style='mso-spacerun:yes'> 
312
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span><span
313
+ style='mso-element:field-end'></span></span><span
314
+ lang=EN-US style='mso-fareast-font-family:ヒラギノ角ゴ5;font-weight:normal'><span
315
+ style='mso-element:field-end'></span></span><![endif]--></p>
316
+
317
+
318
+ </div>
319
+
320
+
321
+
322
+ <div style='mso-element:footer' id=f3>
323
+
324
+ <p class=MsoFooter><span lang=JA style='font-family:"MS Gothic";mso-ascii-font-family:"Times New Roman";mso-hansi-font-family:"Times New Roman";font-weight:normal'>{{ labels["commentary_page"] }}</span><span
325
+ lang=JA style='font-family:"MS Mincho";mso-ascii-font-family:"Times New Roman";
326
+ mso-hansi-font-family:"Times New Roman"'>　</span><!--[if supportFields]><span
327
+ lang=EN-US style='mso-fareast-font-family:ヒラギノ角ゴ5;font-weight:normal'><span
328
+ style='mso-element:field-begin'></span> = <span style='mso-element:field-begin'></span><span
329
+ style='mso-spacerun:yes'> </span>PAGE \* Arabic \* MERGEFORMAT <span
330
+ style='mso-element:field-separator'></span><span style='mso-element:field-end'></span> - <span style='mso-element:field-begin'></span><span
331
+ style='mso-spacerun:yes'> </span>PAGEREF PRECOMMENTARYPAGEREF  <span style='mso-spacerun:yes'> 
332
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span><span
333
+ style='mso-element:field-end'></span></span><span
334
+ lang=EN-US style='mso-fareast-font-family:ヒラギノ角ゴ5;font-weight:normal'><span
335
+ style='mso-element:field-end'></span></span><![endif]--></p>
305
336
 
306
- <p class=Chapter style='margin-right:18.0pt;text-indent:18.0pt'><span
307
- lang=JA style='font-family:"MS Gothic";mso-ascii-font-family:"Times New Roman";
308
- mso-hansi-font-family:"Times New Roman"'>{{labels["commentary_page"}}　</span><span lang=EN-US
309
- style='mso-bidi-font-weight:bold'>2</span></p>
310
- <p class=MsoFooter align=center>{{ labels["permission_footer"] }}</p>
311
337
 
312
338
  </div>
313
339
 
314
340
  <div style='mso-element:footer' id=ff3>
315
341
 
316
- <p class=Chapter><span style='mso-spacerun:yes'> </span><span lang=JA
317
- style='font-family:"MS Gothic";mso-ascii-font-family:"Times New Roman";
318
- mso-hansi-font-family:"Times New Roman"'>{{labels["commentary_page"}}　</span><span lang=EN-US
319
- style='mso-bidi-font-weight:bold'>1</span></p>
320
- <p class=MsoFooter align=center>{{ labels["permission_footer"] }}</p>
342
+ <p class=MsoFooter><span lang=JA style='font-family:"MS Gothic";mso-ascii-font-family:"Times New Roman";mso-hansi-font-family:"Times New Roman";font-weight:normal'>{{ labels["commentary_page"] }}</span><span
343
+ lang=JA style='font-family:"MS Mincho";mso-ascii-font-family:"Times New Roman";
344
+ mso-hansi-font-family:"Times New Roman"'>　</span><!--[if supportFields]><span
345
+ lang=EN-US style='mso-fareast-font-family:ヒラギノ角ゴ5;font-weight:normal'><span
346
+ style='mso-element:field-begin'></span> = <span style='mso-element:field-begin'></span><span
347
+ style='mso-spacerun:yes'> </span>PAGE \* Arabic \* MERGEFORMAT <span
348
+ style='mso-element:field-separator'></span><span style='mso-element:field-end'></span> - <span style='mso-element:field-begin'></span><span
349
+ style='mso-spacerun:yes'> </span>PAGEREF PRECOMMENTARYPAGEREF  <span style='mso-spacerun:yes'> 
350
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span><span
351
+ style='mso-element:field-end'></span></span><span
352
+ lang=EN-US style='mso-fareast-font-family:ヒラギノ角ゴ5;font-weight:normal'><span
353
+ style='mso-element:field-end'></span></span><![endif]--></p>
354
+
355
+
321
356
 
322
357
  </div>
323
358
 
359
+
360
+
324
361
  </body>
325
362
 
326
363
  </html>
data/lib/isodoc/jis/html/html_jis_intro.html CHANGED
@@ -2,7 +2,6 @@
2
2
 
3
3
  <nav>
4
4
 
5
- <h1 id="content">{{ labels["table_of_contents"] }}</h1>
6
5
  <div id="toc"></div>
7
6
 
8
7
  </nav>
data/lib/isodoc/jis/html/isodoc.css CHANGED
@@ -935,7 +935,7 @@ p.Chapter, li.Chapter, div.Chapter {
935
935
  mso-no-proof: yes; }
936
936
 
937
937
  p.zzSTDTitle2, li.zzSTDTitle2, div.zzSTDTitle2 {
938
- mso-style-name: 章;
938
+ mso-style-name: 規格名称（英語）;
939
939
  /* Standard name (English) */
940
940
  mso-style-unhide: no;
941
941
  mso-style-parent: "";
data/lib/isodoc/jis/html/isodoc.scss CHANGED
@@ -892,7 +892,7 @@ p.Chapter, li.Chapter, div.Chapter
892
892
  mso-bidi-font-weight:normal;
893
893
  mso-no-proof:yes;}
894
894
  p.zzSTDTitle2, li.zzSTDTitle2, div.zzSTDTitle2
895
- {mso-style-name:章;
895
+ {mso-style-name:規格名称（英語）;
896
896
  /* Standard name (English) */
897
897
  mso-style-unhide:no;
898
898
  mso-style-parent:"";
data/lib/isodoc/jis/html/word_jis_intro.html CHANGED
@@ -6,10 +6,3 @@ margin-left:5.1pt;margin-right:5.1pt'>
6
6
  </div>
7
7
 
8
8
 
9
- <p class="MsoNormal">
10
- <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
11
- </p>
12
-
13
- <p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">{{ labels["table_of_contents"] }}</span></p>
14
-
15
- WORDTOC
data/lib/isodoc/jis/html/wordstyle.css CHANGED
@@ -2393,7 +2393,7 @@ div.WordSection2 {
2393
2393
  layout-grid: 17.0pt 0pt;
2394
2394
  mso-layout-grid-char-alt: 56; }
2395
2395
 
2396
- div.WordSection3 {
2396
+ div.WordSection3, div.colophon {
2397
2397
  page: WordSection3; }
2398
2398
 
2399
2399
  @page WordSection4 {
@@ -2401,11 +2401,10 @@ div.WordSection3 {
2401
2401
  margin: 82.2pt 62.35pt 79.4pt 62.35pt;
2402
2402
  mso-header-margin: 45.35pt;
2403
2403
  mso-footer-margin: 2.0cm;
2404
- mso-page-numbers: 1;
2405
2404
  mso-title-page: yes;
2406
2405
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh3;
2407
- mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
2408
- mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef2;
2406
+ mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h3;
2407
+ mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef3;
2409
2408
  mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
2410
2409
  mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh2;
2411
2410
  mso-first-footer: url("file:///C:/Doc/FILENAME_files/header.html") ff3;
@@ -2418,12 +2417,11 @@ div.WordSection3 {
2418
2417
  margin: 82.2pt 62.35pt 79.4pt 62.35pt;
2419
2418
  mso-header-margin: 45.35pt;
2420
2419
  mso-footer-margin: 2.0cm;
2421
- mso-page-numbers: 1;
2422
2420
  mso-title-page: yes;
2423
- mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh4;
2424
- mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h4;
2425
- mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef4;
2426
- mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f4;
2421
+ mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh3;
2422
+ mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h3;
2423
+ mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef3;
2424
+ mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
2427
2425
  mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh2;
2428
2426
  mso-first-footer: url("file:///C:/Doc/FILENAME_files/header.html") ff3;
2429
2427
  mso-paper-source: 0;
@@ -2435,12 +2433,11 @@ div.WordSection3 {
2435
2433
  margin: 82.2pt 62.35pt 79.4pt 62.35pt;
2436
2434
  mso-header-margin: 45.35pt;
2437
2435
  mso-footer-margin: 2.0cm;
2438
- mso-page-numbers: 1;
2439
2436
  mso-title-page: yes;
2440
- mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh4;
2441
- mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h4;
2442
- mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef4;
2443
- mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f4;
2437
+ mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh3;
2438
+ mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h3;
2439
+ mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef3;
2440
+ mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
2444
2441
  mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh2;
2445
2442
  mso-first-footer: url("file:///C:/Doc/FILENAME_files/header.html") ff3;
2446
2443
  mso-paper-source: 0;
data/lib/isodoc/jis/html/wordstyle.scss CHANGED
@@ -2405,18 +2405,17 @@ div.WordSection2
2405
2405
  mso-paper-source:0;
2406
2406
  layout-grid:17.0pt 0pt;
2407
2407
  mso-layout-grid-char-alt:56;}
2408
- div.WordSection3
2408
+ div.WordSection3, div.colophon
2409
2409
  {page:WordSection3;}
2410
2410
  @page WordSection4
2411
2411
  {size:21.0cm 842.0pt;
2412
2412
  margin:82.2pt 62.35pt 79.4pt 62.35pt;
2413
2413
  mso-header-margin:45.35pt;
2414
2414
  mso-footer-margin:2.0cm;
2415
- mso-page-numbers:1;
2416
2415
  mso-title-page:yes;
2417
2416
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh3;
2418
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
2419
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
2417
+ mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h3;
2418
+ mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
2420
2419
  mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
2421
2420
  mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2;
2422
2421
  mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff3;
@@ -2428,12 +2427,11 @@ div.WordSection3
2428
2427
  margin:82.2pt 62.35pt 79.4pt 62.35pt;
2429
2428
  mso-header-margin:45.35pt;
2430
2429
  mso-footer-margin:2.0cm;
2431
- mso-page-numbers:1;
2432
2430
  mso-title-page:yes;
2433
- mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh4;
2434
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h4;
2435
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef4;
2436
- mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f4;
2431
+ mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh3;
2432
+ mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h3;
2433
+ mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
2434
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
2437
2435
  mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2;
2438
2436
  mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff3;
2439
2437
  mso-paper-source:0;
@@ -2444,12 +2442,11 @@ div.WordSection3
2444
2442
  margin:82.2pt 62.35pt 79.4pt 62.35pt;
2445
2443
  mso-header-margin:45.35pt;
2446
2444
  mso-footer-margin:2.0cm;
2447
- mso-page-numbers:1;
2448
2445
  mso-title-page:yes;
2449
- mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh4;
2450
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h4;
2451
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef4;
2452
- mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f4;
2446
+ mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh3;
2447
+ mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h3;
2448
+ mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
2449
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
2453
2450
  mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2;
2454
2451
  mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff3;
2455
2452
  mso-paper-source:0;
data/lib/isodoc/jis/html_convert.rb CHANGED
@@ -35,7 +35,7 @@ module IsoDoc
35
35
  }
36
36
  end
37
37
 
38
- def make_table_footnote_target(out, fnid, fnref)
38
+ def make_table_footnote_target(out, fnid, fnref)
39
39
  attrs = { id: fnid, class: "TableFootnoteRef" }
40
40
  out.span do |s|
41
41
  s << @i18n.table_footnote