posit-dev
diff --git a/‎CLAUDE.md‎
Lines changed: 2 additions & 2 deletions b/‎CLAUDE.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎doc/ggsql.xml‎
Lines changed: 3 additions & 2 deletions b/‎doc/ggsql.xml‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎doc/syntax/index.qmd‎
Lines changed: 1 addition & 0 deletions b/‎doc/syntax/index.qmd‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎doc/syntax/layer/type/text.qmd‎
Lines changed: 139 additions & 0 deletions b/‎doc/syntax/layer/type/text.qmd‎
Lines changed: 139 additions & 0 deletions
diff --git a/‎ggsql-vscode/syntaxes/ggsql.tmLanguage.json‎
Lines changed: 1 addition & 1 deletion b/‎ggsql-vscode/syntaxes/ggsql.tmLanguage.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/execute/mod.rs‎
Lines changed: 7 additions & 3 deletions b/‎src/execute/mod.rs‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎src/format.rs‎
Lines changed: 92 additions & 16 deletions b/‎src/format.rs‎
Lines changed: 92 additions & 16 deletions
diff --git a/‎src/parser/builder.rs‎
Lines changed: 0 additions & 1 deletion b/‎src/parser/builder.rs‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/plot/aesthetic.rs‎
Lines changed: 5 additions & 3 deletions b/‎src/plot/aesthetic.rs‎
Lines changed: 5 additions & 3 deletions
@@ -334,7 +334,7 @@ pub enum Geom {
     // Statistical geoms
     Histogram, Density, Smooth, Boxplot, Violin,
     // Annotation geoms
-    Text, Label, Segment, Arrow, Rule, Linear, ErrorBar,
+    Text, Segment, Arrow, Rule, Linear, ErrorBar,
 }
 
 pub enum AestheticValue {
@@ -1211,7 +1211,7 @@ Maps data values (columns or literals) to visual aesthetics. Syntax: `value AS a
 - **Position**: `x`, `y`, `xmin`, `xmax`, `ymin`, `ymax`
 - **Color**: `color`, `fill`, `stroke`, `opacity`
 - **Size/Shape**: `size`, `shape`, `linetype`, `linewidth`
-- **Text**: `label`, `family`, `fontface`
+- **Text**: `label`, `typeface`, `fontweight`, `italic`
 
 **Literal vs Column**:
 
 
@@ -168,8 +168,9 @@
       <item>linewidth</item>
       <item>width</item>
       <item>height</item>
-      <item>family</item>
-      <item>fontface</item>
+      <item>typeface</item>
+      <item>fontweight</item>
+      <item>italic</item>
       <item>hjust</item>
       <item>vjust</item>
     </list>
 
@@ -25,6 +25,7 @@ There are many different layers to choose from when visualising your data. Some
 - [`area`](layer/type/area.qmd) is used to display series as an area chart.
 - [`ribbon`](layer/type/ribbon.qmd) is used to display series extrema.
 - [`polygon`](layer/type/polygon.qmd) is used to display arbitrary shapes as polygons.
+- [`text`](layer/text.qmd) is used to render datapoints as text.
 - [`bar`](layer/type/bar.qmd) creates a bar chart, optionally calculating y from the number of records in each bar.
 - [`density`](layer/type/density.qmd) creates univariate kernel density estimates, showing the distribution of a variable.
 - [`violin`](layer/type/violin.qmd) displays a rotated kernel density estimate.
 
@@ -0,0 +1,139 @@
+---
+title: "Text"
+---
+
+> Layers are declared with the [`DRAW` clause](../clause/draw.qmd). Read the documentation for this clause for a thorough description of how to use it.
+
+The text layer displays rows in the data as text. It can be used as a visualisation itself, or used to annotate a different layer.
+
+## Aesthetics
+The following aesthetics are recognised by the text layer.
+
+### Required
+* Primary axis (e.g. `x`): Position along the primary axis.
+* Secondary axis (e.g. `y`): Position along the secondary axis.
+* `label` The text to dislay.
+
+### Optional
+* `stroke` The colour at the contour lines of glyphs. Typically kept blank.
+* `fill` The colour of the glyphs.
+* `colour` Shorthand for setting `stroke` and `fill` simultaneously.
+* `opacity` The opacity of the fill colour.
+* `typeface` The typeface to style the lettering.
+* `fontsize` The size of the text in points.
+* `fontweight` Font weight. Interpretation is writer dependent. Vega-Lite converts everything to 'normal' or 'bold'. Can be one of the following:
+    * CSS keywords: `'thin'`, `'hairline'`, `'extra-light'`, `'ultra-light'`, `'light'`, `'normal'` (default), `'regular'`, `'lighter'`, `'medium'`, `'semi-bold'`, `'demi-bold'`, `'bold'`, `'bolder'`, `'extra-bold'`, `'ultra-bold'`, `'black'`, `'heavy'`
+    * Numeric values between 0-1000.
+* `italic` Whether text should be italicised. Boolean value (`true` or `false`).
+* `hjust` Horizontal justification. Can be a numeric value between 0-1 or one of `"left"`, `"right"` or `"centre"` (default). Interpretation of numeric values is writer-dependent.
+* `vjust` Vertical justification. Can be a numeric value between 0-1 or one of `"top"`, `"bottom"` or `"middle"` (default). Interpretation of numeric values is writer-dependent.
+* `rotation` Rotation of the text in degrees.
+
+## Settings
+* `offset` Position offset expressed in absolute points. Can be one of the following:
+    * a single number that applies both horizontally and vertically
+    * an numeric array `[h, v]` where the first number is the horizontal offset and the second number is the vertical offset.
+* `format` Formatting specifier, see explanation below.
+* `position`: Determines the position adjustment to use for the layer (default is `'identity'`)
+
+### Format
+The `format` setting can take a string that will be used in formatting the `label` aesthetic. 
+The basic syntax for this is that the `label` value will be inserted into any place where `{}` appears.
+This means that e.g. `SETTING format => '{} species'` will result in the label "adelie species" for a row where the `label` value is "adelie".
+Besides simply inserting the value as-is, it is also possible to apply a formatter to `label` before insertion by naming a formatter inside the curly braces prefixed with `:`.
+Known formatters are:
+
+* `{:Title}` will title-case the value (make the first letter in each work upper case) before insertion, e.g. `SETTING format => '{:Title} species'` will become "Adelie species" for the "adelie" label.
+* `{:UPPER}` will make the value upper-case, e.g. `SETTING format => '{:UPPER} species'` will become "ADELIE species" for the "adelie" label.
+* `{:lower}` works much like `{:UPPER}` but changes the value to lower-case instead.
+* `{:time ...}` will format a date/datetime/time value according to the format defined afterwards. The formatting follows strftime format using the Rust chrono library. You can see an overview of the supported syntax at the [chrono docs](https://docs.rs/chrono/latest/chrono/format/strftime/index.html). The basic usage is `SETTING format => '{:time %B %Y}` which would format a value at 2025-07-04 as "July 2025".
+* `{:num ...}` will format a numeric value according to the format defined afterwards. The format follows the printf format using the Rust sprintf library. The syntax is `%[flags][width][.precision]type` with the following meaning:
+  - `flags`: One or more modifiers:
+    * `-`: left-justify
+    * `+`: Force sign for positive numbers
+    * ` `: (space) Space before positive numbers
+    * `0`: Zero-pad
+    * `#`: Alternate form (`0x` prefix for hex, etc)
+  - `width`: The minimum width of characters to render. Depending on the `flags` the string will be padded to be at least this width
+  - `precision`: The maximum precision of the number. For `%g`/`%G` it is the total number of digits whereas for the rest it is the number of digits to the right of the decimal point
+  - `type`: How to present the number. One of:
+    * `d`/`i`: Signed decimal integers
+    * `u`: Unsigned decimal integers
+    * `f`/`F`: Decimal floating point
+    * `e`/`E`: Scientific notation
+    * `g`/`G`: Shortest form of `e` and `f`
+    * `o`: Unsigned octal
+    * `x`/`X`: Unsigned hexadecimal
+
+## Data transformation
+The text layer does not transform its data but passed it through unchanged.
+
+## Orientation
+The text layer has no orientation. The axes are treated symmetrically.
+
+## Examples
+
+Standard drawing data points as labels.
+
+```{ggsql}
+VISUALISE bill_len AS x, bill_dep AS y FROM ggsql:penguins
+DRAW text MAPPING island AS label
+```
+
+You can use the `format` setting to tweak the display of the label.
+
+```{ggsql}
+VISUALISE bill_len AS x, bill_dep AS y FROM ggsql:penguins
+DRAW text 
+  MAPPING island AS label
+  SETTING format => '{:UPPER}'
+```
+
+Setting font properties. Colours are typically mapped to the fill.
+
+```{ggsql}                                                                                         
+VISUALISE bill_len AS x, bill_dep AS y FROM ggsql:penguins
+DRAW text 
+  MAPPING 
+    island AS label, 
+    species AS fill,
+    flipper_len AS fontsize
+  SETTING
+    opacity => 0.8,
+    fontweight => 'bold',
+    typeface => 'Times New Roman'
+  SCALE fontsize TO [6, 20]
+```
+
+The 'stroke' aesthetic is applied to the outline of the text.
+
+```{ggsql}
+SELECT 1 as x, 1 as y
+VISUALISE x, y, 'My Label' AS label
+DRAW text
+  SETTING fontsize => 30, stroke => 'red'
+```
+
+Labelling precomputed bars with the data value.
+
+```{ggsql}
+SELECT island, COUNT(*) AS n FROM ggsql:penguins GROUP BY island
+VISUALISE island AS x, n AS y
+  DRAW bar
+  DRAW text
+    MAPPING n AS label
+    SETTING vjust => 'top', offset => [0, -11], fill => 'white'
+```
+
+If you label bars at the extreme end, you may need to expand the scale to accommodate the labels.
+
+```{ggsql}
+SELECT island, COUNT(*) AS n FROM ggsql:penguins GROUP BY island
+VISUALISE island AS x, n AS y
+  DRAW bar
+  DRAW text
+    MAPPING n AS label
+    SETTING vjust => 'bottom', offset => [0, 11]
+  SCALE y FROM [0, 200]
+```
+
@@ -249,7 +249,7 @@
       "patterns": [
         {
           "name": "support.type.aesthetic.ggsql",
-          "match": "\\b(x|y|xmin|xmax|ymin|ymax|xend|yend|weight|color|colour|fill|stroke|opacity|size|shape|linetype|linewidth|width|height|label|family|fontface|hjust|vjust|panel|row|column)\\b"
+          "match": "\\b(x|y|xmin|xmax|ymin|ymax|xend|yend|weight|color|colour|fill|stroke|opacity|size|shape|linetype|linewidth|width|height|label|typeface|fontweight|italic|hjust|vjust|panel|row|column)\\b"
         }
       ]
     },
 
