From 43255aab4df3eb4f9d71e5f80e9bab45f8bdad72 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 25 Jul 2014 21:03:41 +0000 Subject: getmap (25jul14) git-svn-id: svn://tug.org/texlive/trunk@34723 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/getmap/getmap.sty | 60 ++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 2 deletions(-) (limited to 'Master/texmf-dist/tex/latex/getmap') diff --git a/Master/texmf-dist/tex/latex/getmap/getmap.sty b/Master/texmf-dist/tex/latex/getmap/getmap.sty index 424f14ea8e7..977db82ab20 100644 --- a/Master/texmf-dist/tex/latex/getmap/getmap.sty +++ b/Master/texmf-dist/tex/latex/getmap/getmap.sty @@ -27,7 +27,7 @@ %% This work consists of all files listed in manifest.txt. %% \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{getmap}[2014/07/19 v1.3 getmap.sty - Josef Kleber (C) 2014]% +\ProvidesPackage{getmap}[2014/07/25 v1.4 getmap.sty - Josef Kleber (C) 2014]% \RequirePackage{xkeyval}% \RequirePackage{stringenc}% \RequirePackage{ifthen}% @@ -43,6 +43,18 @@ \expandafter\def\csname#1@#3\endcsname{##1}% }% }% +\newcommand*\GM@JK@define@key@detok[4]% +{% + \expandafter\gdef\csname#1@#3\endcsname{#4}% + \define@key{#2.sty}{#3}[#4]% + {% + \expandafter\gdef\csname#1@#3\endcsname{\detokenize{##1}}% + }% + \define@key{#2}{#3}% + {% + \expandafter\def\csname#1@#3\endcsname{\detokenize{##1}}% + }% +}% \GM@JK@define@key{GM@JK}{getmap}{mode}{osm}% \GM@JK@define@key{GM@JK}{getmap}{key}{}% \GM@JK@define@key{GM@JK}{getmap}{xsize}{600}% @@ -56,6 +68,11 @@ \GM@JK@define@key{GM@JK}{getmap}{heading}{0}% \GM@JK@define@key{GM@JK}{getmap}{fov}{90}% \GM@JK@define@key{GM@JK}{getmap}{pitch}{0}% +\GM@JK@define@key{GM@JK}{getmap}{language}{en}% +\GM@JK@define@key@detok{GM@JK}{getmap}{markers}{}% +\GM@JK@define@key@detok{GM@JK}{getmap}{path}{}% +\GM@JK@define@key@detok{GM@JK}{getmap}{visible}{}% +\GM@JK@define@key{GM@JK}{getmap}{pathfile}{}% \GM@JK@define@key{GM@JK}{getmap}{file}{getmap}% \GM@JK@define@key{GM@JK}{getmap}{inputencoding}{}% \GM@JK@define@key{GM@JK}{getmap}{overwrite}{true}% @@ -76,7 +93,7 @@ \gdef\GM@JK@inputencoding{utf8}% }% \newif\ifGM@JK@writexviii\GM@JK@writexviiifalse% -\ExecuteOptionsX{mode,xsize,ysize,scale,zoom,type,imagetype,color,number,file,heading,fov,pitch}% +\ExecuteOptionsX{mode,xsize,ysize,scale,zoom,type,imagetype,color,number,file,heading,fov,pitch,language}% \ProcessOptionsX\relax% \ifthenelse{\equal{\GM@JK@mode}{gm}}% {% @@ -132,6 +149,12 @@ \space-i\space \GM@JK@imagetype% \space-c\space "\GM@JK@color"% \space-n\space \GM@JK@number% + \space-L\space "\GM@JK@language"% + \space-M\space "\GM@JK@markers@string"% + \space-C\space "\GM@JK@location@string"% + \space-P\space "\GM@JK@path@string"% + \space-p\space "\GM@JK@pathfile"% + \space-V\space "\GM@JK@visible@string"% \space-o\space \GM@JK@file}% }% {% @@ -197,6 +220,39 @@ {% failure \errmessage{Converting to UTF-8 failed}% }% + \StringEncodingConvert% + {\GM@JK@markers@string}% + {\GM@JK@markers}% + {\GM@JK@inputencoding}{utf-8}% + \StringEncodingSuccessFailure% + {% + %success + }% + {% failure + \errmessage{Converting to UTF-8 failed}% + }% + \StringEncodingConvert% + {\GM@JK@path@string}% + {\GM@JK@path}% + {\GM@JK@inputencoding}{utf-8}% + \StringEncodingSuccessFailure% + {% + %success + }% + {% failure + \errmessage{Converting to UTF-8 failed}% + }% + \StringEncodingConvert% + {\GM@JK@visible@string}% + {\GM@JK@visible}% + {\GM@JK@inputencoding}{utf-8}% + \StringEncodingSuccessFailure% + {% + %success + }% + {% failure + \errmessage{Converting to UTF-8 failed}% + }% \ifthenelse{\equal{\GM@JK@overwrite}{true}}% {% \GM@JK@shellescape% -- cgit v1.2.3