diff --git a/layout/reftests/font-face/multiple-in-family-1-notref.html b/layout/reftests/font-face/multiple-in-family-1-notref.html index e2fab2c08fd..ec5e8f4da36 100644 --- a/layout/reftests/font-face/multiple-in-family-1-notref.html +++ b/layout/reftests/font-face/multiple-in-family-1-notref.html @@ -18,6 +18,9 @@

ABC

+

A

+

B

+

C

diff --git a/layout/reftests/font-face/multiple-in-family-1-ref.html b/layout/reftests/font-face/multiple-in-family-1-ref.html index f78c2b3acda..2e79e70d250 100644 --- a/layout/reftests/font-face/multiple-in-family-1-ref.html +++ b/layout/reftests/font-face/multiple-in-family-1-ref.html @@ -16,11 +16,19 @@ src: url(../fonts/markB.ttf); } + @font-face { + font-family: "MarkD"; + src: url(../fonts/markD.ttf); + } + -

ABC

+

DDC

+

A

+

B

+

C

diff --git a/layout/reftests/font-face/multiple-in-family-1.html b/layout/reftests/font-face/multiple-in-family-1.html index 43aa47139a4..0bc5bc8d02c 100644 --- a/layout/reftests/font-face/multiple-in-family-1.html +++ b/layout/reftests/font-face/multiple-in-family-1.html @@ -23,6 +23,9 @@

ABC

+

A

+

B

+

C

diff --git a/layout/reftests/font-face/order-2-ref.html b/layout/reftests/font-face/order-2-ref.html index 05dc8756080..35b31763765 100644 --- a/layout/reftests/font-face/order-2-ref.html +++ b/layout/reftests/font-face/order-2-ref.html @@ -7,28 +7,17 @@ -

ABC

+

XYC

diff --git a/layout/reftests/font-face/order-2.html b/layout/reftests/font-face/order-2.html index fa7a94d9d55..b6e6ddbb800 100644 --- a/layout/reftests/font-face/order-2.html +++ b/layout/reftests/font-face/order-2.html @@ -28,19 +28,11 @@ body { font-family: "One"; } - span.spacer { - /* to ensure the same vertical positioning of the text */ - display: inline-block; - height: 3em; - width: 1em; - vertical-align: baseline; - } - -

ABC

+

ABC

diff --git a/layout/reftests/font-face/order-3-ref.html b/layout/reftests/font-face/order-3-ref.html index 05dc8756080..35b31763765 100644 --- a/layout/reftests/font-face/order-3-ref.html +++ b/layout/reftests/font-face/order-3-ref.html @@ -7,28 +7,17 @@ -

ABC

+

XYC

diff --git a/layout/reftests/font-face/order-3.html b/layout/reftests/font-face/order-3.html index c1c215d1b3c..e481792da16 100644 --- a/layout/reftests/font-face/order-3.html +++ b/layout/reftests/font-face/order-3.html @@ -28,19 +28,11 @@ body { font-family: "One"; } - span.spacer { - /* to ensure the same vertical positioning of the text */ - display: inline-block; - height: 3em; - width: 1em; - vertical-align: baseline; - } - -

ABC

+

ABC

diff --git a/layout/reftests/font-face/reftest.list b/layout/reftests/font-face/reftest.list index c19871b59fa..150995ed9eb 100644 --- a/layout/reftests/font-face/reftest.list +++ b/layout/reftests/font-face/reftest.list @@ -19,9 +19,9 @@ fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") HTTP(..) == src-list-format-3.html src-list # FIXME: The behavior here is neither mandated nor specified by the spec, but # it really ought to be. HTTP(..) == order-1.html order-1-ref.html -fails-if(MOZ_WIDGET_TOOLKIT!="gtk2") HTTP(..) == order-2.html order-2-ref.html -fails-if(MOZ_WIDGET_TOOLKIT!="gtk2") HTTP(..) == order-3.html order-3-ref.html -fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") random-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) == multiple-in-family-1.html multiple-in-family-1-ref.html +fails HTTP(..) == order-2.html order-2-ref.html +fails HTTP(..) == order-3.html order-3-ref.html +fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") random-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) == multiple-in-family-1.html multiple-in-family-1-ref.html fails-if(MOZ_WIDGET_TOOLKIT=="gtk2") fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") random-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) != multiple-in-family-1.html multiple-in-family-1-notref.html random-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) == prop-order-over-rule-order-1a.html prop-order-over-rule-order-2a.html random-if(MOZ_WIDGET_TOOLKIT=="windows") HTTP(..) == prop-order-over-rule-order-1b.html prop-order-over-rule-order-2b.html diff --git a/layout/reftests/fonts/mark-generate.py b/layout/reftests/fonts/mark-generate.py index 50e9ea8380a..993aad3e90d 100755 --- a/layout/reftests/fonts/mark-generate.py +++ b/layout/reftests/fonts/mark-generate.py @@ -66,3 +66,22 @@ for codepoint in range(ord("A"), ord("D") + 1): g.width = width f.generate("mark" + mark + charname + ".ttf") + +# And, for references, generate markXmark2Y +f = fontforge.font() +n = "MarkXMark2Y" +f.fontname = n +f.familyname = n +f.fullname = n +f.copyright = "Copyright (c) 2008 Mozilla Corporation" + +g = f.createChar(ord("X"), "X") +g.importOutlines("mark-glyph.svg") +g.width = 1500 + +g = f.createChar(ord("Y"), "Y") +g.importOutlines("mark2-glyph.svg") +g.width = 1800 + +f.generate("markXmark2Y.ttf") + diff --git a/layout/reftests/fonts/markXmark2Y.ttf b/layout/reftests/fonts/markXmark2Y.ttf new file mode 100644 index 00000000000..7a949e34559 Binary files /dev/null and b/layout/reftests/fonts/markXmark2Y.ttf differ