diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/gitinfo2/README | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/gitinfo2/gitPseudoHeadInfo.gin | 26 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.pdf | bin | 125252 -> 126814 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.tex | 47 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/gitinfo2/gitinfotest.tex | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/gitinfo2/post-xxx-sample.txt | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/gitinfo2/gitexinfo.sty | 27 |
7 files changed, 62 insertions, 46 deletions
diff --git a/Master/texmf-dist/doc/latex/gitinfo2/README b/Master/texmf-dist/doc/latex/gitinfo2/README index a84de3d24f4..88a293b792d 100644 --- a/Master/texmf-dist/doc/latex/gitinfo2/README +++ b/Master/texmf-dist/doc/latex/gitinfo2/README @@ -10,6 +10,6 @@ please see the accompanying manual: gitinfo2.pdf. Change History ~~~~~~~~~~~~~~ -Current Release: 2.0.5 2015-11-09 +Current Release: 2.0.6 2015-11-14 Please see gitinfo2.pdf in the package documentation directory diff --git a/Master/texmf-dist/doc/latex/gitinfo2/gitPseudoHeadInfo.gin b/Master/texmf-dist/doc/latex/gitinfo2/gitPseudoHeadInfo.gin index f89cdfd4bc6..0a8766bb925 100644 --- a/Master/texmf-dist/doc/latex/gitinfo2/gitPseudoHeadInfo.gin +++ b/Master/texmf-dist/doc/latex/gitinfo2/gitPseudoHeadInfo.gin @@ -1,17 +1,17 @@ \usepackage[% - shash={c8c0570}, - lhash={c8c0570274cae7dce60a19396493512273a42e84}, + shash={8b7f039}, + lhash={8b7f039fe973cd99a90aecf01df3b18d193f9534}, authname={Brent Longborough}, - authemail={brent+ctancontrib@longborough.org}, - authsdate={2015-11-08}, - authidate={2015-11-08 20:41:51 +0000}, - authudate={1447015311}, + authemail={brent@longborough.org}, + authsdate={2015-11-14}, + authidate={2015-11-14 16:31:15 +0000}, + authudate={1447518675}, commname={Brent Longborough}, - commemail={brent+ctancontrib@longborough.org}, - commsdate={2015-11-08}, - commidate={2015-11-08 20:41:51 +0000}, - commudate={1447015311}, - refnames={ (HEAD -> CTAN)}, - firsttagdescribe={2.0.5-2-gc8c0570}, - reltag={2.0.5-2-gc8c0570} + commemail={brent@longborough.org}, + commsdate={2015-11-14}, + commidate={2015-11-14 16:31:15 +0000}, + commudate={1447518675}, + refnames={ (HEAD -> CTAN, tag: 2.0.6, origin/CTAN)}, + firsttagdescribe={2.0.6}, + reltag={2.0.6-0-g8b7f039} ]{gitexinfo}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.pdf b/Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.pdf Binary files differindex 4d20f8ee2b2..bd652ec04b4 100644 --- a/Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.pdf +++ b/Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.pdf diff --git a/Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.tex b/Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.tex index 5fad32c47f6..17d75428322 100644 --- a/Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.tex +++ b/Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.tex @@ -1,5 +1,5 @@ % gitinfo2.tex -% 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 @@ -701,6 +701,10 @@ you can redefine the \tpname\ wrapper in this way: \renewcommand{\gitWrapEmail}[1]{\url{#1}} \end{verbatim} +Please note that from Release 2.0.6 this precaution is optional, +since \tpname\ now detokenises Author and Committer names and email addresses, +and all \git\ reference names. + % - - - - - - - - - - - - - - - - - - - - - - - - - - - \section{For \sfit{memoir} users} \label{sect:memuser} @@ -818,6 +822,15 @@ and a clean working copy. \chapter{Etc} \section{Release notes} +\rpara{R2.0.6: 2015-11-14 -- Detokenise the metadata} +\begin{itemize} +\item Detokenise names, emails, branches, and tags. +This means you should be able to use branch names like \verb!yes@top_dol$lar! without +\TeX\ chewing you out. +I'd welcome feedback on this, +as I have an uneasy feeling there may be unintended consequences. +\end{itemize} + \rpara{R2.0.5: 2015-11-09 -- Bug fixes and general improvements} \begin{itemize} \item Support for the \sfit{datetime2} package @@ -881,25 +894,26 @@ I think I owe a special mention, both for ideas and code, to Clea Rees, Jörg Weber, and Kai Mindermann for improving the handling of \git\ references; to Jörg Weber for watermarking; -and to Michael Rans and Ross Vandegrift for -the deduplication of \metaname. +to Michael Rans and Ross Vandegrift for +the deduplication of \metaname; +and to \sfit{ivokabadshow} on GitHub +for a welcome example of how to detokenise the metadata. My sincere thanks, too, to Adrian Burd, -cedb12 (on GitHub), +cedb12 (GitHub), Maximilian Held, Johannes Hoetzer, -ivokabadshow (on GitHub), Mikko Korpela, Martin W Leidig, Enrico Malizia, Ken Mankoff, Ryan Matlock, Robbie Morrison, -Nik (of gwdg nokta de), -Omid (of gmail nokta com), +Nik (gwdg nokta de), +Omid (gmail nokta com), Sasaki~Suguru, -Tor\-bjørn~T (on GitHub and TeX.SE), +Tor\-bjørn~T (GitHub and TeX.SE), and Felix Wenger. @@ -910,21 +924,20 @@ And, of course, for \TeX{} Live and everything else. Finally, but by no means least, my thanks to the \textsc{Ctan} elves, and their dæmons, particularly, in my case, -Robin Fairbairns, Manfred Lotz, and Petra Rübe-Pugliese, +Ina Dau, +Manfred Lotz, +Petra Rübe-Pugliese, +and +Robin Fairbairns, for their infinite patience and unstinting dedication to the \TeX\ community. -The failings, of course, I claim for my self. -Among these, a major one appears to be my incapacity -decently to package this stuff for -\textsc{Ctan} and \TeX{}~Live. -Now that I have finally built a Makefile, -\emph{either} this will improve \emph{or} -I now have \emph{two} problems. +The failings, of course, I claim for myself. + % - - - - - - - - - - - - - - - - - - - - - - - - - - - \clearpage \section{Copyright \& licence} -Copyright \copyright\ 2014, Brent Longborough, +Copyright \copyright\ \DTMfetchyear{gitdate}, Brent Longborough, who has asserted his moral right to be identified as the author of this work. diff --git a/Master/texmf-dist/doc/latex/gitinfo2/gitinfotest.tex b/Master/texmf-dist/doc/latex/gitinfo2/gitinfotest.tex index a01310fc2e3..fe516988444 100644 --- a/Master/texmf-dist/doc/latex/gitinfo2/gitinfotest.tex +++ b/Master/texmf-dist/doc/latex/gitinfo2/gitinfotest.tex @@ -13,8 +13,6 @@ % End of tweak % ===================================================== \usepackage[missing={(Oh my!)},dirty={Oh no!},markifdirty,marknotags]{gitinfo2} -\usepackage{hyperref} -\renewcommand{\gitWrapEmail}[1]{\url{#1}} \frenchspacing \begin{document} diff --git a/Master/texmf-dist/doc/latex/gitinfo2/post-xxx-sample.txt b/Master/texmf-dist/doc/latex/gitinfo2/post-xxx-sample.txt index f04d4130582..2fc05f92136 100644 --- a/Master/texmf-dist/doc/latex/gitinfo2/post-xxx-sample.txt +++ b/Master/texmf-dist/doc/latex/gitinfo2/post-xxx-sample.txt @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2014 Brent Longborough +# Copyright 2015 Brent Longborough # Part of gitinfo2 package Version 2 -# Release 2.0.5 +# Release 2.0.6 2015-11-14 # Please read gitinfo2.pdf for licencing and other details # ----------------------------------------------------- # Post-{commit,checkout,merge} hook for the gitinfo2 package 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% + } |