Skip to content

Issue #1888: added in the \dfrac macro for displaystyle fractions #8151

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
QuLogic merged 9 commits into from
Jul 26, 2017
Merged

Issue #1888: added in the \dfrac macro for displaystyle fractions #8151

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4b9ff60
Feature addition: I added in the the \dfrac macro (displaystyle fract…
watkinrt Feb 26, 2017
45f5d63
PEP8 fixes
watkinrt Feb 26, 2017
bedfdc0
Documentation: Updated the docstring for the dfrac_demo
watkinrt Feb 26, 2017
0d10078
Documentation update: I updated the dfrac_demo docstring to be a raw …
Mar 2, 2017
2c9b9bc
Although Sphyinx requires "\\" to show "\" characters, I removed them…
watkinrt Mar 25, 2017
57fd910
Remove stray text from documentation.
watkinrt Apr 16, 2017
d0cfe37
With the resent merging of the sphinx-gallery branch, I went through …
watkinrt Jul 4, 2017
7781dbd
Merge remote-tracking branch 'master/master' into dfrac
watkinrt Jul 7, 2017
b80d975
TST: add missing tests
tacaswell Jul 16, 2017
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
Documentation update: I updated the dfrac_demo docstring to be a raw … 
…string with the backslashes escaped.

Feature modification: I added in a dictionary to the Parser class of mathtex to link math style names to their TeX numerical values. I used a dictionary instead of hardcoding specific math style (ex. DISPLAYSTYLE=0) as I will use the dictionary in my implementation of the math styles in the future.
  • Loading branch information
Ryan Watkins committed Mar 2, 2017
commit 0d10078c59909858b8a674f290c6ba1b0027260d
16 changes: 8 additions & 8 deletions examples/text_labels_and_annotations/dfrac_demo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
"""
=======================================
The difference between \dfrac and \frac
=======================================
r"""
=========================================
The difference between \\dfrac and \\frac
=========================================

In this example, the differences between the \dfrac and \frac TeX macros are
In this example, the differences between the \\dfrac and \\frac TeX macros are
illustrated; in particular, the difference between display style and text style
fractions when using Mathtex.
fractions when using Mathtex. aasdsads
Copy link
Copy Markdown
Contributor

@anntzer anntzer Apr 16, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mathtext
remove whatever aasdsads is


.. versionadded:: 2.1

.. note::
To use \dfrac with the LaTeX engine (text.usetex : True), you need to
To use \\dfrac with the LaTeX engine (text.usetex : True), you need to
import the amsmath package with the text.latex.preamble rc, which is
an unsupported feature; therefore, it is probably a better idea to just
use the \displaystyle option before the \frac macro to get this behavior
use the \\displaystyle option before the \\frac macro to get this behavior
with the LaTeX engine.

"""
Expand Down
18 changes: 13 additions & 5 deletions lib/matplotlib/mathtext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2224,6 +2224,10 @@ class Parser(object):
The grammar is based directly on that in TeX, though it cuts a few
corners.
"""

_math_style_dict = dict(displaystyle=0, textstyle=1,
scriptstyle=2, scriptscriptstyle=3)

_binary_operators = set('''
+ * -
\\pm \\sqcap \\rhd
Expand Down Expand Up @@ -3052,7 +3056,7 @@ def _genfrac(self, ldelim, rdelim, rule, style, num, den):
rule = float(rule)

# If style != displaystyle == 0, shrink the num and den
Copy link
Copy Markdown
Member

@QuLogic QuLogic Feb 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these warrant some constants instead of magic numbers.

if style:
if style != self._math_style_dict['displaystyle']:
num.shrink()
den.shrink()
cnum = HCentered([num])
Expand Down Expand Up @@ -3101,7 +3105,8 @@ def frac(self, s, loc, toks):
state.font, state.fontsize, state.dpi)
num, den = toks[0]

return self._genfrac('', '', thickness, 1, num, den)
return self._genfrac('', '', thickness,
self._math_style_dict['textstyle'], num, den)

def dfrac(self, s, loc, toks):
assert(len(toks) == 1)
Expand All @@ -3112,21 +3117,24 @@ def dfrac(self, s, loc, toks):
state.font, state.fontsize, state.dpi)
num, den = toks[0]

return self._genfrac('', '', thickness, 0, num, den)
return self._genfrac('', '', thickness,
self._math_style_dict['displaystyle'], num, den)

def stackrel(self, s, loc, toks):
assert(len(toks) == 1)
assert(len(toks[0]) == 2)
num, den = toks[0]

return self._genfrac('', '', 0.0, 1, num, den)
return self._genfrac('', '', 0.0,
self._math_style_dict['textstyle'], num, den)

def binom(self, s, loc, toks):
assert(len(toks) == 1)
assert(len(toks[0]) == 2)
num, den = toks[0]

return self._genfrac('(', ')', 0.0, 1, num, den)
return self._genfrac('(', ')', 0.0,
self._math_style_dict['textstyle'], num, den)

def sqrt(self, s, loc, toks):
#~ print "sqrt", toks
Expand Down