From 2c039800bb8cf7848f41cd7bfc2bf3dd81f4b31c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 20 Jun 2016 22:21:16 +0000 Subject: getmap (20jun16) git-svn-id: svn://tug.org/texlive/trunk@41503 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/getmap/getmap.cfg | 2 +- Master/texmf-dist/tex/latex/getmap/getmap.sty | 87 +++++++++++++++------------ 2 files changed, 49 insertions(+), 40 deletions(-) (limited to 'Master/texmf-dist/tex/latex/getmap') diff --git a/Master/texmf-dist/tex/latex/getmap/getmap.cfg b/Master/texmf-dist/tex/latex/getmap/getmap.cfg index a389f27ac95..305b7ad96b4 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 by: +%% Copyright (C) 2014,2016 by: %% Josef Kleber %% %% diff --git a/Master/texmf-dist/tex/latex/getmap/getmap.sty b/Master/texmf-dist/tex/latex/getmap/getmap.sty index 3a44b6a0e29..5931dfc3a17 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 by: +%% Copyright (C) 2014,2016 by: %% Josef Kleber %% %% @@ -27,10 +27,11 @@ %% This work consists of all files listed in manifest.txt. %% \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{getmap}[2014/10/07 v1.8 getmap.sty - Josef Kleber (C) 2014]% +\ProvidesPackage{getmap}[2016/06/18 v1.9 getmap.sty - Josef Kleber (C) 2014,2016]% \RequirePackage{xkeyval}% \RequirePackage{stringenc}% \RequirePackage{ifthen}% +\RequirePackage{shellesc}% \newcommand*\GM@JK@define@key[4]% {% \expandafter\gdef\csname#1@#3\endcsname{#4}% @@ -123,51 +124,51 @@ \ifGM@JK@writexviii\relax% \ifthenelse{\equal{\GM@JK@mode}{osm}}% {% - \immediate\write18{getmapdl \space-l\space "\GM@JK@location@string"% - \space-m\space osm% - \space-k\space "\GM@JK@key@string"% - \space-x\space \GM@JK@xsize% - \space-y\space \GM@JK@ysize% - \space-z\space "\GM@JK@zoom"% - \space-s\space \GM@JK@scale% - \space-t\space \GM@JK@type% - \space-i\space \GM@JK@imagetype% - \space-c\space "\GM@JK@color"% - \space-n\space \GM@JK@number% - \space-o\space \GM@JK@file}% + \ShellEscape{getmapdl \space-l\space "\GM@JK@location@string"% + \space-m\space osm% + \space-k\space "\GM@JK@key@string"% + \space-x\space \GM@JK@xsize% + \space-y\space \GM@JK@ysize% + \space-z\space "\GM@JK@zoom"% + \space-s\space \GM@JK@scale% + \space-t\space \GM@JK@type% + \space-i\space \GM@JK@imagetype% + \space-c\space "\GM@JK@color"% + \space-n\space \GM@JK@number% + \space-o\space \GM@JK@file}% }% {% \ifthenelse{\equal{\GM@JK@mode}{gm}}% {% - \immediate\write18{getmapdl \space-l\space "\GM@JK@location@string"% - \space-m\space gm% - \space-x\space \GM@JK@xsize% - \space-y\space \GM@JK@ysize% - \space-z\space \GM@JK@zoom% - \space-s\space \GM@JK@scale% - \space-t\space \GM@JK@type% - \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}% + \ShellEscape{getmapdl \space-l\space "\GM@JK@location@string"% + \space-m\space gm% + \space-x\space \GM@JK@xsize% + \space-y\space \GM@JK@ysize% + \space-z\space \GM@JK@zoom% + \space-s\space \GM@JK@scale% + \space-t\space \GM@JK@type% + \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}% }% {% \ifthenelse{\equal{\GM@JK@mode}{gsv}}% {% - \immediate\write18{getmapdl \space-l\space "\GM@JK@location@string"% - \space-m\space gsv% - \space-x\space \GM@JK@xsize% - \space-y\space \GM@JK@ysize% - \space-H\space \GM@JK@heading% - \space-F\space \GM@JK@fov% - \space-T\space \GM@JK@pitch% - \space-o\space \GM@JK@file}% + \ShellEscape{getmapdl \space-l\space "\GM@JK@location@string"% + \space-m\space gsv% + \space-x\space \GM@JK@xsize% + \space-y\space \GM@JK@ysize% + \space-H\space \GM@JK@heading% + \space-F\space \GM@JK@fov% + \space-T\space \GM@JK@pitch% + \space-o\space \GM@JK@file}% }% {% \PackageError{getmap}{invalid mode}{invalid mode! Use osm, gm or gsv!}% @@ -193,6 +194,14 @@ \def\GM@JK@color{blue}% }% {}% + \ifthenelse{\equal{\GM@JK@mode}{osm}}% + {% + \def\GM@JK@scale{3385}% + \def\GM@JK@zoom{}% + \def\GM@JK@type{map}% + \def\GM@JK@color{yellow_1}% + }% + {}% \setkeys{getmap}{#1}% \ifthenelse{\equal{\GM@JK@mode}{gsv}}% {\def\GM@JK@imagetype{jpg}}{}% -- cgit v1.2.3