From 572456971b69faa978ab93ea544a2ec4b19b1f8e Mon Sep 17 00:00:00 2001 From: Cinders Date: Sat, 18 May 2013 12:42:48 -0600 Subject: [PATCH] Proper support for using Source Code and OCR-A fonts --- indra/llrender/llfontgl.cpp | 33 ++++++++++++++++-- indra/llrender/llfontgl.h | 4 +++ indra/newview/fonts/fonts.xml | 9 +++-- indra/newview/fonts/fonts_droid.xml | 9 +++-- indra/newview/fonts/fonts_dyslexia.xml | 11 ++++-- indra/newview/fonts/fonts_liberation.xml | 9 +++-- indra/newview/fonts/fonts_mobi.xml | 9 +++-- indra/newview/fonts/fonts_roboto.xml | 9 +++-- indra/newview/fonts/fonts_ubuntu.xml | 9 +++-- indra/newview/fonts/ocra.ttf | Bin 0 -> 59660 bytes .../skins/default/xui/en/panel_script_ed.xml | 2 +- .../xui/en/panel_script_ed_preproc.xml | 4 +-- .../skins/vintage/xui/en/panel_script_ed.xml | 4 +-- .../xui/en/panel_script_ed_preproc.xml | 6 ++-- 14 files changed, 94 insertions(+), 24 deletions(-) create mode 100644 indra/newview/fonts/ocra.ttf diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index c16efc243e..5809a0fa45 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -852,6 +852,10 @@ bool LLFontGL::loadDefaultFonts() succ &= (NULL != getFontSansSerifBold()); succ &= (NULL != getFontMonospace()); succ &= (NULL != getFontExtChar()); + // Advanced script editor + succ &= (NULL != getFontScripting()); + succ &= (NULL != getFontOCRA()); + // return succ; } @@ -1036,6 +1040,22 @@ LLFontGL* LLFontGL::getFontSansSerifBold() return fontp; } +// Advanced Script Editor +//static +LLFontGL* LLFontGL::getFontScripting() +{ + static LLFontGL* fontp = getFont(LLFontDescriptor("Scripting","Monospace",0)); + return fontp; +} + +//static +LLFontGL* LLFontGL::getFontOCRA() +{ + static LLFontGL* fontp = getFont(LLFontDescriptor("OCRA","Monospace",0)); + return fontp; +} +// + //static LLFontGL* LLFontGL::getFontExtChar() { @@ -1064,12 +1084,21 @@ LLFontGL* LLFontGL::getFontByName(const std::string& name) { return getFontSansSerifBig(); } - else if (name == "SMALL" || name == "OCRA") + // Advanced script editor + //else if (name == "SMALL" || name == "OCRA") + else if (name == "SMALL") + // { - // *BUG: Should this be "MONOSPACE"? Do we use "OCRA" anymore? + // *BUG: Should this be "MONOSPACE"? // Does "SMALL" mean "SERIF"? return getFontMonospace(); } + // Advanced script editor + else if (name == "OCRA") + { + return getFontOCRA(); + } + // else { return NULL; diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h index 7e19b77917..461823be18 100644 --- a/indra/llrender/llfontgl.h +++ b/indra/llrender/llfontgl.h @@ -179,6 +179,10 @@ public: static LLFontGL* getFontSansSerifBig(); static LLFontGL* getFontSansSerifHuge(); static LLFontGL* getFontSansSerifBold(); + // Advanced script editor + static LLFontGL* getFontScripting(); + static LLFontGL* getFontOCRA(); + // static LLFontGL* getFontExtChar(); static LLFontGL* getFont(const LLFontDescriptor& desc); // Use with legacy names like "SANSSERIF_SMALL" or "OCRA" diff --git a/indra/newview/fonts/fonts.xml b/indra/newview/fonts/fonts.xml index 35537f8ee9..83d508c4ac 100644 --- a/indra/newview/fonts/fonts.xml +++ b/indra/newview/fonts/fonts.xml @@ -62,11 +62,16 @@ DejaVuSansMono.ttf - SourceCodePro-Regular.ttf + + ocra.ttf + + DejaVuSans.ttf @@ -143,7 +148,7 @@ DejaVuSans.ttf - diff --git a/indra/newview/fonts/fonts_droid.xml b/indra/newview/fonts/fonts_droid.xml index cbc4971b52..1d700cf5df 100644 --- a/indra/newview/fonts/fonts_droid.xml +++ b/indra/newview/fonts/fonts_droid.xml @@ -62,11 +62,16 @@ DroidSansMono.ttf - SourceCodePro-Regular.ttf + + ocra.ttf + + DroidSans.ttf @@ -143,7 +148,7 @@ DroidSans.ttf - diff --git a/indra/newview/fonts/fonts_dyslexia.xml b/indra/newview/fonts/fonts_dyslexia.xml index b39d796fc0..d75dd27f4f 100644 --- a/indra/newview/fonts/fonts_dyslexia.xml +++ b/indra/newview/fonts/fonts_dyslexia.xml @@ -62,13 +62,18 @@ MobiSansMono.ttf - SourceCodePro-Regular.ttf + + + ocra.ttf + + comment="Name of DejaVu font"> opendyslexic.ttf @@ -143,7 +148,7 @@ opendyslexic.ttf - diff --git a/indra/newview/fonts/fonts_liberation.xml b/indra/newview/fonts/fonts_liberation.xml index 69c67abc8a..0c0f12135a 100644 --- a/indra/newview/fonts/fonts_liberation.xml +++ b/indra/newview/fonts/fonts_liberation.xml @@ -62,10 +62,15 @@ LiberationMono-Regular.ttf - SourceCodePro-Regular.ttf + + + ocra.ttf + @@ -143,7 +148,7 @@ DejaVuSans.ttf - diff --git a/indra/newview/fonts/fonts_mobi.xml b/indra/newview/fonts/fonts_mobi.xml index 79da54bc69..d7b529615d 100644 --- a/indra/newview/fonts/fonts_mobi.xml +++ b/indra/newview/fonts/fonts_mobi.xml @@ -62,10 +62,15 @@ MobiSansMono.ttf - SourceCodePro-Regular.ttf + + + ocra.ttf + @@ -143,7 +148,7 @@ MobiSans.ttf - diff --git a/indra/newview/fonts/fonts_roboto.xml b/indra/newview/fonts/fonts_roboto.xml index f847b17fc3..1c51115693 100644 --- a/indra/newview/fonts/fonts_roboto.xml +++ b/indra/newview/fonts/fonts_roboto.xml @@ -62,11 +62,16 @@ MobiSansMono.ttf - SourceCodePro-Regular.ttf + + ocra.ttf + + Roboto-Regular.ttf @@ -143,7 +148,7 @@ Roboto-Regular.ttf - diff --git a/indra/newview/fonts/fonts_ubuntu.xml b/indra/newview/fonts/fonts_ubuntu.xml index dbfd30ab5e..c6e68da05b 100644 --- a/indra/newview/fonts/fonts_ubuntu.xml +++ b/indra/newview/fonts/fonts_ubuntu.xml @@ -62,10 +62,15 @@ UbuntuMono-R.ttf - UbuntuMono-R.ttf + + + ocra.ttf + @@ -137,7 +142,7 @@ - diff --git a/indra/newview/fonts/ocra.ttf b/indra/newview/fonts/ocra.ttf new file mode 100644 index 0000000000000000000000000000000000000000..241af99d87e02bf9bbe792d8fe13ae6193579cc4 GIT binary patch literal 59660 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 Qaw_Y|sias$3GtfpzeXB1(EtDd literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml index 192ca2e079..4469583cf3 100644 --- a/indra/newview/skins/default/xui/en/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml @@ -318,7 +318,7 @@ type="string" length="1" follows="left|top|right|bottom" - font="Script" + font="Scripting" height="376" ignore_tab="false" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_script_ed_preproc.xml b/indra/newview/skins/default/xui/en/panel_script_ed_preproc.xml index 06047c5985..0c07c7870a 100644 --- a/indra/newview/skins/default/xui/en/panel_script_ed_preproc.xml +++ b/indra/newview/skins/default/xui/en/panel_script_ed_preproc.xml @@ -342,7 +342,7 @@ type="string" length="1" follows="left|top|right|bottom" - font="Script" + font="Scripting" height="376" ignore_tab="false" layout="topleft" @@ -378,7 +378,7 @@ type="string" length="1" follows="left|top|right|bottom" - font="Script" + font="Scripting" height="376" ignore_tab="false" layout="topleft" diff --git a/indra/newview/skins/vintage/xui/en/panel_script_ed.xml b/indra/newview/skins/vintage/xui/en/panel_script_ed.xml index a13af7889e..27c93fb687 100644 --- a/indra/newview/skins/vintage/xui/en/panel_script_ed.xml +++ b/indra/newview/skins/vintage/xui/en/panel_script_ed.xml @@ -318,8 +318,8 @@ type="string" length="1" follows="left|top|right|bottom" - font="Script" - font.size="Script" + font="Scripting" + font.size="Scripting" height="376" ignore_tab="false" layout="topleft" diff --git a/indra/newview/skins/vintage/xui/en/panel_script_ed_preproc.xml b/indra/newview/skins/vintage/xui/en/panel_script_ed_preproc.xml index 06047c5985..5e9401b59c 100644 --- a/indra/newview/skins/vintage/xui/en/panel_script_ed_preproc.xml +++ b/indra/newview/skins/vintage/xui/en/panel_script_ed_preproc.xml @@ -342,7 +342,8 @@ type="string" length="1" follows="left|top|right|bottom" - font="Script" + font="Scripting" + font.size="Scripting" height="376" ignore_tab="false" layout="topleft" @@ -378,7 +379,8 @@ type="string" length="1" follows="left|top|right|bottom" - font="Script" + font="Scripting" + font.size="Scripting" height="376" ignore_tab="false" layout="topleft"