metanorma-iso 2.1.5 → 2.1.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +3 -1
- data/.github/workflows/release.yml +24 -0
- data/lib/isodoc/iso/html/html_iso_titlepage.html +2 -2
- data/lib/isodoc/iso/html/style-human.scss +39 -1
- data/lib/isodoc/iso/html/style-iso.scss +40 -1
- data/lib/isodoc/iso/i18n-en.yaml +4 -0
- data/lib/isodoc/iso/i18n-fr.yaml +5 -0
- data/lib/isodoc/iso/i18n-ru.yaml +4 -0
- data/lib/isodoc/iso/i18n-zh-Hans.yaml +5 -0
- data/lib/isodoc/iso/init.rb +4 -0
- data/lib/isodoc/iso/iso.amendment.xsl +3698 -3060
- data/lib/isodoc/iso/iso.international-standard.xsl +3698 -3060
- data/lib/isodoc/iso/presentation_xml_convert.rb +22 -6
- data/lib/isodoc/iso/word_cleanup.rb +10 -13
- data/lib/isodoc/iso/word_dis_convert.rb +1 -1
- data/lib/isodoc/iso/xref.rb +35 -4
- data/lib/metanorma/iso/base.rb +4 -0
- data/lib/metanorma/iso/biblio.rng +8 -5
- data/lib/metanorma/iso/boilerplate-fr.xml +1 -1
- data/lib/metanorma/iso/boilerplate-ru.xml +1 -1
- data/lib/metanorma/iso/boilerplate.xml +1 -1
- data/lib/metanorma/iso/cleanup.rb +5 -1
- data/lib/metanorma/iso/front_id.rb +64 -11
- data/lib/metanorma/iso/isodoc.rng +6 -1
- data/lib/metanorma/iso/reqt.rng +1 -1
- data/lib/metanorma/iso/section.rb +5 -0
- data/lib/metanorma/iso/validate.rb +3 -2
- data/lib/metanorma/iso/version.rb +1 -1
- data/lib/metanorma/requirements/modspec.rb +60 -0
- data/lib/metanorma/requirements/requirements.rb +16 -0
- data/lib/metanorma-iso.rb +2 -1
- data/metanorma-iso.gemspec +2 -1
- data/spec/assets/iso.adoc +10 -0
- data/spec/examples/rice_img/1000-1_ed2amd3fig1a.png +0 -0
- data/spec/examples/rice_img/1000-1_ed2amd3fig1b.png +0 -0
- data/spec/examples/rice_img/1000-1_ed2amd3fig2.png +0 -0
- data/spec/examples/rice_img/1000-1_ed2amd3fig3.png +0 -0
- data/spec/examples/rice_img/1000-1_ed2amd3fig4.png +0 -0
- data/spec/examples/rice_img/1000-1_ed2amd3fig5_f.png +0 -0
- data/spec/examples/rice_img/1000-1_ed2amd3figA.png +0 -0
- data/spec/examples/rice_img/1000-1_ed2amd3figA1.png +0 -0
- data/spec/examples/rice_img/1000-1_ed2amd3figA2.png +0 -0
- data/spec/examples/rice_img/1000-1_ed2amd3figTab1.png +0 -0
- data/spec/examples/rice_img/1000-1_ed2amd3figTab2.png +0 -0
- data/spec/examples/rice_img/1001_ed2amd3fig1.png +0 -0
- data/spec/examples/rice_img/ISO_1213_1.png +0 -0
- data/spec/examples/rice_img/SL1000-1_ed2amd3fig1.png +0 -0
- data/spec/isodoc/postproc_spec.rb +6 -13
- data/spec/isodoc/ref_spec.rb +129 -82
- data/spec/isodoc/word_dis_spec.rb +9 -13
- data/spec/metanorma/amd_spec.rb +0 -10
- data/spec/metanorma/base_spec.rb +13 -24
- data/spec/metanorma/cleanup_spec.rb +136 -0
- data/spec/metanorma/macros_spec.rb +99 -0
- data/spec/metanorma/processor_spec.rb +86 -87
- data/spec/metanorma/section_spec.rb +2 -2
- data/spec/metanorma/validate_spec.rb +41 -40
- data/spec/requirements/requirements_spec.rb +1299 -0
- data/spec/requirements/xref_spec.rb +1205 -0
- data/spec/vcr_cassettes/docrels.yml +385 -0
- data/spec/vcr_cassettes/withdrawn_iso.yml +19 -19
- metadata +44 -15
- data/lib/isodoc/iso/html/htmlstyle.css +0 -47
- data/lib/isodoc/iso/html/isodoc-dis.css +0 -4493
- data/lib/isodoc/iso/html/isodoc.css +0 -1346
- data/lib/isodoc/iso/html/style-human.css +0 -1027
- data/lib/isodoc/iso/html/style-iso.css +0 -1053
- data/lib/isodoc/iso/html/wordstyle-dis.css +0 -2280
- data/lib/isodoc/iso/html/wordstyle.css +0 -1728
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a33edbded2e78f7e84cbe0450f7e4a29fba80e915e2d823c0399adb3aed22397
|
4
|
+
data.tar.gz: d4e9bdc4e7a12658a922211a2e166bffa93d780d14ead3b8172538c153646b33
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 77dca92caa958245605a5a8a4d8f6813e4ca4d8bc0ba7cd3df00eb6bf87ffbe40b51728012d427a736f36226ef50cf4d276fac14711bffed7890d6843125dff7
|
7
|
+
data.tar.gz: f5dfbf43788f832aa761c3cc3b2fa6db877cb79375af7856ce464198ae9413824a365ffe2aa05009cf46bcfca520aa814f05c58bb6f46e677c127d55f79a8d81
|
data/.github/workflows/rake.yml
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
2
|
+
# See https://github.com/metanorma/cimas
|
1
3
|
name: rake
|
2
4
|
|
3
5
|
on:
|
@@ -8,6 +10,6 @@ on:
|
|
8
10
|
|
9
11
|
jobs:
|
10
12
|
rake:
|
11
|
-
uses: metanorma/
|
13
|
+
uses: metanorma/ci/.github/workflows/generic-rake.yml@main
|
12
14
|
secrets:
|
13
15
|
pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
|
@@ -0,0 +1,24 @@
|
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
2
|
+
# See https://github.com/metanorma/cimas
|
3
|
+
name: release
|
4
|
+
|
5
|
+
on:
|
6
|
+
workflow_dispatch:
|
7
|
+
inputs:
|
8
|
+
next_version:
|
9
|
+
description: |
|
10
|
+
Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
|
11
|
+
required: true
|
12
|
+
default: 'skip'
|
13
|
+
push:
|
14
|
+
tags: [ v* ]
|
15
|
+
|
16
|
+
jobs:
|
17
|
+
release:
|
18
|
+
uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
|
19
|
+
with:
|
20
|
+
next_version: ${{ github.event.inputs.next_version }}
|
21
|
+
secrets:
|
22
|
+
rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
|
23
|
+
pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
|
24
|
+
|
@@ -26,7 +26,7 @@
|
|
26
26
|
name="CVP_Secretariat_Loca">{{ labels["secretariat"] }}</a>: {{ secretariat }}</p>
|
27
27
|
{% endif %}
|
28
28
|
|
29
|
-
<div class="doctitle-en"><div><span class="title">{{ doctitleintro }}{% if doctitleintro and doctitlemain %}
|
29
|
+
<div class="doctitle-en"><div><span class="title">{{ doctitleintro }}{% if doctitleintro and doctitlemain %} — {% endif %}</span><span class="subtitle">{{ doctitlemain }}{% if doctitlemain and doctitlepart %} —{% endif %}</span>
|
30
30
|
{% if doctitlepart %}
|
31
31
|
</div><div class="doctitle-part">
|
32
32
|
{% if doctitlepartlabel %}<span class="partlabel">{{ doctitlepartlabel }}: </span>{% endif %}
|
@@ -41,7 +41,7 @@
|
|
41
41
|
{% endif %}
|
42
42
|
</div>
|
43
43
|
|
44
|
-
<div class="doctitle-fr"><div><span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %}
|
44
|
+
<div class="doctitle-fr"><div><span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} — {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} —{% endif %}</span>
|
45
45
|
{% if docsubtitlepart %}
|
46
46
|
</div><div>
|
47
47
|
{% if docsubtitlepartlabel %}<span class="partlabel">{{ docsubtitlepartlabel }}: </span>{% endif %}
|
@@ -167,6 +167,10 @@ h2, .h2 {
|
|
167
167
|
margin-bottom: 1em;
|
168
168
|
}
|
169
169
|
|
170
|
+
h3, .h3, h4, .h4, h5, .h5, h6, .h6 {
|
171
|
+
margin-bottom: 1em;
|
172
|
+
}
|
173
|
+
|
170
174
|
h1,
|
171
175
|
h2,
|
172
176
|
h3,
|
@@ -574,7 +578,13 @@ pre {
|
|
574
578
|
|
575
579
|
table {
|
576
580
|
@include table(1px solid black);
|
577
|
-
|
581
|
+
}
|
582
|
+
|
583
|
+
td > p:first-child, th > p:first-child {
|
584
|
+
margin-top: 0em;
|
585
|
+
}
|
586
|
+
td > p:last-child, th > p:last-child {
|
587
|
+
margin-bottom: 0em;
|
578
588
|
}
|
579
589
|
|
580
590
|
td,
|
@@ -593,6 +603,34 @@ p.TableTitle {
|
|
593
603
|
text-align: left !important;
|
594
604
|
}
|
595
605
|
|
606
|
+
/*
|
607
|
+
table.modspec {
|
608
|
+
@include table($border: none !important);
|
609
|
+
text-align: left;
|
610
|
+
|
611
|
+
color: #010d16;
|
612
|
+
|
613
|
+
tr:nth-child(even) {
|
614
|
+
background: #ffffff
|
615
|
+
}
|
616
|
+
tr:nth-child(odd) {
|
617
|
+
background: #ffffff
|
618
|
+
}
|
619
|
+
|
620
|
+
thead tr th {
|
621
|
+
background-color: #5d99d6;
|
622
|
+
}
|
623
|
+
|
624
|
+
td, th {
|
625
|
+
padding: 1em;
|
626
|
+
}
|
627
|
+
|
628
|
+
td.header {
|
629
|
+
font-weight: 400;
|
630
|
+
}
|
631
|
+
}
|
632
|
+
*/
|
633
|
+
|
596
634
|
/*
|
597
635
|
3.10 Footnotes
|
598
636
|
*/
|
@@ -126,6 +126,10 @@ h2, .h2 {
|
|
126
126
|
margin-bottom: 1em;
|
127
127
|
}
|
128
128
|
|
129
|
+
h3, .h3, h4, .h4, h5, .h5, h6, .h6 {
|
130
|
+
margin-bottom: 1em;
|
131
|
+
}
|
132
|
+
|
129
133
|
h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
|
130
134
|
line-height: 1.2;
|
131
135
|
}
|
@@ -607,7 +611,6 @@ div.zzHelp {
|
|
607
611
|
|
608
612
|
table {
|
609
613
|
@include table(1px solid black);
|
610
|
-
text-align: center;
|
611
614
|
}
|
612
615
|
|
613
616
|
td,
|
@@ -615,6 +618,14 @@ th {
|
|
615
618
|
padding: 1em !important;
|
616
619
|
}
|
617
620
|
|
621
|
+
td > p:first-child, th > p:first-child {
|
622
|
+
margin-top: 0em;
|
623
|
+
}
|
624
|
+
td > p:last-child, th > p:last-child {
|
625
|
+
margin-bottom: 0em;
|
626
|
+
}
|
627
|
+
|
628
|
+
|
618
629
|
p.TableTitle {
|
619
630
|
text-align: center;
|
620
631
|
margin-top: 2.5em;
|
@@ -626,6 +637,34 @@ p.TableTitle {
|
|
626
637
|
text-align: left !important;
|
627
638
|
}
|
628
639
|
|
640
|
+
/*
|
641
|
+
table.modspec {
|
642
|
+
@include table($border: none !important);
|
643
|
+
text-align: left;
|
644
|
+
|
645
|
+
color: #010d16;
|
646
|
+
|
647
|
+
tr:nth-child(even) {
|
648
|
+
background: #ffffff
|
649
|
+
}
|
650
|
+
tr:nth-child(odd) {
|
651
|
+
background: #ffffff
|
652
|
+
}
|
653
|
+
|
654
|
+
thead tr th {
|
655
|
+
background-color: #5d99d6;
|
656
|
+
}
|
657
|
+
|
658
|
+
td, th {
|
659
|
+
padding: 1em;
|
660
|
+
}
|
661
|
+
|
662
|
+
td.header {
|
663
|
+
font-weight: 400;
|
664
|
+
}
|
665
|
+
}
|
666
|
+
*/
|
667
|
+
|
629
668
|
/*
|
630
669
|
3.10 Footnotes
|
631
670
|
*/
|
data/lib/isodoc/iso/i18n-en.yaml
CHANGED
data/lib/isodoc/iso/i18n-fr.yaml
CHANGED
data/lib/isodoc/iso/i18n-ru.yaml
CHANGED