gitinfo2 (14nov15)

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

1 files changed, 16 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex/gitinfo2/gitexinfo.sty b/Master/texmf-dist/tex/latex/gitinfo2/gitexinfo.sty
index 78ecb9ea294..ed5b3c27fba 100644
--- a/Master/texmf-dist/tex/latex/gitinfo2/gitexinfo.sty
+++ b/Master/texmf-dist/tex/latex/gitinfo2/gitexinfo.sty
@@ -1,5 +1,5 @@
 % gitexinfo.sty
-% Copyright 2014 Brent Longborough
+% Copyright 2015 Brent Longborough
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -18,7 +18,7 @@
 %     and gitPseudoHeadInfo.gin
 % -----------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{gitexinfo}[2015/11/08 v2.0.5 Auxiliary package for gitinfo2]
+\ProvidesPackage{gitexinfo}[2015/11/14 v2.0.6 Auxiliary package for gitinfo2]
 \SetupKeyvalOptions{family=gitinfo,prefix=gitInf@}
 \DeclareStringOption{shash}
 \DeclareStringOption{lhash}
@@ -38,18 +38,18 @@
 \ProcessKeyvalOptions*
 \renewcommand{\gitAbbrevHash}{\gitInf@shash}
 \renewcommand{\gitHash}{\gitInf@lhash}
-\renewcommand{\gitAuthorName}{\gitInf@authname}
+\renewcommand{\gitAuthorName}{\detokenize\expandafter{\gitInf@authname}}
 \renewcommand{\gitAuthorEmail}{\gitWrapEmail{\gitInf@authemail}}
 \renewcommand{\gitAuthorDate}{\gitInf@authsdate}
 \renewcommand{\gitAuthorIsoDate}{\gitInf@authidate}
 \renewcommand{\gitAuthorUnixDate}{\gitInf@authudate}
-\renewcommand{\gitCommitterName}{\gitInf@commname}
+\renewcommand{\gitCommitterName}{\detokenize\expandafter{\gitInf@commname}}
 \renewcommand{\gitCommitterEmail}{\gitWrapEmail{\gitInf@commemail}}
 \renewcommand{\gitCommitterDate}{\gitInf@commsdate}
 \renewcommand{\gitCommitterIsoDate}{\gitInf@commidate}
 \renewcommand{\gitCommitterUnixDate}{\gitInf@commudate}
-\renewcommand{\gitFirstTagDescribe}{\gitInf@firsttagdescribe}
-\renewcommand{\gitReferences}{\gitInf@refnames}
+\renewcommand{\gitFirstTagDescribe}{\detokenize\expandafter{\gitInf@firsttagdescribe}}
+\renewcommand{\gitReferences}{\detokenize\expandafter{\gitInf@refnames}}
 \newcommand{\git@vtag}[1]{%
     \def\do##1{%
         \StrCut{##1}{tag: }\lcut\rcut%
@@ -84,7 +84,7 @@
     \IfEq{\bcut}{}{}{%
         \IfEq{\bcut}{HEAD}{%            detached head?
         }{%                             no - we have the branch name
-            \renewcommand{\gitBranch}{\bcut}%
+            \renewcommand{\gitBranch}{\detokenize\expandafter{\bcut}}%
         }%
     }%
 }%
@@ -110,9 +110,9 @@
         \StrGobbleRight{\gitInf@describe}{9}[\gitInf@describe]%   Remove -g<hash>
         \StrCount{\gitInf@describe}{-}[\gitInf@mcount]%           Find last -
         \StrCut[\gitInf@mcount]{\gitInf@describe}{-}{\gitInf@rel}{\gitInf@off}
-        \renewcommand{\gitRel}{\gitInf@rel}
-        \renewcommand{\gitRels}{\space\gitInf@rel}
-        \renewcommand{\gitReln}{\space\gitInf@rel}
+        \renewcommand{\gitRel}{\detokenize\expandafter{\gitInf@rel}}
+        \renewcommand{\gitRels}{\space\gitRel}
+        \renewcommand{\gitReln}{\space\gitRel}
         \renewcommand{\gitRoff}{\gitInf@off}
         \renewcommand{\gitDescribe}{#1}
     }%
@@ -130,4 +130,9 @@
 }{%
     \renewcommand{\git@tagmark}{\\Head tags: \gitTags}
 }
-\renewcommand{\gitMark}{Branch: \gitBranch\,@\,\gitAbbrevHash{} \textbullet{} Release:\gitReln{} (\gitAuthorDate)\git@tagmark}
+\renewcommand{\gitMark}{%
+    Branch: \gitBranch\,@\,\gitAbbrevHash{} 
+    \textbullet{} 
+    Release:\gitReln{} 
+    (\gitAuthorDate)\git@tagmark%
+    }