metanorma-un 0.10.3 → 0.10.5
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/isodoc/un/html/htmlstyle.css +8 -0
- data/lib/isodoc/un/html/htmlstyle.scss +7 -0
- data/lib/isodoc/un/html_convert.rb +17 -16
- data/lib/isodoc/un/un.plenary-attachment.xsl +408 -139
- data/lib/isodoc/un/un.plenary.xsl +408 -139
- data/lib/isodoc/un/un.recommendation.xsl +410 -139
- data/lib/metanorma/un/basicdoc.rng +0 -1
- data/lib/metanorma/un/biblio.rng +11 -1
- data/lib/metanorma/un/converter.rb +5 -5
- data/lib/metanorma/un/isodoc.rng +57 -296
- data/lib/metanorma/un/version.rb +1 -1
- data/metanorma-un.gemspec +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4c9e42af1a46f414fa008f1ac5884187a3100ee721181f36aa02745b8417f5b7
|
4
|
+
data.tar.gz: 9e76d11a8c635570cee7031c255ba07f43cac0ea1cc5749850bfdd8aa8def192
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3490d782db4f6cbbb2469fcc30964d03305b2af838e8aeefc16eb3d15ead29d37ad7d17d0f14faa8ab6cee6883ca58b174e62cfc607920b34806162379d0fbe8
|
7
|
+
data.tar.gz: a02f9f18408ef70b322840204ddf3c64db71703d0b18c062021835aaaf7351aa204d7ac020263aa2dcad9add6da54053ef4e40b6e5f51df4f4d9a034eed43f52
|
@@ -124,6 +124,10 @@ a.FootnoteRef + a.FootnoteRef:before {
|
|
124
124
|
content: ", ";
|
125
125
|
vertical-align: super; }
|
126
126
|
|
127
|
+
a.TableFootnoteRef + a.TableFootnoteRef:before {
|
128
|
+
content: ", ";
|
129
|
+
vertical-align: super; }
|
130
|
+
|
127
131
|
.addition {
|
128
132
|
color: blue; }
|
129
133
|
|
@@ -431,6 +435,10 @@ p {
|
|
431
435
|
max-width: 100%;
|
432
436
|
height: auto; }
|
433
437
|
|
438
|
+
table div.figure {
|
439
|
+
padding: 0;
|
440
|
+
margin: 0; }
|
441
|
+
|
434
442
|
/*
|
435
443
|
Document types + stages
|
436
444
|
*/
|
@@ -4,7 +4,6 @@ require "isodoc"
|
|
4
4
|
|
5
5
|
module IsoDoc
|
6
6
|
module UN
|
7
|
-
|
8
7
|
# A {Converter} implementation that generates HTML output, and a document
|
9
8
|
# schema encapsulation of the document for validation
|
10
9
|
#
|
@@ -17,14 +16,18 @@ module IsoDoc
|
|
17
16
|
def default_fonts(options)
|
18
17
|
{
|
19
18
|
bodyfont: (
|
20
|
-
options[:script] == "Hans"
|
21
|
-
|
22
|
-
|
19
|
+
if options[:script] == "Hans"
|
20
|
+
'"Source Han Sans",serif'
|
21
|
+
else
|
22
|
+
'"Times New Roman", serif'
|
23
|
+
end
|
23
24
|
),
|
24
25
|
headerfont: (
|
25
|
-
options[:script] == "Hans"
|
26
|
-
|
27
|
-
|
26
|
+
if options[:script] == "Hans"
|
27
|
+
'"Source Han Sans",sans-serif'
|
28
|
+
else
|
29
|
+
'"Times New Roman", serif'
|
30
|
+
end
|
28
31
|
),
|
29
32
|
monospacefont: '"Courier New",monospace',
|
30
33
|
normalfontsize: "15px",
|
@@ -40,11 +43,10 @@ module IsoDoc
|
|
40
43
|
}
|
41
44
|
end
|
42
45
|
|
43
|
-
|
44
46
|
def googlefonts
|
45
47
|
<<~HEAD.freeze
|
46
|
-
|
47
|
-
|
48
|
+
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet">
|
49
|
+
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400i,500,700,900" rel="stylesheet">
|
48
50
|
HEAD
|
49
51
|
end
|
50
52
|
|
@@ -64,7 +66,7 @@ module IsoDoc
|
|
64
66
|
end
|
65
67
|
|
66
68
|
def make_body3(body, docxml)
|
67
|
-
body.div
|
69
|
+
body.div class: "main-section" do |div3|
|
68
70
|
boilerplate docxml, div3
|
69
71
|
preface_block docxml, div3
|
70
72
|
abstract docxml, div3
|
@@ -88,8 +90,8 @@ module IsoDoc
|
|
88
90
|
def introduction(isoxml, out)
|
89
91
|
f = isoxml.at(ns("//introduction")) || return
|
90
92
|
page_break(out)
|
91
|
-
out.div
|
92
|
-
clause_name(
|
93
|
+
out.div class: "Section3", id: f["id"] do |div|
|
94
|
+
clause_name(f, f.at(ns("./title")), div, { class: "IntroTitle" })
|
93
95
|
f.elements.each do |e|
|
94
96
|
parse(e, div) unless e.name == "title"
|
95
97
|
end
|
@@ -100,8 +102,8 @@ module IsoDoc
|
|
100
102
|
f = isoxml.at(ns("//foreword")) || return
|
101
103
|
page_break(out)
|
102
104
|
out.div **attr_code(id: f["id"]) do |s|
|
103
|
-
clause_name(
|
104
|
-
|
105
|
+
clause_name(f, f.at(ns("./title")) || @i18n.foreword, s,
|
106
|
+
class: "ForewordTitle")
|
105
107
|
f.elements.each { |e| parse(e, s) unless e.name == "title" }
|
106
108
|
end
|
107
109
|
end
|
@@ -111,4 +113,3 @@ module IsoDoc
|
|
111
113
|
end
|
112
114
|
end
|
113
115
|
end
|
114
|
-
|