slaw 10.5.0 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba413f53b9d24192d6ce5a168eed83ca55a317dcb3768009cfdf3bf902a23327
-  data.tar.gz: f664b13ce90bb21b65c0fffb2f780dc5937429c31ac2a9d6270259e0669f2f61
+  metadata.gz: c95f6f9b4e2611cd1418fd4f4b67b98b048b1821510af354fe1290bcf57e009e
+  data.tar.gz: 35ce02b5dbc2558937cf4378e6b426b42f988d313d09f372c688599322dacdf1
 SHA512:
-  metadata.gz: 0f0929aa1fcce2c86f6340fec7731f5e865e0b58b793b4f7d64ba48ec2463299498b4b96fea3487a11ab57a2ae932273e27c593395cd2ca263347006fa36a88a
-  data.tar.gz: 72aceb516d091bd396deeb828873058a3cda366524c3e1819590ae77f021ab9a806baf0108f1239dceaaf0e7a64713e1c954ec385b5ed03563f1d702cd4b0984
+  metadata.gz: 718ce963ef974c024a63d8b0c69d363cd260d34562d426cbc1779be76300380f9e9c06e1865a8598003853a847cb422ab90ca9c8962c3ed39c3189bdc3755429
+  data.tar.gz: 8770a53d488cfc624a563cdadf9f4c0c091d440a1f3920f290ce2f7abb8cfea2f8fd4e7e0931e8c81a287c6c46cf0a5c0a0a03dd7e39429009ebe1c0074a58c4

data/.github/workflows/test.yml

@@ -0,0 +1,22 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: [2.7, 2.6]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

data/README.md

@@ -86,6 +86,23 @@ You can create your own grammar by creating a gem that provides these files and
 
 ## Changelog
 
+### 12.0.0 (31 January 2022)
+
+* Use `<br/>` for newlines in tables, rather than `<eol/>`, since it's more semantically correct.
+
+### 11.0.0 (29 October 2021)
+
+* Prefix eId attributes in attachments with attachement's eId
+* Use crossHeading element for crossheadings
+
+### 10.7.0 (11 June 2021)
+
+* Support underlines with `__text__`
+
+### 10.6.0 (10 May 2021)
+
+* Handle sup and sub when extracting from HTML.
+
 ### 10.5.0 (20 April 2021)
 
 * Handle escaping inlines when unparsing.

data/lib/slaw/extract/html_to_akn_text.xsl

@@ -11,9 +11,10 @@
 
   <xsl:template match="head|style|script|link" />
 
-  <xsl:template match="ul|ol">
+  <!-- block containers that end with newlines -->
+  <xsl:template match="ul|ol|section|article|h1|h2|h3|h4|h5">
     <xsl:apply-templates />
-    <xsl:text>&#10;</xsl:text>
+    <xsl:text>&#10;&#10;</xsl:text>
   </xsl:template>
 
   <xsl:template match="ul/li">
@@ -23,20 +24,23 @@
     <xsl:text>&#10;</xsl:text>
   </xsl:template>
 
+  <!-- numbered lists should include a number -->
   <xsl:template match="ol/li">
-    <!-- 1. foo -->
+    <!-- \1. foo -->
     <xsl:text>\</xsl:text>
-    <xsl:value-of select="position()" />
+    <xsl:choose>
+      <xsl:when test="@value">
+        <xsl:value-of select="@value" />
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="position()" />
+      </xsl:otherwise>
+    </xsl:choose>
     <xsl:text>. </xsl:text>
     <xsl:apply-templates />
     <xsl:text>&#10;</xsl:text>
   </xsl:template>
 
-  <xsl:template match="h1|h2|h3|h4|h5">
-    <xsl:apply-templates />
-    <xsl:text>&#10;&#10;</xsl:text>
-  </xsl:template>
-
   <xsl:template match="p|div">
     <xsl:choose>
       <xsl:when test="starts-with(., '[') and substring(., string-length(.)) = ']'">
@@ -51,32 +55,27 @@
     <xsl:text>&#10;&#10;</xsl:text>
   </xsl:template>
 
+  <!-- START tables -->
+
   <xsl:template match="table">
     <xsl:text>{| </xsl:text>
-    <xsl:text>
-|-</xsl:text>
+    <xsl:text>&#10;|-</xsl:text>
     <xsl:apply-templates />
-    <xsl:text>
-|}
-
-</xsl:text>
+    <xsl:text>&#10;|}&#10;&#10;</xsl:text>
   </xsl:template>
 
   <xsl:template match="tr">
     <xsl:apply-templates />
-    <xsl:text>
-|-</xsl:text>
+    <xsl:text>&#10;|-</xsl:text>
   </xsl:template>
 
   <xsl:template match="th|td">
     <xsl:choose>
       <xsl:when test="local-name(.) = 'th'">
-        <xsl:text>
-! </xsl:text>
+        <xsl:text>&#10;! </xsl:text>
       </xsl:when>
       <xsl:when test="local-name(.) = 'td'">
-        <xsl:text>
-| </xsl:text>
+        <xsl:text>&#10;| </xsl:text>
       </xsl:when>
     </xsl:choose>
 
@@ -118,8 +117,15 @@
   </xsl:template>
 
   <xsl:template match="br">
-    <xsl:text>
-</xsl:text>
+    <xsl:text>&#10;</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="sup">
+    <xsl:text>^^</xsl:text><xsl:apply-templates /><xsl:text>^^</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="sub">
+    <xsl:text>_^</xsl:text><xsl:apply-templates /><xsl:text>^_</xsl:text>
   </xsl:template>
 
 

data/lib/slaw/grammars/inlines.treetop

@@ -20,7 +20,7 @@ module Slaw
       end
 
       rule inline_item
-        remark / image / ref / bold / italics / superscript / subscript / '\\'? [^\n]
+        remark / image / ref / bold / italics / superscript / subscript / underline / '\\'? [^\n]
         <InlineItem>
       end
 
@@ -69,6 +69,12 @@ module Slaw
         <Subscript>
       end
 
+      rule underline
+        # __foo__
+        '__' content:(!'__' inline_item)+ '__'
+        <Underline>
+      end
+
     end
   end
 end

data/lib/slaw/grammars/inlines_nodes.rb

@@ -96,6 +96,15 @@ module Slaw
         end
       end
 
+      class Underline < Treetop::Runtime::SyntaxNode
+        def to_xml(b, idprefix)
+          b.u { |b|
+            for e in content.elements
+              e.inline_item.to_xml(b, idprefix)
+            end
+          }
+        end
+      end
     end
   end
 end

data/lib/slaw/grammars/schedules_nodes.rb

@@ -97,8 +97,9 @@ module Slaw
 
           # the schedule id is derived from the heading
           schedule_id = self.schedule_id(heading_text, i)
+          eId = "att_#{i}"
 
