summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-08-08 00:11:15 +0000
committerKarl Berry <karl@freefriends.org>2008-08-08 00:11:15 +0000
commit8b8a5ec42a2b505d7e21eb76bc3c60ce1a665cbd (patch)
treecfca5e5bb573f489ca3f8261abd8da0341954598 /Master/texmf-dist
parent3d71e200413af24908303ea9b75aa8cd6fcf0a07 (diff)
dlfltxb update (7aug08)
git-svn-id: svn://tug.org/texlive/trunk@10155 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/dlfltxb/README30
-rw-r--r--Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdfbin240990 -> 280107 bytes
-rw-r--r--Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.tex107
-rw-r--r--Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-sample.cfg123
-rw-r--r--Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdfbin29454 -> 29460 bytes
-rw-r--r--Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdfbin193507 -> 195206 bytes
-rw-r--r--Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.pdfbin161065 -> 189338 bytes
-rw-r--r--Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdfbin110241 -> 133769 bytes
-rw-r--r--Master/texmf-dist/tex/latex/dlfltxb/dlfltxbcodetips.sty116
-rw-r--r--Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty4
-rw-r--r--Master/texmf-dist/tex/latex/dlfltxb/dlfltxbtocconfig.sty41
11 files changed, 305 insertions, 116 deletions
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/README b/Master/texmf-dist/doc/latex/dlfltxb/README
index 77518029351..368fb7ec4ff 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/README
+++ b/Master/texmf-dist/doc/latex/dlfltxb/README
@@ -34,6 +34,9 @@ HISTORY
* 20080122 small changes to dlfltxbtocconfig
+ * 20080805 changes to several packages
+
+
Current file contents for the dlfltxb bundle:
=============================================
@@ -60,6 +63,16 @@ dlfltxbcodetips (v0.26):
* \ProvidePGFPagesFourOnOneWithSpaceForNotes provides a
'4 on 1 with space for notes' layout for pgfpages, based on the
standard '8 on 1'
+ * \ArrowBetweenLines for \Updownarrow between lines in a
+ alignat-env
+ * \MoveEqLeft, for making indented equations easier
+ * \OverloadUnderscoreInMath, after which _ will be overloaded in
+ math-mode, such that X_|max| = X_{\textup{max}}
+ * \DeclareMathSymbolShorthand and hence \DeclareMathSet for
+ * creating easy shortcuts to various symbols, such as \setR for
+ \mathbb{R} (the real numbers), we promote the method of using
+ shortcuts that have a meaning with out the definition of the
+ shortcut it self
Changes
-------
@@ -72,8 +85,14 @@ Changes
v0.25 Bugfix.
v0.26 Bugfix.
v0.30 added \ProvidePGFPagesFourOnOneWithSpaceForNotes
+ v0.40 added \MoveEqLeft (renamed from \PullBack),
+ \OverloadUnderscoreInMath, \DeclareMathSet,
+ \DeclareMathSymbolShorthand
+
+
-dlfltxbmarkup (v0.65):
+
+dlfltxbmarkup (v0.70):
---------------------
* dlfltxbmarkup.sty
@@ -105,7 +124,8 @@ Changes
20070601 new version of dlfltxbmarkup-sample.cfg
20080117 new version of dlfltxbmarkup-sample.cfg plus a bug fix
-
+ 20080805 use \scriptsize instead of \footnotesize when writing in the
+ margins. Major cleanup in dlfltxbmarkup-sample.cfg
dlfltxbmisc (v0.2):
-------------------
@@ -128,7 +148,7 @@ Changes
2008/01/01 fixed to accommodate changes in mempatch version 4.9
-dlfltxbtocconfig (0.6)
+dlfltxbtocconfig (0.65)
----------------------
* dlfltxbtocconfig.sty
@@ -147,7 +167,9 @@ Changes
2008/01/17 Initial release
2008/01/22 Made the ToC titles configurable using \contentsname and a
- provided \shortcontentsname
+ provided \shortcontentsname
+ 2008/08/05 some reconfiguration of the look of the short toc.
+
package_doc.bib:
----------------
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdf
index 7074fd3aeb9..eeead6a6cf1 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdf
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.tex b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.tex
index 076b35305bb..0f584e617e1 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.tex
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.tex
@@ -11,7 +11,7 @@
\setlrmargins{*}{*}{0.7}
\setulmargins{*}{*}{1}
-\setlength\marginparwidth{4cm}
+\setlength\marginparwidth{3.5cm}
\checkandfixthelayout
@@ -25,7 +25,9 @@
\definecolor{linkcolour}{rgb}{0,0.2,0.6}
\definecolor{citecolour}{rgb}{0,0.6,0.2}
\definecolor{urlcolour} {rgb}{0.8,0,0.8}
-
+\definecolor{nicered}{rgb}{.647,.129,.149}
+
+
\hypersetup{
pdftitle={The dlfltxbcodetips package},
pdfauthor={Copyright \textcopyright\ \number\year\ Lars Madsen},
@@ -47,6 +49,8 @@
\usepackage[round]{natbib}
\usepackage{dlfltxbcodetips}
+\OverloadUnderscoreInMath
+
\usepackage[loadsampleconfig]{dlfltxbmarkup}
\renewcommand\felineMarginAdjustment{\RaggedLeft}
@@ -117,6 +121,11 @@
\pagestyle{plain}
+\newcommand\note[1]{\textcolor{nicered}{\sffamily #1}}
+
+
+\hyphenation{Provide-PGF-Pages-Four-On-One-With-Space-For-Notes}
+\hyphenation{Overload-Underscore-In-Math}
\begin{document}
@@ -321,6 +330,10 @@ might become a problem.
h(x) & = 0
\end{alignat}
\end{sourcedisplay}
+\noindent\note{This macro have been added to the mathtools package, and will be
+ available with the next mathtools release, afterwhich it will be
+ removed from this package.}
+
\section{Switch dead space}
@@ -387,18 +400,22 @@ and
&\qquad{}\otimes\dbx[6cm]\,.
\end{align*}
But having to do all those indentations by hand quickly becomes quite
-dull. Instead, align everything to the left, and pull back the first
+tedious. Instead, align everything to the left, and pull back the first
line. This is what the following macro does.
+
+\note{Please note that this macro have been added to the
+mathtools package and will be available with the next release of
+mathtools, afterwhich it will be removed from this package.}
\begin{syntax}
- \markup{PullBack}\oarg{number}
+ \markup{MoveEqLeft}\oarg{number}
\end{syntax}
The optional argument is a number (without unit, em will be used)
indicating the amount of indentation. 2\,em is the default. Now simply
-use \markup[nomk]{PullBack} instead of the >>\texttt{\&}<< on the
+use \markup[nomk]{MoveEqLeft} instead of the >>\texttt{\&}<< on the
first line.
\begin{sourcedisplay}
\begin{align*}
- \PullBack f(x) + g(x) + \dbx[4cm] \\
+ \MoveEqLeft f(x) + g(x) + \dbx[4cm] \\
& = \dbx[5cm] \\
& = \dbx[5cm]
\end{align*}
@@ -407,7 +424,7 @@ The optional argument is usually used whenever the alignment is moved
to the right of the equal signs.
\begin{sourcedisplay}
\begin{align*}
- \PullBack[3] f(x) + g(x) + \dbx[4cm] \\
+ \MoveEqLeft[3] f(x) + g(x) + \dbx[4cm] \\
={} & \dbx[5cm] \\
& + \dbx[5cm]
\end{align*}
@@ -478,7 +495,55 @@ Of course, non-balanced \markup[nomk]{left}--\markup[nomk]{right}
constructions may not be used.
-\chapter{Additional layout for the \textsf{pfgpages} package}
+
+
+\chapter{Declaring sets}
+\label{cha:declaring-sets}
+
+It is a good idea to avoid the one (or two) letter shortcuts for sets
+etc., e.g.\ \verb+\R+ for \verb+\mathbb{R}+, it can cause problems
+when co-writing articles with people with other naming habits.
+
+To help with this we provide
+\begin{syntax}
+\markup{DeclareMathSet}\oarg{options}\marg{identifier}
+\end{syntax}
+By default it can be used as
+\begin{Sourcedisplay}
+\DeclareMathSet{R}% => \setR = \mathbb{R}
+$ \setR $
+\end{Sourcedisplay}
+But we have several options to change things. Options
+(\Arg{key}=\Arg{value} style, note that \Arg{identifier} is what is
+given to the formating macro).
+\begin{description}\firmlist
+\item[format] the macro used to format the output, default: \verb|\mathbb|
+\item[name] this defaults to \Arg{identifier}, but can be used to
+ change a part of the macro name,
+ e.g. \verb+\DeclareMathSet[name=Cat,format=\matcal]{C}+ results in
+ \verb+\setCat=\mathcal{C}+.
+\item[prefix] this defaults to \verb+set+, but one might want to use
+ \begin{syntax}
+ \verb+\DeclareMathSet[prefix=group,format=\mathrm]{U}+
+ \end{syntax}
+to get
+ \verb+\groupU+, the unitary group.
+\item[overwrite] boolean, if true, then you can overwrite an existing
+ macro, otherwise it will throw an error.
+
+\end{description}
+Note that for sets it is not a good idea to declare them as math
+operators, as some mathematical operations take sets as their
+argument, so the spacing before an operator would be wrong in that
+case.
+
+\note{Note that this will also be added to the mathtools package, and
+ then removed from this package}
+
+\chapter{Misc}
+\label{cha:misc}
+
+\section{Additional layout for the \textsf{pfgpages} package}
\label{sec:addit-layo-textsfpfg}
The macro \markup{ProvidePGFPagesFourOnOneWithSpaceForNotes} will
@@ -487,6 +552,18 @@ with the \markup[sty,nomk]{pgfpages} package. It is basically the same
as the >>\verb*+8 on 1+<< layout but leaving the second column empty
for reader to fill in their own notes.
+\section{Overloading \texttt{\_} in math-mode}
+\label{sec:overl-texttt_-math}
+
+Placing \markup{OverloadUnderscoreInMath} in the preamble will
+overload the \texttt{\_} character in math-mode such that
+\begin{Sourcedisplay}
+\[
+ X_{ab} = X_|max|
+\]
+\end{Sourcedisplay}
+that is \verb+_|...|+ is that same as \verb+_{\textup{...}}+.
+
\bibliographystyle{plainnat}
\bibliography{package_doc}
@@ -501,3 +578,17 @@ for reader to fill in their own notes.
%%% TeX-PDF-mode: nil
%%% End:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-sample.cfg b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-sample.cfg
index 7f8b2b69c24..708e51cd738 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-sample.cfg
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-sample.cfg
@@ -1,4 +1,4 @@
-\ProvidesFile{felinemarkup.cfg}[2007/05/15 by Lars madsen]
+\ProvidesFile{felinemarkup.cfg}[2008/08/05 by Lars madsen]
% the original name for the dlfltxbmarkup package was 'felinemarkup',
% and in my book I use the following generated keys
@@ -23,23 +23,25 @@
% 2007/05/25 added the mltbib, bbtpc and bbtpcenv keys
% 2007/??/?? added sistyle key
% 2007/06/20 added acronym key
+% 2008/06/27 fixed some settings
% default key
\def\felineStandardKey{macro}
%
+\def\ENcs#1{{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}
% til makroer
\felineKeyGenerator{macro}
{for normal macros (this is the default key)}%
- {\felineWriteInMargin{{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{#1@\protect\css{#1}}}%
- {{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}
+ {\ENcs{#1}}
\felineKeyGenerator{m}%
{just an alias for macro}%
- {\felineWriteInMargin{{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{#1@\protect\css{#1}}}%
- {{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}
+ {\ENcs{#1}}
@@ -99,39 +101,39 @@
\def\felinenameuse#1{\@nameuse{#1}}
\felineKeyGenerator{msym}%
{mathematical symbols}
- {\felineWriteInMargin{\cs{#1} \textnormal{($\@nameuse{#1}$)}}}%
+ {\felineWriteInMargin{\ENcs{#1} \textnormal{($\@nameuse{#1}$)}}}%
{\felineIndexCmd{#1@\protect\css{#1} ($\protect\felinenameuse{#1}$)}%
}%
- {\cs{#1}}
+ {\ENcs{#1}}
% store matematiske symboler
\felineKeyGenerator{bigmsym}%
{operator symbols, like sum etc.}
- {\felineWriteInMargin{\cs{#1} \textnormal{($\@nameuse{#1}$)}}}%
+ {\felineWriteInMargin{\ENcs{#1} \textnormal{($\@nameuse{#1}$)}}}%
{\felineIndexCmd{#1@\protect\css{#1} ($\protect\felinenameuse{#1}$)}%
\felineIndexCmd{store symboler!#1@\protect\css{#1} ($\protect\felinenameuse{#1}$)}%
%
}%
- {\cs{#1}}
+ {\ENcs{#1}}
% log-like konstruktioner
\felineKeyGenerator{mlog}%
{log-like functions}
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{#1@\protect\css{#1} (mat. operator)}%
\felineIndexCmd{navngivne operatorer!#1@\protect\css{#1}}%
%
}%
- {\cs{#1}}
+ {\ENcs{#1}}
% almindelige symboler
\felineKeyGenerator{sym}%
{text symbols}
- {\felineWriteInMargin{\cs{#1} \textnormal{(\@nameuse{#1})}}}%
+ {\felineWriteInMargin{\ENcs{#1} \textnormal{(\@nameuse{#1})}}}%
{\felineIndexCmd{#1@\protect\css{#1} (\@nameuse{#1})}}%
- {\cs{#1}}
+ {\ENcs{#1}}
% delimiters/hegn
\felineKeyGenerator{delim}%
@@ -143,18 +145,18 @@
% delimiters speciel
\felineKeyGenerator{delims}%
{special delimiters (no idea what this is used for)}
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{#1@\protect\css{#1}}}%
- {\ensuremath{\cs{#1}}}
+ {\ensuremath{\ENcs{#1}}}
% ntheorem makroer
\felineKeyGenerator{nthm}%
{ntheorem macros}
- {\felineWriteInMargin{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{ntheorem (pakke)@ntheorem (pakke)!\protect\css{#1}}%
\felineIndexCmd{#1 (ntheorem)@\protect\css{#1}
(ntheorem)}}%
- {\cs{#1}}
+ {\ENcs{#1}}
% ntheorem theoremstyles
\felineKeyGenerator{nthmstl}%
@@ -169,9 +171,9 @@
% XY pic makroer
\felineKeyGenerator{xym}%
{Xy-pic macros}
- {\felineWriteInMargin{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{#1@\protect\css{#1}}\felineIndexCmd{XY-pic@\protect\Xy-pic!#1@\protect\css{#1}}}%
- {\cs{#1}}
+ {\ENcs{#1}}
% Xy-pic pile
\felineKeyGenerator{xymar}%
@@ -205,9 +207,9 @@
% natbib makroer
\felineKeyGenerator{nb}%
{natbib macros}
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{#1 (natbib)@\protect\css{#1} (natbib)}\felineIndexCmd{natbib (pakke)@natbib (pakke)!#1@\protect\css{#1}}}%
- {\cs{#1}}
+ {\ENcs{#1}}
% natbib options
\felineKeyGenerator{nbop}%
@@ -242,11 +244,11 @@
% memoir specifik makro
\felineKeyGenerator{mem}%
{memoir specific macros}
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{#1 (memoir)@\protect\css{#1} (memoir)}%
\felineIndexCmd{memoir (klasse)!#1@\protect\css{#1}}%
}%
- {\cs{#1}}
+ {\ENcs{#1}}
% memoir specifik environment
\felineKeyGenerator{menv}%
@@ -268,30 +270,30 @@
% booktabs makroer
\felineKeyGenerator{bt}%
{booktabs macros}
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{#1@\protect\css{#1} (booktabs)}%
\felineIndexCmd{booktabs (pakke)@booktabs (pakke)!#1@\protect\css{#1}}%
\felineIndexCmd{memoir (klasse)!#1@\protect\css{#1}}%
}%
- {\cs{#1}}
+ {\ENcs{#1}}
% longtable makroer
\felineKeyGenerator{lt}%
{longtable macros}
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{#1 (longtable)@\protect\css{#1} (longtable)}%
\felineIndexCmd{longtable@longtable (pakke)!#1@\protect\css{#1}}%
}%
- {\cs{#1}}
+ {\ENcs{#1}}
% colortbl makroer
\felineKeyGenerator{ctbl}%
{colortbl macros}
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{#1 (colortabl)@\protect\css{#1} (colortbl)}%
\felineIndexCmd{colortbl@colortbl (pakke)!#1@\protect\css{#1}}%
}%
- {\cs{#1}}
+ {\ENcs{#1}}
% dokumentklasse options
\felineKeyGenerator{dop}%
@@ -313,30 +315,30 @@
% fixme makroer
\felineKeyGenerator{fixme}%
{fixme macros}
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{fixme (pakke)!#1@\protect\css{#1}}%
\felineIndexCmd{#1 (fixme)@\protect\css{#1} (fixme)}%
}%
- {{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}
+ {\ENcs{#1}}
% varioref makroer
\felineKeyGenerator{vario}%
{varioref macros}
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{varioref (pakke)!#1@\protect\css{#1}}%
\felineIndexCmd{#1 (varioref)@\protect\css{#1} (varioref)}%
}%
- {{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}
+ {\ENcs{#1}}
% fancyhdr pakke makroer
\felineKeyGenerator{fnchdr}%
{fancyhdr macros}
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{fancyhdr (pakke)!#1@\protect\css{#1}}%
\felineIndexCmd{#1 (fancyhdr)@\protect\css{#1} (fancyhdr)}%
}%
- {{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}
+ {\ENcs{#1}}
% memoir specifikke pagestyles
@@ -359,20 +361,20 @@
% caption pakke makroer
\felineKeyGenerator{cap}%
{caption pacakge macros}
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{caption (pakke)!#1@\protect\css{#1}}%
\felineIndexCmd{#1 (caption)@\protect\css{#1} (caption)}%
}%
- {{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}
+ {\ENcs{#1}}
% subfig makroer
\felineKeyGenerator{subfig}%
{subfig macros}
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{subfig (pakke)!#1@\protect\css{#1}}%
\felineIndexCmd{#1 (subfig)@\protect\css{#1} (subfig)}%
}%
- {{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}
+ {\ENcs{#1}}
% KOMA-script kalsser
\felineKeyGenerator{clskoma}%
@@ -393,10 +395,10 @@
% enumitem makroer
\felineKeyGenerator{ei}%
{enumitem macros}
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{enumitem (pakke)!#1@\protect\css{#1}}%
\felineIndexCmd{#1 (enumitem)@\protect\css{#1} (enumitem)}}%
- {\cs{#1}}
+ {\ENcs{#1}}
% enumitem options
\felineKeyGenerator{eio}%
@@ -414,7 +416,7 @@
\felineIndexCmd{#1 (inputencoding)}}%
{\texttt{#1}}
-% tæller options
+% counter options
\felineKeyGenerator{counter}%
{name of counters}
{\felineWriteInMargin{#1}}%
@@ -422,20 +424,29 @@
\felineIndexCmd{#1 (tæller)}}%
{\texttt{#1}}
+% memoir counter options
+\felineKeyGenerator{mcounter}%
+ {name of memoir counters}
+ {\felineWriteInMargin{#1}}%
+ {\felineIndexCmd{tæller!#1 (memoir)}%
+ \felineIndexCmd{#1 (tæller, memoir)}}%
+ {\texttt{#1}}
+
+
% længde options
\felineKeyGenerator{length}%
{name of lengths}
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{længde!#1@\protect\css{#1}}%
\felineIndexCmd{#1 (længde)@\protect\css{#1} (længde)}}%
- {\cs{#1}}
+ {\ENcs{#1}}
\felineKeyGenerator{gauss}%
{gauss package macros}
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{#1@\protect\css{#1} (gauss)}%
\felineIndexCmd{gauss (pakke)@gauss (pakke)!#1@\protect\css{#1}}}%
- {\cs{#1}}
+ {\ENcs{#1}}
\felineKeyGenerator{tabs}%
{column specifiers for tabular etc.}
@@ -446,17 +457,17 @@
\felineKeyGenerator{mltbib}%
{macros related to the multibib pacakge}
- {\felineWriteInMargin{{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{#1@\protect\css{#1}}%
\felineIndexCmd{multibib (pakke)!#1@\protect\css{#1}}}%
- {{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}
+ {\ENcs{#1}}
\felineKeyGenerator{bbtpc}%
{macros related to the bibtopic package}
- {\felineWriteInMargin{{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{#1@\protect\css{#1}}%
\felineIndexCmd{bibtopic (pakke)!#1@\protect\css{#1}}}%
- {{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}
+ {\ENcs{#1}}
\felineKeyGenerator{bbtpcenv}%
{environment related to the bibtopic package}
@@ -468,17 +479,17 @@
\felineKeyGenerator{sistyle}%
{macros from the sistye package}%
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{#1 (sistyle)@\protect\css{#1} (sistyle)}%
\felineIndexCmd{sistyle (pakke)!#1@\protect\css{#1}}}%
- {\cs{#1}}
+ {\ENcs{#1}}
\felineKeyGenerator{acronym}%
{macros from the acronym package}%
- {\felineWriteInMargin{\cs{#1}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{#1 (acronym)@\protect\css{#1} (acronym)}%
\felineIndexCmd{acronym (pakke)!#1@\protect\css{#1}}}%
- {\cs{#1}}
+ {\ENcs{#1}}
\felineKeyGenerator{beamerenv}
{environment related to the beamer class}
@@ -490,10 +501,10 @@
\felineKeyGenerator{beamer}%
{macros related to the beamer class}
- {\felineWriteInMargin{{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}}%
+ {\felineWriteInMargin{\ENcs{#1}}}%
{\felineIndexCmd{#1@\protect\css{#1} (beamer)}%
\felineIndexCmd{beamer (klasse)!#1@\protect\css{#1}}}%
- {{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}
+ {\ENcs{#1}}
\felineKeyGenerator{beamerclsopt}%
{class options for beamer related to the beamer class}
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf
index 636ccda8624..0dd7b16d0a3 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf
index 321eef76a95..9ca7ca87ef4 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.pdf
index e1fbd0111cc..7dcfac11f4a 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.pdf
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdf
index 8a8103ed37b..11f81e89aa0 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdf
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbcodetips.sty b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbcodetips.sty
index edc970b473d..20fabc43215 100644
--- a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbcodetips.sty
+++ b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbcodetips.sty
@@ -1,4 +1,4 @@
-\ProvidesPackage{dlfltxbcodetips}[2008/01/17 v0.3 by Lars 'daleif' Madsen]
+\ProvidesPackage{dlfltxbcodetips}[2008/08/05 v0.4 by Lars 'daleif' Madsen]
% this pacakge collects some macros presented as code tips in my LaTeX
% book: "Introduktion til LaTeX". As the macros might be useful for
@@ -34,6 +34,9 @@
% not work correctly
% 20070711 Bug fixed in \ArrowBetweenLines, the \ifin@ should go
% inside the \noalign, not outside.
+% 20080617 added \DeclareMathSymbolShorthand and \DeclareMathSet
+% 20080618 redesigned and renamed \PullBack to \MoveEqLeft
+
\newif\ifdlf@do@load@amssymb
\dlf@do@load@amssymbtrue
@@ -63,22 +66,25 @@
% more information is needed
% requires the amsmath package
% Now including a fix explained by Jean-Côme Charpentier
-\def\ArrowBetweenLines{\relax
- \iffalse{\fi\ifnum0=`}\fi
- \@ifstar{\ArrowBetweenLines@auxI{00}}{\ArrowBetweenLines@auxI{01}}}
-\def\ArrowBetweenLines@auxI#1{%
- \@ifnextchar[%
- {\ArrowBetweenLines@auxII{#1}}%
- {\ArrowBetweenLines@auxII{#1}[\Updownarrow]}}
-\def\ArrowBetweenLines@auxII#1[#2]{%
- \ifnum0=`{\fi \iffalse}\fi
- \crcr
- \noalign{\nobreak\vskip-\baselineskip\vskip-\lineskip}%
- \noalign{\expandafter\in@\expandafter{\@currenvir}%
+% only create ArrowBetweenLines if it does not already exist
+\@ifundefined{ArrowBetweenLines}{
+ \def\ArrowBetweenLines{\relax
+ \iffalse{\fi\ifnum0=`}\fi
+ \@ifstar{\ArrowBetweenLines@auxI{00}}{\ArrowBetweenLines@auxI{01}}}
+ \def\ArrowBetweenLines@auxI#1{%
+ \@ifnextchar[%
+ {\ArrowBetweenLines@auxII{#1}}%
+ {\ArrowBetweenLines@auxII{#1}[\Updownarrow]}}
+ \def\ArrowBetweenLines@auxII#1[#2]{%
+ \ifnum0=`{\fi \iffalse}\fi
+ \crcr
+ \noalign{\nobreak\vskip-\baselineskip\vskip-\lineskip}%
+ \noalign{\expandafter\in@\expandafter{\@currenvir}%
{alignedat,aligned,gathered}%
- \ifin@ \else\notag\fi}%
- \if#1 &&\quad #2\else #2\quad\fi
- \\\noalign{\nobreak\vskip-\lineskip}}
+ \ifin@ \else\notag\fi}%
+ \if#1 &&\quad #2\else #2\quad\fi
+ \\\noalign{\nobreak\vskip-\lineskip}}
+}{}
% for making theorems with shaded background
@@ -90,16 +96,6 @@
% redesigned 2007/06/06
\def\theoremframecommand{}
\newcommand\NewShadedTheorem[1]{%
-% \@ifpackageloaded{ntheorem}{
-% \@ifpackagewith{ntheorem}{framed}{}{
-% \PackageError{dlfltxbcodetips}{
-% \string\NewShadedTheorem\space requires ntheorem to be ^^J
-% loaded with the framed option}{}
-% }
-% }{
-% \PackageError{dlfltxbcodetips}{\string\NewShadedTheorem\space can
-% only be used^^J with the ntheorem package}{}
-% }
\@ifnextchar[{\NST@levelii{#1}}{\NST@levelii{#1}[]}}
\def\NST@levelii#1[#2]#3{%
\@ifnextchar[{\NST@leveliii{#1}[#2]{#3}}{\NST@leveliii{#1}[#2]{#3}[]}}
@@ -143,15 +139,18 @@
% displayed alignments should be indented by 2em (and other rules)
% instead of aligning ti the left and indenting all subsequent lines,
% it is easier to just pull back the first line. Just align all lines
-% to the left and replace the & on the fist line with \PullBack
-% The indentation amount can be changed by \PullBack[3], i.e. no unit,
+% to the left and replace the & on the fist line with \MoveEqLeft
+% The indentation amount can be changed by \MoveEqLeft[3], i.e. no unit,
% 'em will be used automatically
-\newlength\PullBackLength
-\newcommand\PullBack[1][2]{%
- \setlength{\global\PullBackLength}{#1em}%
- \kern\PullBackLength%
- &
- \kern-\PullBackLength}
+
+\@ifundefined{MoveEqLeft}{%
+\newcommand\MoveEqLeft[1][2]{%
+ \global\@tempdima=#1em%
+ \kern\@tempdima%
+ &
+ \kern-\@tempdima}
+}{}
+
% this implements a stack that holds a user build mathindent
@@ -293,3 +292,52 @@
can only be used after the pgfpages package have been loaded}{}
}}
+
+
+\begingroup
+\catcode`\_=\active
+\gdef\OverloadUnderscoreInMath{%
+ \protected\gdef_{\@ifnextchar|\subtextup\sb}
+ \gdef\subtextup|##1|{\sb{\textup{##1}}}
+ \AtBeginDocument{\catcode`\_=12 \mathcode`\_=32768 }
+}
+\endgroup
+\@onlypreamble\OverloadUnderscoreInMath
+
+
+\@ifundefined{DeclareMathSymbolShorthand}{
+ \usepackage{keyval}
+\newcommand*\DeclareMathSymbolShorthand[2]{% #1=keyvals, #2=arg.
+ \begingroup
+ \setkeys{DMSS}{name=#2,#1}%
+ \if\DMSS@overwrite % check for overwrite?
+ \else
+ \expandafter\@ifdefinable\csname \DMSS@prefix\DMSS@name\endcsname{%
+ \def\DMSS@overwrite{00}% okay to redefine.
+ }%
+ \fi\if\DMSS@overwrite % Do definition or not.
+ \expandafter\@firstofone
+ \else\expandafter\@gobble\fi
+ {\protected\expandafter\xdef\csname \DMSS@prefix\DMSS@name \endcsname{%
+ \unexpanded\expandafter{\DMSS@format{#2}}%
+ }}\endgroup}
+\define@key{DMSS}{format}{\def\DMSS@format{#1}}
+\define@key{DMSS}{name}{\def\DMSS@name{#1}}
+\define@key{DMSS}{prefix}{\def\DMSS@prefix{#1}}
+\define@key{DMSS}{overwrite}[true]{%
+ \edef\DMSS@overwrite{\csname if#1\endcsname 00\else 01\fi}}
+\setkeys{DMSS}{overwrite=false}
+\newcommand\MakeDeclareShorthandCommand[3]{%
+ % #1 = command name
+ % #2 = default prefix name
+ % #3 = default format
+ % make format macro for eacy reference
+ \expandafter\@ifdefinable\csname math#2format\endcsname{\@namedef{math#2format}{#3}}
+ \newcommand#1[2][]{%
+ \expandafter\DeclareMathSymbolShorthand
+ \expandafter{format=\csname math#2format\endcsname,prefix=#2,##1}{##2}}}
+\MakeDeclareShorthandCommand{\DeclareMathSet}{set}{\mathbb}
+}{} % is defined already so do nothing
+
+
+
diff --git a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty
index 32f4652c10a..8c83baffaa2 100644
--- a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty
+++ b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty
@@ -1,4 +1,4 @@
-\ProvidesPackage{dlfltxbmarkup}[2008/01/10 v0.65 by daleif]
+\ProvidesPackage{dlfltxbmarkup}[2008/08/05 v0.70 by daleif]
% This package be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -90,7 +90,7 @@
% leaves a whatsit
% \ifoddpage\RaggedRight\else\RaggedLeft\fi%
\felineMarginAdjustment%
- {\slshape\footnotesize\strut\hspace{0pt}\color{black} #1\strut\par}}}
+ {\slshape\scriptsize\strut\hspace{0pt}\color{black} #1\strut\par}}}
% this might not belong here, but we will leave it for now
\strictpagechecktrue%
diff --git a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbtocconfig.sty b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbtocconfig.sty
index 8c34150d82a..07bac330fdb 100644
--- a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbtocconfig.sty
+++ b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbtocconfig.sty
@@ -1,4 +1,4 @@
-\ProvidesPackage{dlfltxbtocconfig}[2008/01/22 v0.6 by Lars Madsen]
+\ProvidesPackage{dlfltxbtocconfig}[2008/08/05 v0.65 by Lars Madsen]
% This package be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,6 +19,13 @@
% 20071227 a few internal macros changed to reflect changes in
% mempatch 4.9
% 20080122 made the toc titlenames configurable (\contentsname and \shortcontentsname)
+% 20080131 bugfix, the \ToCSubsectionIndentsPullBack and
+% \ToCSubsectionIndentsBackToNormal should also set toc
+% levels, otherwise hyperref bookmarks comes out wrong.
+% 20080207 bugfix, \spart renamed to \specialpart, end the bookmark
+% for it is removed
+% 20080708 small cosmetic changes
+
% we need to be running under the memoir class
\@ifclassloaded{memoir}{}{%
@@ -36,12 +43,13 @@
% add a \par to the end of the TOC
\AtEndDocument{\addtocontents{toc}{\par}}
-% we will use a special spart in the short ToC only the short ToC uses
+% we will use a special specialpart in the short ToC only the short ToC uses
% this so we define it to do nothing
-\providecommand\l@spart[2]{}
+\providecommand\l@specialpart[2]{}
% similar to \part but only adds something to the ToC
-\newcommand\spart[1]{\cleartorecto\phantomsection\addcontentsline{toc}{spart}{\protect\partnumberline{}#1}}
-
+\newcommand\specialpart[1]{\cleartorecto\phantomsection\addcontentsline{toc}{specialpart}{\protect\partnumberline{}#1}}
+% apparently a bookmark level of 100 removes it from the list of book marks
+\newcommand\toclevel@specialpart{100}%
% this is now directly included in memoir
% % the command inserted into the ToC holding the hook
@@ -98,12 +106,15 @@
\renewcommand\partnumberline[1]{}
% no parts
\renewcommand\l@part[2]{}
- % we will use spart ToC entries and ignore parts
- \renewcommand\l@spart[2]{%
+ % we will use specialpart ToC entries and ignore parts
+ \renewcommand\l@specialpart[2]{%
\noindent
- \qquad\qquad\hrulefill\par%
+% \qquad\qquad\hrulefill\par%
+ \vskip5pt\par
\noindent%
- \raisebox{-3pt}[0pt][0pt]{\qquad\qquad\parbox[t]{0.35\textwidth}{\itshape\bfseries ##1}}%
+% \raisebox{-3pt}[0pt][0pt]{\qquad\qquad\parbox[t]{0.35\textwidth}{\itshape\bfseries ##1}}%
+% \raisebox{-4pt}[0pt][0pt]{\qquad\qquad\parbox[t]{0.35\textwidth}{##1}}%
+ \raisebox{-4pt}[0pt][0pt]{\parbox[t]{0.35\textwidth}{\raggedleft##1} \qquad\qquad}%
\vskip-\baselineskip
\par
}
@@ -178,7 +189,8 @@
\begingroup%
\fboxsep=2pt%
{\parbox{\linewidth-2\fboxsep-2\fboxrule}%
- {\itshape\LARGE \strut\hfill {##1} \hfill\strut}}%
+% {\itshape\LARGE \strut\hfill {##1} \hfill\strut}}%
+ {\scshape\Large \strut\hfill {##1} \hfill\strut}}%
\endgroup%
}
@@ -370,9 +382,14 @@
}
\newcommand\ToCSubsectionIndentsPullBack{%
- \addtocontents{toc}{\protect\cftSubsectionIndentsPullBack}}
+ \addtocontents{toc}{\protect\cftSubsectionIndentsPullBack}%
+ \renewcommand\toclevel@subsubsection{2}%
+}
+
\newcommand\ToCSubsectionIndentsBackToNormal{%
- \addtocontents{toc}{\protect\cftSubsectionIndentsBackToNormal}}
+ \addtocontents{toc}{\protect\cftSubsectionIndentsBackToNormal}%
+ \renewcommand\toclevel@subsubsection{3}%
+}
% preserving some old syntax
\let\RedofelineEmulSubSubSec\ToCSubsectionIndentsBackToNormal