metanorma-itu 2.0.0 → 2.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (27) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/itu/base_convert.rb +1 -0
  3. data/lib/isodoc/itu/html/htmlstyle.css +25 -20
  4. data/lib/isodoc/itu/html/htmlstyle.scss +9 -2
  5. data/lib/isodoc/itu/html/itu.css +8 -2
  6. data/lib/isodoc/itu/html/itu.scss +7 -1
  7. data/lib/isodoc/itu/html/word_itu_titlepage_sp.html +4 -3
  8. data/lib/isodoc/itu/html/wordstyle.css +8 -8
  9. data/lib/isodoc/itu/html/wordstyle.scss +8 -8
  10. data/lib/isodoc/itu/itu.implementers-guide.xsl +2196 -1298
  11. data/lib/isodoc/itu/itu.in-force.xsl +2196 -1298
  12. data/lib/isodoc/itu/itu.recommendation-annex.xsl +2196 -1298
  13. data/lib/isodoc/itu/itu.recommendation-supplement.xsl +2196 -1298
  14. data/lib/isodoc/itu/itu.recommendation.xsl +2196 -1298
  15. data/lib/isodoc/itu/itu.resolution.xsl +2196 -1298
  16. data/lib/isodoc/itu/itu.service-publication.xsl +2196 -1298
  17. data/lib/isodoc/itu/itu.technical-paper.xsl +2196 -1298
  18. data/lib/isodoc/itu/itu.technical-report.xsl +2196 -1298
  19. data/lib/isodoc/itu/metadata.rb +25 -24
  20. data/lib/isodoc/itu/presentation_xml_convert.rb +13 -0
  21. data/lib/isodoc/itu/ref.rb +28 -18
  22. data/lib/isodoc/itu/xref_section.rb +12 -6
  23. data/lib/metanorma/itu/basicdoc.rng +5 -3
  24. data/lib/metanorma/itu/biblio.rng +7 -5
  25. data/lib/metanorma/itu/isodoc.rng +142 -4
  26. data/lib/metanorma/itu/version.rb +1 -1
  27. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3fdddaec3384534927a88d4a07598884be02c732c4c22ebb4f48a25d1ba25e26
4
- data.tar.gz: e2f5b1459929f5e8a1db46fa2a38ab0bfee5c582a7c9fd5c482fb28bb7de9f56
3
+ metadata.gz: 1305941e6046a181049aa84b4469004a4ff1c4f1ce1ebfaf958d8be9b2055cea
4
+ data.tar.gz: 9c0a08603d5224d0fcacc2e636d749bda9c6b3c404dc331ed0edbe2df3ed5b64
5
5
  SHA512:
6
- metadata.gz: 5e8eb91dcc35be210a9f55eaa7e256d1a5c31785341e3749667eca9a0c6a97e1c2f2c7a283711520f476377ad2db75d791acf4f43da567833f65c8cb53c74d32
7
- data.tar.gz: 4471f53be6a4fd4167e70b6670a68b9b67cef8e3421075e049bd871acc443b4ade5cb3766dc0904c5980caa5f157fc3a258b095fd3e22f910b945fdefc89f2b3
6
+ metadata.gz: f2cca246b2a1460a15c7d3ad66b7d0d2bd6974c22e55cca16a895cf03236246aa665f229ac0705b8967860ec6b62a4d12ef3363150421be10a7fda8f7be27244
7
+ data.tar.gz: c9d6a3b30593e6473cd025ef19c2d77426f6f46b081d269c5238cd9d5e218db19a9b4caa4ddd978ab765c89a76af290543eefda054cbb6af71236a18698ffcd9
data/lib/isodoc/itu/base_convert.rb CHANGED
@@ -53,6 +53,7 @@ module IsoDoc
53
53
  end
54
54
 
55
55
  def annex_name(annex, name, div)
56
+ preceding_floating_titles(name, div)
56
57
  r_a = @meta.get[:doctype_original] == "recommendation-annex"
57
58
  div.h1 **{ class: r_a ? "RecommendationAnnex" : "Annex" } do |t|
58
59
  name&.children&.each { |c2| parse(c2, t) }
data/lib/isodoc/itu/html/htmlstyle.css CHANGED
@@ -678,57 +678,62 @@ nav #toc {
678
678
  nav #toc {
679
679
  padding: 0 1.5em;
680
680
  overflow: visible; } }
681
- #toc {
681
+ #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
682
682
  font-family: {{bodyfont}};
683
683
  font-weight: 400; }
684
- #toc ul {
684
+ #toc ul, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
685
685
  margin: 0;
686
686
  padding: 0;
687
687
  list-style: none; }
688
- #toc ul li a {
688
+ #toc ul li a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul li a {
689
689
  padding: 5px 10px; }
