From 03cfd32828b985c4e06f859d75b50e52fd2e7114 Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Mon, 14 Sep 2009 21:36:04 +0000
Subject: DEV-39949 	 Normalize fonts across systems

This attempts to be pretty close to the 80-20 style guide (sizewise probably a bit closer than we were before) while remaining pragmatically close to what we've already been using in viewer2.

The main goal is to bring fonts to parity across all platforms to the extent that truncation issues and layout glitches need to be fixed and tested on only one platform, not 3+.
---
 .../skins/default/xui/en/floater_font_test.xml     | 26 +++++++
 indra/newview/skins/default/xui/en/fonts.xml       | 82 ++++++++++++++++------
 2 files changed, 88 insertions(+), 20 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_font_test.xml b/indra/newview/skins/default/xui/en/floater_font_test.xml
index 8babbaa273..744d434982 100644
--- a/indra/newview/skins/default/xui/en/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/en/floater_font_test.xml
@@ -62,6 +62,30 @@
      left="16">
         SansSerifHuge
     </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="36"
+     follows="left|top|right"
+     font="SansSerifHuge"
+     font.style.="BOLD"
+     height="32"
+     layout="topleft"
+     left="16">
+        SansSerifHuge style=BOLD
+    </text>
+    <text
+     type="string"
+     length="1"
+     bottom_delta="36"
+     follows="left|top|right"
+     font="SansSerifBold"
+     font.size="Huge"
+     height="32"
+     layout="topleft"
+     left="16">
+        SansSerifBold size=Huge
+    </text>
     <text
      type="string"
      length="1"
@@ -311,6 +335,7 @@
      left="16">
         Helvetica size=Large style=BOLD|ITALIC
     </text>
+<!--
     <text
      type="string"
      length="1"
@@ -333,4 +358,5 @@
      left="16">
         BogusFontName
     </text>
+-->
 </floater>
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index ced8ba83f7..dec9839d1a 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -2,7 +2,7 @@
 <fonts>
 
   <font name="default" comment="default font files (global fallbacks)">
-    <file>DejaVuSansCondensed.ttf</file>
+    <file>DejaVuSans.ttf</file>
     <os name="Windows">
       <file>MSGOTHIC.TTC</file>
       <file>gulim.ttc</file>
@@ -18,28 +18,45 @@
     </os>
   </font>
 
-  <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
-    <file>Helvetica.dfont</file>
-  <os name="Windows">
-      <file>arial.ttf</file>
+  <font name="SansSerifBold" 
+	comment="Name of bold sans-serif font">
+    <file>DejaVuSans-Bold.ttf</file>
+    <os name="Windows">
+      <file>arialbd.ttf</file>
       </os>
     <os name="Mac">
       <file>Helvetica.dfont</file>
       </os>
   </font>
 
-  <font name="SansSerifBold" 
-	comment="Name of bold sans-serif font" 
-	font_style="Bold">
-    <file>Helvetica.dfont</file>
+  <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
+    <file>DejaVuSans.ttf</file>
     <os name="Windows">
-      <file>arialbd.ttf</file>
+      <file>arial.ttf</file>
       </os>
     <os name="Mac">
       <file>Helvetica.dfont</file>
       </os>
   </font>
 
+  <font name="SansSerif" 
+	comment="Name of bold sans-serif font" 
+	font_style="BOLD">
+    <file>DejaVuSans-Bold.ttf</file>
+  </font>
+
+  <font name="SansSerif" 
+	comment="Name of italic sans-serif font" 
+	font_style="ITALIC">
+    <file>DejaVuSans-Oblique.ttf</file>
+  </font>
+
+  <font name="SansSerif" 
+	comment="Name of bold italic sans-serif font" 
+	font_style="BOLD|ITALIC">
+    <file>DejaVuSans-BoldOblique.ttf</file>
+  </font>
+
   <font name="Monospace"
 	comment="Name of monospace font">
     <file>DejaVuSansMono.ttf</file>
@@ -53,47 +70,72 @@
   <font name="DejaVu"
 	comment="Name of DejaVu font (bold)"
 	font_style="BOLD">
-    <file>DejaVuSansBold.ttf</file>
+    <file>DejaVuSans-Bold.ttf</file>
   </font>
 
   <font name="DejaVu"
 	comment="Name of DejaVu font (italic)"
 	font_style="ITALIC">
-    <file>DejaVuSansOblique.ttf</file>
+    <file>DejaVuSans-Oblique.ttf</file>
   </font>
 
   <font name="DejaVu"
 	comment="Name of DejaVu font (bold italic)"
 	font_style="BOLD|ITALIC">
-    <file>DejaVuSansBoldOblique.ttf</file>
+    <file>DejaVuSans-BoldOblique.ttf</file>
   </font>
 
   <font name="Helvetica"
 	comment="Name of Helvetica font">
-    <file>arial.ttf</file>
+    <file>DejaVuSans.ttf</file>
+    <os name="Windows">
+      <file>arial.ttf</file>
+      </os>
+    <os name="Mac">
+      <file>arial.ttf</file>
+      </os>
   </font>
 
   <font name="Helvetica"
 	comment="Name of Helvetica font (bold)"
 	font_style="BOLD">
-    <file>arialbd.ttf</file>
+    <file>DejaVuSans-Bold.ttf</file>
+    <os name="Windows">
+      <file>arialbd.ttf</file>
+      </os>
+    <os name="Mac">
+      <file>arialbd.ttf</file>
+      </os>
   </font>
 
   <font name="Helvetica"
 	comment="Name of Helvetica font (italic)"
 	font_style="ITALIC">
-    <file>ariali.ttf</file>
+    <file>DejaVuSans-Oblique.ttf</file>
+    <os name="Windows">
+      <file>ariali.ttf</file>
+      </os>
+    <os name="Mac">
+      <file>ariali.ttf</file>
+      </os>
   </font>
 
   <font name="Helvetica"
 	comment="Name of Helvetica font (bold italic)"
 	font_style="BOLD|ITALIC">
-    <file>arialbi.ttf</file>
+    <file>DejaVuSans-BoldOblique.ttf</file>
+    <os name="Windows">
+      <file>arialbi.ttf</file>
+      </os>
+    <os name="Mac">
+      <file>arialbi.ttf</file>
+      </os>
   </font>
 
   <font name="OverrideTest"
 	comment="Name of font to test overriding">
     <file>times.ttf</file>
+    <file>DejaVuSans.ttf</file>
   </font>
 
   <font_size name="Monospace"
@@ -106,15 +148,15 @@
 	     />
   <font_size name="Large"
 	     comment="Size of large font (points, or 1/72 of an inch)"
-	     size="12.0"
+	     size="10.0"
 	     />
   <font_size name="Medium"
 	     comment="Size of medium font (points, or 1/72 of an inch)"
-	     size="10.0"
+	     size="9.0"
 	     />
   <font_size name="Small"
 	     comment="Size of small font (points, or 1/72 of an inch)"
-	     size="9"
+	     size="8.0"
 	     />
 </fonts>
 
-- 
cgit v1.2.3