summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-09-07 01:51:10 +0000
committerKarl Berry <karl@freefriends.org>2014-09-07 01:51:10 +0000
commitff0be2556ec1f7fbde7f75caeed672f326246d37 (patch)
tree27bdaf756663383af2ea5c8b1b378f771de2db5a /Master
parent9d74b45adff88c5e53d6845f22e46dfcd2242fd2 (diff)
gitinfo2 (6sep14)
git-svn-id: svn://tug.org/texlive/trunk@35123 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/gitinfo2/README17
-rw-r--r--Master/texmf-dist/doc/latex/gitinfo2/gitPseudoHeadInfo.gin22
-rw-r--r--Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.pdfbin110855 -> 115923 bytes
-rw-r--r--Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.tex53
-rw-r--r--Master/texmf-dist/doc/latex/gitinfo2/post-xxx-sample.txt30
-rw-r--r--Master/texmf-dist/tex/latex/gitinfo2/gitexinfo.sty6
-rw-r--r--Master/texmf-dist/tex/latex/gitinfo2/gitinfo2.sty6
7 files changed, 91 insertions, 43 deletions
diff --git a/Master/texmf-dist/doc/latex/gitinfo2/README b/Master/texmf-dist/doc/latex/gitinfo2/README
index ee18c3b25d9..a1c01d53f24 100644
--- a/Master/texmf-dist/doc/latex/gitinfo2/README
+++ b/Master/texmf-dist/doc/latex/gitinfo2/README
@@ -13,11 +13,14 @@ Change History
Warning: existing repositories using gitinfo will need to be migrated
in order to take advantage of the new features in gitinfo2.
-2014-05-12 2.0 Changed package name for backward compatibility
- Improved documentation
- New tags for improved Release annotation
- A relocated 'gitHeadInfo.gin' file
- Re-engineered page styles for Memoir users
- Watermarking facility
+2014-09-04 2.0.2 Corrected packaging errors
+ Improve default appearance of watermarks
-2011-08-29 1.0 Initial release
+2014-05-12 2.0 Changed package name for backward compatibility
+ Improved documentation
+ New tags for improved Release annotation
+ A relocated 'gitHeadInfo.gin' file
+ Re-engineered page styles for Memoir users
+ Watermarking facility
+
+2011-08-29 1.0 Initial release
diff --git a/Master/texmf-dist/doc/latex/gitinfo2/gitPseudoHeadInfo.gin b/Master/texmf-dist/doc/latex/gitinfo2/gitPseudoHeadInfo.gin
index d1a7f3c5339..59764bc60ab 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={3dfeae6},
- lhash={3dfeae68bb3109a335704f4420958d4394329f15},
+ shash={39d3087},
+ lhash={39d3087dd45197466bfba8587dd4a4a2aa811b18},
authname={Brent Longborough},
authemail={brent+ctancontrib@longborough.org},
- authsdate={2014-05-17},
- authidate={2014-05-17 17:08:57 +0100},
- authudate={1400342937},
+ authsdate={2014-09-04},
+ authidate={2014-09-04 19:40:07 +0100},
+ authudate={1409856007},
commname={Brent Longborough},
commemail={brent+ctancontrib@longborough.org},
- commsdate={2014-05-17},
- commidate={2014-05-17 17:08:57 +0100},
- commudate={1400342937},
- refnames={ (HEAD, develop)},
- firsttagdescribe={2.0-13-g3dfeae6},
- reltag={2.0-13-g3dfeae6}
+ commsdate={2014-09-04},
+ commidate={2014-09-04 19:40:07 +0100},
+ commudate={1409856007},
+ refnames={ (HEAD, tag: 2.0.2, release/2.0.2)},
+ firsttagdescribe={2.0.2},
+ reltag={2.0.2-0-g39d3087}
]{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 30b7c3f396d..8211e4c6073 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 673e746d815..ca8f62d8c8c 100644
--- a/Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.tex
+++ b/Master/texmf-dist/doc/latex/gitinfo2/gitinfo2.tex
@@ -14,7 +14,7 @@
%
% This work consists of these files:
% gitinfo2.sty, gitexinfo.sty, gitinfo2.tex, gitinfo2.pdf,
-% gitinfotest.tex, post-git-sample.txt,
+% gitinfotest.tex, post-xxx-sample.txt,
% and gitPseudoHeadInfo.gin
% -----------------------------------------------------
\documentclass[a4paper,12pt,twoside,openany]{memoir}
@@ -56,9 +56,10 @@
\chapterstyle{bringhurst}
\pagestyle{empty}
\aliaspagestyle{chapter}{empty}
-\settocdepth{section}
+\settocdepth{subsection}
\setsecnumdepth{none}
\newcommand{\bpara}[1]{\par\vspace{\beforeparaskip}\noindent\textbf{#1}\,}
+\newcommand{\rpara}[1]{\par\noindent\textbf{#1}\,}
\newcommand{\sfit}[1]{\textit{#1}}
\newcommand{\git}{\sfit{git}}
\newcommand*{\emailat}{@}
@@ -73,7 +74,6 @@
bookmarksnumbered,
bookmarksopen,
linktocpage,
- frenchlinks,
]{hyperref}
\hypersetup{
pdfauthor={Brent Longborough},
@@ -84,6 +84,7 @@
\frontmatter
% -----------------------------------------------------
\title{%
+ ~\\[2\baselineskip]
\Huge \tpfname\\[2ex]%
\Large A package for accessing metadata\\from the \git\ \textsc{dvcs}
}
@@ -94,17 +95,11 @@
{\centering
Release:\gitReln\ (\gitAbbrevHash)\\
}
-%\vspace*{2\baselineskip}
% -----------------------------------------------------
-\begingroup
\thispagestyle{empty}
-\aliaspagestyle{chapter}{empty}
-\setlength{\afterchapskip}{20pt}
-\let\clearpage\relax
-\let\chaptitlefont\Large\bfseries
-\vspace*{5\baselineskip}
+\aliaspagestyle{chapter}{plain}
+\clearforchapter
\tableofcontents*
-\endgroup
% -----------------------------------------------------
\mainmatter
\pagestyle{giruled}
@@ -340,7 +335,7 @@ For example:
\begin{quote}
{\ttfamily
-[missing=Help!,notags=\{No tags?\},dirty=Yuck]
+[missing=Help!,notags=\{No\,tags?\},dirty=Eww!]
}
\end{quote}
If you have complex needs, as in the second example,
@@ -619,11 +614,12 @@ by redefining one or more of the following commands.
below the footer
at the bottom of this page.
The definition
- (here split onto three lines to fit)
+ (here split onto four lines to fit)
is:
\begin{verbatim}
-Branch: \gitBranch\,@\,\gitAbbrevHash{} /
+Branch: \gitBranch\,@\,\gitAbbrevHash{}
+\textbullet{}
Release:\gitReln{} (\gitAuthorDate)\\
Head tags: \gitTags
\end{verbatim}
@@ -650,7 +646,6 @@ You can tailor this by redefining \verb!\gitMarkFormat!. For example:
\item[gitMarkPref]
Contains the text of the watermark prefix,
which depends on the reason the document is being watermarked.
- is being printed.
The default values are \sfit{[Dirty]}, \sfit{[Draft]}, or \sfit{[git]}.
You can tailor this by redefining \verb!\gitMarkPref!. For example:
@@ -715,6 +710,15 @@ If you use it, you must load \sfit{datetime}
before you load \tpname.
% -----------------------------------------------------
\chapter{Etc}
+\section{Release notes}
+
+\rpara{R2.0.2: 2014-09-04 -- Mostly cosmetic}
+\begin{itemize}
+\item Fix packaging problems for \textsc{Ctan} and \TeX{}~Live
+\item Improve appearance of watermark
+\item Improve documentation: correct file references. remove gibberish, extend acknowledgments
+\end{itemize}
+
\section{Acknowledgements \& dependencies}
The \href{http://tex.stackexchange.com}{\TeX.SE community}
@@ -751,23 +755,35 @@ Adrian Burd,
Felix Wenger,
Johannes Hoetzer,
Martin W Leidig,
+Mikko Korpela,
Nik (of gwdg nokta de),
Omid (of gmail nokta com),
Robbie Morrison,
Ryan Matlock, and
Sasaki~Suguru.
+Special thanks to Karl Berry for helping me to
+reduce my incompetence with \texttt{ctanify}.
+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 and Petra Rübe-Pugliese,
+Robin Fairbairns, Manfred Lotz, and Petra Rübe-Pugliese,
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 two problems.
% - - - - - - - - - - - - - - - - - - - - - - - - - - -
+\clearpage
\section{Copyright \& licence}
-Copyright \copyright\ 2014, Brent Longborough.
+Copyright \copyright\ 2014, Brent Longborough,
+who has asserted his moral right
+to be identified as the author of this work.
This work --- \tpname\ --- may be distributed and/or modified under the
conditions of the LaTeX Project Public License: either version 1.3
@@ -784,10 +800,9 @@ the Current Maintainer of this work is Brent Longborough.
This work consists of the files
gitinfo2.sty, gitexinfo.sty, gitinfo2.tex, gitinfo2.pdf,
-post-git-sample.txt, and gitPseudoHeadInfo.gin.
+post-xxx-sample.txt, and gitPseudoHeadInfo.gin.
% - - - - - - - - - - - - - - - - - - - - - - - - - - -
-\clearpage
\section{From the author}
Although my limitations as a \TeX nician
mean that I've implemented \tpname\ in a rather simplistic way
diff --git a/Master/texmf-dist/doc/latex/gitinfo2/post-xxx-sample.txt b/Master/texmf-dist/doc/latex/gitinfo2/post-xxx-sample.txt
new file mode 100644
index 00000000000..76e6a263454
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/gitinfo2/post-xxx-sample.txt
@@ -0,0 +1,30 @@
+#!/bin/sh
+# Copyright 2014 Brent Longborough
+# Part of gitinfo2 package Version 2
+# Please read gitinfo2.pdf for licencing and other details
+# -----------------------------------------------------
+# Post-{commit,checkout,merge} hook for the gitinfo2 package
+#
+# Get the first tag found in the history from the current HEAD
+FIRSTTAG=$(git describe --tags --dirty='-*' 2>/dev/null)
+# Get the first tag in history that looks like a Release
+RELTAG=$(git describe --tags --long --dirty='-*' --match '[0-9]*.*' 2>/dev/null)
+# Hoover up the metadata
+git --no-pager log -1 --date=short \
+ --pretty=format:"\usepackage[%
+ shash={%h},
+ lhash={%H},
+ authname={%an},
+ authemail={%ae},
+ authsdate={%ad},
+ authidate={%ai},
+ authudate={%at},
+ commname={%an},
+ commemail={%ae},
+ commsdate={%ad},
+ commidate={%ai},
+ commudate={%at},
+ refnames={%d},
+ firsttagdescribe={$FIRSTTAG},
+ reltag={$RELTAG}
+ ]{gitexinfo}" HEAD > .git/gitHeadInfo.gin
diff --git a/Master/texmf-dist/tex/latex/gitinfo2/gitexinfo.sty b/Master/texmf-dist/tex/latex/gitinfo2/gitexinfo.sty
index 7767684eb8e..47ea589e284 100644
--- a/Master/texmf-dist/tex/latex/gitinfo2/gitexinfo.sty
+++ b/Master/texmf-dist/tex/latex/gitinfo2/gitexinfo.sty
@@ -14,11 +14,11 @@
%
% This work consists of these files:
% gitinfo2.sty, gitexinfo.sty, gitinfo2.tex, gitinfo2.pdf,
-% gitinfo2test.tex, post-git-sample.txt,
+% gitinfo2test.tex, post-xxx-sample.txt,
% and gitPseudoHeadInfo.gin
% -----------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{gitexinfo}[2014/05/12 v2.00 Auxiliary package for gitinfo2]
+\ProvidesPackage{gitexinfo}[2014/09/04 v2.0.2 Auxiliary package for gitinfo2]
\RequirePackage{kvoptions}
\RequirePackage{xstring}
\RequirePackage{etoolbox}
@@ -123,4 +123,4 @@
}{%
\renewcommand{\git@tagmark}{\\Head tags: \gitTags}
}
-\renewcommand{\gitMark}{Branch: \gitBranch\,@\,\gitAbbrevHash{} / Release:\gitReln{} (\gitAuthorDate)\git@tagmark}
+\renewcommand{\gitMark}{Branch: \gitBranch\,@\,\gitAbbrevHash{} \textbullet{} Release:\gitReln{} (\gitAuthorDate)\git@tagmark}
diff --git a/Master/texmf-dist/tex/latex/gitinfo2/gitinfo2.sty b/Master/texmf-dist/tex/latex/gitinfo2/gitinfo2.sty
index e6dabe42ce9..b98d3c0b9af 100644
--- a/Master/texmf-dist/tex/latex/gitinfo2/gitinfo2.sty
+++ b/Master/texmf-dist/tex/latex/gitinfo2/gitinfo2.sty
@@ -14,11 +14,11 @@
%
% This work consists of these files:
% gitinfo2.sty, gitexinfo.sty, gitinfo2.tex, gitinfo2.pdf,
-% gitinfo2test.tex, post-git-sample.txt,
+% gitinfo2test.tex, post-xxx-sample.txt,
% and gitPseudoHeadInfo.gin
% -----------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{gitinfo2}[2014/05/12 v2.00 git revision information]
+\ProvidesPackage{gitinfo2}[2014/09/04 v2.0.2 git revision information]
\RequirePackage{etoolbox}
\RequirePackage{kvoptions}
\RequirePackage{eso-pic}
@@ -177,7 +177,7 @@
\makebox[\paperwidth]{%
\begin{minipage}[b]{\paperwidth}%
\renewcommand{\baselinestretch}{1}%
- \centering{\gitMarkFormat\gitMarkPref{} \gitMark}%
+ \centering{\gitMarkFormat\gitMarkPref{} \textbullet{} \gitMark}%
\end{minipage}%
}%
}%