Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 01/01: [DEVMGR] Fix wonky action menu

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d1a2983c00cb5d75e2100… commit d1a2983c00cb5d75e21001788f27dfe1fc4c3aa9 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Aug 3 14:53:00 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Aug 3 14:54:18 2019 +0200 [DEVMGR] Fix wonky action menu Patch by Pi_User5. CORE-10364 --- dll/win32/devmgr/devmgmt/MainWindow.cpp | 6 ++++++ dll/win32/devmgr/lang/bg-BG.rc | 6 +++++- dll/win32/devmgr/lang/cs-CZ.rc | 6 +++++- dll/win32/devmgr/lang/de-DE.rc | 6 +++++- dll/win32/devmgr/lang/el-GR.rc | 6 +++++- dll/win32/devmgr/lang/en-US.rc | 6 +++++- dll/win32/devmgr/lang/es-ES.rc | 6 +++++- dll/win32/devmgr/lang/et-EE.rc | 6 +++++- dll/win32/devmgr/lang/fr-FR.rc | 6 +++++- dll/win32/devmgr/lang/he-IL.rc | 6 +++++- dll/win32/devmgr/lang/hu-HU.rc | 6 +++++- dll/win32/devmgr/lang/id-ID.rc | 6 +++++- dll/win32/devmgr/lang/it-IT.rc | 6 +++++- dll/win32/devmgr/lang/ja-JP.rc | 6 +++++- dll/win32/devmgr/lang/no-NO.rc | 6 +++++- dll/win32/devmgr/lang/pl-PL.rc | 6 +++++- dll/win32/devmgr/lang/pt-BR.rc | 6 +++++- dll/win32/devmgr/lang/pt-PT.rc | 6 +++++- dll/win32/devmgr/lang/ro-RO.rc | 6 +++++- dll/win32/devmgr/lang/ru-RU.rc | 6 +++++- dll/win32/devmgr/lang/sk-SK.rc | 6 +++++- dll/win32/devmgr/lang/sq-AL.rc | 6 +++++- dll/win32/devmgr/lang/tr-TR.rc | 6 +++++- dll/win32/devmgr/lang/uk-UA.rc | 6 +++++- dll/win32/devmgr/lang/zh-CN.rc | 6 +++++- dll/win32/devmgr/lang/zh-TW.rc | 6 +++++- 26 files changed, 131 insertions(+), 25 deletions(-) diff --git a/dll/win32/devmgr/devmgmt/MainWindow.cpp b/dll/win32/devmgr/devmgmt/MainWindow.cpp index b69778b6411..5b3c6eb669a 100644 --- a/dll/win32/devmgr/devmgmt/MainWindow.cpp +++ b/dll/win32/devmgr/devmgmt/MainWindow.cpp @@ -505,6 +505,12 @@ CDeviceManager::OnNotify(_In_ LPARAM lParam) { case TVN_SELCHANGED: { + HMENU hMenu = GetSubMenu(m_hMenu, 1); + for (INT i = GetMenuItemCount(hMenu) - 1; i >= 0; i--) + { + DeleteMenu(hMenu, i, MF_BYPOSITION); + } + m_DeviceView->CreateActionMenu(hMenu, true); UpdateToolbar(); break; } diff --git a/dll/win32/devmgr/lang/bg-BG.rc b/dll/win32/devmgr/lang/bg-BG.rc index 7cfd3b10065..6b66f97d559 100644 --- a/dll/win32/devmgr/lang/bg-BG.rc +++ b/dll/win32/devmgr/lang/bg-BG.rc @@ -253,7 +253,11 @@ BEGIN BEGIN MENUITEM "E&xit", IDC_EXIT END - MENUITEM "Action", IDC_ACTIONMENU + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END POPUP "View" BEGIN MENUITEM "Devices by type", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/cs-CZ.rc b/dll/win32/devmgr/lang/cs-CZ.rc index cef5ec783ac..97fdb17e8b5 100644 --- a/dll/win32/devmgr/lang/cs-CZ.rc +++ b/dll/win32/devmgr/lang/cs-CZ.rc @@ -257,7 +257,11 @@ BEGIN BEGIN MENUITEM "U&končit", IDC_EXIT END - MENUITEM "Akce", IDC_ACTIONMENU + POPUP "Akce" + BEGIN + MENUITEM "Vyhledat změny hardwaru", IDC_SCAN_HARDWARE + MENUITEM "Přidat hardware", IDC_ADD_HARDWARE + END POPUP "Zobrazit" BEGIN MENUITEM "Zařízení podle typu", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/de-DE.rc b/dll/win32/devmgr/lang/de-DE.rc index 926fe545c6e..97790767f31 100644 --- a/dll/win32/devmgr/lang/de-DE.rc +++ b/dll/win32/devmgr/lang/de-DE.rc @@ -254,7 +254,11 @@ BEGIN BEGIN MENUITEM "&Beenden", IDC_EXIT END - MENUITEM "Ak&tion", IDC_ACTIONMENU + POPUP "Ak&tion" + BEGIN + MENUITEM "Nach geänderter Hardware suchen", IDC_SCAN_HARDWARE + MENUITEM "Hardware hinzufügen", IDC_ADD_HARDWARE + END POPUP "&Ansicht" BEGIN MENUITEM "Geräte nach &Typ", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/el-GR.rc b/dll/win32/devmgr/lang/el-GR.rc index 8cd7a35283c..9b33fdf7e1d 100644 --- a/dll/win32/devmgr/lang/el-GR.rc +++ b/dll/win32/devmgr/lang/el-GR.rc @@ -254,7 +254,11 @@ BEGIN BEGIN MENUITEM "E&xit", IDC_EXIT END - MENUITEM "Action", IDC_ACTIONMENU + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END POPUP "View" BEGIN MENUITEM "Devices by type", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/en-US.rc b/dll/win32/devmgr/lang/en-US.rc index 4acc22822d5..cbc49c1028f 100644 --- a/dll/win32/devmgr/lang/en-US.rc +++ b/dll/win32/devmgr/lang/en-US.rc @@ -251,7 +251,11 @@ BEGIN BEGIN MENUITEM "E&xit", IDC_EXIT END - MENUITEM "&Action", IDC_ACTIONMENU + POPUP "&Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END POPUP "&View" BEGIN MENUITEM "D&evices by type", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/es-ES.rc b/dll/win32/devmgr/lang/es-ES.rc index ead90e98c8f..578401b75db 100644 --- a/dll/win32/devmgr/lang/es-ES.rc +++ b/dll/win32/devmgr/lang/es-ES.rc @@ -261,7 +261,11 @@ BEGIN BEGIN MENUITEM "&Salir", IDC_EXIT END - MENUITEM "Acción", IDC_ACTIONMENU + POPUP "Acción" + BEGIN + MENUITEM "Buscar cambios de hardware", IDC_SCAN_HARDWARE + MENUITEM "Añadir dispositivos", IDC_ADD_HARDWARE + END POPUP "Ver" BEGIN MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/et-EE.rc b/dll/win32/devmgr/lang/et-EE.rc index 6584991152e..081b8d11da5 100644 --- a/dll/win32/devmgr/lang/et-EE.rc +++ b/dll/win32/devmgr/lang/et-EE.rc @@ -258,7 +258,11 @@ BEGIN BEGIN MENUITEM "&Välju", IDC_EXIT END - MENUITEM "&Toiming", IDC_ACTIONMENU + POPUP "&Toiming" + BEGIN + MENUITEM "Otsi riistvaramuudatusi", IDC_SCAN_HARDWARE + MENUITEM "Lisa riistvara", IDC_ADD_HARDWARE + END POPUP "&Vaade" BEGIN MENUITEM "Seadmed &tüübi järgi", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/fr-FR.rc b/dll/win32/devmgr/lang/fr-FR.rc index 226d1290c79..b4c8658e7d5 100644 --- a/dll/win32/devmgr/lang/fr-FR.rc +++ b/dll/win32/devmgr/lang/fr-FR.rc @@ -253,7 +253,11 @@ BEGIN BEGIN MENUITEM "&Quitter", IDC_EXIT END - MENUITEM "Action", IDC_ACTIONMENU + POPUP "Action" + BEGIN + MENUITEM "Vérifier les changements de matériel", IDC_SCAN_HARDWARE + MENUITEM "Ajouter un matériel", IDC_ADD_HARDWARE + END POPUP "Vue" BEGIN MENUITEM "Périphériques par type", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/he-IL.rc b/dll/win32/devmgr/lang/he-IL.rc index e7a805fff5c..9a8ce7a7560 100644 --- a/dll/win32/devmgr/lang/he-IL.rc +++ b/dll/win32/devmgr/lang/he-IL.rc @@ -254,7 +254,11 @@ BEGIN BEGIN MENUITEM "E&xit", IDC_EXIT END - MENUITEM "Action", IDC_ACTIONMENU + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END POPUP "View" BEGIN MENUITEM "Devices by type", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/hu-HU.rc b/dll/win32/devmgr/lang/hu-HU.rc index 74416ea02de..7bb8acf0a6e 100644 --- a/dll/win32/devmgr/lang/hu-HU.rc +++ b/dll/win32/devmgr/lang/hu-HU.rc @@ -253,7 +253,11 @@ BEGIN BEGIN MENUITEM "E&xit", IDC_EXIT END - MENUITEM "Action", IDC_ACTIONMENU + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END POPUP "View" BEGIN MENUITEM "Devices by type", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/id-ID.rc b/dll/win32/devmgr/lang/id-ID.rc index 3af500e05c0..5492df9a755 100644 --- a/dll/win32/devmgr/lang/id-ID.rc +++ b/dll/win32/devmgr/lang/id-ID.rc @@ -254,7 +254,11 @@ BEGIN BEGIN MENUITEM "K&eluar", IDC_EXIT END - MENUITEM "Ak&si", IDC_ACTIONMENU + POPUP "Ak&si" + BEGIN + MENUITEM "Pindai perubahan perangkat keras", IDC_SCAN_HARDWARE + MENUITEM "Tambah perangkat keras", IDC_ADD_HARDWARE + END POPUP "Ta&mpilan" BEGIN MENUITEM "Jenis perangkat", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/it-IT.rc b/dll/win32/devmgr/lang/it-IT.rc index e722a0a910a..3c920c200f5 100644 --- a/dll/win32/devmgr/lang/it-IT.rc +++ b/dll/win32/devmgr/lang/it-IT.rc @@ -255,7 +255,11 @@ BEGIN BEGIN MENUITEM "E&xit", IDC_EXIT END - MENUITEM "Action", IDC_ACTIONMENU + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END POPUP "View" BEGIN MENUITEM "Devices by type", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/ja-JP.rc b/dll/win32/devmgr/lang/ja-JP.rc index ee286dcda27..f066fa93fb0 100644 --- a/dll/win32/devmgr/lang/ja-JP.rc +++ b/dll/win32/devmgr/lang/ja-JP.rc @@ -251,7 +251,11 @@ BEGIN BEGIN MENUITEM "終了(&X)", IDC_EXIT END - MENUITEM "アクション(&A)", IDC_ACTIONMENU + POPUP "アクション(&A)" + BEGIN + MENUITEM "ハードウェアの変更をスキャン", IDC_SCAN_HARDWARE + MENUITEM "ハードウェアを追加", IDC_ADD_HARDWARE + END POPUP "表示(&V)" BEGIN MENUITEM "種類別デバイス(&E)", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/no-NO.rc b/dll/win32/devmgr/lang/no-NO.rc index 244fccbe4f3..6025a692817 100644 --- a/dll/win32/devmgr/lang/no-NO.rc +++ b/dll/win32/devmgr/lang/no-NO.rc @@ -255,7 +255,11 @@ BEGIN BEGIN MENUITEM "E&xit", IDC_EXIT END - MENUITEM "Action", IDC_ACTIONMENU + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END POPUP "View" BEGIN MENUITEM "Devices by type", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/pl-PL.rc b/dll/win32/devmgr/lang/pl-PL.rc index 1338ba0a4a0..3715b6e9b90 100644 --- a/dll/win32/devmgr/lang/pl-PL.rc +++ b/dll/win32/devmgr/lang/pl-PL.rc @@ -263,7 +263,11 @@ BEGIN BEGIN MENUITEM "Z&akończ", IDC_EXIT END - MENUITEM "Akcja", IDC_ACTIONMENU + POPUP "Akcja" + BEGIN + MENUITEM "Skanuj w poszukiwaniu zmian sprzętu", IDC_SCAN_HARDWARE + MENUITEM "Dodaj urządzenie", IDC_ADD_HARDWARE + END POPUP "Widok" BEGIN MENUITEM "Urządzenia według typów", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/pt-BR.rc b/dll/win32/devmgr/lang/pt-BR.rc index 3b869db3cb4..7b2b100eae0 100644 --- a/dll/win32/devmgr/lang/pt-BR.rc +++ b/dll/win32/devmgr/lang/pt-BR.rc @@ -255,7 +255,11 @@ BEGIN BEGIN MENUITEM "E&xit", IDC_EXIT END - MENUITEM "Action", IDC_ACTIONMENU + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END POPUP "View" BEGIN MENUITEM "Devices by type", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/pt-PT.rc b/dll/win32/devmgr/lang/pt-PT.rc index f7e5b4ef59f..70930cbc69f 100644 --- a/dll/win32/devmgr/lang/pt-PT.rc +++ b/dll/win32/devmgr/lang/pt-PT.rc @@ -255,7 +255,11 @@ BEGIN BEGIN MENUITEM "&Sair", IDC_EXIT END - MENUITEM "Acção", IDC_ACTIONMENU + POPUP "Acção" + BEGIN + MENUITEM "Verificar alterações de hardware", IDC_SCAN_HARDWARE + MENUITEM "Adicionar hardware", IDC_ADD_HARDWARE + END POPUP "Vista" BEGIN MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/ro-RO.rc b/dll/win32/devmgr/lang/ro-RO.rc index 6c2ab0b9caf..2f2bcc171e3 100644 --- a/dll/win32/devmgr/lang/ro-RO.rc +++ b/dll/win32/devmgr/lang/ro-RO.rc @@ -258,7 +258,11 @@ BEGIN BEGIN MENUITEM "I&eșire", IDC_EXIT END - MENUITEM "A&cțiune", IDC_ACTIONMENU + POPUP "A&cțiune" + BEGIN + MENUITEM "Scanează configurația fizică", IDC_SCAN_HARDWARE + MENUITEM "Adăugare dispozitiv…", IDC_ADD_HARDWARE + END POPUP "&Afișare" BEGIN MENUITEM "Dispozitive după tip", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/ru-RU.rc b/dll/win32/devmgr/lang/ru-RU.rc index 7996cf44b9b..472e38315f4 100644 --- a/dll/win32/devmgr/lang/ru-RU.rc +++ b/dll/win32/devmgr/lang/ru-RU.rc @@ -254,7 +254,11 @@ BEGIN BEGIN MENUITEM "В&ыход", IDC_EXIT END - MENUITEM "&Действие", IDC_ACTIONMENU + POPUP "&Действие" + BEGIN + MENUITEM "О&бновить конфигурацию оборудования", IDC_SCAN_HARDWARE + MENUITEM "&Добавить устройство", IDC_ADD_HARDWARE + END POPUP "&Вид" BEGIN MENUITEM "&Устройства по типу", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/sk-SK.rc b/dll/win32/devmgr/lang/sk-SK.rc index 3cb51f24d3d..864c5afd114 100644 --- a/dll/win32/devmgr/lang/sk-SK.rc +++ b/dll/win32/devmgr/lang/sk-SK.rc @@ -257,7 +257,11 @@ BEGIN BEGIN MENUITEM "E&xit", IDC_EXIT END - MENUITEM "Action", IDC_ACTIONMENU + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END POPUP "View" BEGIN MENUITEM "Devices by type", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/sq-AL.rc b/dll/win32/devmgr/lang/sq-AL.rc index a97e335b7be..d375bd16227 100644 --- a/dll/win32/devmgr/lang/sq-AL.rc +++ b/dll/win32/devmgr/lang/sq-AL.rc @@ -256,7 +256,11 @@ BEGIN BEGIN MENUITEM "E&xit", IDC_EXIT END - MENUITEM "Action", IDC_ACTIONMENU + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END POPUP "View" BEGIN MENUITEM "Devices by type", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/tr-TR.rc b/dll/win32/devmgr/lang/tr-TR.rc index 26faf2e8d11..ffc84e9d968 100644 --- a/dll/win32/devmgr/lang/tr-TR.rc +++ b/dll/win32/devmgr/lang/tr-TR.rc @@ -254,7 +254,11 @@ BEGIN BEGIN MENUITEM "&Çıkış", IDC_EXIT END - MENUITEM "&Eylem", IDC_ACTIONMENU + POPUP "&Eylem" + BEGIN + MENUITEM "Donanım Değişiklikleri İçin Tara", IDC_SCAN_HARDWARE + MENUITEM "Donanım Ekle", IDC_ADD_HARDWARE + END POPUP "&Görünüm" BEGIN MENUITEM "&Türe Göre Aygıtlar", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/uk-UA.rc b/dll/win32/devmgr/lang/uk-UA.rc index 300d3ad860c..95eb8cb47d7 100644 --- a/dll/win32/devmgr/lang/uk-UA.rc +++ b/dll/win32/devmgr/lang/uk-UA.rc @@ -260,7 +260,11 @@ BEGIN BEGIN MENUITEM "E&xit", IDC_EXIT END - MENUITEM "Action", IDC_ACTIONMENU + POPUP "Action" + BEGIN + MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE + MENUITEM "Add hardware", IDC_ADD_HARDWARE + END POPUP "View" BEGIN MENUITEM "Devices by type", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/zh-CN.rc b/dll/win32/devmgr/lang/zh-CN.rc index 565ba63fe78..63d48cd2362 100644 --- a/dll/win32/devmgr/lang/zh-CN.rc +++ b/dll/win32/devmgr/lang/zh-CN.rc @@ -253,7 +253,11 @@ BEGIN BEGIN MENUITEM "关闭(&X)", IDC_EXIT END - MENUITEM "操作", IDC_ACTIONMENU + POPUP "行动" + BEGIN + MENUITEM "扫描检测硬件改动", IDC_SCAN_HARDWARE + MENUITEM "添加硬件", IDC_ADD_HARDWARE + END POPUP "视图" BEGIN MENUITEM "按类型设备", IDC_DEVBYTYPE diff --git a/dll/win32/devmgr/lang/zh-TW.rc b/dll/win32/devmgr/lang/zh-TW.rc index f131af426f1..08d7e64867a 100644 --- a/dll/win32/devmgr/lang/zh-TW.rc +++ b/dll/win32/devmgr/lang/zh-TW.rc @@ -253,7 +253,11 @@ BEGIN BEGIN MENUITEM "關閉(&X)", IDC_EXIT END - MENUITEM "行動", IDC_ACTIONMENU + POPUP "行動" + BEGIN + MENUITEM "掃描檢測硬體改動", IDC_SCAN_HARDWARE + MENUITEM "添加硬體", IDC_ADD_HARDWARE + END POPUP "檢視" BEGIN MENUITEM "按類型裝置", IDC_DEVBYTYPE

5 years, 4 months

[reactos] 01/01: [FONTS][SETUP] Add Franklin Gothic Medium fonts (#1786)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23faa89d09fa6e048bbc9… commit 23faa89d09fa6e048bbc90a9d7d4b433109d8d0c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 3 19:03:27 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 3 19:03:27 2019 +0900 [FONTS][SETUP] Add Franklin Gothic Medium fonts (#1786) Add "Franklin Gothic Medium" fonts. CORE-16272 - Add "Franklin Gothic Medium" and "Franklin Gothic Medium Italic" fonts by duplicating Alexei Vanyashin's "Libre Franklin" fonts and renaming them. - Delete some "Franklin Gothic Medium" font substitutes. - Add LICENSE file. I made these font files by using FontForge. Their family name is "Franklin Gothic Medium". Their display names are "Franklin Gothic Medium" and "Franklin Gothic Medium Italic". Their font filenames are framd.ttf and framdit.ttf. The Underline Positions are hacked by adding an integer value for workaround of FontForge's bug. Alexei Vanyashin's "Libre Franklin" fonts are available at https://github.com/alexeiva/Libre-Franklin . --- base/setup/lib/muifonts.h | 6 --- media/fonts/CMakeLists.txt | 2 + media/fonts/doc/FranklinGothicMedium/README.txt | 8 ++++ .../FranklinGothicMedium/SIL Open Font License.txt | 43 +++++++++++++++++++++ media/fonts/framd.ttf | Bin 0 -> 352992 bytes media/fonts/framdit.ttf | Bin 0 -> 328536 bytes 6 files changed, 53 insertions(+), 6 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 967f229d07d..9dae43fd2a7 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -15,7 +15,6 @@ MUI_SUBFONT LatinFonts[] = { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -51,7 +50,6 @@ MUI_SUBFONT CyrillicFonts[] = { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Franklin Gothic Medium", L"Libre Franklin" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -87,7 +85,6 @@ MUI_SUBFONT GreekFonts[] = { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Franklin Gothic Medium", L"Libre Franklin" }, { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -124,7 +121,6 @@ MUI_SUBFONT HebrewFonts[] = { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Franklin Gothic Medium", L"Libre Franklin" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Tahoma" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -380,7 +376,6 @@ MUI_SUBFONT UnicodeFonts[] = { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"DejaVu Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -417,7 +412,6 @@ MUI_SUBFONT HindiFonts[] = { L"Courier New Greek,161", L"Courier New,161" }, { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 1c4c70cfba1..5394df3eade 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -32,6 +32,8 @@ list(APPEND FONT_FILES DejaVuSerifCondensed-BoldItalic.ttf DejaVuSerifCondensed-Italic.ttf DejaVuSerifCondensed.ttf + framd.ttf + framdit.ttf FreeMono.ttf FreeMonoBold.ttf FreeMonoBoldOblique.ttf diff --git a/media/fonts/doc/FranklinGothicMedium/README.txt b/media/fonts/doc/FranklinGothicMedium/README.txt new file mode 100644 index 00000000000..ee4a2c9bc74 --- /dev/null +++ b/media/fonts/doc/FranklinGothicMedium/README.txt @@ -0,0 +1,8 @@ +ReactOS "Franklin Gothic Medium" fonts are based on +Alexei Vanyashin's "Libre Franklin" fonts. + +These font files are released under the terms of +SIL Open Font License Version 1.1. See File "SIL Open Font License.txt". + +Alexei Vanyashin's "Libre Franklin" fonts are available +at https://github.com/alexeiva/Libre-Franklin . diff --git a/media/fonts/doc/FranklinGothicMedium/SIL Open Font License.txt b/media/fonts/doc/FranklinGothicMedium/SIL Open Font License.txt new file mode 100644 index 00000000000..e9792ccdb40 --- /dev/null +++ b/media/fonts/doc/FranklinGothicMedium/SIL Open Font License.txt @@ -0,0 +1,43 @@ +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 creat [...] + +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 [...] \ No newline at end of file diff --git a/media/fonts/framd.ttf b/media/fonts/framd.ttf new file mode 100644 index 00000000000..d08fbf792ee Binary files /dev/null and b/media/fonts/framd.ttf differ diff --git a/media/fonts/framdit.ttf b/media/fonts/framdit.ttf new file mode 100644 index 00000000000..765f7fba100 Binary files /dev/null and b/media/fonts/framdit.ttf differ

5 years, 4 months

[reactos] 01/01: [FONTS][SETUP] Add Palatino Linotype fonts (#1785)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb1878157bbe4ca825764… commit bb1878157bbe4ca825764a4ef933f3f086b369dd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 3 16:24:32 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 3 16:24:32 2019 +0900 [FONTS][SETUP] Add Palatino Linotype fonts (#1785) Add "Palatino Linotype" fonts. CORE-16272 - Add "Palatino Linotype", "Palatino Linotype Bold", "Palatino Linotype Bold Italic" and "Palatino Linotype Italic" fonts by duplicating "DejaVu Serif" fonts and renaming them. - Delete some "Palatino Linotype" font substitutes. - Add LICENSE file. I made these font files by using FontForge. Their family name is "Palatino Linotype". Their display names are "Palatino Linotype", "Palatino Linotype Bold", "Palatino Linotype Bold Italic" and "Palatino Linotype Italic". Their font filenames are pala.ttf, palab.ttf, palabi.ttf and palai.ttf. The Underline Positions are hacked by adding an integer value for workaround of FontForge's bug. --- base/setup/lib/muifonts.h | 9 -- media/fonts/CMakeLists.txt | 4 + media/fonts/doc/PalatinoLinotype/LICENSE.txt | 188 +++++++++++++++++++++++++++ media/fonts/doc/PalatinoLinotype/README.txt | 3 + media/fonts/pala.ttf | Bin 0 -> 293776 bytes media/fonts/palab.ttf | Bin 0 -> 282244 bytes media/fonts/palabi.ttf | Bin 0 -> 298676 bytes media/fonts/palai.ttf | Bin 0 -> 296672 bytes 8 files changed, 195 insertions(+), 9 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 0e2ce9a0ab9..967f229d07d 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -22,7 +22,6 @@ MUI_SUBFONT LatinFonts[] = { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"System", L"FreeSans" }, { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, @@ -59,7 +58,6 @@ MUI_SUBFONT CyrillicFonts[] = { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"System", L"FreeSans" }, { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, @@ -96,7 +94,6 @@ MUI_SUBFONT GreekFonts[] = { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"System", L"FreeSans" }, { L"Tahoma", L"DejaVu Sans" }, { L"Terminal", L"DejaVu Sans Mono" }, @@ -134,7 +131,6 @@ MUI_SUBFONT HebrewFonts[] = { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"System", L"FreeSans" }, { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, @@ -181,7 +177,6 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, { L"NSimSun", L"Droid Sans Fallback" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"SimHei", L"Droid Sans Fallback" }, { L"SimSun", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, @@ -238,7 +233,6 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"Ming Light", L"Droid Sans Fallback" }, { L"MingLiU", L"Droid Sans Fallback" }, { L"PMingLiU", L"Droid Sans Fallback" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, @@ -291,7 +285,6 @@ MUI_SUBFONT JapaneseFonts[] = { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, @@ -348,7 +341,6 @@ MUI_SUBFONT KoreanFonts[] = { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, @@ -395,7 +387,6 @@ MUI_SUBFONT UnicodeFonts[] = { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"System", L"FreeSans" }, { L"Tahoma", L"DejaVu Sans" }, { L"Terminal", L"DejaVu Sans Mono" }, diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 9ad30283b5b..1c4c70cfba1 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -98,6 +98,10 @@ list(APPEND FONT_FILES OpenSans-Regular.ttf OpenSans-Semibold.ttf OpenSans-SemiboldItalic.ttf + pala.ttf + palab.ttf + palabi.ttf + palai.ttf symbol.ttf tahoma.ttf tahomabd.ttf diff --git a/media/fonts/doc/PalatinoLinotype/LICENSE.txt b/media/fonts/doc/PalatinoLinotype/LICENSE.txt new file mode 100644 index 00000000000..fae1d512b3c --- /dev/null +++ b/media/fonts/doc/PalatinoLinotype/LICENSE.txt @@ -0,0 +1,188 @@ +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. +Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) + +Copyright (c) 2019 Katayama Hirofumi MZ. + +Bitstream Vera Fonts Copyright +------------------------------ + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is +a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute the +Font Software, including without limitation the rights to use, copy, merge, +publish, distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to the +following conditions: + +The above copyright and trademark notices and this permission notice shall +be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional glyphs or characters may be added to the Fonts, only if the fonts +are renamed to names not containing either the words "Bitstream" or the word +"Vera". + +This License becomes null and void to the extent applicable to Fonts or Font +Software that has been modified and is distributed under the "Bitstream +Vera" names. + +The Font Software may be sold as part of a larger software package but no +copy of one or more of the Font Software typefaces may be sold by itself. + +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 BITSTREAM OR THE GNOME +FOUNDATION 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. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font Software +without prior written authorization from the Gnome Foundation or Bitstream +Inc., respectively. For further information, contact: fonts at gnome dot +org. + +Arev Fonts Copyright +------------------------------ + +Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and +associated documentation files (the "Font Software"), to reproduce +and distribute the modifications to the Bitstream Vera Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to +the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Tavmjong Bah" or the word "Arev". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Tavmjong Bah Arev" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +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 +TAVMJONG BAH 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. + +Except as contained in this notice, the name of Tavmjong Bah shall not +be used in advertising or otherwise to promote the sale, use or other +dealings in this Font Software without prior written authorization +from Tavmjong Bah. For further information, contact: tavmjong @ free +. fr. + +TeX Gyre DJV Math +----------------- +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. + +Math extensions done by B. Jackowski, P. Strzelczyk and P. Pianowski +(on behalf of TeX users groups) are in public domain. + +Letters imported from Euler Fraktur from AMSfonts are (c) American +Mathematical Society (see below). +Bitstream Vera Fonts Copyright +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera +is a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license (“Fonts”) and associated +documentation +files (the “Font Software”), to reproduce and distribute the Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, +and/or sell copies of the Font Software, and to permit persons to whom +the Font Software is furnished to do so, subject to the following +conditions: + +The above copyright and trademark notices and this permission notice +shall be +included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional +glyphs or characters may be added to the Fonts, only if the fonts are +renamed +to names not containing either the words “Bitstream” or the word “Vera”. + +This License becomes null and void to the extent applicable to Fonts or +Font Software +that has been modified and is distributed under the “Bitstream Vera” +names. + +The Font Software may be sold as part of a larger software package but +no copy +of one or more of the Font Software typefaces may be sold by itself. + +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 BITSTREAM OR THE GNOME +FOUNDATION +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. +Except as contained in this notice, the names of GNOME, the GNOME +Foundation, +and Bitstream Inc., shall not be used in advertising or otherwise to promote +the sale, use or other dealings in this Font Software without prior written +authorization from the GNOME Foundation or Bitstream Inc., respectively. +For further information, contact: fonts at gnome dot org. + +AMSFonts (v. 2.2) copyright + +The PostScript Type 1 implementation of the AMSFonts produced by and +previously distributed by Blue Sky Research and Y&Y, Inc. are now freely +available for general use. This has been accomplished through the +cooperation +of a consortium of scientific publishers with Blue Sky Research and Y&Y. +Members of this consortium include: + +Elsevier Science IBM Corporation Society for Industrial and Applied +Mathematics (SIAM) Springer-Verlag American Mathematical Society (AMS) + +In order to assure the authenticity of these fonts, copyright will be +held by +the American Mathematical Society. This is not meant to restrict in any way +the legitimate use of the fonts, such as (but not limited to) electronic +distribution of documents containing these fonts, inclusion of these fonts +into other public domain or commercial font collections or computer +applications, use of the outline data to create derivative fonts and/or +faces, etc. However, the AMS does require that the AMS copyright notice be +removed from any derivative versions of the fonts which have been altered in +any way. In addition, to ensure the fidelity of TeX documents using Computer +Modern fonts, Professor Donald Knuth, creator of the Computer Modern faces, +has requested that any alterations which yield different font metrics be +given a different name. + +$Id$ diff --git a/media/fonts/doc/PalatinoLinotype/README.txt b/media/fonts/doc/PalatinoLinotype/README.txt new file mode 100644 index 00000000000..a93d1c08b94 --- /dev/null +++ b/media/fonts/doc/PalatinoLinotype/README.txt @@ -0,0 +1,3 @@ +ReactOS Palatino Linotype fonts are based on DejaVu Serif fonts. + +See LICENSE.txt for license terms. diff --git a/media/fonts/pala.ttf b/media/fonts/pala.ttf new file mode 100644 index 00000000000..b3ea1a154b1 Binary files /dev/null and b/media/fonts/pala.ttf differ diff --git a/media/fonts/palab.ttf b/media/fonts/palab.ttf new file mode 100644 index 00000000000..0eabb35181b Binary files /dev/null and b/media/fonts/palab.ttf differ diff --git a/media/fonts/palabi.ttf b/media/fonts/palabi.ttf new file mode 100644 index 00000000000..5aa9201efba Binary files /dev/null and b/media/fonts/palabi.ttf differ diff --git a/media/fonts/palai.ttf b/media/fonts/palai.ttf new file mode 100644 index 00000000000..f4f8e936fb3 Binary files /dev/null and b/media/fonts/palai.ttf differ

5 years, 4 months

[reactos] 01/01: [FONTS] s/Geogia/Georgia/

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ce98c85194214111f9ec… commit 5ce98c85194214111f9ecff6f81fbaa015735fd6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 3 11:28:10 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Aug 3 11:28:10 2019 +0900 [FONTS] s/Geogia/Georgia/ --- media/fonts/doc/{Geogia => Georgia}/COPYING.txt | 0 media/fonts/doc/{Geogia => Georgia}/README.txt | 4 ++-- media/fonts/georgia.ttf | Bin 1768964 -> 1768976 bytes media/fonts/georgiab.ttf | Bin 807328 -> 807340 bytes media/fonts/georgiai.ttf | Bin 503904 -> 503916 bytes media/fonts/georgiaz.ttf | Bin 342932 -> 342944 bytes 6 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media/fonts/doc/Geogia/COPYING.txt b/media/fonts/doc/Georgia/COPYING.txt similarity index 100% rename from media/fonts/doc/Geogia/COPYING.txt rename to media/fonts/doc/Georgia/COPYING.txt diff --git a/media/fonts/doc/Geogia/README.txt b/media/fonts/doc/Georgia/README.txt similarity index 90% rename from media/fonts/doc/Geogia/README.txt rename to media/fonts/doc/Georgia/README.txt index e9aeb921ac2..d8352601081 100644 --- a/media/fonts/doc/Geogia/README.txt +++ b/media/fonts/doc/Georgia/README.txt @@ -1,10 +1,10 @@ -ReactOS Geogia fonts are based on FreeSerif fonts of GNU FreeFont, released +ReactOS Georgia fonts are based on FreeSerif fonts of GNU FreeFont, released under the terms of GNU GENERAL PUBLIC LICENSE Version 3 with a special exception. Copyright 2002, 2003, 2005, 2008, 2009, 2010, 2012 GNU Freefont contributors. Copyright (c) 2019 Katayama Hirofumi MZ. -ReactOS Geogia fonts are free software; you can redistribute it and/or +ReactOS Georgia fonts are free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. diff --git a/media/fonts/georgia.ttf b/media/fonts/georgia.ttf index 0427ff3cfc9..b7b0c7741bf 100644 Binary files a/media/fonts/georgia.ttf and b/media/fonts/georgia.ttf differ diff --git a/media/fonts/georgiab.ttf b/media/fonts/georgiab.ttf index 05969406ad3..256ab06ae74 100644 Binary files a/media/fonts/georgiab.ttf and b/media/fonts/georgiab.ttf differ diff --git a/media/fonts/georgiai.ttf b/media/fonts/georgiai.ttf index b87558fe389..fbfc8bdcc3d 100644 Binary files a/media/fonts/georgiai.ttf and b/media/fonts/georgiai.ttf differ diff --git a/media/fonts/georgiaz.ttf b/media/fonts/georgiaz.ttf index 1a65687fc5b..5d2f89fd479 100644 Binary files a/media/fonts/georgiaz.ttf and b/media/fonts/georgiaz.ttf differ

5 years, 4 months

[reactos] 01/01: [FONTS][SETUP] Add Geogia fonts (#1784)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e282f99ce5dbc7ff4cdfd… commit e282f99ce5dbc7ff4cdfdf9226a618da1fb42c1a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 3 10:43:09 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 3 10:43:09 2019 +0900 [FONTS][SETUP] Add Geogia fonts (#1784) Add "Geogia" fonts. CORE-16272 - Add "Geogia", "Geogia Bold", "Geogia Bold Italic" and "Geogia Italic" fonts by duplicating FreeSerif fonts and renaming them. - Delete some "Geogia" font substitutes. - Add LICENSE file. I made these font files by using FontForge. Their family name is "Geogia". Their display names are "Geogia", "Geogia Bold", "Geogia Bold Italic" and "Geogia Italic". Their font filenames are georgia.ttf, georgiab.ttf, georgiaz.ttf and georgiai.ttf. The Underline Positions are hacked by adding an integer value for workaround of FontForge's bug. --- base/setup/lib/muifonts.h | 10 - media/fonts/CMakeLists.txt | 4 + media/fonts/doc/Geogia/COPYING.txt | 674 +++++++++++++++++++++++++++++++++++++ media/fonts/doc/Geogia/README.txt | 28 ++ media/fonts/georgia.ttf | Bin 0 -> 1768964 bytes media/fonts/georgiab.ttf | Bin 0 -> 807328 bytes media/fonts/georgiai.ttf | Bin 0 -> 503904 bytes media/fonts/georgiaz.ttf | Bin 0 -> 342932 bytes 8 files changed, 706 insertions(+), 10 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 0157c02d5e5..0e2ce9a0ab9 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -16,7 +16,6 @@ MUI_SUBFONT LatinFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, - { L"Georgia", L"FreeSerif" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -54,7 +53,6 @@ MUI_SUBFONT CyrillicFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin" }, - { L"Georgia", L"FreeSerif" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -92,7 +90,6 @@ MUI_SUBFONT GreekFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin" }, - { L"Georgia", L"FreeSerif" }, { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -131,7 +128,6 @@ MUI_SUBFONT HebrewFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin" }, - { L"Georgia", L"FreeSerif" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Tahoma" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -175,7 +171,6 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Georgia", L"FreeSerif" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -232,7 +227,6 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"DLCMingMedium", L"Droid Sans Fallback" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Georgia", L"FreeSerif" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -285,7 +279,6 @@ MUI_SUBFONT JapaneseFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Georgia", L"FreeSerif" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -343,7 +336,6 @@ MUI_SUBFONT KoreanFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Georgia", L"FreeSerif" }, { L"Gulim", L"Droid Sans Fallback" }, { L"GulimChe", L"Droid Sans Fallback" }, { L"Gungsuh", L"Droid Sans Fallback" }, @@ -397,7 +389,6 @@ MUI_SUBFONT UnicodeFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, - { L"Georgia", L"FreeSerif" }, { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"DejaVu Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -436,7 +427,6 @@ MUI_SUBFONT HindiFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, - { L"Georgia", L"FreeSerif" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 384c5141593..9ad30283b5b 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -46,6 +46,10 @@ list(APPEND FONT_FILES FreeSerifItalic.ttf FSEX301.ttf FSEX301-L2.ttf + georgia.ttf + georgiab.ttf + georgiai.ttf + georgiaz.ttf LiberationMono-Bold.ttf LiberationMono-BoldItalic.ttf LiberationMono-Italic.ttf diff --git a/media/fonts/doc/Geogia/COPYING.txt b/media/fonts/doc/Geogia/COPYING.txt new file mode 100644 index 00000000000..94a9ed024d3 --- /dev/null +++ b/media/fonts/doc/Geogia/COPYING.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + 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), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/media/fonts/doc/Geogia/README.txt b/media/fonts/doc/Geogia/README.txt new file mode 100644 index 00000000000..e9aeb921ac2 --- /dev/null +++ b/media/fonts/doc/Geogia/README.txt @@ -0,0 +1,28 @@ +ReactOS Geogia fonts are based on FreeSerif fonts of GNU FreeFont, released +under the terms of GNU GENERAL PUBLIC LICENSE Version 3 with a special exception. + +Copyright 2002, 2003, 2005, 2008, 2009, 2010, 2012 GNU Freefont contributors. +Copyright (c) 2019 Katayama Hirofumi MZ. + +ReactOS Geogia fonts are free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License as published +by the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +The fonts are distributed in the hope that they will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +As a special exception, if you create a document which uses this font, and +embed this font or unaltered portions of this font into the document, this +font does not by itself cause the resulting document to be covered by the +GNU General Public License. This exception does not however invalidate any +other reasons why the document might be covered by the GNU General Public +License. If you modify this font, you may extend this exception to your +version of the font, but you are not obligated to do so. If you do not +wish to do so, delete this exception statement from your version. diff --git a/media/fonts/georgia.ttf b/media/fonts/georgia.ttf new file mode 100644 index 00000000000..0427ff3cfc9 Binary files /dev/null and b/media/fonts/georgia.ttf differ diff --git a/media/fonts/georgiab.ttf b/media/fonts/georgiab.ttf new file mode 100644 index 00000000000..05969406ad3 Binary files /dev/null and b/media/fonts/georgiab.ttf differ diff --git a/media/fonts/georgiai.ttf b/media/fonts/georgiai.ttf new file mode 100644 index 00000000000..b87558fe389 Binary files /dev/null and b/media/fonts/georgiai.ttf differ diff --git a/media/fonts/georgiaz.ttf b/media/fonts/georgiaz.ttf new file mode 100644 index 00000000000..1a65687fc5b Binary files /dev/null and b/media/fonts/georgiaz.ttf differ

5 years, 4 months

[reactos] 01/01: [FONTS][BOOTDATA][SETUP] Add Courier New fonts (#1783)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=faa3237d469640031d384… commit faa3237d469640031d3846f94a490edd33dee100 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 3 09:05:14 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 3 09:05:14 2019 +0900 [FONTS][BOOTDATA][SETUP] Add Courier New fonts (#1783) Add "Courier New" fonts. CORE-16272 - Add "Courier New", "Courier New Bold", "Courier New Bold Italic" and "Courier New Italic" fonts by duplicating FreeMono fonts and renaming them. - Delete some "Courier New" font substitutes. - Add LICENSE file. I made these font files by using FontForge. Their family name is "Courier New". Their display names are "Courier New", "Courier New Bold", "Courier New Bold Italic" and "Courier New Italic". Their font filenames are cour.ttf, courbd.ttf, courbi.ttf and couri.ttf. The Underline Positions are hacked by adding an integer value for workaround of FontForge's bug. --- base/setup/lib/muifonts.h | 9 - boot/bootdata/livecd.inf | 1 - media/fonts/CMakeLists.txt | 4 + media/fonts/cour.ttf | Bin 0 -> 314804 bytes media/fonts/courbd.ttf | Bin 0 -> 156100 bytes media/fonts/courbi.ttf | Bin 0 -> 159032 bytes media/fonts/couri.ttf | Bin 0 -> 191584 bytes media/fonts/doc/CourierNew/COPYING.txt | 674 +++++++++++++++++++++++++++++++++ media/fonts/doc/CourierNew/README.txt | 28 ++ 9 files changed, 706 insertions(+), 10 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 653373487c2..0157c02d5e5 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -9,7 +9,6 @@ MUI_SUBFONT LatinFonts[] = { L"Arial Greek,161", L"Arial,161" }, { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"FreeMono" }, - { L"Courier New", L"FreeMono" }, { L"Courier New Baltic,186", L"Courier New,186" }, { L"Courier New CE,238", L"Courier New,238" }, { L"Courier New CYR,204", L"Courier New,204" }, @@ -48,7 +47,6 @@ MUI_SUBFONT CyrillicFonts[] = { L"Arial Greek,161", L"Arial,161" }, { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"FreeMono" }, - { L"Courier New", L"FreeMono" }, { L"Courier New Baltic,186", L"Courier New,186" }, { L"Courier New CE,238", L"Courier New,238" }, { L"Courier New CYR,204", L"Courier New,204" }, @@ -87,7 +85,6 @@ MUI_SUBFONT GreekFonts[] = { L"Arial Greek,161", L"Arial,161" }, { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"FreeMono" }, - { L"Courier New", L"FreeMono" }, { L"Courier New Baltic,186", L"Courier New,186" }, { L"Courier New CE,238", L"Courier New,238" }, { L"Courier New CYR,204", L"Courier New,204" }, @@ -127,7 +124,6 @@ MUI_SUBFONT HebrewFonts[] = { L"Arial Greek,161", L"Arial,161" }, { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"FreeMono" }, - { L"Courier New", L"FreeMono" }, { L"Courier New Baltic,186", L"Courier New,186" }, { L"Courier New CE,238", L"Courier New,238" }, { L"Courier New CYR,204", L"Courier New,204" }, @@ -172,7 +168,6 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Arial Greek,161", L"Arial,161" }, { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"FreeMono" }, - { L"Courier New", L"FreeMono" }, { L"Courier New Baltic,186", L"Courier New,186" }, { L"Courier New CE,238", L"Courier New,238" }, { L"Courier New CYR,204", L"Courier New,204" }, @@ -228,7 +223,6 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"Arial Greek,161", L"Arial,161" }, { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"FreeMono" }, - { L"Courier New", L"FreeMono" }, { L"Courier New Baltic,186", L"Courier New,186" }, { L"Courier New CE,238", L"Courier New,238" }, { L"Courier New CYR,204", L"Courier New,204" }, @@ -284,7 +278,6 @@ MUI_SUBFONT JapaneseFonts[] = { L"Arial Greek,161", L"Arial,161" }, { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"FreeMono" }, - { L"Courier New", L"FreeMono" }, { L"Courier New Baltic,186", L"Courier New,186" }, { L"Courier New CE,238", L"Courier New,238" }, { L"Courier New CYR,204", L"Courier New,204" }, @@ -343,7 +336,6 @@ MUI_SUBFONT KoreanFonts[] = { L"Batang", L"Droid Sans Fallback" }, { L"BatangChe", L"Droid Sans Fallback" }, { L"Courier", L"FreeMono" }, - { L"Courier New", L"FreeMono" }, { L"Courier New Baltic,186", L"Courier New,186" }, { L"Courier New CE,238", L"Courier New,238" }, { L"Courier New CYR,204", L"Courier New,204" }, @@ -437,7 +429,6 @@ MUI_SUBFONT HindiFonts[] = { L"Arial Greek,161", L"Arial,161" }, { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"FreeMono" }, - { L"Courier New", L"FreeMono" }, { L"Courier New Baltic,186", L"Courier New,186" }, { L"Courier New CE,238", L"Courier New,238" }, { L"Courier New CYR,204", L"Courier New,204" }, diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index 81452350c24..434a533adef 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -49,7 +49,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management","Pagin ; Font Substitution HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier New",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans" diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index e558028d2db..384c5141593 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -6,6 +6,10 @@ list(APPEND FONT_FILES ariali.ttf comic.ttf comicbd.ttf + cour.ttf + courbd.ttf + courbi.ttf + couri.ttf DejaVuMathTeXGyre.ttf DejaVuSans-Bold.ttf DejaVuSans-BoldOblique.ttf diff --git a/media/fonts/cour.ttf b/media/fonts/cour.ttf new file mode 100644 index 00000000000..72ad8e47850 Binary files /dev/null and b/media/fonts/cour.ttf differ diff --git a/media/fonts/courbd.ttf b/media/fonts/courbd.ttf new file mode 100644 index 00000000000..44dfda7bb19 Binary files /dev/null and b/media/fonts/courbd.ttf differ diff --git a/media/fonts/courbi.ttf b/media/fonts/courbi.ttf new file mode 100644 index 00000000000..b5d105690ad Binary files /dev/null and b/media/fonts/courbi.ttf differ diff --git a/media/fonts/couri.ttf b/media/fonts/couri.ttf new file mode 100644 index 00000000000..bdb78960588 Binary files /dev/null and b/media/fonts/couri.ttf differ diff --git a/media/fonts/doc/CourierNew/COPYING.txt b/media/fonts/doc/CourierNew/COPYING.txt new file mode 100644 index 00000000000..94a9ed024d3 --- /dev/null +++ b/media/fonts/doc/CourierNew/COPYING.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + 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), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/media/fonts/doc/CourierNew/README.txt b/media/fonts/doc/CourierNew/README.txt new file mode 100644 index 00000000000..6894dd408cf --- /dev/null +++ b/media/fonts/doc/CourierNew/README.txt @@ -0,0 +1,28 @@ +ReactOS Courier New fonts are based on FreeMono fonts of GNU FreeFont, released +under the terms of GNU GENERAL PUBLIC LICENSE Version 3 with a special exception. + +Copyright 2002, 2003, 2005, 2008, 2009, 2010, 2012 GNU Freefont contributors. +Copyright (c) 2019 Katayama Hirofumi MZ. + +ReactOS Courier New fonts are free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License as published +by the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +The fonts are distributed in the hope that they will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +As a special exception, if you create a document which uses this font, and +embed this font or unaltered portions of this font into the document, this +font does not by itself cause the resulting document to be covered by the +GNU General Public License. This exception does not however invalidate any +other reasons why the document might be covered by the GNU General Public +License. If you modify this font, you may extend this exception to your +version of the font, but you are not obligated to do so. If you do not +wish to do so, delete this exception statement from your version.

5 years, 4 months

[reactos] 01/01: [FONTS][SETUP][BOOTDATA] Add Arial fonts (#1781)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1463f4b02ac7d8514baa8… commit 1463f4b02ac7d8514baa808614a18b280cae1972 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 2 20:37:53 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 2 20:37:53 2019 +0900 [FONTS][SETUP][BOOTDATA] Add Arial fonts (#1781) Add Arial fonts. CORE-16272 - Add "Arial", "Arial Bold", "Arial Bold Italic" and "Arial Italic" fonts by duplicating Liberation Sans fonts and renaming them. - Disable some Arial font substitutes. - Add LICENSE file. I made these font files by using FontForge. Their family name is "Arial". Their display names are "Arial", "Arial Bold", "Arial Bold Italic" and "Arial Italic". Their font filenames are arial.ttf, arialbd.ttf, arialbi.ttf and ariali.ttf. The Underline Positions are hacked by adding an integer value for workaround of FontForge's bug. --- base/setup/lib/muifonts.h | 8 --- boot/bootdata/livecd.inf | 1 - media/fonts/CMakeLists.txt | 4 ++ media/fonts/arial.ttf | Bin 0 -> 180120 bytes media/fonts/arialbd.ttf | Bin 0 -> 180000 bytes media/fonts/arialbi.ttf | Bin 0 -> 187656 bytes media/fonts/ariali.ttf | Bin 0 -> 188056 bytes media/fonts/doc/Arial/AUTHORS.txt | 13 +++++ media/fonts/doc/Arial/ChangeLog.txt | 24 +++++++++ media/fonts/doc/Arial/LICENSE.txt | 104 ++++++++++++++++++++++++++++++++++++ media/fonts/doc/Arial/README.txt | 8 +++ 11 files changed, 153 insertions(+), 9 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index a01176ac088..653373487c2 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -3,7 +3,6 @@ MUI_SUBFONT LatinFonts[] = { /*Font Substitute */ - { L"Arial", L"Liberation Sans" }, { L"Arial Baltic,186", L"Arial,186" }, { L"Arial CE,238", L"Arial,238" }, { L"Arial CYR,204", L"Arial,204" }, @@ -43,7 +42,6 @@ MUI_SUBFONT LatinFonts[] = MUI_SUBFONT CyrillicFonts[] = { - { L"Arial", L"Liberation Sans" }, { L"Arial Baltic,186", L"Arial,186" }, { L"Arial CE,238", L"Arial,238" }, { L"Arial CYR,204", L"Arial,204" }, @@ -83,7 +81,6 @@ MUI_SUBFONT CyrillicFonts[] = MUI_SUBFONT GreekFonts[] = { - { L"Arial", L"Liberation Sans" }, { L"Arial Baltic,186", L"Arial,186" }, { L"Arial CE,238", L"Arial,238" }, { L"Arial CYR,204", L"Arial,204" }, @@ -169,7 +166,6 @@ WCHAR CSF_LocalName3[] = {0xFC4B, 0x91CC, 0}; /* SimHei */ WCHAR CSF_LocalName4[] = {'M', 'S', 0x5B8B, 0x4F53, 0}; /* MS Song */ MUI_SUBFONT ChineseSimplifiedFonts[] = { - { L"Arial", L"Liberation Sans" }, { L"Arial Baltic,186", L"Arial,186" }, { L"Arial CE,238", L"Arial,238" }, { L"Arial CYR,204", L"Arial,204" }, @@ -226,7 +222,6 @@ WCHAR CTF_LocalName2[] = {0x83EF, 0x5EB7, 0x4E2D, 0x660E, 0x9AD4, 0}; /* D WCHAR CTF_LocalName3[] = {0x83EF, 0x5EB7, 0x7C97, 0x660E, 0x9AD4, 0}; /* DLCMingBold */ MUI_SUBFONT ChineseTraditionalFonts[] = { - { L"Arial", L"Liberation Sans" }, { L"Arial Baltic,186", L"Arial,186" }, { L"Arial CE,238", L"Arial,238" }, { L"Arial CYR,204", L"Arial,204" }, @@ -283,7 +278,6 @@ WCHAR JF_LocalName2[] = {0xFF2D, 0xFF33, ' ', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0} WCHAR JF_LocalName3[] = {0xFF2D, 0xFF33, ' ', 0xFF30, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0}; /* MS PGothic */ MUI_SUBFONT JapaneseFonts[] = { - { L"Arial", L"Liberation Sans" }, { L"Arial Baltic,186", L"Arial,186" }, { L"Arial CE,238", L"Arial,238" }, { L"Arial CYR,204", L"Arial,204" }, @@ -341,7 +335,6 @@ WCHAR KF_LocalName4[] = {0xAD74, 0xB9BC, 0}; /* Gulim */ WCHAR KF_LocalName5[] = {0xAD74, 0xB9BC, 0xCCB4, 0}; /* GulimChe */ MUI_SUBFONT KoreanFonts[] = { - { L"Arial", L"Liberation Sans" }, { L"Arial Baltic,186", L"Arial,186" }, { L"Arial CE,238", L"Arial,238" }, { L"Arial CYR,204", L"Arial,204" }, @@ -438,7 +431,6 @@ MUI_SUBFONT UnicodeFonts[] = MUI_SUBFONT HindiFonts[] = { /*Font Substitute */ - { L"Arial", L"Liberation Sans" }, { L"Arial Baltic,186", L"Arial,186" }, { L"Arial CE,238", L"Arial,238" }, { L"Arial CYR,204", L"Arial,204" }, diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index 465f9ef1969..81452350c24 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -48,7 +48,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ALLUSERSPRO HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management","PagingFiles",0x00000000,"" ; Font Substitution -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Arial",0x00000000,"Liberation Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier New",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 47c8f723097..e558028d2db 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -1,5 +1,9 @@ list(APPEND FONT_FILES + arial.ttf + arialbd.ttf + arialbi.ttf + ariali.ttf comic.ttf comicbd.ttf DejaVuMathTeXGyre.ttf diff --git a/media/fonts/arial.ttf b/media/fonts/arial.ttf new file mode 100644 index 00000000000..9996deef116 Binary files /dev/null and b/media/fonts/arial.ttf differ diff --git a/media/fonts/arialbd.ttf b/media/fonts/arialbd.ttf new file mode 100644 index 00000000000..1334d0526db Binary files /dev/null and b/media/fonts/arialbd.ttf differ diff --git a/media/fonts/arialbi.ttf b/media/fonts/arialbi.ttf new file mode 100644 index 00000000000..643ddb8d52f Binary files /dev/null and b/media/fonts/arialbi.ttf differ diff --git a/media/fonts/ariali.ttf b/media/fonts/ariali.ttf new file mode 100644 index 00000000000..0b499ce88a8 Binary files /dev/null and b/media/fonts/ariali.ttf differ diff --git a/media/fonts/doc/Arial/AUTHORS.txt b/media/fonts/doc/Arial/AUTHORS.txt new file mode 100644 index 00000000000..8d3f86585b0 --- /dev/null +++ b/media/fonts/doc/Arial/AUTHORS.txt @@ -0,0 +1,13 @@ +AUTHORS + +Current Contributors (sorted alphabetically): + - Katayama Hirofumi MZ + +Previous Contributors + - Pravin Satpute <psatpute at redhat dot com> + Project Owner (Current) + Red Hat, Inc. + + - Steve Matteson + Original Designer + Ascender, Inc. diff --git a/media/fonts/doc/Arial/ChangeLog.txt b/media/fonts/doc/Arial/ChangeLog.txt new file mode 100644 index 00000000000..a78b3a3eadd --- /dev/null +++ b/media/fonts/doc/Arial/ChangeLog.txt @@ -0,0 +1,24 @@ +* Thu Oct 04 2012 Pravin Satpute <psatpute AT redhat DOT com> +- 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 <psatpute AT redhat DOT com> +- 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. + +* Fri Aug 02 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> +- Renamed filename "LiberationSans-Regular.ttf" as "arial.ttf". +- Renamed filename "LiberationSans-Bold.ttf" as "arialbd.ttf". +- Renamed filename "LiberationSans-BoldItalic.ttf" as "arialbi.ttf". +- Renamed filename "LiberationSans-Italic.ttf" as "ariali.ttf". +- Renamed family name "Liberation Sans" as "Arial". +- Renamed display name "Liberation Sans" as "Arial". +- Renamed display name "Liberation Sans Bold" as "Arial Bold". +- Renamed display name "Liberation Sans Bold Italic" as "Arial Bold Italic". +- Renamed display name "Liberation Sans Italic" as "Arial Italic". diff --git a/media/fonts/doc/Arial/LICENSE.txt b/media/fonts/doc/Arial/LICENSE.txt new file mode 100644 index 00000000000..ad3ff4979a1 --- /dev/null +++ b/media/fonts/doc/Arial/LICENSE.txt @@ -0,0 +1,104 @@ +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. +Copyright (c) 2019 Katayama Hirofumi MZ + with renamed as "Arial". + +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/Arial/README.txt b/media/fonts/doc/Arial/README.txt new file mode 100644 index 00000000000..b52515317a2 --- /dev/null +++ b/media/fonts/doc/Arial/README.txt @@ -0,0 +1,8 @@ +ReactOS Arial fonts are based on Liberation Sans. + +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +Please read file "LICENSE" for details. + +Please read file "AUTHORS" for list of contributors.

5 years, 4 months

[reactos] 01/01: [WIN32SS][NTGDI] Improve IntGetOutlineTextMetrics (#1760)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7547757892c3543354dd2… commit 7547757892c3543354dd2b8e6de5f5a055c7ad1b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 2 20:28:30 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 2 20:28:30 2019 +0900 [WIN32SS][NTGDI] Improve IntGetOutlineTextMetrics (#1760) Improve size checking of IntGetOutlineTextMetrics function. --- win32ss/gdi/ntgdi/freetype.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 37ff3fbf5a7..d31178d3f2e 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -2304,22 +2304,30 @@ IntGetOutlineTextMetrics(PFONTGDI FontGDI, Cache = &SharedFace->UserLanguage; } - if (Cache->OutlineRequiredSize && Size < Cache->OutlineRequiredSize) + if (Size == 0 && Cache->OutlineRequiredSize > 0) { + ASSERT(Otm == NULL); return Cache->OutlineRequiredSize; } IntInitFontNames(&FontNames, SharedFace); + Cache->OutlineRequiredSize = FontNames.OtmSize; - if (!Cache->OutlineRequiredSize) + if (Size == 0) { - Cache->OutlineRequiredSize = FontNames.OtmSize; + ASSERT(Otm == NULL); + IntFreeFontNames(&FontNames); + return Cache->OutlineRequiredSize; } + ASSERT(Otm != NULL); + if (Size < Cache->OutlineRequiredSize) { + DPRINT1("Size %u < OutlineRequiredSize %u\n", Size, + Cache->OutlineRequiredSize); IntFreeFontNames(&FontNames); - return Cache->OutlineRequiredSize; + return 0; /* failure */ } XScale = Face->size->metrics.x_scale;

5 years, 4 months

[reactos] 01/01: [KERNEL32] Minor enhancements for CreateRemoteThread(). (#804)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44cddadba80aa9efab0da… commit 44cddadba80aa9efab0da36aa57cf6f7a012df43 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 23 21:44:53 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 1 19:12:49 2019 +0200 [KERNEL32] Minor enhancements for CreateRemoteThread(). (#804) - Add some cleanup code in failure code paths, instead of asserting. - Move BasepNotifyCsrOfThread() helper to the only file where it is used. - Don't use ERROR_DBGBREAK in failure paths but just DPRINT the error message: we handle the failures properly. - When creating the remote thread, sync its service tag with the parent thread's one. --- dll/win32/kernel32/client/proc.c | 30 ---------- dll/win32/kernel32/client/thread.c | 113 ++++++++++++++++++++++++------------- 2 files changed, 75 insertions(+), 68 deletions(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index f36219457b2..b44624c381b 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -479,36 +479,6 @@ BaseProcessStartup(PPROCESS_START_ROUTINE lpStartAddress) _SEH2_END; } -NTSTATUS -WINAPI -BasepNotifyCsrOfThread(IN HANDLE ThreadHandle, - IN PCLIENT_ID ClientId) -{ - BASE_API_MESSAGE ApiMessage; - PBASE_CREATE_THREAD CreateThreadRequest = &ApiMessage.Data.CreateThreadRequest; - - DPRINT("BasepNotifyCsrOfThread: Thread: %p, Handle %p\n", - ClientId->UniqueThread, ThreadHandle); - - /* Fill out the request */ - CreateThreadRequest->ClientId = *ClientId; - CreateThreadRequest->ThreadHandle = ThreadHandle; - - /* Call CSR */ - CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepCreateThread), - sizeof(*CreateThreadRequest)); - if (!NT_SUCCESS(ApiMessage.Status)) - { - DPRINT1("Failed to tell CSRSS about new thread: %lx\n", ApiMessage.Status); - return ApiMessage.Status; - } - - /* Return Success */ - return STATUS_SUCCESS; -} - BOOLEAN WINAPI BasePushProcessParameters(IN ULONG ParameterFlags, diff --git a/dll/win32/kernel32/client/thread.c b/dll/win32/kernel32/client/thread.c index 3505d4bdae7..be33021fcf3 100644 --- a/dll/win32/kernel32/client/thread.c +++ b/dll/win32/kernel32/client/thread.c @@ -18,12 +18,37 @@ typedef NTSTATUS (NTAPI *PCSR_CREATE_REMOTE_THREAD)(IN HANDLE ThreadHandle, IN PCLIENT_ID ClientId); +/* FUNCTIONS ******************************************************************/ + NTSTATUS WINAPI BasepNotifyCsrOfThread(IN HANDLE ThreadHandle, - IN PCLIENT_ID ClientId); + IN PCLIENT_ID ClientId) +{ + BASE_API_MESSAGE ApiMessage; + PBASE_CREATE_THREAD CreateThreadRequest = &ApiMessage.Data.CreateThreadRequest; + + DPRINT("BasepNotifyCsrOfThread: Thread: %p, Handle %p\n", + ClientId->UniqueThread, ThreadHandle); + + /* Fill out the request */ + CreateThreadRequest->ClientId = *ClientId; + CreateThreadRequest->ThreadHandle = ThreadHandle; + + /* Call CSR */ + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepCreateThread), + sizeof(*CreateThreadRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + DPRINT1("Failed to tell CSRSS about new thread: %lx\n", ApiMessage.Status); + return ApiMessage.Status; + } -/* FUNCTIONS ******************************************************************/ + /* Return Success */ + return STATUS_SUCCESS; +} __declspec(noreturn) VOID @@ -153,12 +178,13 @@ CreateRemoteThread(IN HANDLE hProcess, ULONG_PTR Cookie; ULONG ReturnLength; SIZE_T ReturnSize; + DPRINT("CreateRemoteThread: hProcess: %p dwStackSize: %lu lpStartAddress" - ": %p lpParameter: %p, dwCreationFlags: %lx\n", hProcess, - dwStackSize, lpStartAddress, lpParameter, dwCreationFlags); + ": %p lpParameter: %p, dwCreationFlags: %lx\n", hProcess, + dwStackSize, lpStartAddress, lpParameter, dwCreationFlags); /* Clear the Context */ - RtlZeroMemory(&Context, sizeof(CONTEXT)); + RtlZeroMemory(&Context, sizeof(Context)); /* Write PID */ ClientId.UniqueProcess = hProcess; @@ -176,14 +202,14 @@ CreateRemoteThread(IN HANDLE hProcess, return NULL; } - /* Create Initial Context */ + /* Create the Initial Context */ BaseInitializeContext(&Context, lpParameter, lpStartAddress, InitialTeb.StackBase, 1); - /* initialize the attributes for the thread object */ + /* Initialize the attributes for the thread object */ ObjectAttributes = BaseFormatObjectAttributes(&LocalObjectAttributes, lpThreadAttributes, NULL); @@ -217,10 +243,10 @@ CreateRemoteThread(IN HANDLE hProcess, if (!NT_SUCCESS(Status)) { /* Fail */ - ERROR_DBGBREAK("SXS: %s - Failing thread create because " - "NtQueryInformationThread() failed with status %08lx\n", - __FUNCTION__, Status); - return NULL; + DPRINT1("SXS: %s - Failing thread create because " + "NtQueryInformationThread() failed with status %08lx\n", + __FUNCTION__, Status); + goto Quit; } /* Allocate the Activation Context Stack */ @@ -228,10 +254,10 @@ CreateRemoteThread(IN HANDLE hProcess, if (!NT_SUCCESS(Status)) { /* Fail */ - ERROR_DBGBREAK("SXS: %s - Failing thread create because " - "RtlAllocateActivationContextStack() failed with status %08lx\n", - __FUNCTION__, Status); - return NULL; + DPRINT1("SXS: %s - Failing thread create because " + "RtlAllocateActivationContextStack() failed with status %08lx\n", + __FUNCTION__, Status); + goto Quit; } /* Save it */ @@ -249,15 +275,10 @@ CreateRemoteThread(IN HANDLE hProcess, if (!NT_SUCCESS(Status)) { /* Fail */ - ERROR_DBGBREAK("SXS: %s - Failing thread create because " - "RtlQueryInformationActivationContext() failed with status %08lx\n", - __FUNCTION__, Status); - - /* Free the activation context stack */ - // RtlFreeThreadActivationContextStack(); - RtlFreeActivationContextStack(Teb->ActivationContextStackPointer); - - return NULL; + DPRINT1("SXS: %s - Failing thread create because " + "RtlQueryInformationActivationContext() failed with status %08lx\n", + __FUNCTION__, Status); + goto Quit; } /* Does it need to be activated? */ @@ -271,24 +292,21 @@ CreateRemoteThread(IN HANDLE hProcess, if (!NT_SUCCESS(Status)) { /* Fail */ - ERROR_DBGBREAK("SXS: %s - Failing thread create because " - "RtlActivateActivationContextEx() failed with status %08lx\n", - __FUNCTION__, Status); - - /* Free the activation context stack */ - // RtlFreeThreadActivationContextStack(); - RtlFreeActivationContextStack(Teb->ActivationContextStackPointer); - - return NULL; + DPRINT1("SXS: %s - Failing thread create because " + "RtlActivateActivationContextEx() failed with status %08lx\n", + __FUNCTION__, Status); + goto Quit; } } + + /* Sync the service tag with the parent thread's one */ + Teb->SubProcessTag = NtCurrentTeb()->SubProcessTag; } /* Notify CSR */ if (!BaseRunningInServerProcess) { Status = BasepNotifyCsrOfThread(hThread, &ClientId); - ASSERT(NT_SUCCESS(Status)); } else { @@ -304,16 +322,35 @@ CreateRemoteThread(IN HANDLE hProcess, { /* Call it instead of going through LPC */ Status = CsrCreateRemoteThread(hThread, &ClientId); - ASSERT(NT_SUCCESS(Status)); } } } +Quit: + if (!NT_SUCCESS(Status)) + { + /* Failed to create the thread */ + + /* Free the activation context stack */ + if (ActivationContextStack) + RtlFreeActivationContextStack(ActivationContextStack); + + NtTerminateThread(hThread, Status); + // FIXME: Wait for the thread to terminate? + BaseFreeThreadStack(hProcess, &InitialTeb); + NtClose(hThread); + + BaseSetLastNTError(Status); + return NULL; + } + /* Success */ - if (lpThreadId) *lpThreadId = HandleToUlong(ClientId.UniqueThread); + if (lpThreadId) + *lpThreadId = HandleToUlong(ClientId.UniqueThread); - /* Resume it if asked */ - if (!(dwCreationFlags & CREATE_SUSPENDED)) NtResumeThread(hThread, &Dummy); + /* Resume the thread if asked */ + if (!(dwCreationFlags & CREATE_SUSPENDED)) + NtResumeThread(hThread, &Dummy); /* Return handle to thread */ return hThread;

5 years, 4 months

[reactos] 01/01: [KERNEL32][RTL] Diverse fixes/improvements for thread stack creation code. (#802)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=effdb6f232aa4448179c2… commit effdb6f232aa4448179c2b0a0f70aaa20856357c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu May 26 04:44:25 2016 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 1 19:04:13 2019 +0200 [KERNEL32][RTL] Diverse fixes/improvements for thread stack creation code. (#802) - kernel32!BaseCreateStack() is compatible with ntdll!RtlpCreateUserStack(). - When checking whether a stack guard page can be added, its size has to be accounted for in the checking logic. - We have to satisfy the PEB::MinimumStackCommit constraint. - We cannot use PEB::GuaranteedStackBytes in BaseCreateStack() since it is nowhere initialized (default is 0). It gets initialized to a non-zero value when the user manually calls SetThreadStackGuarantee(). https://www.installsetupconfig.com/win32programming/windowsthreadsprocessap… - RtlpCreateUserStack(): Fix memory leak in failure case. - RtlpFreeUserStack() doesn't need to return anything. See also commit 1bc59379 (r59868). CORE-11319 --- dll/win32/kernel32/client/thread.c | 7 +-- dll/win32/kernel32/client/utils.c | 68 ++++++++++++++++------------- dll/win32/kernel32/include/kernel32.h | 20 +++++---- sdk/lib/rtl/thread.c | 82 ++++++++++++++++++++--------------- 4 files changed, 102 insertions(+), 75 deletions(-) diff --git a/dll/win32/kernel32/client/thread.c b/dll/win32/kernel32/client/thread.c index e64cd7230d3..3505d4bdae7 100644 --- a/dll/win32/kernel32/client/thread.c +++ b/dll/win32/kernel32/client/thread.c @@ -165,9 +165,10 @@ CreateRemoteThread(IN HANDLE hProcess, /* Create the Stack */ Status = BaseCreateStack(hProcess, - dwStackSize, - dwCreationFlags & STACK_SIZE_PARAM_IS_A_RESERVATION ? - dwStackSize : 0, + (dwCreationFlags & STACK_SIZE_PARAM_IS_A_RESERVATION) ? + 0 : dwStackSize, + (dwCreationFlags & STACK_SIZE_PARAM_IS_A_RESERVATION) ? + dwStackSize : 0, &InitialTeb); if (!NT_SUCCESS(Status)) { diff --git a/dll/win32/kernel32/client/utils.c b/dll/win32/kernel32/client/utils.c index e0654c9700c..6e3a3368ad5 100644 --- a/dll/win32/kernel32/client/utils.c +++ b/dll/win32/kernel32/client/utils.c @@ -346,22 +346,25 @@ BaseFormatObjectAttributes(OUT POBJECT_ATTRIBUTES ObjectAttributes, } /* - * Creates a stack for a thread or fiber + * Creates a stack for a thread or fiber. + * NOTE: Adapted from sdk/lib/rtl/thread.c:RtlpCreateUserStack(). */ NTSTATUS WINAPI -BaseCreateStack(HANDLE hProcess, - SIZE_T StackCommit, - SIZE_T StackReserve, - PINITIAL_TEB InitialTeb) +BaseCreateStack( + _In_ HANDLE hProcess, + _In_opt_ SIZE_T StackCommit, + _In_opt_ SIZE_T StackReserve, + _Out_ PINITIAL_TEB InitialTeb) { NTSTATUS Status; PIMAGE_NT_HEADERS Headers; ULONG_PTR Stack; BOOLEAN UseGuard; - ULONG PageSize, Dummy, AllocationGranularity; - SIZE_T StackReserveHeader, StackCommitHeader, GuardPageSize, GuaranteedStackCommit; - DPRINT("BaseCreateStack (hProcess: %p, Max: %lx, Current: %lx)\n", + ULONG PageSize, AllocationGranularity, Dummy; + SIZE_T MinimumStackCommit, GuardPageSize; + + DPRINT("BaseCreateStack(hProcess: 0x%p, Max: 0x%lx, Current: 0x%lx)\n", hProcess, StackReserve, StackCommit); /* Read page size */ @@ -372,34 +375,38 @@ BaseCreateStack(HANDLE hProcess, Headers = RtlImageNtHeader(NtCurrentPeb()->ImageBaseAddress); if (!Headers) return STATUS_INVALID_IMAGE_FORMAT; - StackCommitHeader = Headers->OptionalHeader.SizeOfStackCommit; - StackReserveHeader = Headers->OptionalHeader.SizeOfStackReserve; - - if (!StackReserve) StackReserve = StackReserveHeader; + if (StackReserve == 0) + StackReserve = Headers->OptionalHeader.SizeOfStackReserve; - if (!StackCommit) + if (StackCommit == 0) { - StackCommit = StackCommitHeader; + StackCommit = Headers->OptionalHeader.SizeOfStackCommit; } + /* Check if the commit is higher than the reserve */ else if (StackCommit >= StackReserve) { + /* Grow the reserve beyond the commit, up to 1MB alignment */ StackReserve = ROUND_UP(StackCommit, 1024 * 1024); } + /* Align everything to Page Size */ StackCommit = ROUND_UP(StackCommit, PageSize); StackReserve = ROUND_UP(StackReserve, AllocationGranularity); - GuaranteedStackCommit = NtCurrentTeb()->GuaranteedStackBytes; - if ((GuaranteedStackCommit) && (StackCommit < GuaranteedStackCommit)) + MinimumStackCommit = NtCurrentPeb()->MinimumStackCommit; + if ((MinimumStackCommit != 0) && (StackCommit < MinimumStackCommit)) { - StackCommit = GuaranteedStackCommit; + StackCommit = MinimumStackCommit; } + /* Check if the commit is higher than the reserve */ if (StackCommit >= StackReserve) { + /* Grow the reserve beyond the commit, up to 1MB alignment */ StackReserve = ROUND_UP(StackCommit, 1024 * 1024); } + /* Align everything to Page Size */ StackCommit = ROUND_UP(StackCommit, PageSize); StackReserve = ROUND_UP(StackReserve, AllocationGranularity); @@ -423,11 +430,11 @@ BaseCreateStack(HANDLE hProcess, InitialTeb->PreviousStackBase = NULL; InitialTeb->PreviousStackLimit = NULL; - /* Update the Stack Position */ + /* Update the stack position */ Stack += StackReserve - StackCommit; - /* Check if we will need a guard page */ - if (StackReserve > StackCommit) + /* Check if we can add a guard page */ + if (StackReserve >= StackCommit + PageSize) { Stack -= PageSize; StackCommit += PageSize; @@ -456,11 +463,10 @@ BaseCreateStack(HANDLE hProcess, /* Now set the current Stack Limit */ InitialTeb->StackLimit = (PVOID)Stack; - /* Create a guard page */ + /* Create a guard page if needed */ if (UseGuard) { - /* Set the guard page */ - GuardPageSize = PAGE_SIZE; + GuardPageSize = PageSize; Status = NtProtectVirtualMemory(hProcess, (PVOID*)&Stack, &GuardPageSize, @@ -481,10 +487,14 @@ BaseCreateStack(HANDLE hProcess, return STATUS_SUCCESS; } +/* + * NOTE: Adapted from sdk/lib/rtl/thread.c:RtlpFreeUserStack(). + */ VOID WINAPI -BaseFreeThreadStack(IN HANDLE hProcess, - IN PINITIAL_TEB InitialTeb) +BaseFreeThreadStack( + _In_ HANDLE hProcess, + _In_ PINITIAL_TEB InitialTeb) { SIZE_T Dummy = 0; @@ -501,10 +511,10 @@ BaseFreeThreadStack(IN HANDLE hProcess, VOID WINAPI BaseInitializeContext(IN PCONTEXT Context, - IN PVOID Parameter, - IN PVOID StartAddress, - IN PVOID StackAddress, - IN ULONG ContextType) + IN PVOID Parameter, + IN PVOID StartAddress, + IN PVOID StackAddress, + IN ULONG ContextType) { #ifdef _M_IX86 ULONG ContextFlags; diff --git a/dll/win32/kernel32/include/kernel32.h b/dll/win32/kernel32/include/kernel32.h index 005b5d05272..ef47d4d946c 100644 --- a/dll/win32/kernel32/include/kernel32.h +++ b/dll/win32/kernel32/include/kernel32.h @@ -183,10 +183,17 @@ BaseFormatObjectAttributes(OUT POBJECT_ATTRIBUTES ObjectAttributes, NTSTATUS WINAPI -BaseCreateStack(HANDLE hProcess, - SIZE_T StackReserve, - SIZE_T StackCommit, - PINITIAL_TEB InitialTeb); +BaseCreateStack( + _In_ HANDLE hProcess, + _In_opt_ SIZE_T StackCommit, + _In_opt_ SIZE_T StackReserve, + _Out_ PINITIAL_TEB InitialTeb); + +VOID +WINAPI +BaseFreeThreadStack( + _In_ HANDLE hProcess, + _In_ PINITIAL_TEB InitialTeb); VOID WINAPI @@ -233,11 +240,6 @@ WINAPI BaseThreadStartup(LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter); -VOID -WINAPI -BaseFreeThreadStack(IN HANDLE hProcess, - IN PINITIAL_TEB InitialTeb); - __declspec(noreturn) VOID WINAPI diff --git a/sdk/lib/rtl/thread.c b/sdk/lib/rtl/thread.c index 535380593c9..df7541cdeac 100644 --- a/sdk/lib/rtl/thread.c +++ b/sdk/lib/rtl/thread.c @@ -20,7 +20,7 @@ NTSTATUS NTAPI -RtlpCreateUserStack(IN HANDLE hProcess, +RtlpCreateUserStack(IN HANDLE ProcessHandle, IN SIZE_T StackReserve OPTIONAL, IN SIZE_T StackCommit OPTIONAL, IN ULONG StackZeroBits OPTIONAL, @@ -29,10 +29,10 @@ RtlpCreateUserStack(IN HANDLE hProcess, NTSTATUS Status; SYSTEM_BASIC_INFORMATION SystemBasicInfo; PIMAGE_NT_HEADERS Headers; - ULONG_PTR Stack = 0; - BOOLEAN UseGuard = FALSE; + ULONG_PTR Stack; + BOOLEAN UseGuard; ULONG Dummy; - SIZE_T GuardPageSize; + SIZE_T MinimumStackCommit, GuardPageSize; /* Get some memory information */ Status = ZwQuerySystemInformation(SystemBasicInformation, @@ -42,26 +42,34 @@ RtlpCreateUserStack(IN HANDLE hProcess, if (!NT_SUCCESS(Status)) return Status; /* Use the Image Settings if we are dealing with the current Process */ - if (hProcess == NtCurrentProcess()) + if (ProcessHandle == NtCurrentProcess()) { /* Get the Image Headers */ Headers = RtlImageNtHeader(NtCurrentPeb()->ImageBaseAddress); if (!Headers) return STATUS_INVALID_IMAGE_FORMAT; /* If we didn't get the parameters, find them ourselves */ - if (!StackReserve) StackReserve = Headers->OptionalHeader. - SizeOfStackReserve; - if (!StackCommit) StackCommit = Headers->OptionalHeader. - SizeOfStackCommit; + if (StackReserve == 0) + StackReserve = Headers->OptionalHeader.SizeOfStackReserve; + if (StackCommit == 0) + StackCommit = Headers->OptionalHeader.SizeOfStackCommit; + + MinimumStackCommit = NtCurrentPeb()->MinimumStackCommit; + if ((MinimumStackCommit != 0) && (StackCommit < MinimumStackCommit)) + { + StackCommit = MinimumStackCommit; + } } else { /* Use the System Settings if needed */ - if (!StackReserve) StackReserve = SystemBasicInfo.AllocationGranularity; - if (!StackCommit) StackCommit = SystemBasicInfo.PageSize; + if (StackReserve == 0) + StackReserve = SystemBasicInfo.AllocationGranularity; + if (StackCommit == 0) + StackCommit = SystemBasicInfo.PageSize; } - /* Check if the commit is higher than the reserve*/ + /* Check if the commit is higher than the reserve */ if (StackCommit >= StackReserve) { /* Grow the reserve beyond the commit, up to 1MB alignment */ @@ -69,11 +77,12 @@ RtlpCreateUserStack(IN HANDLE hProcess, } /* Align everything to Page Size */ - StackReserve = ROUND_UP(StackReserve, SystemBasicInfo.AllocationGranularity); StackCommit = ROUND_UP(StackCommit, SystemBasicInfo.PageSize); + StackReserve = ROUND_UP(StackReserve, SystemBasicInfo.AllocationGranularity); /* Reserve memory for the stack */ - Status = ZwAllocateVirtualMemory(hProcess, + Stack = 0; + Status = ZwAllocateVirtualMemory(ProcessHandle, (PVOID*)&Stack, StackZeroBits, &StackReserve, @@ -82,41 +91,48 @@ RtlpCreateUserStack(IN HANDLE hProcess, if (!NT_SUCCESS(Status)) return Status; /* Now set up some basic Initial TEB Parameters */ - InitialTeb->PreviousStackBase = NULL; - InitialTeb->PreviousStackLimit = NULL; InitialTeb->AllocatedStackBase = (PVOID)Stack; InitialTeb->StackBase = (PVOID)(Stack + StackReserve); + InitialTeb->PreviousStackBase = NULL; + InitialTeb->PreviousStackLimit = NULL; - /* Update the Stack Position */ + /* Update the stack position */ Stack += StackReserve - StackCommit; - /* Check if we will need a guard page */ - if (StackReserve > StackCommit) + /* Check if we can add a guard page */ + if (StackReserve >= StackCommit + SystemBasicInfo.PageSize) { - /* Remove a page to set as guard page */ Stack -= SystemBasicInfo.PageSize; StackCommit += SystemBasicInfo.PageSize; UseGuard = TRUE; } + else + { + UseGuard = FALSE; + } /* Allocate memory for the stack */ - Status = ZwAllocateVirtualMemory(hProcess, + Status = ZwAllocateVirtualMemory(ProcessHandle, (PVOID*)&Stack, 0, &StackCommit, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + GuardPageSize = 0; + ZwFreeVirtualMemory(ProcessHandle, (PVOID*)&Stack, &GuardPageSize, MEM_RELEASE); + return Status; + } /* Now set the current Stack Limit */ InitialTeb->StackLimit = (PVOID)Stack; - /* Create a guard page */ + /* Create a guard page if needed */ if (UseGuard) { - /* Attempt maximum space possible */ GuardPageSize = SystemBasicInfo.PageSize; - Status = ZwProtectVirtualMemory(hProcess, + Status = ZwProtectVirtualMemory(ProcessHandle, (PVOID*)&Stack, &GuardPageSize, PAGE_GUARD | PAGE_READWRITE, @@ -132,23 +148,21 @@ RtlpCreateUserStack(IN HANDLE hProcess, return STATUS_SUCCESS; } -NTSTATUS +VOID NTAPI -RtlpFreeUserStack(IN HANDLE Process, +RtlpFreeUserStack(IN HANDLE ProcessHandle, IN PINITIAL_TEB InitialTeb) { SIZE_T Dummy = 0; - NTSTATUS Status; /* Free the Stack */ - Status = ZwFreeVirtualMemory(Process, - &InitialTeb->AllocatedStackBase, - &Dummy, - MEM_RELEASE); + ZwFreeVirtualMemory(ProcessHandle, + &InitialTeb->AllocatedStackBase, + &Dummy, + MEM_RELEASE); /* Clear the initial TEB */ - RtlZeroMemory(InitialTeb, sizeof(INITIAL_TEB)); - return Status; + RtlZeroMemory(InitialTeb, sizeof(*InitialTeb)); } /* FUNCTIONS ***************************************************************/

5 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2019