metanorma-un 0.5.7 → 0.5.12

Sign up to get free protection for your applications and to get access to all the features.
Files changed (24) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +7 -5
  3. data/lib/asciidoctor/un/basicdoc.rng +52 -3
  4. data/lib/asciidoctor/un/converter.rb +1 -1
  5. data/lib/asciidoctor/un/isodoc.rng +51 -3
  6. data/lib/isodoc/un/base_convert.rb +1 -1
  7. data/lib/isodoc/un/html/html_unece_intro.html +1 -1
  8. data/lib/isodoc/un/html/htmlstyle.css +3 -3
  9. data/lib/isodoc/un/html/htmlstyle.scss +2 -2
  10. data/lib/isodoc/un/html/unece.css +19 -20
  11. data/lib/isodoc/un/html/unece.scss +19 -20
  12. data/lib/isodoc/un/html/word_unece_intro.html +1 -1
  13. data/lib/isodoc/un/html/wordstyle.css +17 -17
  14. data/lib/isodoc/un/html/wordstyle.scss +17 -17
  15. data/lib/isodoc/un/html_convert.rb +5 -3
  16. data/lib/isodoc/un/un.plenary-attachment.xsl +253 -45
  17. data/lib/isodoc/un/un.plenary.xsl +253 -45
  18. data/lib/isodoc/un/un.recommendation.xsl +254 -46
  19. data/lib/isodoc/un/word_convert.rb +7 -3
  20. data/lib/isodoc/un/xref.rb +4 -2
  21. data/lib/metanorma/un/processor.rb +11 -8
  22. data/lib/metanorma/un/version.rb +1 -1
  23. data/metanorma-unece.gemspec +2 -2
  24. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c01dbd7826220e4745047a2e35efb4c1a84652261f3885f867a59c76689afaba
4
- data.tar.gz: b92a663a7cfbd929b559fa8066f6c5b09737e85d8ddfb39a804fa51dfa03ddb8
3
+ metadata.gz: d6f40fd8baff69f7e6106f1c7a19bcc6c3a2e090d125de96ae9c9b486a8e684a
4
+ data.tar.gz: cb96a99a8726aa83764355fb67c58aac06860666f17c728286adc54d4f3ae30a
5
5
  SHA512:
6
- metadata.gz: 47b69cccf5f4f6b0415da7117820238a19e54760598e693e029095360a85fd68f6bccc6b9a3a3e5286a4c166c647a469e17118a98f41332add49e84bd2d687f9
7
- data.tar.gz: f5b1c1ab84c63061e38a7134af4daf3e08a5d372c5a528f10915e6790dd417a3739089f5ee20116991ff36903f153d30aedc83b258ce3f509b6f60ba662da595
6
+ metadata.gz: e3c8a21a6575b9e8a9f556fdae8a7c97f155a466b509f8793fc589268501edaf1fff97522297855e76461019472c60ff36196b753caee6bb182dddde9e82b6ce
7
+ data.tar.gz: 3edf55c3391e3e126307fd2b911b754148d2dcced675e11540358a3c412bb09a130b69719e5fd2677d2b7b605136e2eaaf188171138b514ad1f88d053d917103
data/.github/workflows/rake.yml CHANGED
@@ -36,7 +36,10 @@ jobs:
36
36
  with:
37
37
  ruby-version: ${{ matrix.ruby }}
38
38
 
39
- - uses: actions/cache@v1
39
+ - if: matrix.os == 'macos-latest'
40
+ run: brew install autoconf automake libtool
41
+
42
+ - uses: actions/cache@v2
40
43
  with:
41
44
  path: vendor/bundle
42
45
  key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
@@ -48,15 +51,14 @@ jobs:
48
51
 
49
52
  - run: bundle exec rake
50
53
 
51
- notify:
52
- name: Trigger notify workflow
54
+ tests-passed:
53
55
  needs: rake
54
56
  runs-on: ubuntu-latest
55
57
  steps:
56
- - name: Trigger notify workflow
58
+ - name: Trigger tests passed event
57
59
  uses: Sibz/github-status-action@v1
58
60
  with:
59
- authToken: ${{ secrets.GITHUB_TOKEN }}
61
+ authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
60
62
  context: 'tests-passed-successfully'
61
63
  description: 'Tests passed successfully'
