diff options
author | Ingo Kegel <ingo.kegel@ej-technologies.com> | 2016-01-04 13:36:54 +0100 |
---|---|---|
committer | Ingo Kegel <ingo.kegel@ej-technologies.com> | 2016-01-04 13:36:54 +0100 |
commit | 89a36e0eed4a31856cca0cedb9b67ce79cee5100 (patch) | |
tree | fd0d71cc5924564036775b320ee6e25afc899605 /core/src | |
parent | e0c6c1a58ff09e657d41f2bca6943486cb877f25 (diff) | |
download | dokka-89a36e0eed4a31856cca0cedb9b67ce79cee5100.tar.gz dokka-89a36e0eed4a31856cca0cedb9b67ce79cee5100.tar.bz2 dokka-89a36e0eed4a31856cca0cedb9b67ce79cee5100.zip |
Embedded underscores in words like word_with_underscores or single embedded stars like embedded*star were removed in the output.
Diffstat (limited to 'core/src')
-rw-r--r-- | core/src/main/kotlin/Kotlin/ContentBuilder.kt | 6 | ||||
-rw-r--r-- | core/src/test/kotlin/format/HtmlFormatTest.kt | 6 | ||||
-rw-r--r-- | core/src/test/kotlin/markdown/ParserTest.kt | 12 |
3 files changed, 24 insertions, 0 deletions
diff --git a/core/src/main/kotlin/Kotlin/ContentBuilder.kt b/core/src/main/kotlin/Kotlin/ContentBuilder.kt index c4bb18de..1a6ffb98 100644 --- a/core/src/main/kotlin/Kotlin/ContentBuilder.kt +++ b/core/src/main/kotlin/Kotlin/ContentBuilder.kt @@ -103,6 +103,12 @@ public fun buildContentTo(tree: MarkdownNode, target: ContentBlock, linkResolver parent.append(createEntityOrText(node.text)) } + MarkdownTokenTypes.EMPH -> { + if (node.parent?.type != MarkdownElementTypes.EMPH) { + parent.append(ContentText(node.text)) + } + } + MarkdownTokenTypes.COLON, MarkdownTokenTypes.DOUBLE_QUOTE, MarkdownTokenTypes.LT, diff --git a/core/src/test/kotlin/format/HtmlFormatTest.kt b/core/src/test/kotlin/format/HtmlFormatTest.kt index 593dbfe6..8045d38c 100644 --- a/core/src/test/kotlin/format/HtmlFormatTest.kt +++ b/core/src/test/kotlin/format/HtmlFormatTest.kt @@ -153,5 +153,11 @@ public class HtmlFormatTest { htmlService.appendNodes(tempLocation, output, model.members.single().members.filter { it.name == "Bar" }) } } + + @Test fun uninterpretedEmphasisCharacters() { + verifyOutput("testdata/format/uninterpretedEmphasisCharacters.kt", ".html") { model, output -> + htmlService.appendNodes(tempLocation, output, model.members.single().members) + } + } } diff --git a/core/src/test/kotlin/markdown/ParserTest.kt b/core/src/test/kotlin/markdown/ParserTest.kt index 5a7adf05..b0ec68ff 100644 --- a/core/src/test/kotlin/markdown/ParserTest.kt +++ b/core/src/test/kotlin/markdown/ParserTest.kt @@ -86,6 +86,18 @@ number two runTestFor("*text*") } + @Test fun underscoresNoEmph() { + runTestFor("text_with_underscores") + } + + @Test fun emphUnderscores() { + runTestFor("_text_") + } + + @Test fun singleStar() { + runTestFor("Embedded*Star") + } + @Test fun directive() { runTestFor("A text \${code with.another.value} with directive") } |