Merge pull request #141 from daviehh/Catppuccin_revise

change ordering according to palette, and add to catalogue
JuliaGraphics · Nov 27, 2024 · 543a16c · 543a16c
2 parents 28c6335 + b1815aa
commit 543a16c
Show file tree

Hide file tree

Showing 2 changed files with 127 additions and 115 deletions.
diff --git a/data/catppuccin_scheme.jl b/data/catppuccin_scheme.jl
@@ -1,116 +1,116 @@
-loadcolorscheme(:catppuccin_mocha, [
-	RGB(0.9607843137254902, 0.8784313725490196, 0.8627450980392157), 
-	RGB(0.9764705882352941, 0.8862745098039215, 0.6862745098039216), 
-	RGB(0.803921568627451, 0.8392156862745098, 0.9568627450980393), 
-	RGB(0.9490196078431372, 0.803921568627451, 0.803921568627451), 
-	RGB(0.6509803921568628, 0.8901960784313725, 0.6313725490196078), 
-	RGB(0.5803921568627451, 0.8862745098039215, 0.8352941176470589), 
-	RGB(0.9607843137254902, 0.7607843137254902, 0.9058823529411765), 
-	RGB(0.5372549019607843, 0.8627450980392157, 0.9215686274509803), 
-	RGB(0.9803921568627451, 0.7019607843137254, 0.5294117647058824), 
-	RGB(0.7294117647058823, 0.7607843137254902, 0.8705882352941177), 
-	RGB(0.7058823529411765, 0.7450980392156863, 0.996078431372549), 
-	RGB(0.4549019607843137, 0.7803921568627451, 0.9254901960784314), 
-	RGB(0.796078431372549, 0.6509803921568628, 0.9686274509803922), 
-	RGB(0.9215686274509803, 0.6274509803921569, 0.6745098039215687), 
-	RGB(0.5372549019607843, 0.7058823529411765, 0.9803921568627451), 
-	RGB(0.6509803921568628, 0.6784313725490196, 0.7843137254901961), 
-	RGB(0.9529411764705882, 0.5450980392156862, 0.6588235294117647), 
-	RGB(0.5764705882352941, 0.6, 0.6980392156862745), 
-	RGB(0.4980392156862745, 0.5176470588235295, 0.611764705882353), 
-	RGB(0.4235294117647059, 0.4392156862745098, 0.5254901960784314), 
-	RGB(0.34509803921568627, 0.3568627450980392, 0.4392156862745098), 
-	RGB(0.27058823529411763, 0.2784313725490196, 0.35294117647058826), 
-	RGB(0.19215686274509805, 0.19607843137254902, 0.26666666666666666), 
-	RGB(0.11764705882352941, 0.11764705882352941, 0.1803921568627451), 
-	RGB(0.09411764705882353, 0.09411764705882353, 0.1450980392156863), 
-	RGB(0.06666666666666667, 0.06666666666666667, 0.10588235294117647), 
-], "catppuccin", "")
+loadcolorscheme(:Catppuccin_latte, [
+	RGB{N0f8}(0.863, 0.541, 0.471), 
+	RGB{N0f8}(0.867, 0.471, 0.471), 
+	RGB{N0f8}(0.918, 0.463, 0.796), 
+	RGB{N0f8}(0.533, 0.224, 0.937), 
+	RGB{N0f8}(0.824, 0.059, 0.224), 
+	RGB{N0f8}(0.902, 0.271, 0.325), 
+	RGB{N0f8}(0.996, 0.392, 0.043), 
+	RGB{N0f8}(0.875, 0.557, 0.114), 
+	RGB{N0f8}(0.251, 0.627, 0.169), 
+	RGB{N0f8}(0.09, 0.573, 0.6), 
+	RGB{N0f8}(0.016, 0.647, 0.898), 
+	RGB{N0f8}(0.125, 0.624, 0.71), 
+	RGB{N0f8}(0.118, 0.4, 0.961), 
+	RGB{N0f8}(0.447, 0.529, 0.992), 
+	RGB{N0f8}(0.298, 0.31, 0.412), 
+	RGB{N0f8}(0.361, 0.373, 0.467), 
+	RGB{N0f8}(0.424, 0.435, 0.522), 
+	RGB{N0f8}(0.486, 0.498, 0.576), 
+	RGB{N0f8}(0.549, 0.561, 0.631), 
+	RGB{N0f8}(0.612, 0.627, 0.69), 
+	RGB{N0f8}(0.675, 0.69, 0.745), 
+	RGB{N0f8}(0.737, 0.753, 0.8), 
+	RGB{N0f8}(0.8, 0.816, 0.855), 
+	RGB{N0f8}(0.937, 0.945, 0.961), 
+	RGB{N0f8}(0.902, 0.914, 0.937), 
+	RGB{N0f8}(0.863, 0.878, 0.91), 
+], "Catppuccin", "Catppuccin theme: latte flavor.")
 