690
- #toc ul a {
690
+ #toc ul a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a {
691
691
  color: #141115;
692
692
  text-decoration: none;
693
693
  display: block; }
694
- #toc ul a:hover {
694
+ #toc ul a:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
695
695
  box-shadow: none;
696
696
  color: white; }
697
- #toc .h2 {
697
+ #toc .h2, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h2 {
698
698
  padding-left: 30px; }
699
- #toc .h3 {
699
+ #toc .h3, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
700
700
  padding-left: 50px; }
701
- #toc .toc-active, #toc li:hover {
701
+ #toc .toc-active, #toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
702
702
  background: #da1d52;
703
703
  box-shadow: inset -5px 0px 10px -5px #da1d52 !important; }
704
- #toc .toc-active a, #toc li:hover a {
704
+ #toc .toc-active a, #toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
705
705
  color: white; }
706
706
  @media print {
707
- #toc .toc-active, #toc li:hover {
707
+ #toc .toc-active, #toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
708
708
  background: white;
709
709
  box-shadow: none !important; }
710
- #toc .toc-active a {
710
+ #toc .toc-active a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
711
711
  color: #141115; }
712
- #toc li:hover a {
712
+ #toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
713
713
  color: black; } }
714
- #toc .h1 {
714
+ #toc .h1, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h1 {
715
715
  text-transform: uppercase; }
716
- #toc li a {
716
+ #toc li a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li a {
717
717
  font-size: {{normalfontsize}}; }
718
- #toc li:hover a {
718
+ #toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
719
719
  background: none;
720
720
  box-shadow: none; }
721
- #toc li:before {
721
+ #toc li:before, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:before {
722
722
  content: " ";
723
723
  display: none; }
724
724
  @media print {
725
- #toc .toc-active a {
725
+ #toc .toc-active a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
726
726
  color: #4D7EA5; }
727
- #toc .toc-active, #toc li:hover {
727
+ #toc .toc-active, #toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
728
728
  background: white;
729
729
  box-shadow: none !important; }
730
- #toc li:hover a {
730
+ #toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
731
731
  color: black; } }
732
+ #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
733
+ margin-top: 0;
734
+ margin-bottom: 0;
735
+ font-size: 100%; }
736
+
732
737
  #toc-list ul {
733
738
  margin-bottom: 0.25em; }
734
739
 
@@ -789,7 +794,7 @@ nav #toc {
789
794
  @media screen and (min-width: 768px) {
790
795
  h1.toc-contents {
791
796
  margin-top: 1em; }
792
- ul#toc-list {
797
+ ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
793
798
  padding: 0;
794
799
  margin: 0; } }
795
800
 
data/lib/isodoc/itu/html/htmlstyle.scss CHANGED
@@ -52,7 +52,7 @@ nav {
52
52
  }
53
53
  }
54
54
 
55
- #toc {
55
+ #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
56
56
  font-family: $bodyfont;
57
57
  font-weight: 400;
58
58
 
@@ -92,6 +92,13 @@ nav {
92
92
  }
93
93
  }
94
94
 
95
+ #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
96
+ margin-top: 0;
97
+ margin-bottom: 0;
98
+ font-size: 100%;
99
+ }
100
+
101
+
95
102
  #toc-list {
96
103
  ul {
97
104
  margin-bottom: 0.25em;
@@ -136,7 +143,7 @@ nav {
136
143
  margin-top: 1em;
137
144
  }
138
145
 
139
- ul#toc-list {
146
+ ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
140
147
  padding: 0;
141
148
  margin: 0;
142
149
  }
