Skip to content

fix(code): use Pygments style background for Code container #4845

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

Open
Chessing234 wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −3
Open

fix(code): use Pygments style background for Code container #4845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions manim/mobject/text/code_mobject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
from pygments import highlight
from pygments.formatters.html import HtmlFormatter
from pygments.lexers import get_lexer_by_name, guess_lexer, guess_lexer_for_filename
from pygments.styles import get_all_styles
from pygments.styles import get_all_styles, get_style_by_name

from manim.constants import *
from manim.mobject.geometry.arc import Dot
from manim.mobject.geometry.shape_matchers import SurroundingRectangle
from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL
from manim.mobject.types.vectorized_mobject import VGroup, VMobject
from manim.typing import StrPath
from manim.utils.color import WHITE, ManimColor
from manim.utils.color import GRAY, WHITE, ManimColor


class Code(VMobject, metaclass=ConvertToOpenGL):
Expand Down Expand Up @@ -107,7 +107,7 @@ def construct(self):
_styles_list_cache: list[str] | None = None
default_background_config: dict[str, Any] = {
"buff": 0.3,
"fill_color": ManimColor("#222"),
"fill_color": None,
"stroke_color": WHITE,
"corner_radius": 0.2,
"stroke_width": 1,
Expand Down Expand Up @@ -214,8 +214,14 @@ def __init__(
for start, end, color in color_range:
line[start:end].set_color(color)

selected_style = get_style_by_name(formatter_style)
if add_line_numbers:
base_paragraph_config.update({"alignment": "right"})
line_number_color = selected_style.line_number_color
if line_number_color == "inherit":
base_paragraph_config.update({"color": GRAY})
else:
base_paragraph_config.update({"color": line_number_color})
self.line_numbers = Paragraph(
*[
str(i)
Expand All @@ -239,6 +245,11 @@ def __init__(
background_config_base = self.default_background_config.copy()
background_config_base.update(background_config)

if background_config_base["fill_color"] is None:
background_config_base["fill_color"] = ManimColor(
selected_style.background_color
)

if background == "rectangle":
self.background = SurroundingRectangle(
self,
Expand Down
9 changes: 9 additions & 0 deletions tests/test_code_mobject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,12 @@ def test_code_initialization_style_correct_color():
)
except ValueError as e:
pytest.fail(f"Code initialization failed for style {style} with error: {e}")


def test_code_background_matches_formatter_style():
rendered_code = Code(
code_string="x = 1\n",
language="python",
formatter_style="xcode",
)
assert rendered_code.background.fill_color == ManimColor("#ffffff")
Loading