Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor TexTemplate #3520

Merged
merged 10 commits into from
Jan 15, 2024
Merged

Refactor TexTemplate #3520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b57f2ff
Refactor `TexTemplate`
Viicos Dec 11, 2023
bdded05
Add tests, refactor some things
Viicos Dec 12, 2023
53cea3f
Fixed Some tests
JasonGrace2282 Dec 23, 2023
c896fc9
Merge branch 'main' into refactor-textemplate
JasonGrace2282 Dec 23, 2023
6eb4ea1
Merge branch 'main' into refactor-textemplate
JasonGrace2282 Dec 24, 2023
1f17457
Move typing imports
Viicos Dec 28, 2023
2768115
Fix remaining tests
Viicos Dec 28, 2023
fc6c197
Merge branch 'main' of https://github.com/ManimCommunity/manim into r…
JasonGrace2282 Jan 15, 2024
5f61785
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 15, 2024
bd5b200
Merge branch 'main' into refactor-textemplate
JasonGrace2282 Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions manim/_config/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from manim import constants
from manim.constants import RendererType
from manim.utils.color import ManimColor
from manim.utils.tex import TexTemplate, TexTemplateFromFile
from manim.utils.tex import TexTemplate

if TYPE_CHECKING:
from enum import EnumMeta
Expand Down Expand Up @@ -833,7 +833,7 @@ def digest_args(self, args: argparse.Namespace) -> Self:

# Handle --tex_template
if args.tex_template:
self.tex_template = TexTemplateFromFile(tex_filename=args.tex_template)
self.tex_template = TexTemplate.from_file(args.tex_template)

if (
self.renderer == RendererType.OPENGL
Expand Down Expand Up @@ -1756,19 +1756,19 @@ def tex_template(self) -> TexTemplate:
if not hasattr(self, "_tex_template") or not self._tex_template:
fn = self._d["tex_template_file"]
if fn:
self._tex_template = TexTemplateFromFile(tex_filename=fn)
self._tex_template = TexTemplate.from_file(fn)
else:
self._tex_template = TexTemplate()
return self._tex_template

@tex_template.setter
def tex_template(self, val: TexTemplateFromFile | TexTemplate) -> None:
if isinstance(val, (TexTemplateFromFile, TexTemplate)):
def tex_template(self, val: TexTemplate) -> None:
if isinstance(val, TexTemplate):
self._tex_template = val

@property
def tex_template_file(self) -> Path:
"""File to read Tex template from (no flag). See :class:`.TexTemplateFromFile`."""
"""File to read Tex template from (no flag). See :class:`.TexTemplate`."""
return self._d["tex_template_file"]

@tex_template_file.setter
Expand Down
Loading
Loading