Reorganize so Color section matches WL

Author: rocky

mathics/builtin/__init__.py

@@ -145,7 +145,7 @@ def is_builtin(var):
 
 disable_file_module_names = [] if ENABLE_FILES_MODULE else ["files_io.files", "files_io.importexport"]
 
-for subdir in ("drawing", "files_io", "numbers", "specialfns", "fileformats"):
+for subdir in ("colors", "drawing", "files_io", "numbers", "specialfns", "fileformats"):
     import_name = f"{__name__}.{subdir}"
 
     if import_name in disable_file_module_names:

mathics/builtin/box/graphics.py

@@ -11,7 +11,7 @@
     BoxConstructError,
 )
 
-from mathics.builtin.drawing.colors import _Color, ColorError, RGBColor
+from mathics.builtin.colors.color_directives import _Color, ColorError, RGBColor
 from mathics.builtin.drawing.graphics_internals import _GraphicsElement, GLOBALS
 
 from mathics.builtin.graphics import (

mathics/builtin/box/graphics3d.py

@@ -10,7 +10,7 @@
 from mathics.builtin.base import BoxConstructError
 from mathics.builtin.box.graphics import GraphicsBox, LineBox, PointBox, PolygonBox
 
-from mathics.builtin.drawing.colors import _Color, RGBColor
+from mathics.builtin.colors.color_directives import _Color, RGBColor
 from mathics.builtin.drawing.graphics_internals import GLOBALS3D
 from mathics.builtin.drawing.graphics3d import (
     _Graphics3DElement,

mathics/builtin/colors/__init__.py

@@ -0,0 +1,8 @@
+"""
+Colors
+
+Programmatic support for symbolic colors.
+
+"""
+
+from mathics.version import __version__  # noqa used in loading to check consistency.

mathics/builtin/drawing/colors.py …thics/builtin/colors/color_directives.pymathics/builtin/drawing/colors.py renamed to mathics/builtin/colors/color_directives.py mathics/builtin/drawing/colors.py renamed to mathics/builtin/colors/color_directives.py

@@ -1,15 +1,12 @@
 """
-Colors
-
-Programmatic support for symbolic colors.
-
+Color Directives
 """
 
 from math import atan2, cos, exp, pi, radians, sin, sqrt
 
 from mathics.version import __version__  # noqa used in loading to check consistency.
 
-from mathics.builtin.drawing.color_internals import convert_color
+from mathics.builtin.colors.color_internals import convert_color
 
 from mathics.builtin.base import (
     Builtin,

…thics/builtin/drawing/color_internals.py mathics/builtin/colors/color_internals.pymathics/builtin/drawing/color_internals.py renamed to mathics/builtin/colors/color_internals.py mathics/builtin/drawing/color_internals.py renamed to mathics/builtin/colors/color_internals.py

@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
-"""Color Names
+# FIXME: this should live in colors/named_colors.py not here.
+# However there is some mysterious tie that can be seen when
+# running Graphics[{Red, Disk[]}] that doesn't associate Red in a DiskBox (or something like that -
+# if I knew the details better this would have been resolved.
+"""Named Colors
 
 Mathics has definitions for the most common color names which can be
 used in a graphics or style specification.

mathics/builtin/drawing/rgbcolor.py mathics/builtin/colors/named_colors.pymathics/builtin/drawing/rgbcolor.py renamed to mathics/builtin/colors/named_colors.py

@@ -13,7 +13,7 @@
 )
 
 from mathics.builtin.base import BoxConstructError, Builtin, InstanceableBuiltin
-from mathics.builtin.drawing.colors import RGBColor
+from mathics.builtin.colors.color_directives import RGBColor
 from mathics.builtin.graphics import (
     _GraphicsElements,
     CoordinatesError,

mathics/builtin/drawing/graphics3d.py

@@ -23,7 +23,7 @@
     SymbolRule,
     from_python,
 )
-from mathics.builtin.drawing.color_internals import (
+from mathics.builtin.colors.color_internals import (
     convert_color,
     colorspaces as known_colorspaces,
 )
@@ -1296,7 +1296,7 @@ def apply(self, input, colorspace, evaluation):
         if isinstance(input, Image):
             return input.color_convert(colorspace.get_string_value())
         else:
-            from mathics.builtin.drawing.colors import (
+            from mathics.builtin.colors.color_directives import (
                 expression_to_color,
                 color_to_expression,
             )

mathics/builtin/drawing/image.py

@@ -64,7 +64,7 @@ def gradient_palette(color_function, n, evaluation):  # always returns RGB value
     if len(colors.leaves) != n:
         return
 
-    from mathics.builtin.drawing.colors import expression_to_color, ColorError
+    from mathics.builtin.colors.color_directives import expression_to_color, ColorError
 
     try:
         objects = [expression_to_color(x) for x in colors.leaves]