metanorma-ogc 2.3.0 → 2.3.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -123,11 +123,6 @@ module IsoDoc
123
123
  super
124
124
  end
125
125
 
126
- def section(docxml)
127
- super
128
- references(docxml)
129
- end
130
-
131
126
  def bibdata(docxml)
132
127
  docxml.xpath(ns("//bibdata/contributor[@type = 'author']")).each do |a|
133
128
  a.at(ns("./description"))&.text == "contributor" and
@@ -189,7 +184,7 @@ module IsoDoc
189
184
  def bibrender_relaton(xml, renderings)
190
185
  f = renderings[xml["id"]][:formattedref]
191
186
  f &&= "<formattedref>#{f}</formattedref>"
192
- keep = "./docidentifier | ./uri | ./note | ./status"
187
+ keep = "./docidentifier | ./uri | ./note | ./status | ./biblio-tag"
193
188
  xml.children = "#{f}#{xml.xpath(ns(keep)).to_xml}"
194
189
  end
195
190
 
@@ -208,6 +203,18 @@ module IsoDoc
208
203
  display_order_xpath(docxml, "//indexsect", i)
209
204
  end
210
205
 
206
+ def norm_ref_entry_code(_ordinal, _idents, _ids, _standard, _datefn)
207
+ ""
208
+ end
209
+
210
+ # if ids is just a number, only use that ([1] Non-Standard)
211
+ # else, use both ordinal, as prefix, and ids
212
+ def biblio_ref_entry_code(ordinal, ids, _id, standard, datefn)
213
+ standard and return "[#{ordinal}]<tab/>"
214
+ ret = (ids[:ordinal] || ids[:metanorma] || "[#{ordinal}]")
215
+ prefix_bracketed_ref("#{ret}#{datefn}")
216
+ end
217
+
211
218
  include Init
212
219
  end
213
220
  end
@@ -4,90 +4,24 @@
4
4
  <title>Copyright notice</title>
5
5
 
6
6
  <p align="center">Copyright
7
- © {{ docyear }} Open Geospatial Consortium<br/>
8
- To obtain additional rights of use, visit
9
- <link target="http://www.ogc.org/legal/">http://www.ogc.org/legal/</link></p>
10
- </clause>
11
- <clause>
12
- <title>Note</title>
13
- <p align="left">Attention is drawn to the possibility that some of the elements of this document may be the subject of patent rights. The Open Geospatial Consortium shall not be held responsible for identifying any or all such patent rights.</p>
14
-
15
- <p align="left">Recipients of this document are requested to submit, with their comments, notification of any relevant patent claims or other intellectual property rights of which they may be aware that might be infringed by any implementation of the standard set forth in this document, and to provide supporting documentation.</p>
16
- </clause>
17
- </copyright-statement>
18
- <license-statement>
19
- <clause>
20
- <title>License Agreement</title>
21
-
22
- <p>Permission is hereby granted by the Open Geospatial
23
- Consortium, ("Licensor"), free of charge and subject to the terms set
24
- forth below, to any person obtaining a copy of this Intellectual Property and
25
- any associated documentation, to deal in the Intellectual Property without
26
- restriction (except as set forth below), including without limitation the
27
- rights to implement, use, copy, modify, merge, publish, distribute, and/or
28
- sublicense copies of the Intellectual Property, and to permit persons to whom
29
- the Intellectual Property is furnished to do so, provided that all copyright notices
30
- on the intellectual property are retained intact and that each person to whom
31
- the Intellectual Property is furnished agrees to the terms of this Agreement.</p>
32
-
33
- <p>If you modify the Intellectual Property, all copies of
34
- the modified Intellectual Property must include, in addition to the above
35
- copyright notice, a notice that the Intellectual Property includes
36
- modifications that have not been approved or adopted by LICENSOR.</p>
37
-
38
- <p>THIS LICENSE IS A COPYRIGHT LICENSE ONLY, AND DOES NOT
39
- CONVEY ANY RIGHTS UNDER ANY PATENTS THAT MAY BE IN FORCE ANYWHERE IN THE WORLD.
40
- THE INTELLECTUAL PROPERTY IS PROVIDED "AS
41
- IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
42
- LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
43
- AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. THE COPYRIGHT HOLDER OR HOLDERS
44
- INCLUDED IN THIS NOTICE DO NOT WARRANT THAT THE FUNCTIONS CONTAINED IN THE
45
- INTELLECTUAL PROPERTY WILL MEET YOUR REQUIREMENTS OR THAT THE OPERATION OF THE
46
- INTELLECTUAL PROPERTY WILL BE UNINTERRUPTED OR ERROR FREE. ANY USE OF THE
47
- INTELLECTUAL PROPERTY SHALL BE MADE ENTIRELY AT THE USER’S OWN RISK. IN NO
48
- EVENT SHALL THE COPYRIGHT HOLDER OR ANY CONTRIBUTOR OF INTELLECTUAL PROPERTY
49
- RIGHTS TO THE INTELLECTUAL PROPERTY BE LIABLE FOR ANY CLAIM, OR ANY DIRECT,
50
- SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
51
- FROM ANY ALLEGED INFRINGEMENT OR ANY LOSS OF USE, DATA OR PROFITS, WHETHER IN
52
- AN ACTION OF CONTRACT, NEGLIGENCE OR UNDER ANY OTHER LEGAL THEORY, ARISING OUT
53
- OF OR IN CONNECTION WITH THE IMPLEMENTATION, USE, COMMERCIALIZATION OR
54
- PERFORMANCE OF THIS INTELLECTUAL PROPERTY.</p>
55
-
56
- <p>This license is effective until terminated. You may
57
- terminate it at any time by destroying the Intellectual Property together with
58
- all copies in any form. The license will also terminate if you fail to comply
59
- with any term or condition of this Agreement. Except as provided in the
60
- following sentence, no such termination of this license shall require the
61
- termination of any third party end-user sublicense to the Intellectual Property
62
- which is in force as of the date of notice of such termination. In addition,
63
- should the Intellectual Property, or the operation of the Intellectual
64
- Property, infringe, or in LICENSOR’s sole opinion be
65
- likely to infringe, any patent, copyright, trademark or other right of a third
66
- party, you agree that LICENSOR, in its sole discretion, may terminate this
67
- license without any compensation or liability to you, your licensees or any
68
- other party. You agree upon termination of any kind to destroy or cause to be
69
- destroyed the Intellectual Property together with all copies in any form,
70
- whether held by you or by any third party.</p>
71
-
72
- <p>Except as contained in this notice, the name of
73
- LICENSOR or of any other holder of a copyright in all or part of the Intellectual
74
- Property shall not be used in advertising or otherwise to promote the sale, use
75
- or other dealings in this Intellectual Property without prior written
76
- authorization of LICENSOR or such copyright holder. LICENSOR is and shall at
77
- all times be the sole entity that may authorize you or any third party to use
78
- certification marks, trademarks or other special designations to indicate
79
- compliance with any LICENSOR standards or specifications.
80
- This Agreement is
81
- governed by the laws of the Commonwealth of Massachusetts. The application to
82
- this Agreement of the United Nations Convention on Contracts for the
83
- International Sale of Goods is hereby expressly excluded. In the event any
84
- provision of this Agreement shall be deemed unenforceable, void or invalid, such
85
- provision shall be modified so as to make it valid and enforceable, and as so
86
- modified the entire Agreement shall remain in full force and effect. No
87
- decision, action or inaction by LICENSOR shall be construed to be a waiver of
88
- any rights or remedies available to it.</p>
89
-
90
- <p>None of the Intellectual Property or underlying information or technology may be downloaded or otherwise exported or reexported in violation of U.S. export laws and regulations. In addition, you are responsible for complying with any local laws in your jurisdiction which may impact your right to import, export or use the Intellectual Property, and you represent that you have complied with any regulations or registration procedures required by applicable law to make this license enforceable.</p>
7
+ © {{ docyear }} Open Geospatial Consortium<br/>
8
+ To obtain additional rights of use, visit
9
+ <link target="https://www.ogc.org/legal">https://www.ogc.org/legal</link>
10
+ </p>
11
+ </clause>
12
+ <clause>
13
+ <title>Note</title>
14
+ <p align="left">Attention is drawn to the possibility that some of the elements of this document may be the subject of patent rights. The Open Geospatial Consortium shall not be held responsible for identifying any or all such patent rights.</p>
15
+
16
+ <p align="left">Recipients of this document are requested to submit, with their comments, notification of any relevant patent claims or other intellectual property rights of which they may be aware that might be infringed by any implementation of the standard set forth in this document, and to provide supporting documentation.</p>
17
+ </clause>
18
+ </copyright-statement>
19
+ <license-statement>
20
+ <clause>
21
+ <title>License Agreement</title>
22
+
23
+ <p>Use of this document is subject to the license agreement at
24
+ <link target="https://www.ogc.org/license">https://www.ogc.org/license</link></p>
91
25
  </clause>
