Merge branch 'release/1.2.0'

yzane · May 3, 2018 · 2d62837 · 2d62837
2 parents 2d5fb11 + 6e6fc31
commit 2d62837
Show file tree

Hide file tree

Showing 11 changed files with 108 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.2.0 (2018/05/03)
+* Add: Support [markdown-it-plantuml](https://github.com/gmunguia/markdown-it-plantuml)
+    * Support for lightweight diagrams (PlantUML) [#60](https://github.com/yzane/vscode-markdown-pdf/issues/60)
+
 ## 1.1.0 (2018/05/03)
 * Add: Support [markdown-it-container](https://github.com/markdown-it/markdown-it-container) [#72](https://github.com/yzane/vscode-markdown-pdf/issues/72)
 

diff --git a/README.ja.md b/README.ja.md
@@ -31,6 +31,8 @@
 * [emoji](http://www.webpagefx.com/tools/emoji-cheat-sheet/)
 * [markdown-it-checkbox](https://github.com/mcecot/markdown-it-checkbox)
 * [markdown-it-container](https://github.com/markdown-it/markdown-it-container)
+* [PlantUML](http://plantuml.com/)
+  * [markdown-it-plantuml](https://github.com/gmunguia/markdown-it-plantuml)
 
 サンプルファイル
  * [pdf](sample/README.pdf)
@@ -40,20 +42,34 @@
 
 ### markdown-it-container
 
-input
+INPUT
 ```
 ::: warning
 *here be dragons*
 :::
 ```
 
-output
+OUTPUT
 ``` html
 <div class="warning">
 <p><em>here be dragons</em></p>
 </div>
 ```
 
+### markdown-it-plantuml
+
+INPUT
+```
+@startuml
+Bob -[#red]> Alice : hello
+Alice -[#0000FF]->Bob : ok
+@enduml
+```
+
+OUTPUT
+
+![PlantUML](images/PlantUML.png)
+
 
 ## インストール
 
@@ -508,6 +524,10 @@ Visual Studio Code の `files.autoGuessEncoding` オプションを使うと、
 
 ## [Release Notes](CHANGELOG.md)
 
+### 1.2.0 (2018/05/03)
+* Add: Support [markdown-it-plantuml](https://github.com/gmunguia/markdown-it-plantuml)
+    * Support for lightweight diagrams (PlantUML) [#60](https://github.com/yzane/vscode-markdown-pdf/issues/60)
+
 ### 1.1.0 (2018/05/03)
 * Add: Support [markdown-it-container](https://github.com/markdown-it/markdown-it-container) [#72](https://github.com/yzane/vscode-markdown-pdf/issues/72)
 
@@ -532,17 +552,18 @@ MIT
 
 
 ## Special thanks
-* [marcbachmann/node-html-pdf](https://github.com/marcbachmann/node-html-pdf)
+* [GoogleChrome/puppeteer](https://github.com/GoogleChrome/puppeteer)
 * [markdown-it/markdown-it](https://github.com/markdown-it/markdown-it)
 * [mcecot/markdown-it-checkbox](https://github.com/mcecot/markdown-it-checkbox)
+* [leff/markdown-it-named-headers](https://github.com/leff/markdown-it-named-headers)
 * [markdown-it/markdown-it-emoji](https://github.com/markdown-it/markdown-it-emoji)
 * [HenrikJoreteg/emoji-images](https://github.com/HenrikJoreteg/emoji-images)
 * [isagalaev/highlight.js](https://github.com/isagalaev/highlight.js)
 * [cheeriojs/cheerio](https://github.com/cheeriojs/cheerio)
 * [janl/mustache.js](https://github.com/janl/mustache.js)
-
+* [markdown-it/markdown-it-container](https://github.com/markdown-it/markdown-it-container)
+* [gmunguia/markdown-it-plantuml](https://github.com/gmunguia/markdown-it-plantuml)
 
 and
 
-
 * [cakebake/markdown-themeable-pdf](https://github.com/cakebake/markdown-themeable-pdf)
diff --git a/README.md b/README.md
@@ -33,6 +33,8 @@ Supports the following features
 * [emoji](http://www.webpagefx.com/tools/emoji-cheat-sheet/)
 * [markdown-it-checkbox](https://github.com/mcecot/markdown-it-checkbox)
 * [markdown-it-container](https://github.com/markdown-it/markdown-it-container)
+* [PlantUML](http://plantuml.com/)
+  * [markdown-it-plantuml](https://github.com/gmunguia/markdown-it-plantuml)
 
 Sample files
  * [pdf](sample/README.pdf)
@@ -42,20 +44,34 @@ Sample files
 
 ### markdown-it-container
 
-input
+INPUT
 ```
 ::: warning
 *here be dragons*
 :::
 ```
 
-output
+OUTPUT
 ``` html
 <div class="warning">
 <p><em>here be dragons</em></p>
 </div>
 ```
 
+### markdown-it-plantuml
+
+INPUT
+```
+@startuml
+Bob -[#red]> Alice : hello
+Alice -[#0000FF]->Bob : ok
+@enduml
+```
+
+OUTPUT
+
+![PlantUML](images/PlantUML.png)
+
 
 ## Install
 
@@ -514,6 +530,10 @@ Please use the following to insert a page break.
 
 ## [Release Notes](CHANGELOG.md)
 
+### 1.2.0 (2018/05/03)
+* Add: Support [markdown-it-plantuml](https://github.com/gmunguia/markdown-it-plantuml)
+    * Support for lightweight diagrams (PlantUML) [#60](https://github.com/yzane/vscode-markdown-pdf/issues/60)
+
 ### 1.1.0 (2018/05/03)
 * Add: Support [markdown-it-container](https://github.com/markdown-it/markdown-it-container) [#72](https://github.com/yzane/vscode-markdown-pdf/issues/72)
 
@@ -547,10 +567,10 @@ MIT
 * [isagalaev/highlight.js](https://github.com/isagalaev/highlight.js)
 * [cheeriojs/cheerio](https://github.com/cheeriojs/cheerio)
 * [janl/mustache.js](https://github.com/janl/mustache.js)
-
+* [markdown-it/markdown-it-container](https://github.com/markdown-it/markdown-it-container)
+* [gmunguia/markdown-it-plantuml](https://github.com/gmunguia/markdown-it-plantuml)
 
 and
 
-
 * [marcbachmann/node-html-pdf](https://github.com/marcbachmann/node-html-pdf)
 * [cakebake/markdown-themeable-pdf](https://github.com/cakebake/markdown-themeable-pdf)
diff --git a/extension.js b/extension.js
@@ -257,7 +257,11 @@ function convertMarkdownToHtml(filename, type, text) {
       }
     }
   });
-
+
+  // PlantUML
+  // https://github.com/gmunguia/markdown-it-plantuml
+  md.use(require('markdown-it-plantuml'));
+
   statusbarmessage.dispose();
   return md.render(text);
 

diff --git a/images/PlantUML.png b/images/PlantUML.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "markdown-pdf",
   "displayName": "Markdown PDF",
   "description": "Convert Markdown to PDF",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "publisher": "yzane",
   "icon": "images/icon.png",
   "engines": {
@@ -462,6 +462,7 @@
     "markdown-it-container": "^2.0.0",
     "markdown-it-emoji": "^1.4.0",
     "markdown-it-named-headers": "0.0.4",
+    "markdown-it-plantuml": "^1.0.0",
     "mkdirp": "^0.5.1",
     "mustache": "^2.3.0",
     "puppeteer": "^1.3.0",

diff --git a/sample/README.html b/sample/README.html
@@ -414,7 +414,13 @@ <h2 id="features">Features</h2>
 <ul>
 <li><a href="https://highlightjs.org/static/demo/">Syntax highlighting</a></li>
 <li><a href="http://www.webpagefx.com/tools/emoji-cheat-sheet/">emoji</a></li>
-<li>checkbox</li>
+<li><a href="https://github.com/mcecot/markdown-it-checkbox">markdown-it-checkbox</a></li>
+<li><a href="https://github.com/markdown-it/markdown-it-container">markdown-it-container</a></li>
+<li><a href="http://plantuml.com/">PlantUML</a>
+<ul>
+<li><a href="https://github.com/gmunguia/markdown-it-plantuml">markdown-it-plantuml</a></li>
+</ul>
+</li>
 </ul>
 <p>Sample files</p>
 <ul>
@@ -423,6 +429,26 @@ <h2 id="features">Features</h2>
 <li><a href="sample/README.png">png</a></li>
 <li><a href="sample/README.jpeg">jpeg</a></li>
 </ul>
+<h3 id="markdown-it-container">markdown-it-container</h3>
+<p>INPUT</p>
+<pre class="hljs"><code><div>::: warning
+*here be dragons*
+:::
+</div></code></pre>
+<p>OUTPUT</p>
+<pre class="hljs"><code><div><span class="hljs-tag">&lt;<span class="hljs-name">div</span> <span class="hljs-attr">class</span>=<span class="hljs-string">"warning"</span>&gt;</span>
+<span class="hljs-tag">&lt;<span class="hljs-name">p</span>&gt;</span><span class="hljs-tag">&lt;<span class="hljs-name">em</span>&gt;</span>here be dragons<span class="hljs-tag">&lt;/<span class="hljs-name">em</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">p</span>&gt;</span>
+<span class="hljs-tag">&lt;/<span class="hljs-name">div</span>&gt;</span>
+</div></code></pre>
+<h3 id="markdown-it-plantuml">markdown-it-plantuml</h3>
+<p>INPUT</p>
+<pre class="hljs"><code><div>@startuml
+Bob -[#red]&gt; Alice : hello
+Alice -[#0000FF]-&gt;Bob : ok
+@enduml
+</div></code></pre>
+<p>OUTPUT</p>
+<p><img src="images/PlantUML.png" alt="PlantUML"></p>
 <h2 id="install">Install</h2>
 <p>Chromium download starts automatically when Markdown PDF is installed and Markdown file is first opened with Visutal Studio Code.</p>
 <p>However, it is time-consuming depending on the environment because of its large size (~ 170Mb Mac, ~ 282Mb Linux, ~ 280Mb Win).</p>
@@ -1031,6 +1057,18 @@ <h3 id="markdown-pdfstyles-option"><code>markdown-pdf.styles</code> option</h3>
 <li>Online CSS (https://xxx/xxx.css) is applied correctly for JPG and PNG, but problems occur with PDF. <a href="https://github.com/yzane/vscode-markdown-pdf/issues/67">#67</a></li>
 </ul>
 <h2 id="release-notes"><a href="CHANGELOG.md">Release Notes</a></h2>
+<h3 id="120-20180503">1.2.0 (2018/05/03)</h3>
+<ul>
+<li>Add: Support <a href="https://github.com/gmunguia/markdown-it-plantuml">markdown-it-plantuml</a>
+<ul>
+<li>Support for lightweight diagrams (PlantUML) <a href="https://github.com/yzane/vscode-markdown-pdf/issues/60">#60</a></li>
+</ul>
+</li>
+</ul>
+<h3 id="110-20180503">1.1.0 (2018/05/03)</h3>
+<ul>
+<li>Add: Support <a href="https://github.com/markdown-it/markdown-it-container">markdown-it-container</a> <a href="https://github.com/yzane/vscode-markdown-pdf/issues/72">#72</a></li>
+</ul>
 <h3 id="105-20180503">1.0.5 (2018/05/03)</h3>
 <ul>
 <li>Improve: Exception handling</li>
@@ -1069,6 +1107,8 @@ <h2 id="special-thanks">Special thanks</h2>
 <li><a href="https://github.com/isagalaev/highlight.js">isagalaev/highlight.js</a></li>
 <li><a href="https://github.com/cheeriojs/cheerio">cheeriojs/cheerio</a></li>
 <li><a href="https://github.com/janl/mustache.js">janl/mustache.js</a></li>
+<li><a href="https://github.com/markdown-it/markdown-it-container">markdown-it/markdown-it-container</a></li>
+<li><a href="https://github.com/gmunguia/markdown-it-plantuml">gmunguia/markdown-it-plantuml</a></li>
 </ul>
 <p>and</p>
 <ul>

diff --git a/sample/README.jpeg b/sample/README.jpeg
diff --git a/sample/README.pdf b/sample/README.pdf
diff --git a/sample/README.png b/sample/README.png