public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-09-19 04:41:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix space characters problem of Text (#1035)

Browse source 
* Fix Text wrong display

* Fix space characters problem of Text

* Fix a potential bug using height or width in Text

* Update Text

* Fix typo in text_mobject.py
This commit is contained in:
XiaoYoung 2020-05-07 16:16:39 +08:00 • committed by GitHub
parent 3362f93964
commit 522a5b3c5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
manimlib/mobject/svg/svg_mobject.py
View file

@ -87,9 +87,9 @@ class SVGMobject(VMobject):
for child in element.childNodes
])
elif element.tagName == 'path':
result.append(self.path_string_to_mobject(
element.getAttribute('d')
))
temp = element.getAttribute('d')
if temp != '':
result.append(self.path_string_to_mobject(temp))
elif element.tagName == 'use':
result += self.use_to_mobjects(element)
elif element.tagName == 'rect':

27
manimlib/mobject/svg/text_mobject.py
View file

@ -5,6 +5,7 @@ import hashlib
import cairo
import manimlib.constants as consts
from manimlib.constants import *
from manimlib.mobject.geometry import Dot
from manimlib.mobject.svg.svg_mobject import SVGMobject
from manimlib.utils.config_ops import digest_config
@ -44,17 +45,21 @@ class Text(SVGMobject):
't2g': {},
't2s': {},
't2w': {},
'tab_width': 4,
}
def __init__(self, text, **config):
self.text = text
self.full2short(config)
digest_config(self, config)
if text.find('\t') != -1:
text = text.replace('\t', ' '*self.tab_width)
self.text = text
self.lsh = self.size if self.lsh == -1 else self.lsh
file_name = self.text2svg()
self.remove_last_M(file_name)
SVGMobject.__init__(self, file_name, **config)
self.apply_space_chars()
nppc = self.n_points_per_cubic_curve
for each in self:
@ -78,12 +83,28 @@ class Text(SVGMobject):
self.set_color_by_t2g()
# anti-aliasing
self.scale(TEXT_MOB_SCALE_FACTOR)
if self.height is None and self.width is None:
self.scale(TEXT_MOB_SCALE_FACTOR)
def apply_space_chars(self):
indexes = self.find_indexes(' ') + self.find_indexes('\n')
indexes = sorted(indexes, key=lambda i: i[0])
if len(self.text) == len(indexes):
space = Dot(fill_opacity=0, stroke_opacity=0)
self.submobjects = [space.copy() for _ in range(len(indexes))]
return
for start, _ in indexes:
space = Dot(fill_opacity=0, stroke_opacity=0)
if start == 0:
space.move_to(self.submobjects[0].get_center())
else:
space.move_to(self.submobjects[start-1].get_center())
self.submobjects.insert(start, space)
def remove_last_M(self, file_name):
with open(file_name, 'r') as fpr:
content = fpr.read()
content = re.sub(r'Z M [^[A-Za-z]*? "\/>', 'Z "/>', content)
content = re.sub(r'Z M [^A-Za-z]*? "\/>', 'Z "/>', content)
with open(file_name, 'w') as fpw:
fpw.write(content)