metanorma-generic 1.10.2 → 1.10.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 15f20c2ff6ac5b4bd0c8225e2c2e90eccc45535e37ed0aa1a2d5d644aa66edab
4
- data.tar.gz: b8334113bb3b81424dded4d127fdabf2767441201c5a4509d9282b280304d004
3
+ metadata.gz: 25641110b45e76829391dc1a8d7558ed8a57b1c205ed3edd68b7691e13efffa4
4
+ data.tar.gz: 7370721bedccaca54ee3277d9d03a96af28582c3a787b75900971e812992b4f0
5
5
  SHA512:
6
- metadata.gz: 45cb75656b843384c91ce95588e490515cb8aeec3c3288359cd755c89a988d6d4821a0990a83c9c94776822a3d9df09ccc518934d8a8180364e9a3c0465e8435
7
- data.tar.gz: c539dee549b527bb65f52272caaed23924139b06cc822272589a49a14dff01c826f4d2cb33a931e8d571b9b7466395935eff8d4893b4fd2b47a047b78d85acc7
6
+ metadata.gz: 783da8466b07f8e9afc0bb8553e1363b8587a4b5883371b0db5611f53fce39a2ae2dd990c556e65424511bf4241f451d9efc3cddbf75644f9d93760416477aad
7
+ data.tar.gz: 4dac2a50657d08b05e23e4c3e2ad59c200d9a3413e1ec37077b233a4a6c4b9e3ec31deb25d40f278dfe2e77460fbc21237b1461995da82fed95eae7aa4f02521
@@ -32,6 +32,18 @@
32
32
  <ref name="DocumentType"/>
33
33
  </element>
34
34
  </define>
35
+ <define name="section-title">
36
+ <element name="title">
37
+ <zeroOrMore>
38
+ <ref name="TextElement"/>
39
+ </zeroOrMore>
40
+ </element>
41
+ <zeroOrMore>
42
+ <element name="variant-title">
43
+ <ref name="TypedTitleString"/>
44
+ </element>
45
+ </zeroOrMore>
46
+ </define>
35
47
  <define name="hyperlink">
36
48
  <element name="link">
37
49
  <attribute name="target">
@@ -204,6 +216,18 @@
204
216
  </zeroOrMore>
205
217
  </element>
206
218
  </define>
219
+ <define name="dt">
220
+ <element name="dt">
221
+ <optional>
222
+ <attribute name="id">
223
+ <data type="ID"/>
224
+ </attribute>
225
+ </optional>
226
+ <zeroOrMore>
227
+ <ref name="TextElement"/>
228
+ </zeroOrMore>
229
+ </element>
230
+ </define>
207
231
  <define name="example">
208
232
  <element name="example">
209
233
  <attribute name="id">
@@ -899,7 +923,7 @@
899
923
  </include>
900
924
  <!-- end overrides -->
901
925
  <define name="docsubtype">
902
- <element name="docsubtype">
926
+ <element name="subdoctype">
903
927
  <ref name="DocumentSubtype"/>
904
928
  </element>
905
929
  </define>
@@ -954,6 +978,16 @@
954
978
  </define>
955
979
  <define name="concept">
956
980
  <element name="concept">
981
+ <optional>
982
+ <attribute name="ital">
983
+ <data type="boolean"/>
984
+ </attribute>
985
+ </optional>
986
+ <optional>
987
+ <attribute name="ref">
988
+ <data type="boolean"/>
989
+ </attribute>
990
+ </optional>
957
991
  <optional>
958
992
  <element name="refterm">
959
993
  <zeroOrMore>
@@ -989,8 +1023,14 @@
989
1023
  <ref name="imagemap"/>
990
1024
  <ref name="svgmap"/>
991
1025
  <ref name="inputform"/>
1026
+ <ref name="toc"/>
992
1027
  </choice>
993
1028
  </define>
