diff options
| author | Laurent P. René de Cotret <laurent.decotret@outlook.com> | 2021-08-18 19:10:22 -0400 |
|---|---|---|
| committer | Laurent P. René de Cotret <laurent.decotret@outlook.com> | 2021-08-18 19:10:22 -0400 |
| commit | 3a1f73eb5d400cdcd7aa092778145a9cbcaf600a (patch) | |
| tree | 6bde52e4599d04eeef0f04559bf3add9c9864a7d | |
| parent | efe22be250ce1436684688383f2ca3d65b539302 (diff) | |
| parent | ae9118b02937f36da975602342c2747478225338 (diff) | |
Merge branch 'master' of https://github.com/LaurentRDC/pandoc-plot1.3.0
| -rw-r--r-- | .github/workflows/ci.yml | 14 | ||||
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | tests/fixtures/.issue30.yml | 6 |
3 files changed, 16 insertions, 7 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 961a481..e90e762 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,12 +101,14 @@ jobs: sudo apt-get --quiet --yes install octave sudo apt-get --quiet --yes install gnuplot sudo apt-get --quiet --yes install graphviz - + sudo apt-get --quiet --yes install plantuml - sudo mv /usr/share/plantuml/plantuml.jar . - java -jar plantuml.jar -h + echo $(plantuml -version) + # The ubuntu package version is too old + sudo curl -L "http://sourceforge.net/projects/plantuml/files/plantuml.jar/download" -o "/usr/share/plantuml/plantuml.jar" + echo $(plantuml -version) - - name: Install Graphviz and GNUplot [Windows] + - name: Install Graphviz, GNUplot, and PlantUML [Windows] if: runner.os == 'Windows' shell: pwsh run: | @@ -114,6 +116,8 @@ jobs: dot -c choco install --yes --no-progress gnuplot + choco install --yes --no-progress plantuml + plantuml -h - name: Install Plots.jl toolkit # Integration tests sometimes hang on MacOS @@ -278,4 +282,4 @@ jobs: # --url https://github.com/LaurentRDC/pandoc-plot/releases/download/$VERSION/pandoc-plot-wininst-x86_64.exe ` # --version $VERSION ` # --token $GITHUB_TOKEN ` - # --submit $SUBMIT
\ No newline at end of file + # --submit $SUBMIT diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cab62c..8a1ddc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ pandoc-plot uses [Semantic Versioning](http://semver.org/spec/v2.0.0.html) * Deprecated `plotTransform` in favour of `plotFilter`. `plotTransform` will be removed in the next major update (v2+). * Save formats incompatible with toolkits will now show an appropriate error. * The build system is now based on `cabal-install` rather than `stack`. +* Fixed an issue where some types of PlantUML diagrams (e.g. Gantt charts) would not be exported correctly (#30). ## Release 1.2.3 @@ -290,4 +291,4 @@ This happens automatically through the function `plotTransform`. ## Release 0.1.0.0 -* Initial release
\ No newline at end of file +* Initial release diff --git a/tests/fixtures/.issue30.yml b/tests/fixtures/.issue30.yml index bed5f55..e0d8f8a 100644 --- a/tests/fixtures/.issue30.yml +++ b/tests/fixtures/.issue30.yml @@ -1,4 +1,8 @@ strict: true logging: - verbosity: debug
\ No newline at end of file + verbosity: debug + +plantuml: + executable: "plantuml" + command_line_arguments: "" |