metanorma-ietf 3.7.0 → 3.7.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d5676e734dfefc19937ce0ea3b404be286e148d9c60d7a121be3454037580f85
4
- data.tar.gz: 5acf46a8f76721ab10b94f715b62a885e2d8ad8f6b205656292dfad12105ee43
3
+ metadata.gz: aeb0c94430f5b3ed24a329a89529c6921e7ca6074426f804bbf6691976282269
4
+ data.tar.gz: a479f966ab1f10d217afd1b4340131f5fe7d2d83f79d8e50f67bf2cb0e4d7ff9
5
5
  SHA512:
6
- metadata.gz: 804ffce50d693bba414590f64b6a1a4bbc2dd26300ed95098205b8406dbb0ebfa4b4016d590e37d9cbac6bd6d7f0c48e982d5f7611ae9efea6ff03d8ca2c60d7
7
- data.tar.gz: d77dac9cb000a5d5f9ede0a70492b2ea88ae266f8516f34989c982e0686258a17cc2e6081606f38a19f02d145aedbc244f49e15bddffc5f5e0aa2f15d4c484ca
6
+ metadata.gz: e758b0d51003ed797dbc6d9972535d8946ddf47a9c640f9f076e1db5991d414b3d87aee4c3a60a84cc902b02fd2abf35e647921c20297403f6feca543587dfac
7
+ data.tar.gz: 3a0fe42165b028986bf7e6cdd77768ff554507e83f9bad29bc6ebd633439ff9b3c07917235bb5ac966bd5445f0e94c6770e6284ac2034cf841a573a0ea60c9b6
@@ -96,17 +96,8 @@ module IsoDoc
96
96
  alt: node["alt"] }
97
97
  end
98
98
 
99
- def image_parse(node, out, caption)
99
+ def image_parse(node, out)
100
100
  out.artwork **attr_code(image_parse_attrs(node))
101
- image_title_parse(out, caption)
102
- end
103
-
104
- def image_title_parse(out, caption)
105
- unless caption.nil?
106
- out.t align: "center", keepWithPrevious: "true" do |p|
107
- p << caption.to_s
108
- end
109
- end
110
101
  end
111
102
 
112
103
  def svg_parse(node, out)
@@ -208,11 +208,15 @@ Applicable to modify and delete</a:documentation>
208
208
  </zeroOrMore>
209
209
  <optional>
210
210
  <element name="newcontent">
211
- <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
211
+ <a:documentation>New content to be added to the document; applicable to add and modify.
212
+ Can be blocks and/or sections</a:documentation>
212
213
  <ref name="OptionalId"/>
213
214
  <zeroOrMore>
214
215
  <ref name="BasicBlock"/>
215
216
  </zeroOrMore>
217
+ <zeroOrMore>
218
+ <ref name="section"/>
219
+ </zeroOrMore>
216
220
  </element>
217
221
  </optional>
218
222
  <zeroOrMore>
@@ -1,6 +1,10 @@
1
1
  module Metanorma
2
2
  module Ietf
3
- class Converter < ::Metanorma::Standoc::Converter
3
+ class Cleanup < ::Metanorma::Standoc::Cleanup
4
+ def copied_instance_variables
5
+ super + %i[bcp_bold]
6
+ end
7
+
4
8
  def cleanup(xmldoc)
5
9
  bcp14_cleanup(xmldoc)
6
10
  abstract_cleanup(xmldoc)
@@ -12,9 +16,8 @@ module Metanorma
12
16
 
13
17
  def boilerplate_isodoc(xmldoc)
14
18
  x = xmldoc.dup
15
- x.root.add_namespace(nil, xml_namespace)
16
- # xml = Nokogiri::XML(x.to_xml)
17
- @isodoc ||= isodoc(@lang, @script, @locale)
19
+ x.root.add_namespace(nil, @conv.xml_namespace)
20
+ @isodoc ||= @conv.isodoc(@lang, @script, @locale)
18
21
  # initialise @isodoc.xrefs, for @isodoc.xrefs.info