1029
+ <define name="toc">
1030
+ <element name="toc">
1031
+ <ref name="ul"/>
1032
+ </element>
1033
+ </define>
994
1034
  <define name="inputform">
995
1035
  <element name="form">
996
1036
  <attribute name="id">
@@ -998,6 +1038,9 @@
998
1038
  </attribute>
999
1039
  <attribute name="name"/>
1000
1040
  <attribute name="action"/>
1041
+ <optional>
1042
+ <attribute name="class"/>
1043
+ </optional>
1001
1044
  <zeroOrMore>
1002
1045
  <choice>
1003
1046
  <ref name="TextElement"/>
@@ -1229,6 +1272,12 @@
1229
1272
  <optional>
1230
1273
  <attribute name="type"/>
1231
1274
  </optional>
1275
+ <optional>
1276
+ <attribute name="identifier"/>
1277
+ </optional>
1278
+ <optional>
1279
+ <attribute name="prefix"/>
1280
+ </optional>
1232
1281
  <text/>
1233
1282
  </define>
1234
1283
  <define name="ics">
@@ -1490,26 +1539,26 @@
1490
1539
  <optional>
1491
1540
  <ref name="section-title"/>
1492
1541
  </optional>
1493
- <group>
1542
+ <choice>
1494
1543
  <choice>
1495
1544
  <group>
1496
- <zeroOrMore>
1545
+ <oneOrMore>
1497
1546
  <ref name="BasicBlock"/>
1498
- </zeroOrMore>
1547
+ </oneOrMore>
1499
1548
  <zeroOrMore>
1500
1549
  <ref name="note"/>
1501
1550
  </zeroOrMore>
1502
1551
  </group>
1503
1552
  <ref name="amend"/>
1504
1553
  </choice>
1505
- <zeroOrMore>
1554
+ <oneOrMore>
1506
1555
  <choice>
1507
1556
  <ref name="clause-subsection"/>
1508
1557
  <ref name="terms"/>
1509
1558
  <ref name="definitions"/>
1510
1559
  </choice>
1511
- </zeroOrMore>
1512
- </group>
1560
+ </oneOrMore>
1561
+ </choice>
1513
1562
  </define>
1514
1563
  <define name="Annex-Section">
1515
1564
  <optional>
@@ -64,9 +64,9 @@
64
64
  <optional>
65
65
  <ref name="label"/>
66
66
  </optional>
67
- <optional>
67
+ <zeroOrMore>
68
68
  <ref name="subject"/>
69
- </optional>
69
+ </zeroOrMore>
70
70
  <zeroOrMore>
71
71
  <ref name="reqinherit"/>
72
72
  </zeroOrMore>
@@ -80,6 +80,7 @@
80
80
  <ref name="verification"/>
81
81
  <ref name="import"/>
82
82
  <ref name="description"/>
83
+ <ref name="component"/>
83
84
  </choice>
84
85
  </zeroOrMore>
85
86
  <optional>
@@ -105,12 +106,16 @@
105
106
  </define>
106
107
  <define name="subject">
107
108
  <element name="subject">
108
- <text/>
109
+ <oneOrMore>
110
+ <ref name="TextElement"/>
111
+ </oneOrMore>
109
112
  </element>
110
113
  </define>
111
114
  <define name="reqinherit">
112
115
  <element name="inherit">
113
- <text/>
116
+ <oneOrMore>
117
+ <ref name="TextElement"/>
118
+ </oneOrMore>
114
119
  </element>
115
120
  </define>
116
121
  <define name="measurementtarget">
@@ -138,6 +143,12 @@
138
143
  <ref name="RequirementSubpart"/>
139
144
  </element>
140
145
  </define>
146
+ <define name="component">
147
+ <element name="component">
148
+ <attribute name="class"/>
149
+ <ref name="RequirementSubpart"/>
150
+ </element>
151
+ </define>
141
152
  <define name="reqt_references">
