metanorma-ieee 1.0.14 → 1.1.0

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.
@@ -50,32 +50,34 @@ module IsoDoc
50
50
  def abstract(clause, out)
51
51
  page_break(out)
52
52
  out.div **attr_code(id: clause["id"], class: "abstract") do |s|
53
- clause_name(clause, clause.at(ns("./title")), s, { class: "AbstractTitle" })
53
+ clause_name(clause, clause.at(ns("./title")), s,
54
+ { class: "AbstractTitle" })
54
55
  clause.elements.each { |e| parse(e, s) unless e.name == "title" }
55
56
  end
56
57
  end
57
58
 
59
+ MAIN_ELEMENTS =
60
+ "//sections/*[@displayorder][not(@class = 'zzSTDTitle1')] | " \
61
+ "//annex[@displayorder] | " \
62
+ "//bibliography/*[@displayorder] | //colophon/*[@displayorder] | " \
63
+ "//indexsect[@displayorder]".freeze
64
+
58
65
  def make_body3(body, docxml)
59
- body.div class: "WordSectionMiddleTitle" do |_div3|
60
- middle_title_ieee(docxml, body)
66
+ body.div class: "WordSectionMiddleTitle" do |div3|
67
+ middle_title_ieee(docxml, div3)
61
68
  end
62
69
  section_break(body, continuous: true)
63
70
  body.div class: "WordSectionMain" do |div3|
64
- middle docxml, div3
71
+ content(div3, docxml, ns(self.class::MAIN_ELEMENTS))
65
72
  footnotes div3
66
73
  comments div3
67
74
  end
68
75
  end
69
76
 
70
- def middle_title(isoxml, out); end
71
-
72
- def middle_title_ieee(_docxml, out)
77
+ def middle_title_ieee(docxml, out)
78
+ title = docxml.at(ns("//p[@class = 'zzSTDTitle1']")) or return
73
79
  out.p(class: "IEEEStdsTitle", style: "margin-top:70.0pt") do |p|
74
- p << @meta.get[:full_doctitle]
75
- @meta.get[:amd] || @meta.get[:corr] and p << "<br/>"
76
- @meta.get[:amd] and p << "Amendment #{@meta.get[:amd]}"
77
- @meta.get[:amd] && @meta.get[:corr] and p << " "
78
- @meta.get[:corr] and p << "Corrigenda #{@meta.get[:corr]}"
80
+ title.children.each { |n| parse(n, p) }
79
81
  end
80
82
  end
81
83
 
@@ -137,7 +139,6 @@ module IsoDoc
137
139
  end
138
140
 
139
141
  def annex_name(_annex, name, div)
140
- preceding_floating_titles(name, div)
141
142
  return if name.nil?
142
143
 
143
144
  name&.at(ns("./strong"))&.remove # supplied by CSS list numbering
@@ -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.2 -->
20
+ <!-- VERSION v1.2.3 -->
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">
@@ -192,9 +192,11 @@
192
192
  </attribute>
193
193
  </optional>
194
194
  <attribute name="citeas"/>
195
- <attribute name="type">
196
- <ref name="ReferenceFormat"/>
197
- </attribute>
195
+ <optional>
196
+ <attribute name="type">
197
+ <ref name="ReferenceFormat"/>
198
+ </attribute>
199
+ </optional>
198
200
  <optional>
199
201
  <attribute name="alt"/>
200
202
  </optional>
@@ -836,6 +838,26 @@
836
838
  <ref name="paragraph"/>
837
839
  </element>
838
840
  </define>
841
+ <define name="stem">
842
+ <element name="stem">
843
+ <attribute name="type">
844
+ <choice>
845
+ <value>MathML</value>
846
+ <value>AsciiMath</value>
847
+ <value>LatexMath</value>
848
+ </choice>
849
+ </attribute>
850
+ <attribute name="block">
851
+ <data type="boolean"/>
852
+ </attribute>
853
+ <oneOrMore>
854
+ <choice>
855
+ <text/>
856
+ <ref name="AnyElement"/>
857
+ </choice>
858
+ </oneOrMore>
859
+ </element>
860
+ </define>
839
861
  <define name="em">
840
862
  <element name="em">
841
863
  <zeroOrMore>
@@ -1,7 +1,8 @@
1
1
  module Metanorma
2
2
  module IEEE
3
3
  class TermLookupCleanup < Metanorma::Standoc::TermLookupCleanup
4
- def remove_missing_ref_term(node, _target)
4
+ def remove_missing_ref_term(node, _target, type)
5
+ type == "symbol" and return super
5
6
  node.at("../xrefrender")&.remove
6
7
  #node.replace("<preferred><expression><name>#{node.children.to_xml}"\
7
8
  # "</name></expression></preferred>")
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module IEEE
3
- VERSION = "1.0.14".freeze
3
+ VERSION = "1.1.0".freeze
4
4
  end
5
5
  end
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
25
25
  spec.require_paths = ["lib"]
26
26
  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
27
27
 
28
- spec.add_dependency "metanorma-standoc", "~> 2.4.2"
28
+ spec.add_dependency "metanorma-standoc", "~> 2.5.0"
29
29
  spec.add_dependency "mnconvert", "~> 1.20"
30
30
  #spec.add_dependency "pubid-ieee", "~> 0.1.1"
31
31
  #spec.add_dependency "pubid-iso", "~> 0.5.3"
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.14
4
+ version: 1.1.0
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-07-06 00:00:00.000000000 Z
11
+ date: 2023-08-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 2.4.2
19
+ version: 2.5.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 2.4.2
26
+ version: 2.5.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: mnconvert
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -249,6 +249,7 @@ files:
249
249
  - lib/isodoc/ieee/init.rb
250
250
  - lib/isodoc/ieee/metadata.rb
251
251
  - lib/isodoc/ieee/pdf_convert.rb
252
+ - lib/isodoc/ieee/presentation_bibdata.rb
252
253
  - lib/isodoc/ieee/presentation_ref.rb
253
254
  - lib/isodoc/ieee/presentation_terms.rb
254
255
  - lib/isodoc/ieee/presentation_xml_convert.rb