metanorma-iso 2.1.2 → 2.1.3
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/html2doc/lists.rb +7 -4
- data/lib/isodoc/iso/html/isodoc-dis.css +3 -5
- data/lib/isodoc/iso/html/isodoc-dis.scss +3 -4
- data/lib/isodoc/iso/iso.amendment.xsl +302 -53
- data/lib/isodoc/iso/iso.international-standard.xsl +302 -53
- data/lib/isodoc/iso/presentation_xml_convert.rb +1 -1
- data/lib/metanorma/iso/biblio.rng +102 -5
- data/lib/metanorma/iso/cleanup.rb +29 -18
- data/lib/metanorma/iso/front.rb +13 -6
- data/lib/metanorma/iso/isodoc.rng +7 -0
- data/lib/metanorma/iso/validate_section.rb +0 -12
- data/lib/metanorma/iso/version.rb +1 -1
- data/spec/isodoc/section_spec.rb +2 -8
- data/spec/isodoc/word_dis_spec.rb +60 -0
- data/spec/metanorma/amd_spec.rb +4 -40
- data/spec/metanorma/base_spec.rb +55 -100
- data/spec/metanorma/validate_spec.rb +8 -19
- data/spec/spec_helper.rb +0 -6
- data/spec/vcr_cassettes/withdrawn_iso.yml +22 -22
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5af2d1e84ef187d29c8adb59589006fe83a313db249d03f1b972f2c24f55026e
|
|
4
|
+
data.tar.gz: 24e56ffa73fb96734cfb1d9990bd97d404707119714cd4c95541d6b60022e6cb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 771062f88d67f10235c8d23df932c4ce0e55f75df7d090e411739729b5d28291f51b453efd0e0a16490d1fbf18d83d0d1cfea1e3308cdc36d137c30b80f1a141
|
|
7
|
+
data.tar.gz: 7a14ad2b9b71991608d0af4ba011c86f1f89bbde21f00e4ee62b6aa975d60c27a9db2cfcbf9701bedfde08f3aeda9b32072c8e39a2c08d4cc8bac8542cf651dc
|
data/lib/html2doc/lists.rb
CHANGED
|
@@ -35,11 +35,14 @@ class Html2Doc
|
|
|
35
35
|
!x.text.strip.empty?
|
|
36
36
|
end
|
|
37
37
|
|
|
38
|
-
prev = first_p.xpath("./preceding-sibling::* |
|
|
38
|
+
prev = first_p.xpath("./preceding-sibling::* | "\
|
|
39
|
+
"./preceding-sibling::text()[normalize-space()]")
|
|
39
40
|
# bullet, tab, paragraph: ignore bullet, tab
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
if prev.empty? then para.replace(para.children)
|
|
42
|
+
elsif prev.size == 2 && prev[-1].name == "span" &&
|
|
43
|
+
prev[-1]["style"] == "mso-tab-count:1"
|
|
44
|
+
first_p.replace(first_p.children)
|
|
45
|
+
end
|
|
43
46
|
end
|
|
44
47
|
|
|
45
48
|
def list2para_style(listtype, depth)
|
|
@@ -1264,9 +1264,6 @@ table.MsoISOTable td, table.MsoISOTableBig td {
|
|
|
1264
1264
|
mso-border-alt: solid windowtext 1pt;
|
|
1265
1265
|
padding: 0cm 2.85pt 0cm 2.85pt; }
|
|
1266
1266
|
|
|
1267
|
-
table.MsoISOTable p, table.MsoISOTableBig p {
|
|
1268
|
-
font-size: {{smallerfontsize}}; }
|
|
1269
|
-
|
|
1270
1267
|
table.MsoTableGrid {
|
|
1271
1268
|
mso-style-name: "Table Grid";
|
|
1272
1269
|
mso-tstyle-rowband-size: 0;
|
|
@@ -3268,9 +3265,10 @@ p.ListContinue2-, li.ListContinue2-, div.ListContinue2- {
|
|
|
3268
3265
|
line-height: 10.5pt;
|
|
3269
3266
|
mso-pagination: widow-orphan;
|
|
3270
3267
|
tab-stops: 40.3pt;
|
|
3271
|
-
font-size:
|
|
3268
|
+
font-size: 10.0pt;
|
|
3272
3269
|
mso-bidi-font-size: {{normalfontsize}};
|
|
3273
|
-
font-family:
|
|
3270
|
+
font-family: {{bodyfont}};
|
|
3271
|
+
/*font-family:"Arial",sans-serif;*/
|
|
3274
3272
|
mso-fareast-font-family: Calibri;
|
|
3275
3273
|
mso-bidi-font-family: "Times New Roman";
|
|
3276
3274
|
mso-ansi-language: EN-GB;
|
|
@@ -1208,8 +1208,6 @@ table.MsoISOTable td, table.MsoISOTableBig td
|
|
|
1208
1208
|
{border:solid windowtext 1pt;
|
|
1209
1209
|
mso-border-alt:solid windowtext 1pt;
|
|
1210
1210
|
padding:0cm 2.85pt 0cm 2.85pt;}
|
|
1211
|
-
table.MsoISOTable p, table.MsoISOTableBig p
|
|
1212
|
-
{font-size:$smallerfontsize; }
|
|
1213
1211
|
table.MsoTableGrid
|
|
1214
1212
|
{mso-style-name:"Table Grid";
|
|
1215
1213
|
mso-tstyle-rowband-size:0;
|
|
@@ -3148,9 +3146,10 @@ p.ListContinue2-, li.ListContinue2-, div.ListContinue2-
|
|
|
3148
3146
|
line-height:10.5pt;
|
|
3149
3147
|
mso-pagination:widow-orphan;
|
|
3150
3148
|
tab-stops:40.3pt;
|
|
3151
|
-
font-size:
|
|
3149
|
+
font-size:10.0pt;
|
|
3152
3150
|
mso-bidi-font-size:$normalfontsize;
|
|
3153
|
-
font-family
|
|
3151
|
+
font-family:$bodyfont;
|
|
3152
|
+
/*font-family:"Arial",sans-serif;*/
|
|
3154
3153
|
mso-fareast-font-family:Calibri;
|
|
3155
3154
|
mso-bidi-font-family:"Times New Roman";
|
|
3156
3155
|
mso-ansi-language:EN-GB;
|