getmap (21jul18)

git-svn-id: svn://tug.org/texlive/trunk@48243 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 19 insertions, 3 deletions

diff --git a/Master/texmf-dist/tex/latex/getmap/getmap.cfg b/Master/texmf-dist/tex/latex/getmap/getmap.cfg
index 305b7ad96b4..ba7e250979b 100644
--- a/Master/texmf-dist/tex/latex/getmap/getmap.cfg
+++ b/Master/texmf-dist/tex/latex/getmap/getmap.cfg
@@ -6,7 +6,7 @@
 %%
 %% getmap.dtx  (with options: `cfgfile')
 %% 
-%% Copyright (C) 2014,2016 by:
+%% Copyright (C) 2014,2016,2018 by:
 %% Josef Kleber
 %% <josef.kleber@gmx.de>
 %% 
diff --git a/Master/texmf-dist/tex/latex/getmap/getmap.sty b/Master/texmf-dist/tex/latex/getmap/getmap.sty
index 5931dfc3a17..79831f5c171 100644
--- a/Master/texmf-dist/tex/latex/getmap/getmap.sty
+++ b/Master/texmf-dist/tex/latex/getmap/getmap.sty
@@ -6,7 +6,7 @@
 %%
 %% getmap.dtx  (with options: `package')
 %% 
-%% Copyright (C) 2014,2016 by:
+%% Copyright (C) 2014,2016,2018 by:
 %% Josef Kleber
 %% <josef.kleber@gmx.de>
 %% 
@@ -27,11 +27,24 @@
 %% This work consists of all files listed in manifest.txt.
 %% 
 \NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{getmap}[2016/06/18 v1.9 getmap.sty - Josef Kleber (C) 2014,2016]%
+\ProvidesPackage{getmap}[2018/07/18 v1.10 getmap.sty - Josef Kleber (C) 2014,2016,2018]%
 \RequirePackage{xkeyval}%
 \RequirePackage{stringenc}%
 \RequirePackage{ifthen}%
 \RequirePackage{shellesc}%
+\RequirePackage{ifxetex}%
+\ifxetex%
+  \def\StringEncodingConvert#1#2#3#4%
+  {%
+    \def#1{#2}%
+  }%
+\fi%
+\ifluatex%
+  \def\StringEncodingConvert#1#2#3#4%
+  {%
+    \def#1{#2}%
+  }%
+\fi%
 \newcommand*\GM@JK@define@key[4]%
 {%
   \expandafter\gdef\csname#1@#3\endcsname{#4}%
@@ -124,6 +137,7 @@
   \ifGM@JK@writexviii\relax%
     \ifthenelse{\equal{\GM@JK@mode}{osm}}%
     {%
+      \ifluatex\directlua{os.setlocale('','ctype')}\fi%
       \ShellEscape{getmapdl \space-l\space "\GM@JK@location@string"%
                             \space-m\space osm%
                             \space-k\space "\GM@JK@key@string"%
@@ -140,6 +154,7 @@
     {%
       \ifthenelse{\equal{\GM@JK@mode}{gm}}%
       {%
+        \ifluatex\directlua{os.setlocale('','ctype')}\fi%
         \ShellEscape{getmapdl \space-l\space "\GM@JK@location@string"%
                               \space-m\space gm%
                               \space-x\space \GM@JK@xsize%
@@ -161,6 +176,7 @@
       {%
         \ifthenelse{\equal{\GM@JK@mode}{gsv}}%
         {%
+          \ifluatex\directlua{os.setlocale('','ctype')}\fi%
           \ShellEscape{getmapdl \space-l\space "\GM@JK@location@string"%
                                 \space-m\space gsv%
                                 \space-x\space \GM@JK@xsize%