metanorma-csa 2.6.2 → 2.6.4

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.
@@ -1,11 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'metanorma/processor'
3
+ require "metanorma/processor"
4
4
 
5
5
  module Metanorma
6
6
  module Csa
7
7
  class Processor < Metanorma::Processor
8
-
9
8
  def initialize
10
9
  @short = :csa
11
10
  @input_format = :asciidoc
@@ -14,9 +13,9 @@ module Metanorma
14
13
 
15
14
  def output_formats
16
15
  super.merge(
17
- html: 'html',
18
- doc: 'doc',
19
- pdf: 'pdf'
16
+ html: "html",
17
+ doc: "doc",
18
+ pdf: "pdf",
20
19
  )
21
20
  end
22
21
 
@@ -24,17 +23,21 @@ module Metanorma
24
23
  "Metanorma::Csa #{Metanorma::Csa::VERSION}"
25
24
  end
26
25
 
27
- def output(isodoc_node, inname, outname, format, options={})
26
+ def output(isodoc_node, inname, outname, format, options = {})
28
27
  options_preprocess(options)
29
28
  case format
30
29
  when :html
31
- IsoDoc::Csa::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
30
+ IsoDoc::Csa::HtmlConvert.new(options)
31
+ .convert(inname, isodoc_node, nil, outname)
32
32
  when :doc
33
- IsoDoc::Csa::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
33
+ IsoDoc::Csa::WordConvert.new(options)
34
+ .convert(inname, isodoc_node, nil, outname)
34
35
  when :pdf
35
- IsoDoc::Csa::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
36
+ IsoDoc::Csa::PdfConvert.new(options)
37
+ .convert(inname, isodoc_node, nil, outname)
36
38
  when :presentation
37
- IsoDoc::Csa::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
39
+ IsoDoc::Csa::PresentationXMLConvert.new(options)
40
+ .convert(inname, isodoc_node, nil, outname)
38
41
  else
39
42
  super
40
43
  end
@@ -14,22 +14,6 @@
14
14
  <value>case-study</value>
15
15
  </choice>
16
16
  </define>
17
- <define name="BibDataExtensionType">
18
- <optional>
19
- <attribute name="schema-version"/>
20
- </optional>
21
- <optional>
22
- <ref name="doctype"/>
23
- </optional>
24
- <optional>
25
- <ref name="docsubtype"/>
26
- </optional>
27
- <ref name="flavor"/>
28
- <ref name="editorialgroup"/>
29
- <zeroOrMore>
30
- <ref name="ics"/>
31
- </zeroOrMore>
32
- </define>
33
17
  <define name="editorialgroup">
34
18
  <element name="editorialgroup">
35
19
  <oneOrMore>
@@ -1,5 +1,11 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <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">
3
+ <define name="requirement">
4
+ <element name="requirement">
5
+ <ref name="RequirementType"/>
6
+ </element>
7
+ </define>
8
+ <!-- ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437 -->
3
9
  <!--
4
10
  Presupposes isodoc.rnc, is included in it
5
11
  include "isodoc.rnc" { }
@@ -7,14 +13,9 @@
7
13
  This is the Metanorma default provisions model; it is overridden by other provisions models,
8
14
  such as Modspec
9
15
  -->
10
- <define name="requirement">
16
+ <define name="recommendation">
11
17
  <a:documentation>Specification of an attribute of a subject that is required.
12
18
  NOTE: A requirement can contain other requirements</a:documentation>
13
- <element name="requirement">
14
- <ref name="RequirementType"/>
15
- </element>
16
- </define>
17
- <define name="recommendation">
18
19
  <a:documentation>Specification of an attribute of a subject that is recommended</a:documentation>
19
20
  <element name="recommendation">
20
21
  <ref name="RequirementType"/>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Csa
3
- VERSION = "2.6.2".freeze
3
+ VERSION = "2.6.4".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-csa
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.6.2
4
+ version: 2.6.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2025-03-17 00:00:00.000000000 Z
11
+ date: 2025-04-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic