From 4ec35cd23818b590076e693d4eb7bc0c596263d0 Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Wed, 6 Apr 2022 13:15:21 -0700
Subject: [PATCH] append -key to key structs

---
 quad2/constants.rkt | 10 +++++-----
 quad2/param.rkt     |  2 +-
 quad2/struct.rkt    | 25 ++++++++++++++++++-------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/quad2/constants.rkt b/quad2/constants.rkt
index 021c6bf2..0226be0c 100644
--- a/quad2/constants.rkt
+++ b/quad2/constants.rkt
@@ -9,8 +9,8 @@
     (define LIST-NAME (list ATTR-NAME ...))))
 
 (define-attr-list all-attrs
-  [:font-family (attr-uncased-string 'font-family)]
-  [:font-path (attr-path 'font-path)]
-  [:font-bold (attr-boolean 'font-bold)]
-  [:font-italic (attr-boolean 'font-italic)]
-  [:font-size (attr-dimension-string 'font-size)])
\ No newline at end of file
+  [:font-family (attr-uncased-string-key 'font-family)]
+  [:font-path (attr-path-key 'font-path)]
+  [:font-bold (attr-boolean-key 'font-bold)]
+  [:font-italic (attr-boolean-key 'font-italic)]
+  [:font-size (attr-dimension-string-key 'font-size)])
\ No newline at end of file
diff --git a/quad2/param.rkt b/quad2/param.rkt
index dc123f4b..c2dd91ca 100644
--- a/quad2/param.rkt
+++ b/quad2/param.rkt
@@ -13,7 +13,7 @@
                         val))) ...))
 
 (define-guarded-parameters
-  [current-attrs (λ (xs) (and (list? xs) (andmap attr? xs))) null]
+  [current-attrs (λ (xs) (and (list? xs) (andmap attr-key? xs))) null]
   [current-show-timing? boolean? #false]
   [current-strict-attrs? boolean? #false]
   [current-use-preconditions? boolean? #true]
diff --git a/quad2/struct.rkt b/quad2/struct.rkt
index ced8e30d..d717207b 100644
--- a/quad2/struct.rkt
+++ b/quad2/struct.rkt
@@ -1,4 +1,5 @@
 #lang racket/base
+(require (for-syntax racket/base racket/syntax))
 (provide (all-defined-out))
 
 (struct $drawing-inst () #:transparent)
@@ -7,10 +8,20 @@
 (struct $doc $drawing-inst (inst) #:transparent)
 (struct $page $drawing-inst (inst) #:transparent)
 
-(struct attr (name) #:transparent)
-(struct attr-uncased-string attr () #:transparent)
-(struct attr-cased-string attr () #:transparent)
-(struct attr-dimension-string attr () #:transparent)
-(struct attr-path attr () #:transparent)
-(struct attr-numeric attr () #:transparent)
-(struct attr-boolean attr () #:transparent)
\ No newline at end of file
+(struct attr-key (name) #:transparent)
+
+(define-syntax (define-attr-key-types stx)
+  (syntax-case stx ()
+    [(_ ID ...)
+     (with-syntax ([(ATTR-ID-KEY ...) (map (λ (id-stx) (format-id stx "attr-~a-key" id-stx)) (syntax->list #'(ID ...)))])
+       #'(begin
+           (struct ATTR-ID-KEY attr-key () #:transparent) ...))]))
+
+;; for type X, creates struct called attr-X-key
+(define-attr-key-types
+  uncased-string
+  cased-string
+  dimension-string
+  path
+  numeric
+  boolean)
\ No newline at end of file