Improve fonts.conf to assign directly to our fonts
authorCaio Marcelo de Oliveira Filho <>
Fri, 25 May 2012 15:03:22 +0000 (12:03 -0300)
committerBalazs Kelemen <>
Fri, 6 Jul 2012 14:28:29 +0000 (16:28 +0200)
Improve fonts.conf to assign directly to our fonts

Use the same strategy as the GTK and Chromium port and assign directly the
fonts used in LayoutTests to our available font choices. Also remove rules
that do not help this goal.

The fonts-qt5-wk1.conf is not needed anymore because the direct rules work
for Qt 4.8.2 and Qt 5.

Use Liberation font family for tests, instead of Nimbus.
Liberation provides the same metrics as MS Core fonts, and is used by
other ports, for example GTK.

The patch also fixes the problem of returning the wrong fonts when
monospaced was request.

The old expected png results were not changed, and will be properly
updated during the unskip stage.

For further information on the font discussion, see the webkit-qt mailing
list thread[1] and bug #85203.

18 files changed:
LiberationMono-Bold.ttf [new file with mode: 0644]
LiberationMono-BoldItalic.ttf [new file with mode: 0644]
LiberationMono-Italic.ttf [new file with mode: 0644]
LiberationMono-Regular.ttf [new file with mode: 0644]
LiberationSans-Bold.ttf [new file with mode: 0644]
LiberationSans-BoldItalic.ttf [new file with mode: 0644]
LiberationSans-Italic.ttf [new file with mode: 0644]
LiberationSans-Regular.ttf [new file with mode: 0644]
LiberationSansNarrow-Bold.ttf [new file with mode: 0644]
LiberationSansNarrow-BoldItalic.ttf [new file with mode: 0644]
LiberationSansNarrow-Italic.ttf [new file with mode: 0644]
LiberationSansNarrow-Regular.ttf [new file with mode: 0644]
LiberationSerif-Bold.ttf [new file with mode: 0644]
LiberationSerif-BoldItalic.ttf [new file with mode: 0644]
LiberationSerif-Italic.ttf [new file with mode: 0644]
LiberationSerif-Regular.ttf [new file with mode: 0644]
fonts-qt5-wk1.conf [deleted file]