Addresses 4352

Add more colors to built-in color list.
Addresses #4352.

Author: JorjMcKie

src/utils.py

@@ -3235,6 +3235,21 @@ def getColorInfoList() -> list:
         ("GRAY97", 247, 247, 247),
         ("GRAY98", 250, 250, 250),
         ("GRAY99", 252, 252, 252),
+        ("AQUA", 0, 255, 255),
+        ("CRIMSON", 220, 20, 60),
+        ("DARKGREY", 169, 169, 169),
+        ("DARKSLATEGREY", 47, 79, 79),
+        ("DIMGREY", 105, 105, 105),
+        ("FUCHSIA", 255, 0, 255),
+        ("GREY", 128, 128, 128),
+        ("INDIGO", 75, 0, 130),
+        ("LIGHTGREY", 211, 211, 211),
+        ("LIGHTSLATEGREY", 119, 136, 153),
+        ("LIME", 0, 255, 0),
+        ("OLIVE", 128, 128, 0),
+        ("SILVER", 192, 192, 192),
+        ("SLATEGREY", 112, 128, 144),
+        ("TEAL", 0, 128, 128),
         ("HONEYDEW", 240, 255, 240),
         ("HONEYDEW1", 240, 255, 240),
         ("HONEYDEW2", 224, 238, 224),
@@ -3543,12 +3558,9 @@ def getColor(name: str) -> tuple:
     Returns:
         a triple of floats in range 0 to 1. In case of name-not-found, "white" is returned.
     """
-    try:
-        c = getColorInfoList()[getColorList().index(name.upper())]
-        return (c[1] / 255.0, c[2] / 255.0, c[3] / 255.0)
-    except Exception:
-        pymupdf.exception_info()
-        return (1, 1, 1)
+    color_dict = getColorInfoDict()
+    c = color_dict.get(name, (255, 255, 255))
+    return (c[0] / 255.0, c[1] / 255.0, c[2] / 255.0)
 
 
 def getColorHSV(name: str) -> tuple:

tests/test_annots.py

@@ -243,7 +243,7 @@ def test_1645():
                 annot_loc * page.derotation_matrix,
                 "TEST",
                 fontsize=18,
-                fill_color=pymupdf.utils.getColor("FIREBRICK1"),
+                fill_color=pymupdf.pdfcolor["firebrick1"],
                 rotate=page.rotation,
                 )
         doc.save(path_out, garbage=1, deflate=True, no_new_id=True)
@@ -372,17 +372,17 @@ def test_3863():
     if pymupdf.mupdf_version_tuple < (1, 24, 10):
         print(f'test_3863(): not running because {pymupdf.mupdf_version_tuple=} < 1.24.10.')
         return
-    
+
     path_in = os.path.normpath(f'{__file__}/../../tests/resources/test_3863.pdf')
     path_out = os.path.normpath(f'{__file__}/../../tests/test_3863.pdf.pdf')
-    
+
     # Create redacted PDF.
     print(f'Loading {path_in=}.')
     with pymupdf.open(path_in) as document:
-    
+
         for num, page in enumerate(document):
             print(f"Page {num + 1} - {page.rect}:")
-    
+
             for image in page.get_images(full=True):
                 print(f"  - Image: {image}")
 
@@ -396,18 +396,18 @@ def test_3863():
 
         print(f'Writing to {path_out=}.')
         document.save(path_out)
-    
+
     with pymupdf.open(path_out) as document:
         assert len(document) == 8
-        
+
         # Create PNG for each page of redacted PDF.
         for num, page in enumerate(document):
             path_png = f'{path_out}.{num}.png'
             pixmap = page.get_pixmap()
             print(f'Writing to {path_png=}.')
             pixmap.save(path_png)
             # Compare with expected png.
-    
+
         print(f'Comparing page PNGs with expected PNGs.')
         for num, _ in enumerate(document):
             path_png = f'{path_out}.{num}.png'
@@ -480,7 +480,7 @@ def test_4079():
     if pymupdf.mupdf_version_tuple >= (1, 26):
         path_after = os.path.normpath(f'{__file__}/../../tests/resources/test_4079_after.pdf')
     else:path_after = os.path.normpath(f'{__file__}/../../tests/resources/test_4079_after_1.25.pdf')
-        
+
     path_out = os.path.normpath(f'{__file__}/../../tests/test_4079_out')
     with pymupdf.open(path_after) as document_after:
         page = document_after[0]