diff options
| author | Michael Williamson <mike@zwobble.org> | 2016-02-20 11:14:08 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2016-02-20 11:14:08 +0000 |
| commit | 125fb6aa1c5824b757626ee6ece93b5b8e4f15b9 (patch) | |
| tree | 44ecbb383fbc1b275feedef3428f6130c40a304f /src | |
| parent | bda901767249e2f0b206ac91e93cb2020553c4a1 (diff) | |
Don't add hyphen to ID prefix
Diffstat (limited to 'src')
4 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/org/zwobble/mammoth/DocumentConverter.java b/src/main/java/org/zwobble/mammoth/DocumentConverter.java index cbcade5..5b34cc4 100644 --- a/src/main/java/org/zwobble/mammoth/DocumentConverter.java +++ b/src/main/java/org/zwobble/mammoth/DocumentConverter.java @@ -219,6 +219,6 @@ public class DocumentConverter { } private String generateId(String bookmarkName) { - return idPrefix + "-" + bookmarkName; + return idPrefix + bookmarkName; } } diff --git a/src/main/java/org/zwobble/mammoth/Mammoth.java b/src/main/java/org/zwobble/mammoth/Mammoth.java index 6960027..0db7f5c 100644 --- a/src/main/java/org/zwobble/mammoth/Mammoth.java +++ b/src/main/java/org/zwobble/mammoth/Mammoth.java @@ -17,7 +17,7 @@ import static org.zwobble.mammoth.util.MammothLists.list; public class Mammoth { public static class Options { // TODO: what default prefix? - public static final Options DEFAULT = new Options("document", false); + public static final Options DEFAULT = new Options("document-", false); private final String idPrefix; private final boolean preserveEmptyParagraphs; diff --git a/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java b/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java index 58828ef..e53f698 100644 --- a/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java @@ -210,10 +210,10 @@ public class DocumentConverterTests { } private List<HtmlNode> convertToHtml(Document document) { - return DocumentConverter.convertToHtml("doc-42", false, document); + return DocumentConverter.convertToHtml("doc-42-", false, document); } private List<HtmlNode> convertToHtml(DocumentElement element) { - return DocumentConverter.convertToHtml("doc-42", false, element); + return DocumentConverter.convertToHtml("doc-42-", false, element); } } diff --git a/src/test/java/org/zwobble/mammoth/tests/MammothTests.java b/src/test/java/org/zwobble/mammoth/tests/MammothTests.java index a545a02..7186216 100644 --- a/src/test/java/org/zwobble/mammoth/tests/MammothTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/MammothTests.java @@ -42,7 +42,7 @@ public class MammothTests { @Test public void footnotesAreAppendedToText() { assertThat( - convertToHtml("footnotes.docx", Mammoth.Options.DEFAULT.idPrefix("doc-42")), + convertToHtml("footnotes.docx", Mammoth.Options.DEFAULT.idPrefix("doc-42-")), deepEquals(success( "<p>Ouch" + "<sup><a href=\"#doc-42-footnote-1\" id=\"doc-42-footnote-ref-1\">[1]</a></sup>." + @@ -54,7 +54,7 @@ public class MammothTests { @Test public void endNotesAreAppendedToText() { assertThat( - convertToHtml("endnotes.docx", Mammoth.Options.DEFAULT.idPrefix("doc-42")), + convertToHtml("endnotes.docx", Mammoth.Options.DEFAULT.idPrefix("doc-42-")), deepEquals(success( "<p>Ouch" + "<sup><a href=\"#doc-42-endnote-2\" id=\"doc-42-endnote-ref-2\">[1]</a></sup>." + @@ -66,7 +66,7 @@ public class MammothTests { @Test public void relationshipsAreReadForEachFileContainingBodyXml() { assertThat( - convertToHtml("footnote-hyperlink.docx", Mammoth.Options.DEFAULT.idPrefix("doc-42")), + convertToHtml("footnote-hyperlink.docx", Mammoth.Options.DEFAULT.idPrefix("doc-42-")), deepEquals(success( "<p><sup><a href=\"#doc-42-footnote-1\" id=\"doc-42-footnote-ref-1\">[1]</a></sup></p>" + "<ol><li id=\"doc-42-footnote-1\"><p> <a href=\"http://www.example.com\">Example</a> <a href=\"#doc-42-footnote-ref-1\">↑</a></p></li></ol>"))); |