diff options
author | Karl Berry <karl@freefriends.org> | 2010-09-13 17:25:14 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-09-13 17:25:14 +0000 |
commit | b51e1247786e65af7c433d1785040c6a629e7b30 (patch) | |
tree | 99652a47b0418a546811dfb94a89699232b7a54c /Master/texmf-dist/source | |
parent | 113f5126bdf7782037612f119061ae0bc4160c7c (diff) |
svn-multi 2.3 (19jul10)
git-svn-id: svn://tug.org/texlive/trunk@19708 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
7 files changed, 155 insertions, 720 deletions
diff --git a/Master/texmf-dist/source/latex/svn-multi/Makefile b/Master/texmf-dist/source/latex/svn-multi/Makefile deleted file mode 100644 index e5964b0c68a..00000000000 --- a/Master/texmf-dist/source/latex/svn-multi/Makefile +++ /dev/null @@ -1,161 +0,0 @@ -# $Id: Makefile 1052 2009-05-03 12:24:53Z martin $ - -PACKAGE = svn-multi -PACKAGE_STY = ${PACKAGE}.sty -PACKAGE_DTX = ${PACKAGE}.dtx ${PACKAGE}-pl.dtx -PACKAGE_SCR = ${PACKAGE}.pl -PACKAGE_DOC = $(PACKAGE_DTX:.dtx=.pdf) -PACKAGE_SRC = ${PACKAGE_DTX} ${PACKAGE}.ins Makefile example_chap1.tex example_main.tex group_example.tex -PACKFILES = ${PACKAGE_SRC} ${PACKAGE_DOC} README - -TEXAUX = *.aux *.log *.glo *.ind *.idx *.out *.svn *.svx *.svt *.toc *.ilg *.gls *.hd *.exa *.exb *.fdb_latexmk -INSGENERATED = ${PACKAGE_STY} svnkw.sty svn-multi.pl -GENERATED = ${INSGENERATED} ${PACKAGE}.pdf svn-multi-pl.pdf example.pdf group_example.pdf group_example_*.tex ${PACKAGE}.zip ${PACKAGE}.tar.gz ${TESTDIR}/test*.pdf -ZIPFILE = ${PACKAGE}-${ZIPVERSION}.zip -TDSZIPFILE = ${PACKAGE}.tds.zip - -TESTDIR = tests -TESTS = $(patsubst %.tex,%,$(subst ${TESTDIR}/,,$(wildcard ${TESTDIR}/test?.tex ${TESTDIR}/test??.tex))) # look for all test*.tex file names and remove the '.tex' -TESTARGS = -output-directory ${TESTDIR} - -LATEX_OPTIONS = -interaction=batchmode -LATEX = pdflatex ${LATEX_OPTIONS} - -TEXMFDIR = ${HOME}/texmf - -RED = \033[01;31m -GREEN = \033[01;32m -WHITE = \033[00m - -CP = cp -v -MV = mv -v -RMDIR = rm -rf -MKDIR = mkdir -p - -.PHONY: all doc package clean fullclean example testclean ${TESTS} tds ${CHECK_LOG} - -############################################################################### - -all: package doc example -new: fullclean all - -doc: ${PACKAGE_DOC} - -package: ${PACKAGE_STY} ${PACKAGE_SCR} - -%.pdf: %.dtx - ${LATEX} $*.dtx - -makeindex -s gind.ist -o $*.ind $*.idx - -makeindex -s gglo.ist -o $*.gls $*.glo - ${LATEX} $*.dtx - ${LATEX} $*.dtx - -${PACKAGE}.pdf: ${PACKAGE}.sty - -${INSGENERATED}: ${PACKAGE_DTX} ${PACKAGE}.ins - yes | latex ${PACKAGE}.ins - @-chmod +x *.pl - -clean: - rm -f ${TEXAUX} $(addprefix ${TESTDIR}/, ${TEXAUX}) - -fullclean: clean - rm -f ${GENERATED} *~ *.backup - rm -f ${PACKAGE}*.zip - rm -rf tds/ - -############################################################################### - -example: example.pdf gexample - -example.pdf: example_main.tex example_chap1.tex ${PACKAGE}.sty - ${LATEX} $< - perl ./svn-multi.pl $< - ${LATEX} $< - mv example_main.pdf $@ - -gexample: group_example.pdf - -group_example.pdf: group_example.tex svn-multi.sty - ${RM} $(addprefix group_example, ${TEXAUX}) group_example_*.tex - ${LATEX} $< - perl svn-multi.pl group_example - ${LATEX} $< - ${LATEX} $< - ${LATEX} $< - -############################################################################### - -zip: ${PACKFILES} - @${MAKE} --no-print-directory ${ZIPFILE} - -zip: ZIPVERSION=$(shell grep "Package: ${PACKAGE} " ${PACKAGE}.log | \ - sed -e "s/.*Package: ${PACKAGE} ....\/..\/..\s\+\(v\S\+\).*/\1/") - -${PACKAGE}%.zip: ${PACKFILES} - grep -L '\* Checksum passed \*' ${PACKAGE_DTX:.dtx=.log} | wc -l | grep -q '^0$$' - -pdfopt ${PACKAGE}.pdf opt_${PACKAGE}.pdf && mv opt_${PACKAGE}.pdf ${PACKAGE}.pdf - ${RM} $@ - zip $@ ${PACKFILES} - @echo - @echo "ZIP file $@ created!" - -release: fullclean package doc example tests ${ZIPFILE} - -############################################################################### - -# Make sure TeX finds the input files in TESTDIR -tests ${TESTS}: export TEXINPUTS:=${TEXINPUTS}:${TESTDIR} -tests ${TESTS}: LATEX_OPTIONS= - -testclean: - @${RM} $(foreach ext, aux log out pdf svn svx, tests/test*.${ext}) - -tests: package testclean - @echo "Running tests: ${TESTS}:" - @${MAKE} -e -i --no-print-directory ${TESTS} \ - TESTARGS="-interaction=batchmode -output-directory=${TESTDIR}"\ - TESTPLOPT="-q"\ - > /dev/null - -${TESTS}: % : ${TESTDIR}/%.tex package testclean - @-${LATEX} -interaction=nonstopmode ${TESTARGS} $< 1>/dev/null 2>/dev/null - @if test -e ${TESTDIR}/$*.svn; then perl ./svn-multi.pl ${TESTDIR}/$* 1>/dev/null ; fi - @if (${LATEX} ${TESTARGS} $< && (test ! -e ${TESTDIR}/$*.pl || ${TESTDIR}/$*.pl ${TESTPLOPT})); \ - then /bin/echo -e "${GREEN}$@ succeeded${WHITE}" >&2; \ - else /bin/echo -e "${RED}$@ failed!!!!!!${WHITE}" >&2; fi - -############################################################################### - -tds: .tds - -.tds: ${PACKAGE_STY} ${PACKAGE_DOC} ${PACKAGE_SRC} - @grep -q '\* Checksum passed \*' ${PACKAGE}.log - ${RMDIR} tds - ${MKDIR} tds/ - ${MKDIR} tds/tex/ tds/tex/latex/ tds/tex/latex/${PACKAGE}/ - ${MKDIR} tds/doc/ tds/doc/latex/ tds/doc/latex/${PACKAGE}/ - ${MKDIR} tds/source/ tds/source/latex/ tds/source/latex/${PACKAGE}/ - test -n "${PACKAGE_SCR}" && ${MKDIR} tds/scripts/ tds/scripts/${PACKAGE}/ - ${CP} ${PACKAGE_STY} tds/tex/latex/${PACKAGE}/ - ${CP} ${PACKAGE_DOC} tds/doc/latex/${PACKAGE}/ - ${CP} ${PACKAGE_SRC} tds/source/latex/${PACKAGE}/ - test -n "${PACKAGE_SCR}" && ${CP} ${PACKAGE_SCR} tds/scripts/${PACKAGE}/ - @touch $@ - -tdszip: ${TDSZIPFILE} - -${TDSZIPFILE}: .tds - ${RM} ${TDSZIPFILE} - cd tds && zip -r ../${TDSZIPFILE} . - -############################################################################### - -install: .tds - test -d "${TEXMFDIR}" && ${CP} -a tds/* "${TEXMFDIR}/" && texhash ${TEXMFDIR} - -uninstall: - test -d "${TEXMFDIR}" && ${RM} -rv "${TEXMFDIR}/tex/latex/${PACKAGE}" \ - "${TEXMFDIR}/doc/latex/${PACKAGE}" "${TEXMFDIR}/source/latex/${PACKAGE}" \ - "${TEXMFDIR}/scripts/${PACKAGE}" && texhash ${TEXMFDIR} - diff --git a/Master/texmf-dist/source/latex/svn-multi/example_chap1.tex b/Master/texmf-dist/source/latex/svn-multi/example_chap1.tex deleted file mode 100644 index 24ac0bc313b..00000000000 --- a/Master/texmf-dist/source/latex/svn-multi/example_chap1.tex +++ /dev/null @@ -1,52 +0,0 @@ -% Version control information: -\svnidlong -{$HeadURL: svn://server/dir/example_chap1.tex $} -{$LastChangedDate: 2009-02-27 13:58:39 +0000 (Fri, 27 Feb 2009) $} -{$LastChangedRevision: 211 $} -{$LastChangedBy: martin $} - -\chapter{Example Chapter} - -\section{Version} -\subsection*{This chapter} -% \url is needed because there is an underscore in the name -% The package 'underscore' seems not to work properly, so the 'hyperref' -% package is used which is not the best solution. Avoid underscore in LaTeX filenames. -Filename: \svnnolinkurl{\svnfilefname}\\ -URL: \svnnolinkurl{\svnfileurl}\\ -% Something like \href{\svnfileurl}{Download} works also! -\textbf{Last change}\\ -Revision: \svnfilerev\\ -Date: \svnfiledate\\ -Year: \svnfileyear\\ -Time: \svnfilehour:\svnfileminute:\svnfilesecond\ \svnfiletimezone\\ -Timezone: \svnfiletimezonehour : \svnfiletimezoneminute\\ -Author: \svnfileauthor\\ - -\subsection*{Whole document} -Filename: \svnnolinkurl{\svnmainfilename}\\ -URL: \url{\svnmainurl}\\ -\textbf{Last change}\\ -Revision: \svnrev\\ -Date: \svndate\\ -Year: \svnyear\\ -Time: \svnhour:\svnminute:\svnsecond\ \svntimezone\\ -Timezone: \svntimezonehour : \svntimezoneminute\\ -Author: \svnauthor\\ -% [...] - -\section{Full Author Names} -\svnRegisterRevision{14}{Test} - -Registered author name: \svnFullAuthor{\svnfileauthor}\\ -Registered revision name: \svnFullRevision{\svnfilerev}\\ -Registered author name (*): \svnFullAuthor*{\svnfileauthor}\\ -Registered revision name (*): \svnFullRevision*{\svnfilerev}\\ - -\subsubsection*{Behaviour if value is not registered:} -Not registered user name: \svnFullAuthor{someusername}\\ -Not registered revision name: \svnFullRevision{12}\\ -Not registered user name (*): \svnFullAuthor*{someusername}\\ -Not registered revision name (*): \svnFullRevision*{12}\\ - - diff --git a/Master/texmf-dist/source/latex/svn-multi/example_main.tex b/Master/texmf-dist/source/latex/svn-multi/example_main.tex deleted file mode 100644 index ef4ebce0f33..00000000000 --- a/Master/texmf-dist/source/latex/svn-multi/example_main.tex +++ /dev/null @@ -1,71 +0,0 @@ -\documentclass[12pt]{report} - -% Traditional way to include keywords: -\usepackage{svn-multi}[2009/03/03] -% Version control information: -\svnidlong -{$HeadURL: svn://server/dir/example_main.tex $} -{$LastChangedDate: 2008-12-03 13:29:19 +0000 (Wed, 03 Dec 2008) $} -{$LastChangedRevision: 146 $} -{$LastChangedBy: martin $} -% The extra Id to access the file name is not needed anymore because it is -% extracted from the URL: -%\svnid{$Id: example_main.tex 146 2008-12-03 13:29:19Z martin $} -% -% Don't forget to set the svn property 'svn:keywords' to -% 'HeadURL LastChangedDate LastChangedRevision LastChangedBy' or -% 'Id' or both depending if you use \svnidlong and/or \svnid - -% Alternative you can use the auto-keyword feature to extract the keywords from -% the Subversion working directory: -%\usepackage[autokw=all]{svn-multi}[2009/03/28] - -\usepackage{hyperref} - -\usepackage{fancyhdr} -\renewcommand{\headrulewidth}{0.4pt} -\renewcommand{\footrulewidth}{0.4pt} -\setlength{\headheight}{14.5pt} -% This will display the last changed revision of the current chapter. -% Change \svnfilerev to \svnrev if you like to have the -% document revision. -\newcommand{\svnfooter}{Last Changed Rev: \svnfilerev} - -\pdfinfo{% - /CreationDate (D:\svnpdfdate) -} - -\svnRegisterAuthor{johnd}{John Doe} -\svnRegisterAuthor{maryd}{Mary Doe} -\svnRegisterAuthor{martin}{Martin S.} -\svnRegisterRevision{15}{Version~1} - -\listfiles -\begin{document} - -\begin{titlepage} - \vspace{8ex} - {\huge Title\par} - \vspace{2ex} - {\large \noindent This is an small example document for the \texttt{svn-multi} - (aka \texttt{svnkw}) package. Please also look at the LaTeX source code of this - document. An advanced example which includes keyword groups is shown in - \url{group\_example.pdf}} - \vfill - \flushleft\sffamily - Version control information:\\ - Head URL: \svnnolinkurl{\svnmainurl}\\ - %or with hyperlink: Head URL: \url{\svnurl}\\ - Last changed file: \texttt{\svnfname}\\ - Last changed date: \svndate\\ - Last changes revision: \svnrev\\ - Version: \svnFullRevision*{\svnrev}\\ - Last changed by: \svnFullAuthor*{\svnauthor}\\ -\end{titlepage} - -% Include chapters -\include{example_chap1} -%\include{example_chap2} -%\include{example_chap3} - -\end{document} diff --git a/Master/texmf-dist/source/latex/svn-multi/group_example.tex b/Master/texmf-dist/source/latex/svn-multi/group_example.tex deleted file mode 100644 index 692687d4f97..00000000000 --- a/Master/texmf-dist/source/latex/svn-multi/group_example.tex +++ /dev/null @@ -1,371 +0,0 @@ -\documentclass[a4paper,oneside]{scrbook} -\usepackage[all]{svn-multi}[2009/03/06] -\svnidlong -{$HeadURL: svn://server/group_example.tex $} -{$LastChangedDate: 2000-01-01 01:44:01 +0000 (Main file) $} -{$LastChangedRevision: 98 $} -{$LastChangedBy: author3 $} - -% Pre-declaration of groups to define order in table -\svngroup{abc} -\svngroup{def} -\svngroup{ghi} -\svngroup{jkl} -%\svngroup{Images} -\svngroup{} - -% Ignore logo in subfiles and set it explicitly into the main file: -%\svnexternal{{logo.jpg}}% -%\svnignoregraphic{logo.jpg} - -% Special groups for images and other external files: -%\svngraphicsgroup{Images} -%\svnexternalgroup{external} - -\let\ifvtex=\relax -\usepackage{hyperref} -\usepackage{ifthen} -\usepackage{listings} -\lstset{basicstyle=\ttfamily} -\makeatletter -% Workaround for listinputlisting -\newcommand*{\svnlstinputlisting}[2][]{% - {\let\input\@input\lstinputlisting[#1]{#2}}% -} -\makeatother -\usepackage{booktabs} -\usepackage{tabularx} -\usepackage{longtable} - -% This is an example document to show the group feature of svn-multi 2.0. -% Please the notes below. - -\makeatletter -% Version control information table for each chapter -\newcommand{\chaptervctable}{% -\par\noindent -\textbf{Version Control Information for this chapter}\\[\bigskipamount]% -\begin{tabular}{lp{0.7\textwidth}} -Chapter URL & \svnnolinkurl{\svnfileurl}\\ -Chapter File name & \svnnolinkurl{\svnfilefname}\\ -Last Changed Revision & \svnfilerev\\ -Last Changed Author & \svnfileauthor\\ -Last Changed Date & \svnfiledate\\ -\end{tabular} -\bigskip -\par\noindent -This files contains the following SVN keywords:\\*[-\baselineskip] -{\let\input\@input -\svnlstinputlisting[firstline=5,lastline=9]{\finkpath} -} -} -\makeatother - -% This file generates some example sub files from this file to avoid a lot of small -% example files in the CTAN directory. In real life there would be separate -% files from the beginning. - -\begin{filecontents}{group_example_part1a.tex} -\svnidlong -{$HeadURL: svn://server/group_example_part1a.tex $} -{$LastChangedDate: 2000-01-01 01:00:01 +0000 (Chapter 1a) $} -{$LastChangedRevision: 101 $} -{$LastChangedBy: author1 $} - -\chapter{Subfile 1a} -\chaptervctable -\end{filecontents} - -\begin{filecontents}{group_example_part1b.tex} -\svnidlong -{$HeadURL: svn://server/group_example_part1b.tex $} -{$LastChangedDate: 2001-01-01 00:00:01 +0000 (Subfile 1b) $} -{$LastChangedRevision: 102 $} -{$LastChangedBy: author2 $} - -\chapter{Subfile 1b} -\chaptervctable -\end{filecontents} - -\begin{filecontents}{group_example_part1c.tex} -\svnidlong -{$HeadURL: svn://server/group_example_part1c.tex $} -{$LastChangedDate: 2000-01-01 00:00:01 +0000 (Subfile 1c) $} -{$LastChangedRevision: 104 $} -{$LastChangedBy: author3 $} - -\chapter{Subfile 1c} -\chaptervctable -\end{filecontents} - -\begin{filecontents}{group_example_part2a.tex} -\svnidlong -{$HeadURL: svn://server/group_example_part2a.tex $} -{$LastChangedDate: 2000-01-01 00:00:01 +0000 (Subfile 2a) $} -{$LastChangedRevision: 100 $} -{$LastChangedBy: author1 $} - -\chapter{Subfile 2a} -\chaptervctable -\end{filecontents} - -\begin{filecontents}{group_example_part2b.tex} -\svnidlong -{$HeadURL: svn://server/group_example_part2b.tex $} -{$LastChangedDate: 2000-01-01 00:00:01 +0000 (Subfile 2b) $} -{$LastChangedRevision: 101 $} -{$LastChangedBy: author1 $} - -\chapter{Subfile 2b} -\chaptervctable -\end{filecontents} - -\begin{filecontents}{group_example_part3a.tex} -\svnidlong -{$HeadURL: svn://server/group_example_part3a.tex $} -{$LastChangedDate: 2000-01-01 00:00:01 +0000 (Subfile 3a) $} -{$LastChangedRevision: 104 $} -{$LastChangedBy: author3 $} - -\chapter{Subfile 3a} -\chaptervctable -\end{filecontents} - -\begin{filecontents}{group_example_part3b.tex} -\svnidlong -{$HeadURL: svn://server/group_example_part3b.tex $} -{$LastChangedDate: 2000-01-01 00:00:01 +0000 (Subfile 3b) $} -{$LastChangedRevision: 103 $} -{$LastChangedBy: author2 $} - -\chapter{Subfile 3b} -\chaptervctable -\end{filecontents} - -\begin{filecontents}{group_example_part4a.tex} -\svnidlong -{$HeadURL: svn://server/group_example_part4a.tex $} -{$LastChangedDate: 2000-01-01 00:00:01 +0000 (Subfile 4a) $} -{$LastChangedRevision: 99 $} -{$LastChangedBy: author3 $} - -\chapter{Subfile 4a} -\chaptervctable -\input{group_example_part4a_sub1.tex} -\end{filecontents} - -\begin{filecontents}{group_example_part4a_sub1.tex} -\svnidlong -{$HeadURL: svn://server/group_example_part4a_sub1.tex $} -{$LastChangedDate: 2000-01-01 00:00:00 +0000 (SubSubfile 4a-1) $} -{$LastChangedRevision: 96 $} -{$LastChangedBy: author2 $} - -\section{SubSubfile 4a-1} -This is a sub file in a sub file. -\svnexternal{{Makefile}} -\end{filecontents} - -\begin{filecontents}{group_example_part4b.tex} -\svnidlong -{$HeadURL: svn://server/group_example_part4b.tex $} -{$LastChangedDate: 2000-01-01 00:00:01 +0000 (Subfile 4b) $} -{$LastChangedRevision: 105 $} -{$LastChangedBy: author2 $} - -\chapter{Subfile 4b} -\chaptervctable -\end{filecontents} - -\begin{filecontents}{group_example_end.tex} -\svnidlong -{$HeadURL: svn://server/group_example_end.tex $} -{$LastChangedDate: 2000-01-01 00:00:01 +0000 (End) $} -{$LastChangedRevision: 100 $} -{$LastChangedBy: author1 $} - -\chapter{End credits} -\chaptervctable -\end{filecontents} - -\begin{filecontents}{group_example_unexpanded.tex} -\svnidlong -{$HeadURL$} -{$LastChangedDate$} -{$LastChangedRevision$} -{$LastChangedBy$} - -\chapter{File with unexpanded keywords} -\chaptervctable -\end{filecontents} - -\svnRegisterAuthor{author1}{Andy Author, I.} -\svnRegisterAuthor{author2}{A. Author, II.} -\svnRegisterAuthor{author3}{Anthony Author, III.} - -% Have VC info on every part page -\let\origpart=\part -\def\part{% -\setpartpreamble{% -\vspace*{5cm} -\par\noindent -\textbf{Version Control Information for this part:}\\[\bigskipamount]% -\begin{tabular}{lp{0.7\textwidth}} -URL of latest File & \svnnolinkurl{\svncgurl}\\ -Name of latest File & \svnnolinkurl{\svncgfname}\\ -Last Changed Revision & \svncgrev\\ -Last Changed Author & \svncgauthor\\ -Last Changed Date & \svncgdate\\ -\end{tabular} -}\origpart -} - -\listfiles -\begin{document} - -% Custom titlepage: -\hbox{}% -\vfill -\pdfbookmark{Title Page}{titlepage}% -{\centering -\Huge\texttt{svn-multi} v2.0 Keyword Groups Example Document\\ -\Large Martin Scharrer\\ -\large 2009/03/01\\ -}% -\vfill -\par\noindent -This is an example and test document for the group feature of svn-multi 2.0. -Please note that the revision keywords were generated manually for testing -purposes. The dates are not consistent with the revisions and contain a debug -name instead of the date text like `(Sat, January 1 2009)'. This doesn't -influence the correct functionality of the svn-multi package.\\ -\bigskip -{\hbox{}\hfill Happy \TeX ing!}\\ -\vfill% -\par\noindent -{\large Version Control Information for this document:\\[\bigskipamount]}% -\begin{tabular}{lp{0.7\textwidth}} -Main URL & \svnnolinkurl{\svnmainurl}\\ -Main File name & \svnnolinkurl{\svnmainfilename}\\ -URL of latest file & \svnnolinkurl{\svnurl}\\ -Name of latest file & \svnnolinkurl{\svnfname}\\ -Last Changed Revision & \svnrev\\ -Last Changed Author & \svnauthor\\ -Last Changed Date & \svndate\\ -\end{tabular} -\bigskip\par\noindent -The main file of this document contains the following SVN -keywords:\\*[-\baselineskip] -\svnlstinputlisting[firstline=3,lastline=7]{\finkpath} -\thispagestyle{empty} -\clearpage - -% Default in Engish -\renewcommand{\svnbeforetable}{% -This is an automatic generated table using the \textbf{\sffamily table} option. -\bigskip\par\noindent -} -\clearpage -\pdfbookmark{Table of Revisions (1)}{tora}% -\tableofrevisions -\clearpage - -% Redefined to German -% Uses booktabs for nicer table -\renewcommand{\svnbeforetable}{% -Can be redefined to another format and language: Verstehen Sie Deutsch? -\bigskip\par\noindent -} -\renewenvironment{svntable}{% -\begin{longtable}{p{6.2cm}rll} -\toprule -} -{% -\bottomrule -\end{longtable} -} -\renewcommand*\svntablehead{% - Name & Rev & Autor & Datum \\ -\midrule[\heavyrulewidth] -} -\renewcommand{\svnrevisionsname}{Revisionen} -\renewcommand{\svntabgroup}[1]{Gruppe `#1'} - -% Some highlight examples: -% Print highest revision bold: -\renewcommand{\svntabrev}[1]{\ifthenelse{#1=\svnrev}{\textbf{#1}}{#1}} -% Highlight all dates after the 14th March 2008 12:00:00: -\renewcommand{\svntabdate}[8]{% - \ifthenelse{#1#2#3#4>2008031412}{\color{red}\bfseries}{}% - \small #3.#2.#1\ #4:#5:#6% -} -% Mark all files last changed by the last author: -\renewcommand{\svntabauthor}[1]{% - \ifthenelse{\equal{#1}{\svnauthor}}{\color{green}}{}% - \svnFullAuthor{#1}% -} - -% Using \scriptsize and \svnnolinkurl for files and subgroups: -\renewcommand{\svntabfile}[2]{% - \addtolength{\leftskip}{#1\medskipamount}% - Datei `{\scriptsize\svnnolinkurl{#2}}' -} -\renewcommand{\svntabsubgroup}[2]{% - \addtolength{\leftskip}{#1\medskipamount}% - Untergruppe `{\scriptsize\svnnolinkurl{#2}}'% -} -\renewcommand{\svntabglobal}[1]{Gesamtes Dokument} - -% Add rule before group rows: -\renewcommand{\svngrouprow}{\midrule} -% Add rule and description after global row: -\renewcommand{\endsvnglobalrow}{\midrule Ohne Gruppe:\\} - -\pdfbookmark{Table of Revisions (2)}{torb}% -\tableofrevisions -\clearpage - - -\svngroup{abc} -\part{Abc} -\include{group_example_part1a} -\include{group_example_part1b} -\include{group_example_part1c} - -\svngroup{def} -\part{Def} -\include{group_example_part2a} -\include{group_example_part2b} - -\svngroup{ghi} -\part{Ghi} -\include{group_example_part3a} -\include{group_example_part3b} - -\svngroup{jkl} -\part{jkl} -\include{group_example_part4a} -\include{group_example_part4b} - -% The rest doesn't belong to a file group: -\svngroup{} -\include{group_example_end} -\include{group_example_unexpanded} - -\chapter*{Reference Examples} -%To reference e.g.\ keyword from group `abc' use: -\section*{Group `abc'} -\svnsetcg{abc} Revision \svncgrev\ from \svncgtoday\ \svncgtime\ done by -\svnFullAuthor{\svncgauthor}. Latest file is \svnnolinkurl{\svncgfname} (URL: \url{\svncgurl}). - -\section*{Subgroup `group\_example\_part3b'} -\svnsetcg{group_example_part3b} Revision \svncgrev\ from \svncgtoday\ \svncgtime\ done by -\svnFullAuthor{\svncgauthor}. Latest file is \svnnolinkurl{\svncgfname} (URL: \url{\svncgurl}). - -\section*{File `group\_example\_part3b.tex'} -\svnsetcg{group_example_part3b.tex} Revision \svncgrev\ from \svncgtoday\ \svncgtime\ done by -\svnFullAuthor{\svncgauthor}. File name and url: \svnnolinkurl{\svncgfname} (URL: \url{\svncgurl}). - - -\end{document} - diff --git a/Master/texmf-dist/source/latex/svn-multi/svn-multi-pl.dtx b/Master/texmf-dist/source/latex/svn-multi/svn-multi-pl.dtx index c6b881819a2..5cdb5a67b97 100644 --- a/Master/texmf-dist/source/latex/svn-multi/svn-multi-pl.dtx +++ b/Master/texmf-dist/source/latex/svn-multi/svn-multi-pl.dtx @@ -10,9 +10,9 @@ # # Copyright (C) 2006-2009 Martin Scharrer # E-mail: martin@scharrer-online.de -# WWW: http://www.scharrer-online.de/latex/svn-multi/ +# WWW: http://latex.scharrer-online.de/svn-multi/ # -# $Id: svn-multi-pl.dtx 692 2009-03-27 21:38:45Z martin $ +# $Id: svn-multi-pl.dtx 1866 2010-07-19 11:17:15Z martin $ # # This program works only in combination with the LaTeX package 'svn-multi' and # generates .svx files with '\svnidlong' macros holding Subversion keywords for @@ -59,15 +59,15 @@ %<*driver> \fi \makeatletter -% $Id: svn-multi-pl.dtx 692 2009-03-27 21:38:45Z martin $ +% $Id: svn-multi-pl.dtx 1866 2010-07-19 11:17:15Z martin $ \def\svnmultipl@version {v0.1a} \def\svnmultipl@rev $#1: #2 ${\def\svnmultipl@rev{#2}} \def\svnmultipl@date $#1: #2-#3-#4 #5 ${% \def\svnmultipl@today{{\year#2\month#3\day#4\today}}% \def\svnmultipl@date{#2/#3/#4}% } -\svnmultipl@rev $Rev: 692 $ -\svnmultipl@date $Date: 2009-03-27 21:38:45 +0000 (Fri, 27 Mar 2009) $ +\svnmultipl@rev $Rev: 1866 $ +\svnmultipl@date $Date: 2010-07-19 12:17:15 +0100 (Mon, 19 Jul 2010) $ \ProvidesFile{svn-multi-pl.dtx} [\svnmultipl@date\space\svnmultipl@version\space SVN Keywords extractor for svn-multi] @@ -130,7 +130,7 @@ % % \title{The \textsf{svn-multi.pl} Script} % \author{Martin Scharrer \\ \url{martin@scharrer-online.de} \\ -% \url{http://www.scharrer-online.de/latex/svn-multi} \\ +% \url{http://latex.scharrer-online.de/svn-multi} \\ % CTAN: \url{http://tug.ctan.org/pkg/svn-multi}} % \date{Version \expandafter\@gobble\svnmultipl@version\\[0.5ex]\svnmultipl@today} % @@ -166,7 +166,7 @@ use File::Basename; % \begin{macrocode} my $VERSION = "0.2"; my ($REV,$DATE) = - (split ' ','$Id: svn-multi-pl.dtx 692 2009-03-27 21:38:45Z martin $')[2,3]; + (split ' ','$Id: svn-multi-pl.dtx 1866 2010-07-19 11:17:15Z martin $')[2,3]; % \end{macrocode} % Declaration of other global constants and variables: diff --git a/Master/texmf-dist/source/latex/svn-multi/svn-multi.dtx b/Master/texmf-dist/source/latex/svn-multi/svn-multi.dtx index 192804000a8..ab2eed42c31 100644 --- a/Master/texmf-dist/source/latex/svn-multi/svn-multi.dtx +++ b/Master/texmf-dist/source/latex/svn-multi/svn-multi.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % Copyright (C) 2006-2009 by Martin Scharrer <martin@scharrer-online.de> -% http://www.scharrer-online.de/latex/ +% http://latex.scharrer-online.de/svn-multi/ % ----------------------------------------------------------------- % % This work may be distributed and/or modified under the @@ -24,19 +24,21 @@ % \fi % \iffalse %<*package|driver> -% $Id: svn-multi.dtx 1448 2009-10-19 21:28:41Z martin $ +% $Id: svn-multi.dtx 1866 2010-07-19 11:17:15Z martin $ % -\def\svnmulti@version{v2.2} +\def\svnmulti@version{v2.3} \RequirePackage{svn-prov} %</package|driver> %<*driver> -\ProvidesFileSVN{$Id: svn-multi.dtx 1448 2009-10-19 21:28:41Z martin $} +\ProvidesFileSVN{$Id: svn-multi.dtx 1866 2010-07-19 11:17:15Z martin $} [\svnmulti@version\space SVN Keywords for multi-file LaTeX documents] \GetFileInfoSVN* \let\svnmulti@date\filedate \let\svnmulti@rev\filerev \documentclass{ltxdoc} +\usepackage[english]{babel} +\dateenglish \def\svnmulti@today#1/#2/#3\relax{% \begingroup @@ -92,13 +94,13 @@ \let\origStopEventually\StopEventually \let\origPrintDescribeMacro\PrintDescribeMacro \usepackage{xcolor} -\definecolor{darkred}{rgb}{0.333.0.0,0.0} +\definecolor{darkred}{rgb}{0.333,0.0,0.0} \hypersetup{colorlinks=true,linkcolor=darkred,urlcolor=darkred} \definecolor{macrodesccolor}{rgb}{0.0,0.0,0.8} \definecolor{macroimplcolor}{rgb}{0.0,0.0,0.4} \definecolor{metacolor}{rgb}{0.0,0.4,0.4} \definecolor{scriptcolor}{rgb}{0.2,0.6,0.2} -\definecolor{optioncolor}{rgb}{0.3.0.2,0} +\definecolor{optioncolor}{rgb}{0.3,0.2,0} \let\macroline\\ \newlength{\macrosep} @@ -291,7 +293,7 @@ %<*package> % \fi % -% \CheckSum{2728} +% \CheckSum{2847} % % {\makeatother % \CharacterTable @@ -336,6 +338,7 @@ % Subversion 'entries' file: 'autokw' option} % \changes{v2.2}{2009/10/19}{Added \css{ifsvnmodified} and % \css{ifsvnfilemodified} macros. Some bug fixes.} +% \changes{v2.3-dev}{2010/03/30}{Changed \css{svnidlong} to ignore all comments between verbatim arguments.} % % ^^A \GetFileInfo{svn-multi.dtx} % @@ -369,7 +372,7 @@ % \title{The \textsf{svn-multi} Package \\\large formerly known as % \textsf{svnkw}} % \author{Martin Scharrer \\ \url{martin@scharrer-online.de} \\ -% \url{http://www.scharrer-online.de/latex/svn-multi}\\ +% \url{http://latex.scharrer-online.de/svn-multi/}\\ % CTAN: \url{http://tug.ctan.org/pkg/svn-multi}} % \date{Version \expandafter\@gobble\svnmulti@version\\[0.5ex]\svnmulti@today} % @@ -575,7 +578,10 @@ % manually to ensure that the file-local macros are reset to empty values at % the begin of each input file. This prevents the keyword from leaking over % from one file to the next. After every subfile the file-local keyword macros -% are also restored to the value of the parent file. +% are also restored to the value of the parent file. A \cs{clearpage} should be +% added at the very end of \cs{include}d files to ensure the last page is flushed +% out by \TeX\ before the keyword macros are restored. Otherwise the last page +% might display the mainfile keyword values. % % \DescribeOption{autokw} % This experimental feature allows the automatically extraction of the keyword @@ -1192,7 +1198,7 @@ % `|/|' as directory separator and should end with a `|/|'. Windows users should % just replace all `|\|' with `|/|', \eg `|C:\My dir|' gets `|{C:/My dir/}|'. % -% \subsection*{Script \hypertarget{script@svn-multi.pl}{\texttt{svn-multi.pl}}} +% \subsection*{Script \protect\hypertarget{script@svn-multi.pl}{\texttt{svn-multi.pl}}} % The file \scr{svn-multi.pl} which comes with the \svnmulti package is an % external Perl script which has to be run in the command line or by a \LaTeX\ % development environment/editor like other tools like |Bib|\TeX\ or @@ -1296,6 +1302,8 @@ % detect any side effects or other issues causes by this package. % % \subsection{Packet \texttt{listings} uses \cs{input}} +% \textbf{Update:} Newer versions of \svnmulti avoid this issue by changing the catcodes +% back to normal while reading the |.svx| file. % If a file \meta{basename}.\meta{extension} is typeset verbatim using % |\lstinputlisting|, which uses |\input| to read the file, an existing % \meta{basename}|.svx| file is also included as part of the listing. This can @@ -1405,7 +1413,7 @@ % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackageSVN - {$Id: svn-multi.dtx 1448 2009-10-19 21:28:41Z martin $} + {$Id: svn-multi.dtx 1866 2010-07-19 11:17:15Z martin $} [\svnmulti@version\space SVN Keywords for multi-file LaTeX documents] % \end{macrocode} @@ -1674,15 +1682,43 @@ % \begin{macro}{\svn@inputsvx}[1]{file name/path without extension} % Used to save and restore file keywords when reading |.svx| files. +% The normal catcodes are restored to avoid issues in special situations +% regarding input of verbatim files +% (e.g.\ \cs{lstinputlisting} from the \pkg{listings} package) or other +% cases where catcodes might have changes (e.g.\ `|%|' in |.dtx| files). % \begin{macrocode} \def\svn@inputsvx#1{% \svn@pushfilestack + \begingroup + \svn@normalcatcodes \svn@input{#1.svx}% + \endgroup \svn@popfilestack } % \end{macrocode} % \end{macro} +% \begin{macro}{\svn@normalcatcodes} +% Sets the default catcodes. +% \begin{macrocode} +\def\svn@normalcatcodes{% + \catcode`\\=0\relax + \catcode`\{=1\relax + \catcode`\}=2\relax + \catcode`\$=3\relax + \catcode`\&=4\relax + \catcode`\^^M=5\relax + \catcode`\#=6\relax + \catcode`\^=7\relax + \catcode`\_=8\relax + \catcode`\ =10\relax + \catcode`\@=12\relax + \catcode`\~=13\relax + \catcode`\%=14\relax +} +% \end{macrocode} +% \end{macro} + % \subsection{Definition of init values} % Initialisation of at least the revision to a numeric value is necessary to not % break the |\ifnum| tests later in this package. The revision is initialised to @@ -1774,9 +1810,9 @@ % \begin{macrocode} \newcommand*{\svne@catcodes}{% \let\do\@makeother - \endlinechar=-1 + \endlinechar=-1% \dospecials - \do\- \do\: \do\. \do\^^L + \do\-\do\:\do\.\do\^^L% } % \end{macrocode} % \end{macro} @@ -1829,12 +1865,16 @@ \begingroup \let\next\relax % \end{macrocode} -% Open the format file to read the version number: +% Open the format file to read the version number. If this file does not exists +% (true for recent svn versions) a valid default value is used and the true +% version number is read from the |entries| file. % \begin{macrocode} + \def\svne@version{8}% \openin\svne@read=#1format\relax \ifeof\svne@read\else \svne@readline\svne@version \closein\svne@read + \fi % \end{macrocode} % Check the format version: % \begin{macrocode} @@ -1850,14 +1890,13 @@ % Check the version and call the parse macros if OK: % \begin{macrocode} \ifnum\svne@version>7\relax - \def\next{\svne@parsedirentry% - \svne@parseentries} + \def\next{\svne@parsedirentry + \svne@parseentries}% \else \closein\svne@read \fi \fi \fi - \fi \next \endgroup } @@ -1898,12 +1937,12 @@ \@makeother\. \gdef\svne@scandate#1{% - \expandafter\svne@scandate@#1\relax - 0000-00-00T00:00:00.00000Z\relax\relax + \expandafter\svne@scandate@#1\empty + 0000-00-00T00:00:00.00000Z\empty\empty } -\gdef\svne@scandate@#1-#2-#3T#4:#5:#6.#7\relax#8\relax{% - \gdef\svnfileyear{#1}% +\gdef\svne@scandate@#1-#2-#3T#4:#5:#6.#7\empty#8\empty{% + \xdef\svnfileyear{#1}% \gdef\svnfilemonth{#2}% \gdef\svnfileday{#3}% \gdef\svnfilehour{#4}% @@ -1966,8 +2005,20 @@ % used to stop the file reading. % \begin{macrocode} \def\svne@handleentry{% + \ifx\svne@rev\empty + \let\svne@rev\svn@revinit + \fi \svn@ifequal{\svne@name}{\svnfilefname}% {% + \message{^^J% + Read from '.svn/entries' file:^^J% + Filename: \svne@name^^J% + Date: \svne@date^^J% + Revision: \svne@rev^^J% + Author: \svne@author^^J% + HeadURL: \svne@url^^J% + ^^J% + }% \svnkwdef{Filename}{\svne@name}% \svnkwdef{Date}{\svne@date}% \svnkwdef{Revision}{\svne@rev}% @@ -2204,19 +2255,80 @@ \svnkwdef{Revision}{0}% \svnkwdef{Author}{}% % \end{macrocode} -% The catcodes are changed by \cs{svn@catcodes} to allow \TeX-special characters -% inside the keywords. The braces |{ }| are changed to allow comments between -% the arguments. \cs{svnidlong@readargsfull} is called to read the arguments. +% Read arguments verbatim or non-verbatim. +% \begin{macrocode} + \if@svnmulti@verbatim + \expandafter\svnidlong@readverb + \else + \expandafter\svnidlong@readargs + \fi +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\svnidlong@readverb} +% The following macros read the four arguments of |\svnidlong| one-by-one with +% verbatim mode deactivated between them to ignore all comments. The macro +% |\@ifnextchar| is used to get rid of all spaces (and therefore comments) between +% the arguments. An error message is printed if a wrong syntax is discovered. +% \begin{macrocode} +\def\svnidlong@readverb{% + \@ifnextchar\bgroup + {\svnidlong@readverb@\svnidlong@readverb@a}% + {\PackageError{svn-multi}{Wrong syntax for \string\svnidlong}{}}% +} +% \end{macrocode} +% Sets up verbatim mode and calls the macro given as an argument. % \begin{macrocode} +\def\svnidlong@readverb@#1{% \begingroup - \if@svnmulti@verbatim - \svn@catcodes - \catcode`\{=12 - \catcode`\}=12 - \else - \def\svnidlong@readargsfull{\svnidlong@readargs}% - \fi - \svnidlong@readargsfull + \svn@catcodes + \catcode`\{=1\relax + \catcode`\}=2\relax + #1% +} +% \end{macrocode} +% Reads first argument, ignores spaces and comments and calls next macro. +% \begin{macrocode} +\def\svnidlong@readverb@a#1{% + \endgroup + \svnkwsave@read #1\relax + \@ifnextchar\bgroup + {\svnidlong@readverb@\svnidlong@readverb@b}% + {\PackageError{svn-multi}{Wrong syntax for \string\svnidlong}{}}% +} +% \end{macrocode} +% Reads second argument, ignores spaces and comments and calls next macro. +% \begin{macrocode} +\def\svnidlong@readverb@b#1{% + \endgroup + \svnkwsave@read #1\relax + \@ifnextchar\bgroup + {\svnidlong@readverb@\svnidlong@readverb@c}% + {\PackageError{svn-multi}{Wrong syntax for \string\svnidlong}{}}% +} +% \end{macrocode} +% Reads third argument, ignores spaces and comments and calls next macro. +% \begin{macrocode} +\def\svnidlong@readverb@c#1{% + \endgroup + \svnkwsave@read #1\relax + \@ifnextchar\bgroup + {\svnidlong@readverb@\svnidlong@readverb@d}% + {\PackageError{svn-multi}{Wrong syntax for \string\svnidlong}{}}% +} +% \end{macrocode} +% Reads last argument, scans date if not empty and calls the Id update macro. +% \begin{macrocode} +\def\svnidlong@readverb@d#1{% + \endgroup + \svnkwsave@read #1\relax + \ifx\svnkwDate\empty\else + \@svn@scanlongdate{\svnkwDate}% + \fi + \@svn@updateid{\svnkw{Revision}}{\svnkw{Date}}% + {\svnkw{Author}}{\svnkw{URL}}% + \ignorespaces } % \end{macrocode} % \end{macro} @@ -2240,32 +2352,7 @@ \fi % \end{macrocode} % \end{macro} - -% \begin{macro}{\svnidlong@readargsfull}[8] -% {some text, ignored}{Keyword 1} -% {some text, ignored}{Keyword 2} -% {some text, ignored}{Keyword 3} -% {some text, ignored}{Keyword 4} -% Reads all four arguments of \cs{svnidlong} and passes them to -% \cs{svnidlong@readargs}. The normal argument braces are changed to category -% ``other'' and put into the macros parameter text to remove all code between -% them. This is done to avoid problems with comments direct after one of the -% arguments. Because the braces are now non-special the parentheses are made to -% a local replacement. % -% \begin{macrocode} -\if@svnmulti@verbatim -\begingroup -\catcode`\{=12\catcode`\}=12 -\catcode`\(=1\catcode`\)=2 -\gdef\svnidlong@readargsfull#1{#2}#3{#4}#5{#6}#7{#8}(% - \svnidlong@readargs(#2)(#4)(#6)(#8)% -) -\endgroup -\fi -% \end{macrocode} -% \end{macro} - % \begin{macro}{\svnidlong@readargs}[4]{Keyword 1}{Keyword 2}{Keyword 3} % {Keyword 4} % Calls sub macro for all four arguments and ends the catcode changes made @@ -3774,6 +3861,9 @@ patch generated macros '\string\pgf@image@<name>!' from the 'pgf' package!}% % |\csname| to avoid \TeX{} if-parsing errors when they are not defined. % \begin{macrocode} \AtBeginDocument{% +\ifx\chapter\relax + \let\chapter\@undefined +\fi \ifx\chapter\@undefined %% Adapted from the \tableofcontents macro, LaTeX `article' class [2005/09/16] diff --git a/Master/texmf-dist/source/latex/svn-multi/svn-multi.ins b/Master/texmf-dist/source/latex/svn-multi/svn-multi.ins index 9ae4d53330e..6d120c55696 100644 --- a/Master/texmf-dist/source/latex/svn-multi/svn-multi.ins +++ b/Master/texmf-dist/source/latex/svn-multi/svn-multi.ins @@ -15,7 +15,7 @@ %% This work consists of the files svn-multi.dtx, svn-multi-pl.dtx, svn-multi.ins %% and the derived files svn-multi.sty, svnkw.sty and svn-multi.pl. %% -%% $Id: svn-multi.ins 622 2009-03-23 12:27:16Z martin $ +%% $Id: svn-multi.ins 1866 2010-07-19 11:17:15Z martin $ \input docstrip.tex |