mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 10:00:33 +00:00
Compare commits
2 Commits
8d724b23a6
...
194b53ef9d
Author | SHA1 | Date | |
---|---|---|---|
|
194b53ef9d | ||
|
edf56d644d |
@ -2332,10 +2332,10 @@
|
|||||||
0x2224 "" "" "force!=utf8x" "\\nmid" "" # DOES NOT DIVIDE # or "\\notdivides" "mathabx"
|
0x2224 "" "" "force!=utf8x" "\\nmid" "" # DOES NOT DIVIDE # or "\\notdivides" "mathabx"
|
||||||
0x2225 "" "" "force!=utf8x" "\\parallel" "" # PARALLEL TO
|
0x2225 "" "" "force!=utf8x" "\\parallel" "" # PARALLEL TO
|
||||||
0x2226 "" "" "force!=utf8x" "\\nparallel" "amssymb" # NOT PARALLEL TO
|
0x2226 "" "" "force!=utf8x" "\\nparallel" "amssymb" # NOT PARALLEL TO
|
||||||
0x2227 "" "" "force!=utf8x" "\\bigwedge" "" # LOGICAL AND
|
0x2227 "" "" "force!=utf8x" "\\wedge" "" # LOGICAL AND
|
||||||
0x2228 "" "" "force!=utf8x" "\\bigvee" "" # LOGICAL OR
|
0x2228 "" "" "force!=utf8x" "\\vee" "" # LOGICAL OR
|
||||||
0x2229 "" "" "force!=utf8x" "\\bigcap" # INTERSECTION
|
0x2229 "" "" "force!=utf8x" "\\cap" # INTERSECTION
|
||||||
0x222a "" "" "force!=utf8x" "\\bigcup" "" # UNION
|
0x222a "" "" "force!=utf8x" "\\cup" "" # UNION
|
||||||
0x222b "" "" "force!=utf8x" "\\int" "esint" # INTEGRAL
|
0x222b "" "" "force!=utf8x" "\\int" "esint" # INTEGRAL
|
||||||
0x222c "" "" "force!=utf8x" "\\iint" "esint|amsmath" # DOUBLE INTEGRAL
|
0x222c "" "" "force!=utf8x" "\\iint" "esint|amsmath" # DOUBLE INTEGRAL
|
||||||
0x222d "" "" "force!=utf8x" "\\iiint" "esint|amsmath" # TRIPLE INTEGRAL
|
0x222d "" "" "force!=utf8x" "\\iiint" "esint|amsmath" # TRIPLE INTEGRAL
|
||||||
|
@ -114,7 +114,7 @@ inline QChar const ucs4_to_qchar(char_type const ucs4)
|
|||||||
|
|
||||||
|
|
||||||
GuiFontMetrics::GuiFontMetrics(QFont const & font)
|
GuiFontMetrics::GuiFontMetrics(QFont const & font)
|
||||||
: font_(font), metrics_(font, 0), xheight_(metrics_.xHeight()),
|
: font_(font), metrics_(font, 0), xheight_(-metrics_.boundingRect('x').top()),
|
||||||
strwidth_cache_(strwidth_cache_max_cost),
|
strwidth_cache_(strwidth_cache_max_cost),
|
||||||
breakstr_cache_(breakstr_cache_max_cost),
|
breakstr_cache_(breakstr_cache_max_cost),
|
||||||
qtextlayout_cache_(qtextlayout_cache_max_size)
|
qtextlayout_cache_(qtextlayout_cache_max_size)
|
||||||
@ -163,6 +163,7 @@ int GuiFontMetrics::em() const
|
|||||||
|
|
||||||
int GuiFontMetrics::xHeight() const
|
int GuiFontMetrics::xHeight() const
|
||||||
{
|
{
|
||||||
|
// This is not alays true on Windows (see #13100).
|
||||||
// LATTEST(metrics_.xHeight() == ascent('x'));
|
// LATTEST(metrics_.xHeight() == ascent('x'));
|
||||||
return xheight_;
|
return xheight_;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user