slaw 11.0.0 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 736f598c8a9924a22e2474b2380a229a49188b9fab567280a167cc187554fdb0
-  data.tar.gz: 01de6d73cd7352ff0d6dfbf201b25e7eeb219f6f213dbb8d4c7e05bca40e5b6b
+  metadata.gz: c95f6f9b4e2611cd1418fd4f4b67b98b048b1821510af354fe1290bcf57e009e
+  data.tar.gz: 35ce02b5dbc2558937cf4378e6b426b42f988d313d09f372c688599322dacdf1
 SHA512:
-  metadata.gz: faab27a9d122bde77325b295e1d9f705edd314cb9a7abd2cdff8b5e08fd9cdc43333c879e8e7c7e7dd1c7ba9e702457ef683372c890726739f46fc002ee26f3e
-  data.tar.gz: 0c289d9a797771c43be62059cf0b08f4a0730ca637400c2e38aedd2285c193cf1c6ce44763b1a4c6c33335200c00351982ff46002fd60cd5c5e194444b8798b6
+  metadata.gz: 718ce963ef974c024a63d8b0c69d363cd260d34562d426cbc1779be76300380f9e9c06e1865a8598003853a847cb422ab90ca9c8962c3ed39c3189bdc3755429
+  data.tar.gz: 8770a53d488cfc624a563cdadf9f4c0c091d440a1f3920f290ce2f7abb8cfea2f8fd4e7e0931e8c81a287c6c46cf0a5c0a0a03dd7e39429009ebe1c0074a58c4

data/README.md

@@ -86,7 +86,11 @@ You can create your own grammar by creating a gem that provides these files and
 
 ## Changelog
 
-### 11.0.0 (2021-10-29)
+### 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

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_text.xsl

@@ -409,7 +409,7 @@
     <xsl:text>__</xsl:text>
   </xsl:template>
 
-  <xsl:template match="a:eol">
+  <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 = "11.0.0"
+  VERSION = "12.0.0"
 end

data/spec/generator_spec.rb

@@ -261,17 +261,17 @@ Hello __underlined__.
 '
     end
 
-    it 'should replace eol with newlines in tables' do
+    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_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>
@@ -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: 11.0.0
+  version: 12.0.0
 platform: ruby
 authors:
 - Greg Kempe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-03 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake