Fix some bugs converting from font name to css font style info

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18214 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Phil Longstaff 2009-07-18 01:53:15 +00:00
parent fe0c1f1f85
commit 3a5149fb32

View File

@ -44,10 +44,13 @@
(len (string-length font-name)) (len (string-length font-name))
(idx 0) (idx 0)
) )
(gnc:debug font-name) (gnc:debug "'" font-name "'")
(set! idx (string-index-right font-name (string->char-set "0123456789"))) (set! idx (string-index-right font-name #\space))
(set! font-size (substring font-name (- idx 1) len)) (gnc:debug idx)
(set! font-name (string-take font-name (- idx 2))) (set! font-size (substring font-name (+ idx 1) len))
(gnc:debug "font-size '" font-size "'")
(set! font-name (string-take font-name idx))
(gnc:debug "font-name: '" font-name "'")
(set! font-weight-idx (string-contains-ci font-name " bold")) (set! font-weight-idx (string-contains-ci font-name " bold"))
(if font-weight-idx (if font-weight-idx
(begin (begin
@ -55,6 +58,8 @@
(set! font-name (string-append (string-take font-name font-weight-idx) (set! font-name (string-append (string-take font-name font-weight-idx)
(string-drop font-name (+ font-weight-idx 5)))) (string-drop font-name (+ font-weight-idx 5))))
)) ))
(gnc:debug "font-name: '" font-name "'")
(gnc:debug "font-weight: " font-weight)
(set! font-style-idx (string-contains-ci font-name " italic")) (set! font-style-idx (string-contains-ci font-name " italic"))
(if font-style-idx (if font-style-idx
(begin (begin
@ -62,6 +67,8 @@
(set! font-name (string-append (string-take font-name font-style-idx) (set! font-name (string-append (string-take font-name font-style-idx)
(string-drop font-name (+ font-style-idx 7)))) (string-drop font-name (+ font-style-idx 7))))
)) ))
(gnc:debug "font-name: '" font-name "'")
(gnc:debug "font-style: " font-style)
(set! font-family font-name) (set! font-family font-name)
(set! result (string-append (set! result (string-append
"font-family: " font-family "; " "font-family: " font-family "; "