From 3527744ffd63f2d83659964d32a5a838bf83baef Mon Sep 17 00:00:00 2001
From: Colin Okay <colin@cicadas.surf>
Date: Tue, 28 Jun 2022 06:34:12 -0500
Subject: [modify] +standard-font-chars+ includes newline

---
 examples/02-moving-bitmp.lisp | 2 ++
 examples/03-font-render.lisp  | 6 ++++--
 wheelwork.lisp                | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/examples/02-moving-bitmp.lisp b/examples/02-moving-bitmp.lisp
index 0cce4e3..282d003 100644
--- a/examples/02-moving-bitmp.lisp
+++ b/examples/02-moving-bitmp.lisp
@@ -128,6 +128,8 @@
   (ww::start (make-instance 'bitmap-display
                             :scale 2.0
                             :fps 60
+                            :width 800
+                            :height 600
                             :asset-root (merge-pathnames
                                          "examples/"
                                          (asdf:system-source-directory :wheelwork)))))
diff --git a/examples/03-font-render.lisp b/examples/03-font-render.lisp
index 60ffcf2..551d4ba 100644
--- a/examples/03-font-render.lisp
+++ b/examples/03-font-render.lisp
@@ -48,13 +48,13 @@
   (let ((hello
           (make-instance
            'ww::text
-           :content "Hell! Oh World..."
+           :content (format nil "Hell!~%Oh World...")
            :font (ww::get-asset "Ticketing.ttf" :asset-args '(:oversample 2)))))
 
     (ww::set-height-preserve-aspect hello 100)
     (setf
      (ww::unit-x hello) 100
-     (ww::unit-y hello) 400)
+     (ww::unit-y hello) 300)
     (ww::add-handler hello #'marquee)
     (ww::add-handler hello #'change-text-color)
     (ww::add-handler hello #'twirl-on-click)
@@ -67,6 +67,8 @@
               'font-display
               :fps 60
               :refocus-on-mousedown-p nil
+              :width 800
+              :height 600
               :title "Wheelwork Example: Font display"
               :asset-root (merge-pathnames
                            "examples/"
diff --git a/wheelwork.lisp b/wheelwork.lisp
index 37a7bfc..2ce7179 100644
--- a/wheelwork.lisp
+++ b/wheelwork.lisp
@@ -687,7 +687,8 @@ ASSET-ARGS is a plist to pass to make-instance for the given resource.
                     asset-args)))))
 
 (define-symbol-macro +standard-font-chars+
-  " ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567890\".,!?-'"  )
+  " 
+ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567890\".,!?-'"  )
 
 (defclass/std font (asset)
   ((characters :i :std +standard-font-chars+)
-- 
cgit v1.2.3