diff --git a/CHANGELOG.md b/CHANGELOG.md index c8f090f..94fbc19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Change Log +## 1.4.4 (2020/03/19) +* Change: mermaid javascript reads from URL instead of from local file + * Add: `markdown-pdf.mermaidServer` option + * add an option to disable mermaid [#175](https://github.com/yzane/vscode-markdown-pdf/issues/175) +* Add: `markdown-pdf.plantumlServer` option + * support configuration of plantUML server [#139](https://github.com/yzane/vscode-markdown-pdf/issues/139) +* Add: configuration scope + * extend setting 'headerTemplate' with scope\.\.\. [#184](https://github.com/yzane/vscode-markdown-pdf/pull/184) +* Update: [slug](https://github.com/yzane/vscode-markdown-pdf/commit/3f4aeaa724999c46fc37423d4b188fd7ce72ffce) for markdown-it-named-headers +* Update: markdown.css, markdown-pdf.css +* Update: dependent packages +* Fix: Fix for issue \#186 [#187](https://github.com/yzane/vscode-markdown-pdf/pull/187) +* Fix: move the Meiryo font to the end of the font-family setting + * Meiryo font causing \\ to show as ¥ [#83](https://github.com/yzane/vscode-markdown-pdf/issues/83) + * Backslash false encoded [#124](https://github.com/yzane/vscode-markdown-pdf/issues/124) + * Errors in which 한글\(korean word\) is not properly printed [#148](https://github.com/yzane/vscode-markdown-pdf/issues/148) +* Fix: Improve the configuration schema of package.json + * Some settings can now be set from the settings editor. + ## 1.4.3 (2020/03/12) * Fix: markdown-include regular expression * Fix: Unable to export to pdf from markdown [#166](https://github.com/yzane/vscode-markdown-pdf/issues/166) diff --git a/README.ja.md b/README.ja.md index 07bca84..35b7e48 100644 --- a/README.ja.md +++ b/README.ja.md @@ -24,14 +24,13 @@ 以下の機能をサポートしています。 * [Syntax highlighting](https://highlightjs.org/static/demo/) -* [emoji](http://www.webpagefx.com/tools/emoji-cheat-sheet/) +* [emoji](https://www.webfx.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) * [markdown-it-include](https://github.com/camelaissani/markdown-it-include) -* [PlantUML](http://plantuml.com/) +* [PlantUML](https://plantuml.com/) * [markdown-it-plantuml](https://github.com/gmunguia/markdown-it-plantuml) -* [mermaid](http://knsv.github.io/mermaid/) - * [knsv/mermaid](https://github.com/knsv/mermaid) +* [mermaid](https://mermaid-js.github.io/mermaid/) サンプルファイル * [pdf](sample/README.pdf) @@ -180,44 +179,46 @@ Markdown PDF をインストールして、Visual Studio Code で Markdownファ ### List -|Category| Option name| -|:---|:---| -|[Save options](#save-options)|[markdown-pdf.type](#markdown-pdftype)| -||[markdown-pdf.convertOnSave](#markdown-pdfconvertonsave)| -||[markdown-pdf.convertOnSaveExclude](#markdown-pdfconvertonsaveexclude)| -||[markdown-pdf.outputDirectory](#markdown-pdfoutputdirectory)| -||[markdown-pdf.outputDirectoryRelativePathFile](#markdown-pdfoutputdirectoryrelativepathfile)| -|[Styles options](#styles-options)|[markdown-pdf.styles](#markdown-pdfstyles)| -||[markdown-pdf.stylesRelativePathFile](#markdown-pdfstylesrelativepathfile)| -||[markdown-pdf.includeDefaultStyles](#markdown-pdfincludedefaultstyles)| -|[Syntax highlight options](#syntax-highlight-options)|[markdown-pdf.highlight](#markdown-pdfhighlight)| -||[markdown-pdf.highlightStyle](#markdown-pdfhighlightstyle)| -|[Markdown options](#markdown-options)|[markdown-pdf.breaks](#markdown-pdfbreaks)| -|[Emoji options](#emoji-options)|[markdown-pdf.emoji](#markdown-pdfemoji)| -|[Configuration options](#configuration-options)|[markdown-pdf.executablePath](#markdown-pdfexecutablepath)| -|[Common Options](#common-options)|[markdown-pdf.scale](#markdown-pdfscale)| -|[PDF options](#pdf-options)|[markdown-pdf.displayHeaderFooter](#markdown-pdfdisplayheaderfooter)| -||[markdown-pdf.headerTemplate](#markdown-pdfheadertemplate)| -||[markdown-pdf.footerTemplate](#markdown-pdffootertemplate)| -||[markdown-pdf.printBackground](#markdown-pdfprintbackground)| -||[markdown-pdf.orientation](#markdown-pdforientation)| -||[markdown-pdf.pageRanges](#markdown-pdfpageranges)| -||[markdown-pdf.format](#markdown-pdfformat)| -||[markdown-pdf.width](#markdown-pdfwidth)| -||[markdown-pdf.height](#markdown-pdfheight)| -||[markdown-pdf.margin.top](#markdown-pdfmargintop)| -||[markdown-pdf.margin.bottom](#markdown-pdfmarginbottom)| -||[markdown-pdf.margin.right](#markdown-pdfmarginright)| -||[markdown-pdf.margin.left](#markdown-pdfmarginleft)| -|[PNG JPEG options](#png-jpeg-options)|[markdown-pdf.quality](#markdown-pdfquality)| -||[markdown-pdf.clip.x](#markdown-pdfclipx)| -||[markdown-pdf.clip.y](#markdown-pdfclipy)| -||[markdown-pdf.clip.width](#markdown-pdfclipwidth)| -||[markdown-pdf.clip.height](#markdown-pdfclipheight)| -||[markdown-pdf.omitBackground](#markdown-pdfomitbackground)| -|[PlantUML options](#plantuml-options)|[markdown-pdf.plantumlOpenMarker](#markdown-pdfplantumlopenmarker)| -||[markdown-pdf.plantumlCloseMarker](#markdown-pdfplantumlclosemarker)| -|[markdown-it-include options](#markdown-it-include-options)|[markdown-pdf.markdown-it-include.enable](#markdown-pdfmarkdown-it-includeenable)| +|Category|Option name|[Configuration scope](https://code.visualstudio.com/api/references/contribution-points#Configuration-property-schema)| +|:---|:---|:---| +|[Save options](#save-options)|[markdown-pdf.type](#markdown-pdftype)| | +||[markdown-pdf.convertOnSave](#markdown-pdfconvertonsave)| | +||[markdown-pdf.convertOnSaveExclude](#markdown-pdfconvertonsaveexclude)| | +||[markdown-pdf.outputDirectory](#markdown-pdfoutputdirectory)| | +||[markdown-pdf.outputDirectoryRelativePathFile](#markdown-pdfoutputdirectoryrelativepathfile)| | +|[Styles options](#styles-options)|[markdown-pdf.styles](#markdown-pdfstyles)| | +||[markdown-pdf.stylesRelativePathFile](#markdown-pdfstylesrelativepathfile)| | +||[markdown-pdf.includeDefaultStyles](#markdown-pdfincludedefaultstyles)| | +|[Syntax highlight options](#syntax-highlight-options)|[markdown-pdf.highlight](#markdown-pdfhighlight)| | +||[markdown-pdf.highlightStyle](#markdown-pdfhighlightstyle)| | +|[Markdown options](#markdown-options)|[markdown-pdf.breaks](#markdown-pdfbreaks)| | +|[Emoji options](#emoji-options)|[markdown-pdf.emoji](#markdown-pdfemoji)| | +|[Configuration options](#configuration-options)|[markdown-pdf.executablePath](#markdown-pdfexecutablepath)| | +|[Common Options](#common-options)|[markdown-pdf.scale](#markdown-pdfscale)| | +|[PDF options](#pdf-options)|[markdown-pdf.displayHeaderFooter](#markdown-pdfdisplayheaderfooter)|resource| +||[markdown-pdf.headerTemplate](#markdown-pdfheadertemplate)|resource| +||[markdown-pdf.footerTemplate](#markdown-pdffootertemplate)|resource| +||[markdown-pdf.printBackground](#markdown-pdfprintbackground)|resource| +||[markdown-pdf.orientation](#markdown-pdforientation)|resource| +||[markdown-pdf.pageRanges](#markdown-pdfpageranges)|resource| +||[markdown-pdf.format](#markdown-pdfformat)|resource| +||[markdown-pdf.width](#markdown-pdfwidth)|resource| +||[markdown-pdf.height](#markdown-pdfheight)|resource| +||[markdown-pdf.margin.top](#markdown-pdfmargintop)|resource| +||[markdown-pdf.margin.bottom](#markdown-pdfmarginbottom)|resource| +||[markdown-pdf.margin.right](#markdown-pdfmarginright)|resource| +||[markdown-pdf.margin.left](#markdown-pdfmarginleft)|resource| +|[PNG JPEG options](#png-jpeg-options)|[markdown-pdf.quality](#markdown-pdfquality)| | +||[markdown-pdf.clip.x](#markdown-pdfclipx)| | +||[markdown-pdf.clip.y](#markdown-pdfclipy)| | +||[markdown-pdf.clip.width](#markdown-pdfclipwidth)| | +||[markdown-pdf.clip.height](#markdown-pdfclipheight)| | +||[markdown-pdf.omitBackground](#markdown-pdfomitbackground)| | +|[PlantUML options](#plantuml-options)|[markdown-pdf.plantumlOpenMarker](#markdown-pdfplantumlopenmarker)| | +||[markdown-pdf.plantumlCloseMarker](#markdown-pdfplantumlclosemarker)| | +||[markdown-pdf.plantumlServer](#markdown-pdfplantumlserver)| | +|[markdown-it-include options](#markdown-it-include-options)|[markdown-pdf.markdown-it-include.enable](#markdown-pdfmarkdown-it-includeenable)| | +|[mermaid options](#mermaid-options)|[markdown-pdf.mermaidServer](#markdown-pdfmermaidserver)| | ### Save options @@ -503,12 +504,27 @@ Markdown PDF をインストールして、Visual Studio Code で Markdownファ - plantuml パーサーの終了区切り文字 - Default: @enduml +#### `markdown-pdf.plantumlServer` + - Plantuml server. e.g. http://localhost:8080 + - Default: http://www.plantuml.com/plantuml + - 例えば、PlantUMLサーバをローカルで実行するには次のようにします [#139](https://github.com/yzane/vscode-markdown-pdf/issues/139) : + ``` + docker run -d -p 8080:8080 plantuml/plantuml-server:jetty + ``` + [plantuml/plantuml-server - Docker Hub](https://hub.docker.com/r/plantuml/plantuml-server/) + ### markdown-it-include options #### `markdown-pdf.markdown-it-include.enable` - markdown-it-include を有効にします - boolean. Default: true +### mermaid options + +#### `markdown-pdf.mermaidServer` + - mermaid server + - Default: https://unpkg.com/mermaid/dist/mermaid.min.js +
## FAQ @@ -560,14 +576,24 @@ Visual Studio Code の `files.autoGuessEncoding` オプションを使うと、 ## [Release Notes](CHANGELOG.md) -### 1.4.3 (2020/03/12) -* Fix: markdown-include regular expression - * Fix: Unable to export to pdf from markdown [#166](https://github.com/yzane/vscode-markdown-pdf/issues/166) - * Fix: python code export err [#178](https://github.com/yzane/vscode-markdown-pdf/issues/178) -* Fix: Add support for Ubuntu and Centos - * Fix: Error: Failed to lanuch chrome! [#97](https://github.com/yzane/vscode-markdown-pdf/issues/97) - * Fix: I failed to launch chrome in WSL [#160](https://github.com/yzane/vscode-markdown-pdf/issues/160) - * Fix: Unable to export to pdf from markdown [#166](https://github.com/yzane/vscode-markdown-pdf/issues/166) +## 1.4.4 (2020/03/19) +* Change: mermaid javascript reads from URL instead of from local file + * Add: `markdown-pdf.mermaidServer` option + * add an option to disable mermaid [#175](https://github.com/yzane/vscode-markdown-pdf/issues/175) +* Add: `markdown-pdf.plantumlServer` option + * support configuration of plantUML server [#139](https://github.com/yzane/vscode-markdown-pdf/issues/139) +* Add: configuration scope + * extend setting 'headerTemplate' with scope\.\.\. [#184](https://github.com/yzane/vscode-markdown-pdf/pull/184) +* Update: [slug](https://github.com/yzane/vscode-markdown-pdf/commit/3f4aeaa724999c46fc37423d4b188fd7ce72ffce) for markdown-it-named-headers +* Update: markdown.css, markdown-pdf.css +* Update: dependent packages +* Fix: Fix for issue \#186 [#187](https://github.com/yzane/vscode-markdown-pdf/pull/187) +* Fix: move the Meiryo font to the end of the font-family setting + * Meiryo font causing \\ to show as Â¥ [#83](https://github.com/yzane/vscode-markdown-pdf/issues/83) + * Backslash false encoded [#124](https://github.com/yzane/vscode-markdown-pdf/issues/124) + * Errors in which 한글\(korean word\) is not properly printed [#148](https://github.com/yzane/vscode-markdown-pdf/issues/148) +* Fix: Improve the configuration schema of package.json + * Some settings can now be set from the settings editor. ## License @@ -588,7 +614,7 @@ MIT * [markdown-it/markdown-it-container](https://github.com/markdown-it/markdown-it-container) * [gmunguia/markdown-it-plantuml](https://github.com/gmunguia/markdown-it-plantuml) * [camelaissani/markdown-it-include](https://github.com/camelaissani/markdown-it-include) -* [knsv/mermaid](https://github.com/knsv/mermaid) +* [mermaid-js/mermaid](https://github.com/mermaid-js/mermaid) * [jonschlinkert/gray-matter](https://github.com/jonschlinkert/gray-matter) and diff --git a/README.md b/README.md index 3214210..1fc5fc2 100644 --- a/README.md +++ b/README.md @@ -26,14 +26,13 @@ This extension converts Markdown files to pdf, html, png or jpeg files. Supports the following features * [Syntax highlighting](https://highlightjs.org/static/demo/) -* [emoji](http://www.webpagefx.com/tools/emoji-cheat-sheet/) +* [emoji](https://www.webfx.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) * [markdown-it-include](https://github.com/camelaissani/markdown-it-include) -* [PlantUML](http://plantuml.com/) +* [PlantUML](https://plantuml.com/) * [markdown-it-plantuml](https://github.com/gmunguia/markdown-it-plantuml) -* [mermaid](http://knsv.github.io/mermaid/) - * [knsv/mermaid](https://github.com/knsv/mermaid) +* [mermaid](https://mermaid-js.github.io/mermaid/) Sample files * [pdf](sample/README.pdf) @@ -183,44 +182,46 @@ If the download is not successful or you want to avoid downloading every time yo ### List -|Category| Option name| -|:---|:---| -|[Save options](#save-options)|[markdown-pdf.type](#markdown-pdftype)| -||[markdown-pdf.convertOnSave](#markdown-pdfconvertonsave)| -||[markdown-pdf.convertOnSaveExclude](#markdown-pdfconvertonsaveexclude)| -||[markdown-pdf.outputDirectory](#markdown-pdfoutputdirectory)| -||[markdown-pdf.outputDirectoryRelativePathFile](#markdown-pdfoutputdirectoryrelativepathfile)| -|[Styles options](#styles-options)|[markdown-pdf.styles](#markdown-pdfstyles)| -||[markdown-pdf.stylesRelativePathFile](#markdown-pdfstylesrelativepathfile)| -||[markdown-pdf.includeDefaultStyles](#markdown-pdfincludedefaultstyles)| -|[Syntax highlight options](#syntax-highlight-options)|[markdown-pdf.highlight](#markdown-pdfhighlight)| -||[markdown-pdf.highlightStyle](#markdown-pdfhighlightstyle)| -|[Markdown options](#markdown-options)|[markdown-pdf.breaks](#markdown-pdfbreaks)| -|[Emoji options](#emoji-options)|[markdown-pdf.emoji](#markdown-pdfemoji)| -|[Configuration options](#configuration-options)|[markdown-pdf.executablePath](#markdown-pdfexecutablepath)| -|[Common Options](#common-options)|[markdown-pdf.scale](#markdown-pdfscale)| -|[PDF options](#pdf-options)|[markdown-pdf.displayHeaderFooter](#markdown-pdfdisplayheaderfooter)| -||[markdown-pdf.headerTemplate](#markdown-pdfheadertemplate)| -||[markdown-pdf.footerTemplate](#markdown-pdffootertemplate)| -||[markdown-pdf.printBackground](#markdown-pdfprintbackground)| -||[markdown-pdf.orientation](#markdown-pdforientation)| -||[markdown-pdf.pageRanges](#markdown-pdfpageranges)| -||[markdown-pdf.format](#markdown-pdfformat)| -||[markdown-pdf.width](#markdown-pdfwidth)| -||[markdown-pdf.height](#markdown-pdfheight)| -||[markdown-pdf.margin.top](#markdown-pdfmargintop)| -||[markdown-pdf.margin.bottom](#markdown-pdfmarginbottom)| -||[markdown-pdf.margin.right](#markdown-pdfmarginright)| -||[markdown-pdf.margin.left](#markdown-pdfmarginleft)| -|[PNG JPEG options](#png-jpeg-options)|[markdown-pdf.quality](#markdown-pdfquality)| -||[markdown-pdf.clip.x](#markdown-pdfclipx)| -||[markdown-pdf.clip.y](#markdown-pdfclipy)| -||[markdown-pdf.clip.width](#markdown-pdfclipwidth)| -||[markdown-pdf.clip.height](#markdown-pdfclipheight)| -||[markdown-pdf.omitBackground](#markdown-pdfomitbackground)| -|[PlantUML options](#plantuml-options)|[markdown-pdf.plantumlOpenMarker](#markdown-pdfplantumlopenmarker)| -||[markdown-pdf.plantumlCloseMarker](#markdown-pdfplantumlclosemarker)| -|[markdown-it-include options](#markdown-it-include-options)|[markdown-pdf.markdown-it-include.enable](#markdown-pdfmarkdown-it-includeenable)| +|Category|Option name|[Configuration scope](https://code.visualstudio.com/api/references/contribution-points#Configuration-property-schema)| +|:---|:---|:---| +|[Save options](#save-options)|[markdown-pdf.type](#markdown-pdftype)| | +||[markdown-pdf.convertOnSave](#markdown-pdfconvertonsave)| | +||[markdown-pdf.convertOnSaveExclude](#markdown-pdfconvertonsaveexclude)| | +||[markdown-pdf.outputDirectory](#markdown-pdfoutputdirectory)| | +||[markdown-pdf.outputDirectoryRelativePathFile](#markdown-pdfoutputdirectoryrelativepathfile)| | +|[Styles options](#styles-options)|[markdown-pdf.styles](#markdown-pdfstyles)| | +||[markdown-pdf.stylesRelativePathFile](#markdown-pdfstylesrelativepathfile)| | +||[markdown-pdf.includeDefaultStyles](#markdown-pdfincludedefaultstyles)| | +|[Syntax highlight options](#syntax-highlight-options)|[markdown-pdf.highlight](#markdown-pdfhighlight)| | +||[markdown-pdf.highlightStyle](#markdown-pdfhighlightstyle)| | +|[Markdown options](#markdown-options)|[markdown-pdf.breaks](#markdown-pdfbreaks)| | +|[Emoji options](#emoji-options)|[markdown-pdf.emoji](#markdown-pdfemoji)| | +|[Configuration options](#configuration-options)|[markdown-pdf.executablePath](#markdown-pdfexecutablepath)| | +|[Common Options](#common-options)|[markdown-pdf.scale](#markdown-pdfscale)| | +|[PDF options](#pdf-options)|[markdown-pdf.displayHeaderFooter](#markdown-pdfdisplayheaderfooter)|resource| +||[markdown-pdf.headerTemplate](#markdown-pdfheadertemplate)|resource| +||[markdown-pdf.footerTemplate](#markdown-pdffootertemplate)|resource| +||[markdown-pdf.printBackground](#markdown-pdfprintbackground)|resource| +||[markdown-pdf.orientation](#markdown-pdforientation)|resource| +||[markdown-pdf.pageRanges](#markdown-pdfpageranges)|resource| +||[markdown-pdf.format](#markdown-pdfformat)|resource| +||[markdown-pdf.width](#markdown-pdfwidth)|resource| +||[markdown-pdf.height](#markdown-pdfheight)|resource| +||[markdown-pdf.margin.top](#markdown-pdfmargintop)|resource| +||[markdown-pdf.margin.bottom](#markdown-pdfmarginbottom)|resource| +||[markdown-pdf.margin.right](#markdown-pdfmarginright)|resource| +||[markdown-pdf.margin.left](#markdown-pdfmarginleft)|resource| +|[PNG JPEG options](#png-jpeg-options)|[markdown-pdf.quality](#markdown-pdfquality)| | +||[markdown-pdf.clip.x](#markdown-pdfclipx)| | +||[markdown-pdf.clip.y](#markdown-pdfclipy)| | +||[markdown-pdf.clip.width](#markdown-pdfclipwidth)| | +||[markdown-pdf.clip.height](#markdown-pdfclipheight)| | +||[markdown-pdf.omitBackground](#markdown-pdfomitbackground)| | +|[PlantUML options](#plantuml-options)|[markdown-pdf.plantumlOpenMarker](#markdown-pdfplantumlopenmarker)| | +||[markdown-pdf.plantumlCloseMarker](#markdown-pdfplantumlclosemarker)| | +||[markdown-pdf.plantumlServer](#markdown-pdfplantumlserver)| | +|[markdown-it-include options](#markdown-it-include-options)|[markdown-pdf.markdown-it-include.enable](#markdown-pdfmarkdown-it-includeenable)| | +|[mermaid options](#mermaid-options)|[markdown-pdf.mermaidServer](#markdown-pdfmermaidserver)| | ### Save options @@ -509,12 +510,27 @@ If the download is not successful or you want to avoid downloading every time yo - Closing delimiter used for the plantuml parser. - Default: @enduml +#### `markdown-pdf.plantumlServer` + - Plantuml server. e.g. http://localhost:8080 + - Default: http://www.plantuml.com/plantuml + - For example, to run Plantuml Server locally [#139](https://github.com/yzane/vscode-markdown-pdf/issues/139) : + ``` + docker run -d -p 8080:8080 plantuml/plantuml-server:jetty + ``` + [plantuml/plantuml-server - Docker Hub](https://hub.docker.com/r/plantuml/plantuml-server/) + ### markdown-it-include options #### `markdown-pdf.markdown-it-include.enable` - Enable markdown-it-include. - boolean. Default: true +### mermaid options + +#### `markdown-pdf.mermaidServer` + - mermaid server + - Default: https://unpkg.com/mermaid/dist/mermaid.min.js +
## FAQ @@ -566,14 +582,24 @@ Please use the following to insert a page break. ## [Release Notes](CHANGELOG.md) -### 1.4.3 (2020/03/12) -* Fix: markdown-include regular expression - * Fix: Unable to export to pdf from markdown [#166](https://github.com/yzane/vscode-markdown-pdf/issues/166) - * Fix: python code export err [#178](https://github.com/yzane/vscode-markdown-pdf/issues/178) -* Fix: Add support for Ubuntu and Centos - * Fix: Error: Failed to lanuch chrome! [#97](https://github.com/yzane/vscode-markdown-pdf/issues/97) - * Fix: I failed to launch chrome in WSL [#160](https://github.com/yzane/vscode-markdown-pdf/issues/160) - * Fix: Unable to export to pdf from markdown [#166](https://github.com/yzane/vscode-markdown-pdf/issues/166) +### 1.4.4 (2020/03/19) +* Change: mermaid javascript reads from URL instead of from local file + * Add: `markdown-pdf.mermaidServer` option + * add an option to disable mermaid [#175](https://github.com/yzane/vscode-markdown-pdf/issues/175) +* Add: `markdown-pdf.plantumlServer` option + * support configuration of plantUML server [#139](https://github.com/yzane/vscode-markdown-pdf/issues/139) +* Add: configuration scope + * extend setting 'headerTemplate' with scope\.\.\. [#184](https://github.com/yzane/vscode-markdown-pdf/pull/184) +* Update: [slug](https://github.com/yzane/vscode-markdown-pdf/commit/3f4aeaa724999c46fc37423d4b188fd7ce72ffce) for markdown-it-named-headers +* Update: markdown.css, markdown-pdf.css +* Update: dependent packages +* Fix: Fix for issue \#186 [#187](https://github.com/yzane/vscode-markdown-pdf/pull/187) +* Fix: move the Meiryo font to the end of the font-family setting + * Meiryo font causing \\ to show as Â¥ [#83](https://github.com/yzane/vscode-markdown-pdf/issues/83) + * Backslash false encoded [#124](https://github.com/yzane/vscode-markdown-pdf/issues/124) + * Errors in which 한글\(korean word\) is not properly printed [#148](https://github.com/yzane/vscode-markdown-pdf/issues/148) +* Fix: Improve the configuration schema of package.json + * Some settings can now be set from the settings editor. ## License @@ -594,7 +620,7 @@ MIT * [markdown-it/markdown-it-container](https://github.com/markdown-it/markdown-it-container) * [gmunguia/markdown-it-plantuml](https://github.com/gmunguia/markdown-it-plantuml) * [camelaissani/markdown-it-include](https://github.com/camelaissani/markdown-it-include) -* [knsv/mermaid](https://github.com/knsv/mermaid) +* [mermaid-js/mermaid](https://github.com/mermaid-js/mermaid) * [jonschlinkert/gray-matter](https://github.com/jonschlinkert/gray-matter) and diff --git a/extension.js b/extension.js index 65ca5eb..23978ef 100644 --- a/extension.js +++ b/extension.js @@ -270,7 +270,8 @@ function convertMarkdownToHtml(filename, type, text) { // https://github.com/gmunguia/markdown-it-plantuml var plantumlOptions = { openMarker: matterParts.data.plantumlOpenMarker || vscode.workspace.getConfiguration('markdown-pdf')['plantumlOpenMarker'] || '@startuml', - closeMarker: matterParts.data.plantumlCloseMarker || vscode.workspace.getConfiguration('markdown-pdf')['plantumlCloseMarker'] || '@enduml' + closeMarker: matterParts.data.plantumlCloseMarker || vscode.workspace.getConfiguration('markdown-pdf')['plantumlCloseMarker'] || '@enduml', + server: vscode.workspace.getConfiguration('markdown-pdf')['plantumlServer'] || '' } md.use(require('markdown-it-plantuml'), plantumlOptions); @@ -295,17 +296,18 @@ function convertMarkdownToHtml(filename, type, text) { } /* - * https://github.com/Microsoft/vscode/blob/b3a1b98d54e2f7293d6f018c97df30d07a6c858f/extensions/markdown/src/markdownEngine.ts - * https://github.com/Microsoft/vscode/blob/b3a1b98d54e2f7293d6f018c97df30d07a6c858f/extensions/markdown/src/tableOfContentsProvider.ts + * https://github.com/microsoft/vscode/blob/ca4ceeb87d4ff935c52a7af0671ed9779657e7bd/extensions/markdown-language-features/src/slugify.ts#L26 */ function Slug(string) { try { - var stg = encodeURI(string.trim() - .toLowerCase() - .replace(/[\]\[\!\"\#\$\%\&\'\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\_\{\|\}\~\`]/g, '') - .replace(/\s+/g, '-') - .replace(/^\-+/, '') - .replace(/\-+$/, '')); + var stg = encodeURI( + string.trim() + .toLowerCase() + .replace(/\s+/g, '-') // Replace whitespace with - + .replace(/[\]\[\!\'\#\$\%\&\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\_\{\|\}\~\`。，、；：？！…—·ˉ¨‘’“”々～‖∶＂＇｀｜〃〔〕〈〉《》「」『』．〖〗【】（）［］｛｝]/g, '') // Remove known punctuators + .replace(/^\-+/, '') // Remove leading - + .replace(/\-+$/, '') // Remove trailing - + ); return stg; } catch (error) { showErrorMessage('Slug()', error); @@ -328,8 +330,9 @@ function makeHtml(data, uri) { var filename = path.join(__dirname, 'template', 'template.html'); var template = readFile(filename); - // read mermaid javascripts - var mermaid = readFile(path.join(__dirname, 'node_modules', 'mermaid', 'dist', 'mermaid.min.js')); + // read mermaid javascripts + var mermaidServer = vscode.workspace.getConfiguration('markdown-pdf')['mermaidServer'] || ''; + var mermaid = ''; // compile template var mustache = require('mustache'); @@ -395,7 +398,7 @@ function exportPdf(data, filename, type, uri) { exportHtml(data, tmpfilename); var options = { executablePath: vscode.workspace.getConfiguration('markdown-pdf')['executablePath'] || puppeteer.executablePath(), - args: ['--lang='+vscode.env.langauage, '--no-sandbox', '--disable-setuid-sandbox'] + args: ['--lang='+vscode.env.language, '--no-sandbox', '--disable-setuid-sandbox'] // Setting Up Chrome Linux Sandbox // https://github.com/puppeteer/puppeteer/blob/master/docs/troubleshooting.md#setting-up-chrome-linux-sandbox }; @@ -407,35 +410,35 @@ function exportPdf(data, filename, type, uri) { if (type == 'pdf') { // If width or height option is set, it overrides the format option. // In order to set the default value of page size to A4, we changed it from the specification of puppeteer. - var width_option = vscode.workspace.getConfiguration('markdown-pdf')['width'] || ''; - var height_option = vscode.workspace.getConfiguration('markdown-pdf')['height'] || ''; + var width_option = vscode.workspace.getConfiguration('markdown-pdf', uri)['width'] || ''; + var height_option = vscode.workspace.getConfiguration('markdown-pdf', uri)['height'] || ''; var format_option = ''; if (!width_option && !height_option) { - format_option = vscode.workspace.getConfiguration('markdown-pdf')['format'] || 'A4'; + format_option = vscode.workspace.getConfiguration('markdown-pdf', uri)['format'] || 'A4'; } var landscape_option; - if (vscode.workspace.getConfiguration('markdown-pdf')['orientation'] == 'landscape') { + if (vscode.workspace.getConfiguration('markdown-pdf', uri)['orientation'] == 'landscape') { landscape_option = true; } else { landscape_option = false; } var options = { path: exportFilename, - scale: vscode.workspace.getConfiguration('markdown-pdf')['scale'], - displayHeaderFooter: vscode.workspace.getConfiguration('markdown-pdf')['displayHeaderFooter'], - headerTemplate: vscode.workspace.getConfiguration('markdown-pdf')['headerTemplate'] || '', - footerTemplate: vscode.workspace.getConfiguration('markdown-pdf')['footerTemplate'] || '', - printBackground: vscode.workspace.getConfiguration('markdown-pdf')['printBackground'], + scale: vscode.workspace.getConfiguration('markdown-pdf', uri)['scale'], + displayHeaderFooter: vscode.workspace.getConfiguration('markdown-pdf', uri)['displayHeaderFooter'], + headerTemplate: vscode.workspace.getConfiguration('markdown-pdf', uri)['headerTemplate'] || '', + footerTemplate: vscode.workspace.getConfiguration('markdown-pdf', uri)['footerTemplate'] || '', + printBackground: vscode.workspace.getConfiguration('markdown-pdf', uri)['printBackground'], landscape: landscape_option, - pageRanges: vscode.workspace.getConfiguration('markdown-pdf')['pageRanges'] || '', + pageRanges: vscode.workspace.getConfiguration('markdown-pdf', uri)['pageRanges'] || '', format: format_option, - width: vscode.workspace.getConfiguration('markdown-pdf')['width'] || '', - height: vscode.workspace.getConfiguration('markdown-pdf')['height'] || '', + width: vscode.workspace.getConfiguration('markdown-pdf', uri)['width'] || '', + height: vscode.workspace.getConfiguration('markdown-pdf', uri)['height'] || '', margin: { - top: vscode.workspace.getConfiguration('markdown-pdf')['margin']['top'] || '', - right: vscode.workspace.getConfiguration('markdown-pdf')['margin']['right'] || '', - bottom: vscode.workspace.getConfiguration('markdown-pdf')['margin']['bottom'] || '', - left: vscode.workspace.getConfiguration('markdown-pdf')['margin']['left'] || '' + top: vscode.workspace.getConfiguration('markdown-pdf', uri)['margin']['top'] || '', + right: vscode.workspace.getConfiguration('markdown-pdf', uri)['margin']['right'] || '', + bottom: vscode.workspace.getConfiguration('markdown-pdf', uri)['margin']['bottom'] || '', + left: vscode.workspace.getConfiguration('markdown-pdf', uri)['margin']['left'] || '' } } await page.pdf(options); diff --git a/package-lock.json b/package-lock.json index 6b7aba1..b75d63e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,9 @@ { "name": "markdown-pdf", - "version": "1.4.3", + "version": "1.4.4", "lockfileVersion": 1, "requires": true, "dependencies": { - "@braintree/sanitize-url": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz", - "integrity": "sha512-GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg==" - }, "@types/mime-types": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz", @@ -73,6 +68,16 @@ "color-convert": "^1.9.0" } }, + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -133,6 +138,12 @@ "tweetnacl": "^0.14.3" } }, + "binary-extensions": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", + "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", + "dev": true + }, "boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", @@ -147,6 +158,15 @@ "concat-map": "0.0.1" } }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, "browser-stdout": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", @@ -158,15 +178,6 @@ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, - "camel-case": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", - "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", - "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.1.1" - } - }, "camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", @@ -214,12 +225,20 @@ "lodash": "^4.1.0" } }, - "clean-css": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz", - "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==", + "chokidar": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz", + "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==", + "dev": true, "requires": { - "source-map": "~0.6.0" + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.1", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.2.0" } }, "cliui": { @@ -345,19 +364,6 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, - "crypto-random-string": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-3.2.0.tgz", - "integrity": "sha512-8vPu5bsKaq2uKRy3OL7h1Oo7RayAWB8sYexLKAqvCXVib8SxgbmoF1IN4QMKjBv8uI8mp5gPPMbiRah25GMrVQ==", - "requires": { - "type-fest": "^0.8.1" - } - }, - "css-b64-images": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/css-b64-images/-/css-b64-images-0.2.5.tgz", - "integrity": "sha1-QgBdgyBLK0pdk7axpWRBM7WSegI=" - }, "css-select": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", @@ -467,14 +473,6 @@ "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.0.3.tgz", "integrity": "sha1-vHZD/KjlOoNH4vva/6I2eWtYUJs=" }, - "d3-contour": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-1.3.2.tgz", - "integrity": "sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==", - "requires": { - "d3-array": "^1.1.1" - } - }, "d3-dispatch": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.3.tgz", @@ -504,14 +502,6 @@ "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.3.tgz", "integrity": "sha1-aL+8NJM4o4DETYrMT7wzBKotjA4=" }, - "d3-fetch": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-1.1.2.tgz", - "integrity": "sha512-S2loaQCV/ZeyTyIF2oP8D1K9Z4QizUzW7cWeAOAS4U88qOt3Ucf6GsmgthuYSdyB2HyEm4CeGvkQxWsmInsIVA==", - "requires": { - "d3-dsv": "1" - } - }, "d3-force": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.1.0.tgz", @@ -599,15 +589,6 @@ "d3-time-format": "2" } }, - "d3-scale-chromatic": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz", - "integrity": "sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==", - "requires": { - "d3-color": "1", - "d3-interpolate": "1" - } - }, "d3-selection": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.3.0.tgz", @@ -669,79 +650,6 @@ "d3-transition": "1" } }, - "dagre": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/dagre/-/dagre-0.8.5.tgz", - "integrity": "sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw==", - "requires": { - "graphlib": "^2.1.8", - "lodash": "^4.17.15" - } - }, - "dagre-d3": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/dagre-d3/-/dagre-d3-0.6.4.tgz", - "integrity": "sha512-e/6jXeCP7/ptlAM48clmX4xTZc5Ek6T6kagS7Oz2HrYSdqcLZFLqpAfh7ldbZRFfxCZVyh61NEPR08UQRVxJzQ==", - "requires": { - "d3": "^5.14", - "dagre": "^0.8.5", - "graphlib": "^2.1.8", - "lodash": "^4.17.15" - }, - "dependencies": { - "d3": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/d3/-/d3-5.15.0.tgz", - "integrity": "sha512-C+E80SL2nLLtmykZ6klwYj5rPqB5nlfN5LdWEAVdWPppqTD8taoJi2PxLZjPeYT8FFRR2yucXq+kBlOnnvZeLg==", - "requires": { - "d3-array": "1", - "d3-axis": "1", - "d3-brush": "1", - "d3-chord": "1", - "d3-collection": "1", - "d3-color": "1", - "d3-contour": "1", - "d3-dispatch": "1", - "d3-drag": "1", - "d3-dsv": "1", - "d3-ease": "1", - "d3-fetch": "1", - "d3-force": "1", - "d3-format": "1", - "d3-geo": "1", - "d3-hierarchy": "1", - "d3-interpolate": "1", - "d3-path": "1", - "d3-polygon": "1", - "d3-quadtree": "1", - "d3-random": "1", - "d3-scale": "2", - "d3-scale-chromatic": "1", - "d3-selection": "1", - "d3-shape": "1", - "d3-time": "1", - "d3-time-format": "2", - "d3-timer": "1", - "d3-transition": "1", - "d3-voronoi": "1", - "d3-zoom": "1" - } - }, - "d3-scale": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-2.2.2.tgz", - "integrity": "sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==", - "requires": { - "d3-array": "^1.2.0", - "d3-collection": "1", - "d3-format": "1", - "d3-interpolate": "1", - "d3-time": "1", - "d3-time-format": "2" - } - } - } - }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -752,9 +660,10 @@ } }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, "requires": { "ms": "^2.1.1" } @@ -900,11 +809,6 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, - "escaper": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/escaper/-/escaper-2.5.3.tgz", - "integrity": "sha512-QGb9sFxBVpbzMggrKTX0ry1oiI4CSDAl9vIL702hzl1jGW8VZs7qfqTRX7WDOjoNDoEVGcEtu1ZOQgReSfT2kQ==" - }, "escodegen": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz", @@ -968,6 +872,19 @@ "ms": "2.0.0" } }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "requires": { + "minimist": "0.0.8" + } + }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -1007,6 +924,15 @@ "pend": "~1.2.0" } }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, "find-up": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", @@ -1047,6 +973,13 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "fsevents": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", + "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", + "dev": true, + "optional": true + }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -1081,12 +1014,13 @@ "path-is-absolute": "^1.0.0" } }, - "graphlib": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.8.tgz", - "integrity": "sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==", + "glob-parent": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", + "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", + "dev": true, "requires": { - "lodash": "^4.17.15" + "is-glob": "^4.0.1" } }, "gray-matter": { @@ -1146,27 +1080,14 @@ "he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true }, "highlight.js": { "version": "9.18.1", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz", "integrity": "sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==" }, - "html-minifier": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz", - "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==", - "requires": { - "camel-case": "^3.0.0", - "clean-css": "^4.2.1", - "commander": "^2.19.0", - "he": "^1.2.0", - "param-case": "^2.1.1", - "relateurl": "^0.2.7", - "uglify-js": "^3.5.1" - } - }, "htmlparser2": { "version": "3.8.3", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", @@ -1240,6 +1161,16 @@ "requires": { "agent-base": "5", "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + } } }, "iconv-lite": { @@ -1264,6 +1195,15 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, "is-buffer": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", @@ -1287,12 +1227,33 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, + "is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, "is-regex": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", @@ -1302,11 +1263,6 @@ "has": "^1.0.3" } }, - "is-regexp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", - "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=" - }, "is-symbol": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", @@ -1446,19 +1402,14 @@ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "log-symbols": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", - "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", + "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", "dev": true, "requires": { - "chalk": "^2.0.1" + "chalk": "^2.4.2" } }, - "lower-case": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", - "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=" - }, "markdown-it": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz", @@ -1519,77 +1470,6 @@ "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=" }, - "mermaid": { - "version": "8.4.8", - "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.4.8.tgz", - "integrity": "sha512-sumTNBFwMX7oMQgogdr3NhgTeQOiwcEsm23rQ4KHGW7tpmvMwER1S+1gjCSSnqlmM/zw7Ga7oesYCYicKboRwQ==", - "requires": { - "@braintree/sanitize-url": "^3.1.0", - "crypto-random-string": "^3.0.1", - "d3": "^5.7.0", - "dagre": "^0.8.4", - "dagre-d3": "^0.6.4", - "graphlib": "^2.1.7", - "he": "^1.2.0", - "lodash": "^4.17.11", - "minify": "^4.1.1", - "moment-mini": "^2.22.1", - "scope-css": "^1.2.1" - }, - "dependencies": { - "d3": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/d3/-/d3-5.15.0.tgz", - "integrity": "sha512-C+E80SL2nLLtmykZ6klwYj5rPqB5nlfN5LdWEAVdWPppqTD8taoJi2PxLZjPeYT8FFRR2yucXq+kBlOnnvZeLg==", - "requires": { - "d3-array": "1", - "d3-axis": "1", - "d3-brush": "1", - "d3-chord": "1", - "d3-collection": "1", - "d3-color": "1", - "d3-contour": "1", - "d3-dispatch": "1", - "d3-drag": "1", - "d3-dsv": "1", - "d3-ease": "1", - "d3-fetch": "1", - "d3-force": "1", - "d3-format": "1", - "d3-geo": "1", - "d3-hierarchy": "1", - "d3-interpolate": "1", - "d3-path": "1", - "d3-polygon": "1", - "d3-quadtree": "1", - "d3-random": "1", - "d3-scale": "2", - "d3-scale-chromatic": "1", - "d3-selection": "1", - "d3-shape": "1", - "d3-time": "1", - "d3-time-format": "2", - "d3-timer": "1", - "d3-transition": "1", - "d3-voronoi": "1", - "d3-zoom": "1" - } - }, - "d3-scale": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-2.2.2.tgz", - "integrity": "sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==", - "requires": { - "d3-array": "^1.2.0", - "d3-collection": "1", - "d3-format": "1", - "d3-interpolate": "1", - "d3-time": "1", - "d3-time-format": "2" - } - } - } - }, "mime": { "version": "2.4.4", "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", @@ -1608,20 +1488,6 @@ "mime-db": "1.43.0" } }, - "minify": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/minify/-/minify-4.1.3.tgz", - "integrity": "sha512-ykuscavxivSmVpcCzsXmsVTukWYLUUtPhHj0w2ILvHDGqC+hsuTCihBn9+PJBd58JNvWTNg9132J9nrrI2anzA==", - "requires": { - "clean-css": "^4.1.6", - "css-b64-images": "~0.2.5", - "debug": "^4.1.0", - "html-minifier": "^4.0.0", - "terser": "^4.0.0", - "try-catch": "^2.0.0", - "try-to-catch": "^1.0.2" - } - }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -1631,26 +1497,25 @@ } }, "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true }, "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "requires": { - "minimist": "0.0.8" - } + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz", + "integrity": "sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==" }, "mocha": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.2.tgz", - "integrity": "sha512-FgDS9Re79yU1xz5d+C4rv1G7QagNGHZ+iXF81hO8zY35YZZcLEsJVfFolfsqKFWunATEvNzMK0r/CwWd/szO9A==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.1.1.tgz", + "integrity": "sha512-3qQsu3ijNS3GkWcccT5Zw0hf/rWvu1fTN9sPvEd81hlwsr30GX2GcDSSoBxo24IR8FelmrAydGC6/1J5QQP4WA==", "dev": true, "requires": { "ansi-colors": "3.2.3", "browser-stdout": "1.3.1", + "chokidar": "3.3.0", "debug": "3.2.6", "diff": "3.5.0", "escape-string-regexp": "1.0.5", @@ -1659,30 +1524,21 @@ "growl": "1.10.5", "he": "1.2.0", "js-yaml": "3.13.1", - "log-symbols": "2.2.0", + "log-symbols": "3.0.0", "minimatch": "3.0.4", - "mkdirp": "0.5.1", + "mkdirp": "0.5.3", "ms": "2.1.1", - "node-environment-flags": "1.0.5", + "node-environment-flags": "1.0.6", "object.assign": "4.1.0", "strip-json-comments": "2.0.1", "supports-color": "6.0.0", "which": "1.3.1", "wide-align": "1.1.3", - "yargs": "13.3.0", - "yargs-parser": "13.1.1", + "yargs": "13.3.2", + "yargs-parser": "13.1.2", "yargs-unparser": "1.6.0" }, "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, "glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", @@ -1697,47 +1553,43 @@ "path-is-absolute": "^1.0.0" } }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true + "mkdirp": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz", + "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } } } }, - "moment-mini": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/moment-mini/-/moment-mini-2.24.0.tgz", - "integrity": "sha512-9ARkWHBs+6YJIvrIp0Ik5tyTTtP9PoV0Ssu2Ocq5y9v8+NOOpWiRshAp8c4rZVWTOe+157on/5G+zj5pwIQFEQ==" - }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" }, "mustache": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/mustache/-/mustache-3.2.1.tgz", - "integrity": "sha512-RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA==" - }, - "no-case": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", - "requires": { - "lower-case": "^1.1.1" - } + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.0.1.tgz", + "integrity": "sha512-yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA==" }, "node-environment-flags": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz", - "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz", + "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==", "dev": true, "requires": { "object.getownpropertydescriptors": "^2.0.3", "semver": "^5.7.0" } }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + }, "nth-check": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", @@ -1838,14 +1690,6 @@ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, - "param-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", - "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", - "requires": { - "no-case": "^2.2.0" - } - }, "parse5": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz", @@ -1874,6 +1718,12 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "optional": true }, + "picomatch": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz", + "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==", + "dev": true + }, "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", @@ -1924,6 +1774,14 @@ "ws": "^6.1.0" }, "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, "rimraf": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", @@ -1951,10 +1809,14 @@ "string_decoder": "~0.10.x" } }, - "relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=" + "readdirp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz", + "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==", + "dev": true, + "requires": { + "picomatch": "^2.0.4" + } }, "removeNPMAbsolutePaths": { "version": "2.0.0", @@ -2032,16 +1894,6 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "optional": true }, - "scope-css": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/scope-css/-/scope-css-1.2.1.tgz", - "integrity": "sha512-UjLRmyEYaDNiOS673xlVkZFlVCtckJR/dKgr434VMm7Lb+AOOqXKdAcY7PpGlJYErjXXJzKN7HWo4uRPiZZG0Q==", - "requires": { - "escaper": "^2.5.3", - "slugify": "^1.3.1", - "strip-css-comments": "^3.0.0" - } - }, "section-matter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz", @@ -2063,24 +1915,11 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true }, - "slugify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.4.0.tgz", - "integrity": "sha512-FtLNsMGBSRB/0JOE2A0fxlqjI6fJsgHGS13iTuVT28kViI4JjUiNqp/vyis0ZXYcMnpR3fzGNkv+6vRlI2GwdQ==" - }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "source-map-support": { - "version": "0.5.16", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz", - "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==", - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "optional": true }, "sprintf-js": { "version": "1.0.3", @@ -2158,14 +1997,6 @@ "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz", "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=" }, - "strip-css-comments": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-css-comments/-/strip-css-comments-3.0.0.tgz", - "integrity": "sha1-elYl7/iisibPiUehElTaluE9rok=", - "requires": { - "is-regexp": "^1.0.0" - } - }, "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", @@ -2187,14 +2018,13 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", "optional": true }, - "terser": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.6.tgz", - "integrity": "sha512-4lYPyeNmstjIIESr/ysHg2vUPRGf2tzF9z2yYwnowXVuVzLEamPN1Gfrz7f8I9uEPuHcbFlW4PLIAsJoxXyJ1g==", + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, "requires": { - "commander": "^2.20.0", - "source-map": "~0.6.1", - "source-map-support": "~0.5.12" + "is-number": "^7.0.0" } }, "tough-cookie": { @@ -2213,16 +2043,6 @@ "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", "optional": true }, - "try-catch": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/try-catch/-/try-catch-2.0.1.tgz", - "integrity": "sha512-LsOrmObN/2WdM+y2xG+t16vhYrQsnV8wftXIcIOWZhQcBJvKGYuamJGwnU98A7Jxs2oZNkJztXlphEOoA0DWqg==" - }, - "try-to-catch": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/try-to-catch/-/try-to-catch-1.1.1.tgz", - "integrity": "sha512-ikUlS+/BcImLhNYyIgZcEmq4byc31QpC+46/6Jm5ECWkVFhf8SM2Fp/0pMVXPX6vk45SMCwrP4Taxucne8I0VA==" - }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -2247,11 +2067,6 @@ "prelude-ls": "~1.1.2" } }, - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" - }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", @@ -2262,25 +2077,11 @@ "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==" }, - "uglify-js": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz", - "integrity": "sha512-ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ==", - "requires": { - "commander": "~2.20.3", - "source-map": "~0.6.1" - } - }, "underscore": { "version": "1.9.2", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz", "integrity": "sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ==" }, - "upper-case": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=" - }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", @@ -2332,15 +2133,6 @@ "es6-promisify": "^5.0.0" } }, - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, "https-proxy-agent": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz", @@ -2477,9 +2269,9 @@ "dev": true }, "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", "dev": true, "requires": { "cliui": "^5.0.0", @@ -2491,7 +2283,7 @@ "string-width": "^3.0.0", "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" + "yargs-parser": "^13.1.2" }, "dependencies": { "ansi-regex": { @@ -2523,9 +2315,9 @@ } }, "yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", "dev": true, "requires": { "camelcase": "^5.0.0", diff --git a/package.json b/package.json index ae86fe3..3cbebb0 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "markdown-pdf", "displayName": "Markdown PDF", "description": "Convert Markdown to PDF", - "version": "1.4.3", + "version": "1.4.4", "publisher": "yzane", "icon": "images/icon.png", "engines": { @@ -132,13 +132,13 @@ "title": "Markdown PDF", "properties": { "markdown-pdf.type": { - "type": [ - "array", - "string" - ], + "type": "array", "default": [ "pdf" ], + "items": { + "type": "string" + }, "description": "Output format: pdf, html, png, jpeg. Multiple output formats support" }, "markdown-pdf.convertOnSave": { @@ -147,10 +147,11 @@ "description": "Enable Auto convert on save. To apply the settings, you need to restart Visual Studio Code" }, "markdown-pdf.convertOnSaveExclude": { - "type": [ - "array" - ], + "type": "array", "default": [], + "items": { + "type": "string" + }, "description": "Excluded file name of convertOnSave option" }, "markdown-pdf.outputDirectory": { @@ -164,10 +165,11 @@ "description": "If markdown-pdf.outputDirectoryRelativePathFile option is set to true, the relative path set with markdown-pdf.styles is interpreted as relative from the file" }, "markdown-pdf.styles": { - "type": [ - "array" - ], + "type": "array", "default": [], + "items": { + "type": "string" + }, "description": "A list of local paths to the stylesheets to use from the markdown-pdf. All '\\' need to be written as '\\\\'." }, "markdown-pdf.stylesRelativePathFile": { @@ -191,6 +193,17 @@ "null" ], "enum": [ + "", + "a11y-dark.css", + "a11y-light.css", + "agate.css", + "androidstudio.css", + "an-old-hope.css", + "arduino-light.css", + "arta.css", + "ascetic.css", + "atelier-cave-dark.css", + "atelier-cave-light.css", "atelier-dune-dark.css", "atelier-dune-light.css", "atelier-estuary-dark.css", @@ -210,6 +223,7 @@ "atelier-sulphurpool-dark.css", "atelier-sulphurpool-light.css", "atom-one-dark.css", + "atom-one-dark-reasonable.css", "atom-one-light.css", "brown-paper.css", "codepen-embed.css", @@ -224,7 +238,9 @@ "foundation.css", "github.css", "github-gist.css", + "gml.css", "googlecode.css", + "gradient-dark.css", "grayscale.css", "gruvbox-dark.css", "gruvbox-light.css", @@ -232,12 +248,17 @@ "hybrid.css", "idea.css", "ir-black.css", + "isbl-editor-dark.css", + "isbl-editor-light.css", "kimbie.dark.css", "kimbie.light.css", + "lightfair.css", "magula.css", "mono-blue.css", "monokai.css", "monokai-sublime.css", + "night-owl.css", + "nord.css", "obsidian.css", "ocean.css", "paraiso-dark.css", @@ -250,6 +271,7 @@ "rainbow.css", "routeros.css", "school-book.css", + "shades-of-purple.css", "solarized-dark.css", "solarized-light.css", "sunburst.css", @@ -262,17 +284,10 @@ "vs2015.css", "xcode.css", "xt256.css", - "zenburn.css", - "agate.css", - "androidstudio.css", - "arduino-light.css", - "arta.css", - "ascetic.css", - "atelier-cave-dark.css", - "atelier-cave-light.css" + "zenburn.css" ], "default": "", - "description": "Set the style file name. for example: github.css, monokai.css ... https://github.com/isagalaev/highlight.js/tree/master/src/styles" + "markdownDescription": "Set the style file name. [highlight.js demo](https://highlightjs.org/static/demo/) [highlight.js/src/styles](https://github.com/highlightjs/highlight.js/tree/master/src/styles)" }, "markdown-pdf.breaks": { "type": "boolean", @@ -282,7 +297,7 @@ "markdown-pdf.emoji": { "type": "boolean", "default": true, - "description": "Enable emoji. http://www.webpagefx.com/tools/emoji-cheat-sheet/" + "markdownDescription": "Enable emoji. [Emoji cheat sheet](https://www.webfx.com/tools/emoji-cheat-sheet/)" }, "markdown-pdf.executablePath": { "type": "string", @@ -297,22 +312,26 @@ "markdown-pdf.displayHeaderFooter": { "type": "boolean", "default": true, - "description": "pdf only. Display header and footer." + "description": "pdf only. Display header and footer.", + "scope": "resource" }, "markdown-pdf.headerTemplate": { "type": "string", "default": "
", - "description": "pdf only. HTML template for the print header." + "description": "pdf only. HTML template for the print header.", + "scope": "resource" }, "markdown-pdf.footerTemplate": { "type": "string", "default": "
/
", - "description": "pdf only. HTML template for the print footer." + "description": "pdf only. HTML template for the print footer.", + "scope": "resource" }, "markdown-pdf.printBackground": { "type": "boolean", "default": true, - "description": "pdf only. Print background graphics." + "description": "pdf only. Print background graphics.", + "scope": "resource" }, "markdown-pdf.orientation": { "type": "string", @@ -321,12 +340,14 @@ "landscape" ], "default": "portrait", - "description": "pdf only. Paper orientation. portrait or landscape." + "description": "pdf only. Paper orientation. portrait or landscape.", + "scope": "resource" }, "markdown-pdf.pageRanges": { "type": "string", "default": "", - "description": "pdf only. Paper ranges to print, e.g., '1-5, 8, 11-13'." + "description": "pdf only. Paper ranges to print, e.g., '1-5, 8, 11-13'.", + "scope": "resource" }, "markdown-pdf.format": { "type": "string", @@ -344,37 +365,44 @@ "A6" ], "default": "A4", - "description": "pdf only. Paper format [Letter, Legal, Tabloid, Ledger, A0, A1, A2, A3, A4, A5, A6]." + "description": "pdf only. Paper format [Letter, Legal, Tabloid, Ledger, A0, A1, A2, A3, A4, A5, A6].", + "scope": "resource" }, "markdown-pdf.width": { "type": "string", "default": "", - "description": "pdf only. Paper width, accepts values labeled with units(mm, cm, in, px). If it is set, it overrides the markdown-pdf.format option." + "description": "pdf only. Paper width, accepts values labeled with units(mm, cm, in, px). If it is set, it overrides the markdown-pdf.format option.", + "scope": "resource" }, "markdown-pdf.height": { "type": "string", "default": "", - "description": "pdf only. Paper height, accepts values labeled with units(mm, cm, in, px). If it is set, it overrides the markdown-pdf.format option." + "description": "pdf only. Paper height, accepts values labeled with units(mm, cm, in, px). If it is set, it overrides the markdown-pdf.format option.", + "scope": "resource" }, "markdown-pdf.margin.top": { "type": "string", "default": "1.5cm", - "description": "Page Option. Border Top. units: mm, cm, in, px" + "description": "Page Option. Border Top. units: mm, cm, in, px", + "scope": "resource" }, "markdown-pdf.margin.bottom": { "type": "string", "default": "1cm", - "description": "Page Option. Border bottom. units: mm, cm, in, px" + "description": "Page Option. Border bottom. units: mm, cm, in, px", + "scope": "resource" }, "markdown-pdf.margin.right": { "type": "string", "default": "1cm", - "description": "Page Option. Border right. units: mm, cm, in, px" + "description": "Page Option. Border right. units: mm, cm, in, px", + "scope": "resource" }, "markdown-pdf.margin.left": { "type": "string", "default": "1cm", - "description": "Page Option. Border left. units: mm, cm, in, px" + "description": "Page Option. Border left. units: mm, cm, in, px", + "scope": "resource" }, "markdown-pdf.quality": { "type": "number", @@ -428,6 +456,11 @@ "default": "@enduml", "description": "Closing delimiter used for the plantuml parser." }, + "markdown-pdf.plantumlServer": { + "type": "string", + "default": "http://www.plantuml.com/plantuml", + "description": "plantuml server" + }, "markdown-pdf.StatusbarMessageTimeout": { "type": "number", "default": 10000, @@ -437,6 +470,11 @@ "type": "boolean", "default": true, "description": "Enable markdown-it-include. " + }, + "markdown-pdf.mermaidServer": { + "type": "string", + "default": "https://unpkg.com/mermaid/dist/mermaid.min.js", + "description": "mermaid server." } } } @@ -447,7 +485,7 @@ }, "devDependencies": { "glob": "^7.1.6", - "mocha": "^6.2.2", + "mocha": "^7.1.1", "removeNPMAbsolutePaths": "^2.0.0", "vscode-test": "^1.3.0" }, @@ -456,7 +494,7 @@ "d3": "^4.13.0", "emoji-images": "^0.1.1", "gray-matter": "^4.0.2", - "highlight.js": "^9.15.10", + "highlight.js": "^9.18.1", "markdown-it": "^10.0.0", "markdown-it-checkbox": "^1.1.0", "markdown-it-container": "^2.0.0", @@ -464,10 +502,9 @@ "markdown-it-include": "^1.1.0", "markdown-it-named-headers": "0.0.4", "markdown-it-plantuml": "^1.4.1", - "mermaid": "^8.4.0", - "mkdirp": "^0.5.1", - "mustache": "^3.1.0", + "mkdirp": "^1.0.3", + "mustache": "^4.0.1", "puppeteer-core": "^2.1.1", - "rimraf": "^3.0.0" + "rimraf": "^3.0.2" } } diff --git a/sample/README.html b/sample/README.html index 2dd9828..9d68f02 100644 --- a/sample/README.html +++ b/sample/README.html @@ -5,16 +5,17 @@ - + +{{{mermaid}}}