🌐 AI搜索 & 代理 主页
Skip to content

mathtext: Finetuning sup/super block to match TeX reference #4873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdboom merged 14 commits into from
Aug 25, 2015
Merged

mathtext: Finetuning sup/super block to match TeX reference #4873

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3a32194
first attempt
zblz Aug 6, 2015
800ff30
shrink after Hlist!
zblz Aug 6, 2015
8007cd1
latest finetuning for cm, other fonts will need different parameters!
zblz Aug 6, 2015
22a6682
finetune stix and stixsans
zblz Aug 6, 2015
2ade0fa
add tests for brackets
zblz Aug 7, 2015
84ace61
apply different rules for dropsub (integrals)
zblz Aug 7, 2015
2b050ec
add sub/superscript parameters for Arev Sans
zblz Aug 7, 2015
4d7d377
remove kerning between nucleus and sub or super
zblz Aug 8, 2015
c56e56e
improve integral and slanted nuclei placement
zblz Aug 8, 2015
4d1c494
remove redundant test
zblz Aug 10, 2015
ccdeeba
implement comments by mdboom
zblz Aug 24, 2015
341d481
add all baseline images with subsuper
zblz Aug 24, 2015
43b5455
fix no nucleus in mathtext
zblz Aug 24, 2015
f1fe6e5
add baseline images changed outside of test_mathtext and new test
zblz Aug 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
shrink after Hlist!
  • Loading branch information
@zblz
zblz committed Aug 7, 2015
commit 800ff30f74aa125b895a3c88bd59de33a0bb080c
20 changes: 11 additions & 9 deletions lib/matplotlib/mathtext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,7 +1187,7 @@ def get_underline_thickness(self, font, fontsize, dpi):
# get any smaller
NUM_SIZE_LEVELS = 6
# Percentage of x-height of additional horiz. space after sub/superscripts
SCRIPT_SPACE = -0.10
SCRIPT_SPACE = 0.07
# Percentage of x-height that sub/superscripts drop below the baseline
SUBDROP = 0.3
# Percentage of x-height that superscripts drop below the baseline
Expand All @@ -1196,7 +1196,7 @@ def get_underline_thickness(self, font, fontsize, dpi):
SUB1 = 0.0
# Percentage of x-height that supercripts are offset relative to the subscript
# for slanted nuclei
DELTA = 0.15
DELTA = 0.10

class MathTextWarning(Warning):
pass
Expand Down Expand Up @@ -2631,7 +2631,6 @@ def is_slanted(self, nucleus):

def subsuper(self, s, loc, toks):
assert(len(toks)==1)
# print 'subsuper', toks

nucleus = None
sub = None
Expand Down Expand Up @@ -2686,6 +2685,8 @@ def subsuper(self, s, loc, toks):
"Subscript/superscript sequence is too long. "
"Use braces { } to remove ambiguity.")

last_char = nucleus.children[-2] if isinstance(nucleus,Hlist) else nucleus

state = self.get_state()
rule_thickness = state.font_output.get_underline_thickness(
state.font, state.fontsize, state.dpi)
Expand Down Expand Up @@ -2735,25 +2736,26 @@ def subsuper(self, s, loc, toks):
shift_down = SUBDROP * xHeight
if super is None:
# node757
sub.shrink()
x = Hlist([sub])
x.shrink()
x.width += SCRIPT_SPACE * xHeight
shift_down = max(shift_down, SUB1)
clr = x.height - (abs(xHeight * 4.0) / 5.0)
shift_down = max(shift_down, clr)
x.shift_amount = shift_down / 2.
else:
super.shrink()
x = Hlist([super])
if self.is_slanted(last_char):
x = Hlist([Kern(DELTA * super.height),super])
else:
x = Hlist([super])
x.shrink()
x.width += SCRIPT_SPACE * xHeight
shift_up = SUP1 * xHeight
if self.is_slanted(nucleus):
x = Hlist([Kern(DELTA * x.height),x])
if sub is None:
x.shift_amount = -shift_up
else: # Both sub and superscript
sub.shrink()
y = Hlist([sub])
y.shrink()
y.width += SCRIPT_SPACE * xHeight
shift_down = max(shift_down, SUB1 * xHeight)
# If sub and superscript collide, move sup up
Expand Down