CTAN sync 201909240300

6 files changed, 54 insertions, 8 deletions

diff --git a/macros/luatex/latex/plantuml/CHANGELOG.md b/macros/luatex/latex/plantuml/CHANGELOG.md
index 5c84bfc5b2..0019d588d0 100644
--- a/macros/luatex/latex/plantuml/CHANGELOG.md
+++ b/macros/luatex/latex/plantuml/CHANGELOG.md
@@ -1,14 +1,22 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.3.0] - 2019-09-23
+
+## Added
+
+- Added support for UTF-8 filenames.
+- Added `example-component-diagram.tex`. Refs [#2](https://github.com/latextemplates/plantuml/issues/9).
+
 ## [0.2.3] - 2018-06-04
 
 ## Added
 
-- Add `release.sh` to CTAN upload-
+- Add `release.sh` to CTAN upload
 
 ## Removed
 
@@ -43,7 +51,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 Initial public release
 
-[unreleased]: https://github.com/latextemplates/plantuml/compare/0.2.3...HEAD
+[unreleased]: https://github.com/latextemplates/plantuml/compare/0.3.0...HEAD
+[0.3.0]: https://github.com/latextemplates/plantuml/compare/0.2.3...0.3.0
 [0.2.3]: https://github.com/latextemplates/plantuml/compare/0.2.2...0.2.3
 [0.2.2]: https://github.com/latextemplates/plantuml/compare/0.2.1...0.2.2
 [0.2.1]: https://github.com/latextemplates/plantuml/compare/0.2.0...0.2.1
diff --git a/macros/luatex/latex/plantuml/README.md b/macros/luatex/latex/plantuml/README.md
index 531ee379f2..eb0fd1ce84 100644
--- a/macros/luatex/latex/plantuml/README.md
+++ b/macros/luatex/latex/plantuml/README.md
@@ -1,6 +1,6 @@
 # plantuml
 
-Version 0.2.3
+Version 0.3.0
 
 > A LuaLaTeX package for PlantUML in LaTeX
 
diff --git a/macros/luatex/latex/plantuml/example-component-diagram.tex b/macros/luatex/latex/plantuml/example-component-diagram.tex
new file mode 100644
index 0000000000..785d2e7a56
--- /dev/null
+++ b/macros/luatex/latex/plantuml/example-component-diagram.tex
@@ -0,0 +1,32 @@
+\documentclass{scrartcl}
+\usepackage{graphics}
+
+% Enables inclusion of SVG graphics - 1:1 approach
+% This is NOT the approach of https://ctan.org/pkg/svg-inkscape
+% which allows text in SVG to be typeset using LaTeX.
+% We just include the SVG as is.
+\usepackage{epstopdf}
+\epstopdfDeclareGraphicsRule{.svg}{pdf}{.pdf}{%
+  inkscape -z --file=#1 --export-pdf=\OutputFile
+}
+
+\usepackage[output=svg]{plantuml}
+
+\begin{document}
+\begin{plantuml}
+@startuml
+() "Interface 2" as I2
+() "Interface 3" as I3
+
+[component 1] as c1
+[component 2] as c2
+[component 3] as c3
+
+c1 -- I2
+c1 -- I3
+
+I2 )-- c2
+I3 )-- c3
+@enduml
+\end{plantuml}
+\end{document}
diff --git a/macros/luatex/latex/plantuml/plantuml.lua b/macros/luatex/latex/plantuml/plantuml.lua
index d94e93b5b4..2261c86332 100644
--- a/macros/luatex/latex/plantuml/plantuml.lua
+++ b/macros/luatex/latex/plantuml/plantuml.lua
@@ -22,7 +22,7 @@ function convertPlantUmlToTikz(jobname, mode)
   end
 
   texio.write("Executing PlantUML... ")
-  local cmd = "java -jar " .. plantUmlJar .. " -t"
+  local cmd = "java -jar " .. plantUmlJar .. " -charset UTF-8 -t"
   if (mode == "latex") then
     cmd = cmd .. "latex:nopreamble"
   else
diff --git a/macros/luatex/latex/plantuml/plantuml.pdf b/macros/luatex/latex/plantuml/plantuml.pdf
index 7c9d89e4c3..b753d7aa01 100644
--- a/macros/luatex/latex/plantuml/plantuml.pdf
+++ b/macros/luatex/latex/plantuml/plantuml.pdf
diff --git a/macros/luatex/latex/plantuml/plantuml.sty b/macros/luatex/latex/plantuml/plantuml.sty
index d6777ed44e..d2958792bc 100644
--- a/macros/luatex/latex/plantuml/plantuml.sty
+++ b/macros/luatex/latex/plantuml/plantuml.sty
@@ -24,6 +24,11 @@
 
 \RequirePackage{adjustbox}
 
+% \jobname has a probrem of encodeing
+% if your latex filename include multibyte string
+% you need to redefine PlantUMLJobname to fix
+\def\PlantUMLJobname{\jobname}
+
 \ExplSyntaxOn
 \keys_define:nn { plantuml } {
   output .choices:nn = {
@@ -68,12 +73,12 @@
     }
   \fi
   \NewDocumentEnvironment{plantuml}{}{%
-    \VerbatimOut{\jobname-plantuml.txt}}
+    \VerbatimOut{\PlantUMLJobname-plantuml.txt}}
   {%
     \endVerbatimOut
     \ifluatex
       \directlua{
-        local jobname=\luastring{\jobname}
+        local jobname=\luastring{\PlantUMLJobname}
         local plantUmlMode=\luastring{\PlantUmlMode}
         require("plantuml.lua")
         convertPlantUmlToTikz(jobname, plantUmlMode)
@@ -85,10 +90,10 @@
     \fi
     \ifthenelse{\equal{\PlantUmlMode}{latex}}{
       \begin{adjustbox}{max width=\linewidth}
-        \input{\jobname-plantuml.latex}
+        \input{\PlantUMLJobname-plantuml.latex}
       \end{adjustbox}
     }{
-      \includegraphics[width=\maxwidth{\textwidth}]{\jobname-plantuml.\PlantUmlMode}
+      \includegraphics[width=\maxwidth{\textwidth}]{\PlantUMLJobname-plantuml.\PlantUmlMode}
     }
   }
 \or