data/lib/isodoc/itu/html/itu.css CHANGED
@@ -913,7 +913,11 @@ div.WordSection1 {
913
913
  margin: 54.45pt 54.45pt 54.45pt 54.45pt;
914
914
  mso-header-margin: 24.1pt;
915
915
  mso-footer-margin: 24.1pt;
916
+ {% if doctype == "Service Publication" %}
917
+ mso-page-numbers: 1;
918
+ {% else %}
916
919
  mso-page-numbers: roman-lower 1;
920
+ {% endif %}
917
921
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2;
918
922
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
919
923
  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef2;
@@ -956,7 +960,10 @@ div.WordSection2 {
956
960
  margin: 2.0cm 2.0cm 2.0cm 2.0cm;
957
961
  mso-header-margin: 1.0cm;
958
962
  mso-footer-margin: 1.0cm;
963
+ {% if doctype == "Service Publication" %}
964
+ {% else %}
959
965
  mso-page-numbers: 1;
966
+ {% endif %}
960
967
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2;
961
968
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
962
969
  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef3;
@@ -1112,8 +1119,7 @@ div.example p.MsoListParagraph {
1112
1119
  font-size: 10.0pt; }
1113
1120
 
1114
1121
  div.Note p.MsoListParagraph {
1115
- font-size: {{smallerfontsize}};
1116
- margin-left: 1.0cm; }
1122
+ font-size: {{smallerfontsize}}; }
1117
1123
 
1118
1124
  div.Note span.stem {
1119
1125
  font-size: {{smallerfontsize}}; }
data/lib/isodoc/itu/html/itu.scss CHANGED
@@ -875,7 +875,11 @@ div.WordSection1
875
875
  margin:54.45pt 54.45pt 54.45pt 54.45pt;
876
876
  mso-header-margin:24.1pt;
877
877
  mso-footer-margin:24.1pt;
878
+ {% if doctype == "Service Publication" %}
879
+ mso-page-numbers:1;
880
+ {% else %}
878
881
  mso-page-numbers:roman-lower 1;
882
+ {% endif %}
879
883
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
880
884
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
881
885
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
@@ -918,7 +922,10 @@ div.WordSection2
918
922
  margin:2.0cm 2.0cm 2.0cm 2.0cm;
919
923
  mso-header-margin:1.0cm;
920
924
  mso-footer-margin:1.0cm;
925
+ {% if doctype == "Service Publication" %}
926
+ {% else %}
921
927
  mso-page-numbers:1;
928
+ {% endif %}
922
929
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
923
930
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
924
931
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
@@ -1069,7 +1076,6 @@ div.example p.MsoListParagraph {
1069
1076
 
1070
1077
  div.Note p.MsoListParagraph {
1071
1078
  font-size: $smallerfontsize;
1072
- margin-left: 1.0cm;
1073
1079
  }
1074
1080
 
1075
1081
  div.Note span.stem {
data/lib/isodoc/itu/html/word_itu_titlepage_sp.html CHANGED
@@ -35,7 +35,7 @@ lang="EN-GB" style='font-size:10.0pt'>{{ number_abbrev }} {{ docnumeric }} – {
35
35
  </td>
36
36
  <td width="548" style='width:411.1pt;padding:0cm 0cm 0cm 0cm;height:3.0cm;mso-height-rule:exactly'>
37
37
  <p class="MsoNormal" style='margin-top:0cm'><b style='mso-bidi-font-weight:
38
- normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'>{{ international_telecommunication_union | upcase }}</span></b></p>
38
+ normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'>{{ labels["international_telecommunication_union"] | upcase }}</span></b></p>
39
39
  </td>
40
40
  </tr>
41
41
  <tr style='mso-yfti-irow:1;page-break-inside:avoid;height:4.0cm;mso-height-rule:
@@ -48,8 +48,8 @@ normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'>{{
48
48
  <td width="548" style='width:411.1pt;padding:0cm 0cm 0cm 0cm;height:4.0cm;
49
49
  mso-height-rule:exactly'>
50
50
  <p class="MsoNormal" style='margin-top:0cm;text-align:left;'><b style='mso-bidi-font-weight:
51
- normal'><span lang="EN-GB" style='font-size:18.0pt;mso-bidi-font-size:10.0pt'>{% if bureau == "R" %}{{ br }}{% endif %}{% if bureau == "T" %}{{ tsb }}{% endif %}{% if bureau == "D" %}{{ bdt }}{% endif %}<br/>
52
- </span></b><b style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'>{% if bureau == "R" %}{{ br_full }}{% endif %}{% if bureau == "T" %}{{ tsb_full }}{% endif %}{% if bureau == "D" %}{{ bdt_full }}{% endif %}</span></b><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'><o:p></o:p></span></p>
51
+ normal'><span lang="EN-GB" style='font-size:18.0pt;mso-bidi-font-size:10.0pt'>{% if bureau == "R" %}{{ labels["br"] }}{% endif %}{% if bureau == "T" %}{{ labels["tsb"] }}{% endif %}{% if bureau == "D" %}{{ labels["bdt"] }}{% endif %}<br/>
52
+ </span></b><b style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'>{% if bureau == "R" %}{{ labels["br_full"] }}{% endif %}{% if bureau == "T" %}{{ labels["tsb_full"] }}{% endif %}{% if bureau == "D" %}{{ labels["bdt_full"] }}{% endif %}</span></b><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'><o:p></o:p></span></p>
53
53
  </td>
54
54
  </tr>
55
55
  <tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes;page-break-inside:avoid;
@@ -86,6 +86,7 @@ normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'>{{
86
86
  </td>
87
87
  <td width="548" style='width:411.1pt;padding:0cm 0cm 0cm 0cm'>
88
88
  <p class="MsoNormal"><b style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'>{{ doctitle }}</span></b></p>
89
+ {% if docsubtitle %}<p class="MsoNormal"><b style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'>{{ docsubtitle }}</span></b></p>{% endif %}
89
90
  {% if positiontitle %}<p class="MsoNormal"/>
90
91
  <p class="MsoNormal" style='font-size:14.0pt'>{{ positiontitle | upcase }}</p>{% endif %}
91
92
  </td>
data/lib/isodoc/itu/html/wordstyle.css CHANGED
@@ -100,9 +100,9 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph {
100
100
  mso-style-priority: 34;
101
101
  mso-style-unhide: no;
102
102
  mso-style-qformat: yes;
103
- margin-top: 0cm;
103
+ margin-top: 6.0pt;
104
104
  margin-right: 0cm;
105
- margin-bottom: 6.0pt;
105
+ margin-bottom: 0.0pt;
106
106
  text-align: justify;
107
107
  text-justify: inter-ideograph;
108
108
  /* do not put in margin-left, it is specific to list level */
@@ -118,9 +118,9 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
118
118
  mso-style-unhide: no;
119
119
  mso-style-qformat: yes;
120
120
  mso-style-type: export-only;
121
- margin-top: 0cm;
121
+ margin-top: 6.0pt;
122
122
  margin-right: 0cm;
123
- margin-bottom: 6.0pt;
123
+ margin-bottom: 0.0pt;
124
124
  text-align: justify;
125
125
  text-justify: inter-ideograph;
126
126
  /* do not put in margin-left, it is specific to list level */
@@ -136,9 +136,9 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
136
136
  mso-style-unhide: no;
137
137
  mso-style-qformat: yes;
138
138
  mso-style-type: export-only;
139
- margin-top: 0cm;
139
+ margin-top: 6.0pt;
140
140
  margin-right: 0cm;
141
- margin-bottom: 6.0pt;
141
+ margin-bottom: 0.0pt;
142
142
  text-align: justify;
143
143
  text-justify: inter-ideograph;
144
144
  /* do not put in margin-left, it is specific to list level */
@@ -154,9 +154,9 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
154
154
  mso-style-unhide: no;
155
155
  mso-style-qformat: yes;
156
156
  mso-style-type: export-only;
157
- margin-top: 0cm;
157
+ margin-top: 6.0pt;
158
158
  margin-right: 0cm;
159
- margin-bottom: 6.0pt;
159
+ margin-bottom: 0.0pt;
160
160
  text-align: justify;
161
161
  text-justify: inter-ideograph;
162
162
  /* do not put in margin-left, it is specific to list level */
data/lib/isodoc/itu/html/wordstyle.scss CHANGED
@@ -89,9 +89,9 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
89
89
  {mso-style-priority:34;
90
90
  mso-style-unhide:no;
91
91
  mso-style-qformat:yes;
92
- margin-top:0cm;
92
+ margin-top:6.0pt;
93
93
  margin-right:0cm;
94
- margin-bottom:6.0pt;
94
+ margin-bottom:0.0pt;
95
95
  text-align:justify;
96
96
  text-justify:inter-ideograph;
97
97
  /* do not put in margin-left, it is specific to list level */
@@ -106,9 +106,9 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
106
106
  mso-style-unhide:no;
107
107
  mso-style-qformat:yes;
108
108
  mso-style-type:export-only;
109
- margin-top:0cm;
109
+ margin-top:6.0pt;
110
110
  margin-right:0cm;
111
- margin-bottom:6.0pt;
111
+ margin-bottom:0.0pt;
112
112
  text-align:justify;
113
113
  text-justify:inter-ideograph;
114
114
  /* do not put in margin-left, it is specific to list level */
@@ -123,9 +123,9 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
123
123
  mso-style-unhide:no;
124
124
  mso-style-qformat:yes;
125
125
  mso-style-type:export-only;
126
- margin-top:0cm;
126
+ margin-top:6.0pt;
127
127
  margin-right:0cm;
128
- margin-bottom:6.0pt;
128
+ margin-bottom:0.0pt;
129
129
  text-align:justify;
130
130
  text-justify:inter-ideograph;
131
131
  /* do not put in margin-left, it is specific to list level */
@@ -140,9 +140,9 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
140
140
  mso-style-unhide:no;
141
141
  mso-style-qformat:yes;
142
142
  mso-style-type:export-only;
143
- margin-top:0cm;
143
+ margin-top:6.0pt;
144
144
  margin-right:0cm;
145
- margin-bottom:6.0pt;
145
+ margin-bottom:0.0pt;
146
146
  text-align:justify;
147
147
  text-justify:inter-ideograph;
148
148
  /* do not put in margin-left, it is specific to list level */