-          b.attachment(eId: "att_#{i}") { |b|
+          b.attachment(eId: eId) { |b|
             schedule_title.to_xml(b, '', heading_text)
             b.doc_(name: "schedule") { |b|
               b.meta { |b|
@@ -128,7 +129,7 @@ module Slaw
               }
 
               b.mainBody { |b| 
-                body.children.elements.each_with_index { |e| e.to_xml(b, '', i) } if body.is_a? Body
+                body.children.elements.each_with_index { |e| e.to_xml(b, eId + "__", i) } if body.is_a? Body
               }
             }
           }

data/lib/slaw/grammars/tables_nodes.rb

@@ -67,7 +67,7 @@ module Slaw
           #   for the first line, eat whitespace at the start
           #   for the last line, eat whitespace at the end
           if not tail and (i > 0 or not inline_items.empty?)
-            eol.text_value.count("\n").times { b.eol }
+            eol.text_value.count("\n").times { b.br }
           end
         end
       end

data/lib/slaw/grammars/za/act_nodes.rb

@@ -234,8 +234,14 @@ module Slaw
             section_title.num
           end
 
-          def to_xml(b, *args)
+          def to_xml(b, idprefix='', *args)
             id = "sec_#{Slaw::Grammars::Counters.clean(num)}"
+            # For historical reasons, we normally ignore the idprefix for sections, assuming
+            # them to be unique. However, in an attachment (eg. a schedule), ensure they
+            # are correctly prefixed
+            # TODO: always include the idprefix
+            id = idprefix + id if idprefix.start_with? 'att_'
+
             b.section(eId: id) { |b|
               section_title.to_xml(b)
 
@@ -371,13 +377,11 @@ module Slaw
 
         class Crossheading < Treetop::Runtime::SyntaxNode
           def to_xml(b, idprefix, i=0)
-            cnt = Slaw::Grammars::Counters.counters[idprefix]['hcontainer'] += 1
-            id = "#{idprefix}hcontainer_#{cnt}"
+            cnt = Slaw::Grammars::Counters.counters[idprefix]['crossHeading'] += 1
+            id = "#{idprefix}crossHeading_#{cnt}"
 
-            b.hcontainer(eId: id, name: 'crossheading') { |b|
-              b.heading { |b|
+            b.crossHeading(eId: id) { |b|
                 inline_items.to_xml(b, idprefix)
-              }
             }
           end
         end

data/lib/slaw/grammars/za/act_text.xsl

@@ -59,13 +59,19 @@
                                     <xsl:call-template name="string-replace-all">
                                       <xsl:with-param name="text">
                                         <xsl:call-template name="string-replace-all">
-                                          <xsl:with-param name="text" select="$text" />
-                                          <xsl:with-param name="value"><xsl:value-of select="'\'" /></xsl:with-param>
-                                          <xsl:with-param name="replacement"><xsl:value-of select="'\\'" /></xsl:with-param>
+                                          <xsl:with-param name="text">
+                                            <xsl:call-template name="string-replace-all">
+                                              <xsl:with-param name="text" select="$text" />
+                                              <xsl:with-param name="value"><xsl:value-of select="'\'" /></xsl:with-param>
+                                              <xsl:with-param name="replacement"><xsl:value-of select="'\\'" /></xsl:with-param>
+                                            </xsl:call-template>
+                                          </xsl:with-param>
+                                          <xsl:with-param name="value"><xsl:value-of select="'**'" /></xsl:with-param>
+                                          <xsl:with-param name="replacement"><xsl:value-of select="'\*\*'" /></xsl:with-param>
                                         </xsl:call-template>
                                       </xsl:with-param>
-                                      <xsl:with-param name="value"><xsl:value-of select="'**'" /></xsl:with-param>
-                                      <xsl:with-param name="replacement"><xsl:value-of select="'\*\*'" /></xsl:with-param>
+                                      <xsl:with-param name="value"><xsl:value-of select="'__'" /></xsl:with-param>
+                                      <xsl:with-param name="replacement"><xsl:value-of select="'\_\_'" /></xsl:with-param>
                                     </xsl:call-template>
                                   </xsl:with-param>
                                   <xsl:with-param name="value"><xsl:value-of select="'//'" /></xsl:with-param>
@@ -225,9 +231,9 @@
   </xsl:template>
 
   <!-- crossheadings -->
-  <xsl:template match="a:hcontainer[@name='crossheading']">
+  <xsl:template match="a:crossHeading">
     <xsl:text>CROSSHEADING </xsl:text>
-    <xsl:apply-templates select="a:heading" />
+    <xsl:apply-templates />
     <xsl:text>&#10;&#10;</xsl:text>
   </xsl:template>
 
@@ -293,7 +299,7 @@
       <xsl:text>&#10;</xsl:text>
     </xsl:if>
 
-    <xsl:text>&#10;&#10;</xsl:text>
+    <xsl:text>&#10;</xsl:text>
     <xsl:apply-templates select="a:doc/a:mainBody" />
   </xsl:template>
 
@@ -397,7 +403,13 @@
     <xsl:text>^_</xsl:text>
   </xsl:template>
 
-  <xsl:template match="a:eol">
+  <xsl:template match="a:u">
+    <xsl:text>__</xsl:text>
+    <xsl:apply-templates />
+    <xsl:text>__</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="a:eol | a:br">
     <xsl:text>&#10;</xsl:text>
   </xsl:template>
 

data/lib/slaw/version.rb

@@ -1,3 +1,3 @@
 module Slaw
-  VERSION = "10.5.0"
+  VERSION = "12.0.0"
 end

data/spec/fixtures/roundtrip-escapes.txt

@@ -18,3 +18,7 @@ nested ** stars in // italics \*\* // and bold **
 
 super ^^with \^\^ hats \^\^^^ and sub _^\_^ with \^_ end tokens \^_^_
 
+underlines __underline with _ underscores__ and \_\_escaped underlines \_\_
+
+mixed __underline **and \_\_ bold**__
+

data/spec/generator_spec.rb

@@ -240,17 +240,38 @@ Hello [there](/za/act/123) friend.
 '
     end
 
-    it 'should replace eol with newlines in tables' do
+    it 'should unparse underlines correctly' do
+      doc = xml2doc(section(<<XML
+        <num>1.</num>
+        <paragraph id="section-19.paragraph-0">
+          <content>
+            <p>Hello <u>underlined</u>.</p>
+          </content>
+        </paragraph>
+XML
+      ))
+
+      text = subject.text_from_act(doc)
+      text.should == 'BODY
+
+1. 
+
+Hello __underlined__.
+
+'
+    end
+
+    it 'should replace eol and br with newlines in tables' do
       doc = xml2doc(section(<<XML
         <num>1.</num>
         <table eId="sec__21_table_1">
           <tr>
             <td>
-              <p>foo<eol/>bar<eol/>baz</p>
+              <p>foo<eol/>bar<br/>baz</p>
             </td>
             <td>
               <p>
-              one<eol/>two<eol/>three
+              one<br/>two<eol/>three
 
               </p>
             </td>

data/spec/za/act_block_spec.rb

@@ -59,9 +59,7 @@ EOS
         <p>Hello there</p>
       </content>
     </hcontainer>
-    <hcontainer eId="sec_1__hcontainer_2" name="crossheading">
-      <heading>crossheading</heading>
-    </hcontainer>
+    <crossHeading eId="sec_1__crossHeading_1">crossheading</crossHeading>
   </section>
 </body>'
     end
@@ -96,9 +94,7 @@ EOS
       </blockList>
     </content>
   </hcontainer>
-  <hcontainer eId="hcontainer_2" name="crossheading">
-    <heading>crossheading</heading>
-  </hcontainer>
+  <crossHeading eId="crossHeading_1">crossheading</crossHeading>
   <section eId="sec_1">
     <num>1.</num>
     <heading>Section</heading>
@@ -107,9 +103,7 @@ EOS
         <p>Hello there</p>
       </content>
     </hcontainer>
-    <hcontainer eId="sec_1__hcontainer_2" name="crossheading">
-      <heading>crossheading</heading>
-    </hcontainer>
+    <crossHeading eId="sec_1__crossHeading_1">crossheading</crossHeading>
   </section>
 </body>'
     end
@@ -260,10 +254,8 @@ EOS
       to_xml(node).should == '<chapter eId="chp_2">
   <num>2</num>
   <heading>The Chapter Heading</heading>
-  <hcontainer eId="chp_2__hcontainer_1" name="crossheading">
-    <heading>crossheading</heading>
-  </hcontainer>
-  <hcontainer eId="chp_2__hcontainer_2" name="hcontainer">
+  <crossHeading eId="chp_2__crossHeading_1">crossheading</crossHeading>
+  <hcontainer eId="chp_2__hcontainer_1" name="hcontainer">
     <content>
       <p>Some lines at the start of the chapter.</p>
     </content>
@@ -489,9 +481,7 @@ EOS
       to_xml(node).should == '<part eId="part_2">
   <num>2</num>
   <heading>The Part Heading</heading>
-  <hcontainer eId="part_2__hcontainer_1" name="crossheading">
-    <heading>crossheading</heading>
-  </hcontainer>
+  <crossHeading eId="part_2__crossHeading_1">crossheading</crossHeading>
   <section eId="sec_1">
     <num>1.</num>
     <heading>Section</heading>
@@ -1872,9 +1862,7 @@ EOS
   context 'crossheadings' do
     it 'should handle a inline_items in crossheadings' do
       node = parse :crossheading, "CROSSHEADING something [[remark]] [link](/foo/bar)\n"
-      to_xml(node, '').should == '<hcontainer eId="hcontainer_1" name="crossheading">
-  <heading>something <remark status="editorial">[remark]</remark> <ref href="/foo/bar">link</ref></heading>
-</hcontainer>'
+      to_xml(node, '').should == '<crossHeading eId="crossHeading_1">something <remark status="editorial">[remark]</remark> <ref href="/foo/bar">link</ref></crossHeading>'
     end
 
     it 'should not be allowed in preface' do
@@ -1924,9 +1912,7 @@ Text
     <p>Some text</p>
   </preface>
   <body>
-    <hcontainer eId="hcontainer_1" name="crossheading">
-      <heading>In the body</heading>
-    </hcontainer>
+    <crossHeading eId="crossHeading_1">In the body</crossHeading>
     <section eId="sec_1">
       <num>1.</num>
       <heading>Section 1</heading>
@@ -1987,9 +1973,7 @@ Text
     <p>Some text</p>
   </preamble>
   <body>
-    <hcontainer eId="hcontainer_1" name="crossheading">
-      <heading>In the body</heading>
-    </hcontainer>
+    <crossHeading eId="crossHeading_1">In the body</crossHeading>
     <section eId="sec_1">
       <num>1.</num>
       <heading>Section 1</heading>

data/spec/za/act_inline_spec.rb

@@ -197,7 +197,7 @@ EOS
       </identification>
     </meta>
     <mainBody>
-      <hcontainer eId="hcontainer_1" name="hcontainer">
+      <hcontainer eId="att_1__hcontainer_1" name="hcontainer">
         <content>
           <p>
             <remark status="editorial">[Schedule 1 added by Act 23 of 2004]</remark>
@@ -535,4 +535,17 @@ EOS
     end
   end
 
+  describe 'underline' do
+    it 'should handle underline' do
+      node = parse :generic_container, <<EOS
+      Text __with underline__ and _ under__scores__.
+EOS
+      to_xml(node, "").should == '<hcontainer eId="hcontainer_1" name="hcontainer">
+  <content>
+    <p>Text <u>with underline</u> and _ under<u>scores</u>.</p>
+  </content>
+</hcontainer>'
+    end
+  end
+
 end

data/spec/za/act_schedules_spec.rb

@@ -88,11 +88,11 @@ EOS
         </identification>
       </meta>
       <mainBody>
-        <section eId="sec_1">
+        <section eId="att_1__sec_1">
           <num>1.</num>
           <heading>Foo</heading>
         </section>
-        <section eId="sec_2">
+        <section eId="att_1__sec_2">
           <num>2.</num>
           <heading>Bar</heading>
         </section>
@@ -129,7 +129,7 @@ EOS
         </identification>
       </meta>
       <mainBody>
-        <hcontainer eId="hcontainer_1" name="hcontainer">
+        <hcontainer eId="att_2__hcontainer_1" name="hcontainer">
           <content>
             <p>Baz</p>
             <p>Boom</p>
@@ -186,16 +186,16 @@ EOS
       </identification>
     </meta>
     <mainBody>
-      <hcontainer eId="hcontainer_1" name="hcontainer">
+      <hcontainer eId="att_1__hcontainer_1" name="hcontainer">
         <content>
           <p>Subject to approval in terms of this By-Law, the erection:</p>
         </content>
       </hcontainer>
-      <section eId="sec_1">
+      <section eId="att_1__sec_1">
         <num>1.</num>
         <heading>Foo</heading>
       </section>
-      <section eId="sec_2">
+      <section eId="att_1__sec_2">
         <num>2.</num>
         <heading>Bar</heading>
       </section>
@@ -246,16 +246,16 @@ EOS
       </identification>
     </meta>
     <mainBody>
-      <hcontainer eId="hcontainer_1" name="hcontainer">
+      <hcontainer eId="att_1__hcontainer_1" name="hcontainer">
         <content>
           <p>Subject to approval in terms of this By-Law, the erection:</p>
         </content>
       </hcontainer>
-      <section eId="sec_1">
+      <section eId="att_1__sec_1">
         <num>1.</num>
         <heading>Foo</heading>
       </section>
-      <section eId="sec_2">
+      <section eId="att_1__sec_2">
         <num>2.</num>
         <heading>Bar</heading>
       </section>
@@ -304,16 +304,16 @@ EOS
       </identification>
     </meta>
     <mainBody>
-      <hcontainer eId="hcontainer_1" name="hcontainer">
+      <hcontainer eId="att_1__hcontainer_1" name="hcontainer">
         <content>
           <p>Subject to approval in terms of this By-Law, the erection:</p>
         </content>
       </hcontainer>
-      <section eId="sec_1">
+      <section eId="att_1__sec_1">
         <num>1.</num>
         <heading>Foo</heading>
       </section>
-      <section eId="sec_2">
+      <section eId="att_1__sec_2">
         <num>2.</num>
         <heading>Bar</heading>
       </section>
@@ -372,19 +372,19 @@ EOS
       </identification>
     </meta>
     <mainBody>
-      <part eId="part_I">
+      <part eId="att_1__part_I">
         <num>I</num>
         <heading>Form of authentication statement</heading>
-        <hcontainer eId="part_I__hcontainer_1" name="hcontainer">
+        <hcontainer eId="att_1__part_I__hcontainer_1" name="hcontainer">
           <content>
             <p>This printed impression has been carefully compared by me with the bill which was passed by Parliament and found by me to be a true copy of the bill.</p>
           </content>
         </hcontainer>
       </part>
-      <part eId="part_II">
+      <part eId="att_1__part_II">
         <num>II</num>
         <heading>Form of statement of the President’s assent.</heading>
-        <hcontainer eId="part_II__hcontainer_1" name="hcontainer">
+        <hcontainer eId="att_1__part_II__hcontainer_1" name="hcontainer">
           <content>
             <p>I signify my assent to the bill and a whole bunch of other stuff.</p>
           </content>
@@ -447,7 +447,7 @@ EOS
       </identification>
     </meta>
     <mainBody>
-      <hcontainer eId="hcontainer_1" name="hcontainer">
+      <hcontainer eId="att_1__hcontainer_1" name="hcontainer">
         <content>
           <p>Subject to approval in terms of this By-Law.</p>
           <p>Schedule another</p>
@@ -499,7 +499,7 @@ EOS
       </identification>
     </meta>
     <mainBody>
-      <hcontainer eId="hcontainer_1" name="hcontainer">
+      <hcontainer eId="att_1__hcontainer_1" name="hcontainer">
         <content>
           <p>Subject to approval in terms of this By-Law.</p>
         </content>
@@ -550,16 +550,16 @@ EOS
       </identification>
     </meta>
     <mainBody>
-      <hcontainer eId="hcontainer_1" name="hcontainer">
+      <hcontainer eId="att_1__hcontainer_1" name="hcontainer">
         <content>
           <p>Subject to approval in terms of this By-Law, the erection:</p>
         </content>
       </hcontainer>
-      <section eId="sec_1">
+      <section eId="att_1__sec_1">
         <num>1.</num>
         <heading>Foo</heading>
       </section>
-      <section eId="sec_2">
+      <section eId="att_1__sec_2">
         <num>2.</num>
         <heading>Bar</heading>
       </section>
@@ -608,12 +608,12 @@ EOS
       </identification>
     </meta>
     <mainBody>
-      <hcontainer eId="hcontainer_1" name="hcontainer">
+      <hcontainer eId="att_1__hcontainer_1" name="hcontainer">
         <content>
           <p>Subject to approval in terms of this By-Law, the erection:</p>
         </content>
       </hcontainer>
-      <section eId="sec_1">
+      <section eId="att_1__sec_1">
         <num>1.</num>
         <heading>Foo</heading>
       </section>
@@ -665,16 +665,16 @@ EOS
       </identification>
     </meta>
     <mainBody>
-      <hcontainer eId="hcontainer_1" name="hcontainer">
+      <hcontainer eId="att_1__hcontainer_1" name="hcontainer">
         <content>
           <p>Subject to approval in terms of this By-Law, the erection:</p>
         </content>
       </hcontainer>
-      <section eId="sec_1">
+      <section eId="att_1__sec_1">
         <num>1.</num>
         <heading>Foo</heading>
       </section>
-      <section eId="sec_2">
+      <section eId="att_1__sec_2">
         <num>2.</num>
         <heading>Bar</heading>
       </section>
@@ -729,11 +729,11 @@ EOS
         </identification>
       </meta>
       <mainBody>
-        <section eId="sec_1">
+        <section eId="att_1__sec_1">
           <num>1.</num>
           <heading>Foo</heading>
         </section>
-        <section eId="sec_2">
+        <section eId="att_1__sec_2">
           <num>2.</num>
           <heading>Bar</heading>
         </section>
@@ -770,7 +770,7 @@ EOS
         </identification>
       </meta>
       <mainBody>
-        <hcontainer eId="hcontainer_1" name="hcontainer">
+        <hcontainer eId="att_2__hcontainer_1" name="hcontainer">
           <content>
             <p>Baz</p>
             <p>Boom</p>
@@ -826,16 +826,16 @@ EOS
       </identification>
     </meta>
     <mainBody>
-      <hcontainer eId="hcontainer_1" name="hcontainer">
+      <hcontainer eId="att_1__hcontainer_1" name="hcontainer">
         <content>
           <p>Subject to approval in terms of this By-Law, the erection:</p>
         </content>
       </hcontainer>
-      <section eId="sec_1">
+      <section eId="att_1__sec_1">
         <num>1.</num>
         <heading>Foo</heading>
       </section>
-      <section eId="sec_2">
+      <section eId="att_1__sec_2">
         <num>2.</num>
         <heading>Bar</heading>
       </section>
@@ -885,16 +885,16 @@ EOS
       </identification>
     </meta>
     <mainBody>
-      <hcontainer eId="hcontainer_1" name="hcontainer">
+      <hcontainer eId="att_1__hcontainer_1" name="hcontainer">
         <content>
           <p>Subject to approval in terms of this By-Law, the erection:</p>
         </content>
       </hcontainer>
-      <section eId="sec_1">
+      <section eId="att_1__sec_1">
         <num>1.</num>
         <heading>Foo</heading>
       </section>
-      <section eId="sec_2">
+      <section eId="att_1__sec_2">
         <num>2.</num>
         <heading>Bar</heading>
       </section>
@@ -942,16 +942,16 @@ EOS
       </identification>
     </meta>
     <mainBody>
-      <hcontainer eId="hcontainer_1" name="hcontainer">
+      <hcontainer eId="att_1__hcontainer_1" name="hcontainer">
         <content>
           <p>Subject to approval in terms of this By-Law, the erection:</p>
         </content>
       </hcontainer>
-      <section eId="sec_1">
+      <section eId="att_1__sec_1">
         <num>1.</num>
         <heading>Foo</heading>
       </section>
-      <section eId="sec_2">
+      <section eId="att_1__sec_2">
         <num>2.</num>
         <heading>Bar</heading>
       </section>
@@ -1001,16 +1001,16 @@ EOS
       </identification>
     </meta>
     <mainBody>
-      <hcontainer eId="hcontainer_1" name="hcontainer">
+      <hcontainer eId="att_1__hcontainer_1" name="hcontainer">
         <content>
           <p>Other than as is set out hereinbelow, no signs other than locality bound signs, temporary signs including loose portable sign, estate agents signs, newspaper headline posters and posters (the erection of which must comply with the appropriate schedules pertinent thereto) shall be erected on Municipal owned land.</p>
         </content>
       </hcontainer>
-      <section eId="sec_1">
+      <section eId="att_1__sec_1">
         <num>1.</num>
         <heading>Foo</heading>
       </section>
-      <section eId="sec_2">
+      <section eId="att_1__sec_2">
         <num>2.</num>
         <heading>Bar</heading>
       </section>
@@ -1060,7 +1060,7 @@ EOS
       </identification>
     </meta>
     <mainBody>
-      <hcontainer eId="hcontainer_1" name="hcontainer">
+      <hcontainer eId="att_1__hcontainer_1" name="hcontainer">
         <content>
           <p>Subject to approval in terms of this By-Law.</p>
         </content>

data/spec/za/act_table_spec.rb

@@ -151,10 +151,10 @@ EOS
       to_xml(node, "prefix__").should == '<table eId="prefix__table_1">
   <tr>
     <td>
-      <p>foo<eol/>bar<eol/><eol/>baz</p>
+      <p>foo<br/>bar<br/><br/>baz</p>
     </td>
     <td>
-      <p>one<eol/>two<eol/><eol/>three</p>
+      <p>one<br/>two<br/><br/>three</p>
     </td>
     <td>
       <p>four</p>
@@ -176,7 +176,7 @@ EOS
       to_xml(node, "prefix__").should == '<table eId="prefix__table_1">
   <tr>
     <th>
-      <p>foo<eol/>three</p>
+      <p>foo<br/>three</p>
     </th>
   </tr>
   <tr>
@@ -298,10 +298,10 @@ EOS
       </identification>
     </meta>
     <mainBody>
-      <hcontainer eId="hcontainer_1" name="hcontainer">
+      <hcontainer eId="att_1__hcontainer_1" name="hcontainer">
         <content>
           <p>Heres a table:</p>
-          <table eId="hcontainer_1__table_1">
+          <table eId="att_1__hcontainer_1__table_1">
             <tr>
               <td>
                 <p>r1c1</p>
@@ -380,7 +380,7 @@ EOS
       <p>a <ref href="/a/b">link</ref> in a table</p>
     </td>
     <td>
-      <p><ref href="/a/b">link</ref> and<eol/><remark status="editorial">[comment]</remark></p>
+      <p><ref href="/a/b">link</ref> and<br/><remark status="editorial">[comment]</remark></p>
     </td>
   </tr>
 </table>'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slaw
 version: !ruby/object:Gem::Version
-  version: 10.5.0
+  version: 12.0.0
 platform: ruby
 authors:
 - Greg Kempe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -103,9 +103,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A lightweight library for using Akoma Ntoso acts in Ruby.

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - 2.7.0
-  - 2.6.2
-before_install:
-  - gem update bundler