slaw 10.6.0 → 10.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2feb9ea5e726f4300a0920de90b88f14b3a86ce4ae3dddd9a59b3bf8c855e575
-  data.tar.gz: 263ef515bc1a81b8cccc1788a3b107b573f3840492913cedf17ae729745d1c4b
+  metadata.gz: 6e4cdd070ad171d0d999cbaa93da4fb2723df0a2d430679833d3588903049575
+  data.tar.gz: 33bffb144c455bb8d35f7c8dc7e3593041eead5d1c76569575afa8df73bd0a8e
 SHA512:
-  metadata.gz: 573bab26b9e880856e74404058208e9fae5f400f0ee64413d771fea872e4b3b7c626ebefb5c020321dc4b4f35919b25b94801c6622e82d2f2a8dfe3507c35f61
-  data.tar.gz: 01d73bb0903dbee8213eae364316835361b4d34bbe0ed4a12f9dcaeb114bf1e5ec9ac46133e0570bea1998af0daaac610591da905463d64e63f1449ffd529db7
+  metadata.gz: b69cf6e2303be5096d3697ced6fe3bb1538d46a5657c718f8e1c6e8e4edee1b1c24ea4b7a6f199920499412b716cfa21e0fddb72be46928377d02145236831cf
+  data.tar.gz: 13744a12c6e8f62d90cd6fd4b553e3d45f4dd7b38ca076c6da2d2dcea7e72a31feb9345f687d7d29fa5a0d9a8874c4a506929f5c1a73838f2b551df8cc063806

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,10 @@ You can create your own grammar by creating a gem that provides these files and
 
 ## Changelog
 
+### 10.7.0 (11 June 2021)
+
+* Support underlines with `__text__`
+
 ### 10.6.0 (10 May 2021)
 
 * Handle sup and sub when extracting from HTML.

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/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>
@@ -397,6 +403,12 @@
     <xsl:text>^_</xsl:text>
   </xsl:template>
 
+  <xsl:template match="a:u">
+    <xsl:text>__</xsl:text>
+    <xsl:apply-templates />
+    <xsl:text>__</xsl:text>
+  </xsl:template>
+
   <xsl:template match="a:eol">
     <xsl:text>&#10;</xsl:text>
   </xsl:template>

data/lib/slaw/version.rb

@@ -1,3 +1,3 @@
 module Slaw
-  VERSION = "10.6.0"
+  VERSION = "10.7.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

@@ -237,6 +237,27 @@ XML
 
 Hello [there](/za/act/123) friend.
 
+'
+    end
+
+    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
 

data/spec/za/act_inline_spec.rb

@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slaw
 version: !ruby/object:Gem::Version
-  version: 10.6.0
+  version: 10.7.0
 platform: ruby
 authors:
 - Greg Kempe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-06-11 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

data/.travis.yml

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