92
26
  </license-statement>
93
27
 
@@ -97,62 +31,62 @@
97
31
  <clause>
98
32
  <title>Notice</title>
99
33
  <p>This document is an OGC Member approved international standard. This document is available on a royalty free, non-discriminatory basis. Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.
100
- </p>
101
- </clause>
102
- {% else %}
103
- <clause>
104
- <title>Notice for Drafts</title>
105
- <p>This document is not an OGC Standard. This document is distributed for review and comment. This document is subject to change without notice and may not be referred to as an OGC Standard.</p>
34
+ </p>
35
+ </clause>
36
+ {% else %}
37
+ <clause>
38
+ <title>Notice for Drafts</title>
39
+ <p>This document is not an OGC Standard. This document is distributed for review and comment. This document is subject to change without notice and may not be referred to as an OGC Standard.</p>
106
40
 
107
- <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
108
- </clause>
109
- {% endif %}
41
+ <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
42
+ </clause>
43
+ {% endif %}
110
44
 
111
45
 
112
- {% elsif doctype == "Engineering Report" %}
113
- <clause>
114
- <title>Notice</title>
115
- <p>This document is not an OGC Standard. This document is an OGC Public Engineering Report created as a deliverable in an OGC Interoperability Initiative and is <em>not an official position</em> of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard.</p>
46
+ {% elsif doctype == "Engineering Report" %}
47
+ <clause>
48
+ <title>Notice</title>
49
+ <p>This document is not an OGC Standard. This document is an OGC Public Engineering Report created as a deliverable in an OGC Interoperability Initiative and is <em>not an official position</em> of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard.</p>
116
50
 
117
- <p>Further, any OGC Engineering Report should not be referenced as required or mandatory technology in procurements. However, the discussions in this document could very well lead to the definition of an OGC Standard.</p>
118
- </clause>
51
+ <p>Further, any OGC Engineering Report should not be referenced as required or mandatory technology in procurements. However, the discussions in this document could very well lead to the definition of an OGC Standard.</p>
52
+ </clause>
119
53
 
120
54
 
121
- {% elsif doctype == "Best Practice" %}
122
- <clause>
123
- <title>Notice</title>
124
- <p>This document defines an OGC Best Practice on a particular technology or approach related to an OGC standard. This document is <em>not</em> an OGC Standard and may not be referred to as an OGC Standard. It is subject to change without notice. However, this document is an <em>official</em> position of the OGC membership on this particular technology topic.</p>
55
+ {% elsif doctype == "Best Practice" %}
56
+ <clause>
57
+ <title>Notice</title>
58
+ <p>This document defines an OGC Best Practice on a particular technology or approach related to an OGC standard. This document is <em>not</em> an OGC Standard and may not be referred to as an OGC Standard. It is subject to change without notice. However, this document is an <em>official</em> position of the OGC membership on this particular technology topic.</p>
125
59
 
126
- <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
127
- </clause>
60
+ <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
61
+ </clause>
128
62
 
129
- {% elsif doctype == "Release Notes" %}
130
- <clause>
131
- <title>Notice</title>
132
- <p>This document is not an OGC standard. This document provides release notes for an OGC standard. This document is subject to change without notice and may not be referred to as an OGC Standard.</p>
63
+ {% elsif doctype == "Release Notes" %}
64
+ <clause>
65
+ <title>Notice</title>
66
+ <p>This document is not an OGC standard. This document provides release notes for an OGC standard. This document is subject to change without notice and may not be referred to as an OGC Standard.</p>
133
67
 
134
- <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
68
+ <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
135
69
 
136
- </clause>
70
+ </clause>
137
71
 
