anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix handling of codepoints 9, 10, 12, 13

Browse Source 
Qt >= 5 refuses to display them. We work around this in lib/symbols
already, but make sure we do not try to display math glyphs at these
code points anyway.

Fixes bug #8493.
This commit is contained in:
Jean-Marc Lasgouttes 2022-11-20 20:48:35 +01:00
parent 580dea638d
commit 7d196fea77
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO.killqt4
View File

@ -8,5 +8,4 @@ Things left to do after killing Qt4 (obtained by grepping for Qt4 and 'Qt 4'):
* update or remove development/lyx.rpm.README * update or remove development/lyx.rpm.README
* update or remove development/lyxserver/server_monitor.cpp * update or remove development/lyxserver/server_monitor.cpp
* update or remove development/tools/count_total_lines_of_compiled_code.sh * update or remove development/tools/count_total_lines_of_compiled_code.sh
* check references to qt4 in lib/symbols

8
lib/symbols
View File

@ -871,15 +871,13 @@ Ydown stmry 5 0 mathbin x x stmaryrd
Yleft stmry 6 0 mathbin x x stmaryrd Yleft stmry 6 0 mathbin x x stmaryrd
Yright stmry 7 0 mathbin x x stmaryrd Yright stmry 7 0 mathbin x x stmaryrd
varcurlyvee stmry 8 0 mathbin x x stmaryrd varcurlyvee stmry 8 0 mathbin x x stmaryrd
# qt4 does not display characters at the \t position (0x09) # qt does not display characters at codepoints 9, 10,12,13
# therefore our .ttf font contains a copy at 170 (0xaa) # therefore our copies of the TeX fonts have duplicate glyphs after 170
#varcurlywedge stmry 9 0 mathbin x x stmaryrd
#10,12,13 codepoints broken in qt5
varcurlywedge stmry 170 0 mathbin x x stmaryrd varcurlywedge stmry 170 0 mathbin x x stmaryrd
minuso stmry 171 0 mathbin x x stmaryrd minuso stmry 171 0 mathbin x x stmaryrd
baro stmry 11 0 mathbin x x stmaryrd baro stmry 11 0 mathbin x x stmaryrd
sslash stmry 172 0 mathbin x x stmaryrd sslash stmry 172 0 mathbin x x stmaryrd
#for whatever reason qt5 refuses to display anything at position 173 #for whatever reason qt refuses to display anything at position 173
bbslash stmry 174 0 mathbin x x stmaryrd bbslash stmry 174 0 mathbin x x stmaryrd
moo stmry 14 0 mathbin x x stmaryrd moo stmry 14 0 mathbin x x stmaryrd
varotimes stmry 15 0 mathbin x x stmaryrd varotimes stmry 15 0 mathbin x x stmaryrd

9
src/frontends/qt/GuiFontLoader.cpp
View File

@ -386,10 +386,11 @@ bool FontLoader::available(FontInfo const & f)
bool FontLoader::canBeDisplayed(char_type c) bool FontLoader::canBeDisplayed(char_type c)
{ {
// bug 8493 // bug 8493: with Qt5, characters with codepoints 9, 10, 12 and 13
if (c == 0x0009) // are rendered as spaces. We handle that in our TeX fonts by making
// FIXME KILLQT4: get rid of this function if not needed anymore // copies of the glyphs elsewhere, but this may trigger if we are
// FIXME check whether this is still needed for Qt5 // unlucky.
if (c == 0x0009 || c == 0x000a || c == 0x000c || c == 0x000d)
return false; return false;
return true; return true;
} }