slaw 3.3.2 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8ee67f5faf27fbf0798c473d13ed04fdb23f50e84fd5da699688e91a9243c81
-  data.tar.gz: fa1e18df9ddece8b4e81604a9697e711b846fae2dfac465ddce7efdedb3e6e7a
+  metadata.gz: 82626011b387d28e9bdf0228b027fc2fcd643a8644fa0556c03c5ee7461dc7dd
+  data.tar.gz: f2e8cd8e854a5bcb3cd29b14acb9f7f48fa3461dc0e7627caec70c16d7c7d194
 SHA512:
-  metadata.gz: 71e49ed835dad5c8d8e1663ec1df605c41bf43fb9e6691d41854be88f60923da7b425522c527bd154cc200b5c42bbf0f7db8bf3e46593f334b4c7ec209cb5d7a
-  data.tar.gz: 1a55315fa951c9208438ecea2718da71e9e2ab70bf23adbc16bb7d910855a6b8e9bad56e74f0d43474e56ad542f1f9d1124d84f4695f1f8d7c2bb11fbe81ef5e
+  metadata.gz: 5b854023c84d5c07696fdb8ca62c92774afdd9ad52ede40657e40bf6d280683a000c8d4a2d58ad09a8d4c87ef1d8f621050fdfc46d422c45306b0964da284177
+  data.tar.gz: 5359da9d43cd6ebf8e1351a6004db43eb644fab20b312bc86df47361a9b4e267bc9b43e2eacc0014149e5ee898f75e65ff658ea5cf7f6ddd6e37314aa7f51d54

data/README.md

@@ -81,6 +81,14 @@ You can create your own grammar by creating a gem that provides these files and
 
 ## Changelog
 
+### 3.4.0 (20 May 2019)
+
+* Restructure subsections to support generic block elements, starting with an inline block element
+
+### 3.3.3 (17 May 2019)
+
+* FIX bug where unparse was returning XML, not text
+
 ### 3.3.2 (15 May 2019)
 
 * Internal adjustments to make rules easier to override

data/lib/slaw/generator.rb

@@ -87,7 +87,7 @@ module Slaw
 
       if dir = $LOAD_PATH.find { |p| File.exist?(p + filename) }
         xslt = Nokogiri::XSLT(File.read(dir + filename))
-        xslt.transform(doc).child.to_xml
+        xslt.apply_to(doc).gsub(/^( *\n){2,}/, "\n")
       else
         raise "Unable to find text XSL for grammar #{@grammar}: #{fragment}"
       end

data/lib/slaw/grammars/za/act.treetop

@@ -60,12 +60,7 @@ module Slaw
         end
 
         rule subsection
-          space? subsection_prefix space?
-          # eg: (2) (a) foo
-          first_child:inline_block_element?
-          # eg: (2)
-          eol?
-          children:block_element* <Subsection>
+          space? subsection_prefix space? block_elements_with_inline <Subsection>
         end
 
         rule generic_container
@@ -77,6 +72,18 @@ module Slaw
           <Crossheading>
         end
 
+        # An option inline block element, followed by consecutive non-structured content.
+        # This is useful after a rule that can start a new container and have
+        # the first element of the container on the same line, eg.:
+        #
+        # (1) subsection with content
+        #     (a) list a...
+        #
+        rule block_elements_with_inline
+          first_child:inline_block_element?
+          children:block_element* <BlockElementsWithInline>
+        end
+
         # Consecutive non-structured content. We allow many elements
         # here so that we wrap consecutive block elements in one <content> tag,
         # rather than multiple containers for each.

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

@@ -262,6 +262,22 @@ module Slaw
           end
         end
 
+        class BlockElementsWithInline < Treetop::Runtime::SyntaxNode
+          def to_xml(b, idprefix='')
+            b.content { |b|
+              kids = [first_child] + children.elements
+              kids = kids.select { |k| k and !k.text_value.strip.empty? }
+
+              if kids.empty?
+                # schema requires a non-empty content element
+                b.p
+              else
+                kids.each_with_index { |e, i| e.to_xml(b, idprefix, i) }
+              end
+            }
+          end
+        end
+
         class BlockElements < Treetop::Runtime::SyntaxNode
           @@counters = {}
 
@@ -292,19 +308,9 @@ module Slaw
             id = idprefix + num.gsub(/[()]/, '')
             idprefix = id + "."
 
-            kids = children.elements
-            kids = [first_child] + kids if first_child and !first_child.empty?
-
             b.subsection(id: id) { |b|
               b.num(num)
-              b.content { |b|
-                if kids.empty?
-                  # schema requires a non-empty content element
-                  b.p
-                else
-                  kids.each_with_index { |e, i| e.to_xml(b, idprefix, i) }
-                end
-              }
+              block_elements_with_inline.to_xml(b, idprefix)
             }
           end
         end

data/lib/slaw/version.rb

@@ -1,3 +1,3 @@
 module Slaw
-  VERSION = "3.3.2"
+  VERSION = "3.4.0"
 end

data/spec/generator_spec.rb

@@ -222,7 +222,6 @@ baz
 two
 three
 
-              
 |-
 |}
 
@@ -245,7 +244,6 @@ EOS
 SCHEDULE - First Schedule [[remark]]
 Subheading [[another]]
 
-
 Subject to approval in terms of this By-Law.
 
 '

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slaw
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.4.0
 platform: ruby
 authors:
 - Greg Kempe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake