From 45063f42204f2b6dc0621a6e04f9d9b70d311cf5 Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Tue, 13 Mar 2018 21:48:54 -0700
Subject: [PATCH] qexpressibility

---
 quad/quad/qexpr.rkt           |  6 +++++
 quad/quad/typewriter-test.rkt |  2 +-
 quad/quad/typewriter.rkt      | 43 +++++++++++++++++++----------------
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/quad/quad/qexpr.rkt b/quad/quad/qexpr.rkt
index efa92749..75953a97 100644
--- a/quad/quad/qexpr.rkt
+++ b/quad/quad/qexpr.rkt
@@ -61,6 +61,12 @@
       [(quad? x) (apply qexpr #:name (quad-name x) #:clean-attrs? #t (hash->qattrs (attrs x)) (map loop (elems x)))]
       [else x])))
 
+(define/contract (qexpr->quad x)
+  (qexpr? . -> . quad?)
+  (if (txexpr? x)
+      ($quad (attrs->hash (get-attrs x)) (map qexpr->quad (get-elements x)))
+      x))
+
 (define/contract (qml->qexpr x)
   (string? . -> . qexpr?)
   (parameterize ([permissive-xexprs #t]
diff --git a/quad/quad/typewriter-test.rkt b/quad/quad/typewriter-test.rkt
index 99fa4ccb..8dd00713 100644
--- a/quad/quad/typewriter-test.rkt
+++ b/quad/quad/typewriter-test.rkt
@@ -1,3 +1,3 @@
 #lang quad/typewriter
 
-@(dynamic-require 'quad/quad '$quad)[(hasheq 'link "http://beautfifulracket.com") '("An expression that")] is not a value can always be partitioned into two parts: a redex, which is the part that changed in a single-step simplification (highlighted), and the continuation, which is the evaluation context surrounding an expression. In (- 4 (+ 1 1)), the redex is (+ 1 1), and the continuation is (- 4 []), where [] takes the place of the redex. That is, the continuation says how to "continue" after the redex is reduced to a value.
\ No newline at end of file
+◊quad[#:link "http://beautfifulracket.com"]{An expression that} is not a value can always be partitioned into two parts: a redex, which is the part that changed in a single-step simplification (highlighted), and the continuation, which is the evaluation context surrounding an expression. In (- 4 (+ 1 1)), the redex is (+ 1 1), and the continuation is (- 4 []), where [] takes the place of the redex. That is, the continuation says how to "continue" after the redex is reduced to a value.
\ No newline at end of file
diff --git a/quad/quad/typewriter.rkt b/quad/quad/typewriter.rkt
index c14aed13..23ae74f8 100644
--- a/quad/quad/typewriter.rkt
+++ b/quad/quad/typewriter.rkt
@@ -40,16 +40,16 @@
 (define consolidate-into-runs? #t)
 (define (line-wrap xs size [debug #f])
   (break xs size debug
-        #:break-val (make-break #\newline)
-        #:soft-break-proc soft-break?
-        #:finish-wrap-proc (λ (pcs) (list ($line (hasheq 'size (list +inf.0 line-height) 'out 'sw)
-                                                 ;; consolidate chars into a single run (naively)
-                                                 ;; by taking attributes from first (including origin)
-                                                 ;; this only works because there's only one run per line
-                                                 ;; that is, it suffices to position the first letter
-                                                 (if consolidate-into-runs?
-                                                     (list ($char (attrs (car pcs)) (append-map elems pcs)))
-                                                     pcs))))))
+         #:break-val (make-break #\newline)
+         #:soft-break-proc soft-break?
+         #:finish-wrap-proc (λ (pcs) (list ($line (hasheq 'size (list +inf.0 line-height) 'out 'sw)
+                                                  ;; consolidate chars into a single run (naively)
+                                                  ;; by taking attributes from first (including origin)
+                                                  ;; this only works because there's only one run per line
+                                                  ;; that is, it suffices to position the first letter
+                                                  (if consolidate-into-runs?
+                                                      (list ($char (attrs (car pcs)) (append-map elems pcs)))
+                                                      pcs))))))
 
 (define (as-link doc str url-str [x 0] [y 0])
   (send doc save)
@@ -70,24 +70,28 @@
                                    (set! page-count (add1 page-count)))) '(#\page)))
 (define (page-wrap xs size [debug #f])
   (break xs size debug
-        #:break-before? #t
-        #:break-val pb
-        #:soft-break-proc $break?
-        #:finish-wrap-proc (λ (pcs) (list ($page (hasheq) (filter-not $break? pcs))))))
+         #:break-before? #t
+         #:break-val pb
+         #:soft-break-proc $break?
+         #:finish-wrap-proc (λ (pcs) (list ($page (hasheq) (filter-not $break? pcs))))))
 
-(define (typeset args)
+(define (typeset qarg)
   (define chars 25)
   (define line-width (* 7.2 chars))
   (define lines-per-page (* 4 line-height))
-  (position ($doc (hasheq 'origin '(36 36)) (page-wrap (line-wrap (map charify (atomize (apply quad #f args))) line-width) lines-per-page))))
+  (position ($doc (hasheq 'origin '(36 36)) (page-wrap (line-wrap (map charify (atomize qarg)) line-width) lines-per-page))))
 
 
-(require hyphenate racket/runtime-path pollen/unstable/typography)
+(require hyphenate racket/runtime-path pollen/unstable/typography pollen/tag)
+
+(provide quad)
+(define quad (default-tag-function 'quad))
+
 (define-runtime-path fira "fira.ttf")
 (define-macro (mb . ARGS)
   (with-pattern ([PS (syntax-property #'ARGS 'ps)])
     #'(#%module-begin
-       (define q (typeset (list . ARGS)))
+       (define q (typeset (qexpr->quad (quad . ARGS))))
        ;q
        (let ([doc (make-object PDFDocument
                     (hasheq 'compress #t
@@ -114,5 +118,6 @@
   (define (quad-read-syntax path-string p)
     (define quad-at-reader (make-at-reader
                             #:syntax? #t 
-                            #:inside? #t))
+                            #:inside? #t
+                            #:command-char #\◊))
     (syntax-property (quad-at-reader path-string p) 'ps (path-replace-extension path-string #".pdf"))))
\ No newline at end of file