From 604041cb6cba0af2b360f6b2d845c1130bb5dedf Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Tue, 11 Jun 2019 13:06:47 -0700
Subject: [PATCH] adjust image layout

---
 quad/qtest/test-jpeg.rkt   | 8 ++++++--
 quad/quadwriter/layout.rkt | 2 +-
 quad/quadwriter/tags.rkt   | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/quad/qtest/test-jpeg.rkt b/quad/qtest/test-jpeg.rkt
index e0d7f63a..22e6be18 100644
--- a/quad/qtest/test-jpeg.rkt
+++ b/quad/qtest/test-jpeg.rkt
@@ -1,7 +1,11 @@
 #lang quadwriter/markdown
 
-Foo
+Here's a jpeg
 
 ![alt text](test.jpeg)
 
-Bar
\ No newline at end of file
+And a png
+
+![alt text](test.png)
+
+Done.
\ No newline at end of file
diff --git a/quad/quadwriter/layout.rkt b/quad/quadwriter/layout.rkt
index 4150c797..535a6bed 100644
--- a/quad/quadwriter/layout.rkt
+++ b/quad/quadwriter/layout.rkt
@@ -332,7 +332,7 @@
           (match-define (list line-width line-height) (quad-size line-q))
           (define new-size (let ()
                              (define line-heights
-                               (filter-map (λ (q) (quad-ref q :line-height (λ () (pt-y (size q))))) pcs))
+                               (filter-map (λ (q) (or (quad-ref q :line-height) (pt-y (size q)))) pcs))
                              (pt line-width (if (empty? line-heights) line-height (apply max line-heights)))))
           (list
            (struct-copy
diff --git a/quad/quadwriter/tags.rkt b/quad/quadwriter/tags.rkt
index 10f702dc..92d488dd 100644
--- a/quad/quadwriter/tags.rkt
+++ b/quad/quadwriter/tags.rkt
@@ -32,9 +32,11 @@
 
 (define-tag-function (img attrs exprs)
   (qexpr (list->attrs
+          :line-height "false"
+          :line-align-last "center" ; need `last` because img is a block-level element.
           :image-data (second (assq 'src attrs))
           :image-alt (second (assq 'alt attrs))
-          :display (symbol->string (gensym))) exprs))
+          :display "block") exprs))
 
 (define-tag-function (br attrs exprs) line-break)