!11 [patch tracking] 20201016023007641729

From: @openeuler-ci-bot
Reviewed-by: @AlexZ11
Signed-off-by: @AlexZ11
This commit is contained in:
openeuler-ci-bot 2020-11-20 15:03:58 +08:00 committed by Gitee
commit 6578e63449
2 changed files with 47 additions and 2 deletions

View File

@ -3,12 +3,13 @@
Name: doxygen
Epoch: 1
Version: 1.8.18
Release: 4
Release: 5
Summary: A documentation system for C/C++
License: GPL+
Url: http://www.doxygen.nl
Source0: http://sourceforge.net/projects/doxygen/files/rel-1.8.18/%{name}-%{version}.src.tar.gz
Source1: doxywizard.desktop
Patch6000: ef6cc2b1b3b70fba03e994e7a61926c8e2958867.patch
BuildRequires: python3 ImageMagick gcc-c++ gcc perl-interpreter
BuildRequires: tex(dvips) tex(latex) tex(multirow.sty) tex(sectsty.sty) tex(tocloft.sty)
BuildRequires: tex(xtab.sty) tex(import.sty) tex(tabu.sty) tex(appendix.sty)
@ -92,6 +93,9 @@ make tests -C %{BuildDir}
%{_datadir}/icons/hicolor/*/apps/doxywizard.png
%changelog
* 20201016023007641729 patch-tracking 1.8.18-5
- append patch file of upstream repository from <ef6cc2b1b3b70fba03e994e7a61926c8e2958867> to <ef6cc2b1b3b70fba03e994e7a61926c8e2958867>
* Fri Sep 11 2020 baizhonggui <baizhonggui@huawei.com> - 1.8.18-4
- Modify Source0
@ -105,4 +109,4 @@ make tests -C %{BuildDir}
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Eliminate PDF file Differences
- DESC:Eliminate PDF file Differences

View File

@ -0,0 +1,41 @@
diff --git a/doc/doxygen_manual.tex b/doc/doxygen_manual.tex
index aacb57390..3354801dc 100644
--- a/doc/doxygen_manual.tex
+++ b/doc/doxygen_manual.tex
@@ -122,6 +122,7 @@
\usepackage{etoc}
\etocsettocstyle{\doxytocparskip}{\doxynormalparskip}
\begin{document}
+\raggedbottom
\pagenumbering{alph}
\begin{titlepage}
\includegraphics[width=\textwidth]{doxygen_logo}
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index 1d55dd60f..418afa7ed 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -774,7 +774,8 @@ static void writeDefaultHeaderPart1(FTextStream &t)
// End of preamble, now comes the document contents
t << "%===== C O N T E N T S =====\n"
"\n"
- "\\begin{document}\n";
+ "\\begin{document}\n"
+ "\\raggedbottom\n";
QCString documentPre = theTranslator->latexDocumentPre();
if (!documentPre.isEmpty())
{
diff --git a/templates/latex/doxygen.sty b/templates/latex/doxygen.sty
index 78a52546a..a1399b14a 100644
--- a/templates/latex/doxygen.sty
+++ b/templates/latex/doxygen.sty
@@ -186,9 +186,8 @@
% (only if caption is specified)
\newenvironment{DoxyImage}{%
\begin{figure}[H]%
- \begin{center}%
+ \centering%
}{%
- \end{center}%
\end{figure}%
}