slaw 9.1.0 → 9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c60448bb3a8c2cb9bad02e434eab59805129a845b13f6f95b6f062b3a61ef15
-  data.tar.gz: dfcb7d9a0413b8c61448af102da840e41cb3f942ec0a249c35c5ec4808c4e090
+  metadata.gz: '0654597e1ede427474f5b9b4f703070c4d23fc34fdbf10700ae72485f8372a21'
+  data.tar.gz: d19cd4ebfe1e256f5366addde1723817547075e6468ab31b0d65c8d492f5c6d1
 SHA512:
-  metadata.gz: 9930cf182f41f54ab0fc377a9f3d6a48d3cd8f466124ad9d3b404bd0739036a7e9615bdc1b715a16b94458b1215ed8bf77a1ab0a4d40092044faf1ecb2559caf
-  data.tar.gz: 8db5857b43d42ccbacb24c48b2649ae49c431830a5e22a1ceeb121a16e6b8cc10f3a5757bbd6c64393e24c0e34d59486cd11e3a227badf32bfb92ebcfb08f8ce
+  metadata.gz: a778d4798462049e8fbb123c30d72d2e43c4f7f8344e0bc31590d2c5873daa3675979cafdb3fc14be1327f3ed262c19e6220b2e2ed40e825cc68fe353bb57614
+  data.tar.gz: 585ea851576bca2c5059a3693067066f9f06a9b1ef67761534b707ddcd51f447cc8953f7f7b33842486cb77e442b3f7d60dd63e763306d269db14f1c1b17fcaa

data/README.md

@@ -86,6 +86,10 @@ You can create your own grammar by creating a gem that provides these files and
 
 ## Changelog
 
+### 9.2.0 (10 June 2020)
+
+* Subpart numbers are optional
+
 ### 9.1.0 (15 April 2020)
 
 * Subsections can have numbers such as 1.1A and 1.1bis

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

@@ -257,7 +257,7 @@ module Slaw
         end
 
         rule subpart_heading_prefix
-          'subpart'i space alphanums [ :-]*
+          'subpart'i num:(space alphanums)? [ :-]*
         end
 
         rule chapter_heading_prefix

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

@@ -168,6 +168,11 @@ module Slaw
           end
 
           def to_xml(b, id_prefix='', *args)
+            num = self.num
+            if num.empty?
+              num = Slaw::Grammars::Counters.counters[id_prefix]['subpart'] += 1
+            end
+
             id = id_prefix + "subpart-#{num}"
 
             b.subpart(id: id) { |b|
@@ -179,11 +184,11 @@ module Slaw
 
         class SubpartHeading < Treetop::Runtime::SyntaxNode
           def num
-            subpart_heading_prefix.alphanums.text_value
+            subpart_heading_prefix.num.text_value.strip()
           end
 
           def to_xml(b)
-            b.num(num)
+            b.num(num) unless self.num.empty?
             if heading.respond_to? :inline_items
               b.heading { |b|
                 heading.inline_items.to_xml(b)

data/lib/slaw/version.rb

@@ -1,3 +1,3 @@
 module Slaw
-  VERSION = "9.1.0"
+  VERSION = "9.2.0"
 end

data/spec/za/act_block_spec.rb

@@ -828,6 +828,27 @@ EOS
   </subpart>
 </part>'
     end
+
+    it 'should allow optional numbers' do
+      node = parse :subpart, <<EOS
+SUBPART - Heading - with a dash
+
+1. Section
+Hello there
+EOS
+      to_xml(node).should == '<subpart id="subpart-0">
+  <heading>Heading - with a dash</heading>
+  <section id="section-1">
+    <num>1.</num>
+    <heading>Section</heading>
+    <paragraph id="section-1.paragraph0">
+      <content>
+        <p>Hello there</p>
+      </content>
+    </paragraph>
+  </section>
+</subpart>'
+    end
   end
 
   #-------------------------------------------------------------------------------

metadata

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