From b69db11a2c4cf8cfa09e22acfda740d4f68b2e73 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 18 Mar 2013 22:34:58 +0000 Subject: enotez (18mar13) git-svn-id: svn://tug.org/texlive/trunk@29422 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/enotez/README | 6 +- Master/texmf-dist/doc/latex/enotez/enotez_en.pdf | Bin 415444 -> 423164 bytes Master/texmf-dist/doc/latex/enotez/enotez_en.tex | 159 +++-- .../doc/latex/enotez/enotez_split_example.tex | 25 +- Master/texmf-dist/tex/latex/enotez/enotez.sty | 651 +++++++++++++-------- 5 files changed, 552 insertions(+), 289 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/enotez/README b/Master/texmf-dist/doc/latex/enotez/README index b31236b513e..1f2948b06b6 100644 --- a/Master/texmf-dist/doc/latex/enotez/README +++ b/Master/texmf-dist/doc/latex/enotez/README @@ -1,15 +1,15 @@ -------------------------------------------------------------------------- -the ENOTEZ package +the ENOTEZ package v0.5a Endnotes for LaTeX2e -2012/12/30 v0.4 +2013/03/18 -------------------------------------------------------------------------- Clemens Niederberger Web: https://bitbucket.org/cgnieder/enotez/ E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- -Copyright 2012 Clemens Niederberger +Copyright 2012-2013 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/doc/latex/enotez/enotez_en.pdf b/Master/texmf-dist/doc/latex/enotez/enotez_en.pdf index d12c08660cd..4fc79487da8 100644 Binary files a/Master/texmf-dist/doc/latex/enotez/enotez_en.pdf and b/Master/texmf-dist/doc/latex/enotez/enotez_en.pdf differ diff --git a/Master/texmf-dist/doc/latex/enotez/enotez_en.tex b/Master/texmf-dist/doc/latex/enotez/enotez_en.tex index a949b6cae48..f250b918129 100644 --- a/Master/texmf-dist/doc/latex/enotez/enotez_en.tex +++ b/Master/texmf-dist/doc/latex/enotez/enotez_en.tex @@ -1,7 +1,7 @@ % arara: pdflatex -% arara: makeindex: { sort: true, style: enotez_en.ist } -% arara: biber -% arara: pdflatex +% !arara: makeindex: { sort: true, style: enotez_en.ist } +% !arara: biber +% !arara: pdflatex % arara: pdflatex % -------------------------------------------------------------------------- % the ENOTEZ package @@ -13,7 +13,7 @@ % Web: https://bitbucket.org/cgnieder/enotez/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2011-2012 Clemens Niederberger +% Copyright 2011-2013 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -37,7 +37,7 @@ \docsetup{ pkg = enotez , code-box = { - backgroundcolor = gray!7!white , + backgroundcolor = gray!3!white , skipbelow = .6\baselineskip plus .5ex minus .5ex , skipabove = .6\baselineskip plus .5ex minus .5ex , roundcorner = 3pt , @@ -69,7 +69,8 @@ \DeclareInstance{enotez-list}{addsec}{paragraph}{heading=\addsec{#1}} % Layout: -% \usepackage{libertine} +\usepackage{libertinehologopatch} + \cnpkgusecolorscheme{friendly} \renewcommand*\othersectionlevelsformat[3]{% \textcolor{main}{#3\autodot}\enskip} @@ -81,18 +82,15 @@ \ChangeEmph{[}[,.02em]{]}[.055em,-.08em] \ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em] -\ExplSyntaxOn -\NewDocumentCommand \Default {g} - { - \hfill\llap - { - \IfNoValueTF { #1 } - {(initially~empty)} - {Default:~\code{#1}} - } - \newline - } -\ExplSyntaxOff +\newcommand*\Default[1]{% + \hfill\llap + {% + \ifblank{#1}% + {(initially~empty)}% + {Default:~\code{#1}}% + }% + \newline +} \usepackage[backend=biber,style=alphabetic]{biblatex} \addbibresource{\jobname.bib} @@ -135,24 +133,43 @@ } \end{filecontents*} -\usepackage{makeidx} +\usepackage{imakeidx} \begin{filecontents*}{\jobname.ist} heading_prefix "{\\bfseries " heading_suffix "\\hfil}\\nopagebreak\n" headings_flag 1 - delim_0 "\\dotfill " - delim_1 "\\dotfill " - delim_2 "\\dotfill " - delim_r "\\textendash" + delim_0 "\\dotfill\\hyperpage{" + delim_1 "\\dotfill\\hyperpage{" + delim_2 "\\dotfill\\hyperpage{" + delim_r "}\\textendash\\hyperpage{" + delim_t "}" suffix_2p "\\nohyperpage{\\,f.}" suffix_3p "\\nohyperpage{\\,ff.}" \end{filecontents*} -\makeindex +\indexsetup{noclearpage,othercode=\footnotesize} +\makeindex[options={-s \jobname.ist},intoc,columns=3] \usepackage{kantlipsum} \usepackage{etoolbox} \AtBeginEnvironment{beispiel}{\setfnpct{dont-mess-around}} \usepackage{enumitem} + +\usepackage{marginnote,ragged2e} +\makeatletter +\providecommand*\sinceversion[1]{% + \@bsphack + \marginnote{% + \footnotesize\sffamily\RaggedRight + \textcolor{black!75}{Introduced in version~#1}}% + \@esphack} +\providecommand*\changedversion[1]{% + \@bsphack + \marginnote{% + \footnotesize\sffamily\RaggedRight + \textcolor{black!75}{Changed in version~#1}}% + \@esphack} +\makeatother + \begin{document} \section{Licence and Requirements} @@ -161,10 +178,8 @@ terms of the \LaTeX\ Project Public License, version 1.3 or later (\url{http://www.latex-project.org/lppl.txt}). The package has the status ``maintained.'' -\enotez needs and loads the following packages: \paket{expl3}, -\paket{xparse}, \paket{xtemplate} and \paket{l3keys2e}. If you're using -\paket{memoir}, a \paket[http://www.ctan.org/pkg/koma-script]{KOMA-Script} -class or the package \paket{caption} \enotez also needs and loads \paket{etoolbox}. +\enotez needs and loads the following packages: \paket{expl3}, \paket{xparse}, +\paket{xtemplate}, \paket{l3keys2e}, \paket{xpatch} and \paket{scrlfile}. \section{Motivation} \enotez is a new implementation of endnotes for \LaTeXe\ since the \paket{endnotes} @@ -176,21 +191,26 @@ best solution in every case\footnote{You have to write the actual notes in the preamble or a separate file and reference them in the text.}. It also does not allow nested endnotes. +While \enotez worked in tests nicely with the \klasse{memoir} class please keep +in mind that \klasse{memoir} provides its own endnote mechanism. + \enotez enables nested endnotes properly and has another mechanism of customizing the list of endnotes which is easily extendable. One of the main features of \enotez is a split list of endnotes in which the notes are automatically separated by the sections or chapters they were set in, see section~\ref{sec:split} for more information. -As an aside: \enotez is nicely compatible with the \paket{fnpct} package% -\footnote{You'll have to use \cmd*{AdaptNote} for the time being, though.}. +As an aside: \enotez is nicely compatible with the \paket{fnpct} package. +Version~0.2j or newer of \paket{fnpct} automatically detects \enotez and adapts +the \cmd{endnote} command. \section{Usage} \subsection{Placing the Notes} The usage is simple: use \cmd{endnote} in the text where you want to place the note mark. \begin{beschreibung} - \befehl{endnote}[]{} Add an endnote in the text. + \Befehl{endnote}[]{}\newline + Add an endnote in the text. \end{beschreibung} \begin{beispiel} This is some text.\endnote{With an endnote.} @@ -198,23 +218,27 @@ note mark. There's not really much more to it. It is possible to add a custom mark by using the optional argument but that shouldn't be needed too often. \cmd{endnote} works fine inside tables, minipages, floats and captions\footnote{This has been -tested with the standard classes, \paket*{memoir}, and the \paket*{KOMA-Script} +tested with the standard classes, \klasse{memoir}, and the \klasse{KOMA-Script} classes, with and without the \paket*{caption} package. If you're using another -package that redefines \cmd*{caption} it might not work.}. Endnotes can also be -nested. Since that seemed making a pair \cmd{endnotemark}/\cmd{endnotetext} +package that redefines \cmd*{caption} or are using another class it might not +work. Before you place a note in a caption you should re-think the idea anyway.}. +Endnotes can also be nested. + +Since this functionality seemed making a pair \cmd{endnotemark}/\cmd{endnotetext} superfluous they are \emph{not} defined by \enotez. \begin{beispiel} This is some text.\endnote{With another endnote.\endnote{This is a nested\endnote{And another level deeper\ldots} endnote!}} - % uses package `kantlipsum': + % uses package `kantlipsum' to produce dummy text: Of course you can have several paragraphs\endnote{\kant[1-3]} in an endnote. \end{beispiel} \subsection{Printing the Notes} The notes are printed by using the command \cmd{printendnotes}. \begin{beschreibung} - \befehl{printendnotes}*[