62
64
  state: 'success'
data/lib/asciidoctor/un/basicdoc.rng CHANGED
@@ -596,6 +596,7 @@
596
596
  <ref name="bookmark"/>
597
597
  <ref name="image"/>
598
598
  <ref name="index"/>
599
+ <ref name="index-xref"/>
599
600
  </choice>
600
601
  </define>
601
602
  <define name="PureTextElement">
@@ -728,13 +729,61 @@
728
729
  </define>
729
730
  <define name="index">
730
731
  <element name="index">
731
- <attribute name="primary"/>
732
732
  <optional>
733
- <attribute name="secondary"/>
733
+ <attribute name="to">
734
+ <data type="IDREF"/>
735
+ </attribute>
736
+ </optional>
737
+ <element name="primary">
738
+ <oneOrMore>
739
+ <ref name="PureTextElement"/>
740
+ </oneOrMore>
741
+ </element>
742
+ <optional>
743
+ <element name="secondary">
744
+ <oneOrMore>
745
+ <ref name="PureTextElement"/>
746
+ </oneOrMore>
747
+ </element>
748
+ </optional>
749
+ <optional>
750
+ <element name="tertiary">
751
+ <oneOrMore>
752
+ <ref name="PureTextElement"/>
753
+ </oneOrMore>
754
+ </element>
755
+ </optional>
756
+ </element>
757
+ </define>
758
+ <define name="index-xref">
759
+ <element name="index-xref">
760
+ <attribute name="also">
761
+ <data type="boolean"/>
762
+ </attribute>
763
+ <element name="primary">
764
+ <oneOrMore>
765
+ <ref name="PureTextElement"/>
766
+ </oneOrMore>
767
+ </element>
768
+ <optional>
769
+ <element name="secondary">
770
+ <oneOrMore>
771
+ <ref name="PureTextElement"/>
772
+ </oneOrMore>
773
+ </element>
734
774
  </optional>
735
775
  <optional>
736
- <attribute name="tertiary"/>
776
+ <element name="tertiary">
777
+ <oneOrMore>
778
+ <ref name="PureTextElement"/>
779
+ </oneOrMore>
780
+ </element>
737
781
  </optional>
782
+ <element name="target">
783
+ <oneOrMore>
784
+ <ref name="PureTextElement"/>
785
+ </oneOrMore>
786
+ </element>
738
787
  </element>
739
788
  </define>
740
789
  <!-- bare ID element, used for referencing arbitrary spans of text -->
data/lib/asciidoctor/un/converter.rb CHANGED
@@ -30,7 +30,7 @@ module Asciidoctor
30
30
  end
31
31
 
32
32
  def asciidoc_sub(text)
33
- Asciidoctor::Standoc::Utils::asciidoc_sub(text)
33
+ Metanorma::Utils::asciidoc_sub(text)
34
34
  end
35
35
 
36
36
  def title(node, xml)
data/lib/asciidoctor/un/isodoc.rng CHANGED
@@ -55,6 +55,13 @@
55
55
  <param name="pattern">\i\c*|\c+#\c+</param>
56
56
  </data>
57
57
  </attribute>
58
+ <optional>
59
+ <attribute name="to">
60
+ <data type="string">
61
+ <param name="pattern">\i\c*|\c+#\c+</param>
62
+ </data>
63
+ </attribute>
64
+ </optional>
58
65
  <optional>
59
66
  <attribute name="type">
60
67
  <ref name="ReferenceFormat"/>
@@ -246,6 +253,12 @@
246
253
  <data type="boolean"/>
247
254
  </attribute>
248
255
  </optional>
256
+ <optional>
257
+ <attribute name="width"/>
258
+ </optional>
259
+ <optional>
260
+ <ref name="colgroup"/>
261
+ </optional>
249
262
  <optional>
250
263
  <ref name="tname"/>
251
264
  </optional>
@@ -764,6 +777,21 @@
764
777
  </define>
765
778
  </include>
766
779
  <!-- end overrides -->
780
+ <define name="colgroup">
781
+ <element name="colgroup">
782
+ <oneOrMore>
783
+ <ref name="col"/>
784
+ </oneOrMore>
785
+ </element>
786
+ </define>
787
+ <define name="col">
788
+ <element name="col">
789
+ <attribute name="width"/>
790
+ </element>
791
+ </define>
792
+ <define name="BibItemType" combine="choice">
793
+ <value>internal</value>
794
+ </define>
767
795
  <define name="TextElement" combine="choice">
768
796
  <ref name="concept"/>
769
797
  </define>
@@ -814,6 +842,9 @@
814
842
  <data type="boolean"/>
815
843
  </attribute>
816
844
  </optional>
845
+ <optional>
846
+ <attribute name="number"/>
847
+ </optional>
817
848
  <optional>
818
849
  <attribute name="obligation">
819
850
  <choice>
@@ -869,9 +900,11 @@
869
900
  <element name="code">
870
901
  <text/>
871
902
  </element>
872
- <element name="text">
873
- <text/>
874
- </element>
903
+ <optional>
904
+ <element name="text">
905
+ <text/>
906
+ </element>
907
+ </optional>
875
908
  </element>
876
909
  </define>
877
910
  <define name="standard-document">
@@ -1041,6 +1074,9 @@
1041
1074
  </choice>
1042
1075
  </attribute>
1043
1076
  </optional>
1077
+ <optional>
1078
+ <attribute name="number"/>
1079
+ </optional>
1044
1080
  <optional>
1045
1081
  <attribute name="type"/>
1046
1082
  </optional>
@@ -1094,6 +1130,9 @@
1094
1130
  <optional>
1095
1131
  <attribute name="type"/>
1096
1132
  </optional>
1133
+ <optional>
1134
+ <attribute name="number"/>
1135
+ </optional>
1097
1136
  <optional>
1098
1137
  <ref name="section-title"/>
1099
1138
  </optional>
@@ -1196,6 +1235,9 @@
1196
1235
  <optional>
1197
1236
  <attribute name="type"/>
1198
1237
  </optional>
1238
+ <optional>
1239
+ <attribute name="number"/>
1240
+ </optional>
1199
1241
  <optional>
1200
1242
  <attribute name="obligation">
1201
1243
  <choice>
@@ -1524,6 +1566,7 @@
1524
1566
  <value>add</value>
1525
1567
  <value>modify</value>
1526
1568
  <value>delete</value>
1569
+ <value>replace</value>
1527
1570
  </choice>
1528
1571
  </attribute>
1529
1572
  <optional>
@@ -1554,6 +1597,11 @@
1554
1597
  </optional>
1555
1598
  <optional>
1556
1599
  <element name="newcontent">
1600
+ <optional>
1601
+ <attribute name="id">
1602
+ <data type="ID"/>
1603
+ </attribute>
1604
+ </optional>
1557
1605
  <zeroOrMore>
1558
1606
  <ref name="BasicBlock"/>
1559
1607
  </zeroOrMore>
data/lib/isodoc/un/base_convert.rb CHANGED
@@ -3,7 +3,7 @@ require "fileutils"
3
3
  module IsoDoc
4
4
  module UN
5
5
  module BaseConvert
6
- def middle_clause
6
+ def middle_clause(_docxml)
7
7
  "//clause[parent::sections]"
8
8
  end
9
9
 
data/lib/isodoc/un/html/html_unece_intro.html CHANGED
@@ -6,7 +6,7 @@
6
6
  {% endif %}
7
7
 
8
8
  <nav>
9
- <h1 id="content">Contents</h1>
9
+ <h1 id="content">{{ labels["table_of_contents"] }}</h1>
10
10
  <div id="toc"></div>
11
11
 
12
12
  </nav>
data/lib/isodoc/un/html/htmlstyle.css CHANGED
@@ -230,7 +230,7 @@ body {
230
230
  margin-left: auto;
231
231
  margin-right: auto;
232
232
  max-width: 100%;
233
- font-size: 15px;
233
+ font-size: {{normalfontsize}};
234
234
  font-weight: 300;
235
235
  line-height: 1.4em;
236
236
  color: #333;
@@ -709,7 +709,7 @@ p.NormRef {
709
709
  pre,
710
710
  .pseudocode {
711
711
  background-color: #f2f2f2;
712
- font-size: 0.8em;
712
+ font-size: {{monospacefontsize}};
713
713
  line-height: 1.6em;
714
714
  padding: 1.5em;
715
715
  margin: 2em 0 1em 0;
@@ -813,7 +813,7 @@ a.footnote-number {
813
813
  vertical-align: super; }
814
814
 
815
815
  .footnote {
816
- font-size: 0.9em; }
816
+ font-size: {{footnotefontsize}}; }
817
817
 
818
818
  /*
819
819
  3.11 Blockquotes
data/lib/isodoc/un/html/htmlstyle.scss CHANGED
@@ -58,7 +58,7 @@ $un-admonition-color: #47430c;
58
58
  $un-toc-active: #4d7ea5;
59
59
 
60
60
  body {
61
- @include bodyStyle1(15px, 1.4em, $un-text, #ffffff, 300);
61
+ @include bodyStyle1($normalfontsize, 1.4em, $un-text, #ffffff, 300);
62
62
  font-weight: 400;
63
63
  }
64
64
 
@@ -523,7 +523,7 @@ a.footnote-number {
523
523
  }
524
524
 
525
525
  .footnote {
526
- font-size: 0.9em;
526
+ font-size: $footnotefontsize;
527
527
  }
528
528
 
529
529
 
data/lib/isodoc/un/html/unece.css CHANGED
@@ -14,7 +14,7 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode, pre {
14
14
  text-align: left;
15
15
  mso-pagination: widow-orphan;
16
16
  tab-stops: 45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
17
- font-size: 10.0pt;
17
+ font-size: {{monospacefontsize}};
18
18
  font-family: {{monospacefont}};
19
19
  mso-fareast-font-family: Calibri;
20
20
  mso-bidi-font-family: "Courier New";
@@ -31,7 +31,7 @@ p.pseudocode, li.pseudocode, div.pseudocode {
31
31
  text-align: left;
32
32
  mso-pagination: widow-orphan;
33
33
  tab-stops: 45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
34
- font-size: 10.5pt;
34
+ font-size: {{normalfontsize}};
35
35
  font-family: {{bodyfont}};
36
36
  mso-fareast-font-family: Calibri;
37
37
  mso-bidi-font-family: "Courier New";
@@ -49,7 +49,7 @@ p.Biblio, li.Biblio, div.Biblio, p.NormRef, li.NormRef, div.NormRef {
49
49
  tab-stops: 33.15pt;
50
50
  line-height: 12.0pt;
51
51
  mso-pagination: widow-orphan;
52
- font-size: 10.5pt;
52
+ font-size: {{normalfontsize}};
53
53
  font-weight: normal;
54
54
  font-family: {{bodyfont}};
55
55
  mso-fareast-font-family: {{bodyfont}};
@@ -147,10 +147,9 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
147
147
  line-height: 12.0pt;
148
148
  mso-pagination: widow-orphan;
149
149
  tab-stops: 20.15pt;
150
- font-size: 10.0pt;
150
+ font-size: {{smallerfontsize}};
151
151
  mso-bidi-font-size: 11.0pt;
152
152
  font-family: {{bodyfont}};
153
- font-size: 10.0pt;
154
153
  mso-fareast-font-family: {{bodyfont}};
155
154
  mso-bidi-font-family: {{bodyfont}};
156
155
  mso-ansi-language: EN-GB; }
@@ -415,7 +414,7 @@ p.zzCopyright, li.zzCopyright {
415
414
  tab-stops: 20.15pt 25.7pt 481.15pt;
416
415
  padding: 0cm;
417
416
  mso-padding-alt: 1.0pt 4.0pt 1.0pt 4.0pt;
418
- font-size: 10.5pt;
417
+ font-size: {{normalfontsize}};
419
418
  font-family: {{bodyfont}};
420
419
  mso-fareast-font-family: {{bodyfont}};
421
420
  mso-bidi-font-family: {{bodyfont}};
@@ -501,7 +500,7 @@ p.Quote, li.Quote, div.Quote {
501
500
  line-height: 12.0pt;
502
501
  mso-pagination: widow-orphan;
503
502
  tab-stops: 20.15pt;
504
- font-size: 10.5pt;
503
+ font-size: {{normalfontsize}};
505
504
  font-family: {{bodyfont}};
506
505
  mso-fareast-font-family: {{bodyfont}};
507
506
  mso-bidi-font-family: {{bodyfont}};
@@ -517,7 +516,7 @@ p.QuoteAttribution {
517
516
  line-height: 12.0pt;
518
517
  mso-pagination: widow-orphan;
519
518
  tab-stops: 20.15pt;
520
- font-size: 10.5pt;
519
+ font-size: {{normalfontsize}};
521
520
  font-family: {{bodyfont}};
522
521
  mso-fareast-font-family: {{bodyfont}};
523
522
  mso-bidi-font-family: {{bodyfont}};
@@ -575,7 +574,7 @@ p.Formula, li.Formula, div.Formula {
575
574
  line-height: 12.0pt;
576
575
  mso-pagination: widow-orphan;
577
576
  tab-stops: right 487.45pt;
578
- font-size: 10.5pt;
577
+ font-size: {{normalfontsize}};
579
578
  font-family: {{bodyfont}};
580
579
  mso-fareast-font-family: {{bodyfont}};
581
580
  mso-bidi-font-family: {{bodyfont}};
@@ -698,7 +697,7 @@ table.MsoISOTable, table.MsoISOTableBig {
698
697
  mso-border-insideh: .75pt solid windowtext;
699
698
  mso-border-insidev: .75pt solid windowtext;
700
699
  margin-bottom: 12pt;
701
- font-size: 10.0pt;
700
+ font-size: {{smallerfontsize}};
702
701
  font-family: {{bodyfont}}; }
703
702
 
704
703
  table.MsoISOTable th, table.MsoISOTableBig th {
@@ -707,7 +706,7 @@ table.MsoISOTable th, table.MsoISOTableBig th {
707
706
  padding: 0cm 2.85pt 0cm 2.85pt; }
708
707
 
709
708
  table.MsoISOTable p, table.MsoISOTableBig p {
710
- font-size: 10.0pt; }
709
+ font-size: {{smallerfontsize}}; }
711
710
 
712
711
  table.MsoISOTable td, table.MsoISOTableBig td {
713
712
  border: solid windowtext 1pt;
@@ -729,7 +728,7 @@ table.MsoTableGrid {
729
728
  mso-para-margin-bottom: .0001pt;
730
729
  mso-pagination: widow-orphan;
731
730
  margin-bottom: 12pt;
732
- font-size: 10.0pt;
731
+ font-size: {{smallerfontsize}};
733
732
  font-family: {{bodyfont}}; }
734
733
 
735
734
  div.formula {
@@ -771,7 +770,7 @@ a.TableFootnoteRef, span.TableFootnoteRef {
771
770
  vertical-align: super; }
772
771
 
773
772
  aside {
774
- font-size: 10.0pt; }
773
+ font-size: {{footnotefontsize}}; }
775
774
 
776
775
  .example-title {
777
776
  font-weight: bold;
@@ -789,32 +788,32 @@ div.example {
789
788
 
790
789
  p.example, li.example, div.example, td.example {
791
790
  mso-pagination: none;
792
- font-size: 10.0pt;
791
+ font-size: {{smallerfontsize}};
793
792
  font-family: {{bodyfont}}; }
794
793
 
795
794
  td.example p.MsoListParagraph {
796
- font-size: 10.0pt; }
795
+ font-size: {{smallerfontsize}}; }
797
796
 
798
797
  div.example p.MsoListParagraph {
799
- font-size: 10.0pt; }
798
+ font-size: {{smallerfontsize}}; }
800
799
 
801
800
  div.Note p.MsoListParagraph {
802
- font-size: 10.0pt;
801
+ font-size: {{smallerfontsize}};
803
802
  margin-left: 1.0cm; }
804
803
 
805
804
  div.Note span.stem {
806
- font-size: 10.0pt; }
805
+ font-size: {{smallerfontsize}}; }
807
806
 
808
807
  div.Note p.Sourcecode, div.Note pre.Sourcecode {
809
808
  font-size: 8.0pt;
810
809
  margin-left: 1.0cm; }
811
810
 
812
811
  div.Note table.dl {
813
- font-size: 10.0pt;
812
+ font-size: {{smallerfontsize}};
814
813
  margin-left: 1.0cm; }
815
814
 
816
815
  span.note_label, span.example_label, td.example_label, td.note_label {
817
- font-size: 10.0pt;
816
+ font-size: {{smallerfontsize}};
818
817
  font-family: {{bodyfont}}; }
819
818
 
820
819
  table.dl {