metanorma-standoc 1.4.0 → 1.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (64) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/macos.yml +0 -7
  3. data/.github/workflows/ubuntu.yml +6 -11
  4. data/.github/workflows/windows.yml +0 -8
  5. data/.rubocop.yml +1 -1
  6. data/Rakefile +2 -0
  7. data/lib/asciidoctor/standoc/base.rb +28 -27
  8. data/lib/asciidoctor/standoc/biblio.rng +1 -1
  9. data/lib/asciidoctor/standoc/blocks.rb +25 -95
  10. data/lib/asciidoctor/standoc/blocks_notes.rb +89 -0
  11. data/lib/asciidoctor/standoc/cleanup.rb +10 -6
  12. data/lib/asciidoctor/standoc/cleanup_boilerplate.rb +11 -24
  13. data/lib/asciidoctor/standoc/cleanup_inline.rb +1 -1
  14. data/lib/asciidoctor/standoc/cleanup_ref.rb +47 -1
  15. data/lib/asciidoctor/standoc/cleanup_section.rb +72 -5
  16. data/lib/asciidoctor/standoc/cleanup_terms.rb +10 -0
  17. data/lib/asciidoctor/standoc/converter.rb +16 -2
  18. data/lib/asciidoctor/standoc/inline.rb +1 -1
  19. data/lib/asciidoctor/standoc/isodoc.rng +439 -6
  20. data/lib/asciidoctor/standoc/lists.rb +12 -12
  21. data/lib/asciidoctor/standoc/macros_yaml2text.rb +32 -15
  22. data/lib/asciidoctor/standoc/ref.rb +75 -34
  23. data/lib/asciidoctor/standoc/reqt.rb +11 -6
  24. data/lib/asciidoctor/standoc/reqt.rng +23 -0
  25. data/lib/asciidoctor/standoc/section.rb +27 -25
  26. data/lib/asciidoctor/standoc/table.rb +3 -2
  27. data/lib/asciidoctor/standoc/utils.rb +16 -0
  28. data/lib/asciidoctor/standoc/views/datamodel/model_representation.adoc.erb +1 -1
  29. data/lib/metanorma/standoc/processor.rb +5 -7
  30. data/lib/metanorma/standoc/version.rb +1 -1
  31. data/metanorma-standoc.gemspec +3 -2
  32. data/spec/asciidoctor-standoc/base_spec.rb +3 -2
  33. data/spec/asciidoctor-standoc/blocks_spec.rb +68 -32
  34. data/spec/asciidoctor-standoc/cleanup_spec.rb +1221 -17
  35. data/spec/asciidoctor-standoc/datamodel/attributes_table_preprocessor_spec.rb +35 -0
  36. data/spec/asciidoctor-standoc/inline_spec.rb +3 -3
  37. data/spec/asciidoctor-standoc/isobib_cache_spec.rb +4 -4
  38. data/spec/asciidoctor-standoc/lists_spec.rb +7 -5
  39. data/spec/asciidoctor-standoc/macros_spec.rb +4 -3
  40. data/spec/asciidoctor-standoc/refs_dl_spec.rb +8 -6
  41. data/spec/asciidoctor-standoc/refs_spec.rb +275 -30
  42. data/spec/asciidoctor-standoc/section_spec.rb +42 -38
  43. data/spec/asciidoctor-standoc/table_spec.rb +3 -3
  44. data/spec/asciidoctor-standoc/validate_spec.rb +56 -0
  45. data/spec/assets/{html.css → html.scss} +0 -0
  46. data/spec/assets/i18n.yaml +17 -2
  47. data/spec/assets/iso123.rxl +107 -0
  48. data/spec/assets/{word.css → word.scss} +0 -0
  49. data/spec/examples/datamodel/blank_definition_profile.adoc +4 -0
  50. data/spec/examples/datamodel/models/models/{Signature copy.yml → SignatureBlankDefinition.yml} +2 -2
  51. data/spec/fixtures/macros_datamodel/blank_definition_profile.xml +51 -0
  52. data/spec/metanorma/processor_spec.rb +5 -6
  53. data/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec.yml +83 -83
  54. data/spec/vcr_cassettes/isobib_get_123.yml +19 -198
  55. data/spec/vcr_cassettes/isobib_get_123_1.yml +361 -0
  56. data/spec/vcr_cassettes/isobib_get_123_2001.yml +19 -19
  57. data/spec/vcr_cassettes/isobib_get_124.yml +21 -21
  58. data/spec/vcr_cassettes/rfcbib_get_rfc8341.yml +10 -10
  59. data/spec/vcr_cassettes/separates_iev_citations_by_top_level_clause.yml +42 -42
  60. metadata +32 -18
  61. data/lib/asciidoctor-yaml/i18n-en.yaml +0 -20
  62. data/lib/asciidoctor-yaml/i18n-fr.yaml +0 -13
  63. data/lib/asciidoctor-yaml/i18n-zh-Hans.yaml +0 -15
  64. data/lib/asciidoctor/standoc/i18n.rb +0 -39
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-standoc
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.0
4
+ version: 1.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-06-08 00:00:00.000000000 Z
11
+ date: 2020-07-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciidoctor
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.0.20
47
+ version: 1.2.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 1.0.20
54
+ version: 1.2.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: iev
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 1.1.0
75
+ version: 1.2.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 1.1.0
82
+ version: 1.2.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: relaton-iev
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
178
178
  - - ">="
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
+ - !ruby/object:Gem::Dependency
182
+ name: sassc
183
+ requirement: !ruby/object:Gem::Requirement
184
+ requirements:
185
+ - - '='
186
+ - !ruby/object:Gem::Version
187
+ version: 2.4.0
188
+ type: :development
189
+ prerelease: false
190
+ version_requirements: !ruby/object:Gem::Requirement
191
+ requirements:
192
+ - - '='
193
+ - !ruby/object:Gem::Version
194
+ version: 2.4.0
181
195
  - !ruby/object:Gem::Dependency
