diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/bibtex/tamethebeast/CHANGES | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/bibtex/tamethebeast/Makefile | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/bibtex/tamethebeast/README | 16 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.pdf | bin | 910956 -> 910327 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.ps.gz | bin | 429694 -> 0 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec1.tex | 10 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec2.tex | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec3.tex | 60 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec5.tex | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.tex | 36 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/bibtex/tamethebeast/ttb_style.sty | 2 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tlpkg-ctan-check | 5 | ||||
| -rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 2 |
13 files changed, 93 insertions, 61 deletions
diff --git a/Master/texmf-dist/doc/bibtex/tamethebeast/CHANGES b/Master/texmf-dist/doc/bibtex/tamethebeast/CHANGES index 68397e16ec3..dc421c47ecd 100644 --- a/Master/texmf-dist/doc/bibtex/tamethebeast/CHANGES +++ b/Master/texmf-dist/doc/bibtex/tamethebeast/CHANGES @@ -1,9 +1,9 @@ v1.00 2004/07/21 First release on CTAN. v1.01 2004/08/15 Corrected two related errors in sec3 (about left brace and @preamble) -v1.10 2005/03/06 Some corrections. +v1.1 2005/03/06 Some corrections. Added hyperref. -v1.20 2005/06/10 Added LPPL licence notes +v1.2 2005/06/10 Added LPPL licence notes Minor corrections and additions -v1.30 2005/10/16 Corrected many typos (thanks to Roger Jeurissen - and Maarten Grachten) +v1.3 2005/10/16 Corrected many typos +v1.4 2009/10/11 Corrected some more typos diff --git a/Master/texmf-dist/doc/bibtex/tamethebeast/Makefile b/Master/texmf-dist/doc/bibtex/tamethebeast/Makefile index 647f51b3333..f397c29d7e3 100644 --- a/Master/texmf-dist/doc/bibtex/tamethebeast/Makefile +++ b/Master/texmf-dist/doc/bibtex/tamethebeast/Makefile @@ -20,10 +20,6 @@ # and the derived ttb_en.dvi, ttb_en.ps and ttb_en.pdf all: - LATEX=latex make tex - dvips ttb_en -o - -pdf: LATEX=pdflatex make tex tex: *.tex @@ -37,8 +33,5 @@ tex: *.tex clean: rm -f *.aux ttb_en.log ttb_en.blg *.ilg *.ind *.idx \ ttb_en.bbl ttb_en.toc ttb_en.dvi ttb_en.out \ - ttb_en.ptc* ttb_en.mtc* ttb_en.bmt *~ - -tgz: - tar zcvf ttb_en.tgz Makefile ttb_*.tex ttb_*.sty local.bib \ - idxstyle.ist README CHANGES + ttb_en.ptc* ttb_en.mtc* ttb_en.bmt * +~ diff --git a/Master/texmf-dist/doc/bibtex/tamethebeast/README b/Master/texmf-dist/doc/bibtex/tamethebeast/README index e39177d4fad..7ea6fe28309 100644 --- a/Master/texmf-dist/doc/bibtex/tamethebeast/README +++ b/Master/texmf-dist/doc/bibtex/tamethebeast/README @@ -2,7 +2,7 @@ Tame the BeaST -- The B to X of BibTeX ======================================== Nicolas MARKEY <markey@lsv.ens-cachan.fr> - v1.3 2005/10/16 + v1.4 2009/10/11 This is an (as complete as possible) documentation @@ -10,3 +10,17 @@ about bibliographies in LaTeX, thus mainly about BibTeX. Comments welcome! + + +-------------------------------------------------------- +This work may be distributed and/or modified under +the conditions of the LaTeX Project Public License, +either version 1.3 of this license or (at your option) +any later version. The latest version of this license +is in + http://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions +of LaTeX version 2003/12/01 or later. +This work has the LPPL status "maintained". +The current maintainer of this work is Nicolas Markey. + diff --git a/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.pdf b/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.pdf Binary files differindex a5a89966c1e..9279ebd6270 100644 --- a/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.pdf +++ b/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.pdf diff --git a/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.ps.gz b/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.ps.gz Binary files differdeleted file mode 100644 index 56748003dc0..00000000000 --- a/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.ps.gz +++ /dev/null diff --git a/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec1.tex b/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec1.tex index 6d40692260c..a56c88686e9 100644 --- a/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec1.tex +++ b/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec1.tex @@ -38,7 +38,7 @@ This is the main matter of the document, mentioning [\ref{doc1}] and [\ref{doc2}], for instance. \section*{References} \begin{enumerate} - \renewcommand\labelenumi{[\theenumi]} %% numbers are surronded with brackets + \renewcommand\labelenumi{[\theenumi]} %% numbers are surrounded with brackets \item \label{doc1} Michel Goossens, Franck Mittelbach and Alexander Samarin, \emph{The \LaTeX{} Companion}, Addison Wesley, 1993. \item \label{doc2} Leslie Lamport, \emph{\LaTeX: A Document Preparation @@ -457,8 +457,8 @@ indentation due to the list): \hskip-\leftmargin \begin{minipage}{\textwidth} Here are some useful references about \LaTeX. They are -available in every worthy bookshop. Many other good documentations -might be found on the web (the FAQ of \textsf{comp.text.tex} for +available in every worthy bookshop. Much other good documentation +may be found on the web (the FAQ of \textsf{comp.text.tex} for instance). \end{minipage} \bigskip @@ -477,8 +477,8 @@ This code gives: \hskip-\leftmargin \begin{minipage}{\textwidth} Here are some useful references about \LaTeX. They are -available in every worthy bookshop. Many other good documentations -might be found on the web (the FAQ of \textsf{comp.text.tex} for +available in every worthy bookshop. Much other good documentation +may be found on the web (the FAQ of \textsf{comp.text.tex} for instance). \end{minipage} diff --git a/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec2.tex b/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec2.tex index ac324feb8ff..66a008dfc2c 100644 --- a/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec2.tex +++ b/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec2.tex @@ -35,7 +35,7 @@ This description is a somewhat optimistic view, however, and reality is a little more complex: In order to tell \bt which entries have to be extracted, you have to first run \LaTeX on your document. And once \bt has finished its job, you have to run \LaTeX anew in order to take -the resulting bibliography into account. Here are some more precisions: +the resulting bibliography into account. Here are some more details: \begin{itemize} \item At the very first stage, you run \LaTeX on your document. Since this is diff --git a/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec3.tex b/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec3.tex index d1459a7616a..7c295710b18 100644 --- a/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec3.tex +++ b/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec3.tex @@ -71,8 +71,8 @@ outermost braces can be replaced by parentheses: the ``argument'' of a ``command'' starting with an \texttt\at{} is considered as a comment. This gives an easy way to comment a given entry: just remove the initial \texttt\at. - As usual when a language allows comments: Don't hesitate to use - them, so that you have a clean, ordered, and easy-to-maintain + As usual when a language allows comments, don't hesitate to use + them so that you have a clean, ordered, and easy-to-maintain database. Conversely, anything starting with an \texttt\at{} is considered as being a new entry\footnote{There is a special entry type named \ent{comment}. The main use of such an @@ -88,7 +88,7 @@ initial~\texttt{\at}.}. \texttt{Example} and \texttt{example}. In the same way, if you cite both \texttt{example} and - \texttt{Example}, \bt will complain. Indeed, it would have to + \texttt{Example}, \bt will complain. Indeed, it~would have to include the same entry twice, which probably is not what you want; @@ -139,22 +139,18 @@ used for the \LaTeX Companion: } \end{verbatimtab} It gives complementary information about the book\footnote{Filling - both \nichp{title} and \nichp{booktitle} for a book may be of real - interest, as we will see in the section dedicated to cross - references (see section~\ref{crossref} for some more details).}, -for - instance the fact that it is available in your local library. -You really - should not hesitate to use auxiliary, personal fields, giving them - explicit names in order to be sure that no bibliography style -will - use them incidentally\footnote{You'll ask ``Is it really - useful?''. First of all, it is not that long to add those - informations each time you add a new entry, and it is much longer -to - add a field to several entries. Moreover, we'll see later how to - design bibliography styles, and you'll be able to write styles - that take those new fields into account.}. +both \nichp{title} and \nichp{booktitle} for a book may be of real +interest, as we will see in the section dedicated to cross references +(see section~\ref{crossref} for some more details).}, for instance the +fact that it is available in your local library. You really should +not hesitate to use auxiliary, personal fields, giving them explicit +names in order to be sure that no bibliography style will use them +incidentally\footnote{You'll ask ``Is it really useful?''. First of +all, it doesn't take long to add those informations each time you add a +new entry; it~takes much longer to add a field to several +entries. Moreover, we'll see later how to design bibliography styles, +and you'll be able to write styles that take those new fields into +account.}. \mysection{The \protect\nient{string} and \protect\nient{preamble} @@ -180,7 +176,7 @@ to define a shortcut for this publisher. Thus we write: \end{verbatimtab} This does not only spare some time, but most importantly, it ensures that -you won't misspell it, and helps you maintain an homogeneous database. +you won't misspell it, and helps you maintain a homogeneous database. I find this really interesting for author names, so that you're sure to always write them correctly (or always incorrectly, but it would be easy to detect and correct a global mistake anyway). @@ -459,7 +455,7 @@ It is a common error to separate names with commas instead of ``\texttt{and}''.} \hline \verb+De La Fontaine, Jean+ & \verb+Jean+ & \verb++ & \verb+De La Fontaine+ \\ \hline -\verb+De la Fontaine, Jean+ & \verb+Jean+ & \verb+De la+ & \verb+fontaine+ \\ +\verb+De la Fontaine, Jean+ & \verb+Jean+ & \verb+De la+ & \verb+Fontaine+ \\ \hline \verb+de La Fontaine, Jean+ & \verb+Jean+ & \verb+de+ & \verb+La Fontaine+ \\ \hline @@ -485,11 +481,13 @@ I think it's a good place for coming back to abbreviations: You probably agree that names are something not that easy to enter, and are error-prone. I personally advise defining an abbreviation for each author. You'll then concatenate them with \verb+``and''+ using -\verb+#+\index{bibtex}{\#@\texttt{\#}(concatenation)}\index{bibtex}{concatenation@concatenation (\texttt{\#})}. +\verb+#+\index{bibtex}{\#@\texttt{\#}(concatenation)}\index{bibtex}{concatenation@concatenation (\texttt{\#})} (actually, even \verb+``and''+ will be defined as an abbreviation). For instance, I always include a \ext{bib} file containing the following lines: \begin{verbatimtab} +@string{and = "and"} +... @string{goossens = "Goossens, Michel"} @string{mittelbach = "Mittelbach, Franck"} @string{samarin = "Samarin, Alexander"} @@ -499,12 +497,12 @@ another one containing: @string{AW = "Addison-Wesley"} \end{verbatimtab} and my main bibliographic file contains\footnote{This is not quite - true, since \texttt{September} still depends on the language, and I - prefer using \texttt{9} and letting the style file translate that + true, since \texttt{December} still depends on the language, and I + prefer using \texttt{12} and letting the style file translate that into the corresponding month in the correct language.}: \begin{verbatimtab} @book{companion, - author = goossens #" and "# mittelbach #" and "# samarin, + author = goossens # and # mittelbach # and # samarin, title = "The {{\LaTeX}} {C}ompanion", booktitle = "The {{\LaTeX}} {C}ompanion", year = 1993, @@ -670,12 +668,12 @@ it.}. But the first character here is You'd probably prefer \texttt{[DLC]} or \texttt{[Cru]}. The second solution would then be \begin{verbatimtab} - author = {\uppercase{d}}e {\uppercase{l}}a Cruz, Maria. + author = "{\uppercase{d}}e {\uppercase{l}}a Cruz, Maria" \end{verbatimtab} The label would be \verb+{\uppercase{d}}{\uppercase{l}}C+, which is correct. Another (easier) proposal would be \begin{verbatimtab} - author = {D}e {L}a Cruz, Maria. + author = "{D}e {L}a Cruz, Maria" \end{verbatimtab} This also solves the problem, because \bt only considers characters at level~0 when determining which part a word belongs to, but takes all letters into account @@ -688,22 +686,22 @@ This is precisely the reverse problem, but the solution will be different. Assume you cite a paper by the famous Spanish scientist \emph{Juan de la Cierva y Codorn\'\i u}. The basic ideas are \begin{verbatimtab} - author = de la Cierva {\lowercase{Y}} Codorn{\'\i}u, Juan + author = "de la Cierva {\lowercase{Y}} Codorn{\'\i}u, Juan" \end{verbatimtab} or \begin{verbatimtab} - author = de la Cierva {y} Codorn{\'\i}u, Juan + author = "de la Cierva {y} Codorn{\'\i}u, Juan" \end{verbatimtab} However, these solutions yields labels such as \verb+CYC+ or \verb+CyC+, where we would prefer \verb+CC+. Several solutions are possible: \begin{verbatimtab} - author = de la Cierva{ }y Cordon{\'\i}u, Juan + author = "de la Cierva{ }y Cordon{\'\i}u, Juan" \end{verbatimtab} or \begin{verbatimtab} - author = de la {Cierva y} Cordon{\'\i}u, Juan + author = "de la {Cierva y} Cordon{\'\i}u, Juan" \end{verbatimtab} Both solutions work: In the first case, \bt won't see the space, and considers that the \verb+y+ belongs to the previous word. In the second case, diff --git a/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec5.tex b/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec5.tex index 83bc4f6e3eb..1f74d6a5973 100644 --- a/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec5.tex +++ b/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.sec5.tex @@ -138,7 +138,7 @@ another style file; abbreviations are automatically expanded; It is easy to extract all the references by one author (remember that names could be encoded in many different manners inside a \ext{bib} database),~... The package \verb+bibexport+ implements these techniques: -\url{http://www.ctan.org/tex-archive/biblio/bibtex/contrib/bibexport/} +\url{http://www.ctan.org/tex-archive/biblio/bibtex/utils/bibexport/} \mysection{Using several languages in one bibliography} diff --git a/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.tex b/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.tex index e7a7feac9b9..045f6253377 100644 --- a/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.tex +++ b/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_en.tex @@ -19,10 +19,10 @@ % local.bib idxstyle.ist Makefile % and the derived ttb_en.dvi, ttb_en.ps and ttb_en.pdf -\def\ttbversion{1.3} -\def\ttbdate{16/10/2005} +\def\ttbversion{1.4} +\def\ttbdate{11/10/2009} -\documentclass{article} +\documentclass[twoside,openright]{article} \usepackage[T1]{fontenc} \usepackage{ifpdf} \ifpdf @@ -72,7 +72,7 @@ \par\bigskip Nicolas \textsc{Markey} \par -\url{markey@lsv.ens-cachan.fr} +\href{mailto:markey@lsv.ens-cachan.fr}{markey@lsv.ens-cachan.fr} \end{center} \widowpenalty10000 \vfil\vfil @@ -89,7 +89,7 @@ short and incomplete. The capital letters ``BST'' in the title represent the standard extension of \bt style files. ``B~to~X'' means that I tried to be as complete as -possible. Don't hesitate to e-mail me you \TeX{}nical as well as +possible. Don't hesitate to e-mail me your \TeX{}nical as well as (mis)spelling remarks. \end{minipage} \end{center} @@ -101,6 +101,32 @@ possible. Don't hesitate to e-mail me you \TeX{}nical as well as \end{center} \vfil +\clearpage + +\vbox{} +\vfill + +\noindent +\begin{center} +\begin{minipage}{.7\linewidth} +\centerline{\Large\textsf{Acknowledgements:}} + +\bigskip +Several readers of this document have helped me improve it. I~would +like to thank them: +Bj\"orn~Bringert, +Maarten~Grachten, +Roger~Jeurissen, +John~Kewley, +W.~Trevor~King, +Carsten~Lemmen, +Tristan~Miller, +Jochen~Vo\ss. +\end{minipage} +\end{center} +\vfill +\vfill + \include{ttb_en.sec1} \include{ttb_en.sec2} \include{ttb_en.sec3} diff --git a/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_style.sty b/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_style.sty index 7f9eef5356b..62ed2af81c7 100644 --- a/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_style.sty +++ b/Master/texmf-dist/doc/bibtex/tamethebeast/ttb_style.sty @@ -78,7 +78,7 @@ %\AtBeginDocument{% \setcounter{tocdepth}{0}% \def\thepart{\arabic{part}}% -\def\mypart{\clearpage\part}% +\def\mypart{\cleardoublepage\part}% \def\@part[#1]#2{ \ifnum\c@secnumdepth>\m@ne\relax \refstepcounter{part}% \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}% diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 946f5f39828..b3494eb5313 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -96,7 +96,7 @@ my @WorkingTLP = qw( eqexam eqlist eqparbox errata es-tex-faq ESIEEcv erdc esdiff esint esint-type1 eskd eskdx eso-pic esvect estcpmm - etaremune etex-pkg etextools ethiop ethiop-t1 etoolbox euenc eukdate + etaremune etex-pkg ethiop ethiop-t1 etoolbox euenc eukdate eulervm euproposal euro europecv eurosans eurosym everypage exam examdesign examplep exercise exp-testopt expdlist expl3 expressg extarrows exteps @@ -281,7 +281,8 @@ my @WorkingTLP = qw( yagusylo york-thesis yplan ziffer zhmetrics zhspacing zwgetfdate zwpagelayout ); -# epspdf - skip since Siep updates it locally. +# epspdf - skip since Siep updates it manually. +# etextools - skip since it's different on CTAN and apparently unfixable. exit (&main ()); diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 40bf34f8e32..5822f3923ef 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2752,7 +2752,7 @@ sub MAKEmisc { } sub MAKEtamethebeast { - my $destdir = "$DEST/doc/english/$package"; + my $destdir = "$DEST/doc/bibtex/$package"; &SYSTEM("mkdir -p $destdir"); &SYSTEM("$CP -r $packagedir/* $destdir"); } |