Fix text-on-path rendering

Author: jsjgdh

editor/src/messages/portfolio/document/graph_operation/graph_operation_message_handler.rs

@@ -14,7 +14,7 @@ use graphene_std::Color;
 use graphene_std::renderer::Quad;
 use graphene_std::renderer::convert_usvg_path::{convert_tiny_skia_path, convert_usvg_path};
 use graphene_std::table::Table;
-use graphene_std::text::{Font, TextAnchor, TypesettingConfig};
+use graphene_std::text::{Font, TypesettingConfig};
 use graphene_std::vector::style::{Fill, Gradient, GradientStop, GradientStops, GradientType, PaintOrder, Stroke, StrokeAlign, StrokeCap, StrokeJoin};
 #[derive(ExtractField)]
 pub struct GraphOperationMessageContext<'a> {
@@ -394,7 +394,7 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageContext<'_>> for
 				center,
 			} => {
 				let mut options = usvg::Options::default();
-				options.fontdb_mut().load_font_data(include_bytes!("../../../../font.ttf").to_vec());
+				options.fontdb_mut().load_font_data(include_bytes!("../overlays/source-sans-pro-regular.ttf").to_vec());
 				options.font_family = "Source Sans Pro".to_string();
 
 				let svg = svg.replace("font-family=\"sans-serif\"", "font-family=\"Source Sans Pro\"");
@@ -552,7 +552,6 @@ fn import_usvg_node(
 	insert_index: usize,
 	graphite_gradient_stops: &HashMap<String, GradientStops>,
 ) {
-	log::error!("DIAGNOSTIC: Visiting node root: {:?}", node);
 	let layer = modify_inputs.create_layer(id);
 
 	modify_inputs.network_interface.move_layer_to_stack(layer, parent, insert_index, &[]);
@@ -597,7 +596,7 @@ fn import_usvg_node(
 			warn!("Skip image");
 		}
 		usvg::Node::Text(text) => {
-			import_usvg_text(modify_inputs, text, node.abs_transform(), layer);
+			import_usvg_text(modify_inputs, text, node.abs_transform(), layer, parent, insert_index);
 		}
 	}
 }
@@ -643,7 +642,7 @@ fn import_usvg_node_inner(
 			0
 		}
 		usvg::Node::Text(text) => {
-			import_usvg_text(modify_inputs, text, node.abs_transform(), layer);
+			import_usvg_text(modify_inputs, text, node.abs_transform(), layer, parent, insert_index);
 			0
 		}
 		usvg::Node::Path(path) => {
@@ -676,23 +675,31 @@ fn import_usvg_path(modify_inputs: &mut ModifyInputsContext, node: &usvg::Node,
 	}
 }
 
