Skip to content

Commit

Permalink
Remove duplicated fonts and put them under /fonts/ (#9718)
Browse files Browse the repository at this point in the history 
This patch removes the duplicated fonts we have in the repository
by copying them under /fonts/ and removing the duplicates.
The paths are updated accordingly to point to the new location.

In addition this patch moves the content of /css/fonts/ under /fonts/,
so there is a single common "fonts" folder on the repository.
  • Loading branch information
@mrego @gsnedders
mrego authored and gsnedders committed Mar 7, 2018
1 parent 857f5c3 commit e45d0cf
Show file tree
Hide file tree
Showing 1,370 changed files with 1,309 additions and 1,384 deletions.
4 changes: 2 additions & 2 deletions css/CSS2/visudet/content-height-002.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
font-family: 'high-a-only';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
unicode-range: U+0061, U+0020;
}
@font-face {
font-family: 'deep-b-only';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
unicode-range: U+0062, U+0020;
}

Expand Down
4 changes: 2 additions & 2 deletions css/CSS2/visudet/content-height-003.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
font-family: 'high-a-only';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
unicode-range: U+0061, U+0020;
}
@font-face {
font-family: 'deep-b-only';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
unicode-range: U+0062, U+0020;
}

Expand Down
4 changes: 2 additions & 2 deletions css/CSS2/visudet/content-height-004.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
font-family: 'high-a-only';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
unicode-range: U+0061, U+0020;
}
@font-face {
font-family: 'deep-b-only';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
unicode-range: U+0062, U+0020;
}

Expand Down
4 changes: 2 additions & 2 deletions css/CSS2/visudet/content-height-005.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
font-family: 'high';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
}
@font-face {
font-family: 'deep';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
}

div {
Expand Down
4 changes: 2 additions & 2 deletions css/CSS2/visudet/line-height-201.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
font-family: 'high-a-only';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
unicode-range: U+0020, U+0061;
}
@font-face {
font-family: 'deep-b-only';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
unicode-range: U+0062;
}

Expand Down
4 changes: 2 additions & 2 deletions css/CSS2/visudet/line-height-202.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
font-family: 'high-a-only';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
unicode-range: U+0020, U+0061;
}
@font-face {
font-family: 'deep-b-only';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
unicode-range: U+0062;
}

Expand Down
4 changes: 2 additions & 2 deletions css/CSS2/visudet/line-height-203.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
font-family: 'high';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
}
@font-face {
font-family: 'deep';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
}

div {
Expand Down
2 changes: 1 addition & 1 deletion css/CSS2/visudet/line-height-204.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
font-family: 'high';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
}

div {
Expand Down
4 changes: 2 additions & 2 deletions css/CSS2/visudet/line-height-205.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
font-family: 'high-a-only';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
unicode-range: U+0020, U+0061;
}
@font-face {
font-family: 'deep-b-only';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
unicode-range: U+0020, U+0062;
}

Expand Down
4 changes: 2 additions & 2 deletions css/CSS2/visudet/line-height-206.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
font-family: 'high-a-only';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
unicode-range: U+0061, U+0020;
}
@font-face {
font-family: 'deep-b-only';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
unicode-range: U+0062, U+0020;
}