@@ -687,8 +687,12 @@ fn add_discrete_columns_to_partition_by(
             .map(|c| c.name.as_str())
             .collect();
 
-        // Get aesthetics consumed by stat transforms (if any)
+        // Build set of excluded aesthetics that should not trigger auto-grouping:
+        // - Stat-consumed aesthetics (transformed, not grouped)
+        // - 'label' aesthetic (text content to display, not grouping categories)
         let consumed_aesthetics = layer.geom.stat_consumed_aesthetics();
+        let mut excluded_aesthetics: HashSet<&str> = consumed_aesthetics.iter().copied().collect();
+        excluded_aesthetics.insert("label");
 
         for (aesthetic, value) in &layer.mappings.aesthetics {
             // Skip positional aesthetics - these should not trigger auto-grouping.
@@ -698,8 +702,8 @@ fn add_discrete_columns_to_partition_by(
                 continue;
             }
 
-            // Skip stat-consumed aesthetics (they're transformed, not grouped)
-            if consumed_aesthetics.contains(&aesthetic.as_str()) {
+            // Skip excluded aesthetics (stat-consumed or label)
+            if excluded_aesthetics.contains(aesthetic.as_str()) {
                 continue;
             }
 
 
@@ -179,29 +179,105 @@ pub fn apply_label_template(
         }
         let key = elem.to_key_string();
 
-        let break_val = key.clone();
         // Only apply template if no explicit mapping exists
-        result.entry(key).or_insert_with(|| {
-            let label = if placeholders.is_empty() {
-                // No placeholders - use template as literal string
-                template.to_string()
-            } else {
-                // Replace each placeholder with its transformed value
-                // Process in reverse order to preserve string indices
-                let mut label = template.to_string();
-                for parsed in placeholders.iter().rev() {
-                    let transformed = apply_transformation(&break_val, &parsed.placeholder);
-                    label = label.replace(&parsed.match_text, &transformed);
-                }
-                label
-            };
-            Some(label)
+        result.entry(key.clone()).or_insert_with(|| {
+            // Use shared format_value helper
+            Some(format_value(&key, template, &placeholders))
         });
     }
 
     result
 }
 
+/// Apply label formatting template to a DataFrame column.
+///
+/// Returns a new DataFrame with the specified column formatted according to the template.
+///
+/// # Arguments
+/// * `df` - DataFrame containing the column to format
+/// * `column_name` - Name of the column to format
+/// * `template` - Template string with placeholders (e.g., "{:Title}", "{:num %.2f}")
+///
+/// # Returns
+/// New DataFrame with formatted column
+///
+/// # Example
+/// ```ignore
+/// let formatted_df = format_dataframe_column(&df, "_aesthetic_label", "Region: {:Title}")?;
+/// ```
+pub fn format_dataframe_column(
+    df: &polars::prelude::DataFrame,
+    column_name: &str,
+    template: &str,
+) -> Result<polars::prelude::DataFrame, String> {
+    use polars::prelude::*;
+
+    // Get the column
+    let column = df
+        .column(column_name)
+        .map_err(|e| format!("Column '{}' not found: {}", column_name, e))?;
+
+    // Step 1: Convert entire column to strings
+    let string_values: Vec<Option<String>> = if let Ok(str_col) = column.str() {
+        // String column (includes temporal data auto-converted to ISO format)
+        str_col
+            .into_iter()
+            .map(|opt| opt.map(|s| s.to_string()))
+            .collect()
+    } else if let Ok(num_col) = column.cast(&DataType::Float64) {
+        // Numeric column - use shared format_number helper for clean integer formatting
+        use crate::plot::format_number;
+
+        let f64_col = num_col
+            .f64()
+            .map_err(|e| format!("Failed to cast column to f64: {}", e))?;
+
+        f64_col
+            .into_iter()
+            .map(|opt| opt.map(format_number))
+            .collect()
+    } else {
+        return Err(format!(
+            "Formatting doesn't support type {:?} in column '{}'. Try string or numeric types instead.",
+            column.dtype(),
+            column_name
+        ));
+    };
+
+    // Step 2: Apply formatting template to all string values
+    let placeholders = parse_placeholders(template);
+    let formatted_values: Vec<Option<String>> = string_values
+        .into_iter()
+        .map(|opt| opt.map(|s| format_value(&s, template, &placeholders)))
+        .collect();
+
+    let formatted_col = Series::new(column_name.into(), formatted_values);
+
+    // Replace column in DataFrame
+    let mut new_df = df.clone();
+    new_df
+        .replace(column_name, formatted_col)
+        .map_err(|e| format!("Failed to replace column: {}", e))?;
+
+    Ok(new_df)
+}
+
+/// Format a single value using template and parsed placeholders
+fn format_value(value: &str, template: &str, placeholders: &[ParsedPlaceholder]) -> String {
+    if placeholders.is_empty() {
+        // No placeholders - use template as literal string
+        template.to_string()
+    } else {
+        // Replace each placeholder with its transformed value
+        let mut result = template.to_string();
+        for parsed in placeholders.iter().rev() {
+            let transformed = apply_transformation(value, &parsed.placeholder);
+            result = result.replace(&parsed.match_text, &transformed);
+        }
+        result
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
@@ -611,7 +611,6 @@ fn parse_geom_type(text: &str) -> Result<Geom> {
         "boxplot" => Ok(Geom::boxplot()),
         "violin" => Ok(Geom::violin()),
         "text" => Ok(Geom::text()),
-        "label" => Ok(Geom::label()),
         "segment" => Ok(Geom::segment()),
         "arrow" => Ok(Geom::arrow()),
         "rule" => Ok(Geom::rule()),
 
@@ -58,7 +58,7 @@ pub const USER_FACET_AESTHETICS: &[&str] = &["panel", "row", "column"];
 /// - Color aesthetics: color, colour, fill, stroke, opacity
 /// - Size/shape aesthetics: size, shape, linetype, linewidth
 /// - Dimension aesthetics: width, height
-/// - Text aesthetics: label, family, fontface, hjust, vjust
+/// - Text aesthetics: label, typeface, fontweight, italic, hjust, vjust
 pub const NON_POSITIONAL: &[&str] = &[
     "color",
     "colour",
@@ -72,8 +72,10 @@ pub const NON_POSITIONAL: &[&str] = &[
     "width",
     "height",
     "label",
-    "family",
-    "fontface",
+    "typeface",
+    "fontweight",
+    "italic",
+    "fontsize",
     "hjust",
     "vjust",
 ];
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@`
`249`	`249`	`"patterns": [`
`250`	`250`	`{`
`251`	`251`	`"name": "support.type.aesthetic.ggsql",`
`252`		`- "match": "\\b(x\|y\|xmin\|xmax\|ymin\|ymax\|xend\|yend\|weight\|color\|colour\|fill\|stroke\|opacity\|size\|shape\|linetype\|linewidth\|width\|height\|label\|family\|fontface\|hjust\|vjust\|panel\|row\|column)\\b"`
	`252`	`+ "match": "\\b(x\|y\|xmin\|xmax\|ymin\|ymax\|xend\|yend\|weight\|color\|colour\|fill\|stroke\|opacity\|size\|shape\|linetype\|linewidth\|width\|height\|label\|typeface\|fontweight\|italic\|hjust\|vjust\|panel\|row\|column)\\b"`
`253`	`253`	`}`
`254`	`254`	`]`
`255`	`255`	`},`