Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork7.9k
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
9 commits Select commitHold shift + click to select a range
4b9ff60 Feature addition: I added in the the \dfrac macro (displaystyle fract…
watkinrt45f5d63 PEP8 fixes
watkinrtbedfdc0 Documentation: Updated the docstring for the dfrac_demo
watkinrt0d10078 Documentation update: I updated the dfrac_demo docstring to be a raw …
2c9b9bc Although Sphyinx requires "\\" to show "\" characters, I removed them…
watkinrt57fd910 Remove stray text from documentation.
watkinrtd0cfe37 With the resent merging of the sphinx-gallery branch, I went through …
watkinrt7781dbd Merge remote-tracking branch 'master/master' into dfrac
watkinrtb80d975 TST: add missing tests
tacaswellFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
28 changes: 28 additions & 0 deletionsexamples/text_labels_and_annotations/dfrac_demo.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| r""" | ||
| ========================================= | ||
| The difference between \\dfrac and \\frac | ||
| ========================================= | ||
| 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. | ||
| .. versionadded:: 2.1 | ||
| .. note:: | ||
| 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 | ||
| with the LaTeX engine. | ||
| """ | ||
| import matplotlib.pyplot as plt | ||
| fig = plt.figure(figsize=(5.25, 0.75)) | ||
| fig.text(0.5, 0.3, r'\dfrac: $\dfrac{a}{b}$', | ||
| horizontalalignment='center', verticalalignment='center') | ||
| fig.text(0.5, 0.7, r'\frac: $\frac{a}{b}$', | ||
| horizontalalignment='center', verticalalignment='center') | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Needs There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Man, you guys are fast and thorough. I'm working on all of the requested changes. | ||
| plt.show() | ||
55 changes: 42 additions & 13 deletionslib/matplotlib/mathtext.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -2216,6 +2216,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 | ||
| @@ -2301,6 +2305,7 @@ def __init__(self): | ||
| p.float_literal = Forward() | ||
| p.font = Forward() | ||
| p.frac = Forward() | ||
| p.dfrac = Forward() | ||
| p.function = Forward() | ||
| p.genfrac = Forward() | ||
| p.group = Forward() | ||
| @@ -2389,6 +2394,11 @@ def __init__(self): | ||
| - ((p.required_group + p.required_group) | Error(r"Expected \frac{num}{den}")) | ||
| ) | ||
| p.dfrac <<= Group( | ||
| Suppress(Literal(r"\dfrac")) | ||
| - ((p.required_group + p.required_group) | Error(r"Expected \dfrac{num}{den}")) | ||
| ) | ||
| p.stackrel <<= Group( | ||
| Suppress(Literal(r"\stackrel")) | ||
| - ((p.required_group + p.required_group) | Error(r"Expected \stackrel{num}{den}")) | ||
| @@ -2441,6 +2451,7 @@ def __init__(self): | ||
| | p.function | ||
| | p.group | ||
| | p.frac | ||
| | p.dfrac | ||
| | p.stackrel | ||
| | p.binom | ||
| | p.genfrac | ||
| @@ -3035,8 +3046,11 @@ def _genfrac(self, ldelim, rdelim, rule, style, num, den): | ||
| state.font, state.fontsize, state.dpi) | ||
| rule = float(rule) | ||
| # If style != displaystyle == 0, shrink the num and den | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. I think these warrant some constants instead of magic numbers. | ||
| if style != self._math_style_dict['displaystyle']: | ||
| num.shrink() | ||
| den.shrink() | ||
| cnum = HCentered([num]) | ||
| cden = HCentered([den]) | ||
| width = max(num.width, den.width) | ||
| @@ -3069,35 +3083,50 @@ def _genfrac(self, ldelim, rdelim, rule, style, num, den): | ||
| return result | ||
| def genfrac(self, s, loc, toks): | ||
| assert(len(toks) ==1) | ||
| assert(len(toks[0]) ==6) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. 👍 for the whitespace fix, but also, you don't really need the parentheses. | ||
| return self._genfrac(*tuple(toks[0])) | ||
| def frac(self, s, loc, toks): | ||
| assert(len(toks) == 1) | ||
| assert(len(toks[0]) == 2) | ||
| state = self.get_state() | ||
| thickness = state.font_output.get_underline_thickness( | ||
| state.font, state.fontsize, state.dpi) | ||
| num, den = toks[0] | ||
| return self._genfrac('', '', thickness, | ||
| self._math_style_dict['textstyle'], num, den) | ||
| def dfrac(self, s, loc, toks): | ||
| assert(len(toks) == 1) | ||
| assert(len(toks[0]) == 2) | ||
| state = self.get_state() | ||
| thickness = state.font_output.get_underline_thickness( | ||
| state.font, state.fontsize, state.dpi) | ||
| num, den = toks[0] | ||
| 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, | ||
| 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, | ||
| self._math_style_dict['textstyle'], num, den) | ||
| def sqrt(self, s, loc, toks): | ||
| #~ print "sqrt", toks | ||
Binary file not shown.
Loading
Sorry, something went wrong.Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
231 changes: 231 additions & 0 deletionslib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_82.svg
Loading
Sorry, something went wrong.Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong.Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.