Skip to content

Commit 6cd86c0

Browse files
yzaneyzane
committed
Merge branch 'release/1.2.1'
2 parents e93b2ab + 08ff411 commit 6cd86c0

File tree

8 files changed

+83
-192
lines changed

8 files changed

+83
-192
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Change Log
22

3+
## 1.2.1 (2019/09/23)
4+
* Fix: [fix typo, grammar](https://github.com/yzane/vscode-markdown-pdf/pull/122)
5+
* Add: [Option to specify the plantuml delimiter](https://github.com/yzane/vscode-markdown-pdf/pull/104)
6+
* Update: dependencies packages
7+
* Update: README
8+
* Delete the description of the obsolete options.
9+
310
## 1.2.0 (2018/05/03)
411
* Add: Support [markdown-it-plantuml](https://github.com/gmunguia/markdown-it-plantuml)
512
* Support for lightweight diagrams (PlantUML) [#60](https://github.com/yzane/vscode-markdown-pdf/issues/60)

‎README.ja.md‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ Markdown PDF をインストールして、Visutal Studio Code で Markdownフ
166166
||[markdown-pdf.clip.width](#markdown-pdfclipwidth)|
167167
||[markdown-pdf.clip.height](#markdown-pdfclipheight)|
168168
||[markdown-pdf.omitBackground](#markdown-pdfomitbackground)|
169+
|[PlantUML options](#plantuml-options)|[markdown-pdf.plantumlOpenMarker](#markdown-pdfplantumlopenmarker)|
170+
||[markdown-pdf.plantumlCloseMarker](#markdown-pdfplantumlclosemarker)|
169171

170172
### Save options
171173

@@ -441,6 +443,16 @@ Markdown PDF をインストールして、Visutal Studio Code で Markdownフ
441443
- デフォルトの白い背景ではなく、透過によるスクリーンショットのキャプチャーを有効にします
442444
- boolean. Default: false
443445

446+
### PlantUML options
447+
448+
#### `markdown-pdf.plantumlOpenMarker`
449+
- plantuml パーサーの開始区切り文字
450+
- Default: @startuml
451+
452+
#### `markdown-pdf.plantumlCloseMarker`
453+
- plantuml パーサーの終了区切り文字
454+
- Default: @enduml
455+
444456
<div class="page"/>
445457

446458
## FAQ
@@ -492,26 +504,12 @@ Visual Studio Code の `files.autoGuessEncoding` オプションを使うと、
492504

493505
## [Release Notes](CHANGELOG.md)
494506

495-
### 1.2.0 (2018/05/03)
496-
* Add: Support [markdown-it-plantuml](https://github.com/gmunguia/markdown-it-plantuml)
497-
* Support for lightweight diagrams (PlantUML) [#60](https://github.com/yzane/vscode-markdown-pdf/issues/60)
498-
499-
### 1.1.0 (2018/05/03)
500-
* Add: Support [markdown-it-container](https://github.com/markdown-it/markdown-it-container) [#72](https://github.com/yzane/vscode-markdown-pdf/issues/72)
501-
502-
### 1.0.5 (2018/05/03)
503-
* Improve: Exception handling
504-
* Improve: Chromium install check
505-
* Add: Page break
506-
* Is it possible to insert page breaks? [#25](https://github.com/yzane/vscode-markdown-pdf/issues/25)
507+
### 1.2.1 (2019/09/23)
508+
* Fix: [fix typo, grammar](https://github.com/yzane/vscode-markdown-pdf/pull/122)
509+
* Add: [Option to specify the plantuml delimiter](https://github.com/yzane/vscode-markdown-pdf/pull/104)
510+
* Update: dependencies packages
507511
* Update: README
508-
* FAQ: Page break
509-
* Update: markdown-pdf.css
510-
* Add: Meiryo to font-family
511-
512-
### 1.0.4 (2018/05/01)
513-
* Fix: Display error message when downloading Chromium
514-
* Improve: Chromium install. Display download progress on status bar
512+
* Delete the description of the obsolete options.
515513

516514

517515
## License

‎README.md‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ If the download is not successful or you want to avoid downloading every time yo
169169
||[markdown-pdf.clip.width](#markdown-pdfclipwidth)|
170170
||[markdown-pdf.clip.height](#markdown-pdfclipheight)|
171171
||[markdown-pdf.omitBackground](#markdown-pdfomitbackground)|
172+
|[PlantUML options](#plantuml-options)|[markdown-pdf.plantumlOpenMarker](#markdown-pdfplantumlopenmarker)|
173+
||[markdown-pdf.plantumlCloseMarker](#markdown-pdfplantumlclosemarker)|
172174

173175
### Save options
174176

@@ -447,6 +449,16 @@ If the download is not successful or you want to avoid downloading every time yo
447449
- Hides default white background and allows capturing screenshots with transparency
448450
- boolean. Default: false
449451

452+
### PlantUML options
453+
454+
#### `markdown-pdf.plantumlOpenMarker`
455+
- Oppening delimiter used for the plantuml parser.
456+
- Default: @startuml
457+
458+
#### `markdown-pdf.plantumlCloseMarker`
459+
- Closing delimiter used for the plantuml parser.
460+
- Default: @enduml
461+
450462
<div class="page"/>
451463

452464
## FAQ
@@ -498,26 +510,12 @@ Please use the following to insert a page break.
498510

499511
## [Release Notes](CHANGELOG.md)
500512

501-
### 1.2.0 (2018/05/03)
502-
* Add: Support [markdown-it-plantuml](https://github.com/gmunguia/markdown-it-plantuml)
503-
* Support for lightweight diagrams (PlantUML) [#60](https://github.com/yzane/vscode-markdown-pdf/issues/60)
504-
505-
### 1.1.0 (2018/05/03)
506-
* Add: Support [markdown-it-container](https://github.com/markdown-it/markdown-it-container) [#72](https://github.com/yzane/vscode-markdown-pdf/issues/72)
507-
508-
### 1.0.5 (2018/05/03)
509-
* Improve: Exception handling
510-
* Improve: Chromium install check
511-
* Add: Page break
512-
* Is it possible to insert page breaks? [#25](https://github.com/yzane/vscode-markdown-pdf/issues/25)
513+
### 1.2.1 (2019/09/23)
514+
* Fix: [fix typo, grammar](https://github.com/yzane/vscode-markdown-pdf/pull/122)
515+
* Add: [Option to specify the plantuml delimiter](https://github.com/yzane/vscode-markdown-pdf/pull/104)
516+
* Update: dependencies packages
513517
* Update: README
514-
* FAQ: Page break
515-
* Update: markdown-pdf.css
516-
* Add: Meiryo to font-family
517-
518-
### 1.0.4 (2018/05/01)
519-
* Fix: Display error message when downloading Chromium
520-
* Improve: Chromium install. Display download progress on status bar
518+
* Delete the description of the obsolete options.
521519

522520

523521
## License

‎package.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "markdown-pdf",
33
"displayName": "Markdown PDF",
44
"description": "Convert Markdown to PDF",
5-
"version": "1.2.0",
5+
"version": "1.2.1",
66
"publisher": "yzane",
77
"icon": "images/icon.png",
88
"engines": {
@@ -338,20 +338,6 @@
338338
"default": "",
339339
"description": "pdf only. Paper ranges to print, e.g., '1-5, 8, 11-13'."
340340
},
341-
"markdown-pdf.plantumlOpenMarker": {
342-
"type": [
343-
"string"
344-
],
345-
"default": "@startuml",
346-
"description": "Oppening delimiter used for the plantuml parser."
347-
},
348-
"markdown-pdf.plantumlCloseMarker": {
349-
"type": [
350-
"string"
351-
],
352-
"default": "@enduml",
353-
"description": "Closing delimiter used for the plantuml parser."
354-
},
355341
"markdown-pdf.format": {
356342
"type": [
357343
"string",
@@ -451,6 +437,20 @@
451437
"default": false,
452438
"description": "Hides default white background and allows capturing screenshots with transparency."
453439
},
440+
"markdown-pdf.plantumlOpenMarker": {
441+
"type": [
442+
"string"
443+
],
444+
"default": "@startuml",
445+
"description": "Oppening delimiter used for the plantuml parser."
446+
},
447+
"markdown-pdf.plantumlCloseMarker": {
448+
"type": [
449+
"string"
450+
],
451+
"default": "@enduml",
452+
"description": "Closing delimiter used for the plantuml parser."
453+
},
454454
"markdown-pdf.StatusbarMessageTimeout": {
455455
"type": "number",
456456
"default": 10000,

‎sample/README.html‎

Lines changed: 27 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -386,13 +386,8 @@
386386
</head>
387387
<body>
388388
<h1 id="markdown-pdf">Markdown PDF</h1>
389-
<p>This extension convert Markdown file to pdf, html, png or jpeg file.</p>
390-
<p><a href="README.ja.md">Japanease README</a></p>
391-
<h2 id="font-colorred-important-notices-font"><font color="red"> Important Notices </font></h2>
392-
<ul>
393-
<li>Markdown PDF ver1.0.0 replaced PDF converter with <a href="https://github.com/GoogleChrome/puppeteer">puppeteer</a> (Chromium) instead of <a href="https://github.com/marcbachmann/node-html-pdf">node-html-pdf</a> (PhantomJS)</li>
394-
<li>Some options are obsolete, please change. See <a href="#options">Options</a></li>
395-
</ul>
389+
<p>This extension converts Markdown files to pdf, html, png or jpeg files.</p>
390+
<p><a href="README.ja.md">Japanese README</a></p>
396391
<h2 id="table-of-contents">Table of Contents</h2>
397392
<!-- TOC depthFrom:2 depthTo:2 updateOnSave:false -->
398393
<ul>
@@ -505,106 +500,7 @@ <h2 id="extension-settings">Extension Settings</h2>
505500
</ol>
506501
<p><img src="images/settings.gif" alt="demo"></p>
507502
<h2 id="options">Options</h2>
508-
<ul>
509-
<li>Markdown PDF ver1.0.0 replaced PDF converter with <a href="https://github.com/GoogleChrome/puppeteer">puppeteer</a> instead of <a href="https://github.com/marcbachmann/node-html-pdf">node-html-pdf</a>.</li>
510-
<li>Some options are obsolete, please change</li>
511-
<li>The new option of Markdown PDF ver1.0.0 and the obsolete options are as follows</li>
512-
</ul>
513-
<table>
514-
<thead>
515-
<tr>
516-
<th style="text-align:left">ver1.0.0 (new)</th>
517-
<th style="text-align:left">ver0.x.x (obsolete)</th>
518-
</tr>
519-
</thead>
520-
<tbody>
521-
<tr>
522-
<td style="text-align:left"><code>markdown-pdf.executablePath</code></td>
523-
<td style="text-align:left"></td>
524-
</tr>
525-
<tr>
526-
<td style="text-align:left"><code>markdown-pdf.scale</code></td>
527-
<td style="text-align:left"></td>
528-
</tr>
529-
<tr>
530-
<td style="text-align:left"><code>markdown-pdf.displayHeaderFooter</code></td>
531-
<td style="text-align:left"></td>
532-
</tr>
533-
<tr>
534-
<td style="text-align:left"><code>markdown-pdf.headerTemplate</code></td>
535-
<td style="text-align:left"><code>markdown-pdf.header.contents</code></td>
536-
</tr>
537-
<tr>
538-
<td style="text-align:left"><code>markdown-pdf.footerTemplate</code></td>
539-
<td style="text-align:left"><code>markdown-pdf.footer.contents</code></td>
540-
</tr>
541-
<tr>
542-
<td style="text-align:left"><code>markdown-pdf.printBackground</code></td>
543-
<td style="text-align:left"></td>
544-
</tr>
545-
<tr>
546-
<td style="text-align:left"><code>markdown-pdf.pageRanges</code></td>
547-
<td style="text-align:left"></td>
548-
</tr>
549-
<tr>
550-
<td style="text-align:left"><code>markdown-pdf.width</code></td>
551-
<td style="text-align:left"></td>
552-
</tr>
553-
<tr>
554-
<td style="text-align:left"><code>markdown-pdf.height</code></td>
555-
<td style="text-align:left"></td>
556-
</tr>
557-
<tr>
558-
<td style="text-align:left"><code>markdown-pdf.margin.top</code></td>
559-
<td style="text-align:left"><code>markdown-pdf.border.top</code></td>
560-
</tr>
561-
<tr>
562-
<td style="text-align:left"></td>
563-
<td style="text-align:left"><code>markdown-pdf.header.height</code></td>
564-
</tr>
565-
<tr>
566-
<td style="text-align:left"><code>markdown-pdf.margin.bottom</code></td>
567-
<td style="text-align:left"><code>markdown-pdf.border.bottom</code></td>
568-
</tr>
569-
<tr>
570-
<td style="text-align:left"></td>
571-
<td style="text-align:left"><code>markdown-pdf.footer.height</code></td>
572-
</tr>
573-
<tr>
574-
<td style="text-align:left"><code>markdown-pdf.margin.right</code></td>
575-
<td style="text-align:left"><code>markdown-pdf.border.right</code></td>
576-
</tr>
577-
<tr>
578-
<td style="text-align:left"><code>markdown-pdf.margin.left</code></td>
579-
<td style="text-align:left"><code>markdown-pdf.border.left</code></td>
580-
</tr>
581-
<tr>
582-
<td style="text-align:left"><code>markdown-pdf.quality</code></td>
583-
<td style="text-align:left"></td>
584-
</tr>
585-
<tr>
586-
<td style="text-align:left"><code>markdown-pdf.clip.x</code></td>
587-
<td style="text-align:left"></td>
588-
</tr>
589-
<tr>
590-
<td style="text-align:left"><code>markdown-pdf.clip.y</code></td>
591-
<td style="text-align:left"></td>
592-
</tr>
593-
<tr>
594-
<td style="text-align:left"><code>markdown-pdf.clip.width</code></td>
595-
<td style="text-align:left"></td>
596-
</tr>
597-
<tr>
598-
<td style="text-align:left"><code>markdown-pdf.clip.height</code></td>
599-
<td style="text-align:left"></td>
600-
</tr>
601-
<tr>
602-
<td style="text-align:left"><code>markdown-pdf.omitBackground</code></td>
603-
<td style="text-align:left"></td>
604-
</tr>
605-
</tbody>
606-
</table>
607-
<h3 id="option-list">Option list</h3>
503+
<h3 id="list">List</h3>
608504
<table>
609505
<thead>
610506
<tr>
@@ -745,6 +641,14 @@ <h3 id="option-list">Option list</h3>
745641
<td style="text-align:left"></td>
746642
<td style="text-align:left"><a href="#markdown-pdfomitbackground">markdown-pdf.omitBackground</a></td>
747643
</tr>
644+
<tr>
645+
<td style="text-align:left"><a href="#plantuml-options">PlantUML options</a></td>
646+
<td style="text-align:left"><a href="#markdown-pdfplantumlopenmarker">markdown-pdf.plantumlOpenMarker</a></td>
647+
</tr>
648+
<tr>
649+
<td style="text-align:left"></td>
650+
<td style="text-align:left"><a href="#markdown-pdfplantumlclosemarker">markdown-pdf.plantumlCloseMarker</a></td>
651+
</tr>
748652
</tbody>
749653
</table>
750654
<h3 id="save-options">Save options</h3>
@@ -1026,6 +930,17 @@ <h4 id="markdown-pdfomitbackground"><code>markdown-pdf.omitBackground</code></h4
1026930
<li>Hides default white background and allows capturing screenshots with transparency</li>
1027931
<li>boolean. Default: false</li>
1028932
</ul>
933+
<h3 id="plantuml-options">PlantUML options</h3>
934+
<h4 id="markdown-pdfplantumlopenmarker"><code>markdown-pdf.plantumlOpenMarker</code></h4>
935+
<ul>
936+
<li>Oppening delimiter used for the plantuml parser.</li>
937+
<li>Default: @startuml</li>
938+
</ul>
939+
<h4 id="markdown-pdfplantumlclosemarker"><code>markdown-pdf.plantumlCloseMarker</code></h4>
940+
<ul>
941+
<li>Closing delimiter used for the plantuml parser.</li>
942+
<li>Default: @enduml</li>
943+
</ul>
1029944
<div class="page"/>
1030945
<h2 id="faq">FAQ</h2>
1031946
<h3 id="how-can-i-change-emoji-size">How can I change emoji size ?</h3>
@@ -1057,42 +972,16 @@ <h3 id="markdown-pdfstyles-option"><code>markdown-pdf.styles</code> option</h3>
1057972
<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>
1058973
</ul>
1059974
<h2 id="release-notes"><a href="CHANGELOG.md">Release Notes</a></h2>
1060-
<h3 id="120-20180503">1.2.0 (2018/05/03)</h3>
1061-
<ul>
1062-
<li>Add: Support <a href="https://github.com/gmunguia/markdown-it-plantuml">markdown-it-plantuml</a>
975+
<h3 id="121-20190923">1.2.1 (2019/09/23)</h3>
1063976
<ul>
1064-
<li>Support for lightweight diagrams (PlantUML) <a href="https://github.com/yzane/vscode-markdown-pdf/issues/60">#60</a></li>
1065-
</ul>
1066-
</li>
1067-
</ul>
1068-
<h3 id="110-20180503">1.1.0 (2018/05/03)</h3>
1069-
<ul>
1070-
<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>
1071-
</ul>
1072-
<h3 id="105-20180503">1.0.5 (2018/05/03)</h3>
1073-
<ul>
1074-
<li>Improve: Exception handling</li>
1075-
<li>Improve: Chromium install check</li>
1076-
<li>Add: Page break
1077-
<ul>
1078-
<li>Is it possible to insert page breaks? <a href="https://github.com/yzane/vscode-markdown-pdf/issues/25">#25</a></li>
1079-
</ul>
1080-
</li>
977+
<li>Fix: <a href="https://github.com/yzane/vscode-markdown-pdf/pull/122">fix typo, grammar</a></li>
978+
<li>Add: <a href="https://github.com/yzane/vscode-markdown-pdf/pull/104">Option to specify the plantuml delimiter</a></li>
979+
<li>Update: dependencies packages</li>
1081980
<li>Update: README
1082981
<ul>
1083-
<li>FAQ: Page break</li>
982+
<li>Delete the description of the obsolete options.</li>
1084983
</ul>
1085984
</li>
1086-
<li>Update: markdown-pdf.css
1087-
<ul>
1088-
<li>Add: Meiryo to font-family</li>
1089-
</ul>
1090-
</li>
1091-
</ul>
1092-
<h3 id="104-20180501">1.0.4 (2018/05/01)</h3>
1093-
<ul>
1094-
<li>Fix: Display error message when downloading Chromium</li>
1095-
<li>Improve: Chromium install. Display download progress on status bar</li>
1096985
</ul>
1097986
<h2 id="license">License</h2>
1098987
<p>MIT</p>
@@ -1112,7 +1001,6 @@ <h2 id="special-thanks">Special thanks</h2>
11121001
</ul>
11131002
<p>and</p>
11141003
<ul>
1115-
<li><a href="https://github.com/marcbachmann/node-html-pdf">marcbachmann/node-html-pdf</a></li>
11161004
<li><a href="https://github.com/cakebake/markdown-themeable-pdf">cakebake/markdown-themeable-pdf</a></li>
11171005
</ul>
11181006

‎sample/README.jpeg‎

-217 KB
Loading

‎sample/README.pdf‎

29 KB
Binary file not shown.

‎sample/README.png‎

-56 KB
Loading

0 commit comments

Comments
 (0)