suzanne.soy/scribble-enhanced
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Adding customization of command-char to web-server/template

Browse Source 
This entails adding it to include/text and read-syntax-inside as well.

original commit: 73232afd9934f5b7918d29414d835f33f21aa57c
This commit is contained in:
Jay McCarthy 2013-05-08 10:52:04 -06:00
parent fff0344f4e
commit bb9ffefd74
2 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
collects/scribble/text/syntax-utils.rkt
View File

@ -172,22 +172,32 @@
#'(process-begin/text begin/collect begin expr ...)])) #'(process-begin/text begin/collect begin expr ...)]))
;; include for templates ;; include for templates
(require (for-syntax scheme/base (prefix-in scribble: "../reader.rkt")) (require (for-syntax scheme/base (prefix-in scribble: "../reader.rkt") syntax/parse)
scheme/include) scheme/include)
(define-syntax-rule (include/text path-spec) (define-syntax (include/text stx)
(begin/text (syntax-case stx ()
(include-at/relative-to/reader path-spec path-spec path-spec [(_ path-spec)
(let ([xs #f]) (syntax/loc stx
(λ (src inp) (include/text #:command-char #f path-spec))]
(unless xs [(_ #:command-char command-char path-spec)
(set! xs (scribble:read-syntax-inside src inp)) (syntax/loc stx
(when (syntax? xs) (set! xs (or (syntax->list xs) (list xs))))) (begin/text
(if (null? xs) (include-at/relative-to/reader
eof path-spec path-spec path-spec
(let ([x (car xs)]) (let ([xs #f]
(set! xs (cdr xs)) [command-char-v command-char])
(if (and (null? xs) (λ (src inp)
(let ([p (syntax-property x 'scribble)]) (unless xs
(and (pair? p) (eq? (car p) 'newline)))) (set! xs (if command-char-v
eof ; throw away the last newline from the included file (scribble:read-syntax-inside #:command-char command-char-v src inp)
x)))))))) (scribble:read-syntax-inside src inp)))
(when (syntax? xs) (set! xs (or (syntax->list xs) (list xs)))))
(if (null? xs)
eof
(let ([x (car xs)])
(set! xs (cdr xs))
(if (and (null? xs)
(let ([p (syntax-property x 'scribble)])
(and (pair? p) (eq? (car p) 'newline))))
eof ; throw away the last newline from the included file
x))))))))]))

4
collects/scribblings/scribble/reader-internals.scrbl
View File

@ -188,10 +188,12 @@ for reading.
@defproc[(read-inside [in input-port? (current-input-port)]) any]{} @defproc[(read-inside [in input-port? (current-input-port)]) any]{}
@defproc[(read-syntax-inside [source-name any/c (object-name in)] @defproc[(read-syntax-inside [source-name any/c (object-name in)]
[in input-port? (current-input-port)]) [in input-port? (current-input-port)]
[#:command-char command-char char? #\@])
(or/c syntax? eof-object?)]{ (or/c syntax? eof-object?)]{
These @racketid[-inside] variants parse as if starting inside a These @racketid[-inside] variants parse as if starting inside a
@litchar["@{"]...@litchar["}"], and they return a (syntactic) list. @litchar["@{"]...@litchar["}"], and they return a (syntactic) list.
The @racket[command-char] is used to customize the readtable.
Useful for implementing languages that are textual by default (see Useful for implementing languages that are textual by default (see
@filepath{docreader.rkt} for example). @filepath{docreader.rkt} for example).
} }