diff options
| author | Felix Mulder <felix.mulder@gmail.com> | 2017-01-13 14:23:57 +0100 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2017-01-31 14:31:08 +0100 |
| commit | ae89a7a1e067c3e7dde7d5fc8a8a016689f0b9e3 (patch) | |
| tree | 0a9feeb093237e6bb6ff7b73f223cefcb4823bbc | |
| parent | eeeada2083dead6ef15c2c45e4158fa677b8ec02 (diff) | |
| download | dotty-ae89a7a1e067c3e7dde7d5fc8a8a016689f0b9e3.tar.gz dotty-ae89a7a1e067c3e7dde7d5fc8a8a016689f0b9e3.tar.bz2 dotty-ae89a7a1e067c3e7dde7d5fc8a8a016689f0b9e3.zip | |
fix extensions not getting loaded properly
| -rw-r--r-- | doc-tool/resources/css/api-page.css | 4 | ||||
| -rw-r--r-- | doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala | 18 | ||||
| -rw-r--r-- | project/Build.scala | 6 |
3 files changed, 23 insertions, 5 deletions
diff --git a/doc-tool/resources/css/api-page.css b/doc-tool/resources/css/api-page.css index 47f88ed6c..e2927f0d4 100644 --- a/doc-tool/resources/css/api-page.css +++ b/doc-tool/resources/css/api-page.css @@ -19,6 +19,10 @@ div#entity-title > span#entity-kind { font-weight: 100; } +div#entity-body table > tbody > tr > td { + padding: 10px; +} + div.entity-section { background-color: #fff; border-radius: 4px; diff --git a/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala b/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala index d190eea88..a2dad5315 100644 --- a/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala +++ b/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala @@ -5,14 +5,18 @@ package staticsite import java.nio.file.{ Files, FileSystems } import java.nio.file.StandardCopyOption.REPLACE_EXISTING import java.io.{ File => JFile } -import java.util.{ List => JList, Map => JMap, Collections => JCollections } +import java.util.{ List => JList, Map => JMap, Arrays } import java.nio.file.Path import java.io.ByteArrayInputStream import java.nio.charset.StandardCharsets import com.vladsch.flexmark.parser.ParserEmulationFamily import com.vladsch.flexmark.parser.Parser -import com.vladsch.flexmark.ext.tables.TablesExtension +import com.vladsch.flexmark.ext.gfm.tables.TablesExtension +import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension +import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension +import com.vladsch.flexmark.ext.emoji.EmojiExtension +import com.vladsch.flexmark.ext.autolink.AutolinkExtension import com.vladsch.flexmark.ext.front.matter.YamlFrontMatterExtension import com.vladsch.flexmark.util.options.{ DataHolder, MutableDataSet } @@ -340,6 +344,12 @@ object Site { val markdownOptions: DataHolder = new MutableDataSet() .setFrom(ParserEmulationFamily.KRAMDOWN.getOptions) - .set(Parser.EXTENSIONS, JCollections.singleton(TablesExtension.create())) - .set(Parser.EXTENSIONS, JCollections.singleton(YamlFrontMatterExtension.create())) + .set(Parser.EXTENSIONS, Arrays.asList( + TablesExtension.create(), + TaskListExtension.create(), + AutolinkExtension.create(), + EmojiExtension.create(), + YamlFrontMatterExtension.create(), + StrikethroughExtension.create() + )) } diff --git a/project/Build.scala b/project/Build.scala index e27ec350c..025f5c2dd 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -186,7 +186,11 @@ object DottyBuild extends Build { "org.scala-lang.modules" %% "scala-partest" % "1.0.11" % "test", dottyOrganization % "dottydoc-client" % "0.1.0", "com.vladsch.flexmark" % "flexmark" % "0.10.1", - "com.vladsch.flexmark" % "flexmark-ext-tables" % "0.10.1", + "com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % "0.10.1", + "com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % "0.10.1", + "com.vladsch.flexmark" % "flexmark-ext-autolink" % "0.10.1", + "com.vladsch.flexmark" % "flexmark-ext-emoji" % "0.10.1", + "com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % "0.11.1", "com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % "0.10.3", "nl.big-o" % "liqp" % "0.6.7", "com.novocode" % "junit-interface" % "0.11" % "test", |