getmap (20jul14)

git-svn-id: svn://tug.org/texlive/trunk@34670 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 37 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/latex/getmap/getmap.sty b/Master/texmf-dist/tex/latex/getmap/getmap.sty
index de8d3d34243..424f14ea8e7 100644
--- a/Master/texmf-dist/tex/latex/getmap/getmap.sty
+++ b/Master/texmf-dist/tex/latex/getmap/getmap.sty
@@ -27,7 +27,7 @@
 %% This work consists of all files listed in manifest.txt.
 %% 
 \NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{getmap}[2014/07/15 v1.2 getmap.sty - Josef Kleber (C) 2014]%
+\ProvidesPackage{getmap}[2014/07/19 v1.3 getmap.sty - Josef Kleber (C) 2014]%
 \RequirePackage{xkeyval}%
 \RequirePackage{stringenc}%
 \RequirePackage{ifthen}%
@@ -53,6 +53,9 @@
 \GM@JK@define@key{GM@JK}{getmap}{imagetype}{png}%
 \GM@JK@define@key{GM@JK}{getmap}{color}{yellow_1}%
 \GM@JK@define@key{GM@JK}{getmap}{number}{1}%
+\GM@JK@define@key{GM@JK}{getmap}{heading}{0}%
+\GM@JK@define@key{GM@JK}{getmap}{fov}{90}%
+\GM@JK@define@key{GM@JK}{getmap}{pitch}{0}%
 \GM@JK@define@key{GM@JK}{getmap}{file}{getmap}%
 \GM@JK@define@key{GM@JK}{getmap}{inputencoding}{}%
 \GM@JK@define@key{GM@JK}{getmap}{overwrite}{true}%
@@ -73,7 +76,7 @@
   \gdef\GM@JK@inputencoding{utf8}%
 }%
 \newif\ifGM@JK@writexviii\GM@JK@writexviiifalse%
-\ExecuteOptionsX{mode,xsize,ysize,scale,zoom,type,imagetype,color,number,file}%
+\ExecuteOptionsX{mode,xsize,ysize,scale,zoom,type,imagetype,color,number,file,heading,fov,pitch}%
 \ProcessOptionsX\relax%
 \ifthenelse{\equal{\GM@JK@mode}{gm}}%
 {%
@@ -117,17 +120,36 @@
                                   \space-o\space \GM@JK@file}%
     }%
     {%
-      \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-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-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}%
+        }%
+        {%
+          \PackageError{getmap}{invalid mode}{invalid mode! Use osm, gm or gsv!}%
+        }%
+      }%
     }%
   \else%
     \PackageError{getmap}{\write18 disabled}%
@@ -149,6 +171,8 @@
     }%
     {}%
     \setkeys{getmap}{#1}%
+    \ifthenelse{\equal{\GM@JK@mode}{gsv}}%
+    {\def\GM@JK@imagetype{jpg}}{}%
     \PackageInfo{getmap}{using \GM@JK@inputencoding\space encoding}%
     \def\GM@JK@location{#2}%
     \StringEncodingConvert%