metanorma-iho 0.4.3 → 0.5.1

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.
File without changes
File without changes
File without changes
@@ -1,12 +1,12 @@
1
- require "asciidoctor/standoc/converter"
2
- require "asciidoctor/generic/converter"
1
+ require "metanorma/standoc/converter"
2
+ require "metanorma/generic/converter"
3
3
 
4
- module Asciidoctor
4
+ module Metanorma
5
5
  module IHO
6
6
  # A {Converter} implementation that generates RSD output, and a document
7
7
  # schema encapsulation of the document for validation
8
8
  #
9
- class Converter < Asciidoctor::Generic::Converter
9
+ class Converter < Metanorma::Generic::Converter
10
10
  XML_ROOT_TAG = "iho-standard".freeze
11
11
  XML_NAMESPACE = "https://www.metanorma.org/ns/iho".freeze
12
12
 
@@ -104,7 +104,7 @@ module Asciidoctor
104
104
  def pdf_converter(node)
105
105
  return nil if node.attr("no-pdf")
106
106
 
107
- IsoDoc::IHO::PdfConvert.new(html_extract_attributes(node))
107
+ IsoDoc::IHO::PdfConvert.new(pdf_extract_attributes(node))
108
108
  end
109
109
 
110
110
  def doc_converter(node)
File without changes
@@ -32,6 +32,19 @@
32
32
  <ref name="DocumentType"/>
33
33
  </element>
34
34
  </define>
35
+ <define name="bibitem">
36
+ <element name="bibitem">
37
+ <attribute name="id">
38
+ <data type="ID"/>
39
+ </attribute>
40
+ <optional>
41
+ <attribute name="hidden">
42
+ <data type="boolean"/>
43
+ </attribute>
44
+ </optional>
45
+ <ref name="BibliographicItem"/>
46
+ </element>
47
+ </define>
35
48
  <define name="section-title">
36
49
  <element name="title">
37
50
  <zeroOrMore>
@@ -690,6 +703,7 @@
690
703
  <ref name="terms"/>
691
704
  <ref name="term-clause"/>
692
705
  <ref name="definitions"/>
706
+ <ref name="floating-title"/>
693
707
  </choice>
694
708
  </oneOrMore>
695
709
  </element>
@@ -1680,6 +1694,7 @@
1680
1694
  <ref name="clause-subsection"/>
1681
1695
  <ref name="terms"/>
1682
1696
  <ref name="definitions"/>
1697
+ <ref name="floating-title"/>
1683
1698
  </choice>
1684
1699
  </oneOrMore>
1685
1700
  </choice>
@@ -1722,6 +1737,7 @@
1722
1737
  <ref name="terms"/>
1723
1738
  <ref name="definitions"/>
1724
1739
  <ref name="references"/>
1740
+ <ref name="floating-title"/>
1725
1741
  </choice>
1726
1742
  </zeroOrMore>
1727
1743
  </group>
@@ -1796,6 +1812,20 @@
1796
1812
  <data type="ID"/>
1797
1813
  </attribute>
1798
1814
  </optional>
1815
+ <optional>
1816
+ <attribute name="language"/>
1817
+ </optional>
1818
+ <optional>
1819
+ <attribute name="script"/>
1820
+ </optional>
1821
+ <optional>
1822
+ <attribute name="tag"/>
1823
+ </optional>
1824
+ <optional>
1825
+ <attribute name="multilingual-rendering">
1826
+ <ref name="MultilingualRenderingType"/>
1827
+ </attribute>
1828
+ </optional>
1799
1829
  <oneOrMore>
1800
1830
  <ref name="preferred"/>
1801
1831
  </oneOrMore>
@@ -1959,7 +1989,11 @@
1959
1989
  </optional>
1960
1990
  <element name="name">
1961
1991
  <zeroOrMore>
1962
- <ref name="PureTextElement"/>
1992
+ <choice>
1993
+ <ref name="PureTextElement"/>
1994
+ <ref name="stem"/>
1995
+ <ref name="index"/>
1996
+ </choice>
1963
1997
  </zeroOrMore>
1964
1998
  </element>
1965
1999
  <optional>
@@ -1973,7 +2007,7 @@
1973
2007
  </element>
1974
2008
  </optional>
1975
2009
  <optional>
1976
- <element name="grammar-info">
2010
+ <element name="grammar">
1977
2011
  <ref name="Grammar"/>
1978
2012
  </element>
1979
2013
  </optional>
@@ -2516,4 +2550,17 @@
2516
2550
  </oneOrMore>
