metanorma-standoc 1.3.28 → 1.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ee3fb2a341c932aff7e68ccb8c048151741abcb0faaaeacc7397ec9f2b2d57e
-  data.tar.gz: d61e8f1944322c8f2d8a43dff3f0dc9fb6f3c74caffd3ce17998e1b7e25ff7a6
+  metadata.gz: e964fb25b29d5ecbe775bf397a17f9cf264fa3709e8756be7a9025bcf043250f
+  data.tar.gz: d6085180737f332f6aa657eb129bf72f02ca0466b60e22276ddda03cd2cbd788
 SHA512:
-  metadata.gz: 88eccb85c42a5a580f6a56a43ebd86122583fda463ceb4d1599671f482e5a6341ab4299f88d40a07aa639953c701a846101bbe3453dbf44a66947c7641d0cda2
-  data.tar.gz: f4cfbe3757116cb13eda00da0f01fb97b9548ae4eb5b9c5c56b3463ffcd3ab1dcbdddf182799b280ab430e7dbd4ee30179764c332c326238e98a5c1b3ef8a899
+  metadata.gz: baccf6cbbb3c32defcac92b95911e83f10f44338a2bb631a8c6ee86a7b00833583d27161b18ad45b2d80aeec8dcbe3dd349a39b4cfa08670f6cdbe1c8492323c
+  data.tar.gz: 347739395332e6d3ac88ea0ec5bec557fa0d06dee7f7f2bbafa198e245131dd313c3f229f63bb3afc92c99eb4cd0cec8fc2a9f969e0cbf42a76271e45955e8eb

data/.github/workflows/macos.yml

@@ -6,15 +6,23 @@ on:
   push:
     branches: [ master ]
   pull_request:
+    paths-ignore:
+      - .github/workflows/ubuntu.yml
+      - .github/workflows/windows.yml
 
 jobs:
   test-macos:
     name: Test on Ruby ${{ matrix.ruby }} macOS
     runs-on: macos-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
+        experimental: [false]
+        include:
+          - ruby: '2.7'
+            experimental: true
     steps:
       - uses: actions/checkout@master
       - name: Use Ruby

data/.github/workflows/ubuntu.yml

@@ -6,15 +6,23 @@ on:
   push:
     branches: [ master ]
   pull_request:
+    paths-ignore:
+      - .github/workflows/macos.yml
+      - .github/workflows/windows.yml
 
 jobs:
   test-linux:
     name: Test on Ruby ${{ matrix.ruby }} Ubuntu
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
+        experimental: [false]
+        include:
+          - ruby: '2.7'
+            experimental: true
     steps:
       - uses: actions/checkout@master
       - name: Use Ruby

data/.github/workflows/windows.yml

@@ -6,15 +6,23 @@ on:
   push:
     branches: [ master ]
   pull_request:
+    paths-ignore:
+      - .github/workflows/macos.yml
+      - .github/workflows/ubuntu.yml
 
 jobs:
   test-windows:
     name: Test on Ruby ${{ matrix.ruby }} Windows
     runs-on: windows-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
+        experimental: [false]
+        include:
+          - ruby: '2.7'
+            experimental: true
     steps:
       - uses: actions/checkout@master
       - name: Use Ruby

data/lib/asciidoctor/standoc/base.rb

@@ -169,9 +169,13 @@ module Asciidoctor
           html_converter(node).convert(@filename + ".xml")
           doc_converter(node).convert(@filename + ".xml")
         end
+        clean_exit
+        ret
+      end
+
+      def clean_exit
         @log.write(@localdir + @filename + ".err") unless @novalid
         @files_to_delete.each { |f| FileUtils.rm f }
-        ret
       end
 
       def makexml1(node)

data/lib/asciidoctor/standoc/biblio.rng

@@ -88,7 +88,7 @@
       <text/>
     </element>
   </define>
-  <define name="LocalizedString">
+  <define name="LocalizedString1">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -98,6 +98,16 @@
     </optional>
     <text/>
   </define>
+  <define name="LocalizedString">
+    <choice>
+      <ref name="LocalizedString1"/>
+      <oneOrMore>
+        <element name="variant">
+          <ref name="LocalizedString1"/>
+        </element>
+      </oneOrMore>
+    </choice>
+  </define>
   <!--
     Unlike UML, change type to format: type is overloaded
     Would be need if plain were default value and could omit the attribute
@@ -121,7 +131,7 @@
     </optional>
     <ref name="LocalizedStringOrXsAny"/>
   </define>
-  <define name="LocalizedStringOrXsAny">
+  <define name="LocalizedStringOrXsAny1">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -136,6 +146,16 @@
       </choice>
     </oneOrMore>
   </define>
+  <define name="LocalizedStringOrXsAny">
+    <choice>
+      <ref name="LocalizedStringOrXsAny1"/>
+      <oneOrMore>
+        <element name="variant">
+          <ref name="LocalizedStringOrXsAny1"/>
+        </element>
+      </oneOrMore>
+    </choice>
+  </define>
   <define name="contributor">
     <element name="contributor">
       <zeroOrMore>

data/lib/asciidoctor/standoc/blocks.rb

@@ -21,6 +21,10 @@ module Asciidoctor
                   subsequence: node.attr("subsequence") )
       end
 
+      def note_attr(node)
+        attr_code(id_attr(node).merge("keep-separate": node.attr("keep-separate")))
+      end
+
       # We append each contained block to its parent
       def open(node)
         role = node.role || node.attr("style")
@@ -91,7 +95,7 @@ module Asciidoctor
 
       def termnote(n)
         noko do |xml|
-          xml.termnote **id_attr(n) do |ex|
+          xml.termnote **note_attr(n) do |ex|
             wrap_in_para(n, ex)
           end
         end.join("\n")
@@ -99,7 +103,7 @@ module Asciidoctor
 
       def note(n)
         noko do |xml|
-          xml.note **id_attr(n) do |c|
+          xml.note **note_attr(n) do |c|
             wrap_in_para(n, c)
           end
         end.join("\n")
@@ -146,8 +150,7 @@ module Asciidoctor
 
       def pseudocode_example(node)
         noko do |xml|
-          xml.figure **{id: Asciidoctor::Standoc::Utils::anchor_or_uuid(node),
-                        class: "pseudocode"} do |ex|
+          xml.figure **id_unnum_attr(node).merge(class: "pseudocode") do |ex|
             figure_title(node, ex)
             wrap_in_para(node, ex)
           end

data/lib/asciidoctor/standoc/cleanup_block.rb

@@ -131,10 +131,13 @@ module Asciidoctor
       def note_cleanup(xmldoc)
         q = "//note[following-sibling::*[not(local-name() = 'note')]]"
         xmldoc.xpath(q).each do |n|
+          next if n["keep-separate"] == "true"
           next unless n.ancestors("table").empty?
           prev = n.previous_element || next
           n.parent = prev if ELEMS_ALLOW_NOTES.include? prev.name
         end
+        xmldoc.xpath("//note[@keep-separate]").each { |n| n.delete("keep-separate") }
+        xmldoc.xpath("//termnote[@keep-separate]").each { |n| n.delete("keep-separate") }
       end
 
       def requirement_cleanup(x)

data/lib/asciidoctor/standoc/validate.rb

@@ -25,7 +25,6 @@ module Asciidoctor
           @iev = init_iev or return
           iev = @iev.fetch(locality, xmldoc&.at("//language")&.text || "en") or next
           pref.include?(iev.downcase) or
-            #warn %(Term "#{pref[0]}" does not match IEV #{locality} "#{iev}")
           @log.add("Bibliography", t, %(Term "#{pref[0]}" does not match IEV #{locality} "#{iev}"))
         end
       end
@@ -38,14 +37,20 @@ module Asciidoctor
 
       def repeat_id_validate(doc)
         ids = {}
+        crash = false
         doc.xpath("//*[@id]").each do |x|
           if ids[x["id"]]
-          @log.add("Anchors", x, "Anchor #{x['id']} has already been used at line #{ids[x['id']]}")
+            @log.add("Anchors", x, "Anchor #{x['id']} has already been used at line #{ids[x['id']]}")
+            crash = true
           else
             ids[x["id"]] = x.line
           end
         end
+        if crash
+          clean_exit
+          abort("Cannot deal with multiple instances of same ID")
         end
+      end
 
       def schema_validate(doc, schema)
         Tempfile.open(["tmp", ".xml"], :encoding => 'UTF-8') do |f|
@@ -58,6 +63,7 @@ module Asciidoctor
               @log.add("Syntax", "XML Line #{"%06d" % error[:line]}:#{error[:column]}", error[:message])
             end
           rescue Jing::Error => e
+            clean_exit
             abort "Jing failed with error: #{e}"
           ensure
             f.close!

data/lib/asciidoctor/standoc/validate_section.rb

@@ -14,7 +14,6 @@ module Asciidoctor
           callouts = x.elements.select { |e| e.name == "callout" }
           annotations = x.elements.select { |e| e.name == "annotation" }
           if callouts.size != annotations.size
-            #warn "#{x['id']}: mismatch of callouts and annotations"
         @log.add("AsciiDoc Input", x, "mismatch of callouts and annotations")
           end
         end
@@ -23,7 +22,6 @@ module Asciidoctor
       def style_warning(node, msg, text = nil)
         w = msg
         w += ": #{text}" if text
-        #warn w
         @log.add("Style Warning", node, w)
       end
 

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-   VERSION = "1.3.28".freeze
+   VERSION = "1.3.29".freeze
   end
 end

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -310,6 +310,11 @@ RSpec.describe Asciidoctor::Standoc do
       === Term1
 
       NOTE: This is a note
+
+      [NOTE,keep-separate=true]
+      ====
+      XYZ
+      ====
       INPUT
               #{BLANK_HDR}
        <sections>
@@ -321,6 +326,9 @@ RSpec.describe Asciidoctor::Standoc do
          <termnote id="_">
          <p id="_">This is a note</p>
        </termnote>
+        <termnote id='_'>
+   <p id='_'>XYZ</p>
+ </termnote>
        </term>
        </terms>
        </sections>
@@ -395,6 +403,11 @@ RSpec.describe Asciidoctor::Standoc do
 
       [[ABC]]
       NOTE: This is a note
+
+      [NOTE,keep-separate=true]
+      ====
+      XYZ
+      ====
       INPUT
               #{BLANK_HDR}
               <preface><foreword id="_" obligation="informative">
@@ -408,6 +421,9 @@ RSpec.describe Asciidoctor::Standoc do
          <note id="ABC">
          <p id="_">This is a note</p>
        </note>
+         <note id='_'>
+    <p id='_'>XYZ</p>
+  </note>
        </clause></sections>
 
        </standard-document>

data/spec/asciidoctor-standoc/cleanup_spec.rb

@@ -293,6 +293,35 @@ RSpec.describe Asciidoctor::Standoc do
     OUTPUT
   end
 
+    it "does not move notes inside preceding blocks, if they are marked as keep-separate" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      #{ASCIIDOC_BLANK_HDR}
+
+      [stem]
+      ++++
+      r = 1 %
+      r = 1 %
+      ++++
+
+      [NOTE,keep-separate=true]
+      ====
+      That formula does not do much
+      ====
+
+      Indeed.
+    INPUT
+       #{BLANK_HDR}
+    <sections><formula id="_">
+  <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>
+<note id="_">
+  <p id="_">That formula does not do much</p>
+</note>
+
+       <p id="_">Indeed.</p></sections>
+       </standard-document>
+    OUTPUT
+  end
+
   it "does not move notes inside preceding blocks, if they are at clause end" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}

data/spec/asciidoctor-standoc/macros_spec.rb

@@ -223,7 +223,8 @@ OUTPUT
         expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
         #{ASCIIDOC_BLANK_HDR}
 
-        [pseudocode]
+        [pseudocode,subsequence="A"]
+        [%unnumbered]
         ====
           *A* +
                 [smallcap]#B#
@@ -233,7 +234,7 @@ OUTPUT
         INPUT
         #{BLANK_HDR}
         <sections>
-  <figure id="_" class="pseudocode"><p id="_">  <strong>A</strong><br/>
+  <figure id="_"  subsequence='A' class="pseudocode" unnumbered="true"><p id="_">  <strong>A</strong><br/>
         <smallcap>B</smallcap></p>
 <p id="_">  <em>C</em></p></figure>
 </sections>

data/spec/asciidoctor-standoc/refs_spec.rb

@@ -231,7 +231,7 @@ RSpec.describe Asciidoctor::Standoc do
         == Normative References
 
         * [[[iso123,ISO 123]]] _Standard_
-        * [[[iso123,(1)ISO 123]]] _Standard_
+        * [[[iso124,(1)ISO 123]]] _Standard_
       INPUT
         #{BLANK_HDR}
        <sections>
@@ -344,7 +344,7 @@ RSpec.describe Asciidoctor::Standoc do
                </relation>
                <place>Geneva</place>
              </bibitem>
-             <bibitem id='iso123' type='standard'>
+             <bibitem id='iso124' type='standard'>
                <fetched>#{Date.today}</fetched>
                <title type='title-intro' format='text/plain' language='en' script='Latn'>Rubber latex</title>
                <title type='title-main' format='text/plain' language='en' script='Latn'>Sampling</title>
@@ -543,6 +543,7 @@ RSpec.describe Asciidoctor::Standoc do
               <uri>www.iso.org</uri>
             </organization>
           </contributor>
+          <!--
           <contributor>
             <role type="publisher"/>
             <organization>
@@ -551,6 +552,7 @@ RSpec.describe Asciidoctor::Standoc do
               <uri>www.iec.ch</uri>
             </organization>
           </contributor>
+          -->
           <edition>2</edition>
           <language>en</language>
           <language>fr</language>
@@ -643,6 +645,7 @@ RSpec.describe Asciidoctor::Standoc do
               <uri>www.iso.org</uri>
             </organization>
           </contributor>
+          <!--
           <contributor>
             <role type="publisher"/>
             <organization>
@@ -651,6 +654,7 @@ RSpec.describe Asciidoctor::Standoc do
               <uri>www.iec.ch</uri>
             </organization>
           </contributor>
+          -->
           <edition>2</edition>
           <language>en</language>
           <language>fr</language>
@@ -990,7 +994,7 @@ OUTPUT
         </name>
         <affiliation>
           <organization>
-            <name>IETF</name>
+            <name>Internet Engineering Task Force</name>
             <abbreviation>IETF</abbreviation>
           </organization>
         </affiliation>
@@ -1004,12 +1008,19 @@ OUTPUT
         </name>
         <affiliation>
           <organization>
-            <name>IETF</name>
+            <name>Internet Engineering Task Force</name>
             <abbreviation>IETF</abbreviation>
           </organization>
         </affiliation>
       </person>
     </contributor>
+     <contributor>
+   <role type='publisher'/>
+   <organization>
+     <name>Internet Engineering Task Force</name>
+     <abbreviation>IETF</abbreviation>
+   </organization>
+ </contributor>
     <language>en</language>
     <script>Latn</script>
     <abstract format="text/plain" language="en" script="Latn">The standardization of network configuration interfaces for use with the Network Configuration Protocol (NETCONF) or the RESTCONF protocol requires a structured and secure operating environment that promotes human usability and multi-vendor interoperability.  There is a need for standard mechanisms to restrict NETCONF or RESTCONF protocol access for particular users to a preconfigured subset of all available NETCONF or RESTCONF protocol operations and content.  This document defines such an access control model.This document obsoletes RFC 6536.</abstract>
@@ -1043,7 +1054,7 @@ OUTPUT
         </name>
         <affiliation>
           <organization>
-            <name>IETF</name>
+            <name>Internet Engineering Task Force</name>
             <abbreviation>IETF</abbreviation>
           </organization>
         </affiliation>
@@ -1057,12 +1068,19 @@ OUTPUT
         </name>
         <affiliation>
           <organization>
-            <name>IETF</name>
+            <name>Internet Engineering Task Force</name>
             <abbreviation>IETF</abbreviation>
           </organization>
         </affiliation>
       </person>
     </contributor>
+     <contributor>
+   <role type='publisher'/>
+   <organization>
+     <name>Internet Engineering Task Force</name>
+     <abbreviation>IETF</abbreviation>
+   </organization>
+ </contributor>
     <language>en</language>
     <script>Latn</script>
     <abstract format="text/plain" language="en" script="Latn">The standardization of network configuration interfaces for use with the Network Configuration Protocol (NETCONF) or the RESTCONF protocol requires a structured and secure operating environment that promotes human usability and multi-vendor interoperability.  There is a need for standard mechanisms to restrict NETCONF or RESTCONF protocol access for particular users to a preconfigured subset of all available NETCONF or RESTCONF protocol operations and content.  This document defines such an access control model.This document obsoletes RFC 6536.</abstract>