summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-10-12 18:16:31 (GMT)
committerGitHub <noreply@github.com>2020-10-12 18:16:31 (GMT)
commit8094f5f5cb5e4dad161fb4106cb26b125f184ad9 (patch)
tree60557d4dccea80e57a4b58053094a0bb27015c75
parent27f34ad61e37d53226cb9f5d806f3cf743cdb2e4 (diff)
parent24db478285843d3e6afa32af734e29a316f42d62 (diff)
downloadDoxygen-8094f5f5cb5e4dad161fb4106cb26b125f184ad9.zip
Doxygen-8094f5f5cb5e4dad161fb4106cb26b125f184ad9.tar.gz
Doxygen-8094f5f5cb5e4dad161fb4106cb26b125f184ad9.tar.bz2
Merge pull request #8086 from albert-github/feature/bug_latex_footer
Missing footer on first page of each chapter in LaTeX
-rw-r--r--doc/doxygen_manual.tex1
-rw-r--r--doc/manual.sty35
-rw-r--r--src/latexgen.cpp31
3 files changed, 41 insertions, 26 deletions
diff --git a/doc/doxygen_manual.tex b/doc/doxygen_manual.tex
index 0148379..aacb573 100644
--- a/doc/doxygen_manual.tex
+++ b/doc/doxygen_manual.tex
@@ -171,6 +171,7 @@ Written by Dimitri van Heesch\\[2ex]
\chapter{Perl Module Output}\label{perlmod}\hypertarget{perlmod}{}\input{perlmod}
\chapter{Doxygen's internals}\label{arch}\hypertarget{arch}{}\input{arch}
\renewcommand{\thepart}{}
+\renewcommand{\partname}{}
\part{Appendices}
\appendix
%mean that subinputfrom requires a / at the end of the path
diff --git a/doc/manual.sty b/doc/manual.sty
index 643bd40..fd9fd0e 100644
--- a/doc/manual.sty
+++ b/doc/manual.sty
@@ -8,7 +8,6 @@
% Setup fancy headings
\RequirePackage{fancyhdr}
-\pagestyle{fancyplain}
\newcommand{\clearemptydoublepage}{%
\newpage{\pagestyle{empty}\cleardoublepage}%
}
@@ -18,18 +17,28 @@
\renewcommand{\sectionmark}[1]{%
\markright{\thesection\ #1}%
}
-\fancyhead[LE]{\fancyplain{}{\bfseries\thepage}}
-\fancyhead[CE]{\fancyplain{}{}}
-\fancyhead[RE]{\fancyplain{}{\bfseries\leftmark}}
-\fancyhead[LO]{\fancyplain{}{\bfseries\rightmark}}
-\fancyhead[CO]{\fancyplain{}{}}
-\fancyhead[RO]{\fancyplain{}{\bfseries\thepage}}
-\fancyfoot[LE]{\fancyplain{}{}}
-\fancyfoot[CE]{\fancyplain{}{}}
-\fancyfoot[RE]{\fancyplain{}{\bfseries\scriptsize Generated by Doxygen @VERSION@ }}
-\fancyfoot[LO]{\fancyplain{}{\bfseries\scriptsize Generated by Doxygen @VERSION@ }}
-\fancyfoot[CO]{\fancyplain{}{}}
-\fancyfoot[RO]{\fancyplain{}{}}
+
+% Headers & footers
+\pagestyle{fancyplain}
+\renewcommand{\footrulewidth}{0.4pt}
+%
+\fancypagestyle{fancyplain}{
+\fancyhf{}
+\fancyhead[LE, RO]{\bfseries\thepage}
+\fancyhead[LO]{\bfseries\rightmark}
+\fancyhead[RE]{\bfseries\leftmark}
+\fancyfoot[LO, RE]{\bfseries\scriptsize Generated by Doxygen @VERSION@ }
+}
+%
+\fancypagestyle{plain}{
+\fancyhf{}
+\fancyfoot[LO, RE]{\bfseries\scriptsize Generated by Doxygen @VERSION@ }
+\renewcommand{\headrulewidth}{0pt}}
+%
+\pagestyle{fancyplain}
+%
+\usepackage{xpatch}
+\xpatchcmd{\part}{plain}{empty}{}{}
% Define caption that is also suitable in a table
\makeatletter
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index 3343c1a..1d55dd6 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -666,19 +666,24 @@ static void writeDefaultHeaderPart1(FTextStream &t)
t << "% Headers & footers\n"
"\\usepackage{fancyhdr}\n"
"\\pagestyle{fancyplain}\n"
- "\\fancyhead[LE]{\\fancyplain{}{\\bfseries\\thepage}}\n"
- "\\fancyhead[CE]{\\fancyplain{}{}}\n"
- "\\fancyhead[RE]{\\fancyplain{}{\\bfseries\\leftmark}}\n"
- "\\fancyhead[LO]{\\fancyplain{}{\\bfseries\\rightmark}}\n"
- "\\fancyhead[CO]{\\fancyplain{}{}}\n"
- "\\fancyhead[RO]{\\fancyplain{}{\\bfseries\\thepage}}\n"
- "\\fancyfoot[LE]{\\fancyplain{}{}}\n"
- "\\fancyfoot[CE]{\\fancyplain{}{}}\n"
- "\\fancyfoot[RE]{\\fancyplain{}{\\bfseries\\scriptsize " << genString << " Doxygen }}\n"
- "\\fancyfoot[LO]{\\fancyplain{}{\\bfseries\\scriptsize " << genString << " Doxygen }}\n"
- "\\fancyfoot[CO]{\\fancyplain{}{}}\n"
- "\\fancyfoot[RO]{\\fancyplain{}{}}\n"
- "\\renewcommand{\\footrulewidth}{0.4pt}\n";
+ "\\renewcommand{\\footrulewidth}{0.4pt}\n"
+ "%\n"
+ "\\fancypagestyle{fancyplain}{\n"
+ "\\fancyhf{}\n"
+ "\\fancyhead[LE, RO]{\\bfseries\\thepage}\n"
+ "\\fancyhead[LO]{\\bfseries\\rightmark}\n"
+ "\\fancyhead[RE]{\\bfseries\\leftmark}\n"
+ "\\fancyfoot[LO, RE]{\\bfseries\\scriptsize " << genString << " Doxygen }\n"
+ "}\n"
+ "%\n"
+ "\\fancypagestyle{plain}{\n"
+ "\\fancyhf{}\n"
+ "\\fancyfoot[LO, RE]{\\bfseries\\scriptsize " << genString << " Doxygen }\n"
+ "\\renewcommand{\\headrulewidth}{0pt}}\n"
+ "%\n"
+ "\\pagestyle{fancyplain}\n"
+ "%\n";
+
if (!Config_getBool(COMPACT_LATEX))
{
t << "\\renewcommand{\\chaptermark}[1]{%\n"