summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-11-21 22:29:15 +0000
committerKarl Berry <karl@freefriends.org>2015-11-21 22:29:15 +0000
commit98aafffa575aca5e47e04b69c70a87d7c95a37df (patch)
treeb90b7f2abba7cbebc38e48dd0b5a2847be8feb5d /Master
parent8596be0f15d110b8655d08aa44db806eac9729e3 (diff)
gitinfo2 (20nov15)
git-svn-id: svn://tug.org/texlive/trunk@38913 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/gitinfo2/README2
-rw-r--r--Master/texmf-dist/doc/latex/gitinfo2/gitHeadLocal.gin17
-rw-r--r--Master/texmf-dist/doc/latex/gitinfo2/gitPseudoHeadInfo.gin17
-rw-r--r--Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.pdfbin126814 -> 127175 bytes
-rw-r--r--Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.tex50
-rw-r--r--Master/texmf-dist/doc/latex/gitinfo2/gitinfotest.tex14
-rw-r--r--Master/texmf-dist/doc/latex/gitinfo2/post-xxx-sample.txt2
-rw-r--r--Master/texmf-dist/tex/latex/gitinfo2/gitexinfo.sty4
-rw-r--r--Master/texmf-dist/tex/latex/gitinfo2/gitinfo2.sty14
9 files changed, 65 insertions, 55 deletions
diff --git a/Master/texmf-dist/doc/latex/gitinfo2/README b/Master/texmf-dist/doc/latex/gitinfo2/README
index 88a293b792d..dac9b822943 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.6 2015-11-14
+Current Release: 2.0.7 2015-11-22
Please see gitinfo2.pdf in the package documentation directory
diff --git a/Master/texmf-dist/doc/latex/gitinfo2/gitHeadLocal.gin b/Master/texmf-dist/doc/latex/gitinfo2/gitHeadLocal.gin
new file mode 100644
index 00000000000..6ef40822df7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/gitinfo2/gitHeadLocal.gin
@@ -0,0 +1,17 @@
+\usepackage[%
+ shash={10541bd},
+ lhash={10541bd1db148ba538c521d4168a9bdca89f37cd},
+ authname={Brent Longborough},
+ authemail={brent+ctancontrib@longborough.org},
+ authsdate={2015-11-20},
+ authidate={2015-11-20 21:17:46 +0000},
+ authudate={1448054266},
+ commname={Brent Longborough},
+ commemail={brent+ctancontrib@longborough.org},
+ commsdate={2015-11-20},
+ commidate={2015-11-20 21:17:46 +0000},
+ commudate={1448054266},
+ refnames={ (HEAD -> CTAN, develop)},
+ firsttagdescribe={2.0.7-1-g10541bd},
+ reltag={2.0.7-1-g10541bd}
+ ]{gitexinfo} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/gitinfo2/gitPseudoHeadInfo.gin b/Master/texmf-dist/doc/latex/gitinfo2/gitPseudoHeadInfo.gin
deleted file mode 100644
index 0a8766bb925..00000000000
--- a/Master/texmf-dist/doc/latex/gitinfo2/gitPseudoHeadInfo.gin
+++ /dev/null
@@ -1,17 +0,0 @@
-\usepackage[%
- shash={8b7f039},
- lhash={8b7f039fe973cd99a90aecf01df3b18d193f9534},
- authname={Brent Longborough},
- authemail={brent@longborough.org},
- authsdate={2015-11-14},
- authidate={2015-11-14 16:31:15 +0000},
- authudate={1447518675},
- commname={Brent Longborough},
- 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
index bd652ec04b4..14e22b307b0 100644
--- a/Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.pdf
+++ b/Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.tex b/Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.tex
index 17d75428322..5f5ee4c0557 100644
--- a/Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.tex
+++ b/Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.tex
@@ -15,26 +15,14 @@
% This work consists of these files:
% gitinfo2.sty, gitexinfo.sty, gitinfo2.tex, gitinfo2.pdf,
% gitinfotest.tex, post-xxx-sample.txt,
-% and gitPseudoHeadInfo.gin
+% and gitHeadLocal.gin
% -----------------------------------------------------
\documentclass[a4paper,12pt,twoside,openany]{memoir}
% =====================================================
-% This is a tweak to allow this document to be formatted
-% even when it doesn't live in an adequately configured
-% git repository. Please do not try this at home.
-% You have been warned.
-% -----------------------------------------------------
-\makeatletter
-\newcommand{\GI@repo@prefix}{}
-\newcommand{\GI@githeadinfo@file}{\GI@repo@prefix./gitPseudoHeadInfo.gin}
-\makeatother
-% -----------------------------------------------------
-% End of tweak
-% =====================================================
\usepackage[british]{babel}
\selectlanguage{british}
\usepackage[style=iso]{datetime2}
-\usepackage[pcount,grumpy,mark,markifdirty]{gitinfo2}
+\usepackage[local,pcount,grumpy,mark,markifdirty]{gitinfo2}
\usepackage{tgpagella}
\usepackage{tgadventor}
\usepackage{fontspec}
@@ -79,6 +67,7 @@
\newcommand{\tpname}{\sfit{gitinfo2}}
\newcommand{\tpfname}{\textsf{gitinfo2.sty}}
\newcommand{\ginname}{gitHeadInfo.gin}
+\newcommand{\locname}{\texttt{gitHeadLocal.gin}}
\newcommand{\metaname}{\texttt{\ginname}}
\newcommand{\metapath}{\texttt{.git/\ginname}}
% -----------------------------------------------------
@@ -150,9 +139,16 @@ the metadata you need at any point in the document.
\end{enumerate}
It is important to note that \tpname\ reads the metadata
-with the equivalent of \texttt{\textbackslash input\{.git/\ginname\}}
+with the equivalent of \texttt{\textbackslash input\{\metapath\}}
in the repository (module or submodule) root.
+Under some circumstances
+(for example, when shipping something to \textsc{Ctan}),
+a document will not be able to access the standard metadata.
+In such a case, an option is available to read the metadata
+from a \emph{manual} copy in the current directory,
+called \locname.
+
If you actually want to use \tpname, then please read on.
But you may just be reading this to see whether it will be useful;
in this case,
@@ -335,8 +331,19 @@ The following options are available:
\begin{description}
+\item[local]
+By default, \tpname\ normally reads \metapath\ (the metadata file).
+If, however, the document needs to be shipped outside of its own repository,
+this file will not be found.
+Under these circumstances, the {\ttfamily local} option may be used.
+This option causes \tpname\ to search
+instead for \locname\ in the current directory \emph{only.}
+Creating this file
+(normally by copying from \metapath) is your responsibility.
+
\item[grumpy]
-By default, If \tpname\ can't find \metaname\ (the metadata file),
+In those cases where \tpname\ is unable to find the metadata file
+(\metapath{}, or \locname\ if the {\ttfamily\bfseries local} option is used),
it will set all the metadata to a common value, ``(None)'',
issue a package warning, and carry on.
If the \texttt{grumpy} option is used,
@@ -822,6 +829,15 @@ and a clean working copy.
\chapter{Etc}
\section{Release notes}
+\rpara{R2.0.7: 2015-11-22 -- Allow metadata to be shipped}
+\begin{itemize}
+\item
+Allow metadata to be read
+from \texttt{\locname} in the current directory,
+rather than from \metapath,
+via the \texttt{local} package option.
+\end{itemize}
+
\rpara{R2.0.6: 2015-11-14 -- Detokenise the metadata}
\begin{itemize}
\item Detokenise names, emails, branches, and tags.
@@ -957,7 +973,7 @@ the Current Maintainer of this work is Brent Longborough.
This work consists of the files
gitinfo2.sty, gitexinfo.sty, gitinfo2.tex, gitinfo2.pdf,
gitinfotest.tex, post-xxx-sample.txt,
-and gitPseudoHeadInfo.gin.
+and gitHeadLocal.gin.
% - - - - - - - - - - - - - - - - - - - - - - - - - - -
\section{From the author}
diff --git a/Master/texmf-dist/doc/latex/gitinfo2/gitinfotest.tex b/Master/texmf-dist/doc/latex/gitinfo2/gitinfotest.tex
index fe516988444..9e5d817abad 100644
--- a/Master/texmf-dist/doc/latex/gitinfo2/gitinfotest.tex
+++ b/Master/texmf-dist/doc/latex/gitinfo2/gitinfotest.tex
@@ -1,18 +1,6 @@
\documentclass[10pt,a4paper,article,showtrims]{memoir}
% =====================================================
-% This is a tweak to allow this document to be formatted
-% even when it doesn't live in an adequately configured
-% git repository. Please do not try this at home.
-% You have been warned.
-% -----------------------------------------------------
-\makeatletter
-\newcommand{\GI@repo@prefix}{}
-\newcommand{\GI@githeadinfo@file}{\GI@repo@prefix./gitPseudoHeadInfo.gin}
-\makeatother
-% -----------------------------------------------------
-% End of tweak
-% =====================================================
-\usepackage[missing={(Oh my!)},dirty={Oh no!},markifdirty,marknotags]{gitinfo2}
+\usepackage[local,missing={(Oh my!)},dirty={Oh no!},markifdirty,marknotags]{gitinfo2}
\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 2fc05f92136..d9e6ddb89f3 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 2015 Brent Longborough
# Part of gitinfo2 package Version 2
-# Release 2.0.6 2015-11-14
+# Release 2.0.7 2015-11-22
# 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 ed5b3c27fba..0f80141185d 100644
--- a/Master/texmf-dist/tex/latex/gitinfo2/gitexinfo.sty
+++ b/Master/texmf-dist/tex/latex/gitinfo2/gitexinfo.sty
@@ -15,10 +15,10 @@
% This work consists of these files:
% gitinfo2.sty, gitexinfo.sty, gitinfo2.tex, gitinfo2.pdf,
% gitinfo2test.tex, post-xxx-sample.txt,
-% and gitPseudoHeadInfo.gin
+% and gitHeadLocal.gin
% -----------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{gitexinfo}[2015/11/14 v2.0.6 Auxiliary package for gitinfo2]
+\ProvidesPackage{gitexinfo}[2015/11/22 v2.0.7 Auxiliary package for gitinfo2]
\SetupKeyvalOptions{family=gitinfo,prefix=gitInf@}
\DeclareStringOption{shash}
\DeclareStringOption{lhash}
diff --git a/Master/texmf-dist/tex/latex/gitinfo2/gitinfo2.sty b/Master/texmf-dist/tex/latex/gitinfo2/gitinfo2.sty
index bfe37398131..29a94918ce1 100644
--- a/Master/texmf-dist/tex/latex/gitinfo2/gitinfo2.sty
+++ b/Master/texmf-dist/tex/latex/gitinfo2/gitinfo2.sty
@@ -1,5 +1,5 @@
% gitinfo2.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
@@ -15,10 +15,10 @@
% This work consists of these files:
% gitinfo2.sty, gitexinfo.sty, gitinfo2.tex, gitinfo2.pdf,
% gitinfo2test.tex, post-xxx-sample.txt,
-% and gitPseudoHeadInfo.gin
+% and gitHeadLocal.gin
% -----------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{gitinfo2}[2015/11/08 v2.0.5 git revision information]
+\ProvidesPackage{gitinfo2}[2015/11/22 v2.0.7 git revision information]
\RequirePackage{etoolbox}
\RequirePackage{xstring}
\RequirePackage{kvoptions}
@@ -26,6 +26,7 @@
\SetupKeyvalOptions{family=gitinfo,prefix=gitInf@}
\DeclareBoolOption{draft}
\DeclareBoolOption{grumpy}
+\DeclareBoolOption{local}
\DeclareBoolOption{pcount}
\DeclareBoolOption{footinfo}
\DeclareBoolOption{mark}
@@ -76,7 +77,12 @@
% private constants
\providecommand{\GI@repo@prefix}{}
-\providecommand{\GI@githeadinfo@file}{\GI@repo@prefix.git/gitHeadInfo.gin}
+\ifbool{gitInf@local}{%
+ \providecommand{\GI@githeadinfo@file}{gitHeadLocal.gin}
+ \def\gitInf@maxdepth{0}
+}{%
+ \providecommand{\GI@githeadinfo@file}{\GI@repo@prefix.git/gitHeadInfo.gin}
+}
\newcommand{\gitInf@dirtflag}{}
\newcommand{\gitInf@describe}{}
\newcommand{\gitInf@mcount}{}