182
196
  name: equivalent-xml
183
197
  requirement: !ruby/object:Gem::Requirement
@@ -347,13 +361,11 @@ files:
347
361
  - Rakefile
348
362
  - bin/rspec
349
363
  - docs/quickstart.adoc
350
- - lib/asciidoctor-yaml/i18n-en.yaml
351
- - lib/asciidoctor-yaml/i18n-fr.yaml
352
- - lib/asciidoctor-yaml/i18n-zh-Hans.yaml
353
364
  - lib/asciidoctor/standoc/base.rb
354
365
  - lib/asciidoctor/standoc/basicdoc.rng
355
366
  - lib/asciidoctor/standoc/biblio.rng
356
367
  - lib/asciidoctor/standoc/blocks.rb
368
+ - lib/asciidoctor/standoc/blocks_notes.rb
357
369
  - lib/asciidoctor/standoc/cleanup.rb
358
370
  - lib/asciidoctor/standoc/cleanup_block.rb
359
371
  - lib/asciidoctor/standoc/cleanup_boilerplate.rb
@@ -368,7 +380,6 @@ files:
368
380
  - lib/asciidoctor/standoc/datamodel/plantuml_renderer.rb
369
381
  - lib/asciidoctor/standoc/front.rb
370
382
  - lib/asciidoctor/standoc/front_contributor.rb
371
- - lib/asciidoctor/standoc/i18n.rb
372
383
  - lib/asciidoctor/standoc/inline.rb
373
384
  - lib/asciidoctor/standoc/isodoc.rng
374
385
  - lib/asciidoctor/standoc/lists.rb
@@ -412,16 +423,17 @@ files:
412
423
  - spec/assets/boilerplate.xml
413
424
  - spec/assets/codes.yml
414
425
  - spec/assets/header.html
415
- - spec/assets/html.css
426
+ - spec/assets/html.scss
416
427
  - spec/assets/htmlcover.html
417
428
  - spec/assets/htmlintro.html
418
429
  - spec/assets/i18n.yaml
419
430
  - spec/assets/iso.headless.html
420
431
  - spec/assets/iso.xml
432
+ - spec/assets/iso123.rxl
421
433
  - spec/assets/rice_image1.png
422
434
  - spec/assets/scripts.html
423
435
  - spec/assets/std.css
424
- - spec/assets/word.css
436
+ - spec/assets/word.scss
425
437
  - spec/assets/wordcover.html
426
438
  - spec/assets/wordintro.html
427
439
  - spec/assets/xref_error.adoc
@@ -429,6 +441,7 @@ files:
429
441
  - spec/examples/codes_table.html
430
442
  - spec/examples/datamodel/address_class_profile.adoc
431
443
  - spec/examples/datamodel/address_component_profile.adoc
444
+ - spec/examples/datamodel/blank_definition_profile.adoc
432
445
  - spec/examples/datamodel/common_models_diagram.adoc
433
446
  - spec/examples/datamodel/models/models/AddressClassProfile.yml
434
447
  - spec/examples/datamodel/models/models/AddressComponentProfile.yml
@@ -440,8 +453,8 @@ files:
440
453
  - spec/examples/datamodel/models/models/Localization.yml
441
454
  - spec/examples/datamodel/models/models/ProfileCompliantAddress.yml
442
455
  - spec/examples/datamodel/models/models/ProfileCompliantAddressComponent.yml
443
- - spec/examples/datamodel/models/models/Signature copy.yml
444
456
  - spec/examples/datamodel/models/models/Signature.yml
457
+ - spec/examples/datamodel/models/models/SignatureBlankDefinition.yml
445
458
  - spec/examples/datamodel/models/models/TextDirectionCode copy.yml
446
459
  - spec/examples/datamodel/models/models/TextDirectionCode.yml
447
460
  - spec/examples/datamodel/models/models/Validity.yml
@@ -468,12 +481,14 @@ files:
468
481
  - spec/examples/rice_images/rice_image3_3.png
469
482
  - spec/fixtures/macros_datamodel/address_class_profile.xml
470
483
  - spec/fixtures/macros_datamodel/address_component_profile.xml
484
+ - spec/fixtures/macros_datamodel/blank_definition_profile.xml
471
485
  - spec/fixtures/macros_datamodel/common_models_diagram.xml
472
486
  - spec/fixtures/macros_datamodel/top_down_diagram.xml
473
487
  - spec/metanorma/processor_spec.rb
474
488
  - spec/spec_helper.rb
475
489
  - spec/vcr_cassettes/dated_iso_ref_joint_iso_iec.yml
476
490
  - spec/vcr_cassettes/isobib_get_123.yml
491
+ - spec/vcr_cassettes/isobib_get_123_1.yml
477
492
  - spec/vcr_cassettes/isobib_get_123_2001.yml
478
493
  - spec/vcr_cassettes/isobib_get_124.yml
479
494
  - spec/vcr_cassettes/rfcbib_get_rfc8341.yml
@@ -482,7 +497,7 @@ homepage: https://github.com/metanorma/metanorma-standoc
482
497
  licenses:
483
498
  - BSD-2-Clause
484
499
  metadata: {}
485
- post_install_message:
500
+ post_install_message:
486
501
  rdoc_options: []
487
502
  require_paths:
488
503
  - lib
@@ -497,9 +512,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
497
512
  - !ruby/object:Gem::Version
498
513
  version: '0'
499
514
  requirements: []
500
- rubyforge_project:
501
- rubygems_version: 2.7.6
502
- signing_key:
515
+ rubygems_version: 3.0.3
516
+ signing_key:
503
517
  specification_version: 4
504
518
  summary: metanorma-standoc realises standards following the Metanorma standoc model
505
519
  test_files: []
@@ -1,20 +0,0 @@
1
- term_def_boilerplate:
2
- no_terms_boilerplate: |
3
- <p>No terms and definitions are listed in this document.</p>
4
- internal_terms_boilerplate: |
5
- <p>For the purposes of this document,
6
- the following terms and definitions apply.</p>
7
- norm_with_refs_pref:
8
- The following documents are referred to in the text in such a way
9
- that some or all of their content constitutes requirements of this
10
- document. For dated references, only the edition cited applies.
11
- For undated references, the latest edition of the referenced
12
- document (including any amendments) applies.
13
- norm_empty_pref:
14
- There are no normative references in this document.
15
- external_terms_boilerplate: |
16
- <p>For the purposes of this document,
17
- the terms and definitions given in % apply.</p>
18
- internal_external_terms_boilerplate: |
19
- <p>For the purposes of this document, the terms and definitions
20
- given in % and the following apply.</p>
@@ -1,13 +0,0 @@
1
- term_def_boilerplate:
2
- no_terms_boilerplate: |
3
- <p>Aucun terme n'est defini dans le présent document.</p>
4
- internal_terms_boilerplate: |
5
- <p>Pour les besoins du présent document, les termes et définitions suivants s'appliquent.</p>
6
- norm_with_refs_pref:
7
- Les documents suivants cités dans le texte constituent, pour tout ou partie de leur contenu, des exigences du présent document. Pour les références datées, seule l’édition citée s'applique. Pour les références non datées, la dernière édition du document de référence s'applique (y compris les éventuels amendements).
8
- norm_empty_pref:
9
- Le présent document ne contient aucune référence normative.
10
- external_terms_boilerplate: |
11
- <p>Pour les besoins du présent document, les termes et définitions de % s'appliquent.</p>
12
- internal_external_terms_boilerplate: |
13
- <p>Pour les besoins du présent document, les termes et définitions de % ainsi que les suivants, s'appliquent.</p>
@@ -1,15 +0,0 @@
1
- term_def_boilerplate:
2
- no_terms_boilerplate: |
3
- <p>本文件不提供术语和定义。</p>
4
- internal_terms_boilerplate: |
5
- <p>下列术语和定义适用于本文件。</p>
6
- norm_with_refs_pref:
7
- 下列文件对于本文件的应用是必不可少的。
8
- 凡是注日期的引用文件,仅注日期的版本适用于本文件。
9
- 凡是不注日期的引用文件,其最新版本(包括所有的修改单)适用于本文件。
10
- norm_empty_pref:
11
- 本文件并没有规范性引用文件。
12
- external_terms_boilerplate: |
13
- <p>% 界定的术语和定义适用于本文件。</p>
14
- internal_external_terms_boilerplate: |
15
- <p>% 界定的以及下列术语和定义适用于本文件。</p>
@@ -1,39 +0,0 @@
1
- require "yaml"
2
-
3
- module Asciidoctor
4
- module Standoc
5
- module I18n
6
- def load_yaml(lang, script)
7
- if @i18nyaml then YAML.load_file(@i18nyaml)
8
- elsif lang == "en"
9
- YAML.load_file(File.join(File.dirname(__FILE__),
10
- "../../asciidoctor-yaml/i18n-en.yaml"))
11
- elsif lang == "fr"
12
- YAML.load_file(File.join(File.dirname(__FILE__),
13
- "../../asciidoctor-yaml/i18n-fr.yaml"))
14
- elsif lang == "zh" && script == "Hans"
15
- YAML.load_file(File.join(File.dirname(__FILE__),
16
- "../../asciidoctor-yaml/i18n-zh-Hans.yaml"))
17
- else
18
- YAML.load_file(File.join(File.dirname(__FILE__),
19
- "../../asciidoctor-yaml/i18n-en.yaml"))
20
- end
21
- end
22
-
23
- def i18n_init(lang, script)
24
- @lang = lang
25
- @script = script
26
- y = load_yaml(lang, script)
27
- @term_def_boilerplate = y["term_def_boilerplate"] || ""
28
- @no_terms_boilerplate = y["no_terms_boilerplate"] || ""
29
- @internal_terms_boilerplate = y["internal_terms_boilerplate"] || ""
30
- @norm_with_refs_pref = y["norm_with_refs_pref"] || ""
31
- @norm_empty_pref = y["norm_empty_pref"] || ""
32
- @external_terms_boilerplate = y["external_terms_boilerplate"] || ""
33
- @internal_external_terms_boilerplate =
34
- y["internal_external_terms_boilerplate"] || ""
35
- @labels = y
36
- end
37
- end
38
- end
39
- end