Merge branch 'master' of git://factorcode.org/git/factor

2009-09-20 23:59:57 -05:00 · 2009-09-20 23:59:57 -05:00 · 6b9954ffad
parent b09006bba9 9d3d7f549a
commit 6b9954ffad
21 changed files with 13 additions and 3 deletions
--- a/basis/system-info/authors.txt
+++ b/basis/system-info/authors.txt
--- a/basis/system-info/backend/authors.txt
+++ b/basis/system-info/backend/authors.txt
--- a/basis/system-info/backend/backend.factor
+++ b/basis/system-info/backend/backend.factor
--- a/basis/system-info/linux/authors.txt
+++ b/basis/system-info/linux/authors.txt
--- a/basis/system-info/linux/linux.factor
+++ b/basis/system-info/linux/linux.factor
--- a/basis/system-info/linux/tags.txt
+++ b/basis/system-info/linux/tags.txt
--- a/basis/system-info/macosx/authors.txt
+++ b/basis/system-info/macosx/authors.txt
--- a/basis/system-info/macosx/macosx.factor
+++ b/basis/system-info/macosx/macosx.factor
--- a/basis/system-info/macosx/tags.txt
+++ b/basis/system-info/macosx/tags.txt
--- a/basis/system-info/summary.txt
+++ b/basis/system-info/summary.txt
--- a/basis/system-info/system-info.factor
+++ b/basis/system-info/system-info.factor
--- a/basis/system-info/windows/authors.txt
+++ b/basis/system-info/windows/authors.txt
--- a/basis/system-info/windows/ce/authors.txt
+++ b/basis/system-info/windows/ce/authors.txt
--- a/basis/system-info/windows/ce/ce.factor
+++ b/basis/system-info/windows/ce/ce.factor
--- a/basis/system-info/windows/ce/tags.txt
+++ b/basis/system-info/windows/ce/tags.txt
--- a/basis/system-info/windows/nt/authors.txt
+++ b/basis/system-info/windows/nt/authors.txt
--- a/basis/system-info/windows/nt/nt.factor
+++ b/basis/system-info/windows/nt/nt.factor
--- a/basis/system-info/windows/nt/tags.txt
+++ b/basis/system-info/windows/nt/tags.txt
--- a/basis/system-info/windows/tags.txt
+++ b/basis/system-info/windows/tags.txt
--- a/basis/system-info/windows/windows.factor
+++ b/basis/system-info/windows/windows.factor
--- a/basis/windows/fonts/fonts.factor
+++ b/basis/windows/fonts/fonts.factor
@ -1,13 +1,23 @@
 USING: assocs memoize locals kernel accessors init fonts math
-combinators windows.errors windows.types windows.gdi32 ;
+combinators system-info.windows windows.errors windows.types
+windows.gdi32 ;
 IN: windows.fonts

-: windows-font-name ( string -- string' )
+MEMO: windows-fonts ( -- fonts )
+    windows-major 6 >=
+    H{
+        { "sans-serif" "Calibri" }
+        { "serif" "Cambria" }
+        { "monospace" "Consolas" }
+    }
    H{
        { "sans-serif" "Tahoma" }
        { "serif" "Times New Roman" }
        { "monospace" "Courier New" }
-    } ?at drop ;
+    } ? ;
+
+: windows-font-name ( string -- string' )
+    windows-fonts ?at drop ;

 MEMO:: (cache-font) ( font -- HFONT )
    font size>> neg ! nHeight