diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java | 21 | ||||
| -rw-r--r-- | src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java | 68 |
2 files changed, 69 insertions, 20 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java index 9983d09..dab5fa6 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java @@ -346,18 +346,15 @@ class StatefulBodyXmlReader { } private ComplexField parseInstrText(String instrText, XmlElementLike fldChar) { - Pattern externalLinkPattern = Pattern.compile("\\s*HYPERLINK \"(.*)\""); - Matcher externalLinkMatcher = externalLinkPattern.matcher(instrText); - if (externalLinkMatcher.lookingAt()) { - String href = externalLinkMatcher.group(1); - return ComplexField.hyperlink(children -> Hyperlink.href(href, Optional.empty(), children)); - } - - Pattern internalLinkPattern = Pattern.compile("\\s*HYPERLINK\\s+\\\\l\\s+\"(.*)\""); - Matcher internalLinkMatcher = internalLinkPattern.matcher(instrText); - if (internalLinkMatcher.lookingAt()) { - String anchor = internalLinkMatcher.group(1); - return ComplexField.hyperlink(children -> Hyperlink.anchor(anchor, Optional.empty(), children)); + Pattern linkPattern = Pattern.compile("^\\s*HYPERLINK\\s+(\\\\l\\s+)?(?:\"(.*)\"|([^\\\\]\\S*))"); + Matcher linkMatcher = linkPattern.matcher(instrText); + if (linkMatcher.lookingAt()) { + String location = linkMatcher.group(2) == null ? linkMatcher.group(3) : linkMatcher.group(2); + if (linkMatcher.group(1) == null) { + return ComplexField.hyperlink(children -> Hyperlink.href(location, Optional.empty(), children)); + } else { + return ComplexField.hyperlink(children -> Hyperlink.anchor(location, Optional.empty(), children)); + } } Pattern checkboxPattern = Pattern.compile("\\s*FORMCHECKBOX\\s*"); diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java index 71d8627..135ad54 100644 --- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java @@ -374,13 +374,14 @@ public class BodyXmlTests { } @Test - public void runsInAComplexFieldForHyperlinksWithoutSwitchAreReadAsExternalHyperlinks() { - XmlElement hyperlinkRunXml = runXml("this is a hyperlink"); + public void runsInAComplexFieldForHyperlinksWithoutSwitchWithQuotedLocationAreReadAsExternalHyperlinks() { XmlElement element = paragraphXml(list( BEGIN_COMPLEX_FIELD, - HYPERLINK_INSTRTEXT, + element("w:instrText", list( + XmlNodes.text(" HYPERLINK \"http://example.com\"") + )), SEPARATE_COMPLEX_FIELD, - hyperlinkRunXml, + runXml("this is a hyperlink"), END_COMPLEX_FIELD )); DocumentElement paragraph = readSuccess(bodyReader(), element); @@ -389,7 +390,7 @@ public class BodyXmlTests { isEmptyRun(), isEmptyHyperlinkedRun(), isHyperlinkedRun( - hasHref(URI), + hasHref("http://example.com"), hasChildren( isTextElement("this is a hyperlink") ) @@ -399,15 +400,66 @@ public class BodyXmlTests { } @Test - public void runsInAComplexFieldForHyperlinksWithLSwitchAreReadAsInternalHyperlinks() { - XmlElement hyperlinkRunXml = runXml("this is a hyperlink"); + public void runsInAComplexFieldForHyperlinksWithoutSwitchWithUnquotedLocationAreReadAsExternalHyperlinks() { + XmlElement element = paragraphXml(list( + BEGIN_COMPLEX_FIELD, + element("w:instrText", list( + XmlNodes.text(" HYPERLINK http://example.com") + )), + SEPARATE_COMPLEX_FIELD, + runXml("this is a hyperlink"), + END_COMPLEX_FIELD + )); + DocumentElement paragraph = readSuccess(bodyReader(), element); + + assertThat(paragraph, isParagraph(hasChildren( + isEmptyRun(), + isEmptyHyperlinkedRun(), + isHyperlinkedRun( + hasHref("http://example.com"), + hasChildren( + isTextElement("this is a hyperlink") + ) + ), + isEmptyRun() + ))); + } + + @Test + public void runsInAComplexFieldForHyperlinksWithLSwitchWithQuotedLocationAreReadAsInternalHyperlinks() { XmlElement element = paragraphXml(list( BEGIN_COMPLEX_FIELD, element("w:instrText", list( XmlNodes.text(" HYPERLINK \\l \"InternalLink\"") )), SEPARATE_COMPLEX_FIELD, - hyperlinkRunXml, + runXml("this is a hyperlink"), + END_COMPLEX_FIELD + )); + DocumentElement paragraph = readSuccess(bodyReader(), element); + + assertThat(paragraph, isParagraph(hasChildren( + isEmptyRun(), + isEmptyHyperlinkedRun(), + isHyperlinkedRun( + hasAnchor("InternalLink"), + hasChildren( + isTextElement("this is a hyperlink") + ) + ), + isEmptyRun() + ))); + } + + @Test + public void runsInAComplexFieldForHyperlinksWithLSwitchWithUnquotedLocationAreReadAsInternalHyperlinks() { + XmlElement element = paragraphXml(list( + BEGIN_COMPLEX_FIELD, + element("w:instrText", list( + XmlNodes.text(" HYPERLINK \\l InternalLink") + )), + SEPARATE_COMPLEX_FIELD, + runXml("this is a hyperlink"), END_COMPLEX_FIELD )); DocumentElement paragraph = readSuccess(bodyReader(), element); |