From d4d82c8f2259f368085ce4cb31a3de1751199edd Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 15 Apr 2021 22:50:35 -0400 Subject: graphics: font: Change ascender/descender to ascent/descent. --- chickadee/graphics/font.scm | 16 ++++++++-------- 1 file 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 - (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 -- cgit v1.2.3