diff --git a/manimlib/__init__.py b/manimlib/__init__.py index 2043738c..67703a8f 100644 --- a/manimlib/__init__.py +++ b/manimlib/__init__.py @@ -38,8 +38,8 @@ from manimlib.mobject.probability import * from manimlib.mobject.shape_matchers import * from manimlib.mobject.svg.brace import * from manimlib.mobject.svg.drawings import * -from manimlib.mobject.svg.labelled_string import * from manimlib.mobject.svg.mtex_mobject import * +from manimlib.mobject.svg.string_mobject import * from manimlib.mobject.svg.svg_mobject import * from manimlib.mobject.svg.tex_mobject import * from manimlib.mobject.svg.text_mobject import * diff --git a/manimlib/animation/creation.py b/manimlib/animation/creation.py index d3a3dd23..86c5ca05 100644 --- a/manimlib/animation/creation.py +++ b/manimlib/animation/creation.py @@ -5,7 +5,7 @@ from abc import ABC, abstractmethod import numpy as np from manimlib.animation.animation import Animation -from manimlib.mobject.svg.labelled_string import LabelledString +from manimlib.mobject.svg.string_mobject import StringMobject from manimlib.mobject.types.vectorized_mobject import VGroup from manimlib.mobject.types.vectorized_mobject import VMobject from manimlib.utils.bezier import integer_interpolate @@ -212,7 +212,7 @@ class AddTextWordByWord(ShowIncreasingSubsets): } def __init__(self, string_mobject, **kwargs): - assert isinstance(string_mobject, LabelledString) + assert isinstance(string_mobject, StringMobject) grouped_mobject = string_mobject.build_groups() digest_config(self, kwargs) if self.run_time is None: diff --git a/manimlib/animation/transform_matching_parts.py b/manimlib/animation/transform_matching_parts.py index 464d36e7..e82bafaf 100644 --- a/manimlib/animation/transform_matching_parts.py +++ b/manimlib/animation/transform_matching_parts.py @@ -12,7 +12,7 @@ from manimlib.animation.transform import ReplacementTransform from manimlib.animation.transform import Transform from manimlib.mobject.mobject import Mobject from manimlib.mobject.mobject import Group -from manimlib.mobject.svg.labelled_string import LabelledString +from manimlib.mobject.svg.string_mobject import StringMobject from manimlib.mobject.types.vectorized_mobject import VGroup from manimlib.mobject.types.vectorized_mobject import VMobject from manimlib.utils.config_ops import digest_config @@ -160,13 +160,13 @@ class TransformMatchingStrings(AnimationGroup): } def __init__(self, - source: LabelledString, - target: LabelledString, + source: StringMobject, + target: StringMobject, **kwargs ): digest_config(self, kwargs) - assert isinstance(source, LabelledString) - assert isinstance(target, LabelledString) + assert isinstance(source, StringMobject) + assert isinstance(target, StringMobject) anims = [] source_indices = list(range(len(source.labels))) target_indices = list(range(len(target.labels))) @@ -233,11 +233,11 @@ class TransformMatchingStrings(AnimationGroup): ) add_anims_from( FadeTransformPieces, - LabelledString.get_specified_part_items + StringMobject.get_specified_part_items ) add_anims_from( FadeTransformPieces, - LabelledString.get_group_part_items + StringMobject.get_group_part_items ) rest_source = VGroup(*[source[index] for index in source_indices]) diff --git a/manimlib/mobject/svg/mtex_mobject.py b/manimlib/mobject/svg/mtex_mobject.py index 6245149e..149f313f 100644 --- a/manimlib/mobject/svg/mtex_mobject.py +++ b/manimlib/mobject/svg/mtex_mobject.py @@ -1,6 +1,6 @@ from __future__ import annotations -from manimlib.mobject.svg.labelled_string import LabelledString +from manimlib.mobject.svg.string_mobject import StringMobject from manimlib.utils.tex_file_writing import display_during_execution from manimlib.utils.tex_file_writing import get_tex_config from manimlib.utils.tex_file_writing import tex_to_svg_file @@ -31,7 +31,7 @@ if TYPE_CHECKING: SCALE_FACTOR_PER_FONT_POINT = 0.001 -class MTex(LabelledString): +class MTex(StringMobject): CONFIG = { "font_size": 48, "alignment": "\\centering", diff --git a/manimlib/mobject/svg/labelled_string.py b/manimlib/mobject/svg/string_mobject.py similarity index 99% rename from manimlib/mobject/svg/labelled_string.py rename to manimlib/mobject/svg/string_mobject.py index 18ecd556..5004960e 100644 --- a/manimlib/mobject/svg/labelled_string.py +++ b/manimlib/mobject/svg/string_mobject.py @@ -35,7 +35,7 @@ if TYPE_CHECKING: T = TypeVar("T") -class LabelledString(SVGMobject, ABC): +class StringMobject(SVGMobject, ABC): """ An abstract base class for `MTex` and `MarkupText` @@ -49,9 +49,9 @@ class LabelledString(SVGMobject, ABC): or a 2-tuple containing integers or None, or a collection of the above. Note, substrings specified cannot *partially* overlap with each other. - Each instance of `LabelledString` generates 2 svg files. + Each instance of `StringMobject` generates 2 svg files. The additional one is generated with some color commands inserted, - so that each submobject of the original `SVGMobject` will be "labelled" + so that each submobject of the original `SVGMobject` will be labelled by the color of its paired submobject from the additional `SVGMobject`. """ CONFIG = { @@ -208,7 +208,7 @@ class LabelledString(SVGMobject, ABC): unique_vals.append(val) indices.append(index) indices.append(len(vals)) - val_ranges = LabelledString.get_neighbouring_pairs(indices) + val_ranges = StringMobject.get_neighbouring_pairs(indices) return list(zip(unique_vals, val_ranges)) @staticmethod diff --git a/manimlib/mobject/svg/text_mobject.py b/manimlib/mobject/svg/text_mobject.py index 3bfdf0d2..93623c31 100644 --- a/manimlib/mobject/svg/text_mobject.py +++ b/manimlib/mobject/svg/text_mobject.py @@ -13,7 +13,7 @@ import pygments.lexers from manimlib.constants import DEFAULT_PIXEL_WIDTH, FRAME_WIDTH from manimlib.constants import NORMAL from manimlib.logger import log -from manimlib.mobject.svg.labelled_string import LabelledString +from manimlib.mobject.svg.string_mobject import StringMobject from manimlib.utils.config_ops import digest_config from manimlib.utils.customization import get_customization from manimlib.utils.directories import get_downloads_dir @@ -61,7 +61,7 @@ class _Alignment: self.value = _Alignment.VAL_DICT[s.upper()] -class MarkupText(LabelledString): +class MarkupText(StringMobject): CONFIG = { "is_markup": True, "font_size": 48,