From 58ded3c00a780a49c9e7f0f3d9e66e2619a03056 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 16 Jul 2014 22:37:21 +0000 Subject: getmap (16jul14) git-svn-id: svn://tug.org/texlive/trunk@34634 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/getmap/getmap.cfg | 39 ++++++++++++++++++++ Master/texmf-dist/tex/latex/getmap/getmap.sty | 51 +++++++++++++++++++++------ 2 files changed, 79 insertions(+), 11 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/getmap/getmap.cfg (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 new file mode 100644 index 00000000000..a389f27ac95 --- /dev/null +++ b/Master/texmf-dist/tex/latex/getmap/getmap.cfg @@ -0,0 +1,39 @@ +%% +%% This is file `getmap.cfg', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% getmap.dtx (with options: `cfgfile') +%% +%% Copyright (C) 2014 by: +%% Josef Kleber +%% +%% +%% This file may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License, either version 1.3 of this license +%% or (at your option) any later version. The latest version of this +%% license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% and version 1.3 or later is part of all distributions of LaTeX version +%% 2003/12/01 or later. +%% +%% This work has the LPPL maintenance status "author-maintained". +%% +%% The Current Maintainer of this work is Josef Kleber. +%% +%% This work consists of all files listed in manifest.txt. +%% +%% +%% +%% copy this file to your local or home tree +%% and put it under TEXMF/tex/latex/getmap +%% run texhash afterwards +%% +%% +\gdef\GM@JK@key{Fmjtd|luur20u22d,75=o5-9aylh6}% +\endinput +%% +%% End of file `getmap.cfg'. diff --git a/Master/texmf-dist/tex/latex/getmap/getmap.sty b/Master/texmf-dist/tex/latex/getmap/getmap.sty index fd25b08c1d8..de8d3d34243 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/06/24 v1.1 getmap.sty - Josef Kleber (C) 2014]% +\ProvidesPackage{getmap}[2014/07/15 v1.2 getmap.sty - Josef Kleber (C) 2014]% \RequirePackage{xkeyval}% \RequirePackage{stringenc}% \RequirePackage{ifthen}% @@ -43,8 +43,9 @@ \expandafter\def\csname#1@#3\endcsname{##1}% }% }% -\GM@JK@define@key{GM@JK}{getmap}{key}{Kmjtd|luu7n162n1,22=o5-h61wh}% -\GM@JK@define@key{GM@JK}{getmap}{xsize}{800}% +\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}% \GM@JK@define@key{GM@JK}{getmap}{ysize}{400}% \GM@JK@define@key{GM@JK}{getmap}{scale}{3385}% \GM@JK@define@key{GM@JK}{getmap}{zoom}{}% @@ -52,10 +53,18 @@ \GM@JK@define@key{GM@JK}{getmap}{imagetype}{png}% \GM@JK@define@key{GM@JK}{getmap}{color}{yellow_1}% \GM@JK@define@key{GM@JK}{getmap}{number}{1}% -\GM@JK@define@key{GM@JK}{getmap}{file}{osmimage}% +\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}% \gdef\GM@JK@overwrite{false}% +\gdef\GM@JK@key{}% +\IfFileExists{getmap.cfg}% +{% + \input{getmap.cfg}% +}% +{% + \gdef\GM@JK@key{Fmjtd|luur20u22d,75=o5-9aylh6}% +}% \@ifpackageloaded{inputenc}% {% \gdef\GM@JK@inputencoding{\inputencodingname}% @@ -64,8 +73,16 @@ \gdef\GM@JK@inputencoding{utf8}% }% \newif\ifGM@JK@writexviii\GM@JK@writexviiifalse% -\ExecuteOptionsX{key,xsize,ysize,scale,zoom,type,imagetype,color,number,file}% +\ExecuteOptionsX{mode,xsize,ysize,scale,zoom,type,imagetype,color,number,file}% \ProcessOptionsX\relax% +\ifthenelse{\equal{\GM@JK@mode}{gm}}% +{% + \gdef\GM@JK@scale{1}% + \gdef\GM@JK@zoom{17}% + \gdef\GM@JK@type{roadmap}% + \gdef\GM@JK@color{blue}% +}% +{}% \ltx@IfUndefined{pdf@shellescape}% {% \PackageInfo{getmap}{\pdf@shellescape is undefined}% @@ -83,13 +100,15 @@ }% \newcommand*\GM@JK@shellescape% {% - \ifGM@JK@writexviii% - \ifthenelse{\equal{\GM@JK@zoom}{}}% + \ifGM@JK@writexviii\relax% + \ifthenelse{\equal{\GM@JK@mode}{osm}}% {% - \immediate\write18{osmimage \space-l\space "\GM@JK@location@string"% + \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% @@ -98,11 +117,12 @@ \space-o\space \GM@JK@file}% }% {% - \immediate\write18{osmimage \space-l\space "\GM@JK@location@string"% - \space-k\space "\GM@JK@key@string% + \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"% @@ -110,7 +130,7 @@ \space-o\space \GM@JK@file}% }% \else% - \PackageError{getmap}{\write18 disabled} + \PackageError{getmap}{\write18 disabled}% {\write18 disabled\MessageBreak% Use -shell-escape (TeXLive)\MessageBreak% or\space\space--enable-write18 (MiKTeX)}% @@ -119,6 +139,15 @@ \newcommand*\getmap[2][]% {% \begingroup% + \setkeys{getmap}{#1}% + \ifthenelse{\equal{\GM@JK@mode}{gm}}% + {% + \def\GM@JK@scale{1}% + \def\GM@JK@zoom{17}% + \def\GM@JK@type{roadmap}% + \def\GM@JK@color{blue}% + }% + {}% \setkeys{getmap}{#1}% \PackageInfo{getmap}{using \GM@JK@inputencoding\space encoding}% \def\GM@JK@location{#2}% -- cgit v1.2.3