rpms
/
doxygen
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed bz#1673230 - BR on tex(newunicodechar.sty) in doxygen-latex

This commit is contained in:
Than Ngo 2019-02-08 14:09:09 +01:00
parent 3453b33b8f
commit 135737fac1
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
doxygen-1.8.15-inconsistent_whitespace_removal_for_operators.patch Normal file
View File

@ -0,0 +1,48 @@
commit e54ccc0e6eb12a0720860d863a89cb3f1a83f2a2
Author: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun Feb 3 14:33:35 2019 +0100
Issue 6814: Inconsistent whitespace removal for operators in 1.8.15
diff --git a/src/util.cpp b/src/util.cpp
index 9a0e513b..3a3bfd38 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1895,7 +1895,7 @@ QCString removeRedundantWhiteSpace(const QCString &s)
if (g_charAroundSpace.charMap[(uchar)pc].before &&
g_charAroundSpace.charMap[(uchar)nc].after &&
!(pc==',' && nc=='.') &&
- (osp<8 || (osp>=8 && pc!='"' && isId(nc)) || (osp>=8 && pc!='"' && nc!='"'))
+ (osp<8 || (osp>=8 && isId(pc) && isId(nc)))
// e.g. 'operator >>' -> 'operator>>',
// 'operator "" _x' -> 'operator""_x',
// but not 'operator int' -> 'operatorint'
commit 2802e2b4ee8158dba3f3584037e99907c6db7ec4
Author: Dimitri van Heesch <doxygen@gmail.com>
Date: Mon Feb 4 22:19:56 2019 +0100
Issue 6814: Further finetuning for inconsistent whitespace removal for operators in 1.8.15
diff --git a/src/util.cpp b/src/util.cpp
index 3a3bfd38..53b176d4 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1847,7 +1847,8 @@ QCString removeRedundantWhiteSpace(const QCString &s)
case '*':
if (i>0 && pc!=' ' && pc!='\t' && pc!=':' &&
pc!='*' && pc!='&' && pc!='(' && pc!='/' &&
- pc!='.' && (osp<9 || !(pc=='>' && osp==11)))
+ pc!='.' && osp<9
+ )
// avoid splitting &&, **, .*, operator*, operator->*
{
*dst++=' ';
@@ -1855,7 +1856,7 @@ QCString removeRedundantWhiteSpace(const QCString &s)
*dst++=c;
break;
case '&':
- if (i>0 && isId(pc))
+ if (i>0 && isId(pc) && osp<9)
{
if (nc != '=')
// avoid splitting operator&=

4
doxygen.spec
View File

@ -83,6 +83,7 @@ Requires: tex(xtab.sty)
Requires: tex(import.sty)
Requires: tex(tabu.sty)
Requires: tex(appendix.sty)
Requires: tex(newunicodechar.sty)
Requires: texlive-epstopdf-bin
%endif
@ -186,7 +187,8 @@ make tests -C %{_target_platform}
%changelog
* Fri Feb 08 2019 Than Ngo <than@redhat.com> - 1:1.8.15-4
- fix bz#673228 - doxgen 1.8.15 operator whitespace changes cause wxpython FTBFS
- fixed bz#673228 - operator whitespace changes cause wxpython FTBFS
- fixed bz#1673230 - BR on tex(newunicodechar.sty) in doxygen-latex
* Tue Feb 05 2019 Than Ngo <than@redhat.com> - 1:1.8.15-3
- fixed bz#1671999, backported from upstream