From f1867306162a6c851d24dcb7a0300b90dca45878 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 24 Sep 2019 20:07:49 +0000 Subject: plantuml (24sep19) git-svn-id: svn://tug.org/texlive/trunk@52175 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/lualatex/plantuml/plantuml.lua | 2 +- Master/texmf-dist/tex/lualatex/plantuml/plantuml.sty | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/tex/lualatex') diff --git a/Master/texmf-dist/tex/lualatex/plantuml/plantuml.lua b/Master/texmf-dist/tex/lualatex/plantuml/plantuml.lua index d94e93b5b44..2261c86332f 100644 --- a/Master/texmf-dist/tex/lualatex/plantuml/plantuml.lua +++ b/Master/texmf-dist/tex/lualatex/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/Master/texmf-dist/tex/lualatex/plantuml/plantuml.sty b/Master/texmf-dist/tex/lualatex/plantuml/plantuml.sty index d6777ed44ee..d2958792bcf 100644 --- a/Master/texmf-dist/tex/lualatex/plantuml/plantuml.sty +++ b/Master/texmf-dist/tex/lualatex/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 -- cgit v1.2.3