Merge pull request 3b1b#1818 from YishiMichael/refactor

Add `template` and `additional_preamble` parameters to `Tex`

manimlib/animation/indication.py

@@ -12,6 +12,7 @@
 from manimlib.animation.fading import FadeIn
 from manimlib.animation.movement import Homotopy
 from manimlib.animation.transform import Transform
+from manimlib.constants import FRAME_X_RADIUS, FRAME_Y_RADIUS
 from manimlib.constants import ORIGIN, RIGHT, UP
 from manimlib.constants import SMALL_BUFF
 from manimlib.constants import TAU

manimlib/animation/transform_matching_parts.py

@@ -167,83 +167,95 @@ def __init__(self,
         digest_config(self, kwargs)
         assert isinstance(source, StringMobject)
         assert isinstance(target, StringMobject)
-        anims = []
-        source_indices = list(range(len(source.labels)))
-        target_indices = list(range(len(target.labels)))
 
-        def get_filtered_indices_lists(indices_lists, rest_indices):
+        def get_matched_indices_lists(*part_items_list):
+            part_items_list_len = len(part_items_list)
+            indexed_part_items = sorted(it.chain(*[
+                [
+                    (substr, items_index, indices_list)
+                    for substr, indices_list in part_items
+                ]
+                for items_index, part_items in enumerate(part_items_list)
+            ]))
+            grouped_part_items = [
+                (substr, [
+                    [indices_lists for _, _, indices_lists in grouper_2]
+                    for _, grouper_2 in it.groupby(
+                        grouper_1, key=lambda t: t[1]
+                    )
+                ])
+                for substr, grouper_1 in it.groupby(
+                    indexed_part_items, key=lambda t: t[0]
+                )
+            ]
+            return [
+                tuple(indices_lists_list)
+                for _, indices_lists_list in sorted(filter(
+                    lambda t: t[0] and len(t[1]) == part_items_list_len,
+                    grouped_part_items
+                ), key=lambda t: len(t[0]), reverse=True)
+            ]
+
+        def get_filtered_indices_lists(indices_lists, used_indices):
             result = []
+            used = []
             for indices_list in indices_lists:
-                if not indices_list:
-                    continue
-                if not all(index in rest_indices for index in indices_list):
+                if not all(
+                    index not in used_indices and index not in used
+                    for index in indices_list
+                ):
                     continue
                 result.append(indices_list)
-                for index in indices_list:
-                    rest_indices.remove(index)
-            return result
-
-        def add_anims(anim_class, indices_lists_pairs):
-            for source_indices_lists, target_indices_lists in indices_lists_pairs:
-                source_indices_lists = get_filtered_indices_lists(
-                    source_indices_lists, source_indices
-                )
-                target_indices_lists = get_filtered_indices_lists(
-                    target_indices_lists, target_indices
-                )
-                if not source_indices_lists or not target_indices_lists:
-                    source_indices.extend(it.chain(*source_indices_lists))
-                    target_indices.extend(it.chain(*target_indices_lists))
-                    continue
-                anims.append(anim_class(
-                    source.build_parts_from_indices_lists(source_indices_lists),
-                    target.build_parts_from_indices_lists(target_indices_lists),
-                    **kwargs
-                ))
+                used.extend(indices_list)
+            return result, used
 
-        def get_substr_to_indices_lists_map(part_items):
-            result = {}
-            for substr, indices_list in part_items:
-                if substr not in result:
-                    result[substr] = []
-                result[substr].append(indices_list)
-            return result
-
-        def add_anims_from(anim_class, func):
-            source_substr_map = get_substr_to_indices_lists_map(func(source))
-            target_substr_map = get_substr_to_indices_lists_map(func(target))
-            common_substrings = sorted([
-                s for s in source_substr_map if s and s in target_substr_map
-            ], key=len, reverse=True)
-            add_anims(
-                anim_class,
-                [
-                    (source_substr_map[substr], target_substr_map[substr])
-                    for substr in common_substrings
-                ]
-            )
-
-        add_anims(
-            ReplacementTransform,
-            [
+        anim_class_items = [
+            (ReplacementTransform, [
                 (
                     source.get_submob_indices_lists_by_selector(k),
                     target.get_submob_indices_lists_by_selector(v)
                 )
                 for k, v in self.key_map.items()
-            ]
-        )
-        add_anims_from(
-            FadeTransformPieces,
-            StringMobject.get_specified_part_items
-        )
-        add_anims_from(
-            FadeTransformPieces,
-            StringMobject.get_group_part_items
-        )
-
-        rest_source = VGroup(*[source[index] for index in source_indices])
-        rest_target = VGroup(*[target[index] for index in target_indices])
+            ]),
+            (FadeTransformPieces, get_matched_indices_lists(
+                source.get_specified_part_items(),
+                target.get_specified_part_items()
+            )),
+            (FadeTransformPieces, get_matched_indices_lists(
+                source.get_group_part_items(),
+                target.get_group_part_items()
+            ))
+        ]
+
+        anims = []
+        source_used_indices = []
+        target_used_indices = []
+        for anim_class, pairs in anim_class_items:
+            for source_indices_lists, target_indices_lists in pairs:
+                source_filtered, source_used = get_filtered_indices_lists(
+                    source_indices_lists, source_used_indices
+                )
+                target_filtered, target_used = get_filtered_indices_lists(
+                    target_indices_lists, target_used_indices
+                )
+                if not source_filtered or not target_filtered:
+                    continue
+                anims.append(anim_class(
+                    source.build_parts_from_indices_lists(source_filtered),
+                    target.build_parts_from_indices_lists(target_filtered),
+                    **kwargs
+                ))
+                source_used_indices.extend(source_used)
+                target_used_indices.extend(target_used)
+
+        rest_source = VGroup(*[
+            submob for index, submob in enumerate(source.submobjects)
+            if index not in source_used_indices
+        ])
+        rest_target = VGroup(*[
+            submob for index, submob in enumerate(target.submobjects)
+            if index not in target_used_indices
+        ])
         if self.transform_mismatches:
             anims.append(
                 ReplacementTransform(rest_source, rest_target, **kwargs)

manimlib/default_config.yml

@@ -16,17 +16,9 @@ directories:
   # return whatever is at to the TMPDIR environment variable.  If you want to
   # specify them elsewhere,
   temporary_storage: ""
-tex:
-  executable: "latex"
-  template_file: "tex_template.tex" 
-  intermediate_filetype: "dvi"
-  text_to_replace: "[tex_expression]"
-  # For ctex, use the following configuration
-  # executable: "xelatex -no-pdf"
-  # template_file: "ctex_template.tex"
-  # intermediate_filetype: "xdv"
 universal_import_line: "from manimlib import *"
 style:
+  tex_template: "default"
   font: "Consolas"
   text_alignment: "LEFT"
   background_color: "#333333"
@@ -49,4 +41,4 @@ camera_resolutions:
   high: "1920x1080"
   4k: "3840x2160"
   default_resolution: "high"
-fps: 30
+fps: 30