Commite01241c

committed

Merge pull request#5020 from zblz/fix-asy-unc

mathtext: Add `-` to spaced symbols, and do not space symbols at start of string

2 parentsa4eb0c6 +acf73c2 commite01241cCopy full SHA for e01241c

File tree

+3755

-3077

lines changed

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

+3755

-3077

lines changed

Lines changed: 16 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2083,7 +2083,7 @@ class Parser(object):`
`2083`	`2083`	`corners.`
`2084`	`2084`	`"""`
`2085`	`2085`	`_binary_operators=set('''`
`2086`		`- + *`
	`2086`	`+ + * -`
`2087`	`2087`	`\\pm\\sqcap\\rhd`
`2088`	`2088`	`\\mp\\sqcup\\unlhd`
`2089`	`2089`	`\\times\\vee\\unrhd`
`@@ -2499,10 +2499,21 @@ def symbol(self, s, loc, toks):`
`2499`	`2499`	`raiseParseFatalException(s,loc,"Unknown symbol: %s"%c)`
`2500`	`2500`
`2501`	`2501`	`ifcinself._spaced_symbols:`
`2502`		`-return [Hlist( [self._make_space(0.2),`
`2503`		`-char,`
`2504`		`-self._make_space(0.2)] ,`
`2505`		`-do_kern=True)]`
	`2502`	`+# iterate until we find previous character, needed for cases`
	`2503`	`+# such as ${ -2}$, $ -2$, or $ -2$.`
	`2504`	`+foriinsix.moves.xrange(1,loc+1):`
	`2505`	`+prev_char=s[loc-i]`
	`2506`	`+ifprev_char!=' ':`
	`2507`	`+break`
	`2508`	`+# Binary operators at start of string should not be spaced`
	`2509`	`+if (cinself._binary_operatorsand`
	`2510`	`+ (len(s[:loc].split())==0orprev_char=='{')):`
	`2511`	`+return [char]`
	`2512`	`+else:`
	`2513`	`+return [Hlist( [self._make_space(0.2),`
	`2514`	`+char,`
	`2515`	`+self._make_space(0.2)] ,`
	`2516`	`+do_kern=True)]`
`2506`	`2517`	`elifcinself._punctuation_symbols:`
`2507`	`2518`	`return [Hlist( [char,`
`2508`	`2519`	`self._make_space(0.2)] ,`

1 Byte

Binary file not shown.

27 Bytes

Comments

(0)