fix percentages

Author: willmcgugan

src/textual/_compositor.py

@@ -860,6 +860,7 @@ def get_style_at(self, x: int, y: int) -> Style:
         x -= region.x
         y -= region.y
 
+        # TODO: This prompts a render, can we avoid that?
         visible_screen_stack.set(widget.app._background_screens)
         lines = widget.render_lines(Region(0, y, region.width, 1))
 

src/textual/_style_parse.py

@@ -1,4 +1,5 @@
-from textual.color import TRANSPARENT, Color
+from textual._context import active_app
+from textual.color import Color
 from textual.css.parse import substitute_references
 from textual.css.tokenize import tokenize_style, tokenize_values
 from textual.style import Style
@@ -13,8 +14,11 @@
     "s": "strike",
 }
 
+from textual._profile import timer
 
-def style_parse(style_text: str, variables: dict[str, str]) -> Style:
+
+@timer("style parse")
+def style_parse(style_text: str, variables: dict[str, str] | None) -> Style:
     styles: dict[str, bool | None] = {style: None for style in STYLES}
 
     color: Color | None = None
@@ -25,19 +29,27 @@ def style_parse(style_text: str, variables: dict[str, str]) -> Style:
     data: dict[str, str] = {}
     meta: dict[str, object] = {}
 
-    reference_tokens = tokenize_values(variables)
+    if variables is None:
+        try:
+            app = active_app.get()
+        except LookupError:
+            pass
+        else:
+            reference_tokens = app.stylesheet._variable_tokens
+    else:
+        reference_tokens = tokenize_values(variables)
 
     for token in substitute_references(
         tokenize_style(style_text, read_from=("inline style", "")), reference_tokens
     ):
+
         name = token.name
         value = token.value
 
         if name == "color":
             token_color = Color.parse(value)
             if is_background:
                 background = token_color
-                is_background = False
             else:
                 color = token_color
         elif name == "token":
@@ -72,14 +84,14 @@ def style_parse(style_text: str, variables: dict[str, str]) -> Style:
                 meta[key[1:]] = value
             else:
                 data[key] = value
-        elif name == "percent":
-            percent = int(value.rstrip("%")) / 100
-            if background is None:
-                background = TRANSPARENT
+        elif name == "percent" or (name == "scalar" and value.endswith("%")):
+            percent = int(value.rstrip("%")) / 100.0
             if is_background:
-                background = background.multiply_alpha(percent)
+                if background is not None:
+                    background = background.multiply_alpha(percent)
             else:
-                color = background.multiply_alpha(percent)
+                if color is not None:
+                    color = color.multiply_alpha(percent)
 
     parsed_style = Style(background, color, link=data.get("link", None), **styles)
     if meta:

src/textual/color.py

@@ -382,8 +382,8 @@ def multiply_alpha(self, alpha: float) -> Color:
         """
         if self.ansi is not None:
             return self
-        r, g, b, a, _, _ = self
-        return Color(r, g, b, a * alpha)
+        r, g, b, a, _ansi, auto = self
+        return Color(r, g, b, a * alpha, auto=auto)
 
     @lru_cache(maxsize=1024)
     def blend(

src/textual/content.py

@@ -845,18 +845,11 @@ def render(
             return
 
         if parse_style is None:
-            try:
-                app = active_app.get()
-            except LookupError:
-                css_variables = {}
-            else:
-                css_variables = app.get_css_variables()
-            # TODO: Update when we add Content.from_markup
 
             @lru_cache(maxsize=1024)
             def get_style(style: str, /) -> Style:
                 try:
-                    visual_style = Style.parse(style, css_variables)
+                    visual_style = Style.parse(style)
                 except Exception:
                     visual_style = Style.null()
                 return visual_style

src/textual/css/tokenize.py

@@ -251,7 +251,6 @@ class StyleTokenizerState(TokenizerState):
             key_value=r"[@a-zA-Z_-][a-zA-Z0-9_-]*=.*",
             key_value_quote=r"[@a-zA-Z_-][a-zA-Z0-9_-]*='.*'",
             key_value_double_quote=r"""[@a-zA-Z_-][a-zA-Z0-9_-]*=".*\"""",
-            percent=PERCENT,
             color=COLOR,
             token=TOKEN,
             variable_ref=VARIABLE_REF,

src/textual/markup.py

@@ -29,7 +29,7 @@ class MarkupError(Exception):
 __all__ = ["MarkupError", "escape", "to_content"]
 
 RE_TAGS = re.compile(
-    r"""((\\*)\[([a-z#/@][^[]*?)])""",
+    r"""((\\*)\[([\$a-z#/@][^[]*?)])""",
     re.VERBOSE,
 )
 

src/textual/style.py

@@ -120,7 +120,7 @@ def null(cls) -> Style:
     def parse(cls, text_style: str, variables: dict[str, str] | None = None) -> Style:
         from textual._style_parse import style_parse
 
-        return style_parse(text_style, {} if variables is None else variables)
+        return style_parse(text_style, variables)
 
     @classmethod
     def from_rich_style(

tests/snapshot_tests/snapshot_apps/markup.py

@@ -0,0 +1,24 @@
+from textual.app import App, ComposeResult
+from textual.widgets import Label
+
+
+class ContentApp(App):
+
+    def compose(self) -> ComposeResult:
+        yield Label("[bold]Bold[/] [italic]Italic[/] [u]Underline[/]  [s]Strike[/s]")
+        yield Label(
+            "[$primary]Primary[/]  [$secondary]Secondary[/]  [$warning]Warning[/]  [$error]Error[/]"
+        )
+        yield Label("[$text on $primary]Text on Primary")
+        yield Label("[$primary on $primary-muted]Primary on primary muted")
+        yield Label("[$error on $error-muted]Error on error muted")
+        yield Label(
+            "[on $boost]    [on $boost]    [on $boost]  Three layers of $boost  [/]    [/]    [/]"
+        )
+        yield Label("[on $primary 20%]On primary twenty percent")
+        yield Label("[$text 80% on primary]Hello")
+
+
+if __name__ == "__main__":
+    app = ContentApp()
+    app.run()

tests/snapshot_tests/test_snapshots.py

@@ -3356,3 +3356,8 @@ async def run_before(pilot: Pilot) -> None:
         await pilot.pause()
 
     assert snap_compare(LApp(), run_before=run_before)
+
+
+def test_markup(snap_compare):
+    """Check markup rendering, text in test should match the markup."""
+    assert snap_compare(SNAPSHOT_APPS_DIR / "markup.py")