summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl8
-rw-r--r--Master/texmf-dist/doc/latex/getmap/README57
-rw-r--r--Master/texmf-dist/doc/latex/getmap/README.md19
-rw-r--r--Master/texmf-dist/doc/latex/getmap/getmap-example.tex2
-rw-r--r--Master/texmf-dist/doc/latex/getmap/getmap.dtx248
-rw-r--r--Master/texmf-dist/doc/latex/getmap/getmap.pdfbin2272309 -> 2265772 bytes
-rwxr-xr-xMaster/texmf-dist/doc/latex/getmap/install.bat66
-rw-r--r--Master/texmf-dist/doc/latex/getmap/makefile9
-rw-r--r--Master/texmf-dist/tex/latex/getmap/getmap.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/getmap/getmap.sty87
10 files changed, 198 insertions, 300 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 0da5610969e..ddefd2433d4 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,13 +1,13 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 41258 2016-05-19 15:23:37Z karl $
+# $Id: tlmgr.pl 41476 2016-06-18 00:45:25Z preining $
#
# Copyright 2008-2016 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
-my $svnrev = '$Revision: 41258 $';
-my $datrev = '$Date: 2016-05-19 17:23:37 +0200 (Thu, 19 May 2016) $';
+my $svnrev = '$Revision: 41476 $';
+my $datrev = '$Date: 2016-06-18 02:45:25 +0200 (Sat, 18 Jun 2016) $';
my $tlmgrrevision;
my $prg;
if ($svnrev =~ m/: ([0-9]+) /) {
@@ -1765,7 +1765,7 @@ sub restore_one_package {
return ($F_ERROR);
}
$localtlpdb->remove_package($pkg);
- TeXLive::TLPDB->_install_package($restore_file , 0, [] ,$localtlpdb);
+ TeXLive::TLPDB->_install_data($restore_file , 0, [] ,$localtlpdb);
logpackage("restore: $pkg ($rev)");
# now we have to read the .tlpobj file and add it to the DB
my $tlpobj = TeXLive::TLPOBJ->new;
diff --git a/Master/texmf-dist/doc/latex/getmap/README b/Master/texmf-dist/doc/latex/getmap/README
deleted file mode 100644
index 44ed3cfaa67..00000000000
--- a/Master/texmf-dist/doc/latex/getmap/README
+++ /dev/null
@@ -1,57 +0,0 @@
-The goal of this package is the simplest possible provision of
-map images (OpenStreetMap, Google Maps and Google Street View
-are supported). In the simplest case, the specification of an
-address is sufficient. The package loads the map using the
-\write18 feature, which you must activate to use this package.
-The image will be downloaded by an external Lua script. You can
-use this script also from the command line.
-
-License: LPPL
-
-Changes in v1.8:
-
-- added support for long routes by the gps2gps mode (getmapdl.lua)
-
- Long routes might be defined by several thousands of way points.
- Encoding these into a encoded polyline would hugely exceed the
- URL length limit of 2048 bytes. The gps2gps mode allows you to
- reduce the number of gps coordinates based on a given bound.
-
-- added multi route support for gps2epl mode
-
-- updated documentation
-
- INSTALL
-===========
-
-First of all, install the package with the package manager of
-your TeX distribution, if possible! A getmap package is
-available for TeXLive2014+ and MiKTeX!
-
-Manual installation:
-
-download getmap.dtx and makefile (Linux) or install.bat (Windows)
-
-* Linux
-
- simply run make to extract the files and to create the
- documentation. Run sudo make install to copy the files
- into $TEXMFLOCAL
-
- Moreover, there are the following usefull make targets:
-
- uninstall deletes the package in $TEXMFOCAL
- package only extracts the files
- clean cleans all aux files
- cleanall cleans all files except the downloaded files
-
-* Windows
-
- In MiKTeX scripts like getmapdl.lua must be registered.
- This can not be done manually! Please use the package
- manager to install getmap.
-
- For TeXLive simply run install.bat! It assumes that you
- use a standard installation of TeXLive2014. Otherwise you
- must adjust the variables in the first lines of install.bat!
-
diff --git a/Master/texmf-dist/doc/latex/getmap/README.md b/Master/texmf-dist/doc/latex/getmap/README.md
new file mode 100644
index 00000000000..8ba3ed5727e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/getmap/README.md
@@ -0,0 +1,19 @@
+# README #
+
+The goal of this package is the simplest possible provision of
+map images (OpenStreetMap, Google Maps and Google Street View
+are supported). In the simplest case, it is is sufficient to
+specify an address.. The package loads the map using the
+\write18 feature, which you must activate to use this package.
+The image will be downloaded by an external Lua script. You
+can use this script also from the command line.
+
+License: LPPL
+
+Changes in v1.9:
+
+* compatibility fix for luatex v0.85+
+
+* Bugfix: restore some option defaults to guarantee correct
+ download URLs after changing mode in \getmap
+
diff --git a/Master/texmf-dist/doc/latex/getmap/getmap-example.tex b/Master/texmf-dist/doc/latex/getmap/getmap-example.tex
index 4efb44ce7ed..1419a15fc81 100644
--- a/Master/texmf-dist/doc/latex/getmap/getmap-example.tex
+++ b/Master/texmf-dist/doc/latex/getmap/getmap-example.tex
@@ -6,7 +6,7 @@
%%
%% getmap.dtx (with options: `examplefile')
%%
-%% Copyright (C) 2014 by:
+%% Copyright (C) 2014,2016 by:
%% Josef Kleber
%% <josef.kleber@gmx.de>
%%
diff --git a/Master/texmf-dist/doc/latex/getmap/getmap.dtx b/Master/texmf-dist/doc/latex/getmap/getmap.dtx
index 45b7bb14a2f..8db5dfd7feb 100644
--- a/Master/texmf-dist/doc/latex/getmap/getmap.dtx
+++ b/Master/texmf-dist/doc/latex/getmap/getmap.dtx
@@ -4,63 +4,24 @@
\iffalse
%</internal>
%<*readme>
+# README #
+
The goal of this package is the simplest possible provision of
map images (OpenStreetMap, Google Maps and Google Street View
-are supported). In the simplest case, the specification of an
-address is sufficient. The package loads the map using the
+are supported). In the simplest case, it is is sufficient to
+specify an address.. The package loads the map using the
\write18 feature, which you must activate to use this package.
-The image will be downloaded by an external Lua script. You can
-use this script also from the command line.
+The image will be downloaded by an external Lua script. You
+can use this script also from the command line.
License: LPPL
-Changes in v1.8:
-
-- added support for long routes by the gps2gps mode (getmapdl.lua)
-
- Long routes might be defined by several thousands of way points.
- Encoding these into a encoded polyline would hugely exceed the
- URL length limit of 2048 bytes. The gps2gps mode allows you to
- reduce the number of gps coordinates based on a given bound.
-
-- added multi route support for gps2epl mode
-
-- updated documentation
-
-
- INSTALL
-===========
-
-First of all, install the package with the package manager of
-your TeX distribution, if possible! A getmap package is
-available for TeXLive2014+ and MiKTeX!
-
-Manual installation:
-
-download getmap.dtx and makefile (Linux) or install.bat (Windows)
+Changes in v1.9:
-* Linux
+* compatibility fix for luatex v0.85+
- simply run make to extract the files and to create the
- documentation. Run sudo make install to copy the files
- into $TEXMFLOCAL
-
- Moreover, there are the following usefull make targets:
-
- uninstall deletes the package in $TEXMFOCAL
- package only extracts the files
- clean cleans all aux files
- cleanall cleans all files except the downloaded files
-
-* Windows
-
- In MiKTeX scripts like getmapdl.lua must be registered.
- This can not be done manually! Please use the package
- manager to install getmap.
-
- For TeXLive simply run install.bat! It assumes that you
- use a standard installation of TeXLive2014. Otherwise you
- must adjust the variables in the first lines of install.bat!
+* Bugfix: restore some option defaults to guarantee correct
+ download URLs after changing mode in \getmap
%</readme>
%<*bibfile>
@@ -147,7 +108,13 @@ download getmap.dtx and makefile (Linux) or install.bat (Windows)
title = {{MucBer: München Stachus -> Berlin Brandenburger Tor}},
year = {2014},
}
-
+
+@misc{bib:texsx,
+ author = {Kleber, Josef},
+ note = {\href{https://stackoverflow.com/questions/34653500/google-maps-implicit-positioning-of-the-map-broken}{https://stackoverflow.com/questions/34653500/google-maps-implicit-positioning-of-the-map-broken}},
+ title = {{Google Maps 'Implicit Positioning of the Map' broken?}},
+ year = {2016},
+ }
%</bibfile>
%<*luafile>
#!/usr/bin/env texlua
@@ -1084,7 +1051,7 @@ manifest.txt
\askforoverwritefalse
\preamble
-Copyright (C) 2014 by:
+Copyright (C) 2014,2016 by:
Josef Kleber
<josef.kleber@gmx.de>
@@ -1126,7 +1093,7 @@ This work consists of all files listed in manifest.txt.
\nopreamble\nopostamble
\usedir{doc/latex/getmap}
\generate{
- \file{README.txt}{\from{\jobname.dtx}{readme}}
+ \file{README.md}{\from{\jobname.dtx}{readme}}
}
\generate{
\file{manifest.txt}{\from{\jobname.dtx}{manifest}}
@@ -1160,6 +1127,7 @@ This work consists of all files listed in manifest.txt.
\usepackage{listings}
\usepackage{filecontents}
\usepackage{nicefrac}
+\usepackage{tcolorbox}
\usepackage[numbered]{hypdoc}
\usepackage{marginnote}%
\usepackage[automark,nouppercase]{scrpage2}
@@ -1167,6 +1135,7 @@ This work consists of all files listed in manifest.txt.
\usetocstyle{classic}
\usepackage[overwrite=false]{getmap}
\usepackage{attachfile}
+\usepackage{metalogo}
\usepackage{tikz}
% turn off idiotic tikz error in doc generation
\makeatletter
@@ -1330,6 +1299,8 @@ emph={}}
{\if@restonecol\onecolumn\else\clearpage\fi}
\setlength\parindent{0pt}%
\newcommand*\myref[1]{[see: \ref{#1} on page \pageref{#1}]}
+\tcbuselibrary{hooks}
+\newtcolorbox{gmbox}{colback=yellow,colframe=red!75!black,fonttitle=\bfseries,colbacktitle=red!85!black,title=Note,halign=left,box align=center}
\makeatother
\begin{document}
\DocInput{\jobname.dtx}
@@ -1344,7 +1315,7 @@ emph={}}
%emph={},emphstyle=\color{Tomato},
%emph={[2]width,xsize,ysize,zoom,scale,mode,file,type,heading,pitch,fov,markers,visible,path,pathfile},emphstyle={[2]\color{OliveDrab}},
%morekeywords={getmap,includegraphics}}
-%\DoNotIndex{\,,\begingroup,\endgroup,\csname,\def,\else,\endcsname,\equal,\expandafter,
+%\DoNotIndex{\,,\begingroup,\endgroup,\csname,\def,\else,\endcsname,\equal,\expandafter,\write,
%\fi,\gdef,\ifnum,\ifthenelse,\immediate,\MessageBreak,\NeedsTeXFormat,\newcommand,\newif,
%\PackageInfo,\PackageError,\ProcessOptionsX,\ProvidesPackage,\relax,\RequirePackage,
%\space,\errmessage,\ExecuteOptionsX,}
@@ -1355,7 +1326,7 @@ emph={}}
% \author{Josef Kleber}
% \Fileversion{\fileversion}
% \date{\filedate}
-% \Refline{\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}\\\href{https://bitbucket.org/kleberj/getmap/}{\texttt{https://bitbucket.org/kleberj/getmap/}}}
+% \Refline{\href{mailto:getmap@jklatex.de}{\texttt{getmap@jklatex.de}}\\\href{http://getmap.jklatex.de/}{\texttt{http://getmap.jklatex.de/}}}
% \maketitle
% \stepcounter{page}
% \tableofcontents
@@ -1379,8 +1350,8 @@ emph={}}
% \begin{abstract}
% The goal of this package is the simplest possible provision of
% map images (OpenStreetMap, Google Maps and Google Street View
-% are supported). In the simplest case, the specification of an
-% address is sufficient. The package loads the map using the
+% are supported). In the simplest case, it is is sufficient
+% to specify an address. The package loads the map using the
% \cmd\write18 feature, which you must activate to use this package.
% The image will be downloaded by an external Lua script. You can
% use this script also from the command line.
@@ -1401,6 +1372,8 @@ emph={}}
% \subsection{General options}
% \subsubsection[\texttt{mode}]{\texttt{mode (\underline{osm}\textbar{}gm\textbar{}gsv})}
% This option sets the mode, that is the source of the images. OpenStreetMap, Google Maps or Google Street View!
+% Please note that -- if used as local option (mixed modes) -- the default values of the \texttt{scale}, \texttt{zoom}, \texttt{type} and \texttt{color}
+% options for the respective mode are reset to guarantee correct download URLs!
% \subsubsection[\texttt{inputencoding}]{\texttt{inputencoding}}
% This option specifies the input encoding of your file.
% The download script requires the strings encoded in utf8.
@@ -1416,7 +1389,7 @@ emph={}}
% In the case of \texttt{true}, the image will be downloaded anyway!
% BTW, \texttt{overwrite} is equivalent to \texttt{overwrite=true}.
% \subsubsection[\texttt{file}]{\texttt{file (\underline{getmap})}}
-% This \marginpar{\footnotesize\fbox{\parbox{3cm}{\raggedright{}changed default value to \texttt{getmap} in version 1.2!}}}
+% This \marginpar{\begin{gmbox}changed default value to \texttt{getmap} in version 1.2!\end{gmbox}}
% option allows you to specify the name of the image (without extension).
% \subsection{\texttt{osm} mode}
% \subsubsection[\texttt{key}]{\texttt{key (\underline{Fmjtd\textbar{}luur20u22d,75=o5-9aylh6}})}
@@ -1436,7 +1409,7 @@ emph={}}
% This option overwrites a possibly given scale.
% \subsubsection[\texttt{xsize}]{\texttt{xsize (\underline{600})}}
% This option specifies the width of the map in pixels.
-% If \marginpar{\footnotesize\fbox{\parbox{3cm}{\raggedright{}changed default value to \texttt{600} in version 1.2!}}}
+% If \marginpar{\begin{gmbox}changed default value to \texttt{600} in version 1.2!\end{gmbox}}
% you only want to slightly increase or decrease the map extract,
% you should adjust the size of the map. You still have full control over the size of
% the map in the document with the options of \cmd\includegraphics. (max: 3840)
@@ -1492,9 +1465,9 @@ emph={}}
% \texttt{\&markers=size:mid\textbar{}color:blue\textbar{}label:S\textbar{}loc1\textbar{}loc2\textbar{}...}
%
% \getmap[file=bmus1, mode=gm,
-% markers={&markers=size:mid|label:B|color:green|Bode Museum, Berlin%
+% markers={&markers=size:mid|label:B|color:green|52.521847,13.394398%
% &markers=label:P|color:green|Pergamonmuseum, Berlin%
-% &markers=label:N|color:blue|Neues Museum, Berlin}%
+% &markers=label:N|color:blue|52.520063,13.397525}%
% ]{}
% \begin{center}\includegraphics[width=10cm]{bmus1}\end{center}
% \iffalse
@@ -1503,15 +1476,20 @@ emph={}}
\begin{lstlisting}
\getmap[
file=bmus1, mode=gm,
-markers={&markers=size:mid|label:B|color:green|Bode Museum, Berlin%
+markers={&markers=size:mid|label:B|color:green|52.521847,13.394398%
&markers=label:P|color:green|Pergamonmuseum, Berlin%
- &markers=label:N|color:blue|Neues Museum, Berlin}%
+ &markers=label:N|color:blue|52.520063,13.397525}%
]{}
\includegraphics[width=10cm]{bmus1}
\end{lstlisting}
% \iffalse
%</example>
% \fi
+% Earlier versions of this document used POIs for all museums.
+% After an update from Google Maps, the quality of the geo codings deteriorated, at least in this example from Berlin.
+% Using addresses or geographical coordinates usually solves this problem.
+% See \cite{bib:texsx} for more information.
+%
% The parameters size, color and label are optional!
% \begin{description}
% \item[size] tiny, \underline{mid}, small
@@ -1523,9 +1501,9 @@ markers={&markers=size:mid|label:B|color:green|Bode Museum, Berlin%
% With this option you can specify a list of locations (separated by a pipe), which must be on the map!
%
% \getmap[file=bmus2, mode=gm,
-% markers={&markers=size:mid|label:B|color:green|Bode Museum, Berlin
+% markers={&markers=size:mid|label:B|color:green|52.521847,13.394398
% &markers=label:P|color:green|Pergamonmuseum, Berlin
-% &markers=label:N|color:blue|Neues Museum, Berlin},
+% &markers=label:N|color:blue|52.520063,13.397525},
% visible={Brandenburger Tor, Berlin|Reichstagsufer 1, Berlin}]{}
% \begin{center}\includegraphics[width=10cm]{bmus2}\end{center}
% \iffalse
@@ -1534,9 +1512,9 @@ markers={&markers=size:mid|label:B|color:green|Bode Museum, Berlin%
\begin{lstlisting}
\getmap[
file=bmus2, mode=gm
-markers={&markers=size:mid|label:B|color:green|Bode Museum, Berlin%
+markers={&markers=size:mid|label:B|color:green|52.521847,13.394398%
&markers=label:P|color:green|Pergamonmuseum, Berlin%
- &markers=label:N|color:blue|Neues Museum, Berlin},%
+ &markers=label:N|color:blue|52.520063,13.397525},%
visible={Brandenburger Tor, Berlin|Reichstagsufer 1, Berlin}]{}
\includegraphics[width=10cm]{bmus2}
\end{lstlisting}
@@ -1553,11 +1531,11 @@ visible={Brandenburger Tor, Berlin|Reichstagsufer 1, Berlin}]{}
% \fi
\begin{lstlisting}
\getmap[file=bmus3, mode=gm, language=de,
-markers={&markers=size:mid|label:B|color:green|Bode Museum, Berlin%
+markers={&markers=size:mid|label:B|color:green|52.521847,13.394398%
&markers=label:P|color:green|Pergamonmuseum, Berlin%
- &markers=label:N|color:blue|Neues Museum, Berlin},%
-path={&path=weight:5|color:orange|Bode Museum, Berlin|%
- Pergamonmuseum, Berlin|Neues Museum, Berlin|%
+ &markers=label:N|color:blue|52.520063,13.397525},%
+path={&path=weight:5|color:orange|52.521847,13.394398|%
+ Pergamonmuseum, Berlin|52.520063,13.397525|%
James-Simon-Park,Berlin|52.522649,13.402523%
&path=weight:5|color:purple|James-Simon-Park, Berlin|%
Weinmeisterstraße 6, Berlin}]{}
@@ -1568,11 +1546,11 @@ path={&path=weight:5|color:orange|Bode Museum, Berlin|%
% \fi
%
% \getmap[file=bmus3, mode=gm, language=de,
-% markers={&markers=size:mid|label:B|color:green|Bode Museum, Berlin%
+% markers={&markers=size:mid|label:B|color:green|52.521847,13.394398%
% &markers=label:P|color:green|Pergamonmuseum, Berlin%
-% &markers=label:N|color:blue|Neues Museum, Berlin},%
-% path={&path=weight:5|color:orange|Bode Museum, Berlin|%
-% Pergamonmuseum, Berlin|Neues Museum, Berlin|%
+% &markers=label:N|color:blue|52.520063,13.397525},%
+% path={&path=weight:5|color:orange|52.521847,13.394398|%
+% Pergamonmuseum, Berlin|52.520063,13.397525|%
% James-Simon-Park,Berlin|52.522649,13.402523%
% &path=weight:5|color:purple|James-Simon-Park, Berlin|%
% Weinmeisterstraße 6, Berlin}]{}
@@ -1581,13 +1559,6 @@ path={&path=weight:5|color:orange|Bode Museum, Berlin|%
% You can also use \texttt{fillcolor} to mark areas! In paths, you
% can also specify RGB32 colors, in which the last byte defines opacity,
% e.g. 55 (33\%).
-%
-% \getmap[file=cpny, mode=gm, zoom=13,
-% path={&path=weight:2|color:orange|fillcolor:0xff641A55|
-% 40.764302, -73.973004|40.768044, -73.981903|%
-% 40.800642, -73.958193|40.796887, -73.949226|%
-% 40.764302, -73.973004}]{Central Park, New York}
-% \begin{center}\includegraphics[width=10cm]{cpny}\end{center}
% \iffalse
%<*example>
% \fi
@@ -1603,6 +1574,13 @@ path={&path=weight:5|color:orange|Bode Museum, Berlin|%
%</example>
% \fi
%
+% \getmap[file=cpny, mode=gm, zoom=13,
+% path={&path=weight:2|color:orange|fillcolor:0xff641A55|
+% 40.764302, -73.973004|40.768044, -73.981903|%
+% 40.800642, -73.958193|40.796887, -73.949226|%
+% 40.764302, -73.973004}]{Central Park, New York}
+% \begin{center}\includegraphics[width=10cm]{cpny}\end{center}
+%
% With small enough spaces between way points you can also defines routes!
% \subsubsection{\texttt{pathfile}}
% This option specifies the file holding the path specification. It will be loaded by the \texttt{Lua} script.
@@ -1727,17 +1705,17 @@ path={&path=weight:5|color:orange|Bode Museum, Berlin|%
%</example>
% \fi
%
-% and from the platform:
+% View from Olympic Tower Munich (Olympic Stadium and Park):
%
-% \getmap[file=parisgsvp,mode=gsv,heading=30,pitch=-25,fov=60]{Tour Eiffel, Paris}
-% \begin{center}\includegraphics[width=8cm]{parisgsvp}\end{center}
+% \getmap[file=mucoly,mode=gsv,heading=260,pitch=-40,fov=90]{Olympiaturm}
+% \begin{center}\includegraphics[width=8cm]{mucoly}\end{center}
% \iffalse
%<*example>
% \fi
\begin{lstlisting}
- \getmap[file=parisgsvp,mode=gsv,heading=30,pitch=-25,fov=60]%
- {Tour Eiffel, Paris}
- \includegraphics[width=8cm]{parisgsvp}
+ \getmap[file=mucoly,mode=gsv,heading=260,pitch=-40,fov=90]%
+ {Olympiaturm}
+ \includegraphics[width=8cm]{mucoly}
\end{lstlisting}
% \iffalse
%</example>
@@ -2112,7 +2090,7 @@ output = mucber.png
% First, we provide the \LaTeX\ package \package{getmap}.
% \begin{macrocode}
\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]%
% \end{macrocode}
% We need a few packages!
% \begin{macrocode}
@@ -2120,6 +2098,10 @@ output = mucber.png
\RequirePackage{stringenc}%
\RequirePackage{ifthen}%
% \end{macrocode}
+% Newer versions of \LuaTeX\ v0.85+ no longer supports \cmd\write18! Therefore, we use \package{shellesc} instead.
+% \begin{macrocode}
+\RequirePackage{shellesc}%
+% \end{macrocode}
% We provide a macro \cmd\GM@JK@define@key, which defines package options with global scope%
% and options for \cmd\getmap\ with local scope. It takes four arguments \marg{prefix},%
% \marg{package},\marg{option} and \marg{default}.
@@ -2255,60 +2237,61 @@ output = mucber.png
}%
%
% \end{macrocode}
-% We define a macro that is executed as \cmd\write18\ call. First, we test if%
+% We define a macro that is executed as \cmd\ShellEscape\ call. First, we test if%
% \cmd\write18\ is enabled and issue a package error if not! Otherwise we execute%
-% \cmd\write18\ depending on the mode%
+% \cmd\ShellEscape\ depending on the mode%
+% \changes{v1.9}{2016/06/16}{\LuaTeX\ v0.85+ fix: use \texttt{shellesc}'s \texttt{\textbackslash ShellEscape} instead of \texttt{\textbackslash write18}}
% \begin{macrocode}
\newcommand*\GM@JK@shellescape%
{%
\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!}%
@@ -2332,8 +2315,9 @@ output = mucber.png
{%
% \end{macrocode}
% \changes{v1.1}{2014/06/23}{Bugfix: problem in URL when using \cmd\usepackage[utf8]\{inputenc\}}
+% \changes{v1.9}{2016/06/18}{Bugfix: restore mode defaults for \texttt{scale}, \texttt{zoom}, \texttt{type} and \texttt{color} options to guarantee correct download URLs}
% We start a group to keep the setting of options local.
-% Then we test, if we are in \texttt{gm} mode to reset some defaults!
+% Then we test the mode to reset some defaults!
% Finally, we set the local options again to override defaults if necessary!
% \begin{macrocode}
\begingroup%
@@ -2346,6 +2330,14 @@ output = mucber.png
\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}%
% \end{macrocode}
% In \texttt{gsv} mode, we have an implicit \texttt{imagetype=jpg}.
diff --git a/Master/texmf-dist/doc/latex/getmap/getmap.pdf b/Master/texmf-dist/doc/latex/getmap/getmap.pdf
index 4f59356e9bd..b6c11d0c28f 100644
--- a/Master/texmf-dist/doc/latex/getmap/getmap.pdf
+++ b/Master/texmf-dist/doc/latex/getmap/getmap.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/getmap/install.bat b/Master/texmf-dist/doc/latex/getmap/install.bat
deleted file mode 100755
index d9c5fb9092e..00000000000
--- a/Master/texmf-dist/doc/latex/getmap/install.bat
+++ /dev/null
@@ -1,66 +0,0 @@
-@echo off
-rem Adjust these pathes for your installation.
-rem Usually, you just need to change the base directory part!
-set texmfpath=C:\texlive\texmf-local
-set bindir=C:\texlive\2014\bin\win32\
-set pckname=getmap
-echo.
-echo.
-echo Installing %pckname% into %texmfpath%
-echo.
-echo Creating %pckname%.pdf
-pdflatex -shell-escape %pckname%.dtx >nul
-bibtex %pckname% >nul
-makeindex -q -s gind.ist %pckname% >nul
-makeindex -q -s gglo.ist %pckname%.glo -o %pckname%.gls >nul
-pdflatex %pckname%.dtx >nul
-bibtex %pckname% >nul
-makeindex -q -s gind.ist %pckname% >nul
-makeindex -q -s gglo.ist %pckname%.glo -o %pckname%.gls >nul
-pdflatex %pckname%.dtx >nul
-ren README.txt README >nul
-echo Copying files to %texmfpath%
-md %texmfpath%\scripts\%pckname% >nul
-copy getmapdl.lua %texmfpath%\scripts\%pckname%\ >nul
-md %texmfpath%\tex\latex\%pckname% >nul
-copy *.sty %texmfpath%\tex\latex\%pckname% >nul
-copy *.cfg %texmfpath%\tex\latex\%pckname% >nul
-md %texmfpath%\doc\latex\%pckname% >nul
-copy README %texmfpath%\doc\latex\%pckname% >nul
-copy *.txt %texmfpath%\doc\latex\%pckname% >nul
-copy *.tex %texmfpath%\doc\latex\%pckname% >nul
-copy *.dtx %texmfpath%\doc\latex\%pckname% >nul
-copy *.pdf %texmfpath%\doc\latex\%pckname% >nul
-echo Running texhash
-texhash >nul
-del *.aux
-del *.bib
-del *.blg
-del *.bbl
-del *.gls
-del *.glo
-del *.hd
-del *.idx
-del *.ilg
-del *.ind
-del *.ins
-del *.log
-del *.out
-del *.tex
-del *.sty
-del *.cfg
-del *.toc
-del *.txt
-del *.png
-del *.jpg
-del *.epl
-del getmapdl.lua
-del README
-del getmap.pdf
-echo Create getmapdl.exe
-pushd %bindir%
-copy runscript.exe getmapdl.exe >nul
-popd
-echo.
-echo Done
-echo. \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/getmap/makefile b/Master/texmf-dist/doc/latex/getmap/makefile
index f5ed1fe3e88..2509fefc5d3 100644
--- a/Master/texmf-dist/doc/latex/getmap/makefile
+++ b/Master/texmf-dist/doc/latex/getmap/makefile
@@ -23,7 +23,7 @@ $(PKGNAME).pdf:
package:
pdftex $(PKGNAME).dtx
- mv README.txt README
+ dos2unix ./copyCTAN
install: doc
mkdir -p ${TEXMF}/doc/latex/${PKGNAME}
@@ -55,6 +55,7 @@ git: package
cp getmapdl.lua ./../dev/scripts/getmap/getmapdl.lua
cp getmap.sty ./../dev/tex/latex/getmap/getmap.sty
cp getmap.cfg ./../dev/tex/latex/getmap/getmap.cfg
+ cp README.md ./../README.md
ctan:
./copyCTAN
@@ -62,10 +63,10 @@ ctan:
clean:
$(RM) *.aux *.fdb_latexmk *.fls *.ind *.idx *.ilg *.glo *.gls \
*.log *.lol *.m *.out *.tmp *.toc *.sh *.hd \
- *.bbl *.blg *.ins *.txt *.bib *.epl
+ *.bbl *.blg *.ins *.bib *.epl
cleanall: clean
- $(RM) getmapdl.lua *.sty *.png *.jpg\
- *.cfg *.tex README getmap.pdf
+ $(RM) getmapdl.lua *.sty *.png *.jpg manifest.txt \
+ *.cfg *.tex README.md getmap.pdf
.PHONY: all doc package install uninstall styles git ctan clean cleanall
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
%% <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 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
%% <josef.kleber@gmx.de>
%%
@@ -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}}{}%
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-12 04:36:29 +0000