rename theme_colors_*, theme_brand_*

Author: gordonwoodhull

quarto/__init__.py

@@ -6,11 +6,11 @@
 from quarto.quarto import path
 from quarto.render import render
 from quarto.metadata import metadata
-from quarto.theme import altair_theme_colors, altair_theme_brand, \
-    bokeh_theme_colors, bokeh_theme_brand, \
-    great_tables_theme_colors, great_tables_theme_brand, \
-    matplotlib_theme_colors, matplotlib_theme_brand, \
-    plotnine_theme_colors, plotnine_theme_brand, \
-    plotly_theme_colors, plotly_theme_brand, \
-    pygal_theme_colors, pygal_theme_brand, \
-    seaborn_theme_colors, seaborn_theme_brand
+from quarto.theme import theme_colors_altair, theme_brand_altair, \
+    theme_colors_bokeh, theme_brand_bokeh, \
+    theme_colors_great_tables, theme_brand_great_tables, \
+    theme_colors_matplotlib, theme_brand_matplotlib, \
+    theme_colors_plotnine, theme_brand_plotnine, \
+    theme_colors_plotly, theme_brand_plotly, \
+    theme_colors_pygal, theme_brand_pygal, \
+    theme_colors_seaborn, theme_brand_seaborn

quarto/theme.py

@@ -1,7 +1,7 @@
 import yaml
 from functools import partial
 
-def altair_theme_colors(bg, fg):
+def theme_colors_altair(bg, fg):
   return {
     'config': {
       'view': {'stroke': 'transparent'},
@@ -18,14 +18,14 @@ def altair_theme_colors(bg, fg):
     }
   }
 
-def altair_theme_brand(brand_yml):
+def theme_brand_altair(brand_yml):
     brand = yaml.safe_load(open(brand_yml).read())
     bg = brand["color"]["background"]
     fg = brand["color"]["foreground"]
-    return partial(altair_theme_colors, bg, fg)
+    return partial(theme_colors_altair, bg, fg)
 
 # background fill is incomplete
-def bokeh_theme_colors(bg, fg):
+def theme_colors_bokeh(bg, fg):
   from bokeh.io import curdoc
   from bokeh.themes import Theme
   curdoc().theme = Theme(json={'attrs': {
@@ -43,26 +43,26 @@ def bokeh_theme_colors(bg, fg):
     },
   }})
 
-def bokeh_theme_brand(brand_yml):
+def theme_brand_bokeh(brand_yml):
   brand = yaml.safe_load(open(brand_yml).read())
   fg = brand["color"]["foreground"]
   bg = brand["color"]["background"]
-  return partial(bokeh_theme_colors, bg, fg)
+  return partial(theme_colors_bokeh, bg, fg)
 
 
-def great_tables_theme_colors(bg, fg):
+def theme_colors_great_tables(bg, fg):
   return {
     'table_background_color': bg,
     'table_font_color': fg
   }
-def great_tables_theme_brand(brand_yml):
+def theme_brand_great_tables(brand_yml):
   brand = yaml.safe_load(open(brand_yml).read())
   fg = brand["color"]["foreground"]
   bg = brand["color"]["background"]
-  return great_tables_theme_colors(bg, fg)
+  return theme_colors_great_tables(bg, fg)
 
 
-def matplotlib_theme_colors(bg, fg, primary):
+def theme_colors_matplotlib(bg, fg, primary):
   import matplotlib as mpl
   from cycler import cycler
   mpl.rcParams["axes.facecolor"] = bg
@@ -78,42 +78,42 @@ def matplotlib_theme_colors(bg, fg, primary):
     mpl.rcParams["axes.prop_cycle"] = cycler('color', [primary])
 
 
-def matplotlib_theme_brand(brand_yml):
+def theme_brand_matplotlib(brand_yml):
   brand = yaml.safe_load(open(brand_yml).read())
   return partial(
-    matplotlib_theme_colors,
+    theme_colors_matplotlib,
     brand["color"]["background"],
     brand["color"]["foreground"],
     brand["color"]["primary"],
   )
 
 
-def plotnine_theme_colors(bg, fg):
+def theme_colors_plotnine(bg, fg):
   from plotnine import theme, element_rect, element_text
   return theme(
     plot_background=element_rect(fill=bg, size=0),
     text=element_text(color=fg)
   )
 
-def plotnine_theme_brand(brand_yml):
+def theme_brand_plotnine(brand_yml):
   brand = yaml.safe_load(open(brand_yml).read())
-  return plotnine_theme_colors(brand["color"]["background"], brand["color"]["foreground"])
+  return theme_colors_plotnine(brand["color"]["background"], brand["color"]["foreground"])
 
 
-def plotly_theme_colors(bg, fg):
+def theme_colors_plotly(bg, fg):
   import plotly.graph_objects as go
   return go.layout.Template({'layout': {
     'paper_bgcolor': bg,
     'plot_bgcolor': bg,
     'font_color': fg,
   }})
 
-def plotly_theme_brand(brand_yml):
+def theme_brand_plotly(brand_yml):
   brand = yaml.safe_load(open(brand_yml).read())
-  return plotly_theme_colors(brand["color"]["background"], brand["color"]["foreground"])
+  return theme_colors_plotly(brand["color"]["background"], brand["color"]["foreground"])
 
 
-def pygal_theme_colors(_bg, fg, primary, secondary):
+def theme_colors_pygal(_bg, fg, primary, secondary):
   from pygal.style import Style
   return Style(
     background='transparent',
@@ -126,17 +126,17 @@ def pygal_theme_colors(_bg, fg, primary, secondary):
     transition='400ms ease-in',
     colors=('#E853A0', '#E8537A', '#E95355', '#E87653', '#E89B53'))
 
-def pygal_theme_brand(brand_yml):
+def theme_brand_pygal(brand_yml):
   brand = yaml.safe_load(open(brand_yml).read())
-  return pygal_theme_colors(
+  return theme_colors_pygal(
     brand["color"]["background"],
     brand["color"]["foreground"],
     brand["color"]["primary"],
     brand["color"].get("secondary"),
   )
 
 
-def seaborn_theme_colors(bg, fg):
+def theme_colors_seaborn(bg, fg):
   # seaborn accepts matplotlib rcparams
   return {
       "axes.facecolor": bg,
@@ -151,6 +151,6 @@ def seaborn_theme_colors(bg, fg):
       "grid.color": fg,
   }
 
-def seaborn_theme_brand(brand_yml):
+def theme_brand_seaborn(brand_yml):
     brand = yaml.safe_load(open(brand_yml).read())
-    return seaborn_theme_colors(brand["color"]["background"], brand["color"]["foreground"])
+    return theme_colors_seaborn(brand["color"]["background"], brand["color"]["foreground"])