Expand Down
4 changes: 2 additions & 2 deletions css/CSS2/visudet/reference/content-height-002-ref.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
font-family: 'high-a-only';
font-style: normal;
font-weight: 400;
src: url(../support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
unicode-range: U+0061;
}
@font-face {
font-family: 'deep-b-only';
font-style: normal;
font-weight: 400;
src: url(../support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
unicode-range: U+0062;
}

Expand Down
4 changes: 2 additions & 2 deletions css/CSS2/visudet/reference/content-height-003-ref.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
font-family: 'high-a-only';
font-style: normal;
font-weight: 400;
src: url(../support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
unicode-range: U+0061;
}
@font-face {
font-family: 'deep-b-only';
font-style: normal;
font-weight: 400;
src: url(../support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
unicode-range: U+0062;
}

Expand Down
2 changes: 1 addition & 1 deletion css/CSS2/visudet/reference/content-height-004-ref.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
font-family: 'high-a-only';
font-style: normal;
font-weight: 400;
src: url(../support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
unicode-range: U+0061;
}

Expand Down
2 changes: 1 addition & 1 deletion css/CSS2/visudet/reference/line-height-206-ref.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
font-family: 'high-a-only';
font-style: normal;
font-weight: 400;
src: url(../support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
unicode-range: U+0061;
}

Expand Down
2 changes: 1 addition & 1 deletion css/css-fonts/first-available-font-001-ref.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
font-family: 'B';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
}

div {
Expand Down
4 changes: 2 additions & 2 deletions css/css-fonts/first-available-font-001.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
font-family: 'A-no-space';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
unicode-range: U+0061; /* Not including U+0020, so it cannot be the first available font*/
}
@font-face {
font-family: 'B';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
}

div {
Expand Down
2 changes: 1 addition & 1 deletion css/css-fonts/first-available-font-002-ref.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
font-family: 'B';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
}

div {
Expand Down
4 changes: 2 additions & 2 deletions css/css-fonts/first-available-font-002.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
font-family: 'A-no-space';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
unicode-range: U+0061; /* Not including U+0020, so it cannot be the first available font*/
}
@font-face {
font-family: 'B';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
}

div {
Expand Down
2 changes: 1 addition & 1 deletion css/css-fonts/first-available-font-003-ref.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
font-family: 'A';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
}
div {
position: absolute;
Expand Down
4 changes: 2 additions & 2 deletions css/css-fonts/first-available-font-003.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
font-family: 'A';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
}
@font-face {
font-family: 'B-no-space';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
unicode-range: U+0062;
}

Expand Down
4 changes: 2 additions & 2 deletions css/css-fonts/first-available-font-004.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
font-family: 'A';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
}
@font-face {
font-family: 'B-no-space';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
unicode-range: U+0062;
}

Expand Down
6 changes: 3 additions & 3 deletions css/css-fonts/first-available-font-005.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@
font-family: 'A-no-space';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
unicode-range: U+0061;
}
@font-face {
font-family: 'B-no-space';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
unicode-range: U+0061;
}
@font-face {
font-family: 'B';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
}

div {
Expand Down
6 changes: 3 additions & 3 deletions css/css-fonts/first-available-font-006.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@
font-family: 'A-no-space';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
unicode-range: U+0061;
}
@font-face {
font-family: 'B-no-space';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
unicode-range: U+0061;
}
@font-face {
font-family: 'B';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
}

div {
Expand Down
4 changes: 2 additions & 2 deletions css/css-fonts/first-available-font-007.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
font-family: 'A-no-space';
font-style: normal;
font-weight: 400;
src: url(support/Revalia.woff) format('woff');
src: url(/fonts/Revalia.woff) format('woff');
unicode-range: U+0061;
}
@font-face {
font-family: 'B';
font-style: normal;
font-weight: 400;
src: url(support/AD.woff) format('woff');
src: url(/fonts/AD.woff) format('woff');
}

div {
Expand Down
2 changes: 1 addition & 1 deletion css/css-fonts/format-specifiers-variations.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"woff2-variations"
];

var defaultAhemSrc = 'url("../../fonts/Ahem.ttf") format("INSERT_FORMAT")';
var defaultAhemSrc = 'url("/fonts/Ahem.ttf") format("INSERT_FORMAT")';

function runTestOnFormatSpecifiers(formats, expectFail) {
for (var i = 0; i < formats.length; ++i) {
Expand Down
Binary file removed css/css-fonts/support/AD.woff
View file
Binary file not shown.
Binary file removed css/css-fonts/support/Revalia.woff
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion css/css-text-decor/reference/text-decoration-line-010-ref.xht
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@font-face
{
font-family: "mplus-1p-regular";
src: url("../support/mplus-1p-regular.woff") format("woff");
src: url("/fonts/mplus-1p-regular.woff") format("woff");
/* filesize: 803300 bytes (784.5 KBytes) */
/*
mplus-1p-regular.ttf can be downloaded at/from [TBD later]
Expand Down
2 changes: 1 addition & 1 deletion css/css-text-decor/reference/text-decoration-line-011-ref.xht
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@font-face
{
font-family: "mplus-1p-regular";
src: url("../support/mplus-1p-regular.woff") format("woff");
src: url("/fonts/mplus-1p-regular.woff") format("woff");
/* filesize: 803300 bytes (784.5 KBytes) */
/*
mplus-1p-regular.ttf can be downloaded at/from [TBD later]
Expand Down
Loading

1 comment on commit e45d0cf

@liamquin
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The trouble with this patch is that now none of the tests work on the Web - e.g. see
http://test.csswg.org/harness/test/css-writing-modes-3_dev/single/text-orientation-011/
and note in the console the 404 for the font.

Please sign in to comment.