Merge pull request #55 from ndw/v300e

Version 3.0.0e, a beta release
nineml · Jul 12, 2023 · 4816814 · 4816814
2 parents fa179f2 + f538c08
commit 4816814
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,12 +1,12 @@
 sacksName=coffeesacks
 sacksTitle=CoffeeSacks
-sacksVersion=3.0.0d
+sacksVersion=3.0.0e
 
 filterName=coffeefilter
-filterVersion=3.0.0d
+filterVersion=3.0.0e
 
 grinderName=coffeegrinder
-grinderVersion=3.0.0d
+grinderVersion=3.0.0e
 
 xmlresolverVersion=5.2.0
 docbookVersion=5.2CR5

diff --git a/src/main/java/org/nineml/coffeesacks/XmlForest.java b/src/main/java/org/nineml/coffeesacks/XmlForest.java
@@ -16,6 +16,7 @@ public class XmlForest {
     private final Processor processor;
     private final boolean maxPriorityStyle;
     private final ParseForest graph;
+    private final ParserOptions options;
     private Stack<ForestNode> nodeStack = new Stack<>();
     private HashMap<ForestNode, HashSet<ForestNode>> parents = new HashMap<>();
     private HashMap<ForestNode, ArrayList<ChildList>> children = new HashMap<>();
@@ -29,6 +30,7 @@ public XmlForest(Processor processor, InvisibleXmlDocument document) throws Saxo
         this.processor = processor;
         this.maxPriorityStyle = "max".equals(document.getOptions().getPriorityStyle());
         this.graph = document.getResult().getForest();
+        this.options = document.getOptions();
         this.doc = null;
         if (document.succeeded()) {
             constructXml();
@@ -247,7 +249,7 @@ private Map<String,String> attMap(List<ParserAttribute> attributes) {
     }
 
     private AttributeBuilder newAttributes() {
-        return new AttributeBuilder((ParserOptions) graph.getOptions());
+        return new AttributeBuilder(options);
     }
 
     private AttributeBuilder newAttributes(String name, String value) {

diff --git a/src/website/xml/changelog.xml b/src/website/xml/changelog.xml
@@ -9,6 +9,18 @@
 </info>
 
 <revhistory>
+<revision>
+<revnumber>3.0.0e</revnumber>
+<date>2023-07-12</date>
+<revdescription>
+<para>This is a beta release for version 3.0.0. There are a lot of
+underlying changes in this release.</para>
+<para>Version 3.0.0e depends on CoffeeGrinder and CoffeeFilter 3.0.0e which fix
+a few bugs. Also fixed a bug in CoffeeSacks where attempting to parse a forest would raise
+a ClassCastException.</para>
+</revdescription>
+</revision>
+
 <revision>
 <revnumber>3.0.0d</revnumber>
 <date>2023-07-11</date>
@@ -19,7 +31,6 @@ underlying changes in this release.</para>
 a few bugs and make a few improvements.</para>
 </revdescription>
 </revision>
-
 <revision>
 <revnumber>3.0.0c</revnumber>
 <date>2023-07-09</date>