metanorma-standoc 1.4.4 → 1.6.0

data/lib/asciidoctor/standoc/views/datamodel/model_representation.adoc.erb

@@ -2,29 +2,29 @@
 [yaml2text,<%= model_path %>,definition]
 ----
 
-=== {definition.name || "<%= file_name %>"}
+=== {definition.name | default: "<%= file_name %>"}
 {definition.definition}
 
-{if definition.attributes}
-.{definition.name || "<%= file_name %>"} attributes
+{% if definition.attributes %}
+.{definition.name | default: "<%= file_name %>"} attributes
 |===
 |Name |Definition |Mandatory/ Optional/ Conditional |Max Occur |Data Type
 
-{definition.attributes&.*,key,EOK}
-|{key} |{definition.attributes[key].definition || "TODO: enum " + key.to_s + "'s definition"} |{definition.attributes[key]&.cardinality&.min == 0 ? "O" : "M"} |{definition.attributes[key]&.cardinality&.max == "*" ? "N" : "1"} |{definition.attributes[key].origin ? "<<" + definition.attributes[key].origin.to_s + ">>" : ""}`{definition.attributes[key].type}`
+{definition.attributes.*,key,EOK}
+|{key} |{% if definition.attributes[key].definition %}{{ definition.attributes[key].definition }}{% else %}TODO: enum {{ key }}'s definition{% endif %} |{% if definition.attributes[key].cardinality.min == 0 %}O{% else %}M{% endif %} |{% if definition.attributes[key].cardinality.max == "*" %}N{% else %}1{% endif %} |{% if definition.attributes[key].origin %}<<{{ definition.attributes[key].origin }}>>{% endif %} `{definition.attributes[key].type}`
 {EOK}
 |===
-{end}
+{% endif %}
 
-{if definition['values']}
-.{definition.name || "<%= file_name %>"} values
+{% if definition['values'] %}
+.{definition.name | default: "<%= file_name %>"} values
 |===
 |Name |Definition
 
-{definition['values']&.*,key,EOK}
+{definition['values'].*,key,EOK}
 |{key} |{definition['values'][key].definition}
 {EOK}
 |===
-{end}
+{% endif %}
 
 ----

data/lib/asciidoctor/standoc/yaml2_text_preprocessor.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "asciidoctor/standoc/base_structured_text_preprocessor"
+
+module Asciidoctor
+  module Standoc
+    class Yaml2TextPreprocessor < BaseStructuredTextPreprocessor
+      # search document for block `yaml2text`
+      #   after that take template from block and read file into this template
+      #   example:
+      #     [yaml2text,foobar.yaml]
+      #     ----
+      #     === {item.name}
+      #     {item.desc}
+      #
+      #     {item.symbol}:: {item.symbol_def}
+      #     ----
+      #
+      #   with content of `foobar.yaml` file equal to:
+      #     - name: spaghetti
+      #       desc: wheat noodles of 9mm diameter
+      #       symbol: SPAG
+      #       symbol_def: the situation is message like spaghetti at a kid's
+      #
+      #   will produce:
+      #     === spaghetti
+      #     wheat noodles of 9mm diameter
+      #
+      #     SPAG:: the situation is message like spaghetti at a kid's meal
+
+      def initialize(config = {})
+        super
+        @config[:block_name] = "yaml2text"
+      end
+
+      protected
+
+      def content_from_file(document, file_path)
+        YAML.safe_load(
+          File.read(relative_file_path(document, file_path),
+            encoding: "UTF-8"),
+          [Date, Time])
+      end
+    end
+  end
+end

data/lib/liquid/custom_blocks/key_iterator.rb

@@ -0,0 +1,21 @@
+module Liquid
+  module CustomBlocks
+    class KeyIterator < Block
+      def initialize(tag_name, markup, tokens)
+        super
+        @context_name, @var_name = markup.split(',').map(&:strip)
+      end
+
+      def render(context)
+        res = ''
+        iterator = context[@context_name].is_a?(Hash) ? context[@context_name].keys : context[@context_name]
+        iterator.each.with_index do |key, index|
+          context['index'] = index
+          context[@var_name] = key
+          res += super
+        end
+        res
+      end
+    end
+  end
+end

data/lib/liquid/custom_filters/values.rb

@@ -0,0 +1,7 @@
+module Liquid
+  module CustomFilters
+    def values(list)
+      list.values
+    end
+  end
+end

data/lib/metanorma/standoc.rb

@@ -1,11 +1,6 @@
 require_relative "./standoc/processor"
-require_relative "./standoc/requirement"
-require_relative "./standoc/latexml_requirement"
 
 module Metanorma
   module Standoc
-    Requirements = {
-      latexml: LatexmlRequirement.new
-    }
   end
 end

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,24 @@
 module Metanorma
+  class << self
+    # https://stackoverflow.com/a/53399471
+    def parent_of(mod)
+      parent_name = mod.name =~ /::[^:]+\Z/ ? $`.freeze : nil
+      Object.const_get(parent_name) if parent_name
+    end
+
+    def all_modules(mod)
+      [mod] + mod.constants.map { |c| mod.const_get(c) }
+        .select {|c| c.is_a?(Module) && parent_of(c) == mod }
+        .flat_map {|m| all_modules(m) }
+    end
+
+    def versioned(mod, flavour)
+      all_modules(mod).select {|c| defined? c::VERSION}.
+        select {|c| c.name =~ /::#{flavour}$/ }
+    end
+  end
+
   module Standoc
-   VERSION = "1.4.4".freeze
+    VERSION = "1.6.0".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -28,15 +28,17 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 1.1.0"
+  spec.add_dependency "isodoc", "~> 1.2.0"
   spec.add_dependency "iev", "~> 0.2.1"
-  spec.add_dependency "relaton", "~> 1.2.0"
+  # relaton-cli not just relaton, to avoid circular reference in metanorma
+  spec.add_dependency "relaton-cli", "~> 1.4.0"
   spec.add_dependency "relaton-iev", "~> 1.0.0"
   spec.add_dependency "sterile", "~> 1.0.14"
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
   spec.add_dependency "mimemagic"
   spec.add_dependency "mathml2asciimath"
+  spec.add_dependency "latexmath"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "sassc", "2.4.0"
@@ -50,7 +52,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "vcr", "~> 5.0.0"
   spec.add_development_dependency "webmock"
-  #spec.add_development_dependency "relaton-iec"
-  #spec.add_development_dependency "relaton-iso"
-  #spec.add_development_dependency "relaton-ietf"
 end

data/spec/asciidoctor-standoc/base_spec.rb

@@ -32,8 +32,101 @@ RSpec.describe Asciidoctor::Standoc do
     expect(File.exist?("htmlstyle.css")).to be false
   end
 
-  it "processes default metadata" do
+    it "processes publisher abbreviations" do
+    mock_org_abbrevs
     expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to xmlpp(<<~'OUTPUT')
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :publisher: International Electrotechnical Commission,IETF,ISO
+INPUT
+<standard-document xmlns='https://www.metanorma.org/ns/standoc' type='semantic' version='1.5.3'>
+  <bibdata type='standard'>
+    <title language='en' format='text/plain'>Document title</title>
+    <contributor>
+      <role type='author'/>
+      <organization>
+        <name>International Electrotechnical Commission</name>
+        <abbreviation>IEC</abbreviation>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='author'/>
+      <organization>
+        <name>IETF</name>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='author'/>
+      <organization>
+        <name>International Standards Organization</name>
+        <abbreviation>ISO</abbreviation>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='publisher'/>
+      <organization>
+        <name>International Electrotechnical Commission</name>
+        <abbreviation>IEC</abbreviation>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='publisher'/>
+      <organization>
+        <name>IETF</name>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='publisher'/>
+      <organization>
+        <name>International Standards Organization</name>
+        <abbreviation>ISO</abbreviation>
+      </organization>
+    </contributor>
+    <language>en</language>
+    <script>Latn</script>
+    <status>
+      <stage>published</stage>
+    </status>
+    <copyright>
+      <from>2020</from>
+      <owner>
+        <organization>
+          <name>International Electrotechnical Commission</name>
+          <abbreviation>IEC</abbreviation>
+        </organization>
+      </owner>
+    </copyright>
+    <copyright>
+      <from>2020</from>
+      <owner>
+        <organization>
+          <name>IETF</name>
+        </organization>
+      </owner>
+    </copyright>
+    <copyright>
+      <from>2020</from>
+      <owner>
+        <organization>
+          <name>International Standards Organization</name>
+          <abbreviation>ISO</abbreviation>
+        </organization>
+      </owner>
+    </copyright>
+    <ext>
+      <doctype>article</doctype>
+    </ext>
+  </bibdata>
+  <sections> </sections>
+</standard-document>
+OUTPUT
+  end
+
+  it "processes default metadata" do
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -102,13 +195,14 @@ RSpec.describe Asciidoctor::Standoc do
       :email_2: barney@rockhead.example.com
       :phone_2: 789
       :fax_2: 012
-      :publisher: Hanna Barbera, Cartoon Network
+      :publisher: "Hanna Barbera", "Cartoon Network", "Ribose, Inc."
+      :copyright-holder: "Ribose, Inc.", Hanna Barbera
       :part-of: ABC
       :translated-from: DEF,GHI;JKL MNO,PQR
       :keywords: a, b, c
     INPUT
     <?xml version="1.0" encoding="UTF-8"?>
-<standard-document xmlns="https://www.metanorma.org/ns/standoc">
+<standard-document xmlns="https://www.metanorma.org/ns/standoc" type="semantic" version="#{Metanorma::Standoc::VERSION}">
 <bibdata type="standard">
 <title language="en" format="text/plain">Main Title — Title</title>
   <docidentifier>1000-1</docidentifier>
@@ -155,6 +249,12 @@ RSpec.describe Asciidoctor::Standoc do
 <date type="Jack">
   <on>1010-01-01</on>
 </date>
+<contributor>
+  <role type="author"/>
+  <organization>
+    <name>Ribose, Inc.</name>
+  </organization>
+</contributor>
 <contributor>
   <role type="author"/>
   <organization>
@@ -221,6 +321,12 @@ RSpec.describe Asciidoctor::Standoc do
     <name>Cartoon Network</name>
   </organization>
 </contributor>
+<contributor>
+  <role type="publisher"/>
+  <organization>
+    <name>Ribose, Inc.</name>
+  </organization>
+</contributor>
 <edition>2</edition>
 <version>
   <revision-date>2000-01-01</revision-date>
@@ -237,7 +343,7 @@ RSpec.describe Asciidoctor::Standoc do
     <from>2001</from>
        <owner>
      <organization>
-       <name>Hanna Barbera</name>
+       <name>Ribose, Inc.</name>
      </organization>
    </owner>
  </copyright>
@@ -245,7 +351,7 @@ RSpec.describe Asciidoctor::Standoc do
    <from>2001</from>
    <owner>
      <organization>
-       <name>Cartoon Network</name>
+       <name>Hanna Barbera</name>
      </organization>
    </owner>
   </copyright>
@@ -314,6 +420,7 @@ RSpec.describe Asciidoctor::Standoc do
       :doc-uri: E
       :relaton-uri: F
       :title-eo: Dokumenttitolo
+      :doctype: This is a DocType
 
       [abstract]
       == Abstract
@@ -325,7 +432,7 @@ RSpec.describe Asciidoctor::Standoc do
       == Clause 1
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
-       <standard-document xmlns="https://www.metanorma.org/ns/standoc">
+       <standard-document xmlns="https://www.metanorma.org/ns/standoc"  type="semantic" version="#{Metanorma::Standoc::VERSION}">
        <bibdata type="standard">
          <title language="en" format="text/plain">Document title</title>
          <title language="eo" format="text/plain">Dokumenttitolo</title>
@@ -409,11 +516,12 @@ RSpec.describe Asciidoctor::Standoc do
            </owner>
          </copyright>
          <ext>
-         <doctype>article</doctype>
+         <doctype>this-is-a-doctype</doctype>
          </ext>
        </bibdata>
          <preface>
     <abstract id='_'>
+    <title>Abstract</title>
       <p id='_'>This is the abstract of the document</p>
       <p id='_'>This is the second paragraph of the abstract of the document.</p>
     </abstract>
@@ -511,6 +619,31 @@ QU1FOiB0ZXN0Cgo=
 ])
   end
 
+  it "test submitting-organizations with delimiter in end" do
+    FileUtils.rm_f "test.doc"
+    Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :doctype: standard
+      :encoding: utf-8
+      :lang: en
+      :submitting-organizations: Organization One; Organization Two;
+      :publisher: "Hanna Barbera", "Cartoon Network", "Ribose, Inc.",
+    INPUT
+    expect(File.exist?("test.doc")).to be true
+  end
+
+  private
+
+  def mock_org_abbrevs
+    allow_any_instance_of(::Asciidoctor::Standoc::Front).to receive(:org_abbrev).and_return(
+      { "International Standards Organization" => "ISO",
+        "International Electrotechnical Commission" => "IEC" }
+    )
+  end
+
+ 
 
 end
 

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -86,172 +86,149 @@ RSpec.describe Asciidoctor::Standoc do
 
     INPUT
             #{BLANK_HDR}
-       <sections>
-         <formula id="ABC" inequality="true" number="3" keep-with-next="true" keep-lines-together="true">
-         <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>r</mi><mo>=</mo><mn>1</mn><mi>%</mi><mi>r</mi><mo>=</mo><mn>1</mn><mi>%</mi></math></stem>
-       </formula>
-
-       <formula id="_" unnumbered="true">
-         <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub> <mrow> <mrow> <mi mathvariant="bold-italic">F</mi> </mrow> </mrow> <mrow> <mrow> <mi mathvariant="bold-italic">Α</mi> </mrow> </mrow> </msub> </math></stem>
-       </formula>
-              <formula id="_" subsequence="A">
-         <stem type="MathML">
-       <math xmlns="http://www.w3.org/1998/Math/MathML">
-         <mrow>
-           <mi>M</mi>
-           <mo>=</mo>
-           <mrow>
-             <mo>[</mo>
-             <mtable columnspacing="5pt" displaystyle="true" rowspacing="0pt">
-               <mtr>
-                 <mtd columnalign="center">
+            <sections>
+           <formula id='ABC' number='3' keep-with-next='true' keep-lines-together='true' inequality='true'>
+             <stem type='MathML'>
+               <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                 <mi>r</mi>
+                 <mo>=</mo>
+                 <mn>1</mn>
+                 <mi>%</mi>
+                 <mi>r</mi>
+                 <mo>=</mo>
+                 <mn>1</mn>
+                 <mi>%</mi>
+               </math>
+             </stem>
+           </formula>
+           <formula id='_' unnumbered='true'>
+             <stem type='MathML'>
+               <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                 <msub>
                    <mrow>
-                     <mo>-</mo>
                      <mrow>
-                       <mi>sin</mi>
-                       <mo>⁡</mo>
-                       <msub>
-                         <mi>λ</mi>
-                         <mn>0</mn>
-                       </msub>
+                       <mi mathvariant='bold-italic'>F</mi>
                      </mrow>
                    </mrow>
-                 </mtd>
-                 <mtd columnalign="center">
                    <mrow>
-                     <mi>cos</mi>
-                     <mo>⁡</mo>
-                     <msub>
-                       <mi>λ</mi>
-                       <mn>0</mn>
-                     </msub>
-                   </mrow>
-                 </mtd>
-                 <mtd columnalign="center">
-                   <mn>0</mn>
-                 </mtd>
-               </mtr>
-               <mtr>
-                 <mtd columnalign="center">
-                   <mrow>
-                     <mo>-</mo>
                      <mrow>
-                       <mrow>
-                         <mi>sin</mi>
-                         <mo>⁡</mo>
+                       <mi mathvariant='bold-italic'>Α</mi>
+                     </mrow>
+                   </mrow>
+                 </msub>
+               </math>
+             </stem>
+           </formula>
+           <formula id='_' subsequence='A'>
+             <stem type='MathML'>
+               <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                 <mrow>
+                   <mi>M</mi>
+                   <mo>=</mo>
+                   <mo>[</mo>
+                   <mtable>
+                     <mtr>
+                       <mtd>
+                         <mrow>
+                           <mo>−</mo>
+                           <mi>sin</mi>
+                         </mrow>
+                         <msub>
+                           <mi>λ</mi>
+                           <mn>0</mn>
+                         </msub>
+                       </mtd>
+                       <mtd>
+                         <mi>cos</mi>
+                         <msub>
+                           <mi>λ</mi>
+                           <mn>0</mn>
+                         </msub>
+                       </mtd>
+                       <mtd>
+                         <mn>0</mn>
+                       </mtd>
+                     </mtr>
+                     <mtr>
+                       <mtd>
+                         <mrow>
+                           <mo>−</mo>
+                           <mi>sin</mi>
+                         </mrow>
                          <msub>
                            <mi>φ</mi>
                            <mn>0</mn>
                          </msub>
-                       </mrow>
-                       <mo>⁢</mo>
-                       <mrow>
                          <mi>cos</mi>
-                         <mo>⁡</mo>
                          <msub>
                            <mi>λ</mi>
                            <mn>0</mn>
                          </msub>
-                       </mrow>
-                     </mrow>
-                   </mrow>
-                 </mtd>
-                 <mtd columnalign="center">
-                   <mrow>
-                     <mo>-</mo>
-                     <mrow>
-                       <mrow>
+                       </mtd>
+                       <mtd>
+                         <mrow>
+                           <mo>−</mo>
+                           <mi>sin</mi>
+                         </mrow>
+                         <msub>
+                           <mi>φ</mi>
+                           <mn>0</mn>
+                         </msub>
                          <mi>sin</mi>
-                         <mo>⁡</mo>
+                         <msub>
+                           <mi>λ</mi>
+                           <mn>0</mn>
+                         </msub>
+                       </mtd>
+                       <mtd>
+                         <mi>cos</mi>
+                         <msub>
+                           <mi>φ</mi>
+                           <mn>0</mn>
+                         </msub>
+                       </mtd>
+                     </mtr>
+                     <mtr>
+                       <mtd>
+                         <mi>cos</mi>
+                         <msub>
+                           <mi>φ</mi>
+                           <mn>0</mn>
+                         </msub>
+                         <mi>cos</mi>
+                         <msub>
+                           <mi>λ</mi>
+                           <mn>0</mn>
+                         </msub>
+                       </mtd>
+                       <mtd>
+                         <mi>cos</mi>
                          <msub>
                            <mi>φ</mi>
                            <mn>0</mn>
                          </msub>
-                       </mrow>
-                       <mo>⁢</mo>
-                       <mrow>
                          <mi>sin</mi>
-                         <mo>⁡</mo>
                          <msub>
                            <mi>λ</mi>
                            <mn>0</mn>
                          </msub>
-                       </mrow>
-                     </mrow>
-                   </mrow>
-                 </mtd>
-                 <mtd columnalign="center">
-                   <mrow>
-                     <mi>cos</mi>
-                     <mo>⁡</mo>
-                     <msub>
-                       <mi>φ</mi>
-                       <mn>0</mn>
-                     </msub>
-                   </mrow>
-                 </mtd>
-               </mtr>
-               <mtr>
-                 <mtd columnalign="center">
-                   <mrow>
-                     <mrow>
-                       <mi>cos</mi>
-                       <mo>⁡</mo>
-                       <msub>
-                         <mi>φ</mi>
-                         <mn>0</mn>
-                       </msub>
-                     </mrow>
-                     <mo>⁢</mo>
-                     <mrow>
-                       <mi>cos</mi>
-                       <mo>⁡</mo>
-                       <msub>
-                         <mi>λ</mi>
-                         <mn>0</mn>
-                       </msub>
-                     </mrow>
-                   </mrow>
-                 </mtd>
-                 <mtd columnalign="center">
-                   <mrow>
-                     <mrow>
-                       <mi>cos</mi>
-                       <mo>⁡</mo>
-                       <msub>
-                         <mi>φ</mi>
-                         <mn>0</mn>
-                       </msub>
-                     </mrow>
-                     <mo>⁢</mo>
-                     <mrow>
-                       <mi>sin</mi>
-                       <mo>⁡</mo>
-                       <msub>
-                         <mi>λ</mi>
-                         <mn>0</mn>
-                       </msub>
-                     </mrow>
-                   </mrow>
-                 </mtd>
-                 <mtd columnalign="center">
-                   <mrow>
-                     <mi>sin</mi>
-                     <mo>⁡</mo>
-                     <msub>
-                       <mi>φ</mi>
-                       <mn>0</mn>
-                     </msub>
-                   </mrow>
-                 </mtd>
-               </mtr>
-             </mtable>
-             <mo>]</mo>
-           </mrow>
-         </mrow>
-       </math></stem>
-       </formula>
-       </sections></standard-document>
+                       </mtd>
+                       <mtd>
+                         <mi>sin</mi>
+                         <msub>
+                           <mi>φ</mi>
+                           <mn>0</mn>
+                         </msub>
+                       </mtd>
+                     </mtr>
+                   </mtable>
+                   <mo>]</mo>
+                 </mrow>
+               </math>
+             </stem>
+           </formula>
+         </sections>
+       </standard-document>
     OUTPUT
   end
   
@@ -296,7 +273,7 @@ RSpec.describe Asciidoctor::Standoc do
       For further information on the Foreword, see *ISO/IEC Directives, Part 2, 2016, Clause 12.*
       ****
       INPUT
-      <standard-document xmlns="https://www.metanorma.org/ns/standoc">
+      <standard-document xmlns="https://www.metanorma.org/ns/standoc"  type="semantic" version="#{Metanorma::Standoc::VERSION}">
        <bibdata type="standard">
          <title language="en" format="text/plain">Document title</title>
 
@@ -361,6 +338,10 @@ RSpec.describe Asciidoctor::Standoc do
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
 
+      NOTE: This is not a termnote
+
+      EXAMPLE: This is not a termexample
+
       [.nonterm]
       === Term1
 
@@ -371,6 +352,9 @@ RSpec.describe Asciidoctor::Standoc do
   <terms id="_" obligation="normative">
   <title>Terms and definitions</title>
          <p id="_">No terms and definitions are listed in this document.</p>
+         <note id='_'>
+  <p id='_'>This is not a termnote</p>
+</note>
   <clause id="_" inline-header="false" obligation="normative">
   <title>Term1</title>
   <note id="_">
@@ -397,12 +381,12 @@ RSpec.describe Asciidoctor::Standoc do
       INPUT
               #{BLANK_HDR}
               <sections>
-  <terms id="_" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title>
+  <terms id="_" obligation="normative"><title>Terms, definitions and symbols</title>
 <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
 <term id="_">
   <preferred>Term1</preferred>
 </term>
-<definitions id="_">
+<definitions id="_" obligation="normative" type="symbols">
   <title>Symbols</title>
   <note id="_">
   <p id="_">This is a note</p>
@@ -598,11 +582,11 @@ RSpec.describe Asciidoctor::Standoc do
       INPUT
               #{BLANK_HDR}
 <sections> 
-  <terms id="_" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title>
+  <terms id="_" obligation="normative"><title>Terms, definitions and symbols</title>
 <p id="_">For the purposes of this document, the following terms and definitions apply.</p><term id="_">   
   <preferred>Term1</preferred>   
 </term>  
-<definitions id="_">   
+<definitions id="_" obligation="normative" type="symbols">   
   <title>Symbols</title>   
   <example id="_">    
   <p id="_">This is an example</p>    
@@ -679,7 +663,7 @@ RSpec.describe Asciidoctor::Standoc do
       INPUT
       #{BLANK_HDR}
              <preface><foreword id="_" obligation="informative">
-         <title>Preamble</title>
+         <title>Foreword</title>
          <p id="_">This is a preamble</p>
        </foreword></preface><sections>
        <clause id="_" inline-header="false" obligation="normative">
@@ -1246,9 +1230,16 @@ RSpec.describe Asciidoctor::Standoc do
        <recommendation id="ABC"  obligation="permission,recommendation" filename="reqt1.rq"><label>/ogc/recommendation/wfs/2</label><subject>user</subject>
 <classification><tag>control-class</tag><value>Technical</value></classification><classification><tag>priority</tag><value>P0</value></classification><classification><tag>family</tag><value>System &amp; Communications Protection</value></classification><classification><tag>family</tag><value>System and Communications Protocols</value></classification>
         <description><p id="_">I recommend <em>this</em>.</p>
-       </description><specification exclude="false" type="tabular" keep-with-next="true" keep-lines-together="true"><p id="_">This is the object of the recommendation:</p><table id="_">  <tbody>    <tr>      <td align="left">Object</td>      <td align="left">Value</td>    </tr>    <tr>      <td align="left">Mission</td>      <td align="left">Accomplished</td>    </tr>  </tbody></table></specification><description>
+       </description><specification exclude="false" type="tabular" keep-with-next="true" keep-lines-together="true"><p id="_">This is the object of the recommendation:</p><table id="_">  <tbody>    <tr>      <td valign="top" align="left">Object</td>      <td valign="top" align="left">Value</td>    </tr>    <tr>      <td valign="top" align="left">Mission</td>      <td valign="top" align="left">Accomplished</td>    </tr>  </tbody></table></specification><description>
        <p id="_">As for the measurement targets,</p>
-       </description><measurement-target exclude="false"><p id="_">The measurement target shall be measured as:</p><formula id="_">  <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mfrac><mi>r</mi><mn>1</mn></mfrac><mo>=</mo><mn>0</mn></math></stem></formula></measurement-target>
+       </description><measurement-target exclude="false"><p id="_">The measurement target shall be measured as:</p><formula id="_">  <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mfrac>
+       <mrow>
+  <mi>r</mi>
+</mrow>
+<mrow>
+  <mn>1</mn>
+</mrow>
+</mfrac><mo>=</mo><mn>0</mn></math></stem></formula></measurement-target>
        <verification exclude="false"><p id="_">The following code will be run for verification:</p><sourcecode  lang="CoreRoot" id="_">CoreRoot(success): HttpResponse
 if (success)
   recommendation(label: success-response)
@@ -1261,4 +1252,139 @@ end</sourcecode></verification>
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(output)
   end
 
+  it "processes delete change clauses" do
+    input = <<~"INPUT"
+#{ASCIIDOC_BLANK_HDR}
+[change="modify",locality="page=27",path="//table[2]",path_end="//table[2]/following-sibling:example[1]",title="Change"]
+==== Change Clause
+_This table contains information on polygon cells which are not included in ISO 10303-52. Remove table 2 completely and replace with:_
+INPUT
+ output = <<~"OUTPUT"
+            #{BLANK_HDR}
+            <sections>
+  <clause id='_' inline-header='false' obligation='normative'>
+    <title>Change Clause</title>
+    <amend id='_' change='modify' path='//table[2]' path_end='//table[2]/following-sibling:example[1]' title='Change'>
+      <description>
+        <p id='_'>
+          <em>
+            This table contains information on polygon cells which are not
+            included in ISO 10303-52. Remove table 2 completely and replace
+            with:
+          </em>
+        </p>
+      </description>
+    </amend>
+  </clause>
+</sections>
+            </standard-document>
+            OUTPUT
+ expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(output)
+
+  end
+
+  it "processes modify change clauses" do
+    input = <<~"INPUT"
+#{ASCIIDOC_BLANK_HDR}
+[change="modify",locality="page=27",path="//table[2]",path_end="//table[2]/following-sibling:example[1]",title="Change"]
+==== Change Clause
+
+autonumber:table[2]
+autonumber:note[7]
+
+_This table contains information on polygon cells which are not included in ISO 10303-52. Remove table 2 completely and replace with:_
+
+____
+.Edges of triangle and quadrilateral cells
+|===
+2+^.^h| triangle 2+^.^h| quadrilateral
+^.^| edge ^.^| vertices ^.^| edge ^.^| vertices
+^.^| 1 ^.^| 1, 2 ^.^| 1 ^.^| 1, 2
+^.^| 2 ^.^| 2, 3 ^.^| 2 ^.^| 2, 3
+^.^| 3 ^.^| 3, 1 ^.^| 3 ^.^| 3, 4
+| | ^.^| 4 ^.^| 4, 1
+|===
+
+====
+This is not generalised further.
+====
+
+____
+
+Any further exceptions can be ignored.
+    INPUT
+
+     output = <<~"OUTPUT"
+            #{BLANK_HDR}
+     <sections>
+  <clause id='_' inline-header='false' obligation='normative'>
+    <title>Change Clause</title>
+    <amend id='_' change='modify' path='//table[2]' path_end='//table[2]/following-sibling:example[1]' title='Change'>
+    <autonumber type='table'>2</autonumber>
+               <autonumber type='note'>7</autonumber>
+               <description>
+                 <p id='_'>
+                   <em>
+                     This table contains information on polygon cells which are not
+                     included in ISO 10303-52. Remove table 2 completely and replace
+                     with:
+                   </em>
+                 </p>
+               </description>
+      <newcontent id='_'>
+        <table id='_'>
+          <name>Edges of triangle and quadrilateral cells</name>
+          <tbody>
+            <tr>
+              <th colspan='2' valign='middle' align='center'>triangle</th>
+              <th colspan='2' valign='middle' align='center'>quadrilateral</th>
+            </tr>
+            <tr>
+              <td valign='middle' align='center'>edge</td>
+              <td valign='middle' align='center'>vertices</td>
+              <td valign='middle' align='center'>edge</td>
+              <td valign='middle' align='center'>vertices</td>
+            </tr>
+            <tr>
+              <td valign='middle' align='center'>1</td>
+              <td valign='middle' align='center'>1, 2</td>
+              <td valign='middle' align='center'>1</td>
+              <td valign='middle' align='center'>1, 2</td>
+            </tr>
+            <tr>
+              <td valign='middle' align='center'>2</td>
+              <td valign='middle' align='center'>2, 3</td>
+              <td valign='middle' align='center'>2</td>
+              <td valign='middle' align='center'>2, 3</td>
+            </tr>
+            <tr>
+              <td valign='middle' align='center'>3</td>
+              <td valign='middle' align='center'>3, 1</td>
+              <td valign='middle' align='center'>3</td>
+              <td valign='middle' align='center'>3, 4</td>
+            </tr>
+            <tr>
+              <td valign='top' align='left'/>
+              <td valign='top' align='left'/>
+              <td valign='middle' align='center'>4</td>
+              <td valign='middle' align='center'>4, 1</td>
+            </tr>
+          </tbody>
+        </table>
+        <example id='_'>
+          <p id='_'>This is not generalised further.</p>
+        </example>
+      </newcontent>
+      <description>
+  <p id='_'>Any further exceptions can be ignored.</p>
+</description>
+    </amend>
+  </clause>
+</sections>
+     </standard-document>
+     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(output)
+  end
+
+
 end