diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 45cca3f03eb..f391204418c 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -118,7 +118,6 @@ MUI_SUBFONT HebrewFonts[] = { L"System", L"FreeSans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Times New Roman" }, - { L"Times New Roman", L"DejaVu Serif" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, @@ -363,7 +362,6 @@ MUI_SUBFONT UnicodeFonts[] = { L"Tahoma", L"DejaVu Sans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Times New Roman" }, - { L"Times New Roman", L"DejaVu Serif" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, @@ -398,7 +396,6 @@ MUI_SUBFONT HindiFonts[] = { L"Tahoma", L"FreeSans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Times New Roman" }, - { L"Times New Roman", L"DejaVu Serif" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 8e7f70ef994..964949ed187 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -11,28 +11,10 @@ list(APPEND FONT_FILES courbd.ttf courbi.ttf couri.ttf - DejaVuMathTeXGyre.ttf - DejaVuSans-Bold.ttf - DejaVuSans-BoldOblique.ttf - DejaVuSans-ExtraLight.ttf - DejaVuSans-Oblique.ttf - DejaVuSans.ttf - DejaVuSansCondensed-Bold.ttf - DejaVuSansCondensed-BoldOblique.ttf - DejaVuSansCondensed-Oblique.ttf - DejaVuSansCondensed.ttf DejaVuSansMono-Bold.ttf DejaVuSansMono-BoldOblique.ttf DejaVuSansMono-Oblique.ttf DejaVuSansMono.ttf - DejaVuSerif-Bold.ttf - DejaVuSerif-BoldItalic.ttf - DejaVuSerif-Italic.ttf - DejaVuSerif.ttf - DejaVuSerifCondensed-Bold.ttf - DejaVuSerifCondensed-BoldItalic.ttf - DejaVuSerifCondensed-Italic.ttf - DejaVuSerifCondensed.ttf framd.ttf framdit.ttf FreeMono.ttf @@ -43,65 +25,14 @@ list(APPEND FONT_FILES FreeSansBold.ttf FreeSansBoldOblique.ttf FreeSansOblique.ttf - FreeSerif.ttf - FreeSerifBold.ttf - FreeSerifBoldItalic.ttf - FreeSerifItalic.ttf FSEX301.ttf FSEX301-L2.ttf georgia.ttf georgiab.ttf georgiai.ttf georgiaz.ttf - LiberationMono-Bold.ttf - LiberationMono-BoldItalic.ttf - LiberationMono-Italic.ttf - LiberationMono-Regular.ttf - LiberationSans-Bold.ttf - LiberationSans-BoldItalic.ttf - LiberationSans-Italic.ttf - LiberationSans-Regular.ttf - LiberationSansNarrow-Bold.ttf - LiberationSansNarrow-BoldItalic.ttf - LiberationSansNarrow-Italic.ttf - LiberationSansNarrow-Regular.ttf - LiberationSerif-Bold.ttf - LiberationSerif-BoldItalic.ttf - LiberationSerif-Italic.ttf - LiberationSerif-Regular.ttf - LibreFranklin-Black.ttf - LibreFranklin-BlackItalic.ttf - LibreFranklin-Bold.ttf - LibreFranklin-BoldItalic.ttf - LibreFranklin-ExtraBold.ttf - LibreFranklin-ExtraBoldItalic.ttf - LibreFranklin-ExtraLight.ttf - LibreFranklin-ExtraLightItalic.ttf - LibreFranklin-Italic.ttf - LibreFranklin-Light.ttf - LibreFranklin-LightItalic.ttf - LibreFranklin-Medium.ttf - LibreFranklin-MediumItalic.ttf - LibreFranklin-Regular.ttf - LibreFranklin-SemiBold.ttf - LibreFranklin-SemiBoldItalic.ttf - LibreFranklin-Thin.ttf - LibreFranklin-ThinItalic.ttf lucon.ttf Marlett.ttf - OpenSans-Bold.ttf - OpenSans-BoldItalic.ttf - OpenSans-CondBold.ttf - OpenSans-CondLight.ttf - OpenSans-CondLightItalic.ttf - OpenSans-ExtraBold.ttf - OpenSans-ExtraBoldItalic.ttf - OpenSans-Italic.ttf - OpenSans-Light.ttf - OpenSans-LightItalic.ttf - OpenSans-Regular.ttf - OpenSans-Semibold.ttf - OpenSans-SemiboldItalic.ttf pala.ttf palab.ttf palabi.ttf @@ -129,19 +60,6 @@ list(APPEND FONT_FILES trebucbd.ttf trebucbi.ttf trebucit.ttf - Ubuntu-B.ttf - Ubuntu-BI.ttf - Ubuntu-C.ttf - Ubuntu-L.ttf - Ubuntu-LI.ttf - Ubuntu-M.ttf - Ubuntu-MI.ttf - UbuntuMono-B.ttf - UbuntuMono-BI.ttf - UbuntuMono-R.ttf - UbuntuMono-RI.ttf - Ubuntu-R.ttf - Ubuntu-RI.ttf UniVGA16.ttf verdanab.ttf verdanaz.ttf diff --git a/media/fonts/DejaVuMathTeXGyre.ttf b/media/fonts/DejaVuMathTeXGyre.ttf deleted file mode 100644 index 8a24f06400e..00000000000 Binary files a/media/fonts/DejaVuMathTeXGyre.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSans-Bold.ttf b/media/fonts/DejaVuSans-Bold.ttf deleted file mode 100644 index 6d65fa7dc41..00000000000 Binary files a/media/fonts/DejaVuSans-Bold.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSans-BoldOblique.ttf b/media/fonts/DejaVuSans-BoldOblique.ttf deleted file mode 100644 index 753f2d80b1f..00000000000 Binary files a/media/fonts/DejaVuSans-BoldOblique.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSans-ExtraLight.ttf b/media/fonts/DejaVuSans-ExtraLight.ttf deleted file mode 100644 index b09f32d7d6a..00000000000 Binary files a/media/fonts/DejaVuSans-ExtraLight.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSans-Oblique.ttf b/media/fonts/DejaVuSans-Oblique.ttf deleted file mode 100644 index 999bac77141..00000000000 Binary files a/media/fonts/DejaVuSans-Oblique.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSans.ttf b/media/fonts/DejaVuSans.ttf deleted file mode 100644 index e5f7eecce43..00000000000 Binary files a/media/fonts/DejaVuSans.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSansCondensed-Bold.ttf b/media/fonts/DejaVuSansCondensed-Bold.ttf deleted file mode 100644 index 22987c62d93..00000000000 Binary files a/media/fonts/DejaVuSansCondensed-Bold.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSansCondensed-BoldOblique.ttf b/media/fonts/DejaVuSansCondensed-BoldOblique.ttf deleted file mode 100644 index f5fa0ca26f4..00000000000 Binary files a/media/fonts/DejaVuSansCondensed-BoldOblique.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSansCondensed-Oblique.ttf b/media/fonts/DejaVuSansCondensed-Oblique.ttf deleted file mode 100644 index 7fde9078940..00000000000 Binary files a/media/fonts/DejaVuSansCondensed-Oblique.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSansCondensed.ttf b/media/fonts/DejaVuSansCondensed.ttf deleted file mode 100644 index 3259bc21ae0..00000000000 Binary files a/media/fonts/DejaVuSansCondensed.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSerif-Bold.ttf b/media/fonts/DejaVuSerif-Bold.ttf deleted file mode 100644 index 3bb755fa1ea..00000000000 Binary files a/media/fonts/DejaVuSerif-Bold.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSerif-BoldItalic.ttf b/media/fonts/DejaVuSerif-BoldItalic.ttf deleted file mode 100644 index a36dd4b70a8..00000000000 Binary files a/media/fonts/DejaVuSerif-BoldItalic.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSerif-Italic.ttf b/media/fonts/DejaVuSerif-Italic.ttf deleted file mode 100644 index 805daf2228b..00000000000 Binary files a/media/fonts/DejaVuSerif-Italic.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSerif.ttf b/media/fonts/DejaVuSerif.ttf deleted file mode 100644 index 0b803d206c1..00000000000 Binary files a/media/fonts/DejaVuSerif.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSerifCondensed-Bold.ttf b/media/fonts/DejaVuSerifCondensed-Bold.ttf deleted file mode 100644 index 222bf134bca..00000000000 Binary files a/media/fonts/DejaVuSerifCondensed-Bold.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSerifCondensed-BoldItalic.ttf b/media/fonts/DejaVuSerifCondensed-BoldItalic.ttf deleted file mode 100644 index e44663695d5..00000000000 Binary files a/media/fonts/DejaVuSerifCondensed-BoldItalic.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSerifCondensed-Italic.ttf b/media/fonts/DejaVuSerifCondensed-Italic.ttf deleted file mode 100644 index c529df31bff..00000000000 Binary files a/media/fonts/DejaVuSerifCondensed-Italic.ttf and /dev/null differ diff --git a/media/fonts/DejaVuSerifCondensed.ttf b/media/fonts/DejaVuSerifCondensed.ttf deleted file mode 100644 index d3959b32286..00000000000 Binary files a/media/fonts/DejaVuSerifCondensed.ttf and /dev/null differ diff --git a/media/fonts/FreeSerif.ttf b/media/fonts/FreeSerif.ttf deleted file mode 100644 index 889c594f667..00000000000 Binary files a/media/fonts/FreeSerif.ttf and /dev/null differ diff --git a/media/fonts/FreeSerifBold.ttf b/media/fonts/FreeSerifBold.ttf deleted file mode 100644 index 49112d3a92c..00000000000 Binary files a/media/fonts/FreeSerifBold.ttf and /dev/null differ diff --git a/media/fonts/FreeSerifBoldItalic.ttf b/media/fonts/FreeSerifBoldItalic.ttf deleted file mode 100644 index c41a9651aa8..00000000000 Binary files a/media/fonts/FreeSerifBoldItalic.ttf and /dev/null differ diff --git a/media/fonts/FreeSerifItalic.ttf b/media/fonts/FreeSerifItalic.ttf deleted file mode 100644 index 4ea68896dc3..00000000000 Binary files a/media/fonts/FreeSerifItalic.ttf and /dev/null differ diff --git a/media/fonts/LiberationMono-Bold.ttf b/media/fonts/LiberationMono-Bold.ttf deleted file mode 100644 index 9997cdaa334..00000000000 Binary files a/media/fonts/LiberationMono-Bold.ttf and /dev/null differ diff --git a/media/fonts/LiberationMono-BoldItalic.ttf b/media/fonts/LiberationMono-BoldItalic.ttf deleted file mode 100644 index 85eb01be994..00000000000 Binary files a/media/fonts/LiberationMono-BoldItalic.ttf and /dev/null differ diff --git a/media/fonts/LiberationMono-Italic.ttf b/media/fonts/LiberationMono-Italic.ttf deleted file mode 100644 index 5302690d105..00000000000 Binary files a/media/fonts/LiberationMono-Italic.ttf and /dev/null differ diff --git a/media/fonts/LiberationMono-Regular.ttf b/media/fonts/LiberationMono-Regular.ttf deleted file mode 100644 index 1a39bc75633..00000000000 Binary files a/media/fonts/LiberationMono-Regular.ttf and /dev/null differ diff --git a/media/fonts/LiberationSans-Bold.ttf b/media/fonts/LiberationSans-Bold.ttf deleted file mode 100644 index 4581ebf3ee0..00000000000 Binary files a/media/fonts/LiberationSans-Bold.ttf and /dev/null differ diff --git a/media/fonts/LiberationSans-BoldItalic.ttf b/media/fonts/LiberationSans-BoldItalic.ttf deleted file mode 100644 index bfbcd26b559..00000000000 Binary files a/media/fonts/LiberationSans-BoldItalic.ttf and /dev/null differ diff --git a/media/fonts/LiberationSans-Italic.ttf b/media/fonts/LiberationSans-Italic.ttf deleted file mode 100644 index fcdab8850b2..00000000000 Binary files a/media/fonts/LiberationSans-Italic.ttf and /dev/null differ diff --git a/media/fonts/LiberationSans-Regular.ttf b/media/fonts/LiberationSans-Regular.ttf deleted file mode 100644 index 626dd9364f1..00000000000 Binary files a/media/fonts/LiberationSans-Regular.ttf and /dev/null differ diff --git a/media/fonts/LiberationSansNarrow-Bold.ttf b/media/fonts/LiberationSansNarrow-Bold.ttf deleted file mode 100644 index 6e2e6a39743..00000000000 Binary files a/media/fonts/LiberationSansNarrow-Bold.ttf and /dev/null differ diff --git a/media/fonts/LiberationSansNarrow-BoldItalic.ttf b/media/fonts/LiberationSansNarrow-BoldItalic.ttf deleted file mode 100644 index ddfc00446c2..00000000000 Binary files a/media/fonts/LiberationSansNarrow-BoldItalic.ttf and /dev/null differ diff --git a/media/fonts/LiberationSansNarrow-Italic.ttf b/media/fonts/LiberationSansNarrow-Italic.ttf deleted file mode 100644 index 7f919dde696..00000000000 Binary files a/media/fonts/LiberationSansNarrow-Italic.ttf and /dev/null differ diff --git a/media/fonts/LiberationSansNarrow-Regular.ttf b/media/fonts/LiberationSansNarrow-Regular.ttf deleted file mode 100644 index 89cd06672da..00000000000 Binary files a/media/fonts/LiberationSansNarrow-Regular.ttf and /dev/null differ diff --git a/media/fonts/LiberationSerif-Bold.ttf b/media/fonts/LiberationSerif-Bold.ttf deleted file mode 100644 index db3d6f38c9b..00000000000 Binary files a/media/fonts/LiberationSerif-Bold.ttf and /dev/null differ diff --git a/media/fonts/LiberationSerif-BoldItalic.ttf b/media/fonts/LiberationSerif-BoldItalic.ttf deleted file mode 100644 index 8b21277592c..00000000000 Binary files a/media/fonts/LiberationSerif-BoldItalic.ttf and /dev/null differ diff --git a/media/fonts/LiberationSerif-Italic.ttf b/media/fonts/LiberationSerif-Italic.ttf deleted file mode 100644 index 768b83389e8..00000000000 Binary files a/media/fonts/LiberationSerif-Italic.ttf and /dev/null differ diff --git a/media/fonts/LiberationSerif-Regular.ttf b/media/fonts/LiberationSerif-Regular.ttf deleted file mode 100644 index 6fa9a59e34c..00000000000 Binary files a/media/fonts/LiberationSerif-Regular.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-Black.ttf b/media/fonts/LibreFranklin-Black.ttf deleted file mode 100644 index 34170c7cca5..00000000000 Binary files a/media/fonts/LibreFranklin-Black.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-BlackItalic.ttf b/media/fonts/LibreFranklin-BlackItalic.ttf deleted file mode 100644 index dc554ada716..00000000000 Binary files a/media/fonts/LibreFranklin-BlackItalic.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-Bold.ttf b/media/fonts/LibreFranklin-Bold.ttf deleted file mode 100644 index 014605d0bcb..00000000000 Binary files a/media/fonts/LibreFranklin-Bold.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-BoldItalic.ttf b/media/fonts/LibreFranklin-BoldItalic.ttf deleted file mode 100644 index 79ba6146cae..00000000000 Binary files a/media/fonts/LibreFranklin-BoldItalic.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-ExtraBold.ttf b/media/fonts/LibreFranklin-ExtraBold.ttf deleted file mode 100644 index 9ef79fd9509..00000000000 Binary files a/media/fonts/LibreFranklin-ExtraBold.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-ExtraBoldItalic.ttf b/media/fonts/LibreFranklin-ExtraBoldItalic.ttf deleted file mode 100644 index a40e9bc983e..00000000000 Binary files a/media/fonts/LibreFranklin-ExtraBoldItalic.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-ExtraLight.ttf b/media/fonts/LibreFranklin-ExtraLight.ttf deleted file mode 100644 index a854a2b3800..00000000000 Binary files a/media/fonts/LibreFranklin-ExtraLight.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-ExtraLightItalic.ttf b/media/fonts/LibreFranklin-ExtraLightItalic.ttf deleted file mode 100644 index 02ac7b92ead..00000000000 Binary files a/media/fonts/LibreFranklin-ExtraLightItalic.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-Italic.ttf b/media/fonts/LibreFranklin-Italic.ttf deleted file mode 100644 index c39d90ad52b..00000000000 Binary files a/media/fonts/LibreFranklin-Italic.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-Light.ttf b/media/fonts/LibreFranklin-Light.ttf deleted file mode 100644 index e7bf25eaf8a..00000000000 Binary files a/media/fonts/LibreFranklin-Light.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-LightItalic.ttf b/media/fonts/LibreFranklin-LightItalic.ttf deleted file mode 100644 index 2bb09ebf822..00000000000 Binary files a/media/fonts/LibreFranklin-LightItalic.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-Medium.ttf b/media/fonts/LibreFranklin-Medium.ttf deleted file mode 100644 index a82dacbdb02..00000000000 Binary files a/media/fonts/LibreFranklin-Medium.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-MediumItalic.ttf b/media/fonts/LibreFranklin-MediumItalic.ttf deleted file mode 100644 index 7d811c0ae9e..00000000000 Binary files a/media/fonts/LibreFranklin-MediumItalic.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-Regular.ttf b/media/fonts/LibreFranklin-Regular.ttf deleted file mode 100644 index d4e19a7881a..00000000000 Binary files a/media/fonts/LibreFranklin-Regular.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-SemiBold.ttf b/media/fonts/LibreFranklin-SemiBold.ttf deleted file mode 100644 index 9a3cf107a58..00000000000 Binary files a/media/fonts/LibreFranklin-SemiBold.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-SemiBoldItalic.ttf b/media/fonts/LibreFranklin-SemiBoldItalic.ttf deleted file mode 100644 index f49cf9ff0f2..00000000000 Binary files a/media/fonts/LibreFranklin-SemiBoldItalic.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-Thin.ttf b/media/fonts/LibreFranklin-Thin.ttf deleted file mode 100644 index ecced8a76e7..00000000000 Binary files a/media/fonts/LibreFranklin-Thin.ttf and /dev/null differ diff --git a/media/fonts/LibreFranklin-ThinItalic.ttf b/media/fonts/LibreFranklin-ThinItalic.ttf deleted file mode 100644 index 018e3fcfe92..00000000000 Binary files a/media/fonts/LibreFranklin-ThinItalic.ttf and /dev/null differ diff --git a/media/fonts/OpenSans-Bold.ttf b/media/fonts/OpenSans-Bold.ttf deleted file mode 100644 index fd79d43bea0..00000000000 Binary files a/media/fonts/OpenSans-Bold.ttf and /dev/null differ diff --git a/media/fonts/OpenSans-BoldItalic.ttf b/media/fonts/OpenSans-BoldItalic.ttf deleted file mode 100644 index 9bc800958a4..00000000000 Binary files a/media/fonts/OpenSans-BoldItalic.ttf and /dev/null differ diff --git a/media/fonts/OpenSans-CondBold.ttf b/media/fonts/OpenSans-CondBold.ttf deleted file mode 100644 index 83966f21381..00000000000 Binary files a/media/fonts/OpenSans-CondBold.ttf and /dev/null differ diff --git a/media/fonts/OpenSans-CondLight.ttf b/media/fonts/OpenSans-CondLight.ttf deleted file mode 100644 index 97c355b9f67..00000000000 Binary files a/media/fonts/OpenSans-CondLight.ttf and /dev/null differ diff --git a/media/fonts/OpenSans-CondLightItalic.ttf b/media/fonts/OpenSans-CondLightItalic.ttf deleted file mode 100644 index 0b45898db8e..00000000000 Binary files a/media/fonts/OpenSans-CondLightItalic.ttf and /dev/null differ diff --git a/media/fonts/OpenSans-ExtraBold.ttf b/media/fonts/OpenSans-ExtraBold.ttf deleted file mode 100644 index 21f6f84a079..00000000000 Binary files a/media/fonts/OpenSans-ExtraBold.ttf and /dev/null differ diff --git a/media/fonts/OpenSans-ExtraBoldItalic.ttf b/media/fonts/OpenSans-ExtraBoldItalic.ttf deleted file mode 100644 index 31cb688340e..00000000000 Binary files a/media/fonts/OpenSans-ExtraBoldItalic.ttf and /dev/null differ diff --git a/media/fonts/OpenSans-Italic.ttf b/media/fonts/OpenSans-Italic.ttf deleted file mode 100644 index c90da48ff3b..00000000000 Binary files a/media/fonts/OpenSans-Italic.ttf and /dev/null differ diff --git a/media/fonts/OpenSans-Light.ttf b/media/fonts/OpenSans-Light.ttf deleted file mode 100644 index 0d381897da2..00000000000 Binary files a/media/fonts/OpenSans-Light.ttf and /dev/null differ diff --git a/media/fonts/OpenSans-LightItalic.ttf b/media/fonts/OpenSans-LightItalic.ttf deleted file mode 100644 index 68299c4bc6b..00000000000 Binary files a/media/fonts/OpenSans-LightItalic.ttf and /dev/null differ diff --git a/media/fonts/OpenSans-Regular.ttf b/media/fonts/OpenSans-Regular.ttf deleted file mode 100644 index db433349b70..00000000000 Binary files a/media/fonts/OpenSans-Regular.ttf and /dev/null differ diff --git a/media/fonts/OpenSans-Semibold.ttf b/media/fonts/OpenSans-Semibold.ttf deleted file mode 100644 index 1a7679e3949..00000000000 Binary files a/media/fonts/OpenSans-Semibold.ttf and /dev/null differ diff --git a/media/fonts/OpenSans-SemiboldItalic.ttf b/media/fonts/OpenSans-SemiboldItalic.ttf deleted file mode 100644 index 59b6d16b065..00000000000 Binary files a/media/fonts/OpenSans-SemiboldItalic.ttf and /dev/null differ diff --git a/media/fonts/Ubuntu-B.ttf b/media/fonts/Ubuntu-B.ttf deleted file mode 100644 index b173da27417..00000000000 Binary files a/media/fonts/Ubuntu-B.ttf and /dev/null differ diff --git a/media/fonts/Ubuntu-BI.ttf b/media/fonts/Ubuntu-BI.ttf deleted file mode 100644 index 72a5a99ac0c..00000000000 Binary files a/media/fonts/Ubuntu-BI.ttf and /dev/null differ diff --git a/media/fonts/Ubuntu-C.ttf b/media/fonts/Ubuntu-C.ttf deleted file mode 100644 index 602a3ee4ab2..00000000000 Binary files a/media/fonts/Ubuntu-C.ttf and /dev/null differ diff --git a/media/fonts/Ubuntu-L.ttf b/media/fonts/Ubuntu-L.ttf deleted file mode 100644 index ed0f5bce879..00000000000 Binary files a/media/fonts/Ubuntu-L.ttf and /dev/null differ diff --git a/media/fonts/Ubuntu-LI.ttf b/media/fonts/Ubuntu-LI.ttf deleted file mode 100644 index c6cec55fcd5..00000000000 Binary files a/media/fonts/Ubuntu-LI.ttf and /dev/null differ diff --git a/media/fonts/Ubuntu-M.ttf b/media/fonts/Ubuntu-M.ttf deleted file mode 100644 index ca9c03a4767..00000000000 Binary files a/media/fonts/Ubuntu-M.ttf and /dev/null differ diff --git a/media/fonts/Ubuntu-MI.ttf b/media/fonts/Ubuntu-MI.ttf deleted file mode 100644 index e8d186c510a..00000000000 Binary files a/media/fonts/Ubuntu-MI.ttf and /dev/null differ diff --git a/media/fonts/Ubuntu-R.ttf b/media/fonts/Ubuntu-R.ttf deleted file mode 100644 index d748728a207..00000000000 Binary files a/media/fonts/Ubuntu-R.ttf and /dev/null differ diff --git a/media/fonts/Ubuntu-RI.ttf b/media/fonts/Ubuntu-RI.ttf deleted file mode 100644 index 4f2d2bc7cb6..00000000000 Binary files a/media/fonts/Ubuntu-RI.ttf and /dev/null differ diff --git a/media/fonts/UbuntuMono-B.ttf b/media/fonts/UbuntuMono-B.ttf deleted file mode 100644 index 7bd66657657..00000000000 Binary files a/media/fonts/UbuntuMono-B.ttf and /dev/null differ diff --git a/media/fonts/UbuntuMono-BI.ttf b/media/fonts/UbuntuMono-BI.ttf deleted file mode 100644 index 6c5b8ba023e..00000000000 Binary files a/media/fonts/UbuntuMono-BI.ttf and /dev/null differ diff --git a/media/fonts/UbuntuMono-R.ttf b/media/fonts/UbuntuMono-R.ttf deleted file mode 100644 index fdd309d7166..00000000000 Binary files a/media/fonts/UbuntuMono-R.ttf and /dev/null differ diff --git a/media/fonts/UbuntuMono-RI.ttf b/media/fonts/UbuntuMono-RI.ttf deleted file mode 100644 index 18f81a29258..00000000000 Binary files a/media/fonts/UbuntuMono-RI.ttf and /dev/null differ diff --git a/media/fonts/UniVGA16.ttf b/media/fonts/UniVGA16.ttf index e7b74a6030d..9702b4b33ce 100644 Binary files a/media/fonts/UniVGA16.ttf and b/media/fonts/UniVGA16.ttf differ diff --git a/media/fonts/doc/Liberation/AUTHORS.txt b/media/fonts/doc/Liberation/AUTHORS.txt deleted file mode 100644 index 3bb7b6a17ea..00000000000 --- a/media/fonts/doc/Liberation/AUTHORS.txt +++ /dev/null @@ -1,12 +0,0 @@ -AUTHORS - -Current Contributors (sorted alphabetically): - - Pravin Satpute - Project Owner (Current) - Red Hat, Inc. - -Previous Contributors - - - Steve Matteson - Original Designer - Ascender, Inc. diff --git a/media/fonts/doc/Liberation/ChangeLog.txt b/media/fonts/doc/Liberation/ChangeLog.txt deleted file mode 100644 index cd508713ee9..00000000000 --- a/media/fonts/doc/Liberation/ChangeLog.txt +++ /dev/null @@ -1,14 +0,0 @@ -* Thu Oct 04 2012 Pravin Satpute -- Resolved "Glyphs with multiple unicode encodings inhibit subsetting" #851790 -- Resolved #851791, #854601 and #851825 -- Following GASP table version as per Liberation old version. (Anti-aliasing disabled) -- Added support for Serbian glyphs for wikipedia #657849 -- In Monospace fonts, isFixedPitch bit set via script for getting it recognized as Monospace in putty.exe - -* Fri Jul 06 2012 Pravin Satpute -- Initial version of Liberation fonts based on croscore fonts version 1.21.0 -- Converted TTF files into SFD files to be open source. -- Update Copyright and License file -- set fsType bit to 0, Installable Embedding is allowed. -- Absolute value in HHeadAscent/Descent values for maintaining Metric compatibility. - diff --git a/media/fonts/doc/Liberation/LICENSE.txt b/media/fonts/doc/Liberation/LICENSE.txt deleted file mode 100644 index aba73e8a403..00000000000 --- a/media/fonts/doc/Liberation/LICENSE.txt +++ /dev/null @@ -1,102 +0,0 @@ -Digitized data copyright (c) 2010 Google Corporation - with Reserved Font Arimo, Tinos and Cousine. -Copyright (c) 2012 Red Hat, Inc. - with Reserved Font Name Liberation. - -This Font Software is licensed under the SIL Open Font License, -Version 1.1. - -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 - -PREAMBLE The goals of the Open Font License (OFL) are to stimulate -worldwide development of collaborative font projects, to support the font -creation efforts of academic and linguistic communities, and to provide -a free and open framework in which fonts may be shared and improved in -partnership with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. -The fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply to -any document created using the fonts or their derivatives. - - - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. -This may include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components -as distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting ? in part or in whole ? -any of the components of the Original Version, by changing formats or -by porting the Font Software to a new environment. - -"Author" refers to any designer, engineer, programmer, technical writer -or other person who contributed to the Font Software. - - -PERMISSION & CONDITIONS - -Permission is hereby granted, free of charge, to any person obtaining a -copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components,in - Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, - redistributed and/or sold with any software, provided that each copy - contains the above copyright notice and this license. These can be - included either as stand-alone text files, human-readable headers or - in the appropriate machine-readable metadata fields within text or - binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font - Name(s) unless explicit written permission is granted by the - corresponding Copyright Holder. This restriction only applies to the - primary font name as presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font - Software shall not be used to promote, endorse or advertise any - Modified Version, except to acknowledge the contribution(s) of the - Copyright Holder(s) and the Author(s) or with their explicit written - permission. - -5) The Font Software, modified or unmodified, in part or in whole, must - be distributed entirely under this license, and must not be distributed - under any other license. The requirement for fonts to remain under - this license does not apply to any document created using the Font - Software. - - - -TERMINATION -This license becomes null and void if any of the above conditions are not met. - - - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER -DEALINGS IN THE FONT SOFTWARE. - diff --git a/media/fonts/doc/Liberation/README.txt b/media/fonts/doc/Liberation/README.txt deleted file mode 100644 index 572952a6fb9..00000000000 --- a/media/fonts/doc/Liberation/README.txt +++ /dev/null @@ -1,80 +0,0 @@ - 1. What's this? - ================= - - The Liberation Fonts is font collection which aims to provide document - layout compatibility as usage of Times New Roman, Arial, Courier New. - - - 2. Requirements - ================= - - * fontforge is installed. - (http://fontforge.sourceforge.net) - - - 3. Install - ============ - - 3.1 Decompress tarball - - You can extract the files by following command: - - $ tar zxvf liberation-fonts-[VERSION].tar.gz - - 3.2 Build from the source - - Change into directory liberation-fonts-[VERSION]/ and build from sources by - following commands: - - $ cd liberation-fonts-[VERSION] - $ make - - The built font files will be available in 'build' directory. - - 3.3 Install to system - - For Fedora, you could manually install the fonts by copying the TTFs to - ~/.fonts for user wide usage, or to /usr/share/fonts/truetype/liberation - for system-wide availability. Then, run "fc-cache" to let that cached. - - For other distributions, please check out corresponding documentation. - - - 4. Usage - ========== - - Simply select preferred liberation font in applications and start using. - - - 5. License - ============ - - This Font Software is licensed under the SIL Open Font License, - Version 1.1. - - Please read file "LICENSE" for details. - - - 6. For Maintainers - ==================== - - Before packaging a new release based on a new source tarball, you have to - update the version suffix in the Makefile: - - VER = [VERSION] - - Make sure that the defined version corresponds to the font software metadata - which you can check with ftinfo/otfinfo or fontforge itself. It is highly - recommended that file 'ChangeLog' is updated to reflect changes. - - Create a tarball with the following command: - - $ make dist - - The new versioned tarball will be available in the dist/ folder as - 'liberation-fonts-[NEW_VERSION].tar.gz'. - - 7. Credits - ============ - - Please read file "AUTHORS" for list of contributors. diff --git a/media/fonts/doc/Liberation/TODO.txt b/media/fonts/doc/Liberation/TODO.txt deleted file mode 100644 index efc01771ca6..00000000000 --- a/media/fonts/doc/Liberation/TODO.txt +++ /dev/null @@ -1,5 +0,0 @@ -Here are todo for next release -1) Serbian glyph for wikipedia https://bugzilla.redhat.com/show_bug.cgi?id=657849 - - Improving shape of S_BE https://bugzilla.redhat.com/show_bug.cgi?id=657849#c96 -2) Liberation Mono not recognizing as Mono in Windows application #861003 - - presently it is patch, we have to update zero width characters to fixed width diff --git a/media/fonts/doc/LibreFranklin/SIL Open Font License.txt b/media/fonts/doc/LibreFranklin/SIL Open Font License.txt deleted file mode 100644 index e9792ccdb40..00000000000 --- a/media/fonts/doc/LibreFranklin/SIL Open Font License.txt +++ /dev/null @@ -1,43 +0,0 @@ -Copyright (c) 2015, Impallari Type (www.impallari.com) - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others. - -The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the copyright statement(s). - -"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. - -"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission. - -5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file diff --git a/media/fonts/doc/Ubuntu/CONTRIBUTING.txt b/media/fonts/doc/Ubuntu/CONTRIBUTING.txt deleted file mode 100644 index 15bdc0c0b09..00000000000 --- a/media/fonts/doc/Ubuntu/CONTRIBUTING.txt +++ /dev/null @@ -1,21 +0,0 @@ -The Ubuntu Font Family is very long-term endeavour, and the first time -that a professionally-designed font has been funded specifically with -the intent of being an on-going community expanded project: - - http://font.ubuntu.com/ - -Development of the Ubuntu Font Family is undertaken on Launchpad: - - http://launchpad.net/ubuntu-font-family/ - -and this is where milestones, bug management and releases are handled. - -Contributions are welcomed. Your work will be used on millions of -computers every single day! Following the initial bootstrapping of -Latin, Cyrillic, Greek, Arabic and Hebrew expansion will be undertaken -by font designers from the font design and Ubuntu communities. - -To ensure that the Ubuntu Font Family can be re-licensed to future -widely-used libre font licences, copyright assignment is being required: - - https://launchpad.net/~uff-contributors diff --git a/media/fonts/doc/Ubuntu/FONTLOG.txt b/media/fonts/doc/Ubuntu/FONTLOG.txt deleted file mode 100644 index 83022be7e82..00000000000 --- a/media/fonts/doc/Ubuntu/FONTLOG.txt +++ /dev/null @@ -1,292 +0,0 @@ -This is the FONTLOG file for the Ubuntu Font Family and attempts to follow -the recommendations at: http://scripts.sil.org/OFL-FAQ_web#43cecb44 - - -Overview - -The new Ubuntu Font Family was started to enable the personality of -Ubuntu to be seen and felt in every menu, button and dialog. -The typeface is sans-serif, uses OpenType features and is manually -hinted for clarity on desktop and mobile computing screens. - -The scope of the Ubuntu Font Family includes all the languages used by -the various Ubuntu users around the world in tune with Ubuntu's -philosophy which states that every user should be able to use their -software in the language of their choice. So the Ubuntu Font Family -project will be extended to cover many more written languages. - - -History - -The Ubuntu Font Family has been creating during 2010 and 2011. As of -September 2011 coverage is provided for Latin, Cyrillic and Greek across -Regular, Italic, Bold and Bold-Italic. Further work was uptaken during -2015. - - -ChangeLog - -2015-08-21 (Paul Sladen) Ubuntu Font Family version 0.83 - - Note: This release was created by binary patching from the v0.80 - release using the scripts in 'sources/patch-0.80-0.83/' to rebuild - the necessary tables. The release selectively updates only those - proportional .ttf font files exhibiting the bug below bug number; - the Ubuntu Mono monospace font files remain unchanged, being the - original version 0.80 ones. - - [Marc Foley] - * [Engineering] Fixed wrong characters appear in some mac apps. (LP: #1334363) - - -2011-09-22 (Paul Sladen) Ubuntu Font Family version 0.80 - - [Vincent Connare/Dalton Maag] - * Wish for addition of a monospaced member to the family (LP: #640382) - * Mono: No hinting yet - Ubuntu Beta Mono font looks jagged in - Netbeans and terrible with ClearType (LP: #820493) - * Emacs: choosing normal monospace font in Emacs but gives bold-italic - (LP: #791076) - * PUA: ensure that Ubuntu Circle of Friends logo is full size: (LP: #853855) - + U+E0FF becomes large size in proportionals, remains small width in - monospaces - + U+F0FF becomes small size (proportionals only) - + U+F200 is full ubuntu logomark (proportionals only) - - [Paul Sladen] - * Monospace: Patch Family Name to be "Ubuntu Mono" - * Monospace: Patch U+EFFD version debugging glyph to be '0.8' - - [Cody Boisclair] - * Monospace: Force .null HDMX advance to 500 - * Monospace: Remap ASCII box-drawing characters (LP: #788757) - - [Júlio Reis] - * Date corrections to 'FONTLOG' (LP: #836595) - -2011-03-08 (Paul Sladen) Ubuntu Font Family version 0.71.2 - - * (Production) Adjust Medium WeightClass to 500 (Md, MdIt) (LP: #730912) - -2011-03-07 (Paul Sladen) Ubuntu Font Family version 0.71.1 - - * (Design) Add Capitalised version of glyphs and kern. (Lt, LtIt, - Md, MdIt) DM (LP: #677446) - * (Design) Re-space and tighen Regular and Italic by amount specified - by Mark Shuttleworth (minus 4 FUnits). (Rg, It) (LP: #677149) - * (Design) Design: Latin (U+0192) made straight more like l/c f with - tail (LP: #670768) - * (Design) (U+01B3) should have hook on right, as the lowercase - (U+01B4) (LP: #681026) - * (Design) Tail of Light Italic germandbls, longs and lowercase 'f' - to match Italic/BoldItalic (LP: #623925) - * (Production) Update feature (Lt, LtIt, Md, MdIt). DM - (LP: #676538, #676539) - * (Production) Remove Bulgarian locl feature for Italics. (LP: #708578) - * (Production) Update Description information with new string: - "The Ubuntu Font Family are libre fonts funded by Canonical Ltd - on behalf of the Ubuntu project. The font design work and - technical implementation is being undertaken by Dalton Maag. The - typeface is sans-serif, uses OpenType features and is manually - hinted for clarity on desktop and mobile computing screens. The - scope of the Ubuntu Font Family includes all the languages used - by the various Ubuntu users around the world in tune with - Ubuntu's philosophy which states that every user should be able - to use their software in the language of their choice. The - project is ongoing, and we expect the family will be extended to - cover many written languages in the coming years." - (Rg, It, Bd, BdIt, Lt, LtIt, Md, MdIt) (LP: #690590) - * (Production) Pixel per em indicator added at U+F000 (Lt, LtIt, Md, - MdIt) (LP: #615787) - * (Production) Version number indicator added at U+EFFD (Lt, LtIt, Md, - MdIt) (LP: #640623) - * (Production) fstype bit set to 0 - Editable (Lt, LtIt, Md, MdIt) - (LP: #648406) - * (Production) Localisation of name table has been removed because - of problems with Mac OS/X interpretation of localisation. DM - (LP: #730785) - * (Hinting) Regular '?' dot non-circular (has incorrect control - value). (LP: #654336) - * (Hinting) Too much space after latin capital 'G' in 13pt - regular. Now reduced. (LP: #683437) - * (Hinting) Balance Indian Rupee at 18,19pt (LP: #662177) - * (Hinting) Make Regular '£' less ambiguous at 13-15 ppm (LP: #685562) - * (Hinting) Regular capital 'W' made symmetrical at 31 ppem (LP: #686168) - -2010-12-14 (Paul Sladen) Ubuntu Font Family version 0.70.1 - - Packaging, rebuilt from '2010-12-08 UbuntuFontsSourceFiles_070.zip': - * (Midstream) Fstype bit != 0 (LP: #648406) - * (Midstream) Add unit test to validate fstype bits (LP: #648406) - * (Midstream) Add unit test to validate licence - -2010-12-14 (Paul Sladen) Ubuntu Font Family version 0.70 - - Release notes 0.70: - * (Design) Add Capitalised version of glyphs and kern. (Rg, It, Bd, - BdIt) DM (LP: #676538, #677446) - * (Design) Give acute and grave a slight upright move to more match - the Hungarian double acute angle. (Rg, It, Bd, BdIt) (LP: #656647) - * (Design) Shift Bold Italic accent glyphs to be consistent with the - Italic. (BdIt only) DM (LP: #677449) - * (Design) Check spacing and kerning of dcaron, lcaron and - tcaron. (Rg, It, Bd, BdIt) (LP: #664722) - * (Design) Add positive kerning to () {} [] to open out the - combinations so they are less like a closed box. (Rg, It, Bd, - BdIt) (LP: #671228) - * (Design) Change design of acute.asc and check highest points (Bd - and BdIt only) DM - * (Production) Update feature. DM (LP: #676538, #676539) - * (Production) Remove Romanian locl feature. (Rg, It, Bd, BdIt) - (LP: #635615) - * (Production) Update Copyright information with new - strings. "Copyright 2010 Canonical Ltd. Licensed under the Ubuntu - Font Licence 1.0" Trademark string "Ubuntu and Canonical are - registered trademarks of Canonical Ltd." (Rg, It, Bd, BdIt) DM - (LP: #677450) - * (Design) Check aligning of hyphen, math signs em, en, check braces - and other brackets. 16/11 (LP: #676465) - * (Production) Pixel per em indicator added at U+F000 (Rg, It, Bd, - BdIt) (LP: #615787) - * (Production) Version number indicator added at U+EFFD (Rg, It, Bd, - BdIt) (LP: #640623) - * (Production) fstype bit set to 0 - Editable (Rg, It, Bd, BdIt) - (LP: #648406) - -2010-10-05 (Paul Sladen) Ubuntu Font Family version 0.69 - - [Dalton Maag] - * Italic, - - Hinting on lowercase Italic l amended 19ppm (LP: #632451) - - Hinting on lowercase Italic u amended 12ppm (LP: #626376) - - * Regular, Italic, Bold, BoldItalic - - New Rupee Sign added @ U+20B9 (LP: #645987) - - Ubuntu Roundel added @ U+E0FF (LP: #651606) - - [Paul Sladen] - * All - - Removed "!ubu" GSUB.calt ligature for U+E0FF (LP: #651606) - - -Acknowledgements - -If you make modifications be sure to add your name (N), email (E), -web-address (if you have one) (W) and description (D). This list is in -alphabetical order. - -N: Ryan Abdullah -W: http://www.rayan.de/ -D: Arabic calligraphy and design in collaboration with Dalton Maag -D: Arabic testing - -N: Cody Boisclair -D: Monospace low-level debugging and patching ('fixboxdrawing-ft.py') - -N: Amélie Bonet -W: http://ameliebonet.com/ -D: Type design with Dalton Maag, particularly Ubuntu Mono and Ubuntu Condensed - -N: Jason Campbell -W: http://www.campbellgraphics.com/design/fonts.shtml -D: Monospace hinting (first phase) at Dalton Maag - -N: Pilar Cano -W: http://www.pilarcano.com/ -D: Hebrew realisation with Dalton Maag - -N: Fernando Caro -D: Type design with Dalton Maag, particularly Ubuntu Condensed - -N: Ron Carpenter -W: http://www.daltonmaag.com/ -D: Type design with Dalton Maag -D: Arabic realisation in collaboration with Ryan Abdullah - -N: Vincent Connare -W: http://www.connare.com/ -D: Type design, and engineering with Dalton Maag -D: Monospace hinting (second phase) at Dalton Maag - -N: Dave Crossland -E: dave@understandingfonts.com -W: http://understandingfonts.com/ -D: Documentation and libre licensing guidance -D: Google Webfont integration at Google - -N: Steve Edwards -W: http://www.madebymake.com/ -D: font.ubuntu.com revamp implementation with Canonical Web Team - -N: Iain Farrell -W: http://www.flickr.com/photos/iain -D: Ubuntu Font Family delivery for the Ubuntu UX team at Canonical - -N: Marc Foley -W: http://www.marcfoley.co/ -D: Font Engineer at Dalton Maag for the 2015 updates - -N: Shiraaz Gabru -W: http://www.daltonmaag.com/ -D: Ubuntu Font Family project management at Dalton Maag - -N: Marcus Haslam -W: http://design.canonical.com/author/marcus-haslam/ -D: Creative inspiration - -N: Ben Laenen -D: Inspiration behind the pixels-per-em (PPEM) readout debugging glyph at U+F000 - (for this font the concept was re-implemented from scratch by Dalton-Maag) - -N: Bruno Maag -W: http://www.daltonmaag.com/ -D: Stylistic direction of the Ubuntu Font Family, as head of Dalton Maag - -N: Ivanka Majic -W: http://www.ivankamajic.com/ -D: Guiding the UX team and Cyrillic feedback - -N: David Marshall -W: http://www.daltonmaag.com/ -D: Technical guidance and administration at Dalton Maag - -N: Malcolm Wooden -W: http://www.daltonmaag.com/ -D: Font Engineering at Dalton Maag - -N: Lukas Paltram -W: http://www.daltonmaag.com/ -D: Type design with Dalton Maag - -N: Júlio Reis -D: Date fixes to the documentation - -N: Rodrigo Rivas -D: Indian Rupee Sign glyph - -N: Mark Shuttleworth -E: mark@ubuntu.com -W: http://www.markshuttleworth.com/ -D: Executive quality-control and funding - -N: Paul Sladen -E: ubuntu@paul.sladen.org -W: http://www.paul.sladen.org/ -D: Bug triaging, packaging at Ubuntu and Canonical - -N: Nicolas Spalinger -W: http://planet.open-fonts.org -D: Continuous guidance on libre/open font licensing, best practises in source - tree layout, release and packaging (pkg-fonts Debian team) - -N: Kenneth Wimer -D: Initial PPA packaging - -* Canonical Ltd is the primary commercial sponsor of the Ubuntu and - Kubuntu operating systems -* Dalton Maag are a custom type foundry headed by Bruno Maag - -For further documentation, information on contributors, source code -downloads and those involved with the Ubuntu Font Family, visit: - - http://font.ubuntu.com/ diff --git a/media/fonts/doc/Ubuntu/LICENCE-FAQ.txt b/media/fonts/doc/Ubuntu/LICENCE-FAQ.txt deleted file mode 100644 index 776a25edf13..00000000000 --- a/media/fonts/doc/Ubuntu/LICENCE-FAQ.txt +++ /dev/null @@ -1,177 +0,0 @@ - Ubuntu Font Family Licensing FAQ - - Stylistic Foundations - - The Ubuntu Font Family is the first time that a libre typeface has been - designed professionally and explicitly with the intent of developing a - public and long-term community-based development process. - - When developing an open project, it is generally necessary to have firm - foundations: a font needs to maintain harmony within itself even across - many type designers and writing systems. For the [1]Ubuntu Font Family, - the process has been guided with the type foundry Dalton Maag setting - the project up with firm stylistic foundation covering several - left-to-right scripts: Latin, Greek and Cyrillic; and right-to-left - scripts: Arabic and Hebrew (due in 2011). - - With this starting point the community will, under the supervision of - [2]Canonical and [3]Dalton Maag, be able to build on the existing font - sources to expand their character coverage. Ultimately everybody will - be able to use the Ubuntu Font Family in their own written languages - across the whole of Unicode (and this will take some time!). - - Licensing - - The licence chosen by any free software project is one of the - foundational decisions that sets out how derivatives and contributions - can occur, and in turn what kind of community will form around the - project. - - Using a licence that is compatible with other popular licences is a - powerful constraint because of the [4]network effects: the freedom to - share improvements between projects allows free software to reach - high-quality over time. Licence-proliferation leads to many - incompatible licences, undermining the network effect, the freedom to - share and ultimately making the libre movement that Ubuntu is a part of - less effective. For all kinds of software, writing a new licence is not - to be taken lightly and is a choice that needs to be thoroughly - justified if this path is taken. - - Today it is not clear to Canonical what the best licence for a font - project like the Ubuntu Font Family is: one that starts life designed - by professionals and continues with the full range of community - development, from highly commercial work in new directions to curious - beginners' experimental contributions. The fast and steady pace of the - Ubuntu release cycle means that an interim libre licence has been - necessary to enable the consideration of the font family as part of - Ubuntu 10.10 operating system release. - - Before taking any decision on licensing, Canonical as sponsor and - backer of the project has reviewed the many existing licenses used for - libre/open fonts and engaged the stewards of the most popular licenses - in detailed discussions. The current interim licence is the first step - in progressing the state-of-the-art in licensing for libre/open font - development. - - The public discussion must now involve everyone in the (comparatively - new) area of the libre/open font community; including font users, - software freedom advocates, open source supporters and existing libre - font developers. Most importantly, the minds and wishes of professional - type designers considering entering the free software business - community must be taken on board. - - Conversations and discussion has taken place, privately, with - individuals from the following groups (generally speaking personally on - behalf of themselves, rather than their affiliations): - * [5]SIL International - * [6]Open Font Library - * [7]Software Freedom Law Center - * [8]Google Font API - - Document embedding - - One issue highlighted early on in the survey of existing font licences - is that of document embedding. Almost all font licences, both free and - unfree, permit embedding a font into a document to a certain degree. - Embedding a font with other works that make up a document creates a - "combined work" and copyleft would normally require the whole document - to be distributed under the terms of the font licence. As beautiful as - the font might be, such a licence makes a font too restrictive for - useful general purpose digital publishing. - - The situation is not entirely unique to fonts and is encountered also - with tools such as GNU Bison: a vanilla GNU GPL licence would require - anything generated with Bison to be made available under the terms of - the GPL as well. To avoid this, Bison is [9]published with an - additional permission to the GPL which allows the output of Bison to be - made available under any licence. - - The conflict between licensing of fonts and licensing of documents, is - addressed in two popular libre font licences, the SIL OFL and GNU GPL: - * [10]SIL Open Font Licence: When OFL fonts are embedded in a - document, the OFL's terms do not apply to that document. (See - [11]OFL-FAQ for details. - * [12]GPL Font Exception: The situation is resolved by granting an - additional permission to allow documents to not be covered by the - GPL. (The exception is being reviewed). - - The Ubuntu Font Family must also resolve this conflict, ensuring that - if the font is embedded and then extracted it is once again clearly - under the terms of its libre licence. - - Long-term licensing - - Those individuals involved, especially from Ubuntu and Canonical, are - interested in finding a long-term libre licence that finds broad favour - across the whole libre/open font community. The deliberation during the - past months has been on how to licence the Ubuntu Font Family in the - short-term, while knowingly encouraging everyone to pursue a long-term - goal. - * [13]Copyright assignment will be required so that the Ubuntu Font - Family's licensing can be progressively expanded to one (or more) - licences, as best practice continues to evolve within the - libre/open font community. - * Canonical will support and fund legal work on libre font licensing. - It is recognised that the cost and time commitments required are - likely to be significant. We invite other capable parties to join - in supporting this activity. - - The GPL version 3 (GPLv3) will be used for Ubuntu Font Family build - scripts and the CC-BY-SA for associated documentation and non-font - content: all items which do not end up embedded in general works and - documents. - -Ubuntu Font Licence - - For the short-term only, the initial licence is the [14]Ubuntu Font - License (UFL). This is loosely inspired from the work on the SIL - OFL 1.1, and seeks to clarify the issues that arose during discussions - and legal review, from the perspective of the backers, Canonical Ltd. - Those already using established licensing models such as the GPL, OFL - or Creative Commons licensing should have no worries about continuing - to use them. The Ubuntu Font Licence (UFL) and the SIL Open Font - Licence (SIL OFL) are not identical and should not be confused with - each other. Please read the terms precisely. The UFL is only intended - as an interim license, and the overriding aim is to support the - creation of a more suitable and generic libre font licence. As soon as - such a licence is developed, the Ubuntu Font Family will migrate to - it—made possible by copyright assignment in the interium. Between the - OFL 1.1, and the UFL 1.0, the following changes are made to produce the - Ubuntu Font Licence: - * Clarification: - - 1. Document embedding (see [15]embedding section above). - 2. Apply at point of distribution, instead of receipt - 3. Author vs. copyright holder disambiguation (type designers are - authors, with the copyright holder normally being the funder) - 4. Define "Propagate" (for internationalisation, similar to the GPLv3) - 5. Define "Substantially Changed" - 6. Trademarks are explicitly not transferred - 7. Refine renaming requirement - - Streamlining: - 8. Remove "not to be sold separately" clause - 9. Remove "Reserved Font Name(s)" declaration - - A visual demonstration of how these points were implemented can be - found in the accompanying coloured diff between SIL OFL 1.1 and the - Ubuntu Font Licence 1.0: [16]ofl-1.1-ufl-1.0.diff.html - -References - - 1. http://font.ubuntu.com/ - 2. http://www.canonical.com/ - 3. http://www.daltonmaag.com/ - 4. http://en.wikipedia.org/wiki/Network_effect - 5. http://scripts.sil.org/ - 6. http://openfontlibrary.org/ - 7. http://www.softwarefreedom.org/ - 8. http://code.google.com/webfonts - 9. http://www.gnu.org/licenses/gpl-faq.html#CanIUseGPLToolsForNF - 10. http://scripts.sil.org/OFL_web - 11. http://scripts.sil.org/OFL-FAQ_web - 12. http://www.gnu.org/licenses/gpl-faq.html#FontException - 13. https://launchpad.net/~uff-contributors - 14. http://font.ubuntu.com/ufl/ubuntu-font-licence-1.0.txt - 15. http://font.ubuntu.com/ufl/FAQ.html#embedding - 16. http://font.ubuntu.com/ufl/ofl-1.1-ufl-1.0.diff.html diff --git a/media/fonts/doc/Ubuntu/LICENCE.txt b/media/fonts/doc/Ubuntu/LICENCE.txt deleted file mode 100644 index ae78a8f94ea..00000000000 --- a/media/fonts/doc/Ubuntu/LICENCE.txt +++ /dev/null @@ -1,96 +0,0 @@ -------------------------------- -UBUNTU FONT LICENCE Version 1.0 -------------------------------- - -PREAMBLE -This licence allows the licensed fonts to be used, studied, modified and -redistributed freely. The fonts, including any derivative works, can be -bundled, embedded, and redistributed provided the terms of this licence -are met. The fonts and derivatives, however, cannot be released under -any other licence. The requirement for fonts to remain under this -licence does not require any document created using the fonts or their -derivatives to be published under this licence, as long as the primary -purpose of the document is not to be a vehicle for the distribution of -the fonts. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this licence and clearly marked as such. This may -include source files, build scripts and documentation. - -"Original Version" refers to the collection of Font Software components -as received under this licence. - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to -a new environment. - -"Copyright Holder(s)" refers to all individuals and companies who have a -copyright ownership of the Font Software. - -"Substantially Changed" refers to Modified Versions which can be easily -identified as dissimilar to the Font Software by users of the Font -Software comparing the Original Version with the Modified Version. - -To "Propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification and with or without charging -a redistribution fee), making available to the public, and in some -countries other activities as well. - -PERMISSION & CONDITIONS -This licence does not grant any rights under trademark law and all such -rights are reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of the Font Software, to propagate the Font Software, subject to -the below conditions: - -1) Each copy of the Font Software must contain the above copyright -notice and this licence. These can be included either as stand-alone -text files, human-readable headers or in the appropriate machine- -readable metadata fields within text or binary files as long as those -fields can be easily viewed by the user. - -2) The font name complies with the following: -(a) The Original Version must retain its name, unmodified. -(b) Modified Versions which are Substantially Changed must be renamed to -avoid use of the name of the Original Version or similar names entirely. -(c) Modified Versions which are not Substantially Changed must be -renamed to both (i) retain the name of the Original Version and (ii) add -additional naming elements to distinguish the Modified Version from the -Original Version. The name of such Modified Versions must be the name of -the Original Version, with "derivative X" where X represents the name of -the new work, appended to that name. - -3) The name(s) of the Copyright Holder(s) and any contributor to the -Font Software shall not be used to promote, endorse or advertise any -Modified Version, except (i) as required by this licence, (ii) to -acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with -their explicit written permission. - -4) The Font Software, modified or unmodified, in part or in whole, must -be distributed entirely under this licence, and must not be distributed -under any other licence. The requirement for fonts to remain under this -licence does not affect any document created using the Font Software, -except any version of the Font Software extracted from a document -created using the Font Software may only be distributed under this -licence. - -TERMINATION -This licence becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF -COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER -DEALINGS IN THE FONT SOFTWARE. diff --git a/media/fonts/doc/Ubuntu/README.txt b/media/fonts/doc/Ubuntu/README.txt deleted file mode 100644 index 56028212d31..00000000000 --- a/media/fonts/doc/Ubuntu/README.txt +++ /dev/null @@ -1,16 +0,0 @@ - ---------------------- - Ubuntu Font Family - ====================== - -The Ubuntu Font Family are a set of matching new libre/open fonts in -development during 2010--2011. And with further expansion work and -bug fixing during 2015. The development is being funded by -Canonical Ltd on behalf the wider Free Software community and the -Ubuntu project. The technical font design work and implementation is -being undertaken by Dalton Maag. - -Both the final font Truetype/OpenType files and the design files used -to produce the font family are distributed under an open licence and -you are expressly encouraged to experiment, modify, share and improve. - - http://font.ubuntu.com/ diff --git a/media/fonts/doc/Ubuntu/TRADEMARKS.txt b/media/fonts/doc/Ubuntu/TRADEMARKS.txt deleted file mode 100644 index d34265bc853..00000000000 --- a/media/fonts/doc/Ubuntu/TRADEMARKS.txt +++ /dev/null @@ -1,4 +0,0 @@ -Ubuntu and Canonical are registered trademarks of Canonical Ltd. - -The licence accompanying these works does not grant any rights -under trademark law and all such rights are reserved. diff --git a/media/fonts/doc/Ubuntu/copyright.txt b/media/fonts/doc/Ubuntu/copyright.txt deleted file mode 100644 index 77340703a42..00000000000 --- a/media/fonts/doc/Ubuntu/copyright.txt +++ /dev/null @@ -1,5 +0,0 @@ -Copyright 2010,2011 Canonical Ltd. - -This Font Software is licensed under the Ubuntu Font Licence, Version -1.0. https://launchpad.net/ubuntu-font-licence - diff --git a/media/fonts/tahoma.ttf b/media/fonts/tahoma.ttf index b9a0c771a27..ec8dd3bc82a 100644 Binary files a/media/fonts/tahoma.ttf and b/media/fonts/tahoma.ttf differ diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index 9a00123a5f2..c4009fdfdf9 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ diff --git a/media/inf/font.inf b/media/inf/font.inf index 611728168f0..347d9c19faa 100644 --- a/media/inf/font.inf +++ b/media/inf/font.inf @@ -71,7 +71,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dl HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times New Roman",0x00000000,"DejaVu Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Ubuntu",0x00000000,"Tahoma" @@ -106,7 +105,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dl HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times New Roman",0x00000000,"DejaVu Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" ; cp1252/cp437 US diff --git a/modules/rostests/apitests/gdi32/GetTextMetrics.c b/modules/rostests/apitests/gdi32/GetTextMetrics.c index 9fb056f9b90..8b749ae4bd6 100644 --- a/modules/rostests/apitests/gdi32/GetTextMetrics.c +++ b/modules/rostests/apitests/gdi32/GetTextMetrics.c @@ -124,156 +124,6 @@ static const TEST_ENTRY g_FREEMONO[] = }; #define g_FREEMONO_count _countof(g_FREEMONO) -static const TEST_ENTRY g_DEJAVUSERIF[] = -{ - { __LINE__, 400, 0, 2323, 400, 400, 319, 81, 56, 0 }, - { __LINE__, 300, 0, 1743, 300, 300, 239, 61, 42, 0 }, - { __LINE__, 200, 0, 1162, 200, 200, 159, 41, 28, 0 }, - { __LINE__, 100, 0, 580, 100, 100, 80, 20, 14, 0 }, - { __LINE__, 64, 0, 370, 64, 64, 51, 13, 9, 0 }, - { __LINE__, 32, 0, 190, 32, 32, 26, 6, 4, 0 }, - { __LINE__, 16, 0, 91, 16, 16, 13, 3, 2, 0 }, - { __LINE__, 15, 0, 84, 15, 15, 12, 3, 2, 0 }, - { __LINE__, 14, 0, 82, 14, 14, 11, 3, 2, 0 }, - { __LINE__, 13, 0, 77, 13, 13, 10, 3, 2, 0 }, - { __LINE__, 12, 0, 66, 12, 12, 10, 2, 2, 0 }, - { __LINE__, 11, 0, 63, 11, 11, 9, 2, 2, 0 }, - { __LINE__, 10, 0, 63, 10, 10, 8, 2, 1, 0 }, - { __LINE__, 9, 0, 56, 9, 9, 7, 2, 1, 0 }, - { __LINE__, 8, 0, 49, 8, 8, 6, 2, 1, 0 }, - { __LINE__, 7, 0, 42, 7, 7, 6, 1, 1, 0 }, - { __LINE__, 6, 0, 36, 6, 6, 5, 1, 1, 0 }, - { __LINE__, 5, 0, 26, 5, 5, 4, 1, 1, 0 }, - { __LINE__, 4, 0, 22, 4, 4, 3, 1, 1, 0 }, - { __LINE__, 3, 0, 22, 3, 3, 2, 1, 0, 0 }, - { __LINE__, 2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 0, 0, -125, -21, -21, -17, -4, -3, 0 }, - { __LINE__, -1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -3, 0, 22, 4, 4, 3, 1, 1, 0 }, - { __LINE__, -4, 0, 26, 5, 5, 4, 1, 1, 0 }, - { __LINE__, -5, 0, 36, 6, 6, 5, 1, 1, 0 }, - { __LINE__, -6, 0, 42, 7, 7, 6, 1, 1, 0 }, - { __LINE__, -7, 0, 49, 8, 8, 6, 2, 1, 0 }, - { __LINE__, -8, 0, 56, 9, 9, 7, 2, 1, 0 }, - { __LINE__, -9, 0, 63, 10, 10, 8, 2, 1, 0 }, - { __LINE__, -10, 0, 66, 11, 11, 9, 2, 1, 0 }, - { __LINE__, -11, 0, 77, 13, 13, 10, 3, 2, 0 }, - { __LINE__, -12, 0, 82, 14, 14, 11, 3, 2, 0 }, - { __LINE__, -13, 0, 84, 15, 15, 12, 3, 2, 0 }, - { __LINE__, -14, 0, 91, 16, 16, 13, 3, 2, 0 }, - { __LINE__, -15, 0, 103, 18, 18, 14, 4, 3, 0 }, - { __LINE__, -16, 0, 114, 19, 19, 15, 4, 3, 0 }, - { __LINE__, -32, 0, 214, 38, 38, 30, 8, 6, 0 }, - { __LINE__, -64, 0, 431, 74, 74, 59, 15, 10, 0 }, - { __LINE__, -100, 0, 674, 117, 117, 93, 24, 17, 0 }, - { __LINE__, -200, 0, 1352, 233, 233, 186, 47, 33, 0 }, - { __LINE__, -300, 0, 2026, 349, 349, 278, 71, 49, 0 }, - { __LINE__, -400, 0, 2702, 465, 465, 371, 94, 65, 0 }, -}; -#define g_DEJAVUSERIF_count _countof(g_DEJAVUSERIF) - -static const TEST_ENTRY g_DEJAVUSANS[] = -{ - { __LINE__, 400, 0, 2286, 400, 400, 319, 81, 56, 0 }, - { __LINE__, 300, 0, 1715, 300, 300, 239, 61, 42, 0 }, - { __LINE__, 200, 0, 1145, 200, 200, 159, 41, 28, 0 }, - { __LINE__, 100, 0, 573, 100, 100, 80, 20, 14, 0 }, - { __LINE__, 64, 0, 366, 64, 64, 51, 13, 9, 0 }, - { __LINE__, 32, 0, 188, 32, 32, 26, 6, 4, 0 }, - { __LINE__, 16, 0, 91, 16, 16, 13, 3, 2, 0 }, - { __LINE__, 15, 0, 84, 15, 15, 12, 3, 2, 0 }, - { __LINE__, 14, 0, 84, 14, 14, 11, 3, 2, 0 }, - { __LINE__, 13, 0, 79, 13, 13, 10, 3, 2, 0 }, - { __LINE__, 12, 0, 62, 12, 12, 10, 2, 2, 0 }, - { __LINE__, 11, 0, 64, 11, 11, 9, 2, 2, 0 }, - { __LINE__, 10, 0, 64, 10, 10, 8, 2, 1, 0 }, - { __LINE__, 9, 0, 54, 9, 9, 7, 2, 1, 0 }, - { __LINE__, 8, 0, 46, 8, 8, 6, 2, 1, 0 }, - { __LINE__, 7, 0, 41, 7, 7, 6, 1, 1, 0 }, - { __LINE__, 6, 0, 35, 6, 6, 5, 1, 1, 0 }, - { __LINE__, 5, 0, 25, 5, 5, 4, 1, 1, 0 }, - { __LINE__, 4, 0, 22, 4, 4, 3, 1, 1, 0 }, - { __LINE__, 3, 0, 22, 3, 3, 2, 1, 0, 0 }, - { __LINE__, 2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 0, 0, -116, -21, -21, -17, -4, -3, 0 }, - { __LINE__, -1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -3, 0, 22, 4, 4, 3, 1, 1, 0 }, - { __LINE__, -4, 0, 25, 5, 5, 4, 1, 1, 0 }, - { __LINE__, -5, 0, 35, 6, 6, 5, 1, 1, 0 }, - { __LINE__, -6, 0, 41, 7, 7, 6, 1, 1, 0 }, - { __LINE__, -7, 0, 46, 8, 8, 6, 2, 1, 0 }, - { __LINE__, -8, 0, 54, 9, 9, 7, 2, 1, 0 }, - { __LINE__, -9, 0, 64, 10, 10, 8, 2, 1, 0 }, - { __LINE__, -10, 0, 62, 11, 11, 9, 2, 1, 0 }, - { __LINE__, -11, 0, 79, 13, 13, 10, 3, 2, 0 }, - { __LINE__, -12, 0, 84, 14, 14, 11, 3, 2, 0 }, - { __LINE__, -13, 0, 84, 15, 15, 12, 3, 2, 0 }, - { __LINE__, -14, 0, 91, 16, 16, 13, 3, 2, 0 }, - { __LINE__, -15, 0, 98, 18, 18, 14, 4, 3, 0 }, - { __LINE__, -16, 0, 102, 19, 19, 15, 4, 3, 0 }, - { __LINE__, -32, 0, 215, 38, 38, 30, 8, 6, 0 }, - { __LINE__, -64, 0, 423, 74, 74, 59, 15, 10, 0 }, - { __LINE__, -100, 0, 665, 117, 117, 93, 24, 17, 0 }, - { __LINE__, -200, 0, 1331, 233, 233, 186, 47, 33, 0 }, - { __LINE__, -300, 0, 1992, 349, 349, 278, 71, 49, 0 }, - { __LINE__, -400, 0, 2657, 465, 465, 371, 94, 65, 0 }, -}; -#define g_DEJAVUSANS_count _countof(g_DEJAVUSANS) - -static const TEST_ENTRY g_UBUNTUMONO[] = -{ - { __LINE__, 400, 0, 3000, 400, 400, 332, 68, 0, 0 }, - { __LINE__, 300, 0, 2250, 300, 300, 249, 51, 0, 0 }, - { __LINE__, 200, 0, 1500, 200, 200, 166, 34, 1, 0 }, - { __LINE__, 100, 0, 735, 100, 100, 83, 17, 2, 0 }, - { __LINE__, 64, 0, 465, 63, 63, 53, 10, 2, 0 }, - { __LINE__, 32, 0, 240, 31, 31, 26, 5, 0, 0 }, - { __LINE__, 16, 0, 105, 16, 16, 13, 3, 3, 0 }, - { __LINE__, 15, 0, 90, 15, 15, 12, 3, 4, 0 }, - { __LINE__, 14, 0, 75, 14, 14, 11, 3, 5, 0 }, - { __LINE__, 13, 0, 60, 13, 13, 10, 3, 5, 0 }, - { __LINE__, 12, 0, 60, 12, 12, 10, 2, 5, 0 }, - { __LINE__, 11, 0, 60, 11, 11, 9, 2, 4, 0 }, - { __LINE__, 10, 0, 60, 10, 10, 8, 2, 3, 0 }, - { __LINE__, 9, 0, 60, 9, 9, 7, 2, 2, 0 }, - { __LINE__, 8, 0, 60, 8, 8, 7, 1, 1, 0 }, - { __LINE__, 7, 0, 60, 7, 7, 6, 1, 0, 0 }, - { __LINE__, 6, 0, 45, 6, 6, 5, 1, 0, 0 }, - { __LINE__, 5, 0, 45, 5, 5, 4, 1, 0, 0 }, - { __LINE__, 4, 0, 30, 4, 4, 3, 1, 0, 0 }, - { __LINE__, 3, 0, 30, 3, 3, 2, 1, 0, 0 }, - { __LINE__, 2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 0, 0, -135, -19, -19, -16, -3, -1, 0 }, - { __LINE__, -1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -3, 0, 30, 3, 3, 2, 1, 0, 0 }, - { __LINE__, -4, 0, 30, 4, 4, 3, 1, 0, 0 }, - { __LINE__, -5, 0, 45, 5, 5, 4, 1, 0, 0 }, - { __LINE__, -6, 0, 45, 6, 6, 5, 1, 0, 0 }, - { __LINE__, -7, 0, 60, 7, 7, 6, 1, 0, 0 }, - { __LINE__, -8, 0, 60, 13, 13, 10, 3, 5, 0 }, - { __LINE__, -9, 0, 75, 14, 14, 11, 3, 5, 0 }, - { __LINE__, -10, 0, 75, 14, 14, 11, 3, 4, 0 }, - { __LINE__, -11, 0, 90, 15, 15, 12, 3, 4, 0 }, - { __LINE__, -12, 0, 90, 15, 15, 12, 3, 3, 0 }, - { __LINE__, -13, 0, 105, 16, 16, 13, 3, 3, 0 }, - { __LINE__, -14, 0, 105, 17, 17, 14, 3, 3, 0 }, - { __LINE__, -15, 0, 105, 17, 17, 14, 3, 2, 0 }, - { __LINE__, -16, 0, 120, 18, 18, 15, 3, 2, 0 }, - { __LINE__, -32, 0, 240, 33, 33, 28, 5, 1, 0 }, - { __LINE__, -64, 0, 480, 66, 66, 55, 11, 2, 0 }, - { __LINE__, -100, 0, 750, 101, 101, 84, 17, 1, 0 }, - { __LINE__, -200, 0, 1500, 201, 201, 167, 34, 1, 0 }, - { __LINE__, -300, 0, 2250, 300, 300, 249, 51, 0, 0 }, - { __LINE__, -400, 0, 3000, 400, 400, 332, 68, 0, 0 }, -}; -#define g_UBUNTUMONO_count _countof(g_UBUNTUMONO) - static const TEST_ENTRY g_MSGOTHIC[] = { { __LINE__, 400, 0, 3000, 400, 400, 344, 56, 0, 0 }, @@ -388,16 +238,10 @@ static FONT_ENTRY g_font_entries[] = { #ifdef EMIT_TESTCASES { "FREEMONO", "FreeMono", "FreeMono.ttf" }, - { "DEJAVUSERIF", "DejaVu Serif", "DejaVuSerif.ttf" }, - { "DEJAVUSANS", "DejaVu Sans", "DejaVuSans.ttf" }, - { "UBUNTUMONO", "Ubuntu Mono", "UbuntuMono-R.ttf" }, { "MSGOTHIC", "MS Gothic", "msgothic.ttc" }, { "MSMINCHO", "MS Mincho", "msmincho.ttc" }, #else { "FREEMONO", "FreeMono", "FreeMono.ttf", g_FREEMONO_count, g_FREEMONO }, - { "DEJAVUSERIF", "DejaVu Serif", "DejaVuSerif.ttf", g_DEJAVUSERIF_count, g_DEJAVUSERIF }, - { "DEJAVUSANS", "DejaVu Sans", "DejaVuSans.ttf", g_DEJAVUSANS_count, g_DEJAVUSANS }, - { "UBUNTUMONO", "Ubuntu Mono", "UbuntuMono-R.ttf", g_UBUNTUMONO_count, g_UBUNTUMONO }, { "MSGOTHIC", "MS Gothic", "msgothic.ttc", g_MSGOTHIC_count, g_MSGOTHIC }, { "MSMINCHO", "MS Mincho", "msmincho.ttc", g_MSMINCHO_count, g_MSMINCHO }, #endif