vaev-layout: Refact builder reflecting block/inline outside-display behaviour and better inline handling.

Author: pauloamed

src/libs/karm-text/prose.cpp

@@ -46,8 +46,28 @@ void Prose::clear() {
     _cells.clear();
     _blocks.clear();
     _blocksMeasured = false;
-    _beginBlock();
     _lines.clear();
+
+    _beginBlock();
+}
+
+void Prose::copySpanStack(Prose const& prose) {
+    Vec<Box<Text::Prose::Span>> spans;
+    auto currSpan = prose._currentSpan;
+    while (currSpan) {
+        spans.pushBack(*currSpan);
+        currSpan = currSpan->parent;
+    }
+
+    reverse(mutSub(spans));
+    _spans = std::move(spans);
+
+    for (usize i = 0; i + 1 < _spans.len(); ++i) {
+        _spans[i + 1]->parent = &*_spans[i];
+    }
+
+    if (_spans.len())
+        _currentSpan = &*last(_spans);
 }
 
 void Prose::append(Slice<Rune> runes) {

src/libs/karm-text/prose.h

@@ -189,7 +189,9 @@ struct Prose : public Meta::Pinned {
 
     void pushSpan() {
         _spans.pushBack(makeBox<Span>(_currentSpan));
+        auto parentSpan = _currentSpan;
         _currentSpan = &*last(_spans);
+        _currentSpan->parent = parentSpan;
     }
 
     void spanColor(Gfx::Color color) {
@@ -204,6 +206,8 @@ struct Prose : public Meta::Pinned {
             _currentSpan = _currentSpan->parent;
     }
 
+    void copySpanStack(Prose const& prose);
+
     // MARK: Layout ------------------------------------------------------------
 
     void _measureBlocks();

src/web/vaev-layout/base.cpp

@@ -232,10 +232,51 @@ export struct BreakpointTraverser {
 export struct FormatingContext;
 export struct Box;
 
+export struct InlineBox {
+    /* NOTE:
+    This is a sketch implementation of the data model for InlineBox. We should be able to:
+        -   add different inline elements to it, from different types (Prose, Image, inline-block)
+        -   retrieve the added data to be displayed in the same Inline Formatting Context (break lines and display
+            into line boxes)
+        -   respect different styling for the same line (font, fontsize, color, etc)
+    */
+    Text::ProseStyle const _style;
+    Rc<Text::Prose> prose;
+
+    InlineBox(Text::ProseStyle style) : _style(style), prose(makeRc<Text::Prose>(_style)) {}
+
+    InlineBox(Rc<Text::Prose> prose) : _style(prose->_style), prose(prose) {}
+
+    void startInlineBox(Text::ProseStyle proseStyle) {
+        // FIXME: ugly workaround while we dont fix the Prose data structure
+        prose->pushSpan();
+        if (proseStyle.color)
+            prose->spanColor(proseStyle.color.unwrap());
+    }
+
+    void endInlineBox() {
+        prose->popSpan();
+    }
+
+    void add(Box&&) {}
+
+    bool active() {
+        return prose->_runes.len();
+    }
+
+    void clear() {
+        auto oldProse = prose;
+
+        prose = makeRc<Text::Prose>(_style);
+
+        prose->copySpanStack(*oldProse);
+    }
+};
+
 export using Content = Union<
     None,
     Vec<Box>,
-    Rc<Text::Prose>,
+    InlineBox,
     Karm::Image::Picture>;
 
 export struct Attrs {