#404 Add mscgen_js as alternative to mscgen

asciidoctor · Mar 22, 2023 · 530db81 · 530db81
1 parent c840f73
commit 530db81
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -145,7 +145,7 @@ jobs:
           chmod +x Umlet/umlet
           echo "$PWD/Umlet" >> $GITHUB_PATH
       - name: Install MSCgen
-        run: sudo apt-get install -qq mscgen
+        run: npm install --global mscgenjs-cli
       - name: Install Blockdiag
         run: pip install blockdiag[pdf] actdiag seqdiag nwdiag[pdf]
       - name: Install svgbob

diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
@@ -114,7 +114,7 @@ jobs:
           echo "$PWD/Umlet" >> $GITHUB_PATH
 
       - name: Install MSCgen
-        run: export HOMEBREW_NO_INSTALL_CLEANUP=1 && brew install mscgen
+        run: npm install --global mscgenjs-cli
       - name: Install Blockdiag
         run: pip3 install blockdiag[pdf] actdiag seqdiag nwdiag[pdf]
       - name: Install svgbob

diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -5,6 +5,7 @@
 Enhancements::
 
 * Issue #402: Add https://github.com/kaishuu0123/erd-go[erd-go] support
+* Issue #404: Add https://github.com/mscgenjs[mscgenjs] support
 
 == 2.2.4
 

diff --git a/docs/modules/ROOT/partials/advanced.adoc b/docs/modules/ROOT/partials/advanced.adoc
@@ -81,7 +81,7 @@ The following table lists the tools that are required for each diagram type, the
    |graphviz     |{uri-graphviz}[GraphViz]                                              |`dot` or `graphvizdot`
    |meme         |{uri-imagemagick}[ImageMagick]                                        |`convert` and `identify`
    |mermaid      |{uri-mermaid}[Mermaid.cli]                                            |`mmdc`
-   |msc          |{uri-mscgen}[Mscgen]                                                  |`mscgen`
+   |msc          |{uri-mscgen}[Mscgen] or {uri-mscgen-js}[mscgen.js]                    |`mscgen`
    |nomnoml      |{uri-nomnoml}[Nomnoml]                                                |`nomnoml`
    |nwdiag       |{uri-nwdiag}[NwDiag]                                                  |`nwdiag`
    |packetdiag   |{uri-nwdiag}[NwDiag]                                                  |`packetdiag`

diff --git a/docs/modules/ROOT/partials/uris.adoc b/docs/modules/ROOT/partials/uris.adoc
@@ -17,6 +17,7 @@
 :uri-java: http://java.sun.com
 :uri-mermaid: https://github.com/mermaid-js/mermaid-cli
 :uri-mscgen: http://www.mcternan.me.uk/mscgen/
+:uri-mscgen-js: https://github.com/mscgenjs/mscgenjs-cli
 :uri-nomnoml: http://nomnoml.com
 :uri-nwdiag: http://blockdiag.com/en/nwdiag/index.html
 :uri-packetdiag: http://blockdiag.com/en/nwdiag/index.html

diff --git a/lib/asciidoctor-diagram/msc/converter.rb b/lib/asciidoctor-diagram/msc/converter.rb
@@ -21,7 +21,7 @@ def collect_options(source)
       def convert(source, format, options)
         font = options[:font]
 
-        generate_stdin(source.find_command('mscgen'), format.to_s, source.to_s) do |tool_path, output_path|
+        generate_stdin(source.find_command('mscgen', :alt_cmds => ['mscgen_js']), format.to_s, source.to_s) do |tool_path, output_path|
           args = [tool_path, '-o', Platform.native_path(output_path), '-T', format.to_s]
           if font
             args << '-F' << font