metanorma-jis 1.0.2 → 1.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/isodoc/jis/html/isodoc.css +6 -1
- data/lib/isodoc/jis/html/isodoc.scss +5 -1
- data/lib/isodoc/jis/html/style-human.css +25 -13
- data/lib/isodoc/jis/html/style-human.scss +18 -10
- data/lib/isodoc/jis/html/style-iso.css +19 -11
- data/lib/isodoc/jis/html/style-iso.scss +12 -8
- data/lib/isodoc/jis/jis.international-standard.xsl +500 -101
- data/lib/isodoc/jis/metadata.rb +12 -13
- data/lib/isodoc/jis/presentation_section.rb +2 -2
- data/lib/isodoc/jis/presentation_table.rb +3 -2
- data/lib/isodoc/jis/presentation_xml_convert.rb +22 -12
- data/lib/isodoc/jis/word_convert.rb +2 -2
- data/lib/isodoc/jis/{figure.rb → word_figure.rb} +8 -7
- data/lib/metanorma/jis/basicdoc.rng +5 -1
- data/lib/metanorma/jis/biblio.rng +14 -4
- data/lib/metanorma/jis/cleanup.rb +8 -4
- data/lib/metanorma/jis/converter.rb +1 -7
- data/lib/metanorma/jis/front.rb +10 -6
- data/lib/metanorma/jis/isodoc.rng +53 -17
- data/lib/metanorma/jis/validate.rb +1 -1
- data/lib/metanorma/jis/version.rb +1 -1
- data/lib/metanorma-jis.rb +2 -0
- data/lib/relaton/render-jis/config.yml +2 -2
- data/metanorma-jis.gemspec +1 -1
- metadata +6 -6
- /data/lib/isodoc/jis/{table.rb → word_table.rb} +0 -0
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bd23629d8f1ef1a2c1e085333f8c23e79428cf6632dcf03532f198fcffbb60b5
|
|
4
|
+
data.tar.gz: c964a848b37d16c75e2885c34d5f764c1814e7613425eff785d3e0e322e6c017
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 510b2ed4ce3c5837a6497bc76cf886c947ee54281493ec258c14893b2748c3993545474a5a0dce6070c51a6d40949d15d3df55f07e5dfaf045dd516f00180b01
|
|
7
|
+
data.tar.gz: ca343cde45e15b8774eab8797fcd12039e7fc9ad8c68f033175ff1536114990b4303f6284ba7b24da4f667fea0b001626b436a39aa51e3b6c1763356f35540e8
|
|
@@ -1183,7 +1183,7 @@ div.figdl p, table.figdl p {
|
|
|
1183
1183
|
font-size: {{smallerfontsize}};
|
|
1184
1184
|
}
|
|
1185
1185
|
|
|
1186
|
-
table.formula_dl {
|
|
1186
|
+
div.formula_dl, p.formula_dl, table.formula_dl {
|
|
1187
1187
|
margin-left: 20.15pt;
|
|
1188
1188
|
}
|
|
1189
1189
|
|
|
@@ -1221,6 +1221,11 @@ table.MsoISOTable td, table.MsoISOTableBig td {
|
|
|
1221
1221
|
padding: 0cm 2.85pt 0cm 2.85pt;
|
|
1222
1222
|
}
|
|
1223
1223
|
|
|
1224
|
+
table.MsoNormalTable th, table.MsoNormalTable td {
|
|
1225
|
+
border: none;
|
|
1226
|
+
mso-border-alt: none;
|
|
1227
|
+
}
|
|
1228
|
+
|
|
1224
1229
|
table.MsoISOTable p, table.MsoISOTableBig p {
|
|
1225
1230
|
font-size: {{smallerfontsize}};
|
|
1226
1231
|
}
|
|
@@ -1070,7 +1070,7 @@ div.figdl p, table.figdl p {
|
|
|
1070
1070
|
font-size: $smallerfontsize;
|
|
1071
1071
|
}
|
|
1072
1072
|
|
|
1073
|
-
table.formula_dl {
|
|
1073
|
+
div.formula_dl, p.formula_dl, table.formula_dl {
|
|
1074
1074
|
margin-left:20.15pt;
|
|
1075
1075
|
}
|
|
1076
1076
|
|
|
@@ -1102,6 +1102,10 @@ table.MsoISOTable td, table.MsoISOTableBig td
|
|
|
1102
1102
|
{border:solid windowtext 1pt;
|
|
1103
1103
|
mso-border-alt:solid windowtext 1pt;
|
|
1104
1104
|
padding:0cm 2.85pt 0cm 2.85pt;}
|
|
1105
|
+
table.MsoNormalTable th, table.MsoNormalTable td {
|
|
1106
|
+
border: none;
|
|
1107
|
+
mso-border-alt: none;
|
|
1108
|
+
}
|
|
1105
1109
|
table.MsoISOTable p, table.MsoISOTableBig p
|
|
1106
1110
|
{font-size:$smallerfontsize; }
|
|
1107
1111
|
table.MsoTableGrid, table.MsoTableGridBig
|
|
@@ -589,6 +589,11 @@ span.title {
|
|
|
589
589
|
font-size: 0.9em;
|
|
590
590
|
}
|
|
591
591
|
|
|
592
|
+
div.colophon {
|
|
593
|
+
padding: 10px;
|
|
594
|
+
border: 2px solid black;
|
|
595
|
+
}
|
|
596
|
+
|
|
592
597
|
/* TYPOGRAPHY */
|
|
593
598
|
h1, .h1 {
|
|
594
599
|
font-weight: 900;
|
|
@@ -865,14 +870,14 @@ nav {
|
|
|
865
870
|
width: 100%;
|
|
866
871
|
}
|
|
867
872
|
}
|
|
868
|
-
|
|
873
|
+
figure .SourceTitle,
|
|
869
874
|
pre .SourceTitle,
|
|
870
875
|
.pseudocode .SourceTitle {
|
|
871
876
|
font-weight: 700;
|
|
872
877
|
font-size: 1em;
|
|
873
878
|
text-align: center;
|
|
874
879
|
}
|
|
875
|
-
|
|
880
|
+
figure,
|
|
876
881
|
pre,
|
|
877
882
|
.pseudocode {
|
|
878
883
|
background-color: #f7f7f7;
|
|
@@ -884,26 +889,26 @@ pre,
|
|
|
884
889
|
font-size: {{normalfontsize}};
|
|
885
890
|
}
|
|
886
891
|
|
|
887
|
-
|
|
892
|
+
figure figcaption {
|
|
888
893
|
font-weight: 700;
|
|
889
894
|
font-size: 1em;
|
|
890
895
|
text-align: center;
|
|
891
896
|
}
|
|
892
|
-
|
|
897
|
+
figure > img, figure > svg {
|
|
893
898
|
margin-left: auto;
|
|
894
899
|
margin-right: auto;
|
|
895
900
|
display: block;
|
|
896
901
|
max-width: 100%;
|
|
897
902
|
height: auto;
|
|
898
903
|
}
|
|
899
|
-
|
|
904
|
+
figure {
|
|
900
905
|
line-height: 1.6em;
|
|
901
906
|
padding: 1.5em;
|
|
902
907
|
margin: 2em 0 1em 0;
|
|
903
908
|
overflow: auto;
|
|
904
909
|
}
|
|
905
910
|
|
|
906
|
-
table
|
|
911
|
+
table figure {
|
|
907
912
|
padding: 0;
|
|
908
913
|
margin: 0;
|
|
909
914
|
}
|
|
@@ -1125,22 +1130,26 @@ ol {
|
|
|
1125
1130
|
3.5 Bibliograhy
|
|
1126
1131
|
*/
|
|
1127
1132
|
p.Biblio,
|
|
1128
|
-
p.NormRef {
|
|
1133
|
+
p.NormRef, div.Biblio, div.NormRef {
|
|
1129
1134
|
margin-top: 1em;
|
|
1130
1135
|
margin-left: 2em;
|
|
1131
1136
|
}
|
|
1132
1137
|
|
|
1138
|
+
.Biblio.note, .Biblio.Note, .NormRef.note, .NormRef.Note {
|
|
1139
|
+
margin-left: 3.5em;
|
|
1140
|
+
}
|
|
1141
|
+
|
|
1133
1142
|
/*
|
|
1134
1143
|
3.6 Source Code + figures
|
|
1135
1144
|
*/
|
|
1136
|
-
|
|
1145
|
+
figure .SourceTitle,
|
|
1137
1146
|
pre .SourceTitle,
|
|
1138
1147
|
.pseudocode .SourceTitle {
|
|
1139
1148
|
font-weight: 700;
|
|
1140
1149
|
font-size: 1em;
|
|
1141
1150
|
text-align: center;
|
|
1142
1151
|
}
|
|
1143
|
-
|
|
1152
|
+
figure,
|
|
1144
1153
|
pre,
|
|
1145
1154
|
.pseudocode {
|
|
1146
1155
|
background-color: #f7f7f7;
|
|
@@ -1176,8 +1185,7 @@ pre {
|
|
|
1176
1185
|
text-align: left;
|
|
1177
1186
|
}
|
|
1178
1187
|
|
|
1179
|
-
|
|
1180
|
-
.FigureTitle,
|
|
1188
|
+
figcaption,
|
|
1181
1189
|
.SourceTitle,
|
|
1182
1190
|
.AdmonitionTitle,
|
|
1183
1191
|
.RecommendationTitle {
|
|
@@ -1269,6 +1277,10 @@ table th, table td {
|
|
|
1269
1277
|
table td.header {
|
|
1270
1278
|
font-weight: 400;
|
|
1271
1279
|
}
|
|
1280
|
+
table table.plain, table table.plain th, table table.plain td {
|
|
1281
|
+
border: none !important;
|
|
1282
|
+
font-size: 0.95em;
|
|
1283
|
+
}
|
|
1272
1284
|
|
|
1273
1285
|
td > p:first-child, th > p:first-child {
|
|
1274
1286
|
margin-top: 0em;
|
|
@@ -1287,7 +1299,7 @@ table.rouge-line-table td, table.rouge-line-table th {
|
|
|
1287
1299
|
padding: 0em !important;
|
|
1288
1300
|
}
|
|
1289
1301
|
|
|
1290
|
-
|
|
1302
|
+
table > caption {
|
|
1291
1303
|
text-align: center;
|
|
1292
1304
|
margin-top: 2.5em;
|
|
1293
1305
|
font-weight: 800;
|
|
@@ -1408,7 +1420,7 @@ ol > li > p::before {
|
|
|
1408
1420
|
font-size: {{smallerfontsize}};
|
|
1409
1421
|
}
|
|
1410
1422
|
|
|
1411
|
-
|
|
1423
|
+
.formula_dl {
|
|
1412
1424
|
background-color: #f7f7f7;
|
|
1413
1425
|
margin-left: 20%;
|
|
1414
1426
|
margin-right: 20%;
|
|
@@ -138,6 +138,11 @@ span.title {
|
|
|
138
138
|
font-size: 0.9em;
|
|
139
139
|
}
|
|
140
140
|
|
|
141
|
+
div.colophon {
|
|
142
|
+
padding: 10px;
|
|
143
|
+
border:2px solid black;
|
|
144
|
+
}
|
|
145
|
+
|
|
141
146
|
/* TYPOGRAPHY */
|
|
142
147
|
|
|
143
148
|
h1, .h1 {
|
|
@@ -330,18 +335,18 @@ nav {
|
|
|
330
335
|
}
|
|
331
336
|
}
|
|
332
337
|
|
|
333
|
-
|
|
338
|
+
figure,
|
|
334
339
|
pre,
|
|
335
340
|
.pseudocode {
|
|
336
341
|
@include pseudocodeBlock(#f7f7f7);
|
|
337
342
|
font-size: $normalfontsize;
|
|
338
343
|
}
|
|
339
344
|
|
|
340
|
-
|
|
345
|
+
figure {
|
|
341
346
|
@include figureBlock();
|
|
342
347
|
}
|
|
343
348
|
|
|
344
|
-
table
|
|
349
|
+
table figure {
|
|
345
350
|
padding: 0;
|
|
346
351
|
margin: 0;
|
|
347
352
|
}
|
|
@@ -491,16 +496,20 @@ ol {
|
|
|
491
496
|
*/
|
|
492
497
|
|
|
493
498
|
p.Biblio,
|
|
494
|
-
p.NormRef {
|
|
499
|
+
p.NormRef, div.Biblio, div.NormRef {
|
|
495
500
|
margin-top: 1em;
|
|
496
501
|
margin-left: 2em;
|
|
497
502
|
}
|
|
498
503
|
|
|
504
|
+
.Biblio.note, .Biblio.Note, .NormRef.note, .NormRef.Note {
|
|
505
|
+
margin-left: 3.5em;
|
|
506
|
+
}
|
|
507
|
+
|
|
499
508
|
/*
|
|
500
509
|
3.6 Source Code + figures
|
|
501
510
|
*/
|
|
502
511
|
|
|
503
|
-
|
|
512
|
+
figure,
|
|
504
513
|
pre,
|
|
505
514
|
.pseudocode {
|
|
506
515
|
@include pseudocodeBlock(#f7f7f7);
|
|
@@ -515,15 +524,14 @@ pre {
|
|
|
515
524
|
@include recommendationBlock();
|
|
516
525
|
@include listBlock();
|
|
517
526
|
|
|
518
|
-
|
|
519
|
-
.FigureTitle,
|
|
527
|
+
figcaption,
|
|
520
528
|
.SourceTitle,
|
|
521
529
|
.AdmonitionTitle,
|
|
522
530
|
.RecommendationTitle {
|
|
523
531
|
@include blockTitle()
|
|
524
532
|
}
|
|
525
533
|
|
|
526
|
-
|
|
534
|
+
figure dl {
|
|
527
535
|
}
|
|
528
536
|
|
|
529
537
|
/*
|
|
@@ -601,7 +609,7 @@ table.rouge-line-table td, table.rouge-line-table th {
|
|
|
601
609
|
padding: 0em !important;
|
|
602
610
|
}
|
|
603
611
|
|
|
604
|
-
|
|
612
|
+
table > caption {
|
|
605
613
|
text-align: center;
|
|
606
614
|
margin-top: 2.5em;
|
|
607
615
|
font-weight: 800;
|
|
@@ -719,7 +727,7 @@ ol>li>p::before {
|
|
|
719
727
|
font-size: $smallerfontsize;
|
|
720
728
|
}
|
|
721
729
|
|
|
722
|
-
|
|
730
|
+
.formula_dl {
|
|
723
731
|
background-color: #f7f7f7;
|
|
724
732
|
margin-left: 20%;
|
|
725
733
|
margin-right: 20%;
|
|
@@ -814,14 +814,14 @@ nav {
|
|
|
814
814
|
width: 100%;
|
|
815
815
|
}
|
|
816
816
|
}
|
|
817
|
-
|
|
817
|
+
figure .SourceTitle,
|
|
818
818
|
pre .SourceTitle,
|
|
819
819
|
.pseudocode .SourceTitle {
|
|
820
820
|
font-weight: 700;
|
|
821
821
|
font-size: 1em;
|
|
822
822
|
text-align: center;
|
|
823
823
|
}
|
|
824
|
-
|
|
824
|
+
figure,
|
|
825
825
|
pre,
|
|
826
826
|
.pseudocode {
|
|
827
827
|
background-color: #f7f7f7;
|
|
@@ -833,26 +833,26 @@ pre,
|
|
|
833
833
|
font-size: {{normalfontsize}};
|
|
834
834
|
}
|
|
835
835
|
|
|
836
|
-
|
|
836
|
+
figure figcaption {
|
|
837
837
|
font-weight: 700;
|
|
838
838
|
font-size: 1em;
|
|
839
839
|
text-align: center;
|
|
840
840
|
}
|
|
841
|
-
|
|
841
|
+
figure > img, figure > svg {
|
|
842
842
|
margin-left: auto;
|
|
843
843
|
margin-right: auto;
|
|
844
844
|
display: block;
|
|
845
845
|
max-width: 100%;
|
|
846
846
|
height: auto;
|
|
847
847
|
}
|
|
848
|
-
|
|
848
|
+
figure {
|
|
849
849
|
line-height: 1.6em;
|
|
850
850
|
padding: 1.5em;
|
|
851
851
|
margin: 2em 0 1em 0;
|
|
852
852
|
overflow: auto;
|
|
853
853
|
}
|
|
854
854
|
|
|
855
|
-
table
|
|
855
|
+
table figure {
|
|
856
856
|
padding: 0;
|
|
857
857
|
margin: 0;
|
|
858
858
|
}
|
|
@@ -1190,22 +1190,26 @@ ol[class=roman_upper] ol[class=roman_upper] > li::before {
|
|
|
1190
1190
|
/*
|
|
1191
1191
|
3.5 Bibliograhy
|
|
1192
1192
|
*/
|
|
1193
|
-
p.Biblio, p.NormRef {
|
|
1193
|
+
p.Biblio, p.NormRef, div.Biblio, div.NormRef {
|
|
1194
1194
|
margin-top: 1em;
|
|
1195
1195
|
margin-left: 2em;
|
|
1196
1196
|
}
|
|
1197
1197
|
|
|
1198
|
+
.Biblio.note, .Biblio.Note, .NormRef.note, .NormRef.Note {
|
|
1199
|
+
margin-left: 3.5em;
|
|
1200
|
+
}
|
|
1201
|
+
|
|
1198
1202
|
/*
|
|
1199
1203
|
3.6 Source Code + figures
|
|
1200
1204
|
*/
|
|
1201
|
-
|
|
1205
|
+
figure .SourceTitle,
|
|
1202
1206
|
pre .SourceTitle,
|
|
1203
1207
|
.pseudocode .SourceTitle {
|
|
1204
1208
|
font-weight: 700;
|
|
1205
1209
|
font-size: 1em;
|
|
1206
1210
|
text-align: center;
|
|
1207
1211
|
}
|
|
1208
|
-
|
|
1212
|
+
figure,
|
|
1209
1213
|
pre,
|
|
1210
1214
|
.pseudocode {
|
|
1211
1215
|
background-color: #f7f7f7;
|
|
@@ -1241,7 +1245,7 @@ pre {
|
|
|
1241
1245
|
text-align: left;
|
|
1242
1246
|
}
|
|
1243
1247
|
|
|
1244
|
-
|
|
1248
|
+
figcaption, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
|
|
1245
1249
|
font-weight: 700;
|
|
1246
1250
|
font-size: 1em;
|
|
1247
1251
|
text-align: center;
|
|
@@ -1335,6 +1339,10 @@ table th, table td {
|
|
|
1335
1339
|
table td.header {
|
|
1336
1340
|
font-weight: 400;
|
|
1337
1341
|
}
|
|
1342
|
+
table table.plain, table table.plain th, table table.plain td {
|
|
1343
|
+
border: none !important;
|
|
1344
|
+
font-size: 0.95em;
|
|
1345
|
+
}
|
|
1338
1346
|
|
|
1339
1347
|
td,
|
|
1340
1348
|
th {
|
|
@@ -1468,7 +1476,7 @@ ol > li > p::before {
|
|
|
1468
1476
|
margin-right: 20%;
|
|
1469
1477
|
}
|
|
1470
1478
|
|
|
1471
|
-
|
|
1479
|
+
.formula_dl {
|
|
1472
1480
|
background-color: #f7f7f7;
|
|
1473
1481
|
margin-left: 20%;
|
|
1474
1482
|
margin-right: 20%;
|
|
@@ -270,18 +270,18 @@ nav {
|
|
|
270
270
|
}
|
|
271
271
|
}
|
|
272
272
|
|
|
273
|
-
|
|
273
|
+
figure,
|
|
274
274
|
pre,
|
|
275
275
|
.pseudocode {
|
|
276
276
|
@include pseudocodeBlock(#f7f7f7);
|
|
277
277
|
font-size: $normalfontsize;
|
|
278
278
|
}
|
|
279
279
|
|
|
280
|
-
|
|
280
|
+
figure {
|
|
281
281
|
@include figureBlock();
|
|
282
282
|
}
|
|
283
283
|
|
|
284
|
-
table
|
|
284
|
+
table figure {
|
|
285
285
|
padding: 0;
|
|
286
286
|
margin: 0;
|
|
287
287
|
}
|
|
@@ -525,16 +525,20 @@ ol[class="roman_upper"] ol[class="roman_upper"] > li::before {
|
|
|
525
525
|
3.5 Bibliograhy
|
|
526
526
|
*/
|
|
527
527
|
|
|
528
|
-
p.Biblio, p.NormRef {
|
|
528
|
+
p.Biblio, p.NormRef, div.Biblio, div.NormRef {
|
|
529
529
|
margin-top: 1em;
|
|
530
530
|
margin-left: 2em;
|
|
531
531
|
}
|
|
532
532
|
|
|
533
|
+
.Biblio.note, .Biblio.Note, .NormRef.note, .NormRef.Note {
|
|
534
|
+
margin-left: 3.5em;
|
|
535
|
+
}
|
|
536
|
+
|
|
533
537
|
/*
|
|
534
538
|
3.6 Source Code + figures
|
|
535
539
|
*/
|
|
536
540
|
|
|
537
|
-
|
|
541
|
+
figure,
|
|
538
542
|
pre,
|
|
539
543
|
.pseudocode {
|
|
540
544
|
@include pseudocodeBlock(#f7f7f7);
|
|
@@ -549,11 +553,11 @@ pre {
|
|
|
549
553
|
@include recommendationBlock();
|
|
550
554
|
@include listBlock();
|
|
551
555
|
|
|
552
|
-
|
|
556
|
+
figcaption, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
|
|
553
557
|
@include blockTitle()
|
|
554
558
|
}
|
|
555
559
|
|
|
556
|
-
|
|
560
|
+
figure dl {
|
|
557
561
|
}
|
|
558
562
|
|
|
559
563
|
/*
|
|
@@ -747,7 +751,7 @@ ol > li > p::before {
|
|
|
747
751
|
margin-right: 20%;
|
|
748
752
|
}
|
|
749
753
|
|
|
750
|
-
|
|
754
|
+
.formula_dl {
|
|
751
755
|
background-color: #f7f7f7;
|
|
752
756
|
margin-left: 20%;
|
|
753
757
|
margin-right: 20%;
|