incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1233913 - in /incubator/ooo/trunk/main: NOTICE more_fonts/fonts/fc_local.conf scp2/source/ooo/file_font_ooo.scp
Date Fri, 20 Jan 2012 13:59:02 GMT
Author: pfg
Date: Fri Jan 20 13:59:02 2012
New Revision: 1233913

URL: http://svn.apache.org/viewvc?rev=1233913&view=rev
Log:
Remove some references to Liberation that were left in by error when adding ChromeOS fonts.

Modified:
    incubator/ooo/trunk/main/NOTICE
    incubator/ooo/trunk/main/more_fonts/fonts/fc_local.conf
    incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp

Modified: incubator/ooo/trunk/main/NOTICE
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/NOTICE?rev=1233913&r1=1233912&r2=1233913&view=diff
==============================================================================
--- incubator/ooo/trunk/main/NOTICE (original)
+++ incubator/ooo/trunk/main/NOTICE Fri Jan 20 13:59:02 2012
@@ -114,6 +114,6 @@ available under the SIL OpenFont License
 code can be downloaded here:
     http://scripts.sil.org/cms/scripts/page.php?item_id=Gentium_basic
 
-Also for convenience we hava available a set of fonts developed by
+Also for convenience we have available a set of fonts developed by
 Google Inc. for ChromeOS available under the OFL in this site:
     http://gsdview.appspot.com/chromeos-localmirror/distfiles/

Modified: incubator/ooo/trunk/main/more_fonts/fonts/fc_local.conf
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/more_fonts/fonts/fc_local.conf?rev=1233913&r1=1233912&r2=1233913&view=diff
==============================================================================
--- incubator/ooo/trunk/main/more_fonts/fonts/fc_local.conf (original)
+++ incubator/ooo/trunk/main/more_fonts/fonts/fc_local.conf Fri Jan 20 13:59:02 2012
@@ -6,7 +6,6 @@
 
 	<alias binding="same">
 	  <family>Arimo</family>
-	  <family>Liberation Sans Narrow</family>
 	  <family>Arial Narrow</family>
 	  <default>
 	  <family>Arial Narrow</family>
@@ -18,7 +17,6 @@
 	  <family>Arial Narrow</family>
 	  <accept>
 	  <family>Arimo</family>
-	  <family>Liberation Sans Narrow</family>
 	  </accept>
 	</alias>
 <!-- -->

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp?rev=1233913&r1=1233912&r2=1233913&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp Fri Jan 20 13:59:02 2012
@@ -87,20 +87,20 @@ STD_FONT_FILE( gid_File_Fnt_Arimo_BoldIt
 // Cousine
 #ifndef WITHOUT_FONTS 
 #ifndef WNT 
-STD_FONT_FILE( gid_File_Fnt_Cousine_Regular, Cousine-Regular.ttf, Liberation Mono Regular)

-STD_FONT_FILE( gid_File_Fnt_Cousine_Bold, Cousine-Bold.ttf, Liberation Mono Bold) 
-STD_FONT_FILE( gid_File_Fnt_Cousine_Italic, Cousine-Italic.ttf, Liberation Mono Italic) 
-STD_FONT_FILE( gid_File_Fnt_Cousine_BoldItalic, Cousine-BoldItalic.ttf, Liberation Mono Bold
Italic) 
+STD_FONT_FILE( gid_File_Fnt_Cousine_Regular, Cousine-Regular.ttf, Cousine Regular) 
+STD_FONT_FILE( gid_File_Fnt_Cousine_Bold, Cousine-Bold.ttf, Cousine Bold) 
+STD_FONT_FILE( gid_File_Fnt_Cousine_Italic, Cousine-Italic.ttf, Cousine Italic) 
+STD_FONT_FILE( gid_File_Fnt_Cousine_BoldItalic, Cousine-BoldItalic.ttf, Cousine Bold Italic)

 #endif
 #endif
 
 // Timos
 #ifndef WITHOUT_FONTS 
 #ifndef WNT 
-STD_FONT_FILE( gid_File_Fnt_Timos_Regular, Timos-Regular.ttf, Liberation Serif Regular) 
-STD_FONT_FILE( gid_File_Fnt_Timos_Bold, Timos-Bold.ttf, Liberation Serif Bold) 
-STD_FONT_FILE( gid_File_Fnt_Timos_Italic, Timos-Italic.ttf, Liberation Serif Italic) 
-STD_FONT_FILE( gid_File_Fnt_Timos_BoldItalic, Timos-BoldItalic.ttf, Liberation Serif Bold
Italic) 
+STD_FONT_FILE( gid_File_Fnt_Timos_Regular, Timos-Regular.ttf, Timos Regular) 
+STD_FONT_FILE( gid_File_Fnt_Timos_Bold, Timos-Bold.ttf, Timos Bold) 
+STD_FONT_FILE( gid_File_Fnt_Timos_Italic, Timos-Italic.ttf, Timos Italic) 
+STD_FONT_FILE( gid_File_Fnt_Timos_BoldItalic, Timos-BoldItalic.ttf, Timos Bold Italic) 
 #endif
 #endif
 
@@ -112,8 +112,6 @@ STD_FONT_FILE( gid_File_Fnt_SymbolNeu, S
 #endif
 
 
-
-
 // Gentium fonts
 
 #ifndef WITHOUT_FONTS



Mime
View raw message