19
22
  @isodoc
20
23
  end
@@ -102,6 +105,8 @@ module Metanorma
102
105
  def section_names_refs_cleanup(xml); end
103
106
 
104
107
  def note_cleanup(xmldoc); end
108
+
109
+ def norm_ref_preface(sect, isodoc); end
105
110
  end
106
111
  end
107
112
  end
@@ -1,10 +1,8 @@
1
1
  require "asciidoctor"
2
- require "metanorma/standoc/converter"
2
+ require "metanorma-standoc"
3
3
  require "isodoc/ietf/rfc_convert"
4
4
  require_relative "./front"
5
5
  require_relative "./blocks"
6
- require_relative "./validate"
7
- require_relative "./cleanup"
8
6
  require_relative "./macros"
9
7
 
10
8
  module Metanorma
@@ -31,12 +29,16 @@ module Metanorma
31
29
  super
32
30
  end
33
31
 
32
+ def cache_workgroup(_node)
33
+ Metanorma::Ietf::Data::WORKGROUPS
34
+ end
35
+
34
36
  def outputs(node, ret)
35
37
  File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
36
38
  rfc_converter(node).convert("#{@filename}.xml")
37
39
  end
38
40
 
39
- def init_misc(node)
41
+ def init_metadata(node)
40
42
  super
41
43
  @default_doctype = "internet-draft"
42
44
  end
@@ -121,8 +123,6 @@ module Metanorma
121
123
  [t, rel]
122
124
  end
123
125
 
124
- def norm_ref_preface(sect, isodoc); end
125
-
126
126
  def clause_attrs_preprocess(attrs, node)
127
127
  attrs[:numbered] = node.attr("numbered")
128
128
  attrs[:removeInRFC] = node.attr("removeInRFC")
@@ -3,7 +3,11 @@ require "metanorma-utils"
3
3
 
4
4
  module Metanorma
5
5
  module Ietf
6
- class Converter < ::Metanorma::Standoc::Converter
6
+ class Validate < ::Metanorma::Standoc::Validate
7
+ def copied_instance_variables
8
+ super + %i[workgroups]
9
+ end
10
+
7
11
  def content_validate(doc)
8
12
  super
9
13
  image_validate(doc)
@@ -42,10 +46,6 @@ module Metanorma
42
46
  def schema_file
43
47
  "ietf.rng"
44
48
  end
45
-
46
- def cache_workgroup(_node)
47
- Metanorma::Ietf::Data::WORKGROUPS
48
- end
49
49
  end
50
50
  end
51
51
  end
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ietf
3
- VERSION = "3.7.0".freeze
3
+ VERSION = "3.7.1".freeze
4
4
  end
5
5
  end
@@ -4,6 +4,8 @@ require "vectory"
4
4
 
5
5
  require_relative "metanorma/ietf"
6
6
  require_relative "metanorma/ietf/converter"
7
+ require_relative "metanorma/ietf/cleanup"
8
+ require_relative "metanorma/ietf/validate"
7
9
  require_relative "isodoc/ietf/rfc_convert"
8
10
 
9
11
  Metanorma::Registry.instance.register(Metanorma::Ietf::Processor)
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
37
37
  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
38
38
 
39
39
  spec.add_dependency "metanorma-ietf-data"
40
- spec.add_dependency "metanorma-standoc", "~> 3.3.0"
40
+ spec.add_dependency "metanorma-standoc", "~> 3.3.1"
41
41
  spec.add_dependency "relaton-render"
42
42
 
43
43
  spec.add_development_dependency "debug"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ietf
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.7.0
4
+ version: 3.7.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: 2026-02-16 00:00:00.000000000 Z
11
+ date: 2026-03-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-ietf-data
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 3.3.0
33
+ version: 3.3.1
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: 3.3.0
40
+ version: 3.3.1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: relaton-render
43
43
  requirement: !ruby/object:Gem::Requirement