export VGA_COLORS to Python and get rid of other hardcoded themes

docs/book.py

@@ -64,12 +64,11 @@ def test2() -> None:
     from prettypretty.color import Color, OkVersion
     from prettypretty.color.style import AnsiColor, EmbeddedRgb, Fidelity
     from prettypretty.color.style import TerminalColor, TrueColor
-    from prettypretty.color.trans import Translator
-    from prettypretty.theme import VGA
-    red = VGA[AnsiColor.BrightRed.to_8bit() + 2]
+    from prettypretty.color.trans import Translator, VGA_COLORS
+    red = VGA_COLORS[AnsiColor.BrightRed.to_8bit() + 2]
     assert red == Color.srgb(1.0, 0.333333333333333, 0.333333333333333)
 
-    translator = Translator(OkVersion.Revised, VGA)
+    translator = Translator(OkVersion.Revised, VGA_COLORS)
     also_red = translator.resolve(AnsiColor.BrightRed)
     assert red == also_red
 

docs/src/overview/integration.md

@@ -212,12 +212,11 @@ The Python version is a close match:
 ~from prettypretty.color import Color, OkVersion
 ~from prettypretty.color.style import AnsiColor, EmbeddedRgb, Fidelity
 ~from prettypretty.color.style import TerminalColor, TrueColor
-~from prettypretty.color.trans import Translator
-~from prettypretty.theme import VGA
-red = VGA[AnsiColor.BrightRed.to_8bit() + 2]
+~from prettypretty.color.trans import Translator, VGA_COLORS
+red = VGA_COLORS[AnsiColor.BrightRed.to_8bit() + 2]
 assert red == Color.srgb(1.0, 0.333333333333333, 0.333333333333333)
 
-translator = Translator(OkVersion.Revised, VGA)
+translator = Translator(OkVersion.Revised, VGA_COLORS)
 also_red = translator.resolve(AnsiColor.BrightRed)
 assert red == also_red
 

prettypretty/color/trans.pyi

@@ -4,6 +4,9 @@ from typing import Self
 from . import Color, OkVersion, style
 
 
+VGA_COLORS: list[Color] =  ...
+
+
 class ThemeEntry_Default(ThemeEntry):
     """A theme entry for one of the default colors."""
     def __new__(cls, color: style.DefaultColor) -> Self: ...

prettypretty/grid.py

@@ -11,7 +11,8 @@
 from .color.style import ( # pyright: ignore [reportMissingModuleSource]
     AnsiColor, EmbeddedRgb, Fidelity, Layer, TrueColor
 )
-from .theme import MACOS_TERMINAL, VGA, XTERM, current_translator
+from .color.trans import VGA_COLORS # pyright: ignore [reportMissingModuleSource]
+from .theme import current_translator
 from .terminal import Terminal
 
 
@@ -331,24 +332,10 @@ def create_parser() -> argparse.ArgumentParser:
     )
 
     group = parser.add_mutually_exclusive_group()
-    group.add_argument(
-        '--macos-terminal',
-        action='store_const',
-        const=MACOS_TERMINAL,
-        dest='theme',
-        help="use the same colors as the Basic theme for macOS Terminal"
-    )
-    group.add_argument(
-        '--xterm',
-        action='store_const',
-        const=XTERM,
-        dest='theme',
-        help='use the same colors as xterm'
-    )
     group.add_argument(
         '--vga',
         action='store_const',
-        const=VGA,
+        const=VGA_COLORS,
         dest='theme',
         help='use the same colors as VGA in text mode'
     )

prettypretty/plot.py

@@ -27,7 +27,7 @@
     spectrum, # pyright: ignore [reportMissingModuleSource]
     trans, # pyright: ignore [reportMissingModuleSource]
 )
-from .theme import current_translator, VGA
+from .theme import current_translator
 
 
 def create_parser() -> argparse.ArgumentParser:
@@ -58,7 +58,7 @@ def create_parser() -> argparse.ArgumentParser:
     parser.add_argument(
         "--vga",
         action="store_const",
-        const=VGA,
+        const=trans.VGA_COLORS,
         dest="theme",
         help="use VGA colors instead of querying terminal"
     )

prettypretty/theme.py

@@ -7,75 +7,10 @@
 from contextlib import contextmanager
 
 from .color import Color, OkVersion
-from .color.trans import Translator # pyright: ignore [reportMissingModuleSource]
+from .color.trans import Translator, VGA_COLORS # pyright: ignore [reportMissingModuleSource]
 
-MACOS_TERMINAL = (
-    Color.parse("#000000"),
-    Color.parse("#ffffff"),
-    Color.parse("#000000"),
-    Color.parse("#990000"),
-    Color.parse("#00a600"),
-    Color.parse("#999900"),
-    Color.parse("#0000b2"),
-    Color.parse("#b200b2"),
-    Color.parse("#00a6b2"),
-    Color.parse("#bfbfbf"),
-    Color.parse("#666666"),
-    Color.parse("#e50000"),
-    Color.parse("#00d900"),
-    Color.parse("#e5e500"),
-    Color.parse("#0000ff"),
-    Color.parse("#e500e5"),
-    Color.parse("#00e5e5"),
-    Color.parse("#e5e5e5"),
-)
 
-
-VGA = (
-    Color.parse("#000000"),
-    Color.parse("#ffffff"),
-    Color.parse("#000000"),
-    Color.parse("#aa0000"),
-    Color.parse("#00aa00"),
-    Color.parse("#aa5500"),
-    Color.parse("#0000aa"),
-    Color.parse("#aa00aa"),
-    Color.parse("#00aaaa"),
-    Color.parse("#aaaaaa"),
-    Color.parse("#555555"),
-    Color.parse("#ff5555"),
-    Color.parse("#55ff55"),
-    Color.parse("#ffff55"),
-    Color.parse("#5555ff"),
-    Color.parse("#ff55ff"),
-    Color.parse("#55ffff"),
-    Color.parse("#ffffff"),
-)
-
-
-XTERM = (
-    Color.parse("#000000"),
-    Color.parse("#ffffff"),
-    Color.parse("#000000"),
-    Color.parse("#cd0000"),
-    Color.parse("#00cd00"),
-    Color.parse("#cdcd00"),
-    Color.parse("#0000ee"),
-    Color.parse("#cd00cd"),
-    Color.parse("#00cdcd"),
-    Color.parse("#e5e5e5"),
-    Color.parse("#7f7f7f"),
-    Color.parse("#ff0000"),
-    Color.parse("#00ff00"),
-    Color.parse("#ffff00"),
-    Color.parse("#5c5cff"),
-    Color.parse("#ff00ff"),
-    Color.parse("#00ffff"),
-    Color.parse("#ffffff"),
-)
-
-
-_current_translator: list[Translator] = [Translator(OkVersion.Revised, VGA)]
+_current_translator: list[Translator] = [Translator(OkVersion.Revised, VGA_COLORS)]
 
 @contextmanager
 def new_theme(theme_colors: list[Color]) -> Iterator[Translator]:

src/lib.rs

@@ -246,6 +246,7 @@ pub fn color(m: &Bound<'_, PyModule>) -> PyResult<()> {
     modtrans.add_class::<crate::trans::ThemeEntry>()?;
     modtrans.add_class::<crate::trans::ThemeEntryIterator>()?;
     modtrans.add_class::<crate::trans::Translator>()?;
+    modtrans.add("VGA_COLORS", crate::trans::VGA_COLORS)?;
     m.add_submodule(&modtrans)?;
 
     // Only change __name__ attribute after submodule has been added.