-loadcolorscheme(:catppuccin_latte, [
-	RGB(0.9372549019607843, 0.9450980392156862, 0.9607843137254902), 
-	RGB(0.9019607843137255, 0.9137254901960784, 0.9372549019607843), 
-	RGB(0.8627450980392157, 0.8784313725490196, 0.9098039215686274), 
-	RGB(0.8, 0.8156862745098039, 0.8549019607843137), 
-	RGB(0.7372549019607844, 0.7529411764705882, 0.8), 
-	RGB(0.6745098039215687, 0.6901960784313725, 0.7450980392156863), 
-	RGB(0.611764705882353, 0.6274509803921569, 0.6901960784313725), 
-	RGB(0.8745098039215686, 0.5568627450980392, 0.11372549019607843), 
-	RGB(0.9176470588235294, 0.4627450980392157, 0.796078431372549), 
-	RGB(0.8627450980392157, 0.5411764705882353, 0.47058823529411764), 
-	RGB(0.01568627450980392, 0.6470588235294118, 0.8980392156862745), 
-	RGB(0.996078431372549, 0.39215686274509803, 0.043137254901960784), 
-	RGB(0.8666666666666667, 0.47058823529411764, 0.47058823529411764), 
-	RGB(0.12549019607843137, 0.6235294117647059, 0.7098039215686275), 
-	RGB(0.4470588235294118, 0.5294117647058824, 0.9921568627450981), 
-	RGB(0.5490196078431373, 0.5607843137254902, 0.6313725490196078), 
-	RGB(0.25098039215686274, 0.6274509803921569, 0.16862745098039217), 
-	RGB(0.09019607843137255, 0.5725490196078431, 0.6), 
-	RGB(0.9019607843137255, 0.27058823529411763, 0.3254901960784314), 
-	RGB(0.48627450980392156, 0.4980392156862745, 0.5764705882352941), 
-	RGB(0.11764705882352941, 0.4, 0.9607843137254902), 
-	RGB(0.4235294117647059, 0.43529411764705883, 0.5215686274509804), 
-	RGB(0.5333333333333333, 0.2235294117647059, 0.9372549019607843), 
-	RGB(0.8235294117647058, 0.058823529411764705, 0.2235294117647059), 
-	RGB(0.3607843137254902, 0.37254901960784315, 0.4666666666666667), 
-	RGB(0.2980392156862745, 0.30980392156862746, 0.4117647058823529), 
-], "catppuccin", "")
+loadcolorscheme(:Catppuccin_frappe, [
+	RGB{N0f8}(0.949, 0.835, 0.812), 
+	RGB{N0f8}(0.933, 0.745, 0.745), 
+	RGB{N0f8}(0.957, 0.722, 0.894), 
+	RGB{N0f8}(0.792, 0.62, 0.902), 
+	RGB{N0f8}(0.906, 0.51, 0.518), 
+	RGB{N0f8}(0.918, 0.6, 0.612), 
+	RGB{N0f8}(0.937, 0.624, 0.463), 
+	RGB{N0f8}(0.898, 0.784, 0.565), 
+	RGB{N0f8}(0.651, 0.82, 0.537), 
+	RGB{N0f8}(0.506, 0.784, 0.745), 
+	RGB{N0f8}(0.6, 0.82, 0.859), 
+	RGB{N0f8}(0.522, 0.757, 0.863), 
+	RGB{N0f8}(0.549, 0.667, 0.933), 
+	RGB{N0f8}(0.729, 0.733, 0.945), 
+	RGB{N0f8}(0.776, 0.816, 0.961), 
+	RGB{N0f8}(0.71, 0.749, 0.886), 
+	RGB{N0f8}(0.647, 0.678, 0.808), 
+	RGB{N0f8}(0.58, 0.612, 0.733), 
+	RGB{N0f8}(0.514, 0.545, 0.655), 
+	RGB{N0f8}(0.451, 0.475, 0.58), 
+	RGB{N0f8}(0.384, 0.408, 0.502), 
+	RGB{N0f8}(0.318, 0.341, 0.427), 
+	RGB{N0f8}(0.255, 0.271, 0.349), 
+	RGB{N0f8}(0.188, 0.204, 0.275), 
+	RGB{N0f8}(0.161, 0.173, 0.235), 
+	RGB{N0f8}(0.137, 0.149, 0.204), 
+], "Catppuccin", "Catppuccin theme: frappe flavor.")
 
-loadcolorscheme(:catppuccin_frappe, [
-	RGB(0.9490196078431372, 0.8352941176470589, 0.8117647058823529), 
-	RGB(0.7764705882352941, 0.8156862745098039, 0.9607843137254902), 
-	RGB(0.8980392156862745, 0.7843137254901961, 0.5647058823529412), 
-	RGB(0.9568627450980393, 0.7215686274509804, 0.8941176470588236), 
-	RGB(0.9333333333333333, 0.7450980392156863, 0.7450980392156863), 
-	RGB(0.6, 0.8196078431372549, 0.8588235294117647), 
-	RGB(0.6509803921568628, 0.8196078431372549, 0.5372549019607843), 
-	RGB(0.7098039215686275, 0.7490196078431373, 0.8862745098039215), 
-	RGB(0.7294117647058823, 0.7333333333333333, 0.9450980392156862), 
-	RGB(0.5058823529411764, 0.7843137254901961, 0.7450980392156863), 
-	RGB(0.5215686274509804, 0.7568627450980392, 0.8627450980392157), 
-	RGB(0.9372549019607843, 0.6235294117647059, 0.4627450980392157), 
-	RGB(0.792156862745098, 0.6196078431372549, 0.9019607843137255), 
-	RGB(0.9176470588235294, 0.6, 0.611764705882353), 
-	RGB(0.6470588235294118, 0.6784313725490196, 0.807843137254902), 
-	RGB(0.5490196078431373, 0.6666666666666666, 0.9333333333333333), 
-	RGB(0.9058823529411765, 0.5098039215686274, 0.5176470588235295), 
-	RGB(0.5803921568627451, 0.611764705882353, 0.7333333333333333), 
-	RGB(0.5137254901960784, 0.5450980392156862, 0.6549019607843137), 
-	RGB(0.45098039215686275, 0.4745098039215686, 0.5803921568627451), 
-	RGB(0.3843137254901961, 0.40784313725490196, 0.5019607843137255), 
-	RGB(0.3176470588235294, 0.3411764705882353, 0.42745098039215684), 
-	RGB(0.2549019607843137, 0.27058823529411763, 0.34901960784313724), 
-	RGB(0.18823529411764706, 0.20392156862745098, 0.27450980392156865), 
-	RGB(0.1607843137254902, 0.17254901960784313, 0.23529411764705882), 
-	RGB(0.13725490196078433, 0.14901960784313725, 0.20392156862745098), 
-], "catppuccin", "")
+loadcolorscheme(:Catppuccin_macchiato, [
+	RGB{N0f8}(0.957, 0.859, 0.839), 
+	RGB{N0f8}(0.941, 0.776, 0.776), 
+	RGB{N0f8}(0.961, 0.741, 0.902), 
+	RGB{N0f8}(0.776, 0.627, 0.965), 
+	RGB{N0f8}(0.929, 0.529, 0.588), 
+	RGB{N0f8}(0.933, 0.6, 0.627), 
+	RGB{N0f8}(0.961, 0.663, 0.498), 
+	RGB{N0f8}(0.933, 0.831, 0.624), 
+	RGB{N0f8}(0.651, 0.855, 0.584), 
+	RGB{N0f8}(0.545, 0.835, 0.792), 
+	RGB{N0f8}(0.569, 0.843, 0.89), 
+	RGB{N0f8}(0.49, 0.769, 0.894), 
+	RGB{N0f8}(0.541, 0.678, 0.957), 
+	RGB{N0f8}(0.718, 0.741, 0.973), 
+	RGB{N0f8}(0.792, 0.827, 0.961), 
+	RGB{N0f8}(0.722, 0.753, 0.878), 
+	RGB{N0f8}(0.647, 0.678, 0.796), 
+	RGB{N0f8}(0.576, 0.604, 0.718), 
+	RGB{N0f8}(0.502, 0.529, 0.635), 
+	RGB{N0f8}(0.431, 0.451, 0.553), 
+	RGB{N0f8}(0.357, 0.376, 0.471), 
+	RGB{N0f8}(0.286, 0.302, 0.392), 
+	RGB{N0f8}(0.212, 0.227, 0.31), 
+	RGB{N0f8}(0.141, 0.153, 0.227), 
+	RGB{N0f8}(0.118, 0.125, 0.188), 
+	RGB{N0f8}(0.094, 0.098, 0.149), 
+], "Catppuccin", "Catppuccin theme: macchiato flavor.")
 
