From 8e176bc2756f5fa3c88b0be3689aeb2ee07ca8de Mon Sep 17 00:00:00 2001 From: Matthias Felleisen Date: Fri, 29 Jul 2011 18:54:01 -0400 Subject: [PATCH] added documentation for Carl's ... in the student languages; otherwise 2e dots in templates look ugly --- collects/scribblings/htdp-langs/advanced.scrbl | 2 +- .../scribblings/htdp-langs/beginner-abbr.scrbl | 2 +- collects/scribblings/htdp-langs/beginner.scrbl | 2 +- .../htdp-langs/intermediate-lambda.scrbl | 2 +- .../scribblings/htdp-langs/intermediate.scrbl | 3 +-- collects/scribblings/htdp-langs/prim-ops.rkt | 15 +++++++++++++-- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/collects/scribblings/htdp-langs/advanced.scrbl b/collects/scribblings/htdp-langs/advanced.scrbl index 9970fbb662..534bc46751 100644 --- a/collects/scribblings/htdp-langs/advanced.scrbl +++ b/collects/scribblings/htdp-langs/advanced.scrbl @@ -86,7 +86,7 @@ @prim-nonterms[("advanced") define define-struct] -@prim-variables[("advanced") empty true false] +@prim-variables[("advanced") empty true false .. ... .... ..... ......] @; ---------------------------------------------------------------------- @section[#:tag "advanced-syntax"]{Syntax for Advanced} diff --git a/collects/scribblings/htdp-langs/beginner-abbr.scrbl b/collects/scribblings/htdp-langs/beginner-abbr.scrbl index bcae7f7995..16fed41a24 100644 --- a/collects/scribblings/htdp-langs/beginner-abbr.scrbl +++ b/collects/scribblings/htdp-langs/beginner-abbr.scrbl @@ -38,7 +38,7 @@ @prim-nonterms[("beginner-abbr") define define-struct] -@prim-variables[("beginner-abbr") empty true false] +@prim-variables[("beginner-abbr") empty true false .. ... .... ..... ......] @; ---------------------------------------- diff --git a/collects/scribblings/htdp-langs/beginner.scrbl b/collects/scribblings/htdp-langs/beginner.scrbl index 8867fdb2dc..19440f87be 100644 --- a/collects/scribblings/htdp-langs/beginner.scrbl +++ b/collects/scribblings/htdp-langs/beginner.scrbl @@ -35,7 +35,7 @@ @prim-nonterms[("beginner") define define-struct] -@prim-variables[("beginner") empty true false] +@prim-variables[("beginner") empty true false .. ... .... ..... ......] @; -------------------------------------------------- diff --git a/collects/scribblings/htdp-langs/intermediate-lambda.scrbl b/collects/scribblings/htdp-langs/intermediate-lambda.scrbl index 57a76e7316..c173528796 100644 --- a/collects/scribblings/htdp-langs/intermediate-lambda.scrbl +++ b/collects/scribblings/htdp-langs/intermediate-lambda.scrbl @@ -42,7 +42,7 @@ @prim-nonterms[("intm-w-lambda") define define-struct] -@prim-variables[("intm-w-lambda") empty true false] +@prim-variables[("intm-w-lambda") empty true false .. ... .... ..... ......] @; ---------------------------------------------------------------------- diff --git a/collects/scribblings/htdp-langs/intermediate.scrbl b/collects/scribblings/htdp-langs/intermediate.scrbl index 0e5f56601a..542f78084e 100644 --- a/collects/scribblings/htdp-langs/intermediate.scrbl +++ b/collects/scribblings/htdp-langs/intermediate.scrbl @@ -43,8 +43,7 @@ @prim-nonterms[("intermediate") define define-struct] -@prim-variables[("intermediate") empty true false] - +@prim-variables[("intermediate") empty true false .. ... .... ..... ......] @; ---------------------------------------------------------------------- diff --git a/collects/scribblings/htdp-langs/prim-ops.rkt b/collects/scribblings/htdp-langs/prim-ops.rkt index 034e2fcbf7..f28387178d 100644 --- a/collects/scribblings/htdp-langs/prim-ops.rkt +++ b/collects/scribblings/htdp-langs/prim-ops.rkt @@ -56,7 +56,9 @@ (to-paragraph (typeset-type (cadr func))))) -(define-syntax-rule (prim-variables (section-prefix) empty true false) +(define-syntax-rule + (prim-variables (section-prefix) empty true false ..2 ..3 ..4 ..5 ..6) + ;; ===> (make-splice (list @section[#:tag (string-append section-prefix " Pre-Defined Variables")]{Pre-Defined Variables} @@ -71,7 +73,16 @@ @defthing[false boolean?]{ - The false value.}))) + The false value.} + + @section[#:tag (string-append section-prefix " Template Variables")]{Template Variables} + @; MF: I tried abstracting but I failed + @defidform[..2]{A placeholder for indicating that a definition is a template.} + @defidform[..3]{A placeholder for indicating that a definition is a template.} + @defidform[..4]{A placeholder for indicating that a definition is a template.} + @defidform[..5]{A placeholder for indicating that a definition is a template.} + @defidform[..6]{A placeholder for indicating that a definition is a template.} + ))) ;; ----------------------------------------