1 files changed, 37 insertions, 4 deletions
diff --git a/src/layout/box.nim b/src/layout/box.nim
index 711e5aff..556ad88d 100644
--- a/src/layout/box.nim
+++ b/src/layout/box.nim
@@ -6,12 +6,12 @@ import io/term
 
 type
   BoxType* = enum
-    INLINE, BLOCK, INLINE_BLOCK
+    BOX_INLINE, BOX_BLOCK, BOX_INLINE_BLOCK
 
-  CSSRect* = object
+  Rectangle* = object
     x1*: int
-    y1*: int
     x2*: int
+    y1*: int
     y2*: int
 
   CSSBox* = ref object of RootObj
@@ -25,6 +25,18 @@ type
     cssvalues*: CSSSpecifiedValues
     node*: Node
 
+  CSSInlineAtom* = ref object of CSSBox
+    dimensions*: Rectangle
+
+  CSSInlineRowPart* = ref object of CSSInlineAtom
+    str*: string
+    rwidth*: int
+
+  CSSInlineRow* = ref object
+    content*: seq[CSSInlineAtom]
+    rely*: int
+    width*: int
+
   InlineContext* = ref object
     fromx*: int
     fromy*: int
@@ -34,16 +46,31 @@ type
     rows*: seq[CSSRowBox]
     thisrow*: seq[CSSRowBox]
 
+    dimensions*: Rectangle
+    content*: seq[CSSInlineRow]
+    rcontent*: CSSInlineRow
+    color*: CSSColor
+    fontstyle*: CSSFontStyle
+    fontweight*: int
+    textdecoration*: CSSTextDecoration
+    nodes*: seq[Node]
+
+    maxwidth*: int
+
   BlockContext* = ref object
     fromy*: int
+    dimensions*: Rectangle
     margin_done*: int
     margin_todo*: int
     width*: int
     height*: Option[int]
+    content*: seq[CSSBox]
 
   LayoutState* = object
     nodes*: seq[Node]
     term*: TermAttributes
+    fromy*: int
+    fromx*: int
 
   CSSRowBox* = object
     x*: int
@@ -60,4 +87,10 @@ type
 
   CSSInlineBox* = ref object of CSSBox
   CSSBlockBox* = ref object of CSSBox
-  CSSInlineBlockBox* = ref object of CSSBox
+  CSSInlineBlockBox* = ref object of CSSBlockBox
+
+func width*(rectangle: Rectangle): int =
+  return rectangle.x2 - rectangle.x1
+
+func height*(rectangle: Rectangle): int =
+  return rectangle.y2 - rectangle.y1