From 366e7309baba813b2e970ff84b3300bfa86de2f2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 May 2020 21:34:20 +0000 Subject: mercatormap (5may20) git-svn-id: svn://tug.org/texlive/trunk@55034 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/mercatormap/README | 2 +- .../doc/latex/mercatormap/mercatormap-example.tex | 2 +- .../latex/mercatormap/mercatormap.doc.abstract.tex | 3 +- .../mercatormap/mercatormap.doc.definition.tex | 46 +++--- .../latex/mercatormap/mercatormap.doc.maptiles.tex | 60 +++---- .../latex/mercatormap/mercatormap.doc.marker.tex | 184 +++++++++++++++++---- .../mercatormap/mercatormap.doc.orthodromes.tex | 2 + .../latex/mercatormap/mercatormap.doc.scales.tex | 50 +++--- .../doc/latex/mercatormap/mercatormap.doc.sty | 5 + .../mercatormap/mercatormap.doc.versionhistory.tex | 20 +++ .../doc/latex/mercatormap/mercatormap.pdf | Bin 25704396 -> 26056519 bytes .../doc/latex/mercatormap/mercatormap.tex | 6 +- .../tex/latex/mercatormap/mercatormap.sty | 146 +++++++++++----- .../tex/latex/mercatormap/mercatorpy.def | 4 +- .../tex/latex/mercatormap/mercatorsupplier.def | 2 +- 15 files changed, 375 insertions(+), 157 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/mercatormap/README b/Master/texmf-dist/doc/latex/mercatormap/README index eb1212c1aca..52881c11629 100644 --- a/Master/texmf-dist/doc/latex/mercatormap/README +++ b/Master/texmf-dist/doc/latex/mercatormap/README @@ -1,4 +1,4 @@ -%% The LaTeX package mercatormap - version 1.00 (2020/04/20) +%% The LaTeX package mercatormap - version 1.01 (2020/05/05) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2020 by Prof. Dr. Dr. Thomas F. Sturm diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap-example.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap-example.tex index 196906fc852..cbd153db914 100644 --- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap-example.tex +++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap-example.tex @@ -1,7 +1,7 @@ % \LaTeX-Main\ % !TeX encoding=UTF-8 %% -%% The LaTeX package mercatormap - version 1.00 (2020/04/20) +%% The LaTeX package mercatormap - version 1.01 (2020/05/05) %% mercatormap-example.tex: Example document with a map %% %% ------------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.abstract.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.abstract.tex index 0013fd5ff90..43bb9cf5166 100644 --- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.abstract.tex +++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.abstract.tex @@ -74,7 +74,8 @@ \footnote{Prof.~Dr.~Dr.~Thomas F.~Sturm, Institut f\"{u}r Mathematik und Informatik, Universit\"{a}t der Bundeswehr M\"{u}nchen, D-85577 Neubiberg, Germany; email: \href{mailto:thomas.sturm@unibw.de}{thomas.sturm@unibw.de}}\par\medskip -\normalsize\url{http://www.ctan.org/pkg/mercatormap}\par +\normalsize% +\url{https://www.ctan.org/pkg/mercatormap}\par \url{https://github.com/T-F-S/mercatormap} } \end{center} diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.definition.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.definition.tex index 5b53178e4ac..ad285fb7c90 100644 --- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.definition.tex +++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.definition.tex @@ -58,25 +58,25 @@ See \Fullref{sec:automated_map} for script aided map definitions. \end{docCommand} -\begin{docMrcKey}{mapdef/north}{=\meta{map north latitude}}{no default, initially 50} +\begin{docMrcKey}[mapdef]{north}{=\meta{map north latitude}}{no default, initially 50} Northern latitude degree of the visible map, possibly negative for the southern hemisphere, lower than $90$ but always larger than \refKey{/mermap/mapdef/south}. It is accessible as \docAuxCommand{mrcmapnorth} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{mapdef/south}{=\meta{map south latitude}}{no default, initially 48} +\begin{docMrcKey}[mapdef]{south}{=\meta{map south latitude}}{no default, initially 48} Southern latitude degree of the visible map, possibly negative for the southern hemisphere, larger than $-90$ but always lower than \refKey{/mermap/mapdef/north}. It is accessible as \docAuxCommand{mrcmapsouth} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{mapdef/west}{=\meta{map west longitude}}{no default, initially 11} +\begin{docMrcKey}[mapdef]{west}{=\meta{map west longitude}}{no default, initially 11} Western longitude degree of the visible map, possibly negative for the western hemisphere, possibly shifted periodically, but always lower than \refKey{/mermap/mapdef/east}. It is accessible as \docAuxCommand{mrcmapwest} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{mapdef/east}{=\meta{map east longitude}}{no default, initially 13} +\begin{docMrcKey}[mapdef]{east}{=\meta{map east longitude}}{no default, initially 13} Eastern longitude degree of the visible map, possibly negative for the western hemisphere, possibly shifted periodically, but always larger than \refKey{/mermap/mapdef/west}. It is accessible as \docAuxCommand{mrcmapeast} (use read-only). @@ -92,62 +92,62 @@ and not manually by \refCom{mrcdefinemap}. However, some values are computationally used in all cases. They can be ignored as pure technical information. -\begin{docMrcKey}{mapdef/xmin}{=\meta{map tile x minimum}}{no default, initially 271} +\begin{docMrcKey}[mapdef]{xmin}{=\meta{map tile x minimum}}{no default, initially 271} Minimal $x$ coordinate of the map tiles. \end{docMrcKey} -\begin{docMrcKey}{mapdef/xmax}{=\meta{map tile x maximum}}{no default, initially 275} +\begin{docMrcKey}[mapdef]{xmax}{=\meta{map tile x maximum}}{no default, initially 275} Maximal $x$ coordinate of the map tiles. \end{docMrcKey} -\begin{docMrcKey}{mapdef/ymin}{=\meta{map tile y minimum}}{no default, initially 173} +\begin{docMrcKey}[mapdef]{ymin}{=\meta{map tile y minimum}}{no default, initially 173} Minimal $y$ coordinate of the map tiles. \end{docMrcKey} -\begin{docMrcKey}{mapdef/ymax}{=\meta{map tile y maximum}}{no default, initially 177} +\begin{docMrcKey}[mapdef]{ymax}{=\meta{map tile y maximum}}{no default, initially 177} Maximal $y$ coordinate of the map tiles. \end{docMrcKey} -\begin{docMrcKey}{mapdef/zoom}{=\meta{map zoom}}{no default, initially 9} +\begin{docMrcKey}[mapdef]{zoom}{=\meta{map zoom}}{no default, initially 9} Map tile zoom factor alias $z$ coordinate of the map tiles. \end{docMrcKey} -\begin{docMrcKey}{mapdef/pixelwidth}{=\meta{map width in pixels}}{no default, initially 100} +\begin{docMrcKey}[mapdef]{pixelwidth}{=\meta{map width in pixels}}{no default, initially 100} Width of the visible map expressed in pixels of the source file(s). It is accessible as \docAuxCommand{mrcpixelwidth} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{mapdef/pixelheight}{=\meta{map height in tiles}}{no default, initially 100} +\begin{docMrcKey}[mapdef]{pixelheight}{=\meta{map height in tiles}}{no default, initially 100} Height of the visible map expressed in pixels of the source file(s). It is accessible as \docAuxCommand{mrcpixelheight} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{mapdef/westoffset}{=\meta{map tile offset (west)}}{no default, initially 0} +\begin{docMrcKey}[mapdef]{westoffset}{=\meta{map tile offset (west)}}{no default, initially 0} Distance of the visible map from the western edge of the most western tile expressed in tiles (range from 0 to 1). \end{docMrcKey} -\begin{docMrcKey}{mapdef/northoffset}{=\meta{map tile offset (north)}}{no default, initially 0} +\begin{docMrcKey}[mapdef]{northoffset}{=\meta{map tile offset (north)}}{no default, initially 0} Distance of the visible map from the northern edge of the most northern tile expressed in tiles (range from 0 to 1). \end{docMrcKey} -\begin{docMrcKey}{mapdef/southoffset}{=\meta{map tile offset (south)}}{no default, initially 0} +\begin{docMrcKey}[mapdef]{southoffset}{=\meta{map tile offset (south)}}{no default, initially 0} Distance of the visible map from the southern edge of the most southern tile expressed in tiles (range from 0 to 1). \end{docMrcKey} -\begin{docMrcKey}{mapdef/basename}{=\meta{map tile base name}}{no default, initially \texttt{tiles/tile}} +\begin{docMrcKey}[mapdef]{basename}{=\meta{map tile base name}}{no default, initially \texttt{tiles/tile}} File base name for the tiles. \end{docMrcKey} -\begin{docMrcKey}{mapdef/attribution}{=\meta{attribution text}}{no default, initially empty} +\begin{docMrcKey}[mapdef]{attribution}{=\meta{attribution text}}{no default, initially empty} Attribution text for the map source. Typically, it acknowledges the copyright of the map data provider. It may contain hyperlinks. It is accessible as \docAuxCommand{mrcmapattribution} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{mapdef/attribution print}{=\meta{attribution text}}{no default, initially empty} +\begin{docMrcKey}[mapdef]{attribution print}{=\meta{attribution text}}{no default, initially empty} Attribution text for the map source. In contrast to \refKey{/mermap/mapdef/attribution} it is intended for media that does not support hyperlinks like printed posters, books, etc. @@ -155,7 +155,7 @@ information. \end{docMrcKey} -\begin{docMrcKey}{mapdef/resource}{=\meta{map resource}}{no default, initially |none|} +\begin{docMrcKey}[mapdef]{resource}{=\meta{map resource}}{no default, initially |none|} Available map resource with following feasible values: \begin{itemize} \item\docValue{none}: No tiles and no merged map. @@ -165,7 +165,7 @@ information. \end{itemize} \end{docMrcKey} -\begin{docMrcKey}{mapdef/tile size}{=\meta{length}}{no default, initially |32.512mm|} +\begin{docMrcKey}[mapdef]{tile size}{=\meta{length}}{no default, initially |32.512mm|} Typically set computationally. It is identical to \refKey{/mermap/tile size} which is the recommended user option for manual setup. \end{docMrcKey} @@ -206,11 +206,11 @@ The border of the visible map is denoted by a \tikzname\ node \docNode{mrcmap}. The |mrc cs| coordinate system defines a map point by \refKey{/mermap/cs/latitude} and \refKey{/mermap/cs/longitude} -\begin{docMrcKey}{cs/latitude}{=\meta{latitude}}{no default} +\begin{docMrcKey}[cs]{latitude}{=\meta{latitude}}{no default} Sets the \meta{latitude} of a map point. \end{docMrcKey} -\begin{docMrcKey}{cs/longitude}{=\meta{longitude}}{no default} +\begin{docMrcKey}[cs]{longitude}{=\meta{longitude}}{no default} Sets the \meta{longitude} of a map point. \end{docMrcKey} @@ -222,11 +222,11 @@ The |mrc cs| coordinate system defines a map point by A map point can also be defined by shorter variants \refKey{/mermap/cs/lat} and \refKey{/mermap/cs/lon} -\begin{docMrcKey}{cs/lat}{=\meta{latitude}}{no default} +\begin{docMrcKey}[cs]{lat}{=\meta{latitude}}{no default} Sets the \meta{latitude} of a map point. \end{docMrcKey} -\begin{docMrcKey}{cs/lon}{=\meta{longitude}}{no default} +\begin{docMrcKey}[cs]{lon}{=\meta{longitude}}{no default} Sets the \meta{longitude} of a map point. \end{docMrcKey} diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.maptiles.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.maptiles.tex index c5289f537c2..b038b3d6192 100644 --- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.maptiles.tex +++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.maptiles.tex @@ -188,7 +188,7 @@ accompanying Python script. The technical background is documented in the option list for \refCom{mrcsupplymap}. \end{docMrcKey} -\begin{docMrcKey}{supply/type}{=\meta{type}}{no default, initially |reference|} +\begin{docMrcKey}[supply]{type}{=\meta{type}}{no default, initially |reference|} The \meta{type} defines the basic computation for the map. Feasible values are \begin{itemize} \item\docValue{reference}: \flqq map with reference position\frqq\\ @@ -220,37 +220,37 @@ accompanying Python script. The technical background is documented in \end{itemize} \end{docMrcKey} -\begin{docMrcKey}{supply/zoom}{=\meta{setup zoom}}{no default, initially |9|} +\begin{docMrcKey}[supply]{zoom}{=\meta{setup zoom}}{no default, initially |9|} Map tile zoom factor alias $z$ coordinate of the map tiles. Used for map types \docValue{boundaries} and \docValue{reference}. \end{docMrcKey} -\begin{docMrcKey}{supply/north}{=\meta{setup north latitude}}{no default, initially |50|} +\begin{docMrcKey}[supply]{north}{=\meta{setup north latitude}}{no default, initially |50|} Northern latitude degree, possibly negative for the southern hemisphere, lower than $90$ but always larger than \refKey{/mermap/supply/south}. Used for map types \docValue{boundaries} and \docValue{areafit}. \end{docMrcKey} -\begin{docMrcKey}{supply/south}{=\meta{setup south latitude}}{no default, initially |48|} +\begin{docMrcKey}[supply]{south}{=\meta{setup south latitude}}{no default, initially |48|} Southern latitude degree, possibly negative for the southern hemisphere, larger than $-90$ but always lower than \refKey{/mermap/supply/north}. Used for map types \docValue{boundaries} and \docValue{areafit}. \end{docMrcKey} -\begin{docMrcKey}{supply/west}{=\meta{setup west longitude}}{no default, initially |11|} +\begin{docMrcKey}[supply]{west}{=\meta{setup west longitude}}{no default, initially |11|} Western longitude degree, possibly negative for the western hemisphere, possibly shifted periodically, but always lower than \refKey{/mermap/supply/east}. Used for map types \docValue{boundaries} and \docValue{areafit}. \end{docMrcKey} -\begin{docMrcKey}{supply/east}{=\meta{setup east longitude}}{no default, initially |13|} +\begin{docMrcKey}[supply]{east}{=\meta{setup east longitude}}{no default, initially |13|} Eastern longitude degree, possibly negative for the western hemisphere, possibly shifted periodically, but always larger than \refKey{/mermap/supply/west}. Used for map types \docValue{boundaries} and \docValue{areafit}. \end{docMrcKey} -\begin{docMrcKey}{supply/area}{=\marg{comma separated list of named positions}}{no default} +\begin{docMrcKey}[supply]{area}{=\marg{comma separated list of named positions}}{no default} Sets \refKey{/mermap/supply/north}, \refKey{/mermap/supply/south}, \refKey{/mermap/supply/west}, \refKey{/mermap/supply/east} @@ -263,7 +263,7 @@ accompanying Python script. The technical background is documented in \end{docMrcKey} -\begin{docMrcKey}{supply/add area}{=\marg{comma separated list of named positions}}{no default} +\begin{docMrcKey}[supply]{add area}{=\marg{comma separated list of named positions}}{no default} Nearly identical to \refKey{/mermap/supply/area}, but the given \meta{comma separated list of named positions} does not reset the current area, i.e. the positions are added to the @@ -272,7 +272,7 @@ accompanying Python script. The technical background is documented in \end{docMrcKey} -\begin{docMrcKey}{supply/area to reference}{}{no value, initially unset} +\begin{docMrcKey}[supply]{area to reference}{}{no value, initially unset} The map settings \refKey{/mermap/supply/north}, \refKey{/mermap/supply/south}, \refKey{/mermap/supply/west}, \refKey{/mermap/supply/east} @@ -283,24 +283,24 @@ accompanying Python script. The technical background is documented in -\begin{docMrcKey}{supply/latitude}{=\meta{setup latitude}}{no default, initially |49|} +\begin{docMrcKey}[supply]{latitude}{=\meta{setup latitude}}{no default, initially |49|} Latitude degree of a reference point, possibly negative for the southern hemisphere. Used for map type \docValue{reference}. \end{docMrcKey} -\begin{docMrcKey}{supply/longitude}{=\meta{setup longitude}}{no default, initially |12|} +\begin{docMrcKey}[supply]{longitude}{=\meta{setup longitude}}{no default, initially |12|} Longitude degree of a reference point, possibly negative for the western hemisphere. Used for map type \docValue{reference}. \end{docMrcKey} -\begin{docMrcKey}{supply/position}{=\meta{setup latitude}:\meta{setup longitude}}{no default, initially |49:12|} +\begin{docMrcKey}[supply]{position}{=\meta{setup latitude}:\meta{setup longitude}}{no default, initially |49:12|} Latitude degree and longitude of a reference point. Used for map type \docValue{reference}. \end{docMrcKey} -\begin{docMrcKey}{supply/named position}{=\meta{name}}{style, no default} +\begin{docMrcKey}[supply]{named position}{=\meta{name}}{style, no default} The \emph{named position} given by \meta{name} describes a reference point, see \Fullref{sec:names_positions}. Used for map type \docValue{reference}. @@ -308,36 +308,36 @@ accompanying Python script. The technical background is documented in \pagebreak -\begin{docMrcKey}{supply/width}{=\meta{setup width in tiles}}{no default, initially |4|} +\begin{docMrcKey}[supply]{width}{=\meta{setup width in tiles}}{no default, initially |4|} Width of the map as multiplicity of map tiles. Used for map types \docValue{reference} and \docValue{areafit}. \end{docMrcKey} -\begin{docMrcKey}{supply/tex width}{=\meta{width}}{style, no default} +\begin{docMrcKey}[supply]{tex width}{=\meta{width}}{style, no default} Width of the map as \TeX\ dimension. This is a style to compute \refKey{/mermap/supply/width} according to the current \refKey{/mermap/tile size}. \end{docMrcKey} -\begin{docMrcKey}{supply/height}{=\meta{setup height in tiles}}{no default, initially |4|} +\begin{docMrcKey}[supply]{height}{=\meta{setup height in tiles}}{no default, initially |4|} Height of the map as multiplicity of map tiles. Used for map types \docValue{reference} and \docValue{areafit}. \end{docMrcKey} -\begin{docMrcKey}{supply/tex height}{=\meta{width}}{style, no default} +\begin{docMrcKey}[supply]{tex height}{=\meta{width}}{style, no default} Height of the map as \TeX\ dimension. This is a style to compute \refKey{/mermap/supply/height} according to the current \refKey{/mermap/tile size}. \end{docMrcKey} -\begin{docMrcKey}{supply/align}{=\meta{setup alignment}}{no default, initially |center|} +\begin{docMrcKey}[supply]{align}{=\meta{setup alignment}}{no default, initially |center|} Alignment of reference point or area for map types \docValue{reference} and \docValue{areafit}. Feasible values are \docValue{northwest}, \docValue{north}, \docValue{northeast}, \docValue{west}, \docValue{center}, \docValue{east}, \docValue{southwest},\docValue{south}, \docValue{southeast}. \end{docMrcKey} -\begin{docMrcKey}{supply/target}{=\meta{setup target}}{no default, initially |tiles|} +\begin{docMrcKey}[supply]{target}{=\meta{setup target}}{no default, initially |tiles|} Defines the type of output for the Python~3 script. Feasible values are: \begin{itemize} \item\docValue{none}: No tiles are downloaded and no merged map is generated, just map computation. @@ -365,7 +365,7 @@ accompanying Python script. The technical background is documented in \clearpage -\begin{docMrcKey}{supply/url}{=\meta{setup URL}}{no default, initially empty} +\begin{docMrcKey}[supply]{url}{=\meta{setup URL}}{no default, initially empty} Here, the url format with placeholder |{z}{x}{y}| for map tile download is defined. \textbf{Be sure that you have the permission to download, save, and use the map tiles from that URL. Illegal downloads are not endorsed in any @@ -377,7 +377,7 @@ accompanying Python script. The technical background is documented in \end{docMrcKey} -\begin{docMrcKey}{supply/url with api key}{=\marg{prefix}\marg{name}\marg{postfix}}{no default} +\begin{docMrcKey}[supply]{url with api key}{=\marg{prefix}\marg{name}\marg{postfix}}{no default} This is an alternative version of \refKey{/mermap/supply/url}. The URL is constructed from some fixed \meta{prefix} and \meta{postfix} with an API key in between. The API key is retrieved by \meta{name} from a @@ -402,7 +402,7 @@ accompanying Python script. The technical background is documented in -\begin{docMrcKey}{supply/attribution}{=\meta{attribution text}}{no default, initially empty} +\begin{docMrcKey}[supply]{attribution}{=\meta{attribution text}}{no default, initially empty} Attribution text for the map source. Typically, it acknowledges the copyright of the map data provider. It may contain hyperlinks. It is used to set up \refKey{/mermap/mapdef/attribution} afterwards @@ -412,7 +412,7 @@ accompanying Python script. The technical background is documented in \verb+\"{u}+, but umlauts can also be used directly, e.g. as UTF-8 coded characters. \end{docMrcKey} -\begin{docMrcKey}{supply/attribution print}{=\meta{attribution text}}{no default, initially empty} +\begin{docMrcKey}[supply]{attribution print}{=\meta{attribution text}}{no default, initially empty} Attribution text for the map source. In contrast to \refKey{/mermap/supply/attribution} it is intended for media that does not support hyperlinks like printed posters, books, etc. @@ -421,13 +421,13 @@ accompanying Python script. The technical background is documented in \end{docMrcKey} -\begin{docMrcKey}{supply/basename}{=\meta{setup tile base name}}{no default, initially \texttt{tiles/tile}} +\begin{docMrcKey}[supply]{basename}{=\meta{setup tile base name}}{no default, initially \texttt{tiles/tile}} Prefix for local tile files, e.g. '|tiles/map|' for '|tiles/map_10_10_10.png|'. \end{docMrcKey} \clearpage -\begin{docMrcKey}{supply/flex reference scale}{=\meta{scale denominator}}{no default} +\begin{docMrcKey}[supply]{flex reference scale}{=\meta{scale denominator}}{no default} With the given \meta{scale denominator}, an appropriate \refKey{/mermap/supply/zoom} and \refKey{/mermap/tile size} is computed. Note that the \meta{scale denominator} @@ -469,7 +469,7 @@ accompanying Python script. The technical background is documented in \end{docMrcKey} -\begin{docMrcKey}{supply/flex area scale}{=\meta{scale denominator}}{no default} +\begin{docMrcKey}[supply]{flex area scale}{=\meta{scale denominator}}{no default} This is a shortcut for setting \refKey{/mermap/supply/area to reference} and \refKey{/mermap/supply/flex reference scale}=\meta{scale denominator}. Used for map type \docValue{boundaries} and \docValue{reference}. @@ -486,7 +486,7 @@ accompanying Python script. The technical background is documented in \clearpage -\begin{docMrcKey}{supply/flex area fit}{\colOpt{=\meta{size}}}{default |0pt|} +\begin{docMrcKey}[supply]{flex area fit}{\colOpt{=\meta{size}}}{default |0pt|} This key can be used for map type \docValue{areafit} as \emph{final} option \emph{after} all other options. It applies a fine tuning to \refKey{/mermap/tile size}, @@ -522,7 +522,7 @@ accompanying Python script. The technical background is documented in \clearpage -\begin{docMrcKey}{supply/pixel}{=\meta{setup pixel size}}{no default, initially |256|} +\begin{docMrcKey}[supply]{pixel}{=\meta{setup pixel size}}{no default, initially |256|} Pixel width (and height) of a tile. It is especially needed for target \docValue{mergedmap} and also \docValue{wmsmap}. For \docValue{wmsmap}, it is multiplied with a pseudo tile calculation @@ -530,7 +530,7 @@ accompanying Python script. The technical background is documented in \end{docMrcKey} -\begin{docMrcKey}{supply/dpi}{=\meta{dpi value}}{style, no default} +\begin{docMrcKey}[supply]{dpi}{=\meta{dpi value}}{style, no default} This style sets \refKey{/mermap/supply/pixel} such that the given \meta{dpi value} is resulting (approximately). \begin{itemize} @@ -631,7 +631,7 @@ want to add more to avoid any legal uncertainties. \end{itemize} \medskip -\begin{docMrcKey}{supply/source}{=\meta{source}}{style, no default} +\begin{docMrcKey}[supply]{source}{=\meta{source}}{style, no default} This style sets \refKey{/mermap/supply/url}, \refKey{/mermap/supply/attribution},\\ \refKey{/mermap/supply/attribution print} and \refKey{/mermap/supply/basename}.\\ Feasible values for \meta{source} are: diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.marker.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.marker.tex index 070b12acdac..02a3f981fef 100644 --- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.marker.tex +++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.marker.tex @@ -58,44 +58,44 @@ may be helpful which provides some predefined marker types. \pagebreak -\begin{docMrcKey}{marker/first options}{=\meta{options}}{no default, initially unset} +\begin{docMrcKey}[marker]{first options}{=\meta{options}}{no default, initially unset} The given list of \meta{options} is used inside every \refCom{mrcmarker} \emph{before} the options of \refCom{mrcmarker}. \end{docMrcKey} -\begin{docMrcKey}{marker/last options}{=\meta{options}}{no default, initially unset} +\begin{docMrcKey}[marker]{last options}{=\meta{options}}{no default, initially unset} The given list of \meta{options} is used inside every \refCom{mrcmarker} \emph{after} the options of \refCom{mrcmarker}. \end{docMrcKey} -\begin{docMrcKey}{marker/latitude}{=\meta{latitude}}{no default, initially |12|} +\begin{docMrcKey}[marker]{latitude}{=\meta{latitude}}{no default, initially |12|} Latitude degree of the place marker. It is accessible as \docAuxCommand{mrcmarkerlatitude} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{marker/lat}{=\meta{latitude}}{no default, initially |12|} +\begin{docMrcKey}[marker]{lat}{=\meta{latitude}}{no default, initially |12|} Alias for \refKey{/mermap/marker/latitude}. \end{docMrcKey} -\begin{docMrcKey}{marker/longitude}{=\meta{longitude}}{no default, initially |49|} +\begin{docMrcKey}[marker]{longitude}{=\meta{longitude}}{no default, initially |49|} Longitude degree of the place marker. It is accessible as \docAuxCommand{mrcmarkerlongitude} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{marker/lon}{=\meta{longitude}}{no default, initially |49|} +\begin{docMrcKey}[marker]{lon}{=\meta{longitude}}{no default, initially |49|} Alias for \refKey{/mermap/marker/longitude}. \end{docMrcKey} -\begin{docMrcKey}{marker/position}{=\meta{place latitude}:\meta{place longitude}}{no default, initially |12:49|} +\begin{docMrcKey}[marker]{position}{=\meta{place latitude}:\meta{place longitude}}{no default, initially |12:49|} Sets the latitude degree and the longitude degree of the place marker. \end{docMrcKey} -\begin{docMrcKey}{marker/named position}{=\meta{name}}{style, no default} +\begin{docMrcKey}[marker]{named position}{=\meta{name}}{style, no default} Sets the latitude degree and the longitude degree of the place marker to the \emph{named position} denoted by \meta{name}, see \Fullref{sec:names_positions}. \end{docMrcKey} -\begin{docMrcKey}{marker/use inside}{=\meta{area}}{no default, initially |map|} +\begin{docMrcKey}[marker]{use inside}{=\meta{area}}{no default, initially |map|} The place marker is used or ignored according to its belonging inside the given \meta{area}. Feasible values for \meta{area} are: \begin{itemize} @@ -105,72 +105,85 @@ may be helpful which provides some predefined marker types. \end{docMrcKey} -\begin{docMrcKey}{marker/contents}{=\meta{text}}{no default, initially empty} +\begin{docMrcKey}[marker]{contents}{=\meta{text}}{no default, initially empty} Sets \meta{text} for displaying inside the marker, if the marker type supports such a thing. It is accessible as \docAuxCommand{mrcmarkercontents} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{marker/pictocontents}{=\meta{code}}{no default, initially empty} +\begin{docMrcKey}[marker]{pictocontents}{=\meta{code}}{no default, initially empty} Sets \tikzname\ \meta{code} for displaying inside the marker, if the marker type supports such a thing. It is accessible as \docAuxCommand{mrcmarkerpictocontents} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{marker/alias}{=\meta{text}}{no default, initially |noname|} +\begin{docMrcKey}[marker]{alias}{=\meta{text}}{no default, initially |noname|} The position of the marker is available as \tikzname\ coordinate by the given \meta{text}, e.g. to draw to or from the marker. \end{docMrcKey} -\begin{docMrcKey}{marker/uuid}{=\meta{uuid}}{no default, initially empty} +\begin{docMrcKey}[marker][doc updated=2020-05-04]{uuid}{=\meta{uuid}}{no default, initially empty} Sets a \meta{uuid} for unique identification of markers. - It is accessible as \docAuxCommand{mrcmarkeruuid} (use read-only). + It is accessible as \docAuxCommand{mrcmarkeruuid} (use read-only) + and \docAuxCommand[doc sort index=mermap_marker_uuid_tl]{l_mermap_marker_uuid_tl} (use read-only). The \meta{uuid} is provided for user applications. \end{docMrcKey} +\begin{docMrcKeys}[ + doc keypath = marker, + doc name = generic, + doc parameter = {=\meta{text}}, + doc description = {no default, initially empty}, + doc new = 2020-05-04, +]{} + Sets \meta{text} as generic content for user applications. + It is accessible as \docAuxCommand{mrcmarkergeneric} (use read-only) + and \docAuxCommand[doc sort index=mermap_marker_generic_tl]{l_mermap_marker_generic_tl} (use read-only). +\end{docMrcKeys} -\begin{docMrcKey}{marker/category}{=\meta{category}}{no default, initially empty} + +\begin{docMrcKey}[marker]{category}{=\meta{category}}{no default, initially empty} Sets a \meta{category} to group markers. It is accessible as \docAuxCommand{mrcmarkercategory} (use read-only). \end{docMrcKey} \clearpage -\begin{docMrcKey}{marker/show}{\colOpt{=true\textbar false}}{default |true|, initially |true|} +\begin{docMrcKey}[marker]{show}{\colOpt{=true\textbar false}}{default |true|, initially |true|} If set to |true|, the marker is shown, if it lies inside the map (or vicinity). Otherwise, the place marker is not used. \end{docMrcKey} -\begin{docMrcKey}{marker/hide}{\colOpt{=true\textbar false}}{default |true|, initially |false|} +\begin{docMrcKey}[marker]{hide}{\colOpt{=true\textbar false}}{default |true|, initially |false|} If set to |true|, the marker is not used. \refKey{/mermap/marker/hide} is inverse to \refKey{/mermap/marker/show}. \end{docMrcKey} -\begin{docMrcKey}{marker/show category}{=\meta{category}}{style, no default} +\begin{docMrcKey}[marker]{show category}{=\meta{category}}{style, no default} Sets \refKey{/mermap/marker/show} to |true|, if \refKey{/mermap/marker/category} equals \meta{category}. Otherwise, nothing happens. \refKey{/mermap/marker/category} has to be set \emph{before}. \end{docMrcKey} -\begin{docMrcKey}{marker/show all but category}{=\meta{category}}{style, no default} +\begin{docMrcKey}[marker]{show all but category}{=\meta{category}}{style, no default} Sets \refKey{/mermap/marker/show} to |true|, if \refKey{/mermap/marker/category} does not equal \meta{category}. Otherwise, nothing happens. \refKey{/mermap/marker/category} has to be set \emph{before}. \end{docMrcKey} -\begin{docMrcKey}{marker/hide category}{=\meta{category}}{style, no default} +\begin{docMrcKey}[marker]{hide category}{=\meta{category}}{style, no default} Sets \refKey{/mermap/marker/show} to |false|, if \refKey{/mermap/marker/category} equals \meta{category}. Otherwise, nothing happens. \refKey{/mermap/marker/category} has to be set \emph{before}. \end{docMrcKey} -\begin{docMrcKey}{marker/hide all but category}{=\meta{category}}{style, no default} +\begin{docMrcKey}[marker]{hide all but category}{=\meta{category}}{style, no default} Sets \refKey{/mermap/marker/show} to |false|, if \refKey{/mermap/marker/category} does not equal \meta{category}. Otherwise, nothing happens. \refKey{/mermap/marker/category} has to be set \emph{before}. @@ -190,11 +203,114 @@ may be helpful which provides some predefined marker types. \end{docMrcKey} +\clearpage + +The following options require the package |hyperref| to be loaded. +If |hyperref| is not loaded, \refKey{/mermap/marker/url} and +\refKey{/mermap/marker/link} are ignored.\\ +Note that if \refKey{/mermap/marker/url} and \refKey{/mermap/marker/link} +are applied concurrently, then \refKey{/mermap/marker/link} will win. + + +\begin{docMrcKeys}[ + doc keypath = marker, + doc name = url, + doc parameter = {=\meta{URL}}, + doc description = {no default, initially empty}, + doc new = 2020-05-04, +]{} + Sets \meta{URL} as external link of the marker. + The package is required for this option. + For an own marker type, it is applied as \tikzname\ option \docValue{mrchyperpath}. + +\tikzsetnextfilename{marker_url}% +\begin{dispExample} +\begin{tikzpicture} + \mrcNPdef{unibwm}{48.0802826}{11.6381048} + \mrcmap[type=reference, named position=unibwm, + flex reference scale=100000, + source=topplusopen web grau, + tex width=\linewidth,tex height=4cm]{} + \mrcdrawmap + \node[below,font=\fontsize{7pt}{7pt}\sffamily] at (mrcmap.south) + {\mrcmapattribution}; + \mrcdrawnetwork + \mrcclipmap + \mrcmarker{ named position = unibwm, + type = pin, + draw = red, + fill = red!20!white, + url = {https://www.unibw.de}, + contents = {Universit\"at der Bundeswehr M\"unchen}, + } +\end{tikzpicture} +\end{dispExample} + + +\end{docMrcKeys} + + +\begin{docMrcKeys}[ + doc keypath = marker, + doc name = link, + doc parameter = {=\meta{name}}, + doc description = {no default, initially empty}, + doc new = 2020-05-04, +]{} + Sets an internal link of the marker to a document target with + the given \meta{name}. + The package |hyperref| is required for this option. + For an own marker type, it is applied as \tikzname\ option \docValue{mrchyperpath}. +\end{docMrcKeys} + + + +\begin{docMrcKeys}[ + doc keypath = marker, + doc parameter = {\colOpt{=true\textbar false}}, + doc new = 2020-05-04, +]{ + { + doc name = use urls, + doc description = {default |true|, initially |true|}, + }, + { + doc name = ignore urls, + doc description = {default |true|, initially |false|}, + }, +} + If \refKey{/mermap/marker/use urls} is set to |false|, external links + with \refKey{/mermap/marker/url} are ignored.\\ + \refKey{/mermap/marker/ignore urls} is inverse to \refKey{/mermap/marker/use urls}. +\end{docMrcKeys} + + +\begin{docMrcKeys}[ + doc keypath = marker, + doc parameter = {\colOpt{=true\textbar false}}, + doc new = 2020-05-04, +]{ + { + doc name = use links, + doc description = {default |true|, initially |true|}, + }, + { + doc name = ignore links, + doc description = {default |true|, initially |false|}, + }, +} + If \refKey{/mermap/marker/use links} is set to |false|, internal links + with \refKey{/mermap/marker/link} are ignored.\\ + \refKey{/mermap/marker/ignore links} is inverse to \refKey{/mermap/marker/use links}. +\end{docMrcKeys} + + + \clearpage %------------------------------------------------------------------------------- \subsection{Marker Types} -\begin{docMrcKey}{marker/type}{=\meta{type}}{no default, initially |classic|} +\begin{docMrcKey}[marker]{type}{=\meta{type}}{no default, initially |classic|} Decides about the basic shape and style of the marker. Feasible values for \meta{type} are listed in the following. More values can be defined by \refCom{mrcnewmarkertype}. @@ -396,19 +512,19 @@ may be helpful which provides some predefined marker types. \medskip The different marker types can be customized by some additional options: -\begin{docMrcKey}{marker/font}{=\meta{font}}{no default, initially \texttt{\textbackslash sffamily\textbackslash small}} +\begin{docMrcKey}[marker]{font}{=\meta{font}}{no default, initially \texttt{\textbackslash sffamily\textbackslash small}} Font of the marker text (\docValue{classic}, \docValue{pin}, \docValue{pinflip}, \docValue{drop}, \docValue{knob}). It is accessible as \docAuxCommand{mrcmarkerfont} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{marker/text}{=\meta{color}}{no default, initially |black|} +\begin{docMrcKey}[marker]{text}{=\meta{color}}{no default, initially |black|} Color of the marker text (\docValue{classic}, \docValue{pin}, \docValue{pinflip}, \docValue{drop}, \docValue{knob}). It is accessible as \docColor{mrcmarkertext} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{marker/draw}{=\meta{color}}{no default, initially |gray|} +\begin{docMrcKey}[marker]{draw}{=\meta{color}}{no default, initially |gray|} Color of the marker frame (\docValue{pin}, \docValue{pinflip}, \docValue{drop}, \docValue{pictodrop}, \docValue{pictodropring}, \docValue{knob}, \docValue{pictoknob}, \docValue{pictoknobring}, @@ -416,7 +532,7 @@ The different marker types can be customized by some additional options: It is accessible as \docColor{mrcmarkerdraw} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{marker/fill}{=\meta{color}}{no default, initially |gray!20|} +\begin{docMrcKey}[marker]{fill}{=\meta{color}}{no default, initially |gray!20|} Color of the marker interior (\docValue{pin}, \docValue{pinflip}, \docValue{drop}, \docValue{pictodrop}, \docValue{pictodropring}, \docValue{knob}, \docValue{pictoknob}, \docValue{pictoknobring}, @@ -424,12 +540,12 @@ The different marker types can be customized by some additional options: It is accessible as \docColor{mrcmarkerfill} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{marker/angle}{=\meta{angle}}{no default, initially |90|} +\begin{docMrcKey}[marker]{angle}{=\meta{angle}}{no default, initially |90|} Angle of the marker (\docValue{classic}). It is accessible as \docAuxCommand{mrcmarkerangle} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{marker/shift}{=\meta{length}}{no default, initially |0pt|} +\begin{docMrcKey}[marker]{shift}{=\meta{length}}{no default, initially |0pt|} Shift of the marker text (\docValue{pin}, \docValue{pinflip}). It also shifts the drop center @@ -437,7 +553,9 @@ The different marker types can be customized by some additional options: It is accessible as \docAuxCommand{mrcmarkershift} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{marker/radius}{=\meta{length}}{no default, initially |3mm|} +\clearpage + +\begin{docMrcKey}[marker]{radius}{=\meta{length}}{no default, initially |3mm|} Radius of the marker (\docValue{classic}, \docValue{drop}, \docValue{pictodrop}, \docValue{pictodropring}, \docValue{knob}, \docValue{pictoknob}, \docValue{pictoknobring}, @@ -445,13 +563,13 @@ The different marker types can be customized by some additional options: It is accessible as \docAuxCommand{mrcmarkerradius} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{marker/inner radius}{=\meta{length}}{no default, initially |2.25mm|} +\begin{docMrcKey}[marker]{inner radius}{=\meta{length}}{no default, initially |2.25mm|} Inner radius of the marker (\docValue{pictodropring}, \docValue{pictoknobring}, \docValue{ringx}). It is accessible as \docAuxCommand{mrcmarkerinnerradius} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{marker/path style}{=\marg{options}}{no default, initially empty} +\begin{docMrcKey}[marker]{path style}{=\marg{options}}{no default, initially empty} \tikzname\ \meta{options} which are added to (some) path elements of of the marker (\docValue{pin}, \docValue{pinflip}, \docValue{drop}, \docValue{pictodrop}, @@ -460,7 +578,7 @@ The different marker types can be customized by some additional options: It is accessible as \tikzname\ option \docValue{mrcpathstyle} (use read-only). \end{docMrcKey} -\begin{docMrcKey}{marker/node style}{=\marg{options}}{no default, initially empty} +\begin{docMrcKey}[marker]{node style}{=\marg{options}}{no default, initially empty} \tikzname\ \meta{options} which are added to the node element of of the marker (\docValue{classic}, \docValue{pin}, \docValue{pinflip}, \docValue{drop}, \docValue{knob}). @@ -545,7 +663,7 @@ The different marker types can be customized by some additional options: \end{docCommand} -\begin{docMrcKey}{marker/style}{=\meta{style name}}{no default, initially unset} +\begin{docMrcKey}[marker]{style}{=\meta{style name}}{no default, initially unset} Applies a given \meta{style name}, i.e. all options which were stored by \refCom{mrcnewmarkerstyle} under this name. \end{docMrcKey} diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.orthodromes.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.orthodromes.tex index 17855158412..cddb277c86b 100644 --- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.orthodromes.tex +++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.orthodromes.tex @@ -29,6 +29,7 @@ The mathematical background and further information are found in \cite{Sturm:202 \tikzname\ variant to set \refKey{/mermap/samples}. \end{docTikzKey} +\enlargethispage*{1cm} \begin{docCommand}{mrcdraworthodrome}{\oarg{options}\marg{lat1}\marg{lon1}\marg{lat2}\marg{lon2}} Draws an orthodrome curve from a point with @@ -155,6 +156,7 @@ The mathematical background and further information are found in \cite{Sturm:202 \end{dispExample} \end{docCommand} +\enlargethispage*{1cm} \begin{docCommand}{mrcstoreloxodistance}{\marg{macro}\marg{lat1}\marg{lon1}\marg{lat2}\marg{lon2}} Stores the approximate loxodromic distance (in kilometers) between two points diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.scales.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.scales.tex index 4c139d14490..6efc4fe0d09 100644 --- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.scales.tex +++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.scales.tex @@ -206,45 +206,45 @@ but not for critical navigation purposes etc. node[pos=0.8]{80} node[pos=1]{100} node[pos=1,right,yshift=-1mm]{km}; \end{tikzpicture} \end{dispExample} - \end{docCommand} +\clearpage -\begin{docMrcKey}{scalebar/width-in-km}{=\meta{number}}{no default, initially |0|} +\begin{docMrcKey}[scalebar]{width-in-km}{=\meta{number}}{no default, initially |0|} Sets the width of the scale bar to match the real word length \meta{number} in kilometers. \end{docMrcKey} -\begin{docMrcKey}{scalebar/width-in-kilometer}{=\meta{number}}{no default, initially |0|} +\begin{docMrcKey}[scalebar]{width-in-kilometer}{=\meta{number}}{no default, initially |0|} Alias for \refKey{/mermap/scalebar/width-in-km} \end{docMrcKey} -\begin{docMrcKey}{scalebar/width-in-meter}{=\meta{number}}{no default, initially |0|} +\begin{docMrcKey}[scalebar]{width-in-meter}{=\meta{number}}{no default, initially |0|} Sets the width of the scale bar to match the real word length \meta{number} in meters. \end{docMrcKey} -\begin{docMrcKey}{scalebar/width-in-mile}{=\meta{number}}{no default, initially |0|} +\begin{docMrcKey}[scalebar]{width-in-mile}{=\meta{number}}{no default, initially |0|} Sets the width of the scale bar to match the real word length \meta{number} in miles. \end{docMrcKey} -\begin{docMrcKey}{scalebar/width-in-yard}{=\meta{number}}{no default, initially |0|} +\begin{docMrcKey}[scalebar]{width-in-yard}{=\meta{number}}{no default, initially |0|} Sets the width of the scale bar to match the real word length \meta{number} in yards. \end{docMrcKey} -\begin{docMrcKey}{scalebar/partitions}{=\meta{number}}{no default, initially |5|} +\begin{docMrcKey}[scalebar]{partitions}{=\meta{number}}{no default, initially |5|} Determines the \meta{number} of partitions for the scale bar. If \meta{number} is set to 1, there is no partitioning. \end{docMrcKey} -\begin{docMrcKey}{scalebar/height}{=\meta{length}}{no default, initially |2mm|} +\begin{docMrcKey}[scalebar]{height}{=\meta{length}}{no default, initially |2mm|} Sets the height of the scale bar to the given \TeX\ \meta{length}. \end{docMrcKey} -\begin{docMrcKey}{scalebar/at}{=\marg{\tikzname\ coordinate}}{no default, +\begin{docMrcKey}[scalebar]{at}{=\marg{\tikzname\ coordinate}}{no default, initially \texttt{\brackets{(0,0)}}} The scale bar is positioned at the given \meta{\tikzname\ coordinate}. The placement is done with the \refKey{/mermap/scalebar/placement} option. @@ -283,7 +283,7 @@ but not for critical navigation purposes etc. \pagebreak -\begin{docMrcKey}{scalebar/placement}{=\meta{\tikzname\ positioning}}{no default, initially empty} +\begin{docMrcKey}[scalebar]{placement}{=\meta{\tikzname\ positioning}}{no default, initially empty} \meta{\tikzname\ positioning} of a scale bar in combination with \refKey{/mermap/scalebar/at}. All \tikzname\ placement options for nodes can be used, e.g. \texttt{above left} or \texttt{anchor=mid west}, etc. @@ -292,7 +292,7 @@ but not for critical navigation purposes etc. \end{docMrcKey} -\begin{docMrcKey}{scalebar/south-east-inside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset} +\begin{docMrcKey}[scalebar]{south-east-inside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset} Shortcut for placing the scale bar at the south east corner of the map. The optional \mbox{\meta{x shift}} and \meta{y shift} denote the absolute shift values in each direction, i.e. the algebraic sign is @@ -302,36 +302,36 @@ but not for critical navigation purposes etc. are set by this option. \end{docMrcKey} -\begin{docMrcKey}{scalebar/south-east-outside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset} +\begin{docMrcKey}[scalebar]{south-east-outside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset} Shortcut for placing the scale bar below the south east corner of the map. \end{docMrcKey} -\begin{docMrcKey}{scalebar/south-west-inside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset} +\begin{docMrcKey}[scalebar]{south-west-inside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset} Shortcut for placing the scale bar at the south west corner of the map. \end{docMrcKey} -\begin{docMrcKey}{scalebar/south-west-outside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset} +\begin{docMrcKey}[scalebar]{south-west-outside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset} Shortcut for placing the scale bar below the south west corner of the map. \end{docMrcKey} -\begin{docMrcKey}{scalebar/north-west-inside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset} +\begin{docMrcKey}[scalebar]{north-west-inside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset} Shortcut for placing the scale bar at the north west corner of the map. \end{docMrcKey} -\begin{docMrcKey}{scalebar/north-west-outside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset} +\begin{docMrcKey}[scalebar]{north-west-outside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset} Shortcut for placing the scale bar above the north west corner of the map. \end{docMrcKey} -\begin{docMrcKey}{scalebar/north-east-inside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset} +\begin{docMrcKey}[scalebar]{north-east-inside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset} Shortcut for placing the scale bar at the north east corner of the map. \end{docMrcKey} -\begin{docMrcKey}{scalebar/north-east-outside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset} +\begin{docMrcKey}[scalebar]{north-east-outside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset} Shortcut for placing the scale bar above the north east corner of the map. \end{docMrcKey} -\begin{docMrcKey}{scalebar/major style}{=\marg{\tikzname\ options}}{no default, initially empty} +\begin{docMrcKey}[scalebar]{major style}{=\marg{\tikzname\ options}}{no default, initially empty} The \emph{major} part of the scale bar is a single \tikzname\ path object which can be customized by the given \meta{\tikzname\ options}. The \emph{major} part consists of the black area in the default case. @@ -345,7 +345,7 @@ but not for critical navigation purposes etc. \end{docMrcKey} -\begin{docMrcKey}{scalebar/minor style}{=\marg{\tikzname\ options}}{no default, initially empty} +\begin{docMrcKey}[scalebar]{minor style}{=\marg{\tikzname\ options}}{no default, initially empty} The \emph{minor} part of the scale bar is a single \tikzname\ path object which can be customized by the given \meta{\tikzname\ options}. The \emph{minor} part is seen as holes in the default case. @@ -362,12 +362,12 @@ but not for critical navigation purposes etc. \pagebreak -\begin{docMrcKey}{scalebar/double}{\colOpt{=true\textbar false}}{default |true|, initially |true|} +\begin{docMrcKey}[scalebar]{double}{\colOpt{=true\textbar false}}{default |true|, initially |true|} If set to |true|, the scale bar is drawn as a double ruler. \end{docMrcKey} -\begin{docMrcKey}{scalebar/single}{\colOpt{=true\textbar false}}{default |true|, initially |false|} +\begin{docMrcKey}[scalebar]{single}{\colOpt{=true\textbar false}}{default |true|, initially |false|} If set to |true|, the scale bar is drawn as a single ruler. \refKey{/mermap/scalebar/single} is inverse to \refKey{/mermap/scalebar/double}. \tikzsetnextfilename{scales_scalebar6} @@ -379,20 +379,20 @@ but not for critical navigation purposes etc. \end{docMrcKey} -\begin{docMrcKey}{scalebar/transparent}{\colOpt{=true\textbar false}}{default |true|, initially |true|} +\begin{docMrcKey}[scalebar]{transparent}{\colOpt{=true\textbar false}}{default |true|, initially |true|} If set to |true|, the \emph{minor} part of the scale bar is drawn transparent, i.e. as holes inside the ruler. \end{docMrcKey} -\begin{docMrcKey}{scalebar/solid}{\colOpt{=true\textbar false}}{default |true|, initially |false|} +\begin{docMrcKey}[scalebar]{solid}{\colOpt{=true\textbar false}}{default |true|, initially |false|} If set to |true|, the \emph{minor} part of the scale bar is drawn opaque. It is drawn white or according to \refKey{/mermap/scalebar/minor style}. \refKey{/mermap/scalebar/solid} is inverse to \refKey{/mermap/scalebar/transparent}. \end{docMrcKey} -\begin{docMrcKey}{scalebar/scale}{=\meta{scale denominator}}{no default, initially unset} +\begin{docMrcKey}[scalebar]{scale}{=\meta{scale denominator}}{no default, initially unset} Sets or overwrites the \meta{scale denominator} setting. \textbf{Using this key is not needed and may even lead to erroneous displays inside a |tikzpicture| with a defined map setting.} diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.sty b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.sty index e2ecc0fe9fa..7ef0480a7ff 100644 --- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.sty +++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.sty @@ -97,8 +97,13 @@ #1}{#2} \tcbmakedocSubKey{docMrcKey}{mermap} +\tcbmakedocSubKeys{docMrcKeys}{mermap} \tcbmakedocSubKey{docTikzKey}{tikz} \def\tikzname{\textup{Ti\textit{k}Z}} \let\docNode\docValue + +\renewcommand*{\tcbdocnew}[1]{\textcolor{green!50!black}{\sffamily\bfseries N} #1} +\renewcommand*{\tcbdocupdated}[1]{\textcolor{blue!75!black}{\sffamily\bfseries U} #1} + diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.versionhistory.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.versionhistory.tex index 9d5ece4dff5..121b9f3e556 100644 --- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.versionhistory.tex +++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.versionhistory.tex @@ -9,3 +9,23 @@ \begin{itemize} \item Initial public release. \end{itemize} + +\section*{v1.01 (2020/05/05)} +\begin{itemize} +\item Sorting of index key entries fixed for the documentation. +\item User messages for failed Python script calls are changed from warnings to + errors to fail fast and to provide more information and hints about + possible reasons. +\item New general marker option + \refKey{/mermap/marker/generic} with corresponding macros + \docAuxCommand*{mrcmarkergeneric} + and \docAuxCommand*{l_mermap_marker_generic_tl}. Also, the marker uuid is + made |expl3| accessible as \docAuxCommand*{l_mermap_marker_uuid_tl}. +\item New hyper marker options + \refKey{/mermap/marker/url}, + \refKey{/mermap/marker/link}, + \refKey{/mermap/marker/use urls}, + \refKey{/mermap/marker/ignore urls}, + \refKey{/mermap/marker/use links}, + \refKey{/mermap/marker/ignore links}. +\end{itemize} diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.pdf b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.pdf index 15bb306604f..4e6f43986dd 100644 Binary files a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.pdf and b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.pdf differ diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.tex index cba748e1815..8e993db58b0 100644 --- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.tex +++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.tex @@ -2,7 +2,7 @@ % !TeX encoding=UTF-8 % !TeX spellcheck=en_US %% -%% The LaTeX package mercatormap - version 1.00 (2020/04/20) +%% The LaTeX package mercatormap - version 1.01 (2020/05/05) %% mercatormap.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -33,8 +33,8 @@ % \mrcsetapikey{openrouteservice}{YOUR-API-KEY} % registered key % \mrcsetapikey{thunderforest}{YOUR-API-KEY} % registered key -\def\version{1.00}% -\def\datum{2020/04/20}% +\def\version{1.01}% +\def\datum{2020/05/05}% \mrcactivatescript% activates Python script diff --git a/Master/texmf-dist/tex/latex/mercatormap/mercatormap.sty b/Master/texmf-dist/tex/latex/mercatormap/mercatormap.sty index d05872b77fe..488548c96fa 100644 --- a/Master/texmf-dist/tex/latex/mercatormap/mercatormap.sty +++ b/Master/texmf-dist/tex/latex/mercatormap/mercatormap.sty @@ -1,4 +1,4 @@ -%% The LaTeX package mercatormap - version 1.00 (2020/04/20) +%% The LaTeX package mercatormap - version 1.01 (2020/05/05) %% mercatormap.sty: geographic coordinates (Mercator projection) and map tiles for TikZ pictures %% %% ------------------------------------------------------------------------------------------- @@ -19,7 +19,7 @@ %% \RequirePackage{expl3}[2020/02/25] \RequirePackage{xparse} -\ProvidesExplPackage{mercatormap}{2020/04/20}{1.00} +\ProvidesExplPackage{mercatormap}{2020/05/05}{1.01} {A Web Mercator projection package with map tile support} \@ifpackagelater { expl3 } { 2020/02/25 } { } @@ -486,7 +486,7 @@ \tl_const:Nn \c__mermap_supply_call_boundaries_tl {% - \l__mermap_python\c_space_tl boundaries + \l__mermap_python_tl\c_space_tl boundaries -u "\str_use:N\l__mermap_supply_url_str" -at "\str_use:N\l__mermap_supply_attribution_str" -atp "\str_use:N\l__mermap_supply_attribution_print_str" @@ -504,7 +504,7 @@ \tl_const:Nn \c__mermap_supply_call_reference_tl {% - \l__mermap_python\c_space_tl reference + \l__mermap_python_tl\c_space_tl reference -u "\str_use:N\l__mermap_supply_url_str" -at "\str_use:N\l__mermap_supply_attribution_str" -atp "\str_use:N\l__mermap_supply_attribution_print_str" @@ -524,7 +524,7 @@ \tl_const:Nn \c__mermap_supply_call_areafit_tl {% - \l__mermap_python\c_space_tl areafit + \l__mermap_python_tl\c_space_tl areafit -u "\str_use:N\l__mermap_supply_url_str" -at "\str_use:N\l__mermap_supply_attribution_str" -atp "\str_use:N\l__mermap_supply_attribution_print_str" @@ -573,7 +573,7 @@ \tl_new:N \l__mermap_last_mdfivesum_tl \tl_new:N \l__mermap_mdfivesum_tl -\tl_new:N \l__mermap_python +\tl_new:N \l__mermap_python_tl \tl_new:N \l__mermap_supply_align_tl \tl_new:N \l__mermap_supply_basename_tl \tl_new:N \l__mermap_supply_call_tl @@ -748,7 +748,7 @@ { definition~prefix .code:n = {\str_set:Nn\l__mermap_definition_prefix_str{#1}}, python .code:n = { - \tl_set:Nx \l__mermap_python {#1~maptiles.texpy} + \tl_set:Nx \l__mermap_python_tl {#1~maptiles.texpy} }, } @@ -841,9 +841,7 @@ { \__mermap_supplymap_call: } - %\dim_gset_eq:NN \g_tmpa_dim \l__mermap_tile_size_dim \group_end: - %\dim_set_eq:NN \l__mermap_tile_size_dim \g_tmpa_dim } \NewDocumentCommand \mrcsupplymap { O{} m } @@ -853,14 +851,24 @@ } -\msg_new:nnn { mercatormap }{ shell-escape } +\msg_new:nnnn { mercatormap }{ shell-escape } { You~must~invoke~LaTeX~with~the~--shell-escape~flag~to~produce~map~'#1'. } + { The~--shell-escape~flag~is~needed,~because~a~Python~sript~has~to~be~called;~see~package~documentation. } -\msg_new:nnn { mercatormap }{ target-resource } +\msg_new:nnnn { mercatormap }{ target-resource } { Target~and~produced~resource~are~different~for~map~'#1'. } + { Your~target~was~'\l__mermap_supply_target_tl'.\\ + The~produced~resource~is~'\l__mermap_tile_resource_tl'.\\ + Check,~if~'\l__mermap_supply_target_tl'~is~available~via~'\str_use:N\l__mermap_supply_url_str'\\ + or~if~the~zoom~value~is~too~large. + } -\msg_new:nnn { mercatormap }{ definition-production } +\msg_new:nnnn { mercatormap }{ definition-production } { Map~definition~file~not~produced~for~map~'#1'. } + { **~The~failed~shell~command~was:\\ + \l__mermap_supply_call_tl\\ + **~Python~setup~correct? + } \cs_new:Npn \__mermap_supplymap_call: { @@ -868,11 +876,11 @@ c__mermap_supply_call_\l__mermap_supply_type_tl _tl } \tl_set:Nx \l__mermap_supply_call_tl \l_tmpa_tl \tl_set:Nx \l__mermap_mdfivesum_tl { \pdf@mdfivesum{\l__mermap_supply_call_tl} } - \tl_clear:N \l__mermap_last_mdfivesum_tl - \file_if_exist_input:n {\l__mermap_definition_id_str.md5} - \str_if_eq:VVTF \l__mermap_mdfivesum_tl \l__mermap_last_mdfivesum_tl + \file_if_exist:nTF {\l__mermap_definition_id_str.def} { - \file_if_exist:nF {\l__mermap_definition_id_str.def} + \tl_clear:N \l__mermap_last_mdfivesum_tl + \file_if_exist_input:n {\l__mermap_definition_id_str.md5} + \str_if_eq:VVF \l__mermap_mdfivesum_tl \l__mermap_last_mdfivesum_tl { \__mermap_supplymap_call_shell: } @@ -904,17 +912,15 @@ } { \__mermap_write_mdfive:n {false} - \msg_warning:nnx { mercatormap }{ target-resource }{ \l__mermap_definition_id_str } + \msg_error:nnx { mercatormap }{ target-resource }{ \l__mermap_definition_id_str } } } { - \__mermap_write_mdfive:n {false} - \msg_warning:nnx { mercatormap }{ definition-production }{ \l__mermap_definition_id_str } + \msg_error:nnx { mercatormap }{ definition-production }{ \l__mermap_definition_id_str } } } { - \__mermap_write_mdfive:n {false} - \msg_warning:nnx { mercatormap }{ shell-escape }{ \l__mermap_definition_id_str } + \msg_error:nnx { mercatormap }{ shell-escape }{ \l__mermap_definition_id_str } } } @@ -1604,8 +1610,6 @@ double = true, transparent = true, height = 2mm, - %at = {([xshift=-10mm,yshift=5mm]mrcmap.south~east)}, - %placement = above~left, at = {(0,0)}, placement =, major~style =, @@ -1719,6 +1723,8 @@ %---- markers ------------------------------------------------------------------ \bool_new:N \l__mermap_marker_show_bool +\bool_new:N \l__mermap_marker_use_links +\bool_new:N \l__mermap_marker_use_urls \fp_new:N \l__mermap_marker_angle_fp \fp_new:N \l__mermap_marker_inner_radius_fp @@ -1733,9 +1739,14 @@ \tl_new:N \l__mermap_marker_category_tl \tl_new:N \l__mermap_marker_contents_tl \tl_new:N \l__mermap_marker_font_tl +\tl_new:N \l_mermap_marker_generic_tl +\tl_new:N \l__mermap_marker_link_tl \tl_new:N \l__mermap_marker_pictocontents_tl \tl_new:N \l__mermap_marker_type_tl -\tl_new:N \l__mermap_marker_uuid_tl +\tl_new:N \l__mermap_marker_url_tl +\tl_new:N \l_mermap_marker_uuid_tl + + \use:x @@ -1763,8 +1774,10 @@ alias .tl_set:N = \l__mermap_marker_alias_tl, contents .tl_set:N = \l__mermap_marker_contents_tl, pictocontents .tl_set:N = \l__mermap_marker_pictocontents_tl, - % name .meta:nn = {mermap/marker}{contents={#1},alias={#1}}, - uuid .tl_set:N = \l__mermap_marker_uuid_tl, + uuid .tl_set:N = \l_mermap_marker_uuid_tl, + generic .tl_set:N = \l_mermap_marker_generic_tl, + url .tl_set:N = \l__mermap_marker_url_tl, + link .tl_set:N = \l__mermap_marker_link_tl, category .tl_set:N = \l__mermap_marker_category_tl, type .tl_set:N = \l__mermap_marker_type_tl, angle .fp_set:N = \l__mermap_marker_angle_fp, @@ -1787,6 +1800,10 @@ { \str_if_eq:VnT \l__mermap_marker_category_tl {#1} {\bool_set_false:N \l__mermap_marker_show_bool} }, hide~all~but~category .code:n = { \str_if_eq:VnF \l__mermap_marker_category_tl {#1} {\bool_set_false:N \l__mermap_marker_show_bool} }, + use~links .bool_set:N = \l__mermap_marker_use_links, + ignore~links .bool_set_inverse:N = \l__mermap_marker_use_links, + use~urls .bool_set:N = \l__mermap_marker_use_urls, + ignore~urls .bool_set_inverse:N = \l__mermap_marker_use_urls, first~options .tl_set:N = \l__mermap_every_marker_first_tl, last~options .tl_set:N = \l__mermap_every_marker_last_tl, style .choice: =, @@ -1799,7 +1816,6 @@ latitude = 12, longitude = 49, use~inside = map, - % name = noname, contents =, alias = noname, pictocontents =, @@ -1815,8 +1831,13 @@ font = \sffamily\small, type = classic, uuid =, + generic =, + url =, + link =, category =, show = true, + use~links = true, + use~urls = true, } @@ -1824,7 +1845,8 @@ \NewExpandableDocumentCommand\mrcmarkerlongitude{}{\fp_to_decimal:N \l__mermap_marker_longitude_fp} \NewDocumentCommand\mrcmarkercontents{}{\tl_use:N \l__mermap_marker_contents_tl} \NewDocumentCommand\mrcmarkerpictocontents{}{\tl_use:N \l__mermap_marker_pictocontents_tl} -\NewExpandableDocumentCommand\mrcmarkeruuid{}{\tl_use:N \l__mermap_marker_uuid_tl} +\NewExpandableDocumentCommand\mrcmarkeruuid{}{\tl_use:N \l_mermap_marker_uuid_tl} +\NewDocumentCommand\mrcmarkergeneric{}{\tl_use:N \l_mermap_marker_generic_tl} \NewExpandableDocumentCommand\mrcmarkercategory{}{\tl_use:N \l__mermap_marker_category_tl} \NewDocumentCommand\mrcmarkerfont{}{\tl_use:N \l__mermap_marker_font_tl} \NewExpandableDocumentCommand\mrcmarkerangle{}{\fp_to_decimal:N \l__mermap_marker_angle_fp} @@ -1849,6 +1871,56 @@ } +\cs_new_nopar:Npn \__mermap_hyper_path:n #1 + { + \pgfpointanchor{path~picture~bounding~box}{south~west} + \pgf@xb-\pgf@x + \pgf@yb-\pgf@y + \pgfpointanchor{path~picture~bounding~box}{north~east} + \advance\pgf@xb\pgf@x + \advance\pgf@yb\pgf@y + \advance\pgf@x-1bp + \advance\pgf@y-1bp + \advance\pgf@xb-2bp + \advance\pgf@yb-2bp + \pgftext[at={\pgfqpoint{\pgf@x}{\pgf@y}},right,top] + { + \hypersetup{pdfborder=0~0~0} + #1{\vrule height\pgf@yb depth0ptwidth0pt\vrule height0ptdepth0ptwidth\pgf@xb} + } + } + + +\cs_new_nopar:Npn \__mermap_hyper_path_insert: + { + \cs_if_exist:NT \hypersetup + { + \bool_if:NT \l__mermap_marker_use_urls + { + \tl_if_empty:NF \l__mermap_marker_url_tl + { + \__mermap_hyper_path:n {\href{\l__mermap_marker_url_tl}} + } + } + \bool_if:NT \l__mermap_marker_use_links + { + \tl_if_empty:NF \l__mermap_marker_link_tl + { + \__mermap_hyper_path:n {\hyperlink{\l__mermap_marker_link_tl}} + } + } + } + } + + +\tikzset + { + mrchyperpath/.style = + { + path~picture = {\__mermap_hyper_path_insert:} + } + } + \NewDocumentCommand \mrcmarker { m } { \group_begin: @@ -1890,7 +1962,7 @@ \node[circle,fill=black,inner~sep=0pt,minimum~width=4pt, pin={[text=mrcmarkertext,font=\mrcmarkerfont, pin~distance=\mrcmarkerradius, - pin~position=\mrcmarkerangle,mrcnodestyle]\mrcmarkercontents}] {}; + pin~position=\mrcmarkerangle,mrcnodestyle,mrchyperpath]\mrcmarkercontents}] {}; } \__mermap_new_marker_type:nn {pin} @@ -1900,7 +1972,7 @@ \node[fill=white,draw=none,text=mrcmarkertext, above,font=\mrcmarkerfont,inner~sep=0.5mm,align=center, line~width=0mm,xshift=\mrcmarkershift, - fill~opacity=0.7,text~opacity=1,xshift=0mm,mrcnodestyle] + fill~opacity=0.7,text~opacity=1,xshift=0mm,mrcnodestyle,mrchyperpath] (pin_node) at (0,0.5) {\mrcmarkercontents}; \path[draw=mrcmarkerdraw,fill=none,line~join=round,mrcpathstyle] (0,0) -- (0.1,0.5) -- (pin_node.south~east) -- (pin_node.north~east) @@ -1915,7 +1987,7 @@ \node[fill=white,draw=none,text=mrcmarkertext, below,font=\mrcmarkerfont,inner~sep=0.5mm,align=center, line~width=0mm,xshift=\mrcmarkershift, - fill~opacity=0.7,text~opacity=1,xshift=0mm,mrcnodestyle] + fill~opacity=0.7,text~opacity=1,xshift=0mm,mrcnodestyle,mrchyperpath] (pin_node) at (0,-0.5) {\mrcmarkercontents}; \path[draw=mrcmarkerdraw,fill=none,line~join=round,mrcpathstyle] (0,0) -- (-0.1,-0.5) -- (pin_node.north~west) -- (pin_node.south~west) @@ -1930,7 +2002,7 @@ \tl_set:Nn \l_tmpb_tl {\fp_to_dim:n{\l__mermap_marker_radius_fp*0.552}} \__mermap_tikz_path_begin:n { - line~join=bevel,draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle + line~join=bevel,draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath } \pgfpathmoveto{\pgfpoint{0pt}{\fp_to_dim:n{-2*\l__mermap_marker_radius_fp-\l__mermap_marker_shift_fp}}} \pgfpathcurveto{\pgfpoint{\l_tmpb_tl}{-\l_tmpa_tl}}{\pgfpoint{\l_tmpa_tl}{-\l_tmpb_tl}} @@ -1992,21 +2064,21 @@ \__mermap_new_marker_type:nn {knob} { - \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle] + \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath] circle (\fp_to_dim:N\l__mermap_marker_radius_fp); \__mermap_tikz_circle_node: } \__mermap_new_marker_type:nn {pictoknob} { - \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle] + \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath] circle (\fp_to_dim:N\l__mermap_marker_radius_fp); \tl_use:N \l__mermap_marker_pictocontents_tl } \__mermap_new_marker_type:nn {pictoknobring} { - \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,even~odd~rule] + \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath,even~odd~rule] circle (\fp_to_dim:N\l__mermap_marker_radius_fp) circle (\fp_to_dim:N\l__mermap_marker_inner_radius_fp); \tl_use:N \l__mermap_marker_pictocontents_tl @@ -2018,14 +2090,14 @@ \path[draw=mrcmarkerdraw,very~thin] (45 \c_colon_str \l_tmpa_tl)--(225\c_colon_str \l_tmpa_tl) (135\c_colon_str \l_tmpa_tl)--(315\c_colon_str \l_tmpa_tl); - \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,even~odd~rule] + \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath,even~odd~rule] circle (\l_tmpa_tl) circle (\fp_to_dim:N\l__mermap_marker_inner_radius_fp); } \__mermap_new_marker_type:nn {markx} { \tl_set:Nn \l_tmpa_tl {\fp_to_dim:N\l__mermap_marker_radius_fp} - \path[line~join=bevel,draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle] + \path[line~join=bevel,draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath] (0,0) -- (35 \c_colon_str \l_tmpa_tl) -- (55 \c_colon_str \l_tmpa_tl) -- cycle (0,0) -- (125 \c_colon_str \l_tmpa_tl) -- (145 \c_colon_str \l_tmpa_tl) -- cycle (0,0) -- (215 \c_colon_str \l_tmpa_tl) -- (235 \c_colon_str \l_tmpa_tl) -- cycle diff --git a/Master/texmf-dist/tex/latex/mercatormap/mercatorpy.def b/Master/texmf-dist/tex/latex/mercatormap/mercatorpy.def index fe608f47b49..c148e26116f 100644 --- a/Master/texmf-dist/tex/latex/mercatormap/mercatorpy.def +++ b/Master/texmf-dist/tex/latex/mercatormap/mercatorpy.def @@ -1,6 +1,6 @@ \begin{filecontents*}[overwrite]{maptiles.texpy} """ -The LaTeX package mercatormap - version 1.00 (2020/04/20) +The LaTeX package mercatormap - version 1.01 (2020/05/05) maptiles.texpy: Python script for map tile download ------------------------------------------------------------------------------------------- @@ -28,7 +28,7 @@ from pathlib import Path from PIL import Image -packageversion = '1.00 (2020/04/20)' +packageversion = '1.01 (2020/05/05)' def gd(x): diff --git a/Master/texmf-dist/tex/latex/mercatormap/mercatorsupplier.def b/Master/texmf-dist/tex/latex/mercatormap/mercatorsupplier.def index 438374ba26f..dd3544d7ee7 100644 --- a/Master/texmf-dist/tex/latex/mercatormap/mercatorsupplier.def +++ b/Master/texmf-dist/tex/latex/mercatormap/mercatorsupplier.def @@ -1,4 +1,4 @@ -%% The LaTeX package mercatormap - version 1.00 (2020/04/20) +%% The LaTeX package mercatormap - version 1.01 (2020/05/05) %% mercatorsupplier.def: predefined map supplier list %% %% ------------------------------------------------------------------------------------------- -- cgit v1.2.3