metanorma-ieee 1.0.10 → 1.0.12

Sign up to get free protection for your applications and to get access to all the features.
@@ -236,6 +236,36 @@ module IsoDoc
236
236
  dlist["class"] = "formula_dl"
237
237
  end
238
238
 
239
+ def ol(docxml)
240
+ ol_numbering(docxml)
241
+ @xrefs.list_anchor_names(docxml.xpath(ns(@xrefs.sections_xpath)))
242
+ docxml.xpath(ns("//ol/li")).each { |f| ol_label(f) }
243
+ end
244
+
245
+ def ol_numbering(docxml)
246
+ docxml.xpath(ns("//clause | //annex | //foreword | //acknowledgements | //introduction | //preface/abstract | //appendix | //terms | //term | //definitions | //references | //colophon")).each do |_c|
247
+ (docxml.xpath(ns(".//ol")) -
248
+ docxml.xpath(ns("./clause//ol | ./appendix//ol | ./term//ol | ./terms//ol | ./definitions//ol | /references//ol | ./colophon//ol"))).each_with_index do |o, i|
249
+ ol_numbering1(o, i)
250
+ end
251
+ end
252
+ end
253
+
254
+ def ol_numbering1(elem, idx)
255
+ elem["type"] = ol_depth_rotate(elem, idx).to_s
256
+ elem.xpath(ns("./li")).each do |li|
257
+ li["id"] ||= "_#{UUIDTools::UUID.random_create}"
258
+ end
259
+ end
260
+
261
+ def ol_depth_rotate(node, idx)
262
+ depth = node.ancestors("ol").size + idx
263
+ type = :alphabet
264
+ type = :arabic if [2, 5, 8].include? depth
265
+ type = :roman if [3, 6, 9].include? depth
266
+ type
267
+ end
268
+
239
269
  include Init
240
270
  end
241
271
  end
@@ -118,7 +118,7 @@ module Metanorma
118
118
  end
119
119
  end
120
120
 
121
- def select_docid(ref)
121
+ def select_docid(ref, type = nil)
122
122
  ret = super
123
123
  if %w(standard techreport).include?(ref["type"]) then ret
124
124
  else
@@ -17,7 +17,7 @@
17
17
  these elements; we just want one namespace for any child grammars
18
18
  of this.
19
19
  -->
20
- <!-- VERSION v1.2.1 -->
20
+ <!-- VERSION v1.2.2 -->
21
21
  <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
22
22
  <include href="reqt.rng"/>
23
23
  <include href="basicdoc.rng">
@@ -211,6 +211,9 @@
211
211
  <data type="boolean"/>
212
212
  </attribute>
213
213
  </optional>
214
+ <optional>
215
+ <attribute name="style"/>
216
+ </optional>
214
217
  <ref name="CitationType"/>
215
218
  <oneOrMore>
216
219
  <ref name="PureTextElement"/>
@@ -1009,6 +1012,7 @@
1009
1012
  <ref name="del"/>
1010
1013
  <ref name="span"/>
1011
1014
  <ref name="erefstack"/>
1015
+ <ref name="date_inline"/>
1012
1016
  </choice>
1013
1017
  </define>
1014
1018
  <define name="add">
@@ -1050,6 +1054,23 @@
1050
1054
  </oneOrMore>
1051
1055
  </element>
1052
1056
  </define>
1057
+ <define name="date_inline">
1058
+ <element name="date">
1059
+ <attribute name="value"/>
1060
+ <optional>
1061
+ <attribute name="format"/>
1062
+ </optional>
1063
+ <optional>
1064
+ <attribute name="language"/>
1065
+ </optional>
1066
+ <optional>
1067
+ <attribute name="script"/>
1068
+ </optional>
1069
+ <optional>
1070
+ <attribute name="locale"/>
1071
+ </optional>
1072
+ </element>
1073
+ </define>
1053
1074
  <define name="concept">
1054
1075
  <element name="concept">
1055
1076
  <optional>
@@ -2136,6 +2157,7 @@
2136
2157
  <choice>
2137
2158
  <value>identical</value>
2138
2159
  <value>modified</value>
2160
+ <value>adapted</value>
2139
2161
  <value>restyled</value>
2140
2162
  <value>context-added</value>
2141
2163
  <value>generalisation</value>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module IEEE
3
- VERSION = "1.0.10".freeze
3
+ VERSION = "1.0.12".freeze
4
4
  end
5
5
  end
@@ -27,6 +27,9 @@ Gem::Specification.new do |spec|
27
27
 
28
28
  spec.add_dependency "metanorma-standoc", "~> 2.4.2"
29
29
  spec.add_dependency "mnconvert", "~> 1.20"
30
+ #spec.add_dependency "pubid-ieee", "~> 0.1.1"
31
+ #spec.add_dependency "pubid-iso", "~> 0.5.3"
32
+ #spec.add_dependency "relaton-iso", "~> 1.15.4"
30
33
 
31
34
  spec.add_development_dependency "debug"
32
35
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ieee
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.10
4
+ version: 1.0.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-04-25 00:00:00.000000000 Z
11
+ date: 2023-06-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-standoc