summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2016-06-20 19:52:39 +0100
committerMichael Williamson <mike@zwobble.org>2016-06-20 19:52:39 +0100
commitd5d691a5c27b63e65db39f37d47e863843cacd14 (patch)
tree44a7d2234674d5848f47a38abcd12aa52faedf0d
parent577f3ed5d3dc1e9895288c8df8f1b8e55aad623e (diff)
Update java-mammoth to 0.0.3
-rw-r--r--Mammoth/Couscous/mammoth/internal/util/Lists.cs2
-rw-r--r--Mammoth/generated.cs7
m---------java-mammoth0
3 files changed, 7 insertions, 2 deletions
diff --git a/Mammoth/Couscous/mammoth/internal/util/Lists.cs b/Mammoth/Couscous/mammoth/internal/util/Lists.cs
index 18c14f3..9df31b7 100644
--- a/Mammoth/Couscous/mammoth/internal/util/Lists.cs
+++ b/Mammoth/Couscous/mammoth/internal/util/Lists.cs
@@ -20,7 +20,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.util {
return ToJava.ListToList(result);
}
- internal static List<U> eagerMap<T, U>(Iterable<T> iterable, BiFunction<int, T, U> function) {
+ internal static List<U> eagerMapWithIndex<T, U>(Iterable<T> iterable, BiFunction<int, T, U> function) {
var result = FromJava.IterableToEnumerable(iterable)
.Select((value, index) => function.apply(index, value))
.ToList();
diff --git a/Mammoth/generated.cs b/Mammoth/generated.cs
index c2a0bd3..ac12bb1 100644
--- a/Mammoth/generated.cs
+++ b/Mammoth/generated.cs
@@ -1370,6 +1370,8 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx {
return this.readInline(element);
} else if (_couscous_tmp_1.Equals("wp:anchor")) {
return this.readInline(element);
+ } else if (_couscous_tmp_1.Equals("w:sdt")) {
+ return this.readSdt(element);
} else if (_couscous_tmp_1.Equals("w:ins")) {
return this.readElements(element.getChildren());
} else if (_couscous_tmp_1.Equals("w:smartTag")) {
@@ -1521,7 +1523,7 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx {
}
rowIndex = rowIndex + 1;
}
- return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.success(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerMap<Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement>(rows, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_42(merged, rowspans)));
+ return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.success(Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Lists.eagerMapWithIndex<Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement, Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement>(rows, new Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.BodyXmlReader_Anonymous_42(merged, rowspans)));
}
public Mammoth.Couscous.java.util.Optional<string> checkTableRows(Mammoth.Couscous.java.util.List<Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> rows) {
Mammoth.Couscous.java.util.Iterator<Mammoth.Couscous.org.zwobble.mammoth.@internal.documents.DocumentElement> _couscous_tmp_3 = rows.iterator();
@@ -1615,6 +1617,9 @@ namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.docx {
return Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult.withWarning(image, ("Image of type " + contentTypeString) + " is unlikely to display in web browsers");
}
}
+ public Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.ReadResult readSdt(Mammoth.Couscous.org.zwobble.mammoth.@internal.xml.XmlElement element) {
+ return this.readElements((element.findChildOrEmpty("w:sdtContent")).getChildren());
+ }
public string relationshipIdToDocxPath(string relationshipId) {
Mammoth.Couscous.org.zwobble.mammoth.@internal.docx.Relationship relationship = (this._relationships).findRelationshipById(relationshipId);
return "word/" + Mammoth.Couscous.org.zwobble.mammoth.@internal.util.Strings.trimLeft(relationship.getTarget(), 47);
diff --git a/java-mammoth b/java-mammoth
-Subproject 1d724603e22e8941b0813b89bcdf106d95862ec
+Subproject 537c967a33eff35ebdad8268e607831530ed5e4