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

switch `codeblock' to strings instead of bytes

Browse Source 
Also, fix scribble lexer line counting.

Closes PR 12225

original commit: fca5ceecc97dfff28ae52bb404a8761426f64145
This commit is contained in:
Matthew Flatt 2011-11-27 10:08:07 -07:00
parent 201f279940
commit 44a9f835da
3 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
collects/scribble/private/manual-code.rkt
View File

@ -55,9 +55,10 @@
#:line-numbers [line-numbers #f]
#:block? [block? #t]
. strs)
(let* ([str (apply string-append strs)]
[bstr (string->bytes/utf-8 (regexp-replace* #rx"(?m:^$)" str "\xA0"))]
[in (open-input-bytes bstr)])
(let* ([xstr (apply string-append strs)]
[bstr (regexp-replace* #rx"(?m:^$)" xstr "\xA0")]
[in (open-input-string bstr)])
(port-count-lines! in)
(let* ([tokens
(let loop ([mode #f])
(let-values ([(lexeme type data start end backup-delta mode)
@ -66,15 +67,14 @@
null
(cons (list type (sub1 start) (sub1 end) 0)
(loop mode)))))]
[substring* (lambda (bstr start [end (bytes-length bstr)])
(bytes->string/utf-8 (subbytes bstr start end)))]
[e (parameterize ([read-accept-reader #t])
((or expand
(lambda (stx)
(if context
(replace-context context stx)
stx)))
(let ([p (open-input-bytes bstr)])
(let ([p (open-input-string bstr)])
(port-count-lines! p)
(let loop ()
(let ([v (read-syntax 'prog p)])
(cond
@ -138,8 +138,8 @@
(link-mod
#:orig? #t
(datum->syntax #f
(string->symbol (bytes->string/utf-8 (cadr m)))
(vector 'in 1 6 7 (bytes-length (cadr m))))
(string->symbol (cadr m))
(vector 'in 1 6 7 (string-length (cadr m))))
3)
null))
null)]
@ -166,12 +166,12 @@
(let loop ([pos 0]
[tokens tokens])
(cond
[(null? tokens) (split-lines default-color (substring* bstr pos))]
[(null? tokens) (split-lines default-color (substring bstr pos))]
[(eq? (caar tokens) 'white-space) (loop pos (cdr tokens))]
[(= pos (cadar tokens))
(append (let ([style (caar tokens)]
[get-str (lambda ()
(substring* bstr (cadar tokens) (caddar tokens)))])
(substring bstr (cadar tokens) (caddar tokens)))])
(cond
[(symbol? style)
(let ([scribble-style
@ -189,7 +189,7 @@
[(> pos (cadar tokens))
(loop pos (cdr tokens))]
[else (append
(split-lines default-color (substring* bstr pos (cadar tokens)))
(split-lines default-color (substring bstr pos (cadar tokens)))
(loop (cadar tokens) tokens))]))))))))
(define (typeset-code-line context expand lang-line . strs)

12
collects/tests/scribble/docs/codeblock-utf8.scrbl Normal file
View File

@ -0,0 +1,12 @@
#lang scribble/base
@(require scribble/manual)
@defmodulereader[scribble/manual]
@codeblock|{
#lang scribble/manual
(λ x x)
@interaction[1
42]
}|

7
collects/tests/scribble/docs/codeblock-utf8.txt Normal file
View File

@ -0,0 +1,7 @@
 #reader scribble/manual
#lang scribble/manual
(λ x x)
@interaction[1
 
             42]