aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbptato <nincsnevem662@gmail.com>2025-02-14 17:58:37 +0100
committerbptato <nincsnevem662@gmail.com>2025-02-14 17:58:37 +0100
commit1ee2f67e1d7b2f8d164047a1250033de6aa7f3fb (patch)
treebb1fcba5a54e3393e4114e598d6388abf0b54af3 /src
parentdd1a49d2beab7445e903ab0acc29414d690f1977 (diff)
downloadchawan-1ee2f67e1d7b2f8d164047a1250033de6aa7f3fb.tar.gz
csstree, cssvalues: add non-numeric counters, japanese-formal
plus refactor a bit
Diffstat (limited to 'src')
-rw-r--r--src/css/box.nim2
-rw-r--r--src/css/csstree.nim85
-rw-r--r--src/css/cssvalues.nim184
-rw-r--r--src/css/layout.nim6
-rw-r--r--src/css/render.nim3
5 files changed, 157 insertions, 123 deletions
diff --git a/src/css/box.nim b/src/css/box.nim
index 56943f63..f177078e 100644
--- a/src/css/box.nim
+++ b/src/css/box.nim
@@ -101,7 +101,7 @@ type
bmp*: NetworkBitmap
InlineBlockBox* = ref object of InlineBox
- box*: BlockBox
+ # InlineBlockBox always has one block child.
func offset*(x, y: LUnit): Offset =
return [dtHorizontal: x, dtVertical: y]
diff --git a/src/css/csstree.nim b/src/css/csstree.nim
index 386ce6cc..4f0e640a 100644
--- a/src/css/csstree.nim
+++ b/src/css/csstree.nim
@@ -40,7 +40,7 @@ import utils/twtstr
type
StyledNodeType = enum
- stElement, stText, stMarker, stImage, stBr
+ stElement, stText, stImage, stBr, stCounter
# Abstraction over the DOM to pretend that elements, text, replaced
# and pseudo-elements are derived from the same type.
@@ -58,8 +58,10 @@ type
bmp: NetworkBitmap
of stBr: # <br> element
discard
- of stMarker: # ::marker (not that it's implemented...)
- discard
+ of stCounter: # counters
+ counterName: CAtom
+ counterStyle: CSSListStyleType
+ counterSuffix: bool
CSSCounter = object
element: Element
@@ -77,7 +79,6 @@ type
children: seq[StyledNode]
lastChildWasInline: bool
captionSeen: bool
- anonTableDisplay: CSSDisplay
anonComputed: CSSValues
anonInlineComputed: CSSValues
pctx: ptr TreeContext
@@ -101,8 +102,8 @@ when defined(debug):
return "#image"
of stBr:
return "#br"
- of stMarker:
- return "#marker"
+ of stCounter:
+ return "#counter"
iterator mritems(counters: var seq[CSSCounter]): var CSSCounter =
for i in countdown(counters.high, 0):
@@ -143,7 +144,7 @@ proc resetCounter(ctx: var TreeContext; name: CAtom; n: int32;
if not found:
ctx.counters.add(CSSCounter(name: name, n: n, element: element))
-proc counter(ctx: var TreeContext; name: CAtom): int =
+proc counter(ctx: var TreeContext; name: CAtom): int32 =
for counter in ctx.counters.mritems:
if counter.name == name:
return counter.n
@@ -198,10 +199,8 @@ proc initStyledAnon(element: Element; computed: CSSValues;
proc getInternalTableParent(frame: var TreeFrame; display: CSSDisplay):
var seq[StyledNode] =
- if frame.anonTableDisplay != display:
- if frame.anonComputed == nil:
- frame.anonComputed = frame.inheritFor(display)
- frame.anonTableDisplay = display
+ if frame.anonComputed == nil:
+ frame.anonComputed = frame.inheritFor(display)
frame.children.add(initStyledAnon(frame.parent, frame.anonComputed))
return frame.children[^1].anonChildren
@@ -252,15 +251,15 @@ proc getParent(frame: var TreeFrame; computed: CSSValues; display: CSSDisplay):
of DisplayTableRow:
if display != DisplayTableCell:
return frame.getInternalTableParent(DisplayTableCell)
- frame.anonTableDisplay = DisplayNone
+ frame.anonComputed = nil
of RowGroupBox:
if display != DisplayTableRow:
return frame.getInternalTableParent(DisplayTableRow)
- frame.anonTableDisplay = DisplayNone
+ frame.anonComputed = nil
of DisplayTableWrapper:
if display notin RowGroupBox + {DisplayTableRow}:
return frame.getInternalTableParent(DisplayTableRow)
- frame.anonTableDisplay = DisplayNone
+ frame.anonComputed = nil
of DisplayInnerTable:
if frame.children.len > 0 and display != DisplayTableCaption:
return frame.children[0].anonChildren
@@ -281,9 +280,12 @@ proc addListItem(frame: var TreeFrame; node: sink StyledNode) =
let computed = node.computed.inheritProperties()
computed{"white-space"} = WhitespacePre
let markerText = StyledNode(
- t: stMarker,
+ t: stCounter,
element: node.element,
- computed: computed
+ computed: computed,
+ counterName: satListItem.toAtom(),
+ counterStyle: node.computed{"list-style-type"},
+ counterSuffix: true
)
case node.computed{"list-style-position"}
of ListStylePositionOutside:
@@ -320,8 +322,7 @@ proc add(frame: var TreeFrame; node: sink StyledNode) =
else: discard
frame.getParent(node.computed, display).add(node)
frame.lastChildWasInline = display in DisplayOuterInline
- if display == DisplayTableCaption:
- frame.captionSeen = true
+ frame.captionSeen = frame.captionSeen or display == DisplayTableCaption
proc addAnon(frame: var TreeFrame; computed: CSSValues;
children: sink seq[StyledNode]) =
@@ -355,6 +356,15 @@ proc addText(frame: var TreeFrame; text: RefString) =
computed: frame.getAnonInlineComputed()
))
+proc addCounter(frame: var TreeFrame; name: CAtom; style: CSSListStyleType) =
+ frame.add(StyledNode(
+ t: stCounter,
+ element: frame.parent,
+ counterName: name,
+ counterStyle: style,
+ computed: frame.getAnonInlineComputed()
+ ))
+
proc addText(frame: var TreeFrame; s: sink string) =
#TODO should probably cache these...
frame.addText(newRefString(s))
@@ -453,7 +463,7 @@ proc addContent(frame: var TreeFrame; content: CSSContent) =
if frame.ctx.quoteLevel > 0:
dec frame.ctx.quoteLevel
of ContentCounter:
- frame.addText($frame.ctx.counter(content.counter))
+ frame.addCounter(content.counter, content.counterStyle)
proc buildChildren(frame: var TreeFrame; styledNode: StyledNode) =
for child in styledNode.anonChildren:
@@ -468,38 +478,38 @@ proc buildChildren(frame: var TreeFrame; styledNode: StyledNode) =
frame.addContent(content)
proc buildBox(ctx: var TreeContext; frame: TreeFrame; cached: CSSBox): CSSBox =
- var bbox: BlockBox = nil
let display = frame.computed{"display"}
let box = if display == DisplayInline:
InlineBox(computed: frame.computed, element: frame.parent)
else:
- assert display notin DisplayNoneLike
- bbox = BlockBox(computed: frame.computed, element: frame.parent)
- bbox
+ BlockBox(computed: frame.computed, element: frame.parent)
for child in frame.children:
box.children.add(ctx.build(nil, child))
if display in DisplayInlineBlockLike:
return InlineBlockBox(
computed: ctx.rootProperties,
element: frame.parent,
- box: bbox
+ children: @[box]
)
return box
+proc applyCounters(ctx: var TreeContext; styledNode: StyledNode) =
+ for counter in styledNode.computed{"counter-reset"}:
+ ctx.resetCounter(counter.name, counter.num, styledNode.element)
+ var liSeen = false
+ for counter in styledNode.computed{"counter-increment"}:
+ liSeen = counter.name == satListItem.toAtom()
+ ctx.incCounter(counter.name, counter.num, styledNode.element)
+ if not liSeen and styledNode.computed{"display"} == DisplayListItem:
+ ctx.incCounter(satListItem.toAtom(), 1, styledNode.element)
+ for counter in styledNode.computed{"counter-set"}:
+ ctx.setCounter(counter.name, counter.num, styledNode.element)
+
proc build(ctx: var TreeContext; cached: CSSBox; styledNode: StyledNode):
CSSBox =
case styledNode.t
of stElement:
- for counter in styledNode.computed{"counter-reset"}:
- ctx.resetCounter(counter.name, counter.num, styledNode.element)
- var liSeen = false
- for counter in styledNode.computed{"counter-increment"}:
- liSeen = counter.name == satListItem.toAtom()
- ctx.incCounter(counter.name, counter.num, styledNode.element)
- if not liSeen and styledNode.computed{"display"} == DisplayListItem:
- ctx.incCounter(satListItem.toAtom(), 1, styledNode.element)
- for counter in styledNode.computed{"counter-set"}:
- ctx.setCounter(counter.name, counter.num, styledNode.element)
+ ctx.applyCounters(styledNode)
let countersLen = ctx.counters.len
var frame = ctx.initTreeFrame(styledNode.element, styledNode.computed)
frame.buildChildren(styledNode)
@@ -517,12 +527,13 @@ proc build(ctx: var TreeContext; cached: CSSBox; styledNode: StyledNode):
computed: styledNode.computed,
element: styledNode.element
)
- of stMarker:
- let counter = ctx.counter(satListItem.toAtom())
+ of stCounter:
+ let counter = ctx.counter(styledNode.counterName)
+ let addSuffix = styledNode.counterSuffix # only used for markers
return InlineTextBox(
computed: styledNode.computed,
element: styledNode.element,
- text: styledNode.computed{"list-style-type"}.listMarker(counter)
+ text: styledNode.counterStyle.listMarker(counter, addSuffix)
)
of stImage:
return InlineImageBox(
diff --git a/src/css/cssvalues.nim b/src/css/cssvalues.nim
index 2cdd2df0..e4c7ef49 100644
--- a/src/css/cssvalues.nim
+++ b/src/css/cssvalues.nim
@@ -247,6 +247,7 @@ type
ListStyleTypeKatakana = "katakana"
ListStyleTypeKatakanaIroha = "katakana-iroha"
ListStyleTypeJapaneseInformal = "japanese-informal"
+ ListStyleTypeJapaneseFormal = "japanese-formal"
CSSVerticalAlign2* = enum
VerticalAlignBaseline = "baseline"
@@ -365,6 +366,7 @@ type
s*: RefString
of ContentCounter:
counter*: CAtom
+ counterStyle*: CSSListStyleType
else:
discard
@@ -563,7 +565,6 @@ const DisplayInnerTable* = {DisplayTable, DisplayInlineTable}
const DisplayInternalTable* = {
DisplayTableCell, DisplayTableRow, DisplayTableCaption
} + RowGroupBox
-const ProperTableRowParent* = RowGroupBox + {DisplayTableWrapper} #TODO remove
const PositionAbsoluteFixed* = {PositionAbsolute, PositionFixed}
const WhiteSpacePreserve* = {
WhitespacePre, WhitespacePreLine, WhitespacePreWrap
@@ -759,7 +760,6 @@ func bfcify*(overflow: CSSOverflow): CSSOverflow =
return overflow
const UpperAlphaMap = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".toPoints()
-const LowerAlphaMap = "abcdefghijklmnopqrstuvwxyz".toPoints()
const LowerGreekMap = "αβγδεζηθικλμνξοπρστυφχψω".toPoints()
const HiraganaMap = ("あいうえおかきくけこさしすせそたちつてとなにぬねの" &
"はひふへほまみむめもやゆよらりるれろわゐゑをん").toPoints()
@@ -786,14 +786,13 @@ func numToBase(n: int; map: openArray[uint32]): string =
res.addUTF8(tmp[i])
return res
-func numToFixed(n: int; map: openArray[uint32]): string =
- let n = n - 1
- if n notin 0 .. map.high:
- return $n
- return $map[n]
+func numToFixed(n: int32; map: openArray[uint32]): string =
+ if n in 1 .. map.len:
+ return map[n - 1].toUTF8()
+ return $n
-func numberAdditive(i: int; range: HSlice[int, int];
- symbols: openArray[(int, string)]): string =
+func numberAdditive(i: int32; range: Slice[int32];
+ symbols: openArray[(int32, cstring)]): string =
if i notin range:
return $i
var n = i
@@ -801,65 +800,66 @@ func numberAdditive(i: int; range: HSlice[int, int];
while n > 0:
if n >= symbols[at][0]:
n -= symbols[at][0]
- result &= symbols[at][1]
+ result &= $symbols[at][1]
continue
inc at
return result
const romanNumbers = [
- (1000, "M"), (900, "CM"), (500, "D"), (400, "CD"), (100, "C"), (90, "XC"),
- (50, "L"), (40, "XL"), (10, "X"), (9, "IX"), (5, "V"), (4, "IV"), (1, "I")
+ (1000i32, cstring"M"), (900, "CM"), (500, "D"), (400, "CD"), (100, "C"),
+ (90, "XC"), (50, "L"), (40, "XL"), (10, "X"), (9, "IX"), (5, "V"), (4, "IV"),
+ (1, "I")
]
-const romanNumbersLower = block:
- var res: seq[(int, string)] = @[]
- for (n, s) in romanNumbers:
- res.add((n, s.toLowerAscii()))
- res
-
-func romanNumber(i: int): string =
- return numberAdditive(i, 1..3999, romanNumbers)
-
-func romanNumberLower(i: int): string =
- return numberAdditive(i, 1..3999, romanNumbersLower)
+func romanNumber(i: int32): string =
+ return numberAdditive(i, 1i32..3999i32, romanNumbers)
-func japaneseNumber(i: int): string =
+func japaneseNumber(i: int32; formal: bool): string =
if i == 0:
- return "〇"
+ return if formal: "〇" else: "零"
var n = i
var s = ""
if i < 0:
s &= "マイナス"
n *= -1
let o = n
- var ss: seq[string] = @[]
+ var ss: seq[cstring] = @[]
var d = 0
while n > 0:
let m = n mod 10
if m != 0:
case d
- of 1: ss.add("十")
- of 2: ss.add("百")
- of 3: ss.add("千")
+ of 1:
+ ss.add(if formal: cstring"拾" else: "十")
+ if formal:
+ ss.add("壱")
+ of 2:
+ ss.add("百")
+ if formal:
+ ss.add("壱")
+ of 3:
+ ss.add(if formal: cstring"阡" else: "千")
+ if formal:
+ ss.add("壱")
of 4:
ss.add("万")
- ss.add("一")
+ ss.add(if formal: cstring"壱" else: "一")
of 5:
ss.add("万")
- ss.add("十")
+ ss.add(if formal: cstring"拾" else: "十")
of 6:
ss.add("万")
ss.add("百")
of 7:
ss.add("万")
- ss.add("千")
- ss.add("一")
+ ss.add(if formal: cstring"阡" else: "千")
+ ss.add(if formal: cstring"壱" else: "一")
of 8:
ss.add("億")
- ss.add("一")
+ ss.add(if formal: cstring"壱" else: "一")
of 9:
ss.add("億")
- ss.add("十")
+ ss.add(if formal: cstring"拾" else: "十")
else: discard
case m
of 0:
@@ -867,11 +867,11 @@ func japaneseNumber(i: int): string =
n = n div 10
of 1:
if o == n:
- ss.add("一")
- of 2: ss.add("二")
- of 3: ss.add("三")
+ ss.add(if formal: cstring"壱" else: "一")
+ of 2: ss.add(if formal: cstring"弐" else: "二")
+ of 3: ss.add(if formal: cstring"参" else: "三")
of 4: ss.add("四")
- of 5: ss.add("五")
+ of 5: ss.add(if formal: cstring"伍" else: "五")
of 6: ss.add("六")
of 7: ss.add("七")
of 8: ss.add("八")
@@ -879,34 +879,52 @@ func japaneseNumber(i: int): string =
else: discard
n -= m
for j in countdown(ss.high, 0):
- s &= ss[j]
+ s &= $ss[j]
return s
-func listMarker0(t: CSSListStyleType; i: int): string =
- case t
- of ListStyleTypeNone: return ""
- of ListStyleTypeDisc: return "• " # U+2022
- of ListStyleTypeCircle: return "○ " # U+25CB
- of ListStyleTypeSquare: return "□ " # U+25A1
- of ListStyleTypeDisclosureOpen: return "▶ " # U+25B6
- of ListStyleTypeDisclosureClosed: return "▼ " # U+25BC
- of ListStyleTypeDecimal: return $i & ". "
- of ListStyleTypeUpperRoman: return romanNumber(i) & ". "
- of ListStyleTypeLowerRoman: return romanNumberLower(i) & ". "
- of ListStyleTypeUpperAlpha: return numToBase(i, UpperAlphaMap) & ". "
- of ListStyleTypeLowerAlpha: return numToBase(i, LowerAlphaMap) & ". "
- of ListStyleTypeLowerGreek: return numToBase(i, LowerGreekMap) & ". "
- of ListStyleTypeHiragana: return numToBase(i, HiraganaMap) & "、"
- of ListStyleTypeHiraganaIroha: return numToBase(i, HiraganaIrohaMap) & "、"
- of ListStyleTypeKatakana: return numToBase(i, KatakanaMap) & "、"
- of ListStyleTypeKatakanaIroha: return numToBase(i, KatakanaIrohaMap) & "、"
- of ListStyleTypeCjkEarthlyBranch:
- return numToFixed(i, EarthlyBranchMap) & "、"
- of ListStyleTypeCjkHeavenlyStem: return numToFixed(i, HeavenlyStemMap) & "、"
- of ListStyleTypeJapaneseInformal: return japaneseNumber(i) & "、"
-
-func listMarker*(t: CSSListStyleType; i: int): RefString =
- return newRefString(listMarker0(t, i))
+func listMarker0(t: CSSListStyleType; i: int32): string =
+ return case t
+ of ListStyleTypeNone: ""
+ of ListStyleTypeDisc: "•" # U+2022
+ of ListStyleTypeCircle: "○" # U+25CB
+ of ListStyleTypeSquare: "□" # U+25A1
+ of ListStyleTypeDisclosureOpen: "▶" # U+25B6
+ of ListStyleTypeDisclosureClosed: "▼" # U+25BC
+ of ListStyleTypeDecimal: $i
+ of ListStyleTypeUpperRoman: romanNumber(i)
+ of ListStyleTypeLowerRoman: romanNumber(i).toLowerAscii()
+ of ListStyleTypeUpperAlpha: numToBase(i, UpperAlphaMap)
+ of ListStyleTypeLowerAlpha: numToBase(i, UpperAlphaMap).toLowerAscii()
+ of ListStyleTypeLowerGreek: numToBase(i, LowerGreekMap)
+ of ListStyleTypeHiragana: numToBase(i, HiraganaMap)
+ of ListStyleTypeHiraganaIroha: numToBase(i, HiraganaIrohaMap)
+ of ListStyleTypeKatakana: numToBase(i, KatakanaMap)
+ of ListStyleTypeKatakanaIroha: numToBase(i, KatakanaIrohaMap)
+ of ListStyleTypeCjkEarthlyBranch: numToFixed(i, EarthlyBranchMap)
+ of ListStyleTypeCjkHeavenlyStem: numToFixed(i, HeavenlyStemMap)
+ of ListStyleTypeJapaneseInformal: japaneseNumber(i, formal = false)
+ of ListStyleTypeJapaneseFormal: japaneseNumber(i, formal = true)
+
+func listMarkerSuffix(t: CSSListStyleType): string =
+ return case t
+ of ListStyleTypeNone: ""
+ of ListStyleTypeDisc, ListStyleTypeCircle, ListStyleTypeSquare,
+ ListStyleTypeDisclosureOpen, ListStyleTypeDisclosureClosed:
+ " "
+ of ListStyleTypeDecimal, ListStyleTypeUpperRoman, ListStyleTypeLowerRoman,
+ ListStyleTypeUpperAlpha, ListStyleTypeLowerAlpha, ListStyleTypeLowerGreek:
+ ". "
+ of ListStyleTypeHiragana, ListStyleTypeHiraganaIroha, ListStyleTypeKatakana,
+ ListStyleTypeKatakanaIroha, ListStyleTypeCjkEarthlyBranch,
+ ListStyleTypeCjkHeavenlyStem, ListStyleTypeJapaneseInformal,
+ ListStyleTypeJapaneseFormal:
+ "、"
+
+func listMarker*(t: CSSListStyleType; i: int32; suffix: bool): RefString =
+ let res = newRefString(listMarker0(t, i))
+ if suffix:
+ res.s &= listMarkerSuffix(t)
+ return res
func quoteStart*(level: int): string =
if level == 0:
@@ -1073,11 +1091,11 @@ proc parseLegacyColorFun(value: openArray[CSSComponentValue]):
# and ident is in NameTable and may start with "bright-"
func parseANSI(value: openArray[CSSComponentValue]): Opt[CSSColor] =
var i = value.skipBlanks(0)
- if i != value.high or not (value[i] of CSSToken): # only 1 param is valid
- #TODO numeric functions
+ let tok = ?value.getToken(i)
+ if value.skipBlanks(i + 1) < value.len: # only 1 param is valid
return err()
- let tok = CSSToken(value[i])
if tok.t == cttINumber:
+ #TODO calc
if int(tok.nvalue) notin 0..255:
return err() # invalid numeric ANSI color
return ok(ANSIColor(tok.nvalue).cssColor())
@@ -1317,13 +1335,26 @@ proc parseContent(cvals: openArray[CSSComponentValue]): Opt[seq[CSSContent]] =
elif cval of CSSFunction:
let fun = CSSFunction(cval)
if fun.name == cftCounter:
- let i = fun.value.skipBlanks(0)
- if i >= fun.value.len or not (fun.value[i] of CSSToken):
- return err()
- let tok = CSSToken(fun.value[i])
+ var i = fun.value.skipBlanks(0)
+ let tok = ?fun.value.getToken(i)
if tok.t != cttIdent:
return err()
- res.add(CSSContent(t: ContentCounter, counter: tok.value.toAtom()))
+ var style = ListStyleTypeDecimal
+ i = fun.value.skipBlanks(i + 1)
+ if i < fun.value.len:
+ if fun.value[i] != cttComma:
+ return err()
+ i = fun.value.skipBlanks(i + 1)
+ if i < fun.value.len:
+ # stick with decimal if not found
+ style = parseIdent[CSSListStyleType](fun.value[i]).get(style)
+ if fun.value.skipBlanks(i + 1) < fun.value.len:
+ return err()
+ res.add(CSSContent(
+ t: ContentCounter,
+ counter: tok.value.toAtom(),
+ counterStyle: style
+ ))
ok(res)
func parseFontWeight(cval: CSSComponentValue): Opt[int32] =
@@ -1486,12 +1517,7 @@ proc makeEntry*(t: CSSPropertyType; global: CSSGlobalType): CSSComputedEntry =
proc parseVariable(fun: CSSFunction; t: CSSPropertyType;
entry: var CSSComputedEntry; attrs: WindowAttributes): Opt[void] =
var i = fun.value.skipBlanks(0)
- if i >= fun.value.len:
- return err()
- let cval = fun.value[i]
- if not (cval of CSSToken):
- return err()
- let tok = CSSToken(fun.value[i])
+ let tok = ?fun.value.getToken(i)
if tok.t != cttIdent:
return err()
entry = CSSComputedEntry(
diff --git a/src/css/layout.nim b/src/css/layout.nim
index ba74b2bd..fb82aab7 100644
--- a/src/css/layout.nim
+++ b/src/css/layout.nim
@@ -628,7 +628,7 @@ proc alignLine(fstate: var FlowState) =
elif iastate.ibox of InlineBlockBox:
let ibox = InlineBlockBox(iastate.ibox)
# Add the offset to avoid destroying margins (etc.) of the block.
- ibox.box.state.offset += iastate.offset
+ BlockBox(ibox.children[0]).state.offset += iastate.offset
elif iastate.ibox of InlineImageBox:
let ibox = InlineImageBox(iastate.ibox)
ibox.imgstate.offset = iastate.offset
@@ -777,7 +777,7 @@ proc finishLine(fstate: var FlowState; istate: var InlineState; wrap: bool;
# b) `box' has resolved its y offset, so the float can already
# be positioned.
# We check whether our y offset has been positioned as follows:
- # * save marginTarget in FlowState at layoutBlock's start
+ # * save marginTarget in FlowState at layoutFlow's start
# * if our saved marginTarget and bctx's marginTarget no longer
# point to the same object, that means our (or an ancestor's)
# offset has been resolved, i.e. we can position floats already.
@@ -1703,7 +1703,7 @@ proc layoutOuterBlock(fstate: var FlowState; child: BlockBox;
))
proc layoutInlineBlock(fstate: var FlowState; ibox: InlineBlockBox) =
- let box = ibox.box
+ let box = BlockBox(ibox.children[0])
if box.computed{"position"} in PositionAbsoluteFixed:
# Absolute is a bit of a special case in inline: while the spec
# *says* it should blockify, absolutely positioned inline-blocks are
diff --git a/src/css/render.nim b/src/css/render.nim
index 445896ac..02f19a63 100644
--- a/src/css/render.nim
+++ b/src/css/render.nim
@@ -384,9 +384,6 @@ proc renderInlineBox(grid: var FlexibleGrid; state: var RenderState;
let offset = offset + run.offset
if ibox.computed{"visibility"} == VisibilityVisible:
grid.setText(state, run.str, offset, format, ibox.element)
- elif ibox of InlineBlockBox:
- let ibox = InlineBlockBox(ibox)
- grid.renderBlockBox(state, ibox.box, offset)
elif ibox of InlineImageBox:
let ibox = InlineImageBox(ibox)
if ibox.computed{"visibility"} != VisibilityVisible: