slaw 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2471751fab79dd5f9c4694d288db979b3b2d4588ee42a0b5acfa8c03f72a4886
-  data.tar.gz: fdf2d1217666aececa82396becf26d7d110eccdecf20731a2a5bff7c9a871df3
+  metadata.gz: f8ee67f5faf27fbf0798c473d13ed04fdb23f50e84fd5da699688e91a9243c81
+  data.tar.gz: fa1e18df9ddece8b4e81604a9697e711b846fae2dfac465ddce7efdedb3e6e7a
 SHA512:
-  metadata.gz: 8057de3424875aa508a913d3b6ff90c35cf0131b9270f18f8748a639f7027c2f59c1c57fef87eafbbbd5bf9b9fb1133501330d251f1957344eff59d800c946e0
-  data.tar.gz: 90e06d7ef470a0b8fc3359fb77e9669e58b6ca291bb3589d6f2cb222f70acab5cf1681ad99a927490297aed65f4cf0840f1f1968fc538855154841cf9f2f3a37
+  metadata.gz: 71e49ed835dad5c8d8e1663ec1df605c41bf43fb9e6691d41854be88f60923da7b425522c527bd154cc200b5c42bbf0f7db8bf3e46593f334b4c7ec209cb5d7a
+  data.tar.gz: 1a55315fa951c9208438ecea2718da71e9e2ab70bf23adbc16bb7d910855a6b8e9bad56e74f0d43474e56ad542f1f9d1124d84f4695f1f8d7c2bb11fbe81ef5e

data/README.md

@@ -81,6 +81,10 @@ You can create your own grammar by creating a gem that provides these files and
 
 ## Changelog
 
+### 3.3.2 (15 May 2019)
+
+* Internal adjustments to make rules easier to override
+
 ### 3.3.1 (15 May 2019)
 
 * Crossheadings at start of body (ending preface and preamble)

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

@@ -178,18 +178,18 @@ module Slaw
         # and is ignored. This allows escaping of section headings, etc.
 
         rule naked_statement
-          space? !(chapter_heading / part_heading / section_title / schedule_title / subsection_prefix / crossheading) '\\'? inline_items:inline_items? eol
+          space? !body_hierarchy_prefix '\\'? inline_items:inline_items? eol
           <NakedStatement>
         end
 
         rule preface_statement
-          space? !(chapter_heading / part_heading / section_title / schedule_title / crossheading)
+          space? !non_body_hierarchy_prefix
           content:(longtitle / ('\\'? inline_items:inline_items eol))
           <PrefaceStatement>
         end
 
         rule preamble_statement
-          space? !(chapter_heading / part_heading / section_title / schedule_title / crossheading) '\\'? inline_items eol
+          space? !non_body_hierarchy_prefix '\\'? inline_items eol
           <NakedStatement>
         end
 
@@ -237,6 +237,16 @@ module Slaw
           num:dotted_number_2 '.'? (space / newline)
         end
 
+        rule body_hierarchy_prefix
+          # Text that indicates the start of a hierarchy element, in the body
+          chapter_heading / part_heading / section_title / schedule_title / subsection_prefix / crossheading
+        end
+
+        rule non_body_hierarchy_prefix
+          # Text that indicates the start of a hierarchy element, in the preamble or preface
+          chapter_heading / part_heading / section_title / schedule_title / crossheading
+        end
+
         include Slaw::Grammars::Inlines
         include Slaw::Grammars::Tables
         include Slaw::Grammars::Schedules

data/lib/slaw/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slaw
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Greg Kempe