--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-001.html
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-001.html
@@ -1,17 +1,17 @@
<!DOCTYPE html>
<html>
<!-- Submitted from TestTWF Paris -->
<head>
<meta charset="utf-8">
<title>CSS Test: Multi-column element via -moz-columns: [integer]</title>
<link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
<link rel="author" title="Håkon Wium Lie" href="mailto:howcome@opera.com"/>
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-columns"/>
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#columns"/>
<link rel="match" href="reference/multicol-basic-ref.html"/>
<meta name="flags" content="ahem"/>
<link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
<style type="text/css">
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-002.html
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-002.html
@@ -1,17 +1,17 @@
<!DOCTYPE html>
<html>
<!-- Submitted from TestTWF Paris -->
<head>
<meta charset="utf-8">
<title>CSS Test: Multi-column element via -moz-column-count: [integer]</title>
<link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
<link rel="author" title="Håkon Wium Lie" href="mailto:howcome@opera.com"/>
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-columns"/>
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#columns"/>
<link rel="match" href="reference/multicol-basic-ref.html"/>
<meta name="flags" content="ahem"/>
<link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
<style type="text/css">
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-003.html
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-003.html
@@ -1,17 +1,17 @@
<!DOCTYPE html>
<html>
<!-- Submitted from TestTWF Paris -->
<head>
<meta charset="utf-8">
<title>CSS Test: Multi-column element via -moz-columns: [width]</title>
<link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
<link rel="author" title="Håkon Wium Lie" href="mailto:howcome@opera.com"/>
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-columns"/>
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#columns"/>
<link rel="match" href="reference/multicol-basic-ref.html"/>
<meta name="flags" content="ahem"/>
<link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
<style type="text/css">
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-004.html
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-004.html
@@ -1,17 +1,17 @@
<!DOCTYPE html>
<html>
<!-- Submitted from TestTWF Paris -->
<head>
<meta charset="utf-8">
<title>CSS Test: Multi-column element via -moz-column-width: [width]</title>
<link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
<link rel="author" title="Håkon Wium Lie" href="mailto:howcome@opera.com"/>
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-columns"/>
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#columns"/>
<link rel="match" href="reference/multicol-basic-ref.html"/>
<meta name="flags" content="ahem"/>
<link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
<style type="text/css">
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-001.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-columns shorthand (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-25 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
- <link rel="match" href="multicol--moz-columns-001-ref.xht" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+ <link rel="match" href="multicol-columns-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that '-moz-columns: 100px 6' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-002.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-columns shorthand (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-25 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
- <link rel="match" href="multicol--moz-columns-001-ref.xht" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+ <link rel="match" href="multicol-columns-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that '-moz-columns: 6 100px' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-003.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-columns shorthand (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-25 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
- <link rel="match" href="multicol--moz-columns-001-ref.xht" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+ <link rel="match" href="multicol-columns-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that '-moz-columns: 100px auto' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-004.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-004.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-columns shorthand (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-25 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
- <link rel="match" href="multicol--moz-columns-001-ref.xht" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+ <link rel="match" href="multicol-columns-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that '-moz-columns: auto 100px' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-005.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-005.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-columns shorthand (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-25 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
- <link rel="match" href="multicol--moz-columns-001-ref.xht" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+ <link rel="match" href="multicol-columns-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that '-moz-columns: 6' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties. '-moz-columns: 6' is equivalent to '-moz-column-width: auto' and '-moz-column-count: 6'." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-006.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-006.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-columns shorthand (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-25 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
- <link rel="match" href="multicol--moz-columns-001-ref.xht" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+ <link rel="match" href="multicol-columns-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that '-moz-columns: 6 auto' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-007.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-007.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-columns shorthand (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-25 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
- <link rel="match" href="multicol--moz-columns-001-ref.xht" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+ <link rel="match" href="multicol-columns-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that '-moz-columns: auto 6' shorthand correctly set '-moz-column-width' and '-moz-column-count' properties." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-invalid-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-invalid-001.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: invalid -moz-columns shorthand</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-26 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
- <link rel="match" href="multicol--moz-columns-invalid-001-ref.xht" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+ <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
<meta name="flags" content="ahem invalid" />
<meta name="assert" content="This test checks that '-moz-columns: 8 normal' is invalid (generating a parsing error) and therefore will be ignored." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-invalid-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-invalid-002.xht
@@ -1,24 +1,24 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<!--
Original, initial filename of this test was
- multicol--moz-columns-toolong-002.xht
+ multicol-columns-toolong-002.xht
and it should be filename-renamed
- multicol--moz-columns-invalid-002.xht
+ multicol-columns-invalid-002.xht
-->
<title>CSS Multi-column Layout Test: invalid -moz-columns shorthand</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-26 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
- <link rel="match" href="multicol--moz-columns-invalid-001-ref.xht" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+ <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
<meta name="flags" content="ahem invalid" />
<meta name="assert" content="This test checks that '-moz-columns: 8 auto 6em' is invalid (generating a parsing error) and therefore will be ignored." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-toolong-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-columns-toolong-001.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: narrower inline content inside wider colum box</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-26 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
- <link rel="match" href="multicol--moz-columns-invalid-001-ref.xht"/>
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+ <link rel="match" href="multicol-columns-invalid-001-ref.xht"/>
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks the rendering of inline content (2em) inside wider (3em) column boxes." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-001.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-count (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-27 -->
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 '-moz-column-count'" />
- <link rel="match" href="multicol--moz-columns-001-ref.xht" />
+ <link rel="match" href="multicol-columns-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that setting '-moz-column-count' should accordingly create 6 column boxes. In this test, each column box should be exactly 100px wide." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-001.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolumn | -moz-column-rule</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gaps-and-rules"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
<link rel="match" href="multicol-count-computed-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
@@ -27,19 +27,19 @@ div {
margin: 1em;
border: 1em solid gray;
width: 12em;
widows: 1;
orphans: 1;
-moz-column-count: 3;
-moz-column-gap: 6em;
- -moz--moz-column-rule-color: blue;
- -moz--moz-column-rule-width: 1.5em;
- -moz--moz-column-rule-style: solid;
+ -moz-column-rule-color: blue;
+ -moz-column-rule-width: 1.5em;
+ -moz-column-rule-style: solid;
}
#pink {color: pink;}
#orange {color: orange;}
#purple {color: purple;}
#grey {color: grey;}
]]></style>
</head>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-002.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolumn | -moz-column-rule</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gaps-and-rules"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
<link rel="match" href="multicol-count-computed-2-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
@@ -27,19 +27,19 @@ div {
margin: 1em;
border: 1em solid gray;
width: 12em;
widows: 1;
orphans: 1;
-moz-column-count: 3;
-moz-column-gap: 7em;
- -moz--moz-column-rule-color: red;
- -moz--moz-column-rule-width: 1.5em;
- -moz--moz-column-rule-style: solid;
+ -moz-column-rule-color: red;
+ -moz-column-rule-width: 1.5em;
+ -moz-column-rule-style: solid;
}
#pink {color: pink;}
#orange {color: orange;}
#purple {color: purple;}
#grey {color: grey;}
]]></style>
</head>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-003.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-rule and overflow inside (complex test)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-29 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
<link rel="match" href="multicol-count-computed-003-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that if one of 2 adjacent column boxes (2nd and 3rd colum box in this test) does not have any content, then the column rule separating those should not be drawn. In this test, the 3rd colum box should have no inline content. This test also checks that inline content in the normal flow that extends into a column gap should be clipped in the middle of the column gap. So, in this test, inline content in 1st column box should be partially clipped and overlapped partially by 1st -moz-column-rule." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
@@ -22,19 +22,19 @@
color: black;
font: 1.25em/1 Ahem;
orphans: 1;
widows: 1;
width: 13em;
-moz-column-count: 3;
-moz-column-gap: 5em;
- -moz--moz-column-rule-color: blue;
- -moz--moz-column-rule-style: solid;
- -moz--moz-column-rule-width: 1.5em;
+ -moz-column-rule-color: blue;
+ -moz-column-rule-style: solid;
+ -moz-column-rule-width: 1.5em;
}
/*
(11) if (-moz-column-width = auto) and (-moz-column-count != auto) then
(12) N := -moz-column-count;
(13) W := max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
(14) exit;
@@ -70,17 +70,17 @@
Because no inline content should be rendered into the
3rd column box, this causes the 2nd column rule not
been rendered because
"
Column rules are only drawn between two -moz-columns that
both have content.
"
- http://www.w3.org/TR/css3-multicol/#-moz-column-gaps-and-rules
+ http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules
*/
]]></style>
</head>
<body>
<div>
<span id="pink">PINK</span>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-004.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-004.xht
@@ -22,19 +22,19 @@
color: black;
font: 1.25em/1 Ahem;
orphans: 1;
widows: 1;
width: 12em;
-moz-column-count: auto;
-moz-column-gap: 7em;
- -moz--moz-column-rule-color: red;
- -moz--moz-column-rule-width: 1.5em;
- -moz--moz-column-rule-style: solid;
+ -moz-column-rule-color: red;
+ -moz-column-rule-width: 1.5em;
+ -moz-column-rule-style: solid;
}
#pink {color: pink;}
#orange {color: orange;}
#purple {color: purple;}
#gray {color: gray;}
]]></style>
</head>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-005.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-computed-005.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-rule and overflow inside (complex test)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-03 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
<link rel="match" href="multicol-count-computed-003-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that if one of 2 adjacent column boxes (2nd and 3rd colum box in this test) does not have any content, then the column rule separating those should not be drawn. In this test, the 3rd colum box should have no inline content. This test also checks that inline content in the normal flow that extends into a column gap should be clipped in the middle of the column gap. So, in this test, inline content in 1st column box should be partially clipped and overlapped partially by 1st -moz-column-rule." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
@@ -21,19 +21,19 @@
border: gray solid 1em;
color: black;
font: 1.25em/1 Ahem;
orphans: 1;
widows: 1;
width: 13em;
-moz-column-gap: 5em;
- -moz--moz-column-rule-color: blue;
- -moz--moz-column-rule-style: solid;
- -moz--moz-column-rule-width: 1.5em;
+ -moz-column-rule-color: blue;
+ -moz-column-rule-style: solid;
+ -moz-column-rule-width: 1.5em;
-moz-column-width: 1em;
}
/*
(15) if (-moz-column-width != auto) and (-moz-column-count = auto) then
(16) N := max(1, floor((available-width + -moz-column-gap) / (-moz-column-width + -moz-column-gap)));
(17) W := ((available-width + -moz-column-gap) / N) - -moz-column-gap;
(18) exit;
@@ -74,17 +74,17 @@
Because no inline content should be rendered into the
3rd column box, this causes the 2nd column rule not
been rendered because
"
Column rules are only drawn between two -moz-columns that
both have content.
"
- http://www.w3.org/TR/css3-multicol/#-moz-column-gaps-and-rules
+ http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules
*/
]]></style>
</head>
<body>
<div>
<span id="pink">PINK</span>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-large-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-large-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolumn | -moz-column-count</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
<link rel="match" href="multicol-count-large-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-large-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-large-002.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolumn | -moz-column-count</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
<link rel="match" href="multicol-count-large-2-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-negative-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-negative-001.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: negative '-moz-column-count' value</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-30 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
- <link rel="match" href="multicol--moz-columns-invalid-001-ref.xht" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+ <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
<meta name="flags" content="ahem invalid" />
<meta name="assert" content="This test checks that a specified negative '-moz-column-count' value is invalid and ignored." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-negative-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-negative-002.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: zero '-moz-column-count' value</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-07-30 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
- <link rel="match" href="multicol--moz-columns-invalid-001-ref.xht" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
+ <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
<meta name="flags" content="ahem invalid" />
<meta name="assert" content="This test checks that a specified 0 '-moz-column-count' value is invalid and ignored." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-non-integer-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-non-integer-001.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: non-integer '-moz-column-count' value</title>
<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
<link rel="help" href="http://www.w3.org/TR/css3-values/#integers" title="4.1. Integers: the '<integer>' type" />
- <link rel="match" href="multicol--moz-columns-invalid-001-ref.xht" />
+ <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
<meta name="flags" content="ahem invalid" />
<meta name="assert" content="This test checks that a specified real '-moz-column-count' value is invalid and ignored." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-non-integer-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-non-integer-002.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: non-integer '-moz-column-count' value</title>
<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
<link rel="help" href="http://www.w3.org/TR/css3-values/#integers" title="4.1. Integers: the '<integer>' type" />
- <link rel="match" href="multicol--moz-columns-invalid-001-ref.xht" />
+ <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
<meta name="flags" content="ahem invalid" />
<meta name="assert" content="This test checks that a specified real '-moz-column-count' value is invalid and ignored." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-non-integer-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-count-non-integer-003.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: non-integer '-moz-column-count' value</title>
<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
<link rel="help" href="http://www.w3.org/TR/css3-values/#integers" title="4.1. Integers: the '<integer>' type" />
- <link rel="match" href="multicol--moz-columns-invalid-001-ref.xht" />
+ <link rel="match" href="multicol-columns-invalid-001-ref.xht" />
<meta name="flags" content="ahem invalid" />
<meta name="assert" content="This test checks that a specified real '-moz-column-count' value is invalid and ignored." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-002.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolumn | -moz-column-fill-auto</title>
<meta name="assert" content="This test checks that -moz-columns are not balanced when '-moz-column-fill: auto' is set"/>
<link rel="author" title="howcome@opera.com" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#filling--moz-columns"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#filling-columns"/>
<link rel="match" href="multicol-fill-auto-002-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-block-children-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-block-children-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicol | -moz-column-span: all | -moz-column-fill: auto</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#filling--moz-columns"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#filling-columns"/>
<link rel="match" href="multicol-fill-auto-block-children-ref.xht"/>
<meta name="flags" content=""/>
<style type="text/css"><![CDATA[
html {
background: white;
}
body {
background: blue;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-block-children-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto-block-children-002.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: '-moz-column-fill: auto' and '-moz-column-span: all' (complex)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-16 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-span" title="6.1. '-moz-column-span'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#pagination-and-overflow-outside-multicol" title="8.2. Pagination and overflow outside multicol elements" />
<link rel="match" href="multicol-fill-auto-block-children-002-ref.xht" />
<meta name="flags" content="" />
<meta name="assert" content="This test checks that if '-moz-column-fill' is set to 'auto' and a multicolumn element content is solely made of block container boxes, then it should fill column boxes sequentially with such content and, in this test, it should overflow outside of it. This test relies on the idea that a '-moz-column-span: all' element will occupy more space in a multi-column element than a '-moz-column-span: none' element, therefore reducing available space for content in column boxes." />
<style type="text/css"><![CDATA[
html {background-color: white;}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-auto.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolumn | -moz-column-fill-auto</title>
<meta name="assert" content="This test checks that -moz-columns are properly balanced when '-moz-column-fill: auto' is set"/>
<link rel="author" title="howcome@opera.com" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#filling--moz-columns"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#filling-columns"/>
<link rel="match" href="multicol-fill-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-balance-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-fill-balance-001.xht
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolumn | -moz-column-fill</title>
<meta name="assert" content="This test checks that -moz-columns are properly balanced when '-moz-column-fill: balance' is set"/>
<link rel="author" title="howcome@opera.com" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#filling--moz-columns"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#filling-columns"/>
<link rel="match" href="multicol-fill-balance-001-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-000.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-gap (basic)</title>
<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-25 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gap" title="4.1 '-moz-column-gap'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1 '-moz-column-gap'" />
<link rel="match" href="multicol-gap-000-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that column gap appears between two -moz-columns." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: '-moz-column-gap: normal'</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-05 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gap" title="4.1. '-moz-column-gap'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
<link rel="match" href="multicol-gap-001-ref.xht" />
<meta name="flags" content="ahem may" />
<meta name="assert" content="This test checks that the 'normal' column gap is 1em, which is suggested -- and not prescribed -- by the specification." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-002.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-gap (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-05 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gap" title="4.1. '-moz-column-gap'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
<link rel="match" href="multicol-gap-002-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-003.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: '-moz-column-gap: normal'</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-05 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gap" title="4.1. '-moz-column-gap'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
<link rel="match" href="multicol-gap-002-ref.xht" />
<meta name="flags" content="ahem may" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-fraction-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-fraction-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: '-moz-column-gap' with increasing values</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-05 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gap" title="4.1. '-moz-column-gap'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
<link rel="match" href="multicol-gap-fraction-001-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-large-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-large-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: '-moz-column-gap' with large value</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-06 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gap" title="4.1 '-moz-column-gap" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1 '-moz-column-gap" />
<link rel="match" href="multicol-gap-large-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that when '-moz-column-gap' is large and when used '-moz-column-width' is narrow, then content extends into -moz-column-gap until its middle and content can extend, overflow outside the edges of the multi-colum element if 'overflow' is set to 'visible'." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-large-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-large-002.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: '-moz-column-gap' with large value</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-06 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gap" title="4.1 '-moz-column-gap" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1 '-moz-column-gap" />
<link rel="match" href="multicol-gap-large-002-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-negative-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-negative-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-gap with negative value</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-06 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gap" title="4.1. '-moz-column-gap'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
<link rel="match" href="multicol-gap-002-ref.xht" />
<meta name="flags" content="ahem invalid" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-height-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-height-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-count and height</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-06 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gap" title="4.1. '-moz-column-gap'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. '-moz-column-gap'" />
<link rel="match" href="multicol-height-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that length of column rules is equal to the length of the -moz-columns and if a nth column box overflows outside the available width of a multi-column element, then an (n-1)th column rule should be drawn. In this test, a 3rd column box is created outside the content edge of the multi-column element: therefore, a 2nd blue column rule should be drawn accordingly." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-002.xht
@@ -31,17 +31,17 @@
- 2em : 2 column gaps
==========
30em : available width of the 3 inner multi-column elements
So, W == 10em;
30em
- 6em : 3 mult by 2em: horizontal margin of 3 inner multi-column elements
- - 6em : 3 mult by 2em: horizontal -moz-column-gaps of all 3 inner multi-column elements
+ - 6em : 3 mult by 2em: horizontal column-gaps of all 3 inner multi-column elements
==========
18em : 6em for each of the 3 column boxes without their own horizontal margins
So, each column boxes of inner multi-column elements is 2em wide.
*/
}
div
{
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-003.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolumn | inheritance</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
<link rel="match" href="multicol-inherit-3-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-004.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-inherit-004.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolumn | inheritance</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gaps-and-rules"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
<link rel="match" href="multicol-inherit-4-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-005.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-005.xht
@@ -1,12 +1,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>CSS Multi-column Layout Test: nested multi--moz-columns and constrained dimensions</title>
+ <title>CSS Multi-column Layout Test: nested multi-columns and constrained dimensions</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-10 -->
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#pseudo-algorithm" title="3.4 Pseudo-algorithm" />
<link rel="match" href="multicol-nested-005-ref.xht" />
<!--
The original filename of this test was
multicol-inherit-005.xht
This test also serves as a conversion of
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-column-rule-001-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-column-rule-001-ref.xht
@@ -16,30 +16,30 @@
{
background-color: blue;
font-size: 1em;
height: 3em;
position: absolute;
width: 1em;
}
- div#first--moz-column-rule
+ div#first-column-rule
{
left: 14em;
top: auto;
}
- div#second--moz-column-rule
+ div#second-column-rule
{
left: 29em;
top: auto;
}
]]></style>
</head>
<body>
<div id="rel-pos-wrapper">
- <div id="first--moz-column-rule"></div>
- <div id="second--moz-column-rule"></div>
+ <div id="first-column-rule"></div>
+ <div id="second-column-rule"></div>
</div>
</body>
</html>
\ No newline at end of file
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-column-rule-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-column-rule-001.xht
@@ -1,21 +1,21 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<!--
This test's original filename was multicol-inherit-004.xht
and it has been modified and is now
- multicol-nested--moz-column-rule-001.xht
+ multicol-nested-column-rule-001.xht
-->
- <title>CSS Multi-column Layout Test: nested multi--moz-columns and -moz-column-rule position</title>
+ <title>CSS Multi-column Layout Test: nested multi-columns and -moz-column-rule position</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-09 -->
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#pseudo-algorithm" title="3.4 Pseudo-algorithm" />
- <link rel="match" href="multicol-nested--moz-column-rule-001-ref.xht" />
+ <link rel="match" href="multicol-nested-column-rule-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks how the height of column boxes conditions the height of column rule." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-nested-margin-002.xht
@@ -6,17 +6,17 @@
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-14 -->
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-multi-column-model" title="2. The multi-column model" />
<link rel="match" href="multicol-nested-margin-002-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that when an inner nested multi-column element is preceded by a soft column break (caused by an unforced column-break), then the used margin-top of such inner nested multi-column element is '0'." />
<!--
More info:
- Re: [css3-multicol] vertical margins rendering in nested multi--moz-columns
+ Re: [css3-multicol] vertical margins rendering in nested multi-columns
http://lists.w3.org/Archives/Public/www-style/2013Aug/0146.html
-->
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-000.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-rule shorthand (basic)</title>
<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-rule" title="4.5 '-moz-column-rule'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
<link rel="match" href="multicol-rule-000-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-rule exceeding -moz-column-gap</title>
<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gaps-and-rules" title="4. Column gaps and rules" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules" title="4. Column gaps and rules" />
<link rel="match" href="multicol-rule-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="If a column rule is wider than its gap, then the adjacent column boxes overlap the rule. This test checks that if inline content of column boxes uses only 1 twentieth (1/20) of each of the adjacent column box width, then the column rule must shine through 19 twentieths (19/20) of each of the adjacent column boxes (and above their respective backgrounds)." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-002.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolumn | -moz-column-rule</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gaps-and-rules"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
<link rel="match" href="multicol-rule-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-003.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-rule (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-14 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gaps-and-rules" title="4. Column gaps and rules" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules" title="4. Column gaps and rules" />
<link rel="match" href="multicol-rule-003-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
@@ -21,19 +21,19 @@
color: black;
font: 1.25em/1 Ahem;
orphans: 1;
widows: 1;
width: 15em;
-moz-column-count: 4;
-moz-column-gap: 1em;
- -moz--moz-column-rule-color: blue;
- -moz--moz-column-rule-style: solid;
- -moz--moz-column-rule-width: 1em;
+ -moz-column-rule-color: blue;
+ -moz-column-rule-style: solid;
+ -moz-column-rule-width: 1em;
}
]]></style>
</head>
<body>
<div>
1s cl
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-004.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-004.xht
@@ -1,14 +1,14 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: '-moz-column-fill: balance' and -moz-column-rule</title>
<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-02 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gaps-and-rules" title="4. Column gaps and rules" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules" title="4. Column gaps and rules" />
<link rel="match" href="multicol-rule-004-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that when '-moz-column-fill: balance' distributes equally inline content into column boxes in a way that does not completely fill column boxes, then -moz-column-rule must nevertheless still be painted entirely, that is for the whole length of column boxes, even though the whole inline content may not fill the whole length of the column boxes." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>CSS Multi-column Layout Test: -moz--moz-column-rule-color (basic)</title>
+ <title>CSS Multi-column Layout Test: -moz-column-rule-color (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-14 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-rule" title="4.5 '-moz-column-rule'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
<link rel="match" href="multicol-rule-color-001-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
@@ -20,19 +20,19 @@
color: lime;
font: 1.25em/1 Ahem;
orphans: 1;
widows: 1;
width: 14em;
-moz-column-count: 4;
-moz-column-gap: 1em;
- -moz--moz-column-rule-color: blue;
- -moz--moz-column-rule-style: solid;
- -moz--moz-column-rule-width: 1em;
+ -moz-column-rule-color: blue;
+ -moz-column-rule-style: solid;
+ -moz-column-rule-width: 1em;
}
/*
N == 4;
W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
W == max(0, (14em - ((4 - 1) * 1em)) / 4);
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-inherit-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-inherit-001.xht
@@ -1,30 +1,30 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>CSS Multi-column Layout Test: -moz--moz-column-rule-color: inherit</title>
+ <title>CSS Multi-column Layout Test: -moz-column-rule-color: inherit</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-09-02 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crc" title="4.2. '-moz--moz-column-rule-color'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crc" title="4.2. '-moz-column-rule-color'" />
<link rel="help" href="http://www.w3.org/TR/css3-values/#common-keywords" title="3.1.1. CSS-wide keywords: 'initial' and 'inherit'" />
<link rel="match" href="multicol-rule-color-inherit-001-ref.xht" />
<meta name="flags" content="ahem" />
- <meta name="assert" content="This test checks that, by default, -moz--moz-column-rule-color is the current color applying to the element unless reserved keyword 'inherit' is used in which case -moz--moz-column-rule-color will be inherited from the parent's -moz--moz-column-rule-color value." />
+ <meta name="assert" content="This test checks that, by default, -moz-column-rule-color is the current color applying to the element unless reserved keyword 'inherit' is used in which case -moz-column-rule-color will be inherited from the parent's -moz-column-rule-color value." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
<style type="text/css"><![CDATA[
div#parent
{
- -moz--moz-column-rule-color: green;
- -moz--moz-column-rule-style: none;
+ -moz-column-rule-color: green;
+ -moz-column-rule-style: none;
font: 1.25em/1 Ahem;
width: 17em;
}
/*
N == 3;
@@ -55,23 +55,23 @@
div
{
color: red; /* both div#parent and div.child have and use 'color: red' */
orphans: 1;
widows: 1;
-moz-column-count: 3;
-moz-column-gap: 1em;
- -moz--moz-column-rule-width: 1em;
+ -moz-column-rule-width: 1em;
}
div.child
{
- -moz--moz-column-rule-color: inherit;
- -moz--moz-column-rule-style: solid;
+ -moz-column-rule-color: inherit;
+ -moz-column-rule-style: solid;
font-size: 1em;
}
]]></style>
</head>
<body>
<p>Test passes if there are 6 vertical green stripes and <strong>no red</strong>.</p>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-inherit-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-inherit-002.xht
@@ -1,18 +1,18 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>CSS Multi-column Layout Test: -moz--moz-column-rule-color: inherit (complex)</title>
+ <title>CSS Multi-column Layout Test: -moz-column-rule-color: inherit (complex)</title>
<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-09-03 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crc" title="4.2. '-moz--moz-column-rule-color'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crc" title="4.2. '-moz-column-rule-color'" />
<link rel="help" href="http://www.w3.org/TR/css3-values/#common-keywords" title="3.1.1. CSS-wide keywords: 'initial' and 'inherit'" />
<link rel="match" href="multicol-rule-color-inherit-001-ref.xht" />
<meta name="flags" content="ahem" />
- <meta name="assert" content="This test checks that, by default, -moz--moz-column-rule-color is the current color applying to the element." />
+ <meta name="assert" content="This test checks that, by default, -moz-column-rule-color is the current color applying to the element." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
<style type="text/css"><![CDATA[
div#parent
@@ -25,19 +25,19 @@
{
color: red;
display: inline-block;
font-size: 1em;
width: 5em;
-moz-column-count: 3;
-moz-column-gap: 1em;
- -moz--moz-column-rule-color: inherit;
- -moz--moz-column-rule-style: solid;
- -moz--moz-column-rule-width: 1em;
+ -moz-column-rule-color: inherit;
+ -moz-column-rule-style: solid;
+ -moz-column-rule-width: 1em;
}
/*
N == 3;
W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
W == max(0, (5em - ((3 - 1) * 1em)) / 3);
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-dashed-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-dashed-000.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'dashed' border style</title>
<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-rule" title="4.5 '-moz-column-rule'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
<link rel="match" href="multicol-rule-dashed-000-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-dotted-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-dotted-000.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'dotted' border style</title>
<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-rule" title="4.5 '-moz-column-rule'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
<link rel="match" href="multicol-rule-dotted-000-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-double-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-double-000.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'double' border style</title>
<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-rule" title="4.5 '-moz-column-rule'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
<link rel="match" href="multicol-rule-double-000-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>CSS Multi-column Layout Test: -moz--moz-column-rule-width</title>
+ <title>CSS Multi-column Layout Test: -moz-column-rule-width</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-14 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz--moz-column-rule-width'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz-column-rule-width'" />
<link rel="match" href="multicol-rule-fraction-001-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
@@ -21,19 +21,19 @@
color: black;
font: 1.25em/1 Ahem;
orphans: 1;
widows: 1;
width: 14em;
-moz-column-count: 4;
-moz-column-gap: 1em;
- -moz--moz-column-rule-color: blue;
- -moz--moz-column-rule-style: solid;
- -moz--moz-column-rule-width: 0.9em;
+ -moz-column-rule-color: blue;
+ -moz-column-rule-style: solid;
+ -moz-column-rule-width: 0.9em;
}
/*
N == 4;
W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
W == max(0, (14em - ((4 - 1) * 1em)) / 4);
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-002.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>CSS Multi-column Layout Test: wide -moz--moz-column-rule-width painted above background-color</title>
+ <title>CSS Multi-column Layout Test: wide -moz-column-rule-width painted above background-color</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-14 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz--moz-column-rule-width'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz-column-rule-width'" />
<link rel="match" href="multicol-rule-fraction-002-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that if a column rule is wider than its gap, then the column rule will overlap adjacent column boxes above the background of the multi-column element but below the inline content inside the multicol element. In this test, the blue -moz-column-rule is painted above the yellow background-color but below (under) the black Ahem glyphs." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
@@ -22,19 +22,19 @@
color: black;
font: 1.25em/1 Ahem;
orphans: 1;
widows: 1;
width: 14em;
-moz-column-count: 4;
-moz-column-gap: 1em;
- -moz--moz-column-rule-color: blue;
- -moz--moz-column-rule-style: solid;
- -moz--moz-column-rule-width: 1.9em;
+ -moz-column-rule-color: blue;
+ -moz-column-rule-style: solid;
+ -moz-column-rule-width: 1.9em;
}
/*
N == 4;
W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
W == max(0, (14em - ((4 - 1) * 1em)) / 4);
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-fraction-003.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolumn | -moz-column-rule</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gaps-and-rules"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
<link rel="match" href="multicol-rule-fraction-3-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-groove-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-groove-000.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'groove' border style</title>
<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-rule" title="4.5 '-moz-column-rule'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
<link rel="match" href="multicol-rule-groove-000-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-hidden-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-hidden-000.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'hidden' border style</title>
<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-rule" title="4.5 '-moz-column-rule'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
<link rel="match" href="multicol-rule-hidden-000-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-inset-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-inset-000.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'inset' border style</title>
<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-rule" title="4.5 '-moz-column-rule'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
<link rel="match" href="multicol-rule-ridge-000-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="'border-style' values of -moz-column-rule are interpreted as in the collapsing border model in which case 'inset' value is drawn the same as 'ridge'." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-large-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-large-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>CSS Multi-column Layout Test: excessively wide -moz--moz-column-rule-width</title>
+ <title>CSS Multi-column Layout Test: excessively wide -moz-column-rule-width</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-09-03 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz--moz-column-rule-width'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz-column-rule-width'" />
<link rel="bookmark" href="http://lists.w3.org/Archives/Public/www-style/2013Sep/0006.html" title="[css3-multicol] z-order of -moz-column-rule: below or above border?" />
<link rel="match" href="multicol-rule-large-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that if a column rule is wider than its gap, then the column rule will overlap adjacent column boxes; its painting will be above background of multi-column element but below the inline content inside the multicol element." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
@@ -29,19 +29,19 @@
color: lime;
font-size: 1em;
orphans: 1;
widows: 1;
width: 15em;
-moz-column-count: 4;
-moz-column-gap: 1em;
- -moz--moz-column-rule-color: blue;
- -moz--moz-column-rule-style: solid;
- -moz--moz-column-rule-width: 17em;
+ -moz-column-rule-color: blue;
+ -moz-column-rule-style: solid;
+ -moz-column-rule-width: 17em;
}
/*
N == 4;
W == max(0, (available-width - ((N - 1) * -moz-column-gap)) / N);
W == max(0, (15em - ((4 - 1) * 1em)) / 4);
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-none-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-none-000.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'none' border style</title>
<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-rule" title="4.5 '-moz-column-rule'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
<link rel="match" href="multicol-rule-hidden-000-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-outset-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-outset-000.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'outset' border style</title>
<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-rule" title="4.5 '-moz-column-rule'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
<link rel="match" href="multicol-rule-groove-000-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="'border-style' values of -moz-column-rule are interpreted as in the collapsing border model in which case 'outset' value is drawn the same as 'groove'." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-percent-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-percent-001.xht
@@ -1,37 +1,37 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>CSS Multi-column Layout Test: -moz--moz-column-rule-width and percentage unit (basic)</title>
+ <title>CSS Multi-column Layout Test: -moz-column-rule-width and percentage unit (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-14 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz--moz-column-rule-width'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz-column-rule-width'" />
<link rel="match" href="multicol-containing-002-ref.xht" />
<meta name="flags" content="ahem invalid" />
- <meta name="assert" content="This test checks that the -moz--moz-column-rule-width property does not accept percentage unit in its values." />
+ <meta name="assert" content="This test checks that the -moz-column-rule-width property does not accept percentage unit in its values." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
<style type="text/css"><![CDATA[
div
{
color: green;
font: 1.25em/1 Ahem;
width: 19em;
-moz-column-count: 4;
-moz-column-gap: 1em;
- -moz--moz-column-rule-color: red;
- -moz--moz-column-rule-style: solid;
- -moz--moz-column-rule-width: 0;
- -moz--moz-column-rule-width: 200%;
+ -moz-column-rule-color: red;
+ -moz-column-rule-style: solid;
+ -moz-column-rule-width: 0;
+ -moz-column-rule-width: 200%;
}
]]></style>
</head>
<body>
<div>4444 1 1 1 1 4444 1 1 1 4444 1 1 1 1 4444 1 1 1 1 1 1 4444 1 1 4444 1 1 4444 4444 1 1 4444 1 1 4444</div>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-px-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-px-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolumn | -moz-column-rule</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gaps-and-rules"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
<link rel="match" href="multicol-rule-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
@@ -26,19 +26,19 @@ body>div {
margin: 1em;
border: 1em solid gray;
width: 15em;
orphans: 1;
widows: 1;
-moz-column-count: 4;
-moz-column-gap: 1em;
- -moz--moz-column-rule-color: blue;
- -moz--moz-column-rule-width: 16px;
- -moz--moz-column-rule-style: solid;
+ -moz-column-rule-color: blue;
+ -moz-column-rule-width: 16px;
+ -moz-column-rule-style: solid;
}
span {
background: blue;
position: absolute;
top: 0;
left: 3em;
height: 2em;
width: 16px;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-ridge-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-ridge-000.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'ridge' border style</title>
<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-rule" title="4.5 '-moz-column-rule'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
<link rel="match" href="multicol-rule-ridge-000-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-samelength-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-samelength-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>CSS Multi-column Layout Test: '-moz--moz-column-rule-width' has same lenght as '-moz-column-gap'</title>
+ <title>CSS Multi-column Layout Test: '-moz-column-rule-width' has same lenght as '-moz-column-gap'</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-15 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz--moz-column-rule-width'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz-column-rule-width'" />
<link rel="match" href="multicol-rule-samelength-001-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
@@ -37,19 +37,19 @@
color: transparent;
font: 1.25em/1 Ahem; /* equivalent to 20px/1 Ahem */
position: relative;
right: 40px;
width: 9em;
-moz-column-count: 2;
-moz-column-gap: 5em;
- -moz--moz-column-rule-color: green;
- -moz--moz-column-rule-style: solid;
- -moz--moz-column-rule-width: 5em;
+ -moz-column-rule-color: green;
+ -moz-column-rule-style: solid;
+ -moz-column-rule-width: 5em;
}
]]></style>
</head>
<body>
<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-shorthand-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-shorthand-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: '-moz-column-rule' shorthand</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-15 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz--moz-column-rule-width'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. '-moz-column-rule-width'" />
<link rel="match" href="multicol-rule-samelength-001-ref.xht" />
<meta name="flags" content="ahem invalid" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-solid-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-solid-000.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-rule shorthand with 'solid' border style</title>
<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-rule" title="4.5 '-moz-column-rule'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
<link rel="match" href="multicol-rule-solid-000-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-stacking-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-stacking-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolumn | -moz-column-count, stacking</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-gaps-and-rules"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
<link rel="match" href="multicol-rule-stacking-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-groove-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-groove-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>CSS Multi-column Layout Test: '-moz--moz-column-rule-style' groove</title>
+ <title>CSS Multi-column Layout Test: '-moz-column-rule-style' groove</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-15 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crs" title="4.3. '-moz--moz-column-rule-style'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crs" title="4.3. '-moz-column-rule-style'" />
<link rel="match" href="multicol-rule-style-groove-001-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-inset-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-inset-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>CSS Multi-column Layout Test: '-moz--moz-column-rule-style' inset</title>
+ <title>CSS Multi-column Layout Test: '-moz-column-rule-style' inset</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-15 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crs" title="4.3. '-moz--moz-column-rule-style'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crs" title="4.3. '-moz-column-rule-style'" />
<link rel="match" href="multicol-rule-style-ridge-001-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-outset-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-outset-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>CSS Multi-column Layout Test: '-moz--moz-column-rule-style' outset</title>
+ <title>CSS Multi-column Layout Test: '-moz-column-rule-style' outset</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-15 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crs" title="4.3. '-moz--moz-column-rule-style'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crs" title="4.3. '-moz-column-rule-style'" />
<link rel="match" href="multicol-rule-style-groove-001-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-ridge-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-style-ridge-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>CSS Multi-column Layout Test: '-moz--moz-column-rule-style' ridge</title>
+ <title>CSS Multi-column Layout Test: '-moz-column-rule-style' ridge</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-15 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crs" title="4.3. '-moz--moz-column-rule-style'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crs" title="4.3. '-moz-column-rule-style'" />
<link rel="match" href="multicol-rule-style-ridge-001-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-shorthand-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-shorthand-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolumn | invalid</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
<link rel="match" href="multicol-rule-ref.xht"/>
<meta name="flags" content="ahem invalid"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-000.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-000.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-span (basic)</title>
<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-rule" title="4.5 '-moz-column-rule'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 '-moz-column-rule'" />
<link rel="match" href="multicol-span-000-ref.xht" />
<meta name="flags" content="ahem image" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
@@ -36,17 +36,17 @@
W == 5em;
*/
}
div#test, div#reference {margin-bottom: 0.5em;}
- div#-moz-column-span
+ div#column-span
{
-moz-column-span: all;
font: inherit;
}
img
{
padding-right: 4em;
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: '-moz-column-span' element (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-16 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-span" title="6.1. '-moz-column-span'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
<link rel="match" href="multicol-span-all-001-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
@@ -51,17 +51,17 @@
-moz-column-span: all;
}
]]></style>
</head>
<body>
<div>
- <span id="top-first-and-second--moz-columns"> bl ue bl ue </span>
- <span id="top-third-and-fourth--moz-columns"> Pi nk Pi nk </span>
+ <span id="top-first-and-second-columns"> bl ue bl ue </span>
+ <span id="top-third-and-fourth-columns"> Pi nk Pi nk </span>
<h4> sPana </h4>
ab cd ef gh
ij kl mn oq
</div>
</body>
</html>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-002.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: '-moz-column-span' element - large margin-left and 'overflow: hidden'</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-16 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-span" title="6.1. '-moz-column-span'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
<link rel="match" href="multicol-span-all-002-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
@@ -59,17 +59,17 @@
*/
}
]]></style>
</head>
<body>
<div>
- <span id="top-first-and-second--moz-columns"> bl ue bl ue </span>
- <span id="top-third-and-fourth--moz-columns"> Pi nk Pi nk </span>
+ <span id="top-first-and-second-columns"> bl ue bl ue </span>
+ <span id="top-third-and-fourth-columns"> Pi nk Pi nk </span>
<h4> sPana </h4>
ab cd ef gh
ij kl mn oq
</div>
</body>
</html>
\ No newline at end of file
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-003.xht
@@ -1,14 +1,14 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: '-moz-column-span: all' (basic)</title>
<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-03 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-span" title="6.1. '-moz-column-span'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
<link rel="match" href="multicol-count-002-ref.xht"/>
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that '-moz-column-span: all' spans across all column boxes and that content in the normal flow (in this test, the '55555 55555 55555 55555') that appears before the element is automatically balanced across all -moz-columns before the element appears." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-block-sibling-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-block-sibling-003.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicol | -moz-column-span: all | block-level child</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning--moz-columns"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning-columns"/>
<link rel="match" href="multicol-span-all-block-sibling-3-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-child-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-child-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: '-moz-column-span: all' element with block children (complex)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-19 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-span" title="6.1. '-moz-column-span'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
<link rel="bookmark" title="[css3-multicol] spanning element with only block children" href="http://lists.w3.org/Archives/Public/www-style/2013Aug/0318.html" />
<link rel="match" href="multicol-span-all-child-001-ref.xht" />
<meta name="flags" content="ahem may" />
<meta name="assert" content="This test checks how a spanning element with block children is rendered inside a multi-column element with a set height which is insufficient for rendering the entire spanning element. Since the available height (10em)is insufficient to render the spanning element (height needed: 3 times 4em) entirely inside the multi-column element, then UA may treat '-moz-column-span: all' as '-moz-column-span: none'." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-child-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-child-002.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: '-moz-column-span: all' element with block children (complex)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-19 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-span" title="6.1. '-moz-column-span'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
<link rel="bookmark" title="[css3-multicol] spanning element with only block children" href="http://lists.w3.org/Archives/Public/www-style/2013Aug/0318.html" />
<link rel="match" href="multicol-span-all-child-002-ref.xht" />
<meta name="flags" content="may" />
<meta name="assert" content="This test checks how spanning elements with block children is rendered inside a multi-column element with a set height which is insufficient for rendering both spanning elements entirely. Since available space (height of 8em) is insufficient to render both spanning elements (4 times 4em plus 2em) entirely inside the multi-column element, then UA may treat '-moz-column-span: all' as '-moz-column-span: none'." />
<style type="text/css"><![CDATA[
html {background-color: white;}
body
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: '-moz-column-span: all' element and width exceeding available multi-colum width (complex)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-18 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-span" title="6.1. '-moz-column-span'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
<link rel="match" href="multicol-span-all-margin-001-ref.xht" />
<meta name="flags" content="ahem may" />
<meta name="assert" content="This test checks that when 'overflow' is set to 'hidden' on a multi-column element, then any spanning ('-moz-column-span: all') element exceeding the available width of the multi-column should be clipped accordingly." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-002.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: '-moz-column-span: all' element</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-19 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-span" title="6.1. '-moz-column-span'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
<link rel="match" href="multicol-span-all-margin-002-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-bottom-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-bottom-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: '-moz-column-span: all' element with vertical margins and width exceeding available multi-colum width (complex)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-19 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-span" title="6.1. '-moz-column-span'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
<link rel="match" href="multicol-span-all-margin-bottom-001-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: vertically adjacent spanning elements with nested margins (complex)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-19 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-span" title="6.1. '-moz-column-span'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
<link rel="match" href="multicol-span-all-margin-nested-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="In this test, the first h4 element would collapse its margin bottom with the top margin of div#child if only div#child was also a spanning element, which is not: the bottom margin of the first h4 element is 8em wide while the top margin of div#child is only 2em wide (1 column box wide). That is why the bottom margin of the first h4 element should not collapse with the top margin of div#child." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-002.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: vertically adjacent spanning elements with nested margins (complex)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-19 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-span" title="6.1. '-moz-column-span'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
<link rel="match" href="multicol-span-all-margin-nested-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="In this test, the first h4 element would collapse its margin bottom with the resulting (from a margin collapsing with its nested h4 element) of top margin of div#child if only div#child was also a spanning element, which is not: the bottom margin of the first h4 element is 8em wide while the top margin of div#child is only 2em wide (1 column box wide). That is why the bottom margin of the first h4 element should not collapse with the top margin of div#child." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-003.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolomn | -moz-column-span inside block</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning--moz-columns"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning-columns"/>
<link rel="match" href="multicol-span-all-margin-nested-3-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-firstchild-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-all-margin-nested-firstchild-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolumn | -moz-column-span</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning--moz-columns"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning-columns"/>
<link rel="match" href="multicol-span-all-margin-nested-firstchild-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-float-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-float-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>CSS Multi-column Layout Test: floating a -moz-column-spanning element</title>
+ <title>CSS Multi-column Layout Test: floating a column-spanning element</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-22 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#-moz-column-span" title="6.1. '-moz-column-span'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. '-moz-column-span'" />
<link rel="match" href="multicol-span-float-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that '-moz-column-span' does not apply to floating element." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-none-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-span-none-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-span: none (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-22 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning--moz-columns" title="6.1. '-moz-column-span'" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning-columns" title="6.1. '-moz-column-span'" />
<link rel="match" href="multicol-span-none-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks how a '-moz-column-span: none' element is rendered: it should not span across all column boxes." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-count and table-cell (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
<link rel="match" href="multicol-table-cell-001-ref.xht"/>
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that '-moz-column-count' applies to elements with 'display' set to 'table-cell'." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-height-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-height-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-count and height of table-cell (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
<link rel="match" href="multicol-table-cell-height-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that '-moz-column-count' applies to elements with 'display' set to 'table-cell' which can be constrained with a set height." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-height-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-table-cell-height-002.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-count and height of table-cell (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
<link rel="match" href="multicol-table-cell-height-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that '-moz-column-count' applies to elements with 'display' set to 'table-cell' which can be constrained with a set height. A set height for a table-cell still remains the minimum height required by the content, even when its layout is influenced by, conditioned by a multi-column layout." />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-width (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
<link rel="match" href="multicol-width-001-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-002.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-width (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
<link rel="match" href="multicol-width-002-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-003.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-003.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-width (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
<link rel="match" href="multicol-width-002-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-count-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-count-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: -moz-column-count and -moz-column-width (basic)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
- <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns" title="3. The number and width of -moz-columns" />
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of -moz-columns" />
<link rel="match" href="multicol-width-001-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
@font-face {
font-family: Ahem;
src: url("../../../fonts/Ahem.ttf");
}
]]></style>
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-ems-001.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-width-ems-001.xht
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>multicolumn | -moz-column-width</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of--moz-columns"/>
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
<link rel="match" href="multicol-width-ems-ref.xht"/>
<meta name="flags" content=""/>
<style type="text/css"><