Add theme keys for 'pen', 'brush', 'paper'. Add ColorTheme to access …

…these values.

plot-base/src/commonMain/kotlin/org/jetbrains/letsPlot/core/plot/base/theme/ColorTheme.kt

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2023. JetBrains s.r.o.
+ * Use of this source code is governed by the MIT license that can be found in the LICENSE file.
+ */
+
+package org.jetbrains.letsPlot.core.plot.base.theme
+
+import org.jetbrains.letsPlot.commons.values.Color
+
+interface ColorTheme {
+ fun pen(): Color
+ fun brush(): Color
+ fun paper(): Color
+}

plot-base/src/commonMain/kotlin/org/jetbrains/letsPlot/core/plot/base/theme/Theme.kt

@@ -24,4 +24,6 @@ interface Theme {
  fun tooltips(): TooltipsTheme
 
  fun geometries(geomKind: GeomKind): GeomTheme
+
+ fun colors(): ColorTheme
 }

plot-builder/src/commonMain/kotlin/org/jetbrains/letsPlot/core/plot/builder/defaultTheme/DefaultColorTheme.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2023. JetBrains s.r.o.
+ * Use of this source code is governed by the MIT license that can be found in the LICENSE file.
+ */
+
+package org.jetbrains.letsPlot.core.plot.builder.defaultTheme
+
+import org.jetbrains.letsPlot.core.plot.base.theme.ColorTheme
+import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values.ThemeOption.GEOM
+import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values.ThemeOption.Geom.BRUSH
+import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values.ThemeOption.Geom.PAPER
+import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values.ThemeOption.Geom.PEN
+import org.jetbrains.letsPlot.core.plot.builder.presentation.FontFamilyRegistry
+
+internal class DefaultColorTheme(
+ options: Map<String, Any>,
+ fontFamilyRegistry: FontFamilyRegistry
+) : ThemeValuesAccess(options, fontFamilyRegistry), ColorTheme {
+
+ private val geomElem = getElemValue(listOf(GEOM))
+
+ override fun pen() = getColor(geomElem, PEN)
+
+ override fun brush() = getColor(geomElem, BRUSH)
+
+ override fun paper() = getColor(geomElem, PAPER)
+}

plot-builder/src/commonMain/kotlin/org/jetbrains/letsPlot/core/plot/builder/defaultTheme/DefaultTheme.kt

@@ -28,8 +28,8 @@ class DefaultTheme(
  private val facets = DefaultFacetsTheme(options, fontFamilyRegistry)
  private val plot = DefaultPlotTheme(options, fontFamilyRegistry)
  private val tooltips = DefaultTooltipsTheme(options, fontFamilyRegistry)
-
  private val geometries: MutableMap<GeomKind, GeomTheme> = HashMap()
+ private val colors = DefaultColorTheme(options, fontFamilyRegistry)
 
  override fun horizontalAxis(flipAxis: Boolean): AxisTheme = if (flipAxis) axisY else axisX
 
@@ -50,6 +50,8 @@ class DefaultTheme(
  DefaultGeomTheme.forGeomKind(geomKind, themeSettings)
  }
 
+ override fun colors(): ColorTheme = colors
+
  companion object {
  // For demo and tests
  fun minimal2() =

plot-builder/src/commonMain/kotlin/org/jetbrains/letsPlot/core/plot/builder/defaultTheme/values/ThemeOption.kt

@@ -83,6 +83,8 @@ object ThemeOption {
  const val TOOLTIP_TEXT = "tooltip_text"
  const val TOOLTIP_TITLE_TEXT = "tooltip_title_text"
 
+ const val GEOM = "geom"
+
  // view element
  val ELEMENT_BLANK = mapOf(Elem.BLANK to true)
  const val ELEMENT_BLANK_SHORTHAND = "blank"
@@ -135,6 +137,13 @@ object ThemeOption {
  const val HIGH_CONTRAST_DARK = "high_contrast_dark"
  }
 
+ object Geom {
+ // Named colors
+ const val PEN = "pen"
+ const val PAPER = "paper"
+ const val BRUSH = "brush"
+ }
+
  internal object ForTest {
  val themeNames = listOf(
  Name.R_GREY,

plot-builder/src/commonMain/kotlin/org/jetbrains/letsPlot/core/plot/builder/defaultTheme/values/ThemeValuesBase.kt

@@ -137,6 +137,13 @@ open class ThemeValuesBase : ThemeValues(VALUES) {
 
  TOOLTIP_TITLE_TEXT to mapOf(
  Elem.FONT_FACE to FontFace.BOLD,
+ ),
+
+ // Named colors
+ GEOM to mapOf(
+ Geom.PEN to DARK_GREY,
+ Geom.PAPER to Color.WHITE,
+ Geom.BRUSH to Color.PACIFIC_BLUE
  )
  )
  }