From 73615f7e3ce23f2ea656d04ea9f96184f5ebdc0a Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Wed, 24 Mar 2021 17:12:34 +0100
Subject: =?UTF-8?q?Text=20shaping=20=F0=9F=9A=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Shapes text with rustybuzz
- Font fallback with family list
- Tofus are shown in the first font

Co-Authored-By: Martin <mhaug@live.de>
---
 src/exec/context.rs | 56 ++++++++++++++++-------------------------------------
 1 file changed, 17 insertions(+), 39 deletions(-)

(limited to 'src/exec/context.rs')

diff --git a/src/exec/context.rs b/src/exec/context.rs
index 6ba5b25f..b6a67a2e 100644
--- a/src/exec/context.rs
+++ b/src/exec/context.rs
@@ -1,7 +1,4 @@
 use std::mem;
-use std::rc::Rc;
-
-use fontdock::FontStyle;
 
 use super::{Exec, FontFamily, State};
 use crate::diag::{Diag, DiagSet, Pass};
@@ -87,7 +84,7 @@ impl<'a> ExecContext<'a> {
 
     /// Push a word space into the active paragraph.
     pub fn push_space(&mut self) {
-        let em = self.state.font.font_size();
+        let em = self.state.font.resolve_size();
         self.push(SpacingNode {
             amount: self.state.par.word_spacing.resolve(em),
             softness: 1,
@@ -103,19 +100,19 @@ impl<'a> ExecContext<'a> {
 
         while let Some(c) = scanner.eat_merging_crlf() {
             if is_newline(c) {
-                self.push(self.make_text_node(mem::take(&mut line)));
+                self.push(TextNode::new(mem::take(&mut line), &self.state));
                 self.push_linebreak();
             } else {
                 line.push(c);
             }
         }
 
-        self.push(self.make_text_node(line));
+        self.push(TextNode::new(line, &self.state));
     }
 
     /// Apply a forced line break.
     pub fn push_linebreak(&mut self) {
-        let em = self.state.font.font_size();
+        let em = self.state.font.resolve_size();
         self.push_into_stack(SpacingNode {
             amount: self.state.par.leading.resolve(em),
             softness: 2,
@@ -124,7 +121,7 @@ impl<'a> ExecContext<'a> {
 
     /// Apply a forced paragraph break.
     pub fn push_parbreak(&mut self) {
-        let em = self.state.font.font_size();
+        let em = self.state.font.resolve_size();
         self.push_into_stack(SpacingNode {
             amount: self.state.par.spacing.resolve(em),
             softness: 1,
@@ -154,36 +151,6 @@ impl<'a> ExecContext<'a> {
         result
     }
 
-    /// Construct a text node from the given string based on the active text
-    /// state.
-    pub fn make_text_node(&self, text: String) -> TextNode {
-        let mut variant = self.state.font.variant;
-
-        if self.state.font.strong {
-            variant.weight = variant.weight.thicken(300);
-        }
-
-        if self.state.font.emph {
-            variant.style = match variant.style {
-                FontStyle::Normal => FontStyle::Italic,
-                FontStyle::Italic => FontStyle::Normal,
-                FontStyle::Oblique => FontStyle::Normal,
-            }
-        }
-
-        TextNode {
-            text,
-            dir: self.state.dirs.cross,
-            aligns: self.state.aligns,
-            families: Rc::clone(&self.state.font.families),
-            variant,
-            font_size: self.state.font.font_size(),
-            top_edge: self.state.font.top_edge,
-            bottom_edge: self.state.font.bottom_edge,
-            color: self.state.font.color,
-        }
-    }
-
     /// Finish the active paragraph.
     fn finish_par(&mut self) {
         let mut par = mem::replace(&mut self.par, ParNode::new(&self.state));
@@ -292,7 +259,7 @@ impl StackNode {
 
 impl ParNode {
     fn new(state: &State) -> Self {
-        let em = state.font.font_size();
+        let em = state.font.resolve_size();
         Self {
             dirs: state.dirs,
             aligns: state.aligns,
@@ -301,3 +268,14 @@ impl ParNode {
         }
     }
 }
+
+impl TextNode {
+    fn new(text: String, state: &State) -> Self {
+        Self {
+            text,
+            dir: state.dirs.cross,
+            aligns: state.aligns,
+            props: state.font.resolve_props(),
+        }
+    }
+}
-- 
cgit v1.2.3