-fn import_usvg_text(modify_inputs: &mut ModifyInputsContext, text: &usvg::Text, transform: usvg::Transform, layer: LayerNodeIdentifier) {
+fn import_usvg_text(modify_inputs: &mut ModifyInputsContext, text: &usvg::Text, transform: usvg::Transform, layer: LayerNodeIdentifier, parent: LayerNodeIdentifier, insert_index: usize) {
 	use graphene_std::text::TextAnchor;
-	let font_family = text
-		.chunks()
-		.first()
-		.and_then(|chunk| chunk.spans().first())
-		.and_then(|span| span.font().families().first().map(|f| f.to_string()))
-		.unwrap_or_else(|| graphene_std::consts::DEFAULT_FONT_FAMILY.to_string());
-	let font_style = graphene_std::consts::DEFAULT_FONT_STYLE.to_string();
-	let font = Font::new(font_family, font_style);
 
-	let full_text: String = text.chunks().iter().map(|chunk| chunk.text()).collect();
+	for (i, chunk) in text.chunks().iter().enumerate() {
+		let current_layer = if i == 0 {
+			layer
+		} else {
+			let new_id = NodeId::new();
+			let new_layer = modify_inputs.create_layer(new_id);
+			modify_inputs.network_interface.move_layer_to_stack_for_import(new_layer, parent, insert_index, &[]);
+			new_layer
+		};
+		modify_inputs.layer_node = Some(current_layer);
 
-	// Check if any chunk uses text-on-path (TextFlow::Path)
-	let text_path_chunk = text.chunks().iter().find(|chunk| matches!(chunk.text_flow(), usvg::TextFlow::Path(_)));
+		let font_family = chunk
+			.spans()
+			.first()
+			.and_then(|span| span.font().families().first().map(|f| f.to_string()))
+			.unwrap_or_else(|| graphene_std::consts::DEFAULT_FONT_FAMILY.to_string());
+		let font_style = graphene_std::consts::DEFAULT_FONT_STYLE.to_string();
+		let font = Font::new(font_family, font_style);
+
+		let font_size = chunk.spans().first().map(|s| s.font_size().get()).unwrap_or(24.0) as f64;
+		let letter_spacing = chunk.spans().first().map(|s| s.letter_spacing()).unwrap_or(0.0) as f64;
 
-	if let Some(chunk) = text_path_chunk {
 		if let usvg::TextFlow::Path(text_path) = chunk.text_flow() {
 			let path_subpaths = convert_tiny_skia_path(text_path.path());
 			let start_offset = text_path.start_offset() as f64;
@@ -701,8 +708,6 @@ fn import_usvg_text(modify_inputs: &mut ModifyInputsContext, text: &usvg::Text,
 				usvg::TextAnchor::Middle => TextAnchor::Middle,
 				usvg::TextAnchor::End => TextAnchor::End,
 			};
-			let font_size = chunk.spans().first().map(|s| s.font_size().get()).unwrap_or(24.0) as f64;
-			let letter_spacing = chunk.spans().first().map(|s| s.letter_spacing()).unwrap_or(0.0) as f64;
 
 			let affine = DAffine2::from_cols_array(&[
 				transform.sx as f64,
@@ -712,15 +717,14 @@ fn import_usvg_text(modify_inputs: &mut ModifyInputsContext, text: &usvg::Text,
 				transform.tx as f64,
 				transform.ty as f64,
 			]);
-			modify_inputs.insert_text_on_path(full_text, font, font_size, letter_spacing, path_subpaths, start_offset, anchor, affine, layer);
+			modify_inputs.insert_text_on_path(chunk.text().to_string(), font, font_size, letter_spacing, path_subpaths, start_offset, anchor, affine, current_layer);
+			modify_inputs.fill_set(Fill::Solid(Color::BLACK));
+		} else {
+			// Regular text fallback
+			modify_inputs.insert_text(chunk.text().to_string(), font, TypesettingConfig { font_size, ..Default::default() }, current_layer);
 			modify_inputs.fill_set(Fill::Solid(Color::BLACK));
-			return;
 		}
 	}
-
-	// Fallback: regular text
-	modify_inputs.insert_text(full_text, font, TypesettingConfig::default(), layer);
-	modify_inputs.fill_set(Fill::Solid(Color::BLACK));
 }
 
 /// Set correct positions for all imported layers in a single top-down O(n) pass.

editor/src/messages/portfolio/document/graph_operation/utility_types.rs

@@ -4,7 +4,6 @@ use crate::messages::portfolio::document::utility_types::document_metadata::Laye
 use crate::messages::portfolio::document::utility_types::network_interface::{self, InputConnector, NodeNetworkInterface, OutputConnector};
 use crate::messages::prelude::*;
 use glam::{DAffine2, DVec2, IVec2};
-use graphene_std::transform::Transform as _;
 use graph_craft::document::value::TaggedValue;
 use graph_craft::document::{NodeId, NodeInput};
 use graph_craft::{ProtoNodeIdentifier, concrete};
@@ -15,6 +14,7 @@ use graphene_std::raster_types::{CPU, Raster};
 use graphene_std::subpath::Subpath;
 use graphene_std::table::Table;
 use graphene_std::text::{Font, TextAnchor, TypesettingConfig};
+use graphene_std::transform::Transform as _;
 use graphene_std::vector::Vector;
 use graphene_std::vector::style::{Fill, Stroke};
 use graphene_std::vector::{PointId, VectorModificationType};
@@ -290,8 +290,18 @@ impl<'a> ModifyInputsContext<'a> {
 		self.network_interface.move_node_to_chain_start(&fill_id, layer, &[], self.import);
 	}
 
-
-	pub fn insert_text_on_path(&mut self, text: String, font: Font, font_size: f64, character_spacing: f64, path_subpaths: Vec<Subpath<PointId>>, start_offset: f64, text_anchor: TextAnchor, transform: DAffine2, layer: LayerNodeIdentifier) {
+	pub fn insert_text_on_path(
+		&mut self,
+		text: String,
+		font: Font,
+		font_size: f64,
+		character_spacing: f64,
+		path_subpaths: Vec<Subpath<PointId>>,
+		start_offset: f64,
+		text_anchor: TextAnchor,
+		transform: DAffine2,
+		layer: LayerNodeIdentifier,
+	) {
 		use graphene_std::text::TextPathSide;
 
 		// Create the path vector object

node-graph/nodes/gstd/src/text.rs

@@ -1,8 +1,8 @@
 use core_types::{Ctx, table::Table};
 use graph_craft::wasm_application_io::WasmEditorApi;
 use graphic_types::Vector;
-pub use text_nodes::*;
 pub use text_nodes::text_on_path::{TextAnchor, TextPathSide};
+pub use text_nodes::*;
 
 /// Draws a text string as vector geometry with a choice of font and styling.
 #[node_macro::node(category("Text"))]
@@ -80,8 +80,7 @@ fn text<'i: 'n>(
 #[node_macro::node(category("Text"))]
 fn text_on_path<'i: 'n>(
 	_: impl Ctx,
-	#[scope("editor-api")]
-	editor_resources: &'i WasmEditorApi,
+	#[scope("editor-api")] editor_resources: &'i WasmEditorApi,
 	/// The text content to flow along the path.
 	#[default("Lorem ipsum")]
 	text: String,

node-graph/nodes/text/src/font_cache.rs

@@ -1,8 +1,9 @@
 use dyn_any::DynAny;
 use parley::fontique::Blob;
+use serde::Deserialize;
 use std::collections::HashMap;
+use std::hash::Hash;
 use std::sync::Arc;
-use serde::Deserialize;
 
 /// A font type (storing font family and font style and an optional preview URL)
 #[cfg_attr(feature = "wasm", derive(tsify::Tsify))]
@@ -37,6 +38,21 @@ impl Font {
 			font_style_to_restore: None,
 		}
 	}
+
+	pub fn named_weight(weight: u32) -> &'static str {
+		match weight {
+			100 => "Thin",
+			200 => "Extra Light",
+			300 => "Light",
+			400 => "Regular",
+			500 => "Medium",
+			600 => "Semi Bold",
+			700 => "Bold",
+			800 => "Extra Bold",
+			900 => "Black",
+			_ => "Weight",
+		}
+	}
 }
 
 impl Default for Font {
@@ -50,21 +66,32 @@ impl Default for Font {
 }
 
 /// A cache of fonts
-#[derive(Debug, Default, Clone, DynAny)]
+#[derive(Debug, Default, Clone, PartialEq, serde::Serialize, serde::Deserialize, DynAny)]
 pub struct FontCache {
 	/// Mapping of font family name to font style name to font data
 	pub font_file_data: HashMap<Font, Arc<Vec<u8>>>,
 }
 
+impl Hash for FontCache {
+	fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+		self.font_file_data.len().hash(state);
+	}
+}
+
 impl FontCache {
 	/// Get the font data for a font
 	pub fn get_data(&self, font: &Font) -> Option<Arc<Vec<u8>>> {
 		self.font_file_data.get(font).cloned()
 	}
 
 	/// Insert font data for a font
-	pub fn insert(&mut self, font: Font, data: Arc<Vec<u8>>) {
-		self.font_file_data.insert(font, data);
+	pub fn insert(&mut self, font: Font, data: impl Into<Arc<Vec<u8>>>) {
+		self.font_file_data.insert(font, data.into());
+	}
+
+	/// Check if the font data for a font is cached
+	pub fn loaded_font(&self, font: &Font) -> bool {
+		self.font_file_data.contains_key(font)
 	}
 
 	/// Check if the font data for a font is cached
@@ -92,15 +119,15 @@ impl FontCache {
 		if self.font_file_data.contains_key(font) {
 			Some(font)
 		} else {
-			let fallback = self.font_file_data
+			let fallback = self
+				.font_file_data
 				.keys()
 				.find(|font| font.font_family == core_types::consts::DEFAULT_FONT_FAMILY && font.font_style == core_types::consts::DEFAULT_FONT_STYLE)
-				.or_else(|| self.font_file_data.keys().next());			
+				.or_else(|| self.font_file_data.keys().next());
 			fallback
 		}
 	}
 
-
 	/// Try to get the bytes for a font
 	pub fn get<'a>(&'a self, font: &'a Font) -> Option<(&'a Vec<u8>, &'a Font)> {
 		let resolved = self.resolve_font(font)?;

node-graph/nodes/text/src/lib.rs

@@ -1,8 +1,8 @@
 mod font_cache;
 mod path_builder;
 mod text_context;
-mod to_path;
 pub mod text_on_path;
+mod to_path;
 
 use dyn_any::DynAny;
 pub use font_cache::*;