From d23f4f133a65d2b6d7271c837d4208471a628b3d Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Thu, 3 Sep 2015 22:13:36 -0700 Subject: [PATCH] doc fixes (closes #88) --- scribblings/template.scrbl | 26 +++++++++++++++----------- template.rkt | 2 +- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/scribblings/template.scrbl b/scribblings/template.scrbl index 032e976..90fe015 100644 --- a/scribblings/template.scrbl +++ b/scribblings/template.scrbl @@ -105,6 +105,18 @@ With @racket[select], you get the first result; with @racket[select*], you get t In both cases, you get @racket[#f] if there are no matches. +@examples[#:eval my-eval +(module nut-butters pollen/markup +'(div (question "Flavor?") + (answer "Cashew") (answer "Almond"))) +(code:comment @#,t{Import doc from 'nut-butters submodule}) +(require 'nut-butters) +(select 'question doc) +(select 'answer doc) +(select* 'answer doc) +(select 'nonexistent-key doc) +(select* 'nonexistent-key doc) +] @@ -116,13 +128,7 @@ In both cases, you get @racket[#f] if there are no matches. Look up the value of @racket[_key] in @racket[_meta-source]. The @racket[_meta-source] argument can be either 1) a hashtable representing @racket[metas] or 2) a pagenode or source path that identifies a source file that provides @racket[metas]. If no value exists for @racket[_key], you get @racket[#f]. @examples[#:eval my-eval -(module ice-cream pollen/markup -'(div (question "Flavor?") - (answer "Chocolate chip") (answer "Maple walnut")) - '(meta ((template "sub.xml.pt"))) - '(meta ((target "print")))) -(code:comment @#,t{Import doc & metas from 'ice-cream submodule}) -(require 'ice-cream) +(define metas (hash 'template "sub.xml.pp" 'target "print")) (select-from-metas 'template metas) ('target . select-from-metas . metas) (select-from-metas 'nonexistent-key metas) @@ -140,10 +146,8 @@ Look up the value of @racket[_key] in @racket[_doc-source]. The @racket[_doc-sou @examples[#:eval my-eval (module gelato pollen/markup '(div (question "Flavor?") - (answer "Nocciola") (answer "Pistachio")) - '(meta ((template "sub.xml.pt"))) - '(meta ((target "print")))) -(code:comment @#,t{Import doc & metas from 'gelato submodule}) + (answer "Nocciola") (answer "Pistachio"))) +(code:comment @#,t{Import doc from 'gelato submodule}) (require 'gelato) (select-from-doc 'question doc) ('answer . select-from-doc . doc) diff --git a/template.rkt b/template.rkt index f53f3f1..c1896bb 100644 --- a/template.rkt +++ b/template.rkt @@ -116,7 +116,7 @@ [else x-in])) (when (and (not (txexpr? x)) attrs (not tag)) - (raise-argument-error '->html (format "can't use attribute list ~v without a #:tag argument" attrs))) + (raise-argument-error '->html "can't use attribute list without a #:tag argument" tag)) (if (or tag (txexpr? x)) (let ()