142
153
  <element name="references">
143
154
  <oneOrMore>
@@ -1,6 +1,5 @@
1
1
  require "isodoc/generic/metadata"
2
2
  require "isodoc/generic/html_convert"
3
- require "isodoc/generic/pdf_convert"
4
3
  require "isodoc/generic/word_convert"
5
4
  require "isodoc/generic/presentation_xml_convert"
6
5
 
@@ -17,7 +17,6 @@ module Metanorma
17
17
  super.merge(
18
18
  html: "html",
19
19
  doc: "doc",
20
- pdf: "pdf"
21
20
  )
22
21
  end
23
22
 
@@ -44,8 +43,6 @@ module Metanorma
44
43
  IsoDoc::Generic::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
45
44
  when :doc
46
45
  IsoDoc::Generic::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
47
- when :pdf
48
- IsoDoc::Generic::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
49
46
  when :presentation
50
47
  IsoDoc::Generic::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
51
48
  else
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Generic
3
- VERSION = "1.10.2".freeze
3
+ VERSION = "1.10.3".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-generic
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.10.2
4
+ version: 1.10.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: 2021-07-05 00:00:00.000000000 Z
11
+ date: 2021-08-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
@@ -251,7 +251,6 @@ files:
251
251
  - lib/isodoc/generic/i18n.rb
252
252
  - lib/isodoc/generic/init.rb
253
253
  - lib/isodoc/generic/metadata.rb
254
- - lib/isodoc/generic/pdf_convert.rb
255
254
  - lib/isodoc/generic/presentation_xml_convert.rb
256
255
  - lib/isodoc/generic/utils.rb
257
256
  - lib/isodoc/generic/word_convert.rb
@@ -1,66 +0,0 @@
1
- require_relative "base_convert"
2
- require_relative "init"
3
- require "isodoc"
4
-
5
- module IsoDoc
6
- module Generic
7
- # A {Converter} implementation that generates PDF HTML output, and a
8
- # document schema encapsulation of the document for validation
9
- class PdfConvert < IsoDoc::PdfConvert
10
- def initialize(options)
11
- @libdir = File.dirname(__FILE__)
12
- super
13
- end
14
-
15
- class << self
16
- attr_accessor :_file
17
- end
18
-
19
- def self.inherited( k )
20
- k._file = caller_locations.first.absolute_path
21
- end
22
-
23
- def default_fonts(options)
24
- {
25
- bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif'
26
- : configuration.html_bodyfont || '"Overpass",sans-serif'),
27
- headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' :
28
- configuration.html_headerfont || '"Overpass",sans-serif'),
29
- monospacefont: configuration.html_monospacefont || '"Space Mono",monospace'
30
- }.transform_values { |v| v&.empty? ? nil : v }
31
- end
32
-
33
- def default_file_locations(_options)
34
- {
35
- htmlstylesheet: baselocation(configuration.htmlstylesheet) ||
36
- html_doc_path("htmlstyle.scss"),
37
- htmlcoverpage: baselocation(configuration.htmlcoverpage) ||
38
- html_doc_path("html_generic_titlepage.html"),
39
- htmlintropage: baselocation(configuration.htmlintropage) ||
40
- html_doc_path("html_generic_intro.html"),
41
- scripts_pdf: baselocation(configuration.scripts_pdf) ||
42
- html_doc_path("scripts.pdf.html")
43
- }.transform_values { |v| v&.empty? ? nil : v }
44
- end
45
-
46
- def googlefonts
47
- <<~HEAD.freeze
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=Overpass:300,300i,600,900" rel="stylesheet">
50
- HEAD
51
- end
52
-
53
- def html_toc(docxml)
54
- docxml
55
- end
56
-
57
- def configuration
58
- Metanorma::Generic.configuration
59
- end
60
-
61
- include BaseConvert
62
- include Init
63
- end
64
- end
65
- end
66
-