-loadcolorscheme(:catppuccin_macchiato, [
-	RGB(0.9568627450980393, 0.8588235294117647, 0.8392156862745098), 
-	RGB(0.9333333333333333, 0.8313725490196079, 0.6235294117647059), 
-	RGB(0.792156862745098, 0.8274509803921568, 0.9607843137254902), 
-	RGB(0.9411764705882353, 0.7764705882352941, 0.7764705882352941), 
-	RGB(0.9607843137254902, 0.7411764705882353, 0.9019607843137255), 
-	RGB(0.6509803921568628, 0.8549019607843137, 0.5843137254901961), 
-	RGB(0.5686274509803921, 0.8431372549019608, 0.8901960784313725), 
-	RGB(0.5450980392156862, 0.8352941176470589, 0.792156862745098), 
-	RGB(0.7215686274509804, 0.7529411764705882, 0.8784313725490196), 
-	RGB(0.7176470588235294, 0.7411764705882353, 0.9725490196078431), 
-	RGB(0.49019607843137253, 0.7686274509803922, 0.8941176470588236), 
-	RGB(0.9607843137254902, 0.6627450980392157, 0.4980392156862745), 
-	RGB(0.7764705882352941, 0.6274509803921569, 0.9647058823529412), 
-	RGB(0.9333333333333333, 0.6, 0.6274509803921569), 
-	RGB(0.6470588235294118, 0.6784313725490196, 0.796078431372549), 
-	RGB(0.5411764705882353, 0.6784313725490196, 0.9568627450980393), 
-	RGB(0.9294117647058824, 0.5294117647058824, 0.5882352941176471), 
-	RGB(0.5764705882352941, 0.6039215686274509, 0.7176470588235294), 
-	RGB(0.5019607843137255, 0.5294117647058824, 0.6352941176470588), 
-	RGB(0.43137254901960786, 0.45098039215686275, 0.5529411764705883), 
-	RGB(0.3568627450980392, 0.3764705882352941, 0.47058823529411764), 
-	RGB(0.28627450980392155, 0.30196078431372547, 0.39215686274509803), 
-	RGB(0.21176470588235294, 0.22745098039215686, 0.30980392156862746), 
-	RGB(0.1411764705882353, 0.15294117647058825, 0.22745098039215686), 
-	RGB(0.11764705882352941, 0.12549019607843137, 0.18823529411764706), 
-	RGB(0.09411764705882353, 0.09803921568627451, 0.14901960784313725), 
-], "catppuccin", "")
+loadcolorscheme(:Catppuccin_mocha, [
+	RGB{N0f8}(0.961, 0.878, 0.863), 
+	RGB{N0f8}(0.949, 0.804, 0.804), 
+	RGB{N0f8}(0.961, 0.761, 0.906), 
+	RGB{N0f8}(0.796, 0.651, 0.969), 
+	RGB{N0f8}(0.953, 0.545, 0.659), 
+	RGB{N0f8}(0.922, 0.627, 0.675), 
+	RGB{N0f8}(0.98, 0.702, 0.529), 
+	RGB{N0f8}(0.976, 0.886, 0.686), 
+	RGB{N0f8}(0.651, 0.89, 0.631), 
+	RGB{N0f8}(0.58, 0.886, 0.835), 
+	RGB{N0f8}(0.537, 0.863, 0.922), 
+	RGB{N0f8}(0.455, 0.78, 0.925), 
+	RGB{N0f8}(0.537, 0.706, 0.98), 
+	RGB{N0f8}(0.706, 0.745, 0.996), 
+	RGB{N0f8}(0.804, 0.839, 0.957), 
+	RGB{N0f8}(0.729, 0.761, 0.871), 
+	RGB{N0f8}(0.651, 0.678, 0.784), 
+	RGB{N0f8}(0.576, 0.6, 0.698), 
+	RGB{N0f8}(0.498, 0.518, 0.612), 
+	RGB{N0f8}(0.424, 0.439, 0.525), 
+	RGB{N0f8}(0.345, 0.357, 0.439), 
+	RGB{N0f8}(0.271, 0.278, 0.353), 
+	RGB{N0f8}(0.192, 0.196, 0.267), 
+	RGB{N0f8}(0.118, 0.118, 0.18), 
+	RGB{N0f8}(0.094, 0.094, 0.145), 
+	RGB{N0f8}(0.067, 0.067, 0.106), 
+], "Catppuccin", "Catppuccin theme: mocha flavor.")
 
diff --git a/docs/src/catalogue.md b/docs/src/catalogue.md
@@ -36,8 +36,8 @@ function generate_scheme_svg(schemename;
     <div class="schemename"><h2>$(schemename)
 
         <span class="hovertext" data-hover=
-        "name: $(schemename), 
-        length: $(length(colorschemes[schemename])), 
+        "name: $(schemename),
+        length: $(length(colorschemes[schemename])),
         category: $(colorschemes[schemename].category), notes: $(colorschemes[schemename].notes).">※</span>
 
     </h2>
@@ -236,8 +236,20 @@ using Luxor, ColorSchemes # hide
 ColorSchemeCategory("Ghibli") # hide
 ```
 
+# Catppuccin
+
+Catppuccin is a community-driven pastel theme that aims to be the middle
+ground between low and high contrast themes. It consists of 4 soothing
+warm flavors with 26 eye-candy colors each, perfect for coding, designing,
+and much more! See [Catppuccin main project](https://github.com/catppuccin)
+
+```@example catalog
+using Luxor, ColorSchemes # hide
+ColorSchemeCategory("Catppuccin") # hide
+```
+
 # + Feathers
-Palattes derived from the plumage of Australian birds. See [Shandiya's github 
+Palattes derived from the plumage of Australian birds. See [Shandiya's github
 repository](https://github.com/shandiya/feathers).
 
 ```@example catalog