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

Fix shallow copying bug

Browse source
This commit is contained in:
YishiMichael 2022-03-31 11:36:50 +08:00
parent 724a500cc6
commit 106f2a3837
No known key found for this signature in database
GPG key ID: EC615C0C5A86BC80
1 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
manimlib/mobject/svg/labelled_string.py
View file

@ -231,13 +231,6 @@ class LabelledString(_StringSVG):
LabelledString.lslide(span[1], skipped) LabelledString.lslide(span[1], skipped)
) )
@staticmethod
def extend_span(span: Span, skipped: list[Span]) -> Span:
return (
LabelledString.lslide(span[0], skipped),
LabelledString.rslide(span[1], skipped)
)
@staticmethod @staticmethod
def rgb_to_int(rgb_tuple: tuple[int, int, int]) -> int: def rgb_to_int(rgb_tuple: tuple[int, int, int]) -> int:
r, g, b = rgb_tuple r, g, b = rgb_tuple
@ -604,7 +597,6 @@ class MTex(LabelledString):
super().pre_parse() super().pre_parse()
self.backslash_indices = self.get_backslash_indices() self.backslash_indices = self.get_backslash_indices()
self.brace_index_pairs = self.get_brace_index_pairs() self.brace_index_pairs = self.get_brace_index_pairs()
self.script_char_indices = self.get_script_char_indices()
self.script_char_spans = self.get_script_char_spans() self.script_char_spans = self.get_script_char_spans()
self.script_content_spans = self.get_script_content_spans() self.script_content_spans = self.get_script_content_spans()
self.script_spans = self.get_script_spans() self.script_spans = self.get_script_spans()
@ -665,19 +657,17 @@ class MTex(LabelledString):
raise ValueError("Missing '}' inserted") raise ValueError("Missing '}' inserted")
return list(zip(left_brace_indices, right_brace_indices)) return list(zip(left_brace_indices, right_brace_indices))
def get_script_char_indices(self) -> list[int]: def get_script_char_spans(self) -> list[int]:
return self.get_unescaped_char_indices("_", "^")
def get_script_char_spans(self) -> list[Span]:
return [ return [
self.extend_span((index, index + 1), self.space_spans) (index, index + 1)
for index in self.script_char_indices for index in self.get_unescaped_char_indices("_", "^")
] ]
def get_script_content_spans(self) -> list[Span]: def get_script_content_spans(self) -> list[Span]:
result = [] result = []
brace_indices_dict = dict(self.brace_index_pairs) brace_indices_dict = dict(self.brace_index_pairs)
for _, span_begin in self.script_char_spans: for script_char_span in self.script_char_spans:
span_begin = self.rslide(script_char_span[1], self.space_spans)
if span_begin in brace_indices_dict.keys(): if span_begin in brace_indices_dict.keys():
span_end = brace_indices_dict[span_begin] + 1 span_end = brace_indices_dict[span_begin] + 1
else: else:
@ -698,7 +688,10 @@ class MTex(LabelledString):
def get_script_spans(self) -> list[Span]: def get_script_spans(self) -> list[Span]:
return [ return [
(script_char_span[0], script_content_span[1]) (
self.lslide(script_char_span[0], self.space_spans),
script_content_span[1]
)
for script_char_span, script_content_span in zip( for script_char_span, script_content_span in zip(
self.script_char_spans, self.script_content_spans self.script_char_spans, self.script_content_spans
) )
@ -744,10 +737,7 @@ class MTex(LabelledString):
return result return result
def get_ignored_spans(self) -> list[int]: def get_ignored_spans(self) -> list[int]:
return [ return self.script_char_spans.copy()
(index, index + 1)
for index in self.script_char_indices
]
def get_internal_specified_spans(self) -> list[Span]: def get_internal_specified_spans(self) -> list[Span]:
# Match paired double braces (`{{...}}`). # Match paired double braces (`{{...}}`).