From 8b2845269ec07da3c506c9bb41f673b59053e1aa Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 17 Jun 2016 21:55:57 +0100 Subject: Update java-mammoth --- .../Couscous/mammoth/internal/util/Iterables.cs | 9 + Mammoth/Couscous/mammoth/internal/util/Lists.cs | 7 + Mammoth/Couscous/mammoth/internal/util/Maps.cs | 15 + Mammoth/generated.cs | 748 +++++++++++++-------- java-mammoth | 2 +- 5 files changed, 494 insertions(+), 287 deletions(-) diff --git a/Mammoth/Couscous/mammoth/internal/util/Iterables.cs b/Mammoth/Couscous/mammoth/internal/util/Iterables.cs index ac571bc..09b683c 100644 --- a/Mammoth/Couscous/mammoth/internal/util/Iterables.cs +++ b/Mammoth/Couscous/mammoth/internal/util/Iterables.cs @@ -8,6 +8,15 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.util { internal static class Iterables { + internal static Optional getFirst(Iterable iterable) { + var iterator = iterable.iterator(); + if (iterator.hasNext()) { + return Optional.of(iterator.next()); + } else { + return Optional.empty(); + } + } + internal static T getFirst(Iterable iterable, T defaultValue) { var iterator = iterable.iterator(); if (iterator.hasNext()) { diff --git a/Mammoth/Couscous/mammoth/internal/util/Lists.cs b/Mammoth/Couscous/mammoth/internal/util/Lists.cs index db18a21..18c14f3 100644 --- a/Mammoth/Couscous/mammoth/internal/util/Lists.cs +++ b/Mammoth/Couscous/mammoth/internal/util/Lists.cs @@ -20,6 +20,13 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.util { return ToJava.ListToList(result); } + internal static List eagerMap(Iterable iterable, BiFunction function) { + var result = FromJava.IterableToEnumerable(iterable) + .Select((value, index) => function.apply(index, value)) + .ToList(); + return ToJava.ListToList(result); + } + internal static List eagerFlatMap(Iterable iterable, Function> function) { var result = FromJava.IterableToEnumerable(iterable) .SelectMany(element => FromJava.IterableToEnumerable(function.apply(element))) diff --git a/Mammoth/Couscous/mammoth/internal/util/Maps.cs b/Mammoth/Couscous/mammoth/internal/util/Maps.cs index bee2dac..54128b0 100644 --- a/Mammoth/Couscous/mammoth/internal/util/Maps.cs +++ b/Mammoth/Couscous/mammoth/internal/util/Maps.cs @@ -88,6 +88,21 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.util public V getValue() { return _value; } + + public override bool Equals(object otherObj) { + var other = otherObj as Entry; + if (other == null) { + return false; + } else if (object.ReferenceEquals(this, other)) { + return true; + } else { + return _key.Equals(other._key) && _value.Equals(other._value); + } + } + + public override int GetHashCode() { + return _key.GetHashCode() * 17 + _value.GetHashCode(); + } } internal static Builder builder() { diff --git a/Mammoth/generated.cs b/Mammoth/generated.cs index d7aff9b..c2a0bd3 100644 --- a/Mammoth/generated.cs +++ b/Mammoth/generated.cs @@ -428,7 +428,14 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.conversion { return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html.element("tr", (this._this_org__zwobble__mammoth__internal__conversion__DocumentToHtml).convertChildrenToHtml(tableRow))); } public Mammoth.Couscous.java.util.List visit(Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.TableCell tableCell) { - return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html.element("td", Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.cons(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html._FORCE_WRITE, (this._this_org__zwobble__mammoth__internal__conversion__DocumentToHtml).convertChildrenToHtml(tableCell)))); + Mammoth.Couscous.java.util.Map attributes = new Mammoth.Couscous.java.util.HashMap(); + if (tableCell.getColspan() != 1) { + attributes.put("colspan", (tableCell.getColspan()).ToString()); + } + if (tableCell.getRowspan() != 1) { + attributes.put("rowspan", (tableCell.getRowspan()).ToString()); + } + return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html.element("td", attributes, Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.cons(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html._FORCE_WRITE, (this._this_org__zwobble__mammoth__internal__conversion__DocumentToHtml).convertChildrenToHtml(tableCell)))); } public Mammoth.Couscous.java.util.List visit(Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Hyperlink hyperlink) { Mammoth.Couscous.java.util.Map attributes = Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.map("href", this.generateHref(hyperlink)); @@ -969,9 +976,19 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.documents { namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.documents { internal class TableCell : Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.HasChildren { + internal int _rowspan; + internal int _colspan; internal Mammoth.Couscous.java.util.List _children; - internal TableCell(Mammoth.Couscous.java.util.List children) { + internal TableCell(int rowspan, int colspan, Mammoth.Couscous.java.util.List children) { + this._rowspan = rowspan; this._children = children; + this._colspan = colspan; + } + public int getColspan() { + return this._colspan; + } + public int getRowspan() { + return this._rowspan; } public Mammoth.Couscous.java.util.List getChildren() { return this._children; @@ -1020,14 +1037,6 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.documents { namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { internal class BodyXmlReader_Anonymous_32 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> { - public Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement apply(Mammoth.Couscous.java.util.List arg0) { - return new Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Table(arg0); - } - } -} - -namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class BodyXmlReader_Anonymous_33 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> { public Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement apply(Mammoth.Couscous.java.util.List arg0) { return new Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.TableRow(arg0); } @@ -1035,18 +1044,10 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class BodyXmlReader_Anonymous_34 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> { - public Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement apply(Mammoth.Couscous.java.util.List arg0) { - return new Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.TableCell(arg0); - } - } -} - -namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class BodyXmlReader_Anonymous_35 : Mammoth.Couscous.java.util.function.BiFunction, Mammoth.Couscous.java.util.List, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> { + internal class BodyXmlReader_Anonymous_33 : Mammoth.Couscous.java.util.function.BiFunction, Mammoth.Couscous.java.util.List, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader _this_org__zwobble__mammoth__internal__docx__BodyXmlReader; internal Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike _properties; - internal BodyXmlReader_Anonymous_35(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader, Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike properties) { + internal BodyXmlReader_Anonymous_33(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader, Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike properties) { this._this_org__zwobble__mammoth__internal__docx__BodyXmlReader = this_org__zwobble__mammoth__internal__docx__BodyXmlReader; this._properties = properties; } @@ -1057,9 +1058,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class BodyXmlReader_Anonymous_36 : Mammoth.Couscous.java.util.function.Function> { + internal class BodyXmlReader_Anonymous_34 : Mammoth.Couscous.java.util.function.Function> { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader _this_org__zwobble__mammoth__internal__docx__BodyXmlReader; - internal BodyXmlReader_Anonymous_36(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader) { + internal BodyXmlReader_Anonymous_34(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader) { this._this_org__zwobble__mammoth__internal__docx__BodyXmlReader = this_org__zwobble__mammoth__internal__docx__BodyXmlReader; } public Mammoth.Couscous.java.util.Optional apply(string arg0) { @@ -1069,9 +1070,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class BodyXmlReader_Anonymous_37 : Mammoth.Couscous.java.util.function.Function { + internal class BodyXmlReader_Anonymous_35 : Mammoth.Couscous.java.util.function.Function { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader _this_org__zwobble__mammoth__internal__docx__BodyXmlReader; - internal BodyXmlReader_Anonymous_37(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader) { + internal BodyXmlReader_Anonymous_35(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader) { this._this_org__zwobble__mammoth__internal__docx__BodyXmlReader = this_org__zwobble__mammoth__internal__docx__BodyXmlReader; } public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement arg0) { @@ -1081,9 +1082,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class BodyXmlReader_Anonymous_38 : Mammoth.Couscous.java.util.function.BiFunction, Mammoth.Couscous.java.util.List, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> { + internal class BodyXmlReader_Anonymous_36 : Mammoth.Couscous.java.util.function.BiFunction, Mammoth.Couscous.java.util.List, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> { internal Mammoth.Couscous.java.util.Optional _numbering; - internal BodyXmlReader_Anonymous_38(Mammoth.Couscous.java.util.Optional numbering) { + internal BodyXmlReader_Anonymous_36(Mammoth.Couscous.java.util.Optional numbering) { this._numbering = numbering; } public Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement apply(Mammoth.Couscous.java.util.Optional style, Mammoth.Couscous.java.util.List children) { @@ -1093,9 +1094,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class BodyXmlReader_Anonymous_39 : Mammoth.Couscous.java.util.function.Function> { + internal class BodyXmlReader_Anonymous_37 : Mammoth.Couscous.java.util.function.Function> { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader _this_org__zwobble__mammoth__internal__docx__BodyXmlReader; - internal BodyXmlReader_Anonymous_39(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader) { + internal BodyXmlReader_Anonymous_37(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader) { this._this_org__zwobble__mammoth__internal__docx__BodyXmlReader = this_org__zwobble__mammoth__internal__docx__BodyXmlReader; } public Mammoth.Couscous.java.util.Optional apply(string arg0) { @@ -1105,11 +1106,11 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class BodyXmlReader_Anonymous_40 : Mammoth.Couscous.java.util.function.Function>> { + internal class BodyXmlReader_Anonymous_38 : Mammoth.Couscous.java.util.function.Function>> { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader _this_org__zwobble__mammoth__internal__docx__BodyXmlReader; internal string _styleType; internal Mammoth.Couscous.java.util.function.Function> _findStyleById; - internal BodyXmlReader_Anonymous_40(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader, string styleType, Mammoth.Couscous.java.util.function.Function> findStyleById) { + internal BodyXmlReader_Anonymous_38(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader, string styleType, Mammoth.Couscous.java.util.function.Function> findStyleById) { this._this_org__zwobble__mammoth__internal__docx__BodyXmlReader = this_org__zwobble__mammoth__internal__docx__BodyXmlReader; this._styleType = styleType; this._findStyleById = findStyleById; @@ -1121,9 +1122,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class BodyXmlReader_Anonymous_41 : Mammoth.Couscous.java.util.function.BiFunction> { + internal class BodyXmlReader_Anonymous_39 : Mammoth.Couscous.java.util.function.BiFunction> { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader _this_org__zwobble__mammoth__internal__docx__BodyXmlReader; - internal BodyXmlReader_Anonymous_41(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader) { + internal BodyXmlReader_Anonymous_39(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader) { this._this_org__zwobble__mammoth__internal__docx__BodyXmlReader = this_org__zwobble__mammoth__internal__docx__BodyXmlReader; } public Mammoth.Couscous.java.util.Optional apply(string arg0, string arg1) { @@ -1133,9 +1134,110 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class BodyXmlReader_Anonymous_42 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> { + internal class BodyXmlReader_Anonymous_40 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> { + public Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement apply(Mammoth.Couscous.java.util.List arg0) { + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Table(arg0); + } + } +} + +namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { + internal class BodyXmlReader_Anonymous_41 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult> { + internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader _this_org__zwobble__mammoth__internal__docx__BodyXmlReader; + internal BodyXmlReader_Anonymous_41(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader) { + this._this_org__zwobble__mammoth__internal__docx__BodyXmlReader = this_org__zwobble__mammoth__internal__docx__BodyXmlReader; + } + public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult apply(Mammoth.Couscous.java.util.List arg0) { + return (this._this_org__zwobble__mammoth__internal__docx__BodyXmlReader).calculateRowspans(arg0); + } + } +} + +namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { + internal class BodyXmlReader_Anonymous_42 : Mammoth.Couscous.java.util.function.BiFunction { + internal Mammoth.Couscous.java.util.Set> _merged; + internal Mammoth.Couscous.java.util.Map, int> _rowspans; + internal BodyXmlReader_Anonymous_42(Mammoth.Couscous.java.util.Set> merged, Mammoth.Couscous.java.util.Map, int> rowspans) { + this._merged = merged; + this._rowspans = rowspans; + } + public Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement apply(int rowIndex, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement rowElement) { + Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.TableRow row = (Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.TableRow) rowElement; + Mammoth.Couscous.java.util.List mergedCells = new Mammoth.Couscous.java.util.ArrayList(); + int cellIndex = 0; + while (cellIndex < (row.getChildren()).size()) { + Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader__UnmergedTableCell cell = (Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader__UnmergedTableCell) (row.getChildren()).get(cellIndex); + Mammoth.Couscous.java.util.Map__Entry position = Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.entry(rowIndex, cellIndex); + if (!(this._merged).contains(position)) { + mergedCells.add(new Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.TableCell((Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.lookup, int>(this._rowspans, position)).get(), cell._colspan, cell._children)); + } + cellIndex = cellIndex + 1; + } + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.TableRow(mergedCells); + } + } +} + +namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { + internal class BodyXmlReader_Anonymous_43 : Mammoth.Couscous.java.util.function.Function { + public int apply(string arg0) { + return int.Parse(arg0); + } + } +} + +namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { + internal class BodyXmlReader_Anonymous_44 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> { + internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader _this_org__zwobble__mammoth__internal__docx__BodyXmlReader; + internal Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike _properties; + internal int _colspan; + internal BodyXmlReader_Anonymous_44(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader, Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike properties, int colspan) { + this._this_org__zwobble__mammoth__internal__docx__BodyXmlReader = this_org__zwobble__mammoth__internal__docx__BodyXmlReader; + this._properties = properties; + this._colspan = colspan; + } + public Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement apply(Mammoth.Couscous.java.util.List children) { + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader__UnmergedTableCell((this._this_org__zwobble__mammoth__internal__docx__BodyXmlReader).readVmerge(this._properties), this._colspan, children); + } + } +} + +namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { + internal class BodyXmlReader_Anonymous_46 : Mammoth.Couscous.java.util.function.Function { + public bool apply(string val) { + return val.Equals("continue"); + } + } +} + +namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { + internal class BodyXmlReader_Anonymous_45 : Mammoth.Couscous.java.util.function.Function { + public bool apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { + return ((element.getAttributeOrNone("w:val")).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_46())).orElse(true); + } + } +} + +namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { + internal class BodyXmlReader__UnmergedTableCell : Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement { + internal bool _vmerge; + internal int _colspan; + internal Mammoth.Couscous.java.util.List _children; + internal BodyXmlReader__UnmergedTableCell(bool vmerge, int colspan, Mammoth.Couscous.java.util.List children) { + this._vmerge = vmerge; + this._colspan = colspan; + this._children = children; + } + public T accept(Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElementVisitor visitor) { + return visitor.visit(new Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.TableCell(1, this._colspan, this._children)); + } + } +} + +namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { + internal class BodyXmlReader_Anonymous_47 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> { internal Mammoth.Couscous.java.util.Optional _anchor; - internal BodyXmlReader_Anonymous_42(Mammoth.Couscous.java.util.Optional anchor) { + internal BodyXmlReader_Anonymous_47(Mammoth.Couscous.java.util.Optional anchor) { this._anchor = anchor; } public Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement apply(Mammoth.Couscous.java.util.List children) { @@ -1145,10 +1247,10 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class BodyXmlReader_Anonymous_43 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> { + internal class BodyXmlReader_Anonymous_48 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader _this_org__zwobble__mammoth__internal__docx__BodyXmlReader; internal Mammoth.Couscous.java.util.Optional _relationshipId; - internal BodyXmlReader_Anonymous_43(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader, Mammoth.Couscous.java.util.Optional relationshipId) { + internal BodyXmlReader_Anonymous_48(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader, Mammoth.Couscous.java.util.Optional relationshipId) { this._this_org__zwobble__mammoth__internal__docx__BodyXmlReader = this_org__zwobble__mammoth__internal__docx__BodyXmlReader; this._relationshipId = relationshipId; } @@ -1159,10 +1261,10 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class BodyXmlReader_Anonymous_44 : Mammoth.Couscous.org.zwobble.mammoth.@internal.util.InputStreamSupplier { + internal class BodyXmlReader_Anonymous_49 : Mammoth.Couscous.org.zwobble.mammoth.@internal.util.InputStreamSupplier { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader _this_org__zwobble__mammoth__internal__docx__BodyXmlReader; internal string _imagePath; - internal BodyXmlReader_Anonymous_44(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader, string imagePath) { + internal BodyXmlReader_Anonymous_49(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader, string imagePath) { this._this_org__zwobble__mammoth__internal__docx__BodyXmlReader = this_org__zwobble__mammoth__internal__docx__BodyXmlReader; this._imagePath = imagePath; } @@ -1173,10 +1275,10 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class BodyXmlReader_Anonymous_45 : Mammoth.Couscous.java.util.function.Function { + internal class BodyXmlReader_Anonymous_50 : Mammoth.Couscous.java.util.function.Function { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader _this_org__zwobble__mammoth__internal__docx__BodyXmlReader; internal Mammoth.Couscous.java.util.Optional _altText; - internal BodyXmlReader_Anonymous_45(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader, Mammoth.Couscous.java.util.Optional altText) { + internal BodyXmlReader_Anonymous_50(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader, Mammoth.Couscous.java.util.Optional altText) { this._this_org__zwobble__mammoth__internal__docx__BodyXmlReader = this_org__zwobble__mammoth__internal__docx__BodyXmlReader; this._altText = altText; } @@ -1187,10 +1289,10 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class BodyXmlReader_Anonymous_46 : Mammoth.Couscous.org.zwobble.mammoth.@internal.util.InputStreamSupplier { + internal class BodyXmlReader_Anonymous_51 : Mammoth.Couscous.org.zwobble.mammoth.@internal.util.InputStreamSupplier { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader _this_org__zwobble__mammoth__internal__docx__BodyXmlReader; internal string _imagePath; - internal BodyXmlReader_Anonymous_46(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader, string imagePath) { + internal BodyXmlReader_Anonymous_51(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader, string imagePath) { this._this_org__zwobble__mammoth__internal__docx__BodyXmlReader = this_org__zwobble__mammoth__internal__docx__BodyXmlReader; this._imagePath = imagePath; } @@ -1201,10 +1303,10 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class BodyXmlReader_Anonymous_47 : Mammoth.Couscous.org.zwobble.mammoth.@internal.util.InputStreamSupplier { + internal class BodyXmlReader_Anonymous_52 : Mammoth.Couscous.org.zwobble.mammoth.@internal.util.InputStreamSupplier { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader _this_org__zwobble__mammoth__internal__docx__BodyXmlReader; internal string _imagePath; - internal BodyXmlReader_Anonymous_47(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader, string imagePath) { + internal BodyXmlReader_Anonymous_52(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader this_org__zwobble__mammoth__internal__docx__BodyXmlReader, string imagePath) { this._this_org__zwobble__mammoth__internal__docx__BodyXmlReader = this_org__zwobble__mammoth__internal__docx__BodyXmlReader; this._imagePath = imagePath; } @@ -1247,11 +1349,11 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } else if (_couscous_tmp_1.Equals("w:br")) { return this.readBreak(element); } else if (_couscous_tmp_1.Equals("w:tbl")) { - return (this.readElements(element.children())).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_32()); + return this.readTable(element); } else if (_couscous_tmp_1.Equals("w:tr")) { - return (this.readElements(element.children())).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_33()); + return (this.readElements(element.getChildren())).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_32()); } else if (_couscous_tmp_1.Equals("w:tc")) { - return (this.readElements(element.children())).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_34()); + return this.readTableCell(element); } else if (_couscous_tmp_1.Equals("w:hyperlink")) { return this.readHyperlink(element); } else if (_couscous_tmp_1.Equals("w:bookmarkStart")) { @@ -1269,19 +1371,19 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } else if (_couscous_tmp_1.Equals("wp:anchor")) { return this.readInline(element); } else if (_couscous_tmp_1.Equals("w:ins")) { - return this.readElements(element.children()); + return this.readElements(element.getChildren()); } else if (_couscous_tmp_1.Equals("w:smartTag")) { - return this.readElements(element.children()); + return this.readElements(element.getChildren()); } else if (_couscous_tmp_1.Equals("w:drawing")) { - return this.readElements(element.children()); + return this.readElements(element.getChildren()); } else if (_couscous_tmp_1.Equals("v:roundrect")) { - return this.readElements(element.children()); + return this.readElements(element.getChildren()); } else if (_couscous_tmp_1.Equals("v:shape")) { - return this.readElements(element.children()); + return this.readElements(element.getChildren()); } else if (_couscous_tmp_1.Equals("v:textbox")) { - return this.readElements(element.children()); + return this.readElements(element.getChildren()); } else if (_couscous_tmp_1.Equals("w:txbxContent")) { - return this.readElements(element.children()); + return this.readElements(element.getChildren()); } else if (_couscous_tmp_1.Equals("office-word:wrap")) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult._EMPTY_SUCCESS; } else if (_couscous_tmp_1.Equals("v:shadow")) { @@ -1325,7 +1427,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult readRun(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike properties = element.findChildOrEmpty("w:rPr"); - return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.map>(this.readRunStyle(properties), this.readElements(element.children()), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_35(this, properties)); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.map>(this.readRunStyle(properties), this.readElements(element.getChildren()), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_33(this, properties)); } public bool isBold(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike properties) { return properties.hasChild("w:b"); @@ -1351,21 +1453,21 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } } public Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult> readRunStyle(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike properties) { - return this.readStyle(properties, "w:rStyle", "Run", new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_36(this)); + return this.readStyle(properties, "w:rStyle", "Run", new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_34(this)); } public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult readElements(Mammoth.Couscous.java.lang.Iterable nodes) { - return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.flatMap(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyFilter(nodes, typeof(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement)), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_37(this)); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.flatMap(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyFilter(nodes, typeof(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement)), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_35(this)); } public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult readParagraph(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike properties = element.findChildOrEmpty("w:pPr"); Mammoth.Couscous.java.util.Optional numbering = this.readNumbering(properties); - return (Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.map>(this.readParagraphStyle(properties), this.readElements(element.children()), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_38(numbering))).appendExtra(); + return (Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.map>(this.readParagraphStyle(properties), this.readElements(element.getChildren()), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_36(numbering))).appendExtra(); } public Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult> readParagraphStyle(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike properties) { - return this.readStyle(properties, "w:pStyle", "Paragraph", new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_39(this)); + return this.readStyle(properties, "w:pStyle", "Paragraph", new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_37(this)); } public Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult> readStyle(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike properties, string styleTagName, string styleType, Mammoth.Couscous.java.util.function.Function> findStyleById) { - return ((this.readVal(properties, styleTagName)).map>>(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_40(this, styleType, findStyleById))).orElse(Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult.empty()); + return ((this.readVal(properties, styleTagName)).map>>(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_38(this, styleType, findStyleById))).orElse(Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult.empty()); } public Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult> findStyleById(string styleType, string styleId, Mammoth.Couscous.java.util.function.Function> findStyleById) { Mammoth.Couscous.java.util.Optional style = findStyleById.apply(styleId); @@ -1377,7 +1479,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } public Mammoth.Couscous.java.util.Optional readNumbering(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike properties) { Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike numberingProperties = properties.findChildOrEmpty("w:numPr"); - return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Optionals.flatMap(this.readVal(numberingProperties, "w:numId"), this.readVal(numberingProperties, "w:ilvl"), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_41(this)); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Optionals.flatMap(this.readVal(numberingProperties, "w:numId"), this.readVal(numberingProperties, "w:ilvl"), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_39(this)); } public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult readBreak(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { string breakType = (element.getAttributeOrNone("w:type")).orElse(""); @@ -1387,14 +1489,76 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.emptyWithWarning("Unsupported break type: " + breakType); } } + public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult readTable(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { + return ((this.readElements(element.getChildren())).flatMap(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_41(this))).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_40()); + } + public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult calculateRowspans(Mammoth.Couscous.java.util.List rows) { + Mammoth.Couscous.java.util.Optional error = this.checkTableRows(rows); + if (error.isPresent()) { + return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.withWarning(rows, error.get()); + } + Mammoth.Couscous.java.util.Map, int> rowspans = new Mammoth.Couscous.java.util.HashMap, int>(); + Mammoth.Couscous.java.util.Set> merged = new Mammoth.Couscous.java.util.HashSet>(); + Mammoth.Couscous.java.util.Map> lastCellForColumn = new Mammoth.Couscous.java.util.HashMap>(); + int rowIndex = 0; + while (rowIndex < rows.size()) { + Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.TableRow row = (Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.TableRow) rows.get(rowIndex); + int columnIndex = 0; + int cellIndex = 0; + while (cellIndex < (row.getChildren()).size()) { + Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader__UnmergedTableCell cell = (Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader__UnmergedTableCell) (row.getChildren()).get(cellIndex); + Mammoth.Couscous.java.util.Optional> spanningCell = Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.lookup>(lastCellForColumn, columnIndex); + Mammoth.Couscous.java.util.Map__Entry position = Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.entry(rowIndex, cellIndex); + if (cell._vmerge && spanningCell.isPresent()) { + rowspans.put(spanningCell.get(), (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.lookup, int>(rowspans, spanningCell.get())).get() + 1); + merged.add(position); + } else { + lastCellForColumn.put(columnIndex, position); + rowspans.put(position, 1); + } + columnIndex = columnIndex + cell._colspan; + cellIndex = cellIndex + 1; + } + rowIndex = rowIndex + 1; + } + return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.success(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerMap(rows, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_42(merged, rowspans))); + } + public Mammoth.Couscous.java.util.Optional checkTableRows(Mammoth.Couscous.java.util.List rows) { + Mammoth.Couscous.java.util.Iterator _couscous_tmp_3 = rows.iterator(); + while (_couscous_tmp_3.hasNext()) { + Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement rowElement = _couscous_tmp_3.next(); + Mammoth.Couscous.java.util.Optional row = Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Casts.tryCast(typeof(Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.TableRow), rowElement); + if (!row.isPresent()) { + return Mammoth.Couscous.java.util.Optional.of("unexpected non-row element in table, cell merging may be incorrect"); + } else { + Mammoth.Couscous.java.util.Iterator _couscous_tmp_4 = ((row.get()).getChildren()).iterator(); + while (_couscous_tmp_4.hasNext()) { + Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement cell = _couscous_tmp_4.next(); + if (!(cell is Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader__UnmergedTableCell)) { + return Mammoth.Couscous.java.util.Optional.of("unexpected non-cell element in table row, cell merging may be incorrect"); + } + } + } + } + return Mammoth.Couscous.java.util.Optional.empty(); + } + public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult readTableCell(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { + Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike properties = element.findChildOrEmpty("w:tcPr"); + Mammoth.Couscous.java.util.Optional gridSpan = (properties.findChildOrEmpty("w:gridSpan")).getAttributeOrNone("w:val"); + int colspan = (gridSpan.map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_43())).orElse(1); + return (this.readElements(element.getChildren())).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_44(this, properties, colspan)); + } + public bool readVmerge(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike properties) { + return ((properties.findChild("w:vMerge")).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_45())).orElse(false); + } public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult readHyperlink(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { Mammoth.Couscous.java.util.Optional relationshipId = element.getAttributeOrNone("r:id"); Mammoth.Couscous.java.util.Optional anchor = element.getAttributeOrNone("w:anchor"); - Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult childrenResult = this.readElements(element.children()); + Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult childrenResult = this.readElements(element.getChildren()); if (relationshipId.isPresent()) { - return childrenResult.map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_43(this, relationshipId)); + return childrenResult.map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_48(this, relationshipId)); } else if (anchor.isPresent()) { - return childrenResult.map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_42(anchor)); + return childrenResult.map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_47(anchor)); } else { return childrenResult; } @@ -1412,13 +1576,13 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.success(new Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.NoteReference(noteType, noteId)); } public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult readPict(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { - return (this.readElements(element.children())).toExtra(); + return (this.readElements(element.getChildren())).toExtra(); } public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult readImagedata(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { Mammoth.Couscous.java.util.Optional title = element.getAttributeOrNone("o:title"); string relationshipId = element.getAttribute("r:id"); string imagePath = this.relationshipIdToDocxPath(relationshipId); - return this.readImage(imagePath, title, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_44(this, imagePath)); + return this.readImage(imagePath, title, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_49(this, imagePath)); } public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult readInline(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { Mammoth.Couscous.java.util.Optional altText = (element.findChildOrEmpty("wp:docPr")).getAttributeOrNone("descr"); @@ -1426,17 +1590,17 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { return this.readBlips(blips, altText); } public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult readBlips(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementList blips, Mammoth.Couscous.java.util.Optional altText) { - return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.flatMap(blips, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_45(this, altText)); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.flatMap(blips, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_50(this, altText)); } public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult readBlip(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement blip, Mammoth.Couscous.java.util.Optional altText) { Mammoth.Couscous.java.util.Optional embedRelationshipId = blip.getAttributeOrNone("r:embed"); Mammoth.Couscous.java.util.Optional linkRelationshipId = blip.getAttributeOrNone("r:link"); if (embedRelationshipId.isPresent()) { string imagePath = this.relationshipIdToDocxPath(embedRelationshipId.get()); - return this.readImage(imagePath, altText, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_47(this, imagePath)); + return this.readImage(imagePath, altText, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_52(this, imagePath)); } else if (linkRelationshipId.isPresent()) { string imagePath = ((this._relationships).findRelationshipById(linkRelationshipId.get())).getTarget(); - return this.readImage(imagePath, altText, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_46(this, imagePath)); + return this.readImage(imagePath, altText, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_51(this, imagePath)); } else { return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult._EMPTY_SUCCESS; } @@ -1462,7 +1626,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class ContentTypes_Anonymous_48 : Mammoth.Couscous.java.util.function.Function { + internal class ContentTypes_Anonymous_53 : Mammoth.Couscous.java.util.function.Function { public string apply(string imageType) { return "image/" + imageType; } @@ -1491,7 +1655,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { if ((this._extensionDefaults).containsKey(extension)) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.lookup(this._extensionDefaults, extension); } else { - return (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.lookup(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypes._imageExtensions, extension.ToLower())).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypes_Anonymous_48()); + return (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.lookup(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypes._imageExtensions, extension.ToLower())).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypes_Anonymous_53()); } } } @@ -1499,7 +1663,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class ContentTypesXml_Anonymous_49 : Mammoth.Couscous.java.util.function.Function> { + internal class ContentTypesXml_Anonymous_54 : Mammoth.Couscous.java.util.function.Function> { public Mammoth.Couscous.java.util.Map__Entry apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement arg0) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypesXml.readDefault(arg0); } @@ -1507,7 +1671,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class ContentTypesXml_Anonymous_50 : Mammoth.Couscous.java.util.function.Function> { + internal class ContentTypesXml_Anonymous_55 : Mammoth.Couscous.java.util.function.Function> { public Mammoth.Couscous.java.util.Map__Entry apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement arg0) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypesXml.readOverride(arg0); } @@ -1520,13 +1684,13 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypes(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypesXml.readDefaults(element.findChildren("content-types:Default")), Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypesXml.readOverrides(element.findChildren("content-types:Override"))); } public static Mammoth.Couscous.java.util.Map readDefaults(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementList children) { - return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.toMap(children, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypesXml_Anonymous_49()); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.toMap(children, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypesXml_Anonymous_54()); } public static Mammoth.Couscous.java.util.Map__Entry readDefault(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.entry(element.getAttribute("Extension"), element.getAttribute("ContentType")); } public static Mammoth.Couscous.java.util.Map readOverrides(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementList children) { - return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.toMap(children, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypesXml_Anonymous_50()); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.toMap(children, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypesXml_Anonymous_55()); } public static Mammoth.Couscous.java.util.Map__Entry readOverride(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.entry(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Strings.trimLeft(element.getAttribute("PartName"), 47), element.getAttribute("ContentType")); @@ -1541,13 +1705,13 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class DocumentReader_Anonymous_51 : Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader__BodyReaders { + internal class DocumentReader_Anonymous_56 : Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader__BodyReaders { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile _zipFile; internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Styles _styles; internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Numbering _numbering; internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypes _contentTypes; internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.FileReader _fileReader; - internal DocumentReader_Anonymous_51(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile zipFile, Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Styles styles, Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Numbering numbering, Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypes contentTypes, Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.FileReader fileReader) { + internal DocumentReader_Anonymous_56(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile zipFile, Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Styles styles, Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Numbering numbering, Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypes contentTypes, Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.FileReader fileReader) { this._zipFile = zipFile; this._styles = styles; this._numbering = numbering; @@ -1562,10 +1726,10 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class DocumentReader_Anonymous_52 : Mammoth.Couscous.java.util.function.Function> { + internal class DocumentReader_Anonymous_57 : Mammoth.Couscous.java.util.function.Function> { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader__BodyReaders _bodyReaders; internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile _zipFile; - internal DocumentReader_Anonymous_52(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader__BodyReaders bodyReaders, Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile zipFile) { + internal DocumentReader_Anonymous_57(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader__BodyReaders bodyReaders, Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile zipFile) { this._bodyReaders = bodyReaders; this._zipFile = zipFile; } @@ -1577,7 +1741,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class DocumentReader_Anonymous_53 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Notes> { + internal class DocumentReader_Anonymous_58 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Notes> { public Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Notes apply(Mammoth.Couscous.java.util.List arg0) { return new Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Notes(arg0); } @@ -1585,9 +1749,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class DocumentReader_Anonymous_54 : Mammoth.Couscous.java.util.function.Function>> { + internal class DocumentReader_Anonymous_59 : Mammoth.Couscous.java.util.function.Function>> { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader__BodyReaders _bodyReaders; - internal DocumentReader_Anonymous_54(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader__BodyReaders bodyReaders) { + internal DocumentReader_Anonymous_59(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader__BodyReaders bodyReaders) { this._bodyReaders = bodyReaders; } public Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult> apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement arg0) { @@ -1597,9 +1761,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class DocumentReader_Anonymous_55 : Mammoth.Couscous.java.util.function.Function>> { + internal class DocumentReader_Anonymous_60 : Mammoth.Couscous.java.util.function.Function>> { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader__BodyReaders _bodyReaders; - internal DocumentReader_Anonymous_55(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader__BodyReaders bodyReaders) { + internal DocumentReader_Anonymous_60(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader__BodyReaders bodyReaders) { this._bodyReaders = bodyReaders; } public Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult> apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement arg0) { @@ -1609,7 +1773,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class DocumentReader_Anonymous_56 : Mammoth.Couscous.java.util.function.BiFunction, Mammoth.Couscous.java.util.List, Mammoth.Couscous.java.util.List> { + internal class DocumentReader_Anonymous_61 : Mammoth.Couscous.java.util.function.BiFunction, Mammoth.Couscous.java.util.List, Mammoth.Couscous.java.util.List> { public Mammoth.Couscous.java.util.List apply(Mammoth.Couscous.java.util.List arg0, Mammoth.Couscous.java.util.List arg1) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerConcat(arg0, arg1); } @@ -1617,7 +1781,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class DocumentReader_Anonymous_57 : Mammoth.Couscous.java.util.function.Function { + internal class DocumentReader_Anonymous_62 : Mammoth.Couscous.java.util.function.Function { public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Styles apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement arg0) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.StylesXml.readStylesXmlElement(arg0); } @@ -1625,7 +1789,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class DocumentReader_Anonymous_58 : Mammoth.Couscous.java.util.function.Function { + internal class DocumentReader_Anonymous_63 : Mammoth.Couscous.java.util.function.Function { public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Numbering apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement arg0) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NumberingXml.readNumberingXmlElement(arg0); } @@ -1633,7 +1797,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class DocumentReader_Anonymous_59 : Mammoth.Couscous.java.util.function.Function { + internal class DocumentReader_Anonymous_64 : Mammoth.Couscous.java.util.function.Function { public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypes apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement arg0) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypesXml.readContentTypesXmlElement(arg0); } @@ -1641,7 +1805,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class DocumentReader_Anonymous_60 : Mammoth.Couscous.java.util.function.Function { + internal class DocumentReader_Anonymous_65 : Mammoth.Couscous.java.util.function.Function { public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Relationships apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement arg0) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.RelationshipsXml.readRelationshipsXmlElement(arg0); } @@ -1649,7 +1813,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class DocumentReader_Anonymous_62 : Mammoth.Couscous.java.util.function.Function { + internal class DocumentReader_Anonymous_67 : Mammoth.Couscous.java.util.function.Function { public Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement apply(Mammoth.Couscous.java.io.InputStream arg0) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.OfficeXml.parseXml(arg0); } @@ -1657,23 +1821,23 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class DocumentReader_Anonymous_61 : Mammoth.Couscous.org.zwobble.mammoth.@internal.util.SupplierWithException, Mammoth.Couscous.java.io.IOException> { + internal class DocumentReader_Anonymous_66 : Mammoth.Couscous.org.zwobble.mammoth.@internal.util.SupplierWithException, Mammoth.Couscous.java.io.IOException> { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile _zipFile; internal string _name; - internal DocumentReader_Anonymous_61(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile zipFile, string name) { + internal DocumentReader_Anonymous_66(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile zipFile, string name) { this._zipFile = zipFile; this._name = name; } public Mammoth.Couscous.java.util.Optional get() { - return ((this._zipFile).tryGetInputStream(this._name)).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_62()); + return ((this._zipFile).tryGetInputStream(this._name)).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_67()); } } } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class DocumentReader_Anonymous_63 : Mammoth.Couscous.java.util.function.Supplier { + internal class DocumentReader_Anonymous_68 : Mammoth.Couscous.java.util.function.Supplier { internal string _name; - internal DocumentReader_Anonymous_63(string name) { + internal DocumentReader_Anonymous_68(string name) { this._name = name; } public Mammoth.Couscous.org.zwobble.mammoth.@internal.util.PassThroughException get() { @@ -1689,37 +1853,37 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Numbering numbering = Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.readNumbering(zipFile); Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypes contentTypes = Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.readContentTypes(zipFile); Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.FileReader fileReader = new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.PathRelativeFileReader(path); - Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader__BodyReaders bodyReaders = new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_51(zipFile, styles, numbering, contentTypes, fileReader); - return (Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.readNotes(zipFile, bodyReaders)).flatMap(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_52(bodyReaders, zipFile)); + Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader__BodyReaders bodyReaders = new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_56(zipFile, styles, numbering, contentTypes, fileReader); + return (Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.readNotes(zipFile, bodyReaders)).flatMap(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_57(bodyReaders, zipFile)); } public static Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult readNotes(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile file, Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader__BodyReaders bodyReaders) { - return (Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult.map, Mammoth.Couscous.java.util.List, Mammoth.Couscous.java.util.List>(((Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.tryParseOfficeXml(file, "word/footnotes.xml")).map>>(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_54(bodyReaders))).orElse(Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult.success>(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list())), ((Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.tryParseOfficeXml(file, "word/endnotes.xml")).map>>(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_55(bodyReaders))).orElse(Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult.success>(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list())), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_56())).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_53()); + return (Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult.map, Mammoth.Couscous.java.util.List, Mammoth.Couscous.java.util.List>(((Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.tryParseOfficeXml(file, "word/footnotes.xml")).map>>(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_59(bodyReaders))).orElse(Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult.success>(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list())), ((Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.tryParseOfficeXml(file, "word/endnotes.xml")).map>>(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_60(bodyReaders))).orElse(Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult.success>(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list())), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_61())).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_58()); } public static Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Styles readStyles(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile file) { - return ((Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.tryParseOfficeXml(file, "word/styles.xml")).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_57())).orElse(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Styles._EMPTY); + return ((Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.tryParseOfficeXml(file, "word/styles.xml")).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_62())).orElse(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Styles._EMPTY); } public static Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Numbering readNumbering(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile file) { - return ((Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.tryParseOfficeXml(file, "word/numbering.xml")).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_58())).orElse(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Numbering._EMPTY); + return ((Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.tryParseOfficeXml(file, "word/numbering.xml")).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_63())).orElse(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Numbering._EMPTY); } public static Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypes readContentTypes(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile file) { - return ((Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.tryParseOfficeXml(file, "[Content_Types].xml")).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_59())).orElse(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypes._DEFAULT); + return ((Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.tryParseOfficeXml(file, "[Content_Types].xml")).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_64())).orElse(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ContentTypes._DEFAULT); } public static Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Relationships readRelationships(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile zipFile, string name) { - return ((Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.tryParseOfficeXml(zipFile, ("word/_rels/" + name) + ".xml.rels")).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_60())).orElse(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Relationships._EMPTY); + return ((Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.tryParseOfficeXml(zipFile, ("word/_rels/" + name) + ".xml.rels")).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_65())).orElse(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Relationships._EMPTY); } public static Mammoth.Couscous.java.util.Optional tryParseOfficeXml(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile zipFile, string name) { - return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.PassThroughException.wrap>(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_61(zipFile, name)); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.PassThroughException.wrap>(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_66(zipFile, name)); } public static Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement parseOfficeXml(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile zipFile, string name) { - return (Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.tryParseOfficeXml(zipFile, name)).orElseThrow(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_63(name)); + return (Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader.tryParseOfficeXml(zipFile, name)).orElseThrow(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentReader_Anonymous_68(name)); } } } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class DocumentXmlReader_Anonymous_64 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Document> { + internal class DocumentXmlReader_Anonymous_69 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Document> { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentXmlReader _this_org__zwobble__mammoth__internal__docx__DocumentXmlReader; - internal DocumentXmlReader_Anonymous_64(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentXmlReader this_org__zwobble__mammoth__internal__docx__DocumentXmlReader) { + internal DocumentXmlReader_Anonymous_69(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentXmlReader this_org__zwobble__mammoth__internal__docx__DocumentXmlReader) { this._this_org__zwobble__mammoth__internal__docx__DocumentXmlReader = this_org__zwobble__mammoth__internal__docx__DocumentXmlReader; } public Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Document apply(Mammoth.Couscous.java.util.List children) { @@ -1737,8 +1901,8 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { this._notes = notes; } public Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult readElement(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { - Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement body = element.findChild("w:body"); - return (((this._bodyReader).readElements(body.children())).toResult()).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentXmlReader_Anonymous_64(this)); + Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike body = element.findChildOrEmpty("w:body"); + return (((this._bodyReader).readElements(body.getChildren())).toResult()).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocumentXmlReader_Anonymous_69(this)); } } } @@ -1750,9 +1914,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class DocxFiles_Anonymous_65 : Mammoth.Couscous.java.util.function.Supplier { + internal class DocxFiles_Anonymous_70 : Mammoth.Couscous.java.util.function.Supplier { internal string _name; - internal DocxFiles_Anonymous_65(string name) { + internal DocxFiles_Anonymous_70(string name) { this._name = name; } public Mammoth.Couscous.java.io.IOException get() { @@ -1764,7 +1928,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { internal class DocxFiles { public static Mammoth.Couscous.java.io.InputStream getInputStream(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFile file, string name) { - return (file.tryGetInputStream(name)).orElseThrow(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFiles_Anonymous_65(name)); + return (file.tryGetInputStream(name)).orElseThrow(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.DocxFiles_Anonymous_70(name)); } } } @@ -1776,9 +1940,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class NotesXmlReader_Anonymous_66 : Mammoth.Couscous.java.util.function.Predicate { + internal class NotesXmlReader_Anonymous_71 : Mammoth.Couscous.java.util.function.Predicate { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader _this_org__zwobble__mammoth__internal__docx__NotesXmlReader; - internal NotesXmlReader_Anonymous_66(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader this_org__zwobble__mammoth__internal__docx__NotesXmlReader) { + internal NotesXmlReader_Anonymous_71(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader this_org__zwobble__mammoth__internal__docx__NotesXmlReader) { this._this_org__zwobble__mammoth__internal__docx__NotesXmlReader = this_org__zwobble__mammoth__internal__docx__NotesXmlReader; } public bool test(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement arg0) { @@ -1788,9 +1952,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class NotesXmlReader_Anonymous_67 : Mammoth.Couscous.java.util.function.Function> { + internal class NotesXmlReader_Anonymous_72 : Mammoth.Couscous.java.util.function.Function> { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader _this_org__zwobble__mammoth__internal__docx__NotesXmlReader; - internal NotesXmlReader_Anonymous_67(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader this_org__zwobble__mammoth__internal__docx__NotesXmlReader) { + internal NotesXmlReader_Anonymous_72(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader this_org__zwobble__mammoth__internal__docx__NotesXmlReader) { this._this_org__zwobble__mammoth__internal__docx__NotesXmlReader = this_org__zwobble__mammoth__internal__docx__NotesXmlReader; } public Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement arg0) { @@ -1800,9 +1964,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class NotesXmlReader_Anonymous_68 : Mammoth.Couscous.java.util.function.Function { + internal class NotesXmlReader_Anonymous_73 : Mammoth.Couscous.java.util.function.Function { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader _this_org__zwobble__mammoth__internal__docx__NotesXmlReader; - internal NotesXmlReader_Anonymous_68(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader this_org__zwobble__mammoth__internal__docx__NotesXmlReader) { + internal NotesXmlReader_Anonymous_73(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader this_org__zwobble__mammoth__internal__docx__NotesXmlReader) { this._this_org__zwobble__mammoth__internal__docx__NotesXmlReader = this_org__zwobble__mammoth__internal__docx__NotesXmlReader; } public bool apply(string type) { @@ -1812,10 +1976,10 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class NotesXmlReader_Anonymous_69 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Note> { + internal class NotesXmlReader_Anonymous_74 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Note> { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader _this_org__zwobble__mammoth__internal__docx__NotesXmlReader; internal Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement _element; - internal NotesXmlReader_Anonymous_69(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader this_org__zwobble__mammoth__internal__docx__NotesXmlReader, Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { + internal NotesXmlReader_Anonymous_74(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader this_org__zwobble__mammoth__internal__docx__NotesXmlReader, Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { this._this_org__zwobble__mammoth__internal__docx__NotesXmlReader = this_org__zwobble__mammoth__internal__docx__NotesXmlReader; this._element = element; } @@ -1842,25 +2006,25 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader(bodyReader, "endnote", Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.NoteType._ENDNOTE); } public Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult> readElement(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { - Mammoth.Couscous.java.lang.Iterable elements = Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyFilter(element.findChildren("w:" + this._tagName), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader_Anonymous_66(this)); - return Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult.flatMap(elements, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader_Anonymous_67(this)); + Mammoth.Couscous.java.lang.Iterable elements = Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyFilter(element.findChildren("w:" + this._tagName), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader_Anonymous_71(this)); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult.flatMap(elements, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader_Anonymous_72(this)); } public bool isNoteElement(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { - return ((element.getAttributeOrNone("w:type")).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader_Anonymous_68(this))).orElse(true); + return ((element.getAttributeOrNone("w:type")).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader_Anonymous_73(this))).orElse(true); } public bool isSeparatorType(string type) { return type.Equals("continuationSeparator") || type.Equals("separator"); } public Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult readNoteElement(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { - return (((this._bodyReader).readElements(element.children())).toResult()).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader_Anonymous_69(this, element)); + return (((this._bodyReader).readElements(element.getChildren())).toResult()).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NotesXmlReader_Anonymous_74(this, element)); } } } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class Numbering_Anonymous_70 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.java.util.Optional> { + internal class Numbering_Anonymous_75 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.java.util.Optional> { internal string _level; - internal Numbering_Anonymous_70(string level) { + internal Numbering_Anonymous_75(string level) { this._level = level; } public Mammoth.Couscous.java.util.Optional apply(Mammoth.Couscous.java.util.Map levels) { @@ -1880,13 +2044,13 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { this._numbering = numbering; } public Mammoth.Couscous.java.util.Optional findLevel(string numId, string level) { - return (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.lookup>(this._numbering, numId)).flatMap(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Numbering_Anonymous_70(level)); + return (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.lookup>(this._numbering, numId)).flatMap(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Numbering_Anonymous_75(level)); } } } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class NumberingXml_Anonymous_71 : Mammoth.Couscous.java.util.function.Function>> { + internal class NumberingXml_Anonymous_76 : Mammoth.Couscous.java.util.function.Function>> { public Mammoth.Couscous.java.util.Map__Entry> apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement arg0) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NumberingXml.readAbstractNum(arg0); } @@ -1894,7 +2058,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class NumberingXml_Anonymous_72 : Mammoth.Couscous.java.util.function.Function> { + internal class NumberingXml_Anonymous_77 : Mammoth.Couscous.java.util.function.Function> { public Mammoth.Couscous.java.util.Map__Entry apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement arg0) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NumberingXml.readAbstractNumLevel(arg0); } @@ -1902,9 +2066,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class NumberingXml_Anonymous_73 : Mammoth.Couscous.java.util.function.Function>> { + internal class NumberingXml_Anonymous_78 : Mammoth.Couscous.java.util.function.Function>> { internal Mammoth.Couscous.java.util.Map> _abstractNums; - internal NumberingXml_Anonymous_73(Mammoth.Couscous.java.util.Map> abstractNums) { + internal NumberingXml_Anonymous_78(Mammoth.Couscous.java.util.Map> abstractNums) { this._abstractNums = abstractNums; } public Mammoth.Couscous.java.util.Map__Entry> apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement numElement) { @@ -1920,14 +2084,14 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Numbering(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NumberingXml.readNums(element.findChildren("w:num"), abstractNums)); } public static Mammoth.Couscous.java.util.Map> readAbstractNums(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementList children) { - return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.toMap>(children, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NumberingXml_Anonymous_71()); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.toMap>(children, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NumberingXml_Anonymous_76()); } public static Mammoth.Couscous.java.util.Map__Entry> readAbstractNum(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { string abstractNumId = element.getAttribute("w:abstractNumId"); return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.entry>(abstractNumId, Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NumberingXml.readAbstractNumLevels(element)); } public static Mammoth.Couscous.java.util.Map readAbstractNumLevels(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { - return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.toMap(element.findChildren("w:lvl"), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NumberingXml_Anonymous_72()); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.toMap(element.findChildren("w:lvl"), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NumberingXml_Anonymous_77()); } public static Mammoth.Couscous.java.util.Map__Entry readAbstractNumLevel(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { string levelIndex = element.getAttribute("w:ilvl"); @@ -1936,18 +2100,18 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.entry(levelIndex, new Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.NumberingLevel(levelIndex, isOrdered)); } public static Mammoth.Couscous.java.util.Map> readNums(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementList numElements, Mammoth.Couscous.java.util.Map> abstractNums) { - return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.toMap>(numElements, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NumberingXml_Anonymous_73(abstractNums)); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.toMap>(numElements, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.NumberingXml_Anonymous_78(abstractNums)); } public static Mammoth.Couscous.java.util.Map__Entry> readNum(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement numElement, Mammoth.Couscous.java.util.Map> abstractNums) { string numId = numElement.getAttribute("w:numId"); - string abstractNumId = (numElement.findChild("w:abstractNumId")).getAttribute("w:val"); + string abstractNumId = ((numElement.findChild("w:abstractNumId")).get()).getAttribute("w:val"); return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.entry>(numId, (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.lookup>(abstractNums, abstractNumId)).get()); } } } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class OfficeXml_Anonymous_75 : Mammoth.Couscous.java.util.function.Function> { + internal class OfficeXml_Anonymous_80 : Mammoth.Couscous.java.util.function.Function> { public Mammoth.Couscous.java.lang.Iterable apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlNode arg0) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.OfficeXml.collapseAlternateContent(arg0); } @@ -1955,12 +2119,12 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class OfficeXml_Anonymous_74 : Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlNodeVisitor> { + internal class OfficeXml_Anonymous_79 : Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlNodeVisitor> { public Mammoth.Couscous.java.util.List visit(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { if ((element.getName()).Equals("mc:AlternateContent")) { - return (element.findChild("mc:Fallback")).getChildren(); + return (element.findChildOrEmpty("mc:Fallback")).getChildren(); } else { - Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement collapsedElement = new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement(element.getName(), element.getAttributes(), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerFlatMap(element.children(), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.OfficeXml_Anonymous_75())); + Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement collapsedElement = new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement(element.getName(), element.getAttributes(), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerFlatMap(element.getChildren(), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.OfficeXml_Anonymous_80())); return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(collapsedElement); } } @@ -1981,7 +2145,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { return (Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement) (Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.OfficeXml.collapseAlternateContent(parser.parseStream(inputStream))).get(0); } public static Mammoth.Couscous.java.util.List collapseAlternateContent(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlNode node) { - return node.accept>(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.OfficeXml_Anonymous_74()); + return node.accept>(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.OfficeXml_Anonymous_79()); } } } @@ -2021,7 +2185,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class ReadResult_Anonymous_76 : Mammoth.Couscous.java.util.function.Function> { + internal class ReadResult_Anonymous_81 : Mammoth.Couscous.java.util.function.Function> { public Mammoth.Couscous.java.lang.Iterable apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult result) { return result._elements; } @@ -2029,7 +2193,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class ReadResult_Anonymous_77 : Mammoth.Couscous.java.util.function.Function> { + internal class ReadResult_Anonymous_82 : Mammoth.Couscous.java.util.function.Function> { public Mammoth.Couscous.java.lang.Iterable apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult result) { return result._extra; } @@ -2037,7 +2201,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class ReadResult_Anonymous_78 : Mammoth.Couscous.java.util.function.Function> { + internal class ReadResult_Anonymous_83 : Mammoth.Couscous.java.util.function.Function> { public Mammoth.Couscous.java.lang.Iterable apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult result) { return result._warnings; } @@ -2060,7 +2224,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } public static Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult flatMap(Mammoth.Couscous.java.lang.Iterable iterable, Mammoth.Couscous.java.util.function.Function function) { Mammoth.Couscous.java.util.List results = Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerMap(iterable, function); - return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerFlatMap(results, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult_Anonymous_76()), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerFlatMap(results, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult_Anonymous_77()), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyFlatMap(results, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult_Anonymous_78())); + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerFlatMap(results, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult_Anonymous_81()), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerFlatMap(results, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult_Anonymous_82()), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyFlatMap(results, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult_Anonymous_83())); } public static Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult map(Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult first, Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult second, Mammoth.Couscous.java.util.function.BiFunction, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> function) { return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(function.apply(first.getValue(), second._elements)), second._extra, Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyConcat(first.getWarnings(), second._warnings)); @@ -2072,14 +2236,21 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult(elements, Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list()); } public static Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult emptyWithWarning(string warning) { - return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(warning)); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.withWarning(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(), warning); } public static Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult withWarning(Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement element, string warning) { - return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(element), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(warning)); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.withWarning(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(element), warning); + } + public static Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult withWarning(Mammoth.Couscous.java.util.List elements, string warning) { + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult(elements, Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(warning)); } public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult map(Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> function) { return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(function.apply(this._elements)), this._extra, this._warnings); } + public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult flatMap(Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult> function) { + Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult result = function.apply(this._elements); + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult(result._elements, Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerConcat(this._extra, result._extra), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyConcat(this._warnings, result._warnings)); + } public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult toExtra() { return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerConcat(this._extra, this._elements), this._warnings); } @@ -2105,9 +2276,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class Relationships_Anonymous_79 : Mammoth.Couscous.java.util.function.Supplier { + internal class Relationships_Anonymous_84 : Mammoth.Couscous.java.util.function.Supplier { internal string _id; - internal Relationships_Anonymous_79(string id) { + internal Relationships_Anonymous_84(string id) { this._id = id; } public Mammoth.Couscous.java.lang.RuntimeException get() { @@ -2127,13 +2298,13 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { this._relationships = relationships; } public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Relationship findRelationshipById(string id) { - return (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.lookup(this._relationships, id)).orElseThrow(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Relationships_Anonymous_79(id)); + return (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.lookup(this._relationships, id)).orElseThrow(new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Relationships_Anonymous_84(id)); } } } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class RelationshipsXml_Anonymous_80 : Mammoth.Couscous.java.util.function.Function> { + internal class RelationshipsXml_Anonymous_85 : Mammoth.Couscous.java.util.function.Function> { public Mammoth.Couscous.java.util.Map__Entry apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement arg0) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.RelationshipsXml.readRelationship(arg0); } @@ -2143,7 +2314,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { internal class RelationshipsXml { public static Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Relationships readRelationshipsXmlElement(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { - return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Relationships(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.toMap(element.findChildren("relationships:Relationship"), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.RelationshipsXml_Anonymous_80())); + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Relationships(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.toMap(element.findChildren("relationships:Relationship"), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.RelationshipsXml_Anonymous_85())); } public static Mammoth.Couscous.java.util.Map__Entry readRelationship(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.entry(element.getAttribute("Id"), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Relationship(element.getAttribute("Target"))); @@ -2173,9 +2344,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class StylesXml_Anonymous_81 : Mammoth.Couscous.java.util.function.Predicate { + internal class StylesXml_Anonymous_86 : Mammoth.Couscous.java.util.function.Predicate { internal string _styleType; - internal StylesXml_Anonymous_81(string styleType) { + internal StylesXml_Anonymous_86(string styleType) { this._styleType = styleType; } public bool test(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement styleElement) { @@ -2185,7 +2356,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { - internal class StylesXml_Anonymous_82 : Mammoth.Couscous.java.util.function.Function> { + internal class StylesXml_Anonymous_87 : Mammoth.Couscous.java.util.function.Function> { public Mammoth.Couscous.java.util.Map__Entry apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement arg0) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.StylesXml.readStyle(arg0); } @@ -2199,7 +2370,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { return new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Styles(Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.StylesXml.readStyles(styleElements, "paragraph"), Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.StylesXml.readStyles(styleElements, "character")); } public static Mammoth.Couscous.java.util.Map readStyles(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementList styleElements, string styleType) { - return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.toMap(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyFilter(styleElements, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.StylesXml_Anonymous_81(styleType)), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.StylesXml_Anonymous_82()); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.toMap(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyFilter(styleElements, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.StylesXml_Anonymous_86(styleType)), new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.StylesXml_Anonymous_87()); } public static Mammoth.Couscous.java.util.Map__Entry readStyle(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { string styleId = element.getAttribute("w:styleId"); @@ -2210,9 +2381,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { - internal class Html_Anonymous_83 : Mammoth.Couscous.java.util.function.Consumer { + internal class Html_Anonymous_88 : Mammoth.Couscous.java.util.function.Consumer { internal Mammoth.Couscous.java.lang.StringBuilder _builder; - internal Html_Anonymous_83(Mammoth.Couscous.java.lang.StringBuilder builder) { + internal Html_Anonymous_88(Mammoth.Couscous.java.lang.StringBuilder builder) { this._builder = builder; } public void accept(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode node) { @@ -2222,7 +2393,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { - internal class Html_Anonymous_84 : Mammoth.Couscous.java.util.function.Function> { + internal class Html_Anonymous_89 : Mammoth.Couscous.java.util.function.Function> { public Mammoth.Couscous.java.lang.Iterable apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode node) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html.stripEmpty(node); } @@ -2230,7 +2401,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { - internal class Html_Anonymous_85 : Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode__Mapper> { + internal class Html_Anonymous_90 : Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode__Mapper> { public Mammoth.Couscous.java.util.List visit(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlElement element) { Mammoth.Couscous.java.util.List children = Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html.stripEmpty(element.getChildren()); if (children.isEmpty()) { @@ -2256,7 +2427,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { - internal class Html_Anonymous_86 : Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode__Mapper { + internal class Html_Anonymous_91 : Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode__Mapper { public Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode visit(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlElement element) { return new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlElement(element.getTagNames(), element.getAttributes(), Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html.collapse(element.getChildren()), element.isCollapsible()); } @@ -2273,7 +2444,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { - internal class Html_Anonymous_87 : Mammoth.Couscous.java.util.function.Function> { + internal class Html_Anonymous_92 : Mammoth.Couscous.java.util.function.Function> { public Mammoth.Couscous.java.util.Optional apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode last) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Casts.tryCast(typeof(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlElement), last); } @@ -2281,12 +2452,12 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { - internal class Html_Anonymous_88 : Mammoth.Couscous.java.util.function.BiFunction { + internal class Html_Anonymous_93 : Mammoth.Couscous.java.util.function.BiFunction { public bool apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlElement last, Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlElement next) { if (next.isCollapsible() && Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html.isMatch(last, next)) { - Mammoth.Couscous.java.util.Iterator _couscous_tmp_4 = (next.getChildren()).iterator(); - while (_couscous_tmp_4.hasNext()) { - Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode child = _couscous_tmp_4.next(); + Mammoth.Couscous.java.util.Iterator _couscous_tmp_6 = (next.getChildren()).iterator(); + while (_couscous_tmp_6.hasNext()) { + Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode child = _couscous_tmp_6.next(); Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html.collapsingAdd(last.getChildren(), child); } return true; @@ -2305,7 +2476,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { } public static string write(Mammoth.Couscous.java.util.List nodes) { Mammoth.Couscous.java.lang.StringBuilder builder = new Mammoth.Couscous.java.lang.StringBuilder(); - nodes.forEach(new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html_Anonymous_83(builder)); + nodes.forEach(new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html_Anonymous_88(builder)); return builder.toString(); } public static Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode text(string value) { @@ -2345,16 +2516,16 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { return new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlSelfClosingElement(tagName, attributes); } public static Mammoth.Couscous.java.util.List stripEmpty(Mammoth.Couscous.java.util.List nodes) { - return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerFlatMap(nodes, new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html_Anonymous_84()); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerFlatMap(nodes, new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html_Anonymous_89()); } public static Mammoth.Couscous.java.util.List stripEmpty(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode node) { - return node.accept>(new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html_Anonymous_85()); + return node.accept>(new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html_Anonymous_90()); } public static Mammoth.Couscous.java.util.List collapse(Mammoth.Couscous.java.util.List nodes) { Mammoth.Couscous.java.util.List collapsed = new Mammoth.Couscous.java.util.ArrayList(); - Mammoth.Couscous.java.util.Iterator _couscous_tmp_3 = nodes.iterator(); - while (_couscous_tmp_3.hasNext()) { - Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode node = _couscous_tmp_3.next(); + Mammoth.Couscous.java.util.Iterator _couscous_tmp_5 = nodes.iterator(); + while (_couscous_tmp_5.hasNext()) { + Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode node = _couscous_tmp_5.next(); Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html.collapsingAdd(collapsed, node); } return collapsed; @@ -2366,10 +2537,10 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { } } public static Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode collapse(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode node) { - return node.accept(new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html_Anonymous_86()); + return node.accept(new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html_Anonymous_91()); } public static bool tryCollapse(Mammoth.Couscous.java.util.List collapsed, Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode node) { - return (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Optionals.map((Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.tryGetLast(collapsed)).flatMap(new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html_Anonymous_87()), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Casts.tryCast(typeof(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlElement), node), new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html_Anonymous_88())).orElse(false); + return (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Optionals.map((Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.tryGetLast(collapsed)).flatMap(new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html_Anonymous_92()), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Casts.tryCast(typeof(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlElement), node), new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.Html_Anonymous_93())).orElse(false); } public static bool isMatch(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlElement first, Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlElement second) { return (second.getTagNames()).contains(first.getTagName()) && (first.getAttributes()).equals(second.getAttributes()); @@ -2495,9 +2666,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { - internal class HtmlWriter_Anonymous_90 : Mammoth.Couscous.java.util.function.Consumer { + internal class HtmlWriter_Anonymous_95 : Mammoth.Couscous.java.util.function.Consumer { internal Mammoth.Couscous.java.lang.StringBuilder _builder; - internal HtmlWriter_Anonymous_90(Mammoth.Couscous.java.lang.StringBuilder builder) { + internal HtmlWriter_Anonymous_95(Mammoth.Couscous.java.lang.StringBuilder builder) { this._builder = builder; } public void accept(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode child) { @@ -2507,16 +2678,16 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { - internal class HtmlWriter_Anonymous_89 : Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode__Visitor { + internal class HtmlWriter_Anonymous_94 : Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode__Visitor { internal Mammoth.Couscous.java.lang.StringBuilder _builder; - internal HtmlWriter_Anonymous_89(Mammoth.Couscous.java.lang.StringBuilder builder) { + internal HtmlWriter_Anonymous_94(Mammoth.Couscous.java.lang.StringBuilder builder) { this._builder = builder; } public void visit(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlElement element) { ((this._builder).append("<")).append(element.getTagName()); Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlWriter.generateAttributes(element.getAttributes(), this._builder); (this._builder).append(">"); - (element.getChildren()).forEach(new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlWriter_Anonymous_90(this._builder)); + (element.getChildren()).forEach(new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlWriter_Anonymous_95(this._builder)); (((this._builder).append(""); } public void visit(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlSelfClosingElement element) { @@ -2533,7 +2704,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { - internal class HtmlWriter_Anonymous_91 : Mammoth.Couscous.java.util.function.Function, string> { + internal class HtmlWriter_Anonymous_96 : Mammoth.Couscous.java.util.function.Function, string> { public string apply(Mammoth.Couscous.java.util.Map__Entry arg0) { return arg0.getKey(); } @@ -2543,12 +2714,12 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { internal class HtmlWriter { public static void write(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlNode node, Mammoth.Couscous.java.lang.StringBuilder builder) { - node.accept(new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlWriter_Anonymous_89(builder)); + node.accept(new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlWriter_Anonymous_94(builder)); } public static void generateAttributes(Mammoth.Couscous.java.util.Map attributes, Mammoth.Couscous.java.lang.StringBuilder builder) { - Mammoth.Couscous.java.util.Iterator> _couscous_tmp_5 = (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.orderedBy, string>(attributes.entrySet(), new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlWriter_Anonymous_91())).iterator(); - while (_couscous_tmp_5.hasNext()) { - Mammoth.Couscous.java.util.Map__Entry attribute = _couscous_tmp_5.next(); + Mammoth.Couscous.java.util.Iterator> _couscous_tmp_7 = (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.orderedBy, string>(attributes.entrySet(), new Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlWriter_Anonymous_96())).iterator(); + while (_couscous_tmp_7.hasNext()) { + Mammoth.Couscous.java.util.Map__Entry attribute = _couscous_tmp_7.next(); ((((builder.append(" ")).append(attribute.getKey())).append("=\"")).append(Mammoth.Couscous.org.zwobble.mammoth.@internal.html.HtmlWriter.escapeAttributeValue(attribute.getValue()))).append("\""); } } @@ -2562,11 +2733,11 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.html { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.results { - internal static class InternalResult_Anonymous_92 { + internal static class InternalResult_Anonymous_97 { } } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.results { - internal class InternalResult_Anonymous_92 : Mammoth.Couscous.java.util.function.Function, R> { + internal class InternalResult_Anonymous_97 : Mammoth.Couscous.java.util.function.Function, R> { public R apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult result) { return result._value; } @@ -2574,11 +2745,11 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.results { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.results { - internal static class InternalResult_Anonymous_93 { + internal static class InternalResult_Anonymous_98 { } } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.results { - internal class InternalResult_Anonymous_93 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.java.lang.Iterable> { + internal class InternalResult_Anonymous_98 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.java.lang.Iterable> { public Mammoth.Couscous.java.lang.Iterable apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult result) { return result._warnings; } @@ -2586,14 +2757,14 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.results { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.results { - internal static class InternalResult_Anonymous_94 { + internal static class InternalResult_Anonymous_99 { } } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.results { - internal class InternalResult_Anonymous_94 : Mammoth.Couscous.org.zwobble.mammoth.Result { + internal class InternalResult_Anonymous_99 : Mammoth.Couscous.org.zwobble.mammoth.Result { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult _this_org__zwobble__mammoth__internal__results__InternalResult; internal Mammoth.Couscous.java.util.Set _warnings; - internal InternalResult_Anonymous_94(Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult this_org__zwobble__mammoth__internal__results__InternalResult, Mammoth.Couscous.java.util.Set warnings) { + internal InternalResult_Anonymous_99(Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult this_org__zwobble__mammoth__internal__results__InternalResult, Mammoth.Couscous.java.util.Set warnings) { this._this_org__zwobble__mammoth__internal__results__InternalResult = this_org__zwobble__mammoth__internal__results__InternalResult; this._warnings = warnings; } @@ -2610,7 +2781,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.results { internal static class InternalResult { public static Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult> flatMap(Mammoth.Couscous.java.lang.Iterable iterable, Mammoth.Couscous.java.util.function.Function> function) { Mammoth.Couscous.java.util.List> results = Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerMap>(iterable, function); - return new Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult>(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerMap, R>(results, new Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult_Anonymous_92()), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyFlatMap, string>(results, new Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult_Anonymous_93())); + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult>(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerMap, R>(results, new Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult_Anonymous_97()), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyFlatMap, string>(results, new Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult_Anonymous_98())); } public static Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult map(Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult first, Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult second, Mammoth.Couscous.java.util.function.BiFunction function) { return new Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult(function.apply(first._value, second._value), Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyConcat(first._warnings, second._warnings)); @@ -2646,7 +2817,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.results { } public Mammoth.Couscous.org.zwobble.mammoth.Result toResult() { Mammoth.Couscous.java.util.Set warnings = Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Sets.toSet(this._warnings); - return new Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult_Anonymous_94(this, warnings); + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.results.InternalResult_Anonymous_99(this, warnings); } } } @@ -2667,7 +2838,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { - internal class DocumentElementMatching_Anonymous_95 : Mammoth.Couscous.java.util.function.Function { + internal class DocumentElementMatching_Anonymous_100 : Mammoth.Couscous.java.util.function.Function { public string apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Style arg0) { return arg0.getStyleId(); } @@ -2675,7 +2846,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { - internal class DocumentElementMatching_Anonymous_96 : Mammoth.Couscous.java.util.function.BiPredicate { + internal class DocumentElementMatching_Anonymous_101 : Mammoth.Couscous.java.util.function.BiPredicate { public bool test(string arg0, string arg1) { return arg0.Equals(arg1); } @@ -2683,7 +2854,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { - internal class DocumentElementMatching_Anonymous_97 : Mammoth.Couscous.java.util.function.Function> { + internal class DocumentElementMatching_Anonymous_102 : Mammoth.Couscous.java.util.function.Function> { public Mammoth.Couscous.java.util.Optional apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Style arg0) { return arg0.getName(); } @@ -2691,7 +2862,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { - internal class DocumentElementMatching_Anonymous_98 : Mammoth.Couscous.java.util.function.BiPredicate { + internal class DocumentElementMatching_Anonymous_103 : Mammoth.Couscous.java.util.function.BiPredicate { public bool test(string arg0, string arg1) { return arg0.equalsIgnoreCase(arg1); } @@ -2699,14 +2870,14 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { - internal static class DocumentElementMatching_Anonymous_100 { + internal static class DocumentElementMatching_Anonymous_105 { } } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { - internal class DocumentElementMatching_Anonymous_100 : Mammoth.Couscous.java.util.function.Function { + internal class DocumentElementMatching_Anonymous_105 : Mammoth.Couscous.java.util.function.Function { internal Mammoth.Couscous.java.util.function.BiPredicate _areEqual; internal T _requiredValue; - internal DocumentElementMatching_Anonymous_100(Mammoth.Couscous.java.util.function.BiPredicate areEqual, T requiredValue) { + internal DocumentElementMatching_Anonymous_105(Mammoth.Couscous.java.util.function.BiPredicate areEqual, T requiredValue) { this._areEqual = areEqual; this._requiredValue = requiredValue; } @@ -2717,19 +2888,19 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { - internal static class DocumentElementMatching_Anonymous_99 { + internal static class DocumentElementMatching_Anonymous_104 { } } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { - internal class DocumentElementMatching_Anonymous_99 : Mammoth.Couscous.java.util.function.Function { + internal class DocumentElementMatching_Anonymous_104 : Mammoth.Couscous.java.util.function.Function { internal Mammoth.Couscous.java.util.Optional _actual; internal Mammoth.Couscous.java.util.function.BiPredicate _areEqual; - internal DocumentElementMatching_Anonymous_99(Mammoth.Couscous.java.util.Optional actual, Mammoth.Couscous.java.util.function.BiPredicate areEqual) { + internal DocumentElementMatching_Anonymous_104(Mammoth.Couscous.java.util.Optional actual, Mammoth.Couscous.java.util.function.BiPredicate areEqual) { this._actual = actual; this._areEqual = areEqual; } public bool apply(T requiredValue) { - return ((this._actual).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching_Anonymous_100(this._areEqual, requiredValue))).orElse(false); + return ((this._actual).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching_Anonymous_105(this._areEqual, requiredValue))).orElse(false); } } } @@ -2740,13 +2911,13 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching.matchesStyleId(styleId, style) && Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching.matchesStyleName(styleName, style); } public static bool matchesStyleId(Mammoth.Couscous.java.util.Optional styleId, Mammoth.Couscous.java.util.Optional style) { - return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching.matches(styleId, style.map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching_Anonymous_95()), new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching_Anonymous_96()); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching.matches(styleId, style.map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching_Anonymous_100()), new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching_Anonymous_101()); } public static bool matchesStyleName(Mammoth.Couscous.java.util.Optional styleName, Mammoth.Couscous.java.util.Optional style) { - return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching.matches(styleName, style.flatMap(new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching_Anonymous_97()), new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching_Anonymous_98()); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching.matches(styleName, style.flatMap(new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching_Anonymous_102()), new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching_Anonymous_103()); } public static bool matches(Mammoth.Couscous.java.util.Optional required, Mammoth.Couscous.java.util.Optional actual, Mammoth.Couscous.java.util.function.BiPredicate areEqual) { - return (required.map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching_Anonymous_99(actual, areEqual))).orElse(true); + return (required.map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching_Anonymous_104(actual, areEqual))).orElse(true); } } } @@ -2780,9 +2951,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { return new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPathElement(tagNames, attributes, true))); } public Mammoth.Couscous.java.util.List wrap(Mammoth.Couscous.java.util.List nodes) { - Mammoth.Couscous.java.util.Iterator _couscous_tmp_6 = (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.reversed(this._elements)).iterator(); - while (_couscous_tmp_6.hasNext()) { - Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPathElement element = _couscous_tmp_6.next(); + Mammoth.Couscous.java.util.Iterator _couscous_tmp_8 = (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.reversed(this._elements)).iterator(); + while (_couscous_tmp_8.hasNext()) { + Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPathElement element = _couscous_tmp_8.next(); nodes = element.wrap(nodes); } return nodes; @@ -2816,7 +2987,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { - internal class ParagraphMatcher_Anonymous_101 : Mammoth.Couscous.java.util.function.BiPredicate { + internal class ParagraphMatcher_Anonymous_106 : Mammoth.Couscous.java.util.function.BiPredicate { public bool test(Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.NumberingLevel first, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.NumberingLevel second) { return first.isOrdered() == second.isOrdered() && (first.getLevelIndex()).equalsIgnoreCase(second.getLevelIndex()); } @@ -2856,7 +3027,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching.matchesStyle(this._styleId, this._styleName, paragraph.getStyle()); } public bool matchesNumbering(Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Paragraph paragraph) { - return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching.matches(this._numbering, paragraph.getNumbering(), new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.ParagraphMatcher_Anonymous_101()); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.DocumentElementMatching.matches(this._numbering, paragraph.getNumbering(), new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.ParagraphMatcher_Anonymous_106()); } } } @@ -2886,7 +3057,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { - internal class StyleMap_Anonymous_102 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath> { + internal class StyleMap_Anonymous_107 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath> { public Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMapping arg0) { return arg0.getHtmlPath(); } @@ -2894,9 +3065,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { - internal class StyleMap_Anonymous_103 : Mammoth.Couscous.java.util.function.Predicate> { + internal class StyleMap_Anonymous_108 : Mammoth.Couscous.java.util.function.Predicate> { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Paragraph _paragraph; - internal StyleMap_Anonymous_103(Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Paragraph paragraph) { + internal StyleMap_Anonymous_108(Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Paragraph paragraph) { this._paragraph = paragraph; } public bool test(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMapping styleMapping) { @@ -2906,7 +3077,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { - internal class StyleMap_Anonymous_104 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath> { + internal class StyleMap_Anonymous_109 : Mammoth.Couscous.java.util.function.Function, Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath> { public Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMapping arg0) { return arg0.getHtmlPath(); } @@ -2914,9 +3085,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { - internal class StyleMap_Anonymous_105 : Mammoth.Couscous.java.util.function.Predicate> { + internal class StyleMap_Anonymous_110 : Mammoth.Couscous.java.util.function.Predicate> { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Run _run; - internal StyleMap_Anonymous_105(Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Run run) { + internal StyleMap_Anonymous_110(Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Run run) { this._run = run; } public bool test(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMapping styleMapping) { @@ -2964,10 +3135,10 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { return this._strikethrough; } public Mammoth.Couscous.java.util.Optional getParagraphHtmlPath(Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Paragraph paragraph) { - return (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.tryFind>(this._paragraphStyles, new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMap_Anonymous_103(paragraph))).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMap_Anonymous_102()); + return (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.tryFind>(this._paragraphStyles, new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMap_Anonymous_108(paragraph))).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMap_Anonymous_107()); } public Mammoth.Couscous.java.util.Optional getRunHtmlPath(Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.Run run) { - return (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.tryFind>(this._runStyles, new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMap_Anonymous_105(run))).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMap_Anonymous_104()); + return (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.tryFind>(this._runStyles, new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMap_Anonymous_110(run))).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMap_Anonymous_109()); } } } @@ -3040,9 +3211,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { - internal class DocumentMatcherParser_Anonymous_106 : Mammoth.Couscous.java.util.function.BiConsumer { + internal class DocumentMatcherParser_Anonymous_111 : Mammoth.Couscous.java.util.function.BiConsumer { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.ParagraphMatcher _paragraph; - internal DocumentMatcherParser_Anonymous_106(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.ParagraphMatcher paragraph) { + internal DocumentMatcherParser_Anonymous_111(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.ParagraphMatcher paragraph) { this._paragraph = paragraph; } public void accept(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMapBuilder builder, Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath path) { @@ -3052,9 +3223,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { - internal class DocumentMatcherParser_Anonymous_107 : Mammoth.Couscous.java.util.function.BiConsumer { + internal class DocumentMatcherParser_Anonymous_112 : Mammoth.Couscous.java.util.function.BiConsumer { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.RunMatcher _run; - internal DocumentMatcherParser_Anonymous_107(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.RunMatcher run) { + internal DocumentMatcherParser_Anonymous_112(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.RunMatcher run) { this._run = run; } public void accept(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMapBuilder builder, Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath path) { @@ -3064,7 +3235,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { - internal class DocumentMatcherParser_Anonymous_108 : Mammoth.Couscous.java.util.function.BiConsumer { + internal class DocumentMatcherParser_Anonymous_113 : Mammoth.Couscous.java.util.function.BiConsumer { public void accept(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMapBuilder arg0, Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath arg1) { arg0.bold(arg1); } @@ -3072,7 +3243,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { - internal class DocumentMatcherParser_Anonymous_109 : Mammoth.Couscous.java.util.function.BiConsumer { + internal class DocumentMatcherParser_Anonymous_114 : Mammoth.Couscous.java.util.function.BiConsumer { public void accept(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMapBuilder arg0, Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath arg1) { arg0.italic(arg1); } @@ -3080,7 +3251,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { - internal class DocumentMatcherParser_Anonymous_110 : Mammoth.Couscous.java.util.function.BiConsumer { + internal class DocumentMatcherParser_Anonymous_115 : Mammoth.Couscous.java.util.function.BiConsumer { public void accept(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMapBuilder arg0, Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath arg1) { arg0.underline(arg1); } @@ -3088,7 +3259,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { - internal class DocumentMatcherParser_Anonymous_111 : Mammoth.Couscous.java.util.function.BiConsumer { + internal class DocumentMatcherParser_Anonymous_116 : Mammoth.Couscous.java.util.function.BiConsumer { public void accept(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.StyleMapBuilder arg0, Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath arg1) { arg0.strikethrough(arg1); } @@ -3099,21 +3270,21 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { internal class DocumentMatcherParser { public static Mammoth.Couscous.java.util.function.BiConsumer parse(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenIterator tokens) { Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.Token identifier = tokens.next(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._IDENTIFIER); - string _couscous_tmp_7 = identifier.getValue(); - if (_couscous_tmp_7.Equals("p")) { + string _couscous_tmp_9 = identifier.getValue(); + if (_couscous_tmp_9.Equals("p")) { Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.ParagraphMatcher paragraph = Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.DocumentMatcherParser.parseParagraphMatcher(tokens); - return new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.DocumentMatcherParser_Anonymous_106(paragraph); - } else if (_couscous_tmp_7.Equals("r")) { + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.DocumentMatcherParser_Anonymous_111(paragraph); + } else if (_couscous_tmp_9.Equals("r")) { Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.RunMatcher run = Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.DocumentMatcherParser.parseRunMatcher(tokens); - return new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.DocumentMatcherParser_Anonymous_107(run); - } else if (_couscous_tmp_7.Equals("b")) { - return new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.DocumentMatcherParser_Anonymous_108(); - } else if (_couscous_tmp_7.Equals("i")) { - return new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.DocumentMatcherParser_Anonymous_109(); - } else if (_couscous_tmp_7.Equals("u")) { - return new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.DocumentMatcherParser_Anonymous_110(); - } else if (_couscous_tmp_7.Equals("strike")) { - return new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.DocumentMatcherParser_Anonymous_111(); + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.DocumentMatcherParser_Anonymous_112(run); + } else if (_couscous_tmp_9.Equals("b")) { + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.DocumentMatcherParser_Anonymous_113(); + } else if (_couscous_tmp_9.Equals("i")) { + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.DocumentMatcherParser_Anonymous_114(); + } else if (_couscous_tmp_9.Equals("u")) { + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.DocumentMatcherParser_Anonymous_115(); + } else if (_couscous_tmp_9.Equals("strike")) { + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.DocumentMatcherParser_Anonymous_116(); } else { throw new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.LineParseException(identifier, "Unrecognised document element: " + identifier); } @@ -3163,10 +3334,10 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { } public static bool parseListType(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenIterator tokens) { Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.Token listType = tokens.next(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._IDENTIFIER); - string _couscous_tmp_8 = listType.getValue(); - if (_couscous_tmp_8.Equals("ordered-list")) { + string _couscous_tmp_10 = listType.getValue(); + if (_couscous_tmp_10.Equals("ordered-list")) { return true; - } else if (_couscous_tmp_8.Equals("unordered-list")) { + } else if (_couscous_tmp_10.Equals("unordered-list")) { return false; } else { throw new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.LineParseException(listType, "Unrecognised list type: " + listType); @@ -3228,10 +3399,10 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { - internal class StyleMapParser_Anonymous_112 : Mammoth.Couscous.java.util.function.Consumer { + internal class StyleMapParser_Anonymous_117 : Mammoth.Couscous.java.util.function.Consumer { internal Mammoth.Couscous.java.util.function.BiConsumer _documentMatcher; internal Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath _htmlPath; - internal StyleMapParser_Anonymous_112(Mammoth.Couscous.java.util.function.BiConsumer documentMatcher, Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath htmlPath) { + internal StyleMapParser_Anonymous_117(Mammoth.Couscous.java.util.function.BiConsumer documentMatcher, Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath htmlPath) { this._documentMatcher = documentMatcher; this._htmlPath = htmlPath; } @@ -3277,7 +3448,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { tokens.skip(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._ARROW); Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath htmlPath = Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.StyleMapParser.parseHtmlPath(tokens); tokens.skip(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._EOF); - return new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.StyleMapParser_Anonymous_112(documentMatcher, htmlPath); + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.StyleMapParser_Anonymous_117(documentMatcher, htmlPath); } public static Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.HtmlPath parseHtmlPath(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenIterator tokens) { if (tokens.peekTokenType() == Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._EOF) { @@ -3339,26 +3510,26 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { } else if (Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.StyleMappingTokeniser.isNumeric(nextChar)) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._INTEGER; } else { - char _couscous_tmp_9 = nextChar; - if (_couscous_tmp_9.equals(39)) { + char _couscous_tmp_11 = nextChar; + if (_couscous_tmp_11.equals(39)) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._STRING; - } else if (_couscous_tmp_9.equals(46)) { + } else if (_couscous_tmp_11.equals(46)) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._DOT; - } else if (_couscous_tmp_9.equals(58)) { + } else if (_couscous_tmp_11.equals(58)) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._COLON; - } else if (_couscous_tmp_9.equals(62)) { + } else if (_couscous_tmp_11.equals(62)) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._GREATER_THAN; - } else if (_couscous_tmp_9.equals(61)) { + } else if (_couscous_tmp_11.equals(61)) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._EQUALS; - } else if (_couscous_tmp_9.equals(40)) { + } else if (_couscous_tmp_11.equals(40)) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._OPEN_PAREN; - } else if (_couscous_tmp_9.equals(41)) { + } else if (_couscous_tmp_11.equals(41)) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._CLOSE_PAREN; - } else if (_couscous_tmp_9.equals(91)) { + } else if (_couscous_tmp_11.equals(91)) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._OPEN_SQUARE_BRACKET; - } else if (_couscous_tmp_9.equals(93)) { + } else if (_couscous_tmp_11.equals(93)) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._CLOSE_SQUARE_BRACKET; - } else if (_couscous_tmp_9.equals(124)) { + } else if (_couscous_tmp_11.equals(124)) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._CHOICE; } else { return Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._UNKNOWN; @@ -3366,23 +3537,23 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { } } public static int seekEndOfToken(string line, int index, Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType tokenType) { - Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType _couscous_tmp_10 = tokenType; - if (_couscous_tmp_10.equals(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._WHITESPACE)) { + Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType _couscous_tmp_12 = tokenType; + if (_couscous_tmp_12.equals(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._WHITESPACE)) { while (index < line.Length && Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.StyleMappingTokeniser.isWhitespace(line.charAt(index))) { index = index + 1; } return index; - } else if (_couscous_tmp_10.equals(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._IDENTIFIER)) { + } else if (_couscous_tmp_12.equals(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._IDENTIFIER)) { while (index < line.Length && Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.StyleMappingTokeniser.isIdentifierCharacter(line.charAt(index))) { index = index + 1; } return index; - } else if (_couscous_tmp_10.equals(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._INTEGER)) { + } else if (_couscous_tmp_12.equals(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._INTEGER)) { while (index < line.Length && Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.StyleMappingTokeniser.isNumeric(line.charAt(index))) { index = index + 1; } return index; - } else if (_couscous_tmp_10.equals(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._STRING)) { + } else if (_couscous_tmp_12.equals(Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing.TokenType._STRING)) { while (index < line.Length && !(line.charAt(index) == 39)) { index = index + 1; } @@ -3569,19 +3740,25 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml { public bool hasChild(string name) { return false; } + public Mammoth.Couscous.java.util.Optional findChild(string name) { + return Mammoth.Couscous.java.util.Optional.empty(); + } public Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike findChildOrEmpty(string name) { return this; } public Mammoth.Couscous.java.util.Optional getAttributeOrNone(string name) { return Mammoth.Couscous.java.util.Optional.empty(); } + public Mammoth.Couscous.java.util.List getChildren() { + return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.list(); + } } } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml { - internal class XmlElement_Anonymous_113 : Mammoth.Couscous.java.util.function.Supplier { + internal class XmlElement_Anonymous_118 : Mammoth.Couscous.java.util.function.Supplier { internal string _name; - internal XmlElement_Anonymous_113(string name) { + internal XmlElement_Anonymous_118(string name) { this._name = name; } public Mammoth.Couscous.java.lang.RuntimeException get() { @@ -3591,7 +3768,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml { - internal class XmlElement_Anonymous_114 : Mammoth.Couscous.java.util.function.Function { + internal class XmlElement_Anonymous_119 : Mammoth.Couscous.java.util.function.Function { public string apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlNode arg0) { return arg0.innerText(); } @@ -3599,9 +3776,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml { - internal class XmlElement_Anonymous_115 : Mammoth.Couscous.java.util.function.Predicate { + internal class XmlElement_Anonymous_120 : Mammoth.Couscous.java.util.function.Predicate { internal string _name; - internal XmlElement_Anonymous_115(string name) { + internal XmlElement_Anonymous_120(string name) { this._name = name; } public bool test(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement child) { @@ -3627,21 +3804,18 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml { return this._attributes; } public string getAttribute(string name) { - return (this.getAttributeOrNone(name)).orElseThrow(new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement_Anonymous_113(name)); + return (this.getAttributeOrNone(name)).orElseThrow(new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement_Anonymous_118(name)); } public Mammoth.Couscous.java.util.Optional getAttributeOrNone(string name) { return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.lookup(this._attributes, name); } - public Mammoth.Couscous.java.util.List getChildren() { - return this._children; - } public string innerText() { - return java.lang.String.join("", Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyMap(this._children, new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement_Anonymous_114())); + return java.lang.String.join("", Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyMap(this._children, new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement_Anonymous_119())); } public T accept(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlNodeVisitor visitor) { return visitor.visit(this); } - public Mammoth.Couscous.java.lang.Iterable children() { + public Mammoth.Couscous.java.util.List getChildren() { return this._children; } public string toString() { @@ -3650,8 +3824,8 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml { public Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementList findChildren(string name) { return new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementList(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.toList(this.findChildrenIterable(name))); } - public Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement findChild(string name) { - return ((this.findChildrenIterable(name)).iterator()).next(); + public Mammoth.Couscous.java.util.Optional findChild(string name) { + return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.getFirst(this.findChildrenIterable(name)); } public bool hasChild(string name) { return ((this.findChildrenIterable(name)).iterator()).hasNext(); @@ -3660,7 +3834,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml { return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.getFirst(this.findChildrenIterable(name), Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.NullXmlElement._INSTANCE); } public Mammoth.Couscous.java.lang.Iterable findChildrenIterable(string name) { - return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyFilter(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyFilter(this._children, typeof(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement)), new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement_Anonymous_115(name)); + return Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyFilter(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Iterables.lazyFilter(this._children, typeof(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement)), new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement_Anonymous_120(name)); } } } @@ -3668,15 +3842,17 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml { namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml { internal interface XmlElementLike { bool hasChild(string name); + Mammoth.Couscous.java.util.Optional findChild(string name); Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementLike findChildOrEmpty(string name); Mammoth.Couscous.java.util.Optional getAttributeOrNone(string name); + Mammoth.Couscous.java.util.List getChildren(); } } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml { - internal class XmlElementList_Anonymous_116 : Mammoth.Couscous.java.util.function.Function> { + internal class XmlElementList_Anonymous_121 : Mammoth.Couscous.java.util.function.Function> { internal string _name; - internal XmlElementList_Anonymous_116(string name) { + internal XmlElementList_Anonymous_121(string name) { this._name = name; } public Mammoth.Couscous.java.lang.Iterable apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) { @@ -3695,7 +3871,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml { return (this._elements).iterator(); } public Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementList findChildren(string name) { - return new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementList(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerFlatMap(this._elements, new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementList_Anonymous_116(name))); + return new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementList(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerFlatMap(this._elements, new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElementList_Anonymous_121(name))); } } } @@ -3800,9 +3976,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing { - internal class XmlParser__NodeGenerator_Anonymous_117 : Mammoth.Couscous.java.util.function.Function { + internal class XmlParser__NodeGenerator_Anonymous_122 : Mammoth.Couscous.java.util.function.Function { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.XmlParser__NodeGenerator _this_org__zwobble__mammoth__internal__xml__parsing__XmlParser__NodeGenerator; - internal XmlParser__NodeGenerator_Anonymous_117(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.XmlParser__NodeGenerator this_org__zwobble__mammoth__internal__xml__parsing__XmlParser__NodeGenerator) { + internal XmlParser__NodeGenerator_Anonymous_122(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.XmlParser__NodeGenerator this_org__zwobble__mammoth__internal__xml__parsing__XmlParser__NodeGenerator) { this._this_org__zwobble__mammoth__internal__xml__parsing__XmlParser__NodeGenerator = this_org__zwobble__mammoth__internal__xml__parsing__XmlParser__NodeGenerator; } public string apply(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.ElementName arg0) { @@ -3812,9 +3988,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing { - internal class XmlParser__NodeGenerator_Anonymous_118 : Mammoth.Couscous.java.util.function.Supplier { + internal class XmlParser__NodeGenerator_Anonymous_123 : Mammoth.Couscous.java.util.function.Supplier { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.ElementName _name; - internal XmlParser__NodeGenerator_Anonymous_118(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.ElementName name) { + internal XmlParser__NodeGenerator_Anonymous_123(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.ElementName name) { this._name = name; } public string get() { @@ -3824,9 +4000,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing { } namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing { - internal class XmlParser__NodeGenerator_Anonymous_119 : Mammoth.Couscous.java.util.function.Function { + internal class XmlParser__NodeGenerator_Anonymous_124 : Mammoth.Couscous.java.util.function.Function { internal Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.ElementName _name; - internal XmlParser__NodeGenerator_Anonymous_119(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.ElementName name) { + internal XmlParser__NodeGenerator_Anonymous_124(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.ElementName name) { this._name = name; } public string apply(string prefix) { @@ -3847,7 +4023,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing { return ((this._elementStack).getFirst()).build(); } public void startElement(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.ElementName name, Mammoth.Couscous.java.util.Map attributes) { - Mammoth.Couscous.java.util.Map simpleAttributes = Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.eagerMapKeys(attributes, new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.XmlParser__NodeGenerator_Anonymous_117(this)); + Mammoth.Couscous.java.util.Map simpleAttributes = Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Maps.eagerMapKeys(attributes, new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.XmlParser__NodeGenerator_Anonymous_122(this)); Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.XmlElementBuilder element = new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.XmlElementBuilder(this.readName(name), simpleAttributes); (this._elementStack).add(element); } @@ -3855,7 +4031,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing { if (Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Strings.isNullOrEmpty(name.getUri())) { return name.getLocalName(); } else { - return ((((this._this_org__zwobble__mammoth__internal__xml__parsing__XmlParser)._namespaces).prefixForUri(name.getUri())).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.XmlParser__NodeGenerator_Anonymous_119(name))).orElseGet(new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.XmlParser__NodeGenerator_Anonymous_118(name)); + return ((((this._this_org__zwobble__mammoth__internal__xml__parsing__XmlParser)._namespaces).prefixForUri(name.getUri())).map(new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.XmlParser__NodeGenerator_Anonymous_124(name))).orElseGet(new Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.parsing.XmlParser__NodeGenerator_Anonymous_123(name)); } } public void endElement() { diff --git a/java-mammoth b/java-mammoth index 3de728c..1d72460 160000 --- a/java-mammoth +++ b/java-mammoth @@ -1 +1 @@ -Subproject commit 3de728c3d0fecbb3fa3e9b8019941cb51a3d2867 +Subproject commit 1d724603e22e8941b0813b89bcdf106d95862ec4 -- cgit v1.2.3