[Lush-cvs] tl3/lib ogre.sn,1.2,1.3

[Leon B. <le...@us...>]

Update of /cvsroot/lush/tl3/lib
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10329/lib

Modified Files:
	ogre.sn 
Log Message:
backported lush xft2 and truecolor support


Index: ogre.sn
===================================================================
RCS file: /cvsroot/lush/tl3/lib/ogre.sn,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ogre.sn	9 Aug 2012 16:38:37 -0000	1.2
--- ogre.sn	7 Feb 2015 04:53:08 -0000	1.3
***************
*** 201,241 ****
  ;;; fonction pour selectionner des fontes
  
  (de font-18 ()
!   (selectq (gdriver)
!     ("X11" (or (font "-adobe-helvetica-medium-r-*-*-18-*-75-75-*-*-iso8859-1")
!                (font "-*-latin modern sans-medium-r-*-*-18-*-75-75-*-*-iso8859-1")
!                ) )
!     ("WBM" (font "Arial-18"))
!     (t     (font "Helvetica-18")) ) )
  
  (de font-12b ()
!   (selectq (gdriver)
!     ("X11" (or (font "-adobe-helvetica-bold-r-*-*-12-*-75-75-*-*-iso8859-1")
!                (font "-*-latin modern sans-bold-r-*-*-12-*-75-75-*-*-iso8859-1")
!                ) )
!     ("WBM" (font "Arial-Bold-12"))
!     (t     (font "Helvetica-Bold-12")) ) )
  
! (de font-12 ()			
!   (selectq (gdriver)
!     ("X11" (or (font "-adobe-helvetica-medium-r-*-*-12-*-75-75-*-*-iso8859-1")
!                (font "-*-latin modern sans-medium-r-*-*-12-*-75-75-*-*-iso8859-1")
!                ) )
!     ("WBM" (font "Arial-12"))
!     (t     (font "Helvetica-12")) ) )
  
  (de font-8f ()	
!   (selectq (gdriver)
!     ("X11" (or (font "-adobe-courier-medium-r-*-*-12-*-75-75-*-*-iso8859-1")
!                (font "-misc-fixed-medium-r-*-*-12-*-75-75-*-*-iso8859-1")) )
!     ("WBM" (font "Courier New-12"))
!     (t     (font "Courier-12")) ) )
! 
! (de font-8 ()	
!   (selectq (gdriver)
!     ("X11" (font "-adobe-helvetica-medium-r-*-*-8-*-75-75-*-*-iso8859-1"))
!     ("WBM" (font "Arial-8"))
!     (t     (font "Helvetica-8")) ) )
  
  
  
--- 201,249 ----
  ;;; fonction pour selectionner des fontes
  
+ ;;; fonction pour selectionner des fontes
+ 
+ (de ogre-font(size &optional serif mono bold italic)
+   (let ((fam1 (cond (mono  "Courier")
+                     (serif "Times")
+                     (t     "Helvetica")))
+         (fam2 (cond (mono  "Bitstream Vera Sans Mono,Mono")
+                     (serif "Bitstream Vera Serif,Serif")
+                     (t     "Bitstream Vera Sans,Sans"))) )
+     (if (= (gdriver) "X11")
+         (or (font 
+              (sprintf ":family=%s:pixelsize=%d%s%s" 
+                       fam2 size (if bold ":bold" "")(if italic ":italic" "")))
+             (font 
+              (sprintf "-adobe-%s-%s-%s-*-*-%d-*-*-*-*-*-iso8859-1"
+                       (downcase fam1) (if bold "bold" "medium")
+                       (if italic (if (or serif mono) "i" "o") "r")
+                       size ) )
+             (font 
+              "default") )
+       (if (= (gdriver) "WBM")
+           (setq fam1 (cond (mono  "Courier New")
+                            (serif "Time New Roman")
+                            (t     "Arial") ) ) )
+       (or (font (sprintf "%s-%s%s%s%d" fam1
+                          (if bold "Bold" "")
+                          (if italic (if (and serif mono) "Italic" "Oblique") "")
+                          (if (or bold italic) "-" "")
+                          size ) )
+           (font "default") ) ) ) )
+ 
  (de font-18 ()
!   (ogre-font 18 () () () ()) )
  
  (de font-12b ()
!   (ogre-font 12 () () t ()) )
  
! (de font-12 ()
!   (ogre-font 12 () () () ()) )
  
  (de font-8f ()	
!   (ogre-font 12 () t () ()) )
  
+ (de font-8 ()
+   (ogre-font 8 () () () ()) )