summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2021-04-15 22:50:35 -0400
committerDavid Thompson <dthompson2@worcester.edu>2021-04-15 22:50:35 -0400
commitd4d82c8f2259f368085ce4cb31a3de1751199edd (patch)
tree2056dbe218ecdef0917287170d2059dec63f15a9
parentebba71064efa3f12d6b735725639797ab9396af7 (diff)
graphics: font: Change ascender/descender to ascent/descent.HEADmaster
-rw-r--r--chickadee/graphics/font.scm16
1 files changed, 8 insertions, 8 deletions
diff --git a/chickadee/graphics/font.scm b/chickadee/graphics/font.scm
index 416680d..a3ed823 100644
--- a/chickadee/graphics/font.scm
+++ b/chickadee/graphics/font.scm
@@ -50,8 +50,8 @@
load-font
font?
font-face
- font-ascender
- font-descender
+ font-ascent
+ font-descent
font-line-height
font-line-width
font-bold?
@@ -70,14 +70,14 @@
(advance font-char-advance))
(define-record-type <font>
- (make-font face bold? italic? ascender descender line-height chars kernings
+ (make-font face bold? italic? ascent descent line-height chars kernings
sprite-batches)
font?
(face font-face)
(bold? font-bold?)
(italic? font-italic?)
- (ascender font-ascender)
- (descender font-descender)
+ (ascent font-ascent)
+ (descent font-descent)
(line-height font-line-height)
(chars font-chars)
(kernings font-kernings)
@@ -202,12 +202,12 @@ display it at POINT-SIZE. By default, the ASCII character is used."
(hashq-set! batches texture (make-sprite-batch texture))))
(let ((style (face-style-name face)))
(match (size-metrics (face-size face))
- ((_ _ _ _ ascender descender height _)
+ ((_ _ _ _ ascent descent height _)
(make-font (face-family-name face)
(and (string-match ".*[B,b]old.*" style) #t)
(and (string-match ".*[I,i]talic.*" style) #t)
- (/ ascender 64.0)
- (/ descender 64.0)
+ (/ ascent 64.0)
+ (/ descent 64.0)
(/ height 64.0)
chars
kernings