2517
2551
  </element>
2518
2552
  </define>
2553
+ <define name="floating-title">
2554
+ <element name="floating-title">
2555
+ <attribute name="id">
2556
+ <data type="ID"/>
2557
+ </attribute>
2558
+ <attribute name="depth">
2559
+ <data type="int"/>
2560
+ </attribute>
2561
+ <zeroOrMore>
2562
+ <ref name="TextElement"/>
2563
+ </zeroOrMore>
2564
+ </element>
2565
+ </define>
2519
2566
  </grammar>
File without changes
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module IHO
3
- VERSION = "0.4.3".freeze
3
+ VERSION = "0.5.1".freeze
4
4
  end
5
5
  end
data/lib/metanorma-iho.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require "asciidoctor" unless defined? Asciidoctor::Converter
2
- require_relative "asciidoctor/iho/converter"
2
+ require_relative "metanorma/iho/converter"
3
3
  require_relative "isodoc/iho/base_convert"
4
4
  require_relative "isodoc/iho/html_convert"
5
5
  require_relative "isodoc/iho/word_convert"
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
27
27
  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
28
28
 
29
29
  spec.add_dependency "htmlentities", "~> 4.3.4"
30
- spec.add_dependency "metanorma-generic", "~> 1.11.0"
30
+ spec.add_dependency "metanorma-generic", "~> 2.0.0"
31
31
 
32
32
  spec.add_development_dependency "debug"
33
33
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
data/metanorma.yml CHANGED
@@ -8,7 +8,7 @@ logo_paths:
8
8
  - lib/isodoc/iho/html/image001.png
9
9
  - lib/isodoc/iho/html/image002.png
10
10
  - lib/isodoc/iho/html/image003.png
11
- validate_rng_file: lib/asciidoctor/iho/iho.rng
11
+ validate_rng_file: lib/metanorma/iho/iho.rng
12
12
  i18nyaml: lib/isodoc/iho/i18n-en.yaml
13
13
  htmlcoverpage: lib/isodoc/iho/html/html_iho_titlepage.html
14
14
  htmlintropage: lib/isodoc/iho/html/html_iho_intro.html
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iho
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.3
4
+ version: 0.5.1
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-11-29 00:00:00.000000000 Z
11
+ date: 2022-01-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.11.0
33
+ version: 2.0.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.11.0
40
+ version: 2.0.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: debug
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -200,14 +200,6 @@ files:
200
200
  - bin/console
201
201
  - bin/rspec
202
202
  - bin/setup
203
- - lib/asciidoctor/iho.rb
204
- - lib/asciidoctor/iho/basicdoc.rng
205
- - lib/asciidoctor/iho/biblio.rng
206
- - lib/asciidoctor/iho/boilerplate.xml
207
- - lib/asciidoctor/iho/converter.rb
208
- - lib/asciidoctor/iho/iho.rng
209
- - lib/asciidoctor/iho/isodoc.rng
210
- - lib/asciidoctor/iho/reqt.rng
211
203
  - lib/isodoc/iho/base_convert.rb
212
204
  - lib/isodoc/iho/html/header.html
213
205
  - lib/isodoc/iho/html/html_iho_intro.html
@@ -238,7 +230,14 @@ files:
238
230
  - lib/isodoc/iho/xref.rb
239
231
  - lib/metanorma-iho.rb
240
232
  - lib/metanorma/iho.rb
233
+ - lib/metanorma/iho/basicdoc.rng
234
+ - lib/metanorma/iho/biblio.rng
235
+ - lib/metanorma/iho/boilerplate.xml
236
+ - lib/metanorma/iho/converter.rb
237
+ - lib/metanorma/iho/iho.rng
238
+ - lib/metanorma/iho/isodoc.rng
241
239
  - lib/metanorma/iho/processor.rb
240
+ - lib/metanorma/iho/reqt.rng
242
241
  - lib/metanorma/iho/version.rb
243
242
  - metanorma-iho.gemspec
244
243
  - metanorma.yml
@@ -261,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
261
260
  - !ruby/object:Gem::Version
262
261
  version: '0'
263
262
  requirements: []
264
- rubygems_version: 3.2.22
263
+ rubygems_version: 3.2.32
265
264
  signing_key:
266
265
  specification_version: 4
267
266
  summary: metanorma-iho lets you write IHO in AsciiDoc.
@@ -1,4 +0,0 @@
1
- module Asciidoctor
2
- module IHO
3
- end
4
- end