diff --git a/collects/scribble/scheme.ss b/collects/scribble/scheme.ss index dc5e20c4..443af073 100644 --- a/collects/scribble/scheme.ss +++ b/collects/scribble/scheme.ss @@ -377,7 +377,9 @@ [(and (pair? (syntax-e c)) (memq (syntax-e (car (syntax-e c))) '(quote quasiquote unquote unquote-splicing - quasisyntax syntax unsyntax unsyntax-splicing))) + quasisyntax syntax unsyntax unsyntax-splicing)) + (let ([v (syntax->list c)]) + (and v (= 2 (length v))))) (advance c init-line!) (let-values ([(str quote-delta) (case (syntax-e (car (syntax-e c))) @@ -464,8 +466,10 @@ (cond [(and (syntax? l) (pair? (syntax-e l)) - (not (memq (syntax-e (car (syntax-e l))) - '(quote unquote syntax unsyntax quasiquote quasiunsyntax)))) + (not (and (memq (syntax-e (car (syntax-e l))) + '(quote unquote syntax unsyntax quasiquote quasiunsyntax)) + (let ([v (syntax->list l)]) + (and v (= 2 (length v))))))) (lloop (syntax-e l))] [(or (null? l) (and (syntax? l) diff --git a/collects/scribble/text-render.ss b/collects/scribble/text-render.ss index b38a4e72..31835d1f 100644 --- a/collects/scribble/text-render.ss +++ b/collects/scribble/text-render.ss @@ -6,7 +6,8 @@ (define (render-mixin %) (class % - (init [style-file #f]) + (init [style-file #f] + [style-extra-files ()]) (define/override (get-substitutions) '((#rx"---" "\U2014") @@ -62,10 +63,10 @@ null (apply append - (map (lambda (d) (render-flow d part ht #f)) (car flowss)) + (map (lambda (d) (unless (eq? d 'cont) (render-flow d part ht #f))) (car flowss)) (map (lambda (flows) (newline) - (map (lambda (d) (render-flow d part ht #f)) flows)) + (map (lambda (d) (unless (eq? d 'cont) (render-flow d part ht #f))) flows)) (cdr flowss)))))) (define/override (render-itemization i part ht) @@ -94,6 +95,9 @@ [(rang) "<"] [(rarr) "->"] [(nbsp) " "] + [(prime) "'"] + [(alpha) "\u03B1"] + [(infin) "\u221E"] [else (error 'text-render "unknown element symbol: ~e" i)]))] [(string? i) (display i)] [else (write i)])