138
- {% else %}
139
- <clause>
140
- <title>Notice</title>
141
- <p>This document is not an OGC Standard. This document is an OGC {{ doctype }} and is therefore not an official position of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard.</p>
142
- <p>Further, an OGC {{ doctype }} should not be referenced as required or mandatory technology in procurements.</p>
143
- </clause>
144
- {% endif %}
72
+ {% else %}
73
+ <clause>
74
+ <title>Notice</title>
75
+ <p>This document is not an OGC Standard. This document is an OGC {{ doctype }} and is therefore not an official position of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard.</p>
76
+ <p>Further, an OGC {{ doctype }} should not be referenced as required or mandatory technology in procurements.</p>
77
+ </clause>
78
+ {% endif %}
145
79
 
146
- </legal-statement>
80
+ </legal-statement>
147
81
 
148
82
 
149
83
 
150
84
 
151
- <feedback-statement>
152
- {% if doctype == "Standard" %}
153
- <clause id="boilerplate-standard-feedback">
154
- <p>Suggested additions, changes and comments on this document are welcome and encouraged. Such suggestions may be submitted using the online change request form on OGC web site: <link target="http://portal.opengeospatial.org/public_ogc/change_request.php">http://portal.opengeospatial.org/public_ogc/change_request.php</link></p>
155
- </clause>
156
- {% endif %}
157
- </feedback-statement>
85
+ <feedback-statement>
86
+ {% if doctype == "Standard" %}
87
+ <clause id="boilerplate-standard-feedback">
88
+ <p>Suggested additions, changes and comments on this document are welcome and encouraged. Such suggestions may be submitted using the online change request form on OGC web site: <link target="http://ogc.standardstracker.org/">http://ogc.standardstracker.org/</link></p>
89
+ </clause>
90
+ {% endif %}
91
+ </feedback-statement>
158
92
  </boilerplate>
@@ -571,6 +571,11 @@
571
571
  <ref name="MultilingualRenderingType"/>
572
572
  </attribute>
573
573
  </optional>
574
+ <optional>
575
+ <attribute name="linenums">
576
+ <data type="boolean"/>
577
+ </attribute>
578
+ </optional>
574
579
  <optional>
575
580
  <ref name="tname"/>
576
581
  </optional>
@@ -1238,6 +1243,11 @@
1238
1243
  </define>
1239
1244
  <define name="concept">
1240
1245
  <element name="concept">
1246
+ <optional>
1247
+ <attribute name="bold">
1248
+ <data type="boolean"/>
1249
+ </attribute>
1250
+ </optional>
1241
1251
  <optional>
1242
1252
  <attribute name="ital">
1243
1253
  <data type="boolean"/>
@@ -2653,7 +2663,7 @@
2653
2663
  <value>full</value>
2654
2664
  <value>short</value>
2655
2665
  <value>id</value>
2656
- <value>modspec</value>
2666
+ <text/>
2657
2667
  </choice>
2658
2668
  </define>
2659
2669
  <define name="erefTypeWithConnective">
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ogc
3
- VERSION = "2.3.0".freeze
3
+ VERSION = "2.3.2".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ogc
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.0
4
+ version: 2.3.2
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-12-05 00:00:00.000000000 Z
11
+ date: 2022-12-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639
@@ -224,7 +224,6 @@ files:
224
224
  - README.adoc
225
225
  - lib/isodoc/ogc.rb
226
226
  - lib/isodoc/ogc/base_convert.rb
227
- - lib/isodoc/ogc/biblio.rb
228
227
  - lib/isodoc/ogc/html/_coverpage.css
229
228
  - lib/isodoc/ogc/html/_coverpage.scss
230
229
  - lib/isodoc/ogc/html/header.html
@@ -1,24 +0,0 @@
1
- module IsoDoc
2
- module Ogc
3
- module BaseConvert
4
- def std_bibitem_entry(list, bib, ordinal, biblio)
5
- list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
6
- prefix_bracketed_ref(ref, "[#{ordinal}]") if biblio
7
- reference_format(bib, ref)
8
- end
9
- end
10
-
11
- def nonstd_bibitem(list, bib, ordinal, bibliography)
12
- list.p **attr_code(iso_bibitem_entry_attrs(bib, bibliography)) do |r|
13
- id = bibitem_ref_code(bib)
14
- identifier = render_identifier(id)
15
- identifier[:sdo] = nil
16
- if bibliography
17
- ref_entry_code(r, ordinal, identifier, id)
18
- end
19
- reference_format(bib, r)
20
- end
21
- end
22
- end
23
- end
24
- end