metanorma-un 0.9.0 → 0.9.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/un/html/htmlstyle.css +6 -0
- data/lib/isodoc/un/html/htmlstyle.scss +1 -0
- data/lib/isodoc/un/html/unece.css +18 -12
- data/lib/isodoc/un/html/unece.scss +17 -10
- data/lib/isodoc/un/html/word_unece_titlepage.html +4 -4
- data/lib/isodoc/un/i18n.rb +1 -1
- data/lib/isodoc/un/presentation_xml_convert.rb +1 -1
- data/lib/isodoc/un/un.plenary-attachment.xsl +1343 -274
- data/lib/isodoc/un/un.plenary.xsl +1343 -274
- data/lib/isodoc/un/un.recommendation.xsl +1340 -271
- data/lib/isodoc/un/word_convert.rb +27 -21
- data/lib/metanorma/un/biblio.rng +134 -39
- data/lib/metanorma/un/isodoc.rng +16 -0
- data/lib/metanorma/un/version.rb +1 -1
- metadata +3 -3
|
@@ -16,19 +16,25 @@ module IsoDoc
|
|
|
16
16
|
|
|
17
17
|
def default_fonts(options)
|
|
18
18
|
{
|
|
19
|
-
bodyfont: (options[:script] == "Hans"
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
'"Times New Roman",serif'
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
19
|
+
bodyfont: (if options[:script] == "Hans"
|
|
20
|
+
'"Source Han Sans",serif'
|
|
21
|
+
else
|
|
22
|
+
'"Times New Roman",serif'
|
|
23
|
+
end),
|
|
24
|
+
headerfont: (if options[:script] == "Hans"
|
|
25
|
+
'"Source Han Sans",sans-serif'
|
|
26
|
+
else
|
|
27
|
+
'"Times New Roman",serif'
|
|
28
|
+
end),
|
|
29
|
+
monospacefont: '"Courier New",monospace',
|
|
30
|
+
normalfontsize: "10.5pt",
|
|
31
|
+
monospacefontsize: "10.0pt",
|
|
32
|
+
smallerfontsize: "10.0pt",
|
|
33
|
+
footnotefontsize: "9.0pt",
|
|
28
34
|
}
|
|
29
35
|
end
|
|
30
36
|
|
|
31
|
-
def default_file_locations(
|
|
37
|
+
def default_file_locations(_options)
|
|
32
38
|
{
|
|
33
39
|
wordstylesheet: html_doc_path("wordstyle.scss"),
|
|
34
40
|
standardstylesheet: html_doc_path("unece.scss"),
|
|
@@ -40,11 +46,11 @@ module IsoDoc
|
|
|
40
46
|
}
|
|
41
47
|
end
|
|
42
48
|
|
|
43
|
-
def footnotes(
|
|
49
|
+
def footnotes(_div)
|
|
44
50
|
if @meta.get[:item_footnote]
|
|
45
51
|
fn = noko do |xml|
|
|
46
|
-
xml.aside **{ id: "ftnitem" } do |
|
|
47
|
-
|
|
52
|
+
xml.aside **{ id: "ftnitem" } do |d|
|
|
53
|
+
d.p @meta.get[:item_footnote]
|
|
48
54
|
end
|
|
49
55
|
end.join("\n")
|
|
50
56
|
@footnotes.unshift fn
|
|
@@ -77,18 +83,18 @@ module IsoDoc
|
|
|
77
83
|
introduction docxml, div2
|
|
78
84
|
preface docxml, div2
|
|
79
85
|
acknowledgements docxml, div2
|
|
80
|
-
div2.p { |p| p << "
|
|
86
|
+
div2.p { |p| p << " " } # placeholder
|
|
81
87
|
end
|
|
82
88
|
section_break(body)
|
|
83
89
|
end
|
|
84
90
|
|
|
85
91
|
ENDLINE = <<~END.freeze
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
+
<v:line
|
|
93
|
+
alt="" style='position:absolute;left:0;text-align:left;z-index:251662848;
|
|
94
|
+
mso-wrap-edited:f;mso-width-percent:0;mso-height-percent:0;
|
|
95
|
+
mso-width-percent:0;mso-height-percent:0'
|
|
96
|
+
from="6.375cm,20.95pt" to="10.625cm,20.95pt"
|
|
97
|
+
strokeweight="1.5pt"/>
|
|
92
98
|
END
|
|
93
99
|
|
|
94
100
|
def end_line(_isoxml, out)
|
|
@@ -138,7 +144,7 @@ module IsoDoc
|
|
|
138
144
|
abstract.parent = (abstractbox || preface_container) if abstract &&
|
|
139
145
|
(abstractbox || preface_container)
|
|
140
146
|
abstractbox and abstract&.xpath(".//p/br")&.each do |a|
|
|
141
|
-
a.parent.remove if /page-break-before:always/.match(a["style"])
|
|
147
|
+
a.parent.remove if /page-break-before:always/.match?(a["style"])
|
|
142
148
|
end
|
|
143
149
|
docxml&.at("//p[@class = 'AbstractTitle']")&.remove if abstractbox
|
|
144
150
|
foreword.parent = preface_container if foreword && preface_container
|
data/lib/metanorma/un/biblio.rng
CHANGED
|
@@ -614,12 +614,103 @@
|
|
|
614
614
|
<optional>
|
|
615
615
|
<ref name="fetched"/>
|
|
616
616
|
</optional>
|
|
617
|
-
<
|
|
618
|
-
<oneOrMore>
|
|
619
|
-
<ref name="btitle"/>
|
|
620
|
-
</oneOrMore>
|
|
617
|
+
<optional>
|
|
621
618
|
<ref name="formattedref"/>
|
|
622
|
-
</
|
|
619
|
+
</optional>
|
|
620
|
+
<oneOrMore>
|
|
621
|
+
<ref name="btitle"/>
|
|
622
|
+
</oneOrMore>
|
|
623
|
+
<zeroOrMore>
|
|
624
|
+
<ref name="bsource"/>
|
|
625
|
+
</zeroOrMore>
|
|
626
|
+
<oneOrMore>
|
|
627
|
+
<ref name="docidentifier"/>
|
|
628
|
+
</oneOrMore>
|
|
629
|
+
<optional>
|
|
630
|
+
<ref name="docnumber"/>
|
|
631
|
+
</optional>
|
|
632
|
+
<zeroOrMore>
|
|
633
|
+
<ref name="bdate"/>
|
|
634
|
+
</zeroOrMore>
|
|
635
|
+
<zeroOrMore>
|
|
636
|
+
<ref name="contributor"/>
|
|
637
|
+
</zeroOrMore>
|
|
638
|
+
<optional>
|
|
639
|
+
<ref name="edition"/>
|
|
640
|
+
</optional>
|
|
641
|
+
<zeroOrMore>
|
|
642
|
+
<ref name="version"/>
|
|
643
|
+
</zeroOrMore>
|
|
644
|
+
<zeroOrMore>
|
|
645
|
+
<ref name="biblionote"/>
|
|
646
|
+
</zeroOrMore>
|
|
647
|
+
<zeroOrMore>
|
|
648
|
+
<ref name="language"/>
|
|
649
|
+
</zeroOrMore>
|
|
650
|
+
<zeroOrMore>
|
|
651
|
+
<ref name="script"/>
|
|
652
|
+
</zeroOrMore>
|
|
653
|
+
<zeroOrMore>
|
|
654
|
+
<ref name="bibabstract"/>
|
|
655
|
+
</zeroOrMore>
|
|
656
|
+
<optional>
|
|
657
|
+
<ref name="status"/>
|
|
658
|
+
</optional>
|
|
659
|
+
<zeroOrMore>
|
|
660
|
+
<ref name="copyright"/>
|
|
661
|
+
</zeroOrMore>
|
|
662
|
+
<zeroOrMore>
|
|
663
|
+
<ref name="docrelation"/>
|
|
664
|
+
</zeroOrMore>
|
|
665
|
+
<zeroOrMore>
|
|
666
|
+
<ref name="series"/>
|
|
667
|
+
</zeroOrMore>
|
|
668
|
+
<optional>
|
|
669
|
+
<ref name="medium"/>
|
|
670
|
+
</optional>
|
|
671
|
+
<zeroOrMore>
|
|
672
|
+
<ref name="bplace"/>
|
|
673
|
+
</zeroOrMore>
|
|
674
|
+
<zeroOrMore>
|
|
675
|
+
<ref name="bprice"/>
|
|
676
|
+
</zeroOrMore>
|
|
677
|
+
<zeroOrMore>
|
|
678
|
+
<ref name="extent"/>
|
|
679
|
+
</zeroOrMore>
|
|
680
|
+
<optional>
|
|
681
|
+
<ref name="bibliographic_size"/>
|
|
682
|
+
</optional>
|
|
683
|
+
<zeroOrMore>
|
|
684
|
+
<ref name="accesslocation"/>
|
|
685
|
+
</zeroOrMore>
|
|
686
|
+
<zeroOrMore>
|
|
687
|
+
<ref name="license"/>
|
|
688
|
+
</zeroOrMore>
|
|
689
|
+
<zeroOrMore>
|
|
690
|
+
<ref name="bclassification"/>
|
|
691
|
+
</zeroOrMore>
|
|
692
|
+
<zeroOrMore>
|
|
693
|
+
<ref name="bkeyword"/>
|
|
694
|
+
</zeroOrMore>
|
|
695
|
+
<optional>
|
|
696
|
+
<ref name="validity"/>
|
|
697
|
+
</optional>
|
|
698
|
+
</define>
|
|
699
|
+
<define name="ReducedBibliographicItem">
|
|
700
|
+
<optional>
|
|
701
|
+
<attribute name="type">
|
|
702
|
+
<ref name="BibItemType"/>
|
|
703
|
+
</attribute>
|
|
704
|
+
</optional>
|
|
705
|
+
<optional>
|
|
706
|
+
<ref name="fetched"/>
|
|
707
|
+
</optional>
|
|
708
|
+
<optional>
|
|
709
|
+
<ref name="formattedref"/>
|
|
710
|
+
</optional>
|
|
711
|
+
<zeroOrMore>
|
|
712
|
+
<ref name="btitle"/>
|
|
713
|
+
</zeroOrMore>
|
|
623
714
|
<zeroOrMore>
|
|
624
715
|
<ref name="bsource"/>
|
|
625
716
|
</zeroOrMore>
|
|
@@ -638,9 +729,9 @@
|
|
|
638
729
|
<optional>
|
|
639
730
|
<ref name="edition"/>
|
|
640
731
|
</optional>
|
|
641
|
-
<
|
|
732
|
+
<zeroOrMore>
|
|
642
733
|
<ref name="version"/>
|
|
643
|
-
</
|
|
734
|
+
</zeroOrMore>
|
|
644
735
|
<zeroOrMore>
|
|
645
736
|
<ref name="biblionote"/>
|
|
646
737
|
</zeroOrMore>
|
|
@@ -833,6 +924,12 @@
|
|
|
833
924
|
<data type="boolean"/>
|
|
834
925
|
</attribute>
|
|
835
926
|
</optional>
|
|
927
|
+
<optional>
|
|
928
|
+
<attribute name="language"/>
|
|
929
|
+
</optional>
|
|
930
|
+
<optional>
|
|
931
|
+
<attribute name="script"/>
|
|
932
|
+
</optional>
|
|
836
933
|
<text/>
|
|
837
934
|
</element>
|
|
838
935
|
</define>
|
|
@@ -986,36 +1083,34 @@
|
|
|
986
1083
|
<ref name="SeriesType"/>
|
|
987
1084
|
</attribute>
|
|
988
1085
|
</optional>
|
|
989
|
-
<
|
|
1086
|
+
<optional>
|
|
990
1087
|
<ref name="formattedref"/>
|
|
991
|
-
|
|
992
|
-
|
|
993
|
-
|
|
994
|
-
|
|
995
|
-
|
|
996
|
-
|
|
997
|
-
|
|
998
|
-
|
|
999
|
-
|
|
1000
|
-
|
|
1001
|
-
|
|
1002
|
-
|
|
1003
|
-
|
|
1004
|
-
|
|
1005
|
-
|
|
1006
|
-
|
|
1007
|
-
|
|
1008
|
-
|
|
1009
|
-
|
|
1010
|
-
|
|
1011
|
-
|
|
1012
|
-
|
|
1013
|
-
|
|
1014
|
-
|
|
1015
|
-
|
|
1016
|
-
|
|
1017
|
-
</group>
|
|
1018
|
-
</choice>
|
|
1088
|
+
</optional>
|
|
1089
|
+
<ref name="btitle"/>
|
|
1090
|
+
<optional>
|
|
1091
|
+
<ref name="bplace"/>
|
|
1092
|
+
</optional>
|
|
1093
|
+
<optional>
|
|
1094
|
+
<ref name="seriesorganization"/>
|
|
1095
|
+
</optional>
|
|
1096
|
+
<optional>
|
|
1097
|
+
<ref name="abbreviation"/>
|
|
1098
|
+
</optional>
|
|
1099
|
+
<optional>
|
|
1100
|
+
<ref name="seriesfrom"/>
|
|
1101
|
+
</optional>
|
|
1102
|
+
<optional>
|
|
1103
|
+
<ref name="seriesto"/>
|
|
1104
|
+
</optional>
|
|
1105
|
+
<optional>
|
|
1106
|
+
<ref name="seriesnumber"/>
|
|
1107
|
+
</optional>
|
|
1108
|
+
<optional>
|
|
1109
|
+
<ref name="seriespartnumber"/>
|
|
1110
|
+
</optional>
|
|
1111
|
+
<optional>
|
|
1112
|
+
<ref name="seriesrun"/>
|
|
1113
|
+
</optional>
|
|
1019
1114
|
</element>
|
|
1020
1115
|
</define>
|
|
1021
1116
|
<define name="SeriesType">
|
|
@@ -1174,7 +1269,7 @@
|
|
|
1174
1269
|
</element>
|
|
1175
1270
|
</optional>
|
|
1176
1271
|
<element name="bibitem">
|
|
1177
|
-
<ref name="
|
|
1272
|
+
<ref name="ReducedBibliographicItem"/>
|
|
1178
1273
|
</element>
|
|
1179
1274
|
<choice>
|
|
1180
1275
|
<zeroOrMore>
|
|
@@ -1199,9 +1294,9 @@
|
|
|
1199
1294
|
<optional>
|
|
1200
1295
|
<ref name="revision-date"/>
|
|
1201
1296
|
</optional>
|
|
1202
|
-
<
|
|
1297
|
+
<optional>
|
|
1203
1298
|
<ref name="draft"/>
|
|
1204
|
-
</
|
|
1299
|
+
</optional>
|
|
1205
1300
|
</element>
|
|
1206
1301
|
</define>
|
|
1207
1302
|
<define name="vedition">
|
data/lib/metanorma/un/isodoc.rng
CHANGED
|
@@ -282,6 +282,9 @@
|
|
|
282
282
|
<ref name="MultilingualRenderingType"/>
|
|
283
283
|
</attribute>
|
|
284
284
|
</optional>
|
|
285
|
+
<optional>
|
|
286
|
+
<ref name="tname"/>
|
|
287
|
+
</optional>
|
|
285
288
|
<oneOrMore>
|
|
286
289
|
<ref name="ul_li"/>
|
|
287
290
|
</oneOrMore>
|
|
@@ -324,6 +327,9 @@
|
|
|
324
327
|
</choice>
|
|
325
328
|
</attribute>
|
|
326
329
|
</optional>
|
|
330
|
+
<optional>
|
|
331
|
+
<ref name="tname"/>
|
|
332
|
+
</optional>
|
|
327
333
|
<oneOrMore>
|
|
328
334
|
<ref name="li"/>
|
|
329
335
|
</oneOrMore>
|
|
@@ -360,6 +366,9 @@
|
|
|
360
366
|
<ref name="MultilingualRenderingType"/>
|
|
361
367
|
</attribute>
|
|
362
368
|
</optional>
|
|
369
|
+
<optional>
|
|
370
|
+
<ref name="tname"/>
|
|
371
|
+
</optional>
|
|
363
372
|
<oneOrMore>
|
|
364
373
|
<ref name="dt"/>
|
|
365
374
|
<ref name="dd"/>
|
|
@@ -694,6 +703,9 @@
|
|
|
694
703
|
<optional>
|
|
695
704
|
<attribute name="tag"/>
|
|
696
705
|
</optional>
|
|
706
|
+
<optional>
|
|
707
|
+
<attribute name="type"/>
|
|
708
|
+
</optional>
|
|
697
709
|
<optional>
|
|
698
710
|
<attribute name="multilingual-rendering">
|
|
699
711
|
<ref name="MultilingualRenderingType"/>
|
|
@@ -729,6 +741,9 @@
|
|
|
729
741
|
<optional>
|
|
730
742
|
<attribute name="tag"/>
|
|
731
743
|
</optional>
|
|
744
|
+
<optional>
|
|
745
|
+
<attribute name="type"/>
|
|
746
|
+
</optional>
|
|
732
747
|
<optional>
|
|
733
748
|
<attribute name="multilingual-rendering">
|
|
734
749
|
<ref name="MultilingualRenderingType"/>
|
|
@@ -2050,6 +2065,7 @@
|
|
|
2050
2065
|
<value>compare</value>
|
|
2051
2066
|
<value>contrast</value>
|
|
2052
2067
|
<value>see</value>
|
|
2068
|
+
<value>seealso</value>
|
|
2053
2069
|
</choice>
|
|
2054
2070
|
</define>
|
|
2055
2071
|
<define name="deprecates">
|
data/lib/metanorma/un/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-un
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.9.
|
|
4
|
+
version: 0.9.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2022-
|
|
11
|
+
date: 2022-06-21 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: iso-639
|
|
@@ -291,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
291
291
|
- !ruby/object:Gem::Version
|
|
292
292
|
version: '0'
|
|
293
293
|
requirements: []
|
|
294
|
-
rubygems_version: 3.3.
|
|
294
|
+
rubygems_version: 3.3.16
|
|
295
295
|
signing_key:
|
|
296
296
|
specification_version: 4
|
|
297
297
|
summary: Metanorma for UN.
|