slaw 10.1.0 → 10.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d22fb48ee19e9ed5571d8796df269da08ae60f968f952b5e5438ae469d26130
-  data.tar.gz: f297e70e1b31bb3262cea12e7422b22a2375db139edeb8107f74024fd1e559a2
+  metadata.gz: f76b66445a595e5130d1a3af8b153498d41007416bcd7c5ced418d4339030303
+  data.tar.gz: cd28f4839c8ecd4b430a6111a3c5ec3df764af84674b1e6205d54ac27b3c734f
 SHA512:
-  metadata.gz: 02a8a4b0f06923911a3a88e6afc9b4220845abbc77180c1983e443ae493eecebe11f42f6dd60063f0dbb37a097b31188a971d4b60376d8a0574cc081705c7774
-  data.tar.gz: f086fa4f09fdf8ca3be435dd579652d1812859e07282e35b5d39e242894f07046f922e6e493fef2e8ad9bf62d65893c5750eb3020dedaa9fd7af8633e93a586b
+  metadata.gz: f04d34041c3dc21f552b81af8d331d4440cd7c36d94e38007d15be8b467cca15b2bedbc1b5d1fb7d652ebd2b263f695a02afd337ce20df5c0e5eca7b1ec02050
+  data.tar.gz: dae3ef8b12f13761543a90b1711b301af9a3368cbde2387c8c00adf717c6a297ddfcfe108b9ef53073b370178574877a978fb8968d63317ed736ca1c49417232

data/README.md

@@ -86,6 +86,11 @@ You can create your own grammar by creating a gem that provides these files and
 
 ## Changelog
 
+### 10.2.0 (4 September 2020)
+
+* support inline superscript `^^text^^`
+* support inline subscript `_^text^_`
+
 ### 10.1.0 (18 June 2020)
 
 * hcontainer elements have name attributes, to be compliant with AKN 3.0

data/lib/slaw/grammars/inlines.treetop

@@ -20,7 +20,7 @@ module Slaw
       end
 
       rule inline_item
-        remark / image / ref / bold / italics / [^\n]
+        remark / image / ref / bold / italics / superscript / subscript / [^\n]
         <InlineItem>
       end
 
@@ -57,6 +57,18 @@ module Slaw
         <Ref>
       end
 
+      rule superscript
+        # ^^foo^^
+        '^^' content:(!'^^' inline_item)+ '^^'
+        <Superscript>
+      end
+
+      rule subscript
+        # _^foo^_
+        '_^' content:(!'^_' inline_item)+ '^_'
+        <Subscript>
+      end
+
     end
   end
 end

data/lib/slaw/grammars/inlines_nodes.rb

@@ -71,6 +71,26 @@ module Slaw
         end
       end
 
+      class Superscript < Treetop::Runtime::SyntaxNode
+        def to_xml(b, idprefix)
+          b.sup { |b|
+            for e in content.elements
+              e.inline_item.to_xml(b, idprefix)
+            end
+          }
+        end
+      end
+
+      class Subscript < Treetop::Runtime::SyntaxNode
+        def to_xml(b, idprefix)
+          b.sub { |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

@@ -275,6 +275,18 @@
     <xsl:text>**</xsl:text>
   </xsl:template>
 
+  <xsl:template match="a:sup">
+    <xsl:text>^^</xsl:text>
+    <xsl:apply-templates />
+    <xsl:text>^^</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="a:sub">
+    <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.1.0"
+  VERSION = "10.2.0"
 end

data/spec/za/act_inline_spec.rb

@@ -498,4 +498,30 @@ EOS
     end
   end
 
+  describe 'superscript' do
+    it 'should handle superscript' do
+      node = parse :generic_container, <<EOS
+      Hello ^^super **bold** ^^ foo
+EOS
+      to_xml(node, "").should == '<hcontainer eId="hcontainer_1" name="hcontainer">
+  <content>
+    <p>Hello <sup>super <b>bold</b> </sup> foo</p>
+  </content>
+</hcontainer>'
+    end
+  end
+
+  describe 'subscript' do
+    it 'should handle subscript' do
+      node = parse :generic_container, <<EOS
+      Hello _^sub **bold** ^_ foo
+EOS
+      to_xml(node, "").should == '<hcontainer eId="hcontainer_1" name="hcontainer">
+  <content>
+    <p>Hello <sub>sub <b>bold</b> </sub> foo</p>
+  </content>
+</hcontainer>'
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slaw
 version: !ruby/object:Gem::Version
-  version: 10.1.0
+  version: 10.2.0
 platform: ruby
 authors:
 - Greg Kempe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake