summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-10-06 22:52:14 +0000
committerKarl Berry <karl@freefriends.org>2006-10-06 22:52:14 +0000
commit94d59fa51b8d976b869d6b521d96e9bc382843e0 (patch)
treea95d4cdafdea88328c6605faf98d7af6729eadce /Master
parent7b91f7f5bc81d1bd34ae7e5582db73c2779264d9 (diff)
fancyhdr update
git-svn-id: svn://tug.org/texlive/trunk@2252 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty15
-rw-r--r--Master/texmf-dist/tpm/fancyhdr.tpm4
2 files changed, 15 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty b/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
index 172c68b8446..77ed4e3012d 100644
--- a/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
+++ b/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
@@ -1,4 +1,4 @@
-% fancyhdr.sty version 3.0
+% fancyhdr.sty version 3.2
% Fancy headers and footers for LaTeX.
% Piet van Oostrum,
% Dept of Computer and Information Sciences, University of Utrecht,
@@ -135,6 +135,16 @@
% March 3, 2004
% Release of version 3.0
+% Oct 7, 2004
+% version 3.1
+% Added '\endlinechar=13' to \fancy@reset to prevent problems with
+% includegraphics in header when verbatiminput is active.
+
+% March 22, 2005
+% version 3.2
+% reset \everypar (the real one) in \fancy@reset because spanish.ldf does
+% strange things with \everypar between << and >>.
+
\def\ifancy@mpty#1{\def\temp@a{#1}\ifx\temp@a\@empty}
\def\fancy@def#1#2{\ifancy@mpty{#2}\fancy@gbl\def#1{\leavevmode}\else
@@ -308,7 +318,8 @@
% verbatim crosses a page boundary)
% It also defines a \nouppercase command that disables \uppercase and
% \Makeuppercase. It can only be used in the headers and footers.
-\def\fancy@reset{\restorecr
+\let\fnch@everypar\everypar% save real \everypar because of spanish.ldf
+\def\fancy@reset{\fnch@everypar{}\restorecr\endlinechar=13
\def\baselinestretch{1}%
\def\nouppercase##1{{\let\uppercase\relax\let\MakeUppercase\relax
\expandafter\let\csname MakeUppercase \endcsname\relax##1}}%
diff --git a/Master/texmf-dist/tpm/fancyhdr.tpm b/Master/texmf-dist/tpm/fancyhdr.tpm
index c2af53a09e6..605530342f6 100644
--- a/Master/texmf-dist/tpm/fancyhdr.tpm
+++ b/Master/texmf-dist/tpm/fancyhdr.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/fancyhdr.zip">
<TPM:Name>fancyhdr</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/09 00:49:07</TPM:Date>
+ <TPM:Date>2004/03/02 16:20:00</TPM:Date>
<TPM:Version>1.99b</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>
@@ -18,7 +18,7 @@ floats) on the page.
<TPM:Author>Piet van Oostrum</TPM:Author>
<TPM:Size>408099</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="26980">
+ <TPM:RunFiles size="27394">
texmf-dist/tex/latex/fancyhdr/extramarks.sty
texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
texmf-dist/tpm/fancyhdr.tpm