mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 02:47:34 +00:00
LibWeb: Add display: math
This is a `<display-inside>` keyword added by the MathML spec, and has the rough meaning of "display in the default way". It enables the standard layout rules for each MathML element (and is ignored for anything that isn't a MathML element). I believe we'll need an actual MathML formatting context to do the layout correctly, but we can at least support a couple of elements that behave the same as HTML ones.
This commit is contained in:
parent
125d161b3f
commit
f3124c492b
6 changed files with 38 additions and 1 deletions
|
@ -100,6 +100,7 @@ public:
|
||||||
bool is_flex_inside() const { return is_outside_and_inside() && inside() == DisplayInside::Flex; }
|
bool is_flex_inside() const { return is_outside_and_inside() && inside() == DisplayInside::Flex; }
|
||||||
bool is_grid_inside() const { return is_outside_and_inside() && inside() == DisplayInside::Grid; }
|
bool is_grid_inside() const { return is_outside_and_inside() && inside() == DisplayInside::Grid; }
|
||||||
bool is_ruby_inside() const { return is_outside_and_inside() && inside() == DisplayInside::Ruby; }
|
bool is_ruby_inside() const { return is_outside_and_inside() && inside() == DisplayInside::Ruby; }
|
||||||
|
bool is_math_inside() const { return is_outside_and_inside() && inside() == DisplayInside::Math; }
|
||||||
|
|
||||||
enum class Short {
|
enum class Short {
|
||||||
None,
|
None,
|
||||||
|
@ -119,6 +120,7 @@ public:
|
||||||
Ruby,
|
Ruby,
|
||||||
Table,
|
Table,
|
||||||
InlineTable,
|
InlineTable,
|
||||||
|
Math,
|
||||||
};
|
};
|
||||||
|
|
||||||
static Display from_short(Short short_)
|
static Display from_short(Short short_)
|
||||||
|
@ -158,6 +160,11 @@ public:
|
||||||
return Display { DisplayOutside::Block, DisplayInside::Table };
|
return Display { DisplayOutside::Block, DisplayInside::Table };
|
||||||
case Short::InlineTable:
|
case Short::InlineTable:
|
||||||
return Display { DisplayOutside::Inline, DisplayInside::Table };
|
return Display { DisplayOutside::Inline, DisplayInside::Table };
|
||||||
|
case Short::Math:
|
||||||
|
// NOTE: The spec ( https://w3c.github.io/mathml-core/#new-display-math-value ) does not
|
||||||
|
// mention what the outside value for `display: math` should be.
|
||||||
|
// The UA stylesheet does `* { display: block math; }` so let's go with that.
|
||||||
|
return Display { DisplayOutside::Block, DisplayInside::Math };
|
||||||
}
|
}
|
||||||
VERIFY_NOT_REACHED();
|
VERIFY_NOT_REACHED();
|
||||||
}
|
}
|
||||||
|
|
|
@ -143,7 +143,8 @@
|
||||||
"table",
|
"table",
|
||||||
"flex",
|
"flex",
|
||||||
"grid",
|
"grid",
|
||||||
"ruby"
|
"ruby",
|
||||||
|
"math"
|
||||||
],
|
],
|
||||||
"display-internal": [
|
"display-internal": [
|
||||||
"table-row-group",
|
"table-row-group",
|
||||||
|
|
|
@ -219,6 +219,7 @@
|
||||||
"listbox",
|
"listbox",
|
||||||
"mark",
|
"mark",
|
||||||
"marktext",
|
"marktext",
|
||||||
|
"math",
|
||||||
"max-content",
|
"max-content",
|
||||||
"medium",
|
"medium",
|
||||||
"menu",
|
"menu",
|
||||||
|
|
|
@ -3574,6 +3574,8 @@ RefPtr<StyleValue> Parser::parse_display_value(Vector<ComponentValue> const& com
|
||||||
return Display::from_short(Display::Short::Grid);
|
return Display::from_short(Display::Short::Grid);
|
||||||
case DisplayInside::Ruby:
|
case DisplayInside::Ruby:
|
||||||
return Display::from_short(Display::Short::Ruby);
|
return Display::from_short(Display::Short::Ruby);
|
||||||
|
case DisplayInside::Math:
|
||||||
|
return Display::from_short(Display::Short::Math);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -72,6 +72,7 @@
|
||||||
#include <LibWeb/HTML/HTMLHtmlElement.h>
|
#include <LibWeb/HTML/HTMLHtmlElement.h>
|
||||||
#include <LibWeb/Layout/Node.h>
|
#include <LibWeb/Layout/Node.h>
|
||||||
#include <LibWeb/Loader/ResourceLoader.h>
|
#include <LibWeb/Loader/ResourceLoader.h>
|
||||||
|
#include <LibWeb/Namespace.h>
|
||||||
#include <LibWeb/Platform/FontPlugin.h>
|
#include <LibWeb/Platform/FontPlugin.h>
|
||||||
#include <LibWeb/ReferrerPolicy/AbstractOperations.h>
|
#include <LibWeb/ReferrerPolicy/AbstractOperations.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -2243,6 +2244,23 @@ void StyleComputer::transform_box_type_if_needed(StyleProperties& style, DOM::El
|
||||||
|
|
||||||
auto new_display = display;
|
auto new_display = display;
|
||||||
|
|
||||||
|
if (display.is_math_inside()) {
|
||||||
|
// https://w3c.github.io/mathml-core/#new-display-math-value
|
||||||
|
// For elements that are not MathML elements, if the specified value of display is inline math or block math
|
||||||
|
// then the computed value is block flow and inline flow respectively.
|
||||||
|
if (element.namespace_() != Namespace::MathML)
|
||||||
|
new_display = CSS::Display { display.outside(), CSS::DisplayInside::Flow };
|
||||||
|
// For the mtable element the computed value is block table and inline table respectively.
|
||||||
|
else if (element.tag_name().equals_ignoring_ascii_case("mtable"sv))
|
||||||
|
new_display = CSS::Display { display.outside(), CSS::DisplayInside::Table };
|
||||||
|
// For the mtr element, the computed value is table-row.
|
||||||
|
else if (element.tag_name().equals_ignoring_ascii_case("mtr"sv))
|
||||||
|
new_display = CSS::Display { CSS::DisplayInternal::TableRow };
|
||||||
|
// For the mtd element, the computed value is table-cell.
|
||||||
|
else if (element.tag_name().equals_ignoring_ascii_case("mtd"sv))
|
||||||
|
new_display = CSS::Display { CSS::DisplayInternal::TableCell };
|
||||||
|
}
|
||||||
|
|
||||||
switch (required_box_type_transformation(style, element, pseudo_element)) {
|
switch (required_box_type_transformation(style, element, pseudo_element)) {
|
||||||
case BoxTypeTransformation::None:
|
case BoxTypeTransformation::None:
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -373,6 +373,14 @@ JS::GCPtr<Layout::Node> Element::create_layout_node_for_display_type(DOM::Docume
|
||||||
return document.heap().allocate_without_realm<Layout::BlockContainer>(document, element, move(style));
|
return document.heap().allocate_without_realm<Layout::BlockContainer>(document, element, move(style));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (display.is_math_inside()) {
|
||||||
|
// https://w3c.github.io/mathml-core/#new-display-math-value
|
||||||
|
// MathML elements with a computed display value equal to block math or inline math control box generation
|
||||||
|
// and layout according to their tag name, as described in the relevant sections.
|
||||||
|
// FIXME: Figure out what kind of node we should make for them. For now, we'll stick with a generic Box.
|
||||||
|
return document.heap().allocate_without_realm<Layout::Box>(document, element, move(style));
|
||||||
|
}
|
||||||
|
|
||||||
if (display.is_inline_outside()) {
|
if (display.is_inline_outside()) {
|
||||||
if (display.is_flow_root_inside())
|
if (display.is_flow_root_inside())
|
||||||
return document.heap().allocate_without_realm<Layout::BlockContainer>(document, element, move(style));
|
return document.heap().allocate_without_realm<Layout::BlockContainer>(document, element, move(style));
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue