NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.3k

Commitfa68f46

authored

Merge pull request#25661 from devRD/boldsym

boldsymbol support for mathtext

2 parents2c45571 +1de8ffb commitfa68f46Copy full SHA for fa68f46

File tree

4 files changed

+57

-1

lines changed

doc/users/next_whats_new
- boldsym_mathtext.rst
lib/matplotlib
- _mathtext.py
- tests
  - baseline_images/test_mathtext
    - mathtext1_dejavusans_05.png
  - test_mathtext.py

4 files changed

+57

-1

lines changed

`‎doc/users/next_whats_new/boldsym_mathtext.rst`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,14 @@`
	`1`	+Boldsymbol mathtext command ``\boldsymbol``
	`2`	`+-------------------------------------------`
	`3`	`+`
	`4`	+Supports using the ``\boldsymbol{}`` command in mathtext:
	`5`	`+`
	`6`	`+To change symbols to bold enclose the text in a font command as`
	`7`	`+shown:`
	`8`	`+`
	`9`	`+..code-block::`
	`10`	`+`
	`11`	`+ r'$\boldsymbol{a+2+\alpha}$'`
	`12`	`+`
	`13`	`+..math::`
	`14`	`+\boldsymbol{a+2+\alpha}`

`‎lib/matplotlib/_mathtext.py`

Lines changed: 36 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`importre`
`12`	`12`	`importtypes`
`13`	`13`	`importunicodedata`
	`14`	`+importstring`
`14`	`15`
`15`	`16`	`importnumpyasnp`
`16`	`17`	`frompyparsingimport (`
`@@ -1811,6 +1812,11 @@ class _MathStyle(enum.Enum):`
`1811`	`1812`	`_right_delims=set(r") ] \} > \rfloor \rangle \rceil".split())`
`1812`	`1813`	`_delims=_left_delims\|_right_delims\|_ambi_delims`
`1813`	`1814`
	`1815`	`+_small_greek=set([unicodedata.name(chr(i)).split()[-1].lower()foriin`
	`1816`	`+range(ord('\N{GREEK SMALL LETTER ALPHA}'),`
	`1817`	`+ord('\N{GREEK SMALL LETTER OMEGA}')+1)])`
	`1818`	`+_latin_alphabets=set(string.ascii_letters)`
	`1819`	`+`
`1814`	`1820`	`def__init__(self):`
`1815`	`1821`	`p=types.SimpleNamespace()`
`1816`	`1822`
`@@ -1933,6 +1939,9 @@ def csnames(group, names):`
`1933`	`1939`
`1934`	`1940`	`p.operatorname=cmd(r"\operatorname","{"+ZeroOrMore(p.simple)("name")+"}")`
`1935`	`1941`
	`1942`	`+p.boldsymbol=cmd(`
	`1943`	`+r"\boldsymbol","{"+ZeroOrMore(p.simple)("value")+"}")`
	`1944`	`+`
`1936`	`1945`	`p.placeable<<= (`
`1937`	`1946`	`p.accent# Must be before symbol as all accents are symbols`
`1938`	`1947`	`\|p.symbol# Must be second to catch all named symbols and single`
`@@ -1949,6 +1958,7 @@ def csnames(group, names):`
`1949`	`1958`	`\|p.sqrt`
`1950`	`1959`	`\|p.overline`
`1951`	`1960`	`\|p.text`
	`1961`	`+\|p.boldsymbol`
`1952`	`1962`	`)`
`1953`	`1963`
`1954`	`1964`	`p.auto_delim<<= (`
`@@ -2597,3 +2607,29 @@ def auto_delim(self, s, loc, toks):`
`2597`	`2607`	`# if "mid" in toks ... can be removed when requiring pyparsing 3.`
`2598`	`2608`	`toks["mid"].asList()if"mid"intokselse [],`
`2599`	`2609`	`toks["right"])`
	`2610`	`+`
	`2611`	`+defboldsymbol(self,s,loc,toks):`
	`2612`	`+self.push_state()`
	`2613`	`+state=self.get_state()`
	`2614`	`+hlist= []`
	`2615`	`+name=toks["value"]`
	`2616`	`+forcinname:`
	`2617`	`+ifisinstance(c,Hlist):`
	`2618`	`+k=c.children[1]`
	`2619`	`+ifisinstance(k,Char):`
	`2620`	`+k.font="bf"`
	`2621`	`+k._update_metrics()`
	`2622`	`+hlist.append(c)`
	`2623`	`+elifisinstance(c,Char):`
	`2624`	`+c.font="bf"`
	`2625`	`+if (c.cinself._latin_alphabetsor`
	`2626`	`+c.c[1:]inself._small_greek):`
	`2627`	`+c.font="bfit"`
	`2628`	`+c._update_metrics()`
	`2629`	`+c._update_metrics()`
	`2630`	`+hlist.append(c)`
	`2631`	`+else:`
	`2632`	`+hlist.append(c)`
	`2633`	`+self.pop_state()`
	`2634`	`+`
	`2635`	`+returnHlist(hlist)`

`‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext1_dejavusans_05.png`

4.64 KB

`‎lib/matplotlib/tests/test_mathtext.py`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@`
`134`	`134`	`r'$\sum x\quad\sum^nx\quad\sum_nx\quad\sum_n^nx\quad\prod x\quad\prod^nx\quad\prod_nx\quad\prod_n^nx$',# GitHub issue 18085`
`135`	`135`	`r'$1.$ $2.$ $19680801.$ $a.$ $b.$ $mpl.$',`
`136`	`136`	`r'$\text{text}_{\text{sub}}^{\text{sup}} + \text{\$foo\$} + \frac{\text{num}}{\mathbf{\text{den}}}\text{with space, curly brackets \{\}, and dash -}$',`
`137`		`-`
	`137`	`+r'$\boldsymbol{abcde} \boldsymbol{+} \boldsymbol{\Gamma + \Omega} \boldsymbol{01234} \boldsymbol{\alpha * \beta}$',`
`138`	`138`	`]`
`139`	`139`
`140`	`140`	`digits="0123456789"`
`@@ -538,3 +538,9 @@ def test_mathtext_operators():`
`538`	`538`	`fig.text(0.5, (x+0.5)/len(test_str),r'${%s}$'%i)`
`539`	`539`
`540`	`540`	`fig.draw_without_rendering()`
	`541`	`+`
	`542`	`+`
	`543`	`+@check_figures_equal(extensions=["png"])`
	`544`	`+deftest_boldsymbol(fig_test,fig_ref):`
	`545`	`+fig_test.text(0.1,0.2,r"$\boldsymbol{\mathrm{abc0123\alpha}}$")`
	`546`	`+fig_ref.text(0.1,0.2,r"$\mathrm{abc0123\alpha}$")`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitfa68f46

File tree

4 files changed

4 files changed

`‎doc/users/next_whats_new/boldsym_mathtext.rst`

`‎lib/matplotlib/_mathtext.py`

`‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext1_dejavusans_05.png`

`‎lib/matplotlib/tests/test_mathtext.py`

0 commit comments