Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Make TexTemplate() simle, but keep Tex()'s default template (#1343)

Arone032f90f8c68
diff --git a/manim/_config/utils.py b/manim/_config/utils.py
index e21d0c0db..2fba88084 100644
--- a/manim/_config/utils.py
+++ b/manim/_config/utils.py
@@ -25,6 +25,7 @@ import numpy as np
from .. import constants
from ..utils.tex import TexTemplate, TexTemplateFromFile
+from ..utils.tex_templates import TexTemplateLibrary
from .logger_utils import set_file_logger
@@ -1341,7 +1342,7 @@ class ManimConfig(MutableMapping):
if fn:
self._tex_template = TexTemplateFromFile(filename=fn)
else:
- self._tex_template = TexTemplate()
+ self._tex_template = TexTemplateLibrary.default.copy()
return self._tex_template
@tex_template.setter
diff --git a/manim/utils/tex.py b/manim/utils/tex.py
index 532d6af3b..e0114e7a9 100644
--- a/manim/utils/tex.py
+++ b/manim/utils/tex.py
@@ -46,25 +46,8 @@ class TexTemplate:
default_documentclass = r"\documentclass[preview]{standalone}"
default_preamble = r"""
\usepackage[english]{babel}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{lmodern}
\usepackage{amsmath}
\usepackage{amssymb}
-\usepackage{dsfont}
-\usepackage{setspace}
-\usepackage{tipa}
-\usepackage{relsize}
-\usepackage{textcomp}
-\usepackage{mathrsfs}
-\usepackage{calligra}
-\usepackage{wasysym}
-\usepackage{ragged2e}
-\usepackage{physics}
-\usepackage{xcolor}
-\usepackage{microtype}
-\DisableLigatures{encoding = *, family = * }
-\linespread{1}
"""
default_placeholder_text = "YourTextHere"
default_tex_compiler = "latex"
diff --git a/manim/utils/tex_templates.py b/manim/utils/tex_templates.py
index 2bc6479a2..db398da48 100644
--- a/manim/utils/tex_templates.py
+++ b/manim/utils/tex_templates.py
@@ -20,6 +20,31 @@ def _new_ams_template():
return TexTemplate(preamble=preamble)
+""" Tex Template preamble used by original upstream 3b1b """
+_3b3b_preamble = r"""
+\usepackage[english]{babel}
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage{lmodern}
+\usepackage{amsmath}
+\usepackage{amssymb}
+\usepackage{dsfont}
+\usepackage{setspace}
+\usepackage{tipa}
+\usepackage{relsize}
+\usepackage{textcomp}
+\usepackage{mathrsfs}
+\usepackage{calligra}
+\usepackage{wasysym}
+\usepackage{ragged2e}
+\usepackage{physics}
+\usepackage{xcolor}
+\usepackage{microtype}
+\DisableLigatures{encoding = *, family = * }
+\linespread{1}
+"""
+
+
# TexTemplateLibrary
#
class TexTemplateLibrary(object):
@@ -34,16 +59,16 @@ class TexTemplateLibrary(object):
"""
- default = TexTemplate()
+ default = TexTemplate(preamble=_3b3b_preamble)
"""An instance of the default TeX template in manim"""
- threeb1b = TexTemplate()
+ threeb1b = TexTemplate(preamble=_3b3b_preamble)
""" An instance of the default TeX template used by 3b1b """
ctex = TexTemplate(
tex_compiler="xelatex",
output_format=".xdv",
- preamble=TexTemplate.default_preamble.replace(
+ preamble=_3b3b_preamble.replace(
r"\DisableLigatures{encoding = *, family = * }", r"\usepackage[UTF8]{ctex}"
),
)