From 41c752b9b46be75cb840311a508fe894ba827be4 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 24 May 2007 10:36:03 +0000 Subject: [PATCH] make scribble reader section fit narrower column svn: r6265 original commit: 3c25a6ad93e78433981e798b920f9931e9d605c6 --- collects/scribblings/scribble/reader.scrbl | 6 +++--- collects/scribblings/scribble/utils.ss | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/collects/scribblings/scribble/reader.scrbl b/collects/scribblings/scribble/reader.scrbl index 7006d965..da0bab39 100644 --- a/collects/scribblings/scribble/reader.scrbl +++ b/collects/scribblings/scribble/reader.scrbl @@ -307,7 +307,7 @@ the end of the text. They are therefore allowed, as long as they are balanced. @scribble-examples[ - "@foo{f{o}o}"] + "@foo{f{o}o}" ] There is also an alternative syntax for the body, one that specifies a @@ -492,8 +492,8 @@ the need for functions, for example: @verbatim[ #< (define (important . text) @`b{@u{@big{@,@text}}}) - > (important @`p{This is an important announcement! + > (important @`p{An important announcement! Read it!}) - (b (u (big (p "This is an important announcement!" "\n" "Read it!")))) + (b (u (big (p "An important announcement!" "\n" "Read it!")))) EOS ] diff --git a/collects/scribblings/scribble/utils.ss b/collects/scribblings/scribble/utils.ss index a12444e1..e31c6e2a 100644 --- a/collects/scribblings/scribble/utils.ss +++ b/collects/scribblings/scribble/utils.ss @@ -35,7 +35,12 @@ (map (lambda (line) (let ([line (if (string? line) (list (litchar/lines line) - (scheme:to-element (scribble:read (open-input-string line)))) + (scheme:to-paragraph + (let ([p (open-input-string line)]) + (port-count-lines! p) + (if (regexp-match? #rx"\n" line) + (scribble:read-syntax #f p) + (scribble:read p))))) line)]) (list (as-flow spacer) (as-flow (if line (car line) ""))