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

scribblings: more explicit fonts and relative sizes for more consistent output, and colors changed to match DrScheme defaults

Browse Source 
svn: r6560

original commit: 732569c39d04d5943cfd50dc5bbfbd3f298c7145
This commit is contained in:
Matthew Flatt 2007-06-09 23:21:39 +00:00
parent e12b4a9088
commit 0ae283cd18
6 changed files with 51 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
collects/scribble/html-render.ss
View File

@ -176,10 +176,9 @@
[(sf) `((b (font ([size "-1"][face "Helvetica"]) ,@(super render-element e part ht))))] [(sf) `((b (font ([size "-1"][face "Helvetica"]) ,@(super render-element e part ht))))]
[(subscript) `((sub ,@(super render-element e part ht)))] [(subscript) `((sub ,@(super render-element e part ht)))]
[(superscript) `((sup ,@(super render-element e part ht)))] [(superscript) `((sup ,@(super render-element e part ht)))]
[(hspace) `((tt ,@(let ([str (content->string (element-content e))]) [(hspace) `((span ([class "hspace"])
(if (= 1 (string-length str)) ,@(let ([str (content->string (element-content e))])
'(" ") (map (lambda (c) 'nbsp) (string->list str)))))]
(map (lambda (c) 'nbsp) (string->list str))))))]
[else (error 'html-render "unrecognized style symbol: ~e" style)])] [else (error 'html-render "unrecognized style symbol: ~e" style)])]
[(string? style) [(string? style)
`((span ([class ,style]) ,@(super render-element e part ht)))] `((span ([class ,style]) ,@(super render-element e part ht)))]

23
collects/scribble/latex-render.ss
View File

@ -35,15 +35,21 @@
(define-color "schemeplain" "black") (define-color "schemeplain" "black")
(printf "\\newcommand{\\schemekeyword}[1]{{\\color{black}{\\texttt{\\textbf{#1}}}}}\n") (printf "\\newcommand{\\schemekeyword}[1]{{\\color{black}{\\texttt{\\textbf{#1}}}}}\n")
(printf "\\newcommand{\\schemesyntaxlink}[1]{\\schemekeyword{#1}}\n") (printf "\\newcommand{\\schemesyntaxlink}[1]{\\schemekeyword{#1}}\n")
(define-color "schemecomment" "Brown") (printf "\\definecolor{CommentColor}{rgb}{0.76,0.45,0.12}\n")
(define-color "schemeparen" "BrickRed") (printf "\\definecolor{ParenColor}{rgb}{0.52,0.24,0.14}\n")
(define-color "schemeinputcol" "BrickRed") (printf "\\definecolor{IdentifierColor}{rgb}{0.15,0.15,0.50}\n")
(define-color "schemesymbol" "NavyBlue") (printf "\\definecolor{ResultColor}{rgb}{0.0,0.0,0.69}\n")
(define-color "schemevalue" "ForestGreen") (printf "\\definecolor{ValueColor}{rgb}{0.13,0.55,0.13}\n")
(printf "\\definecolor{OutputColor}{rgb}{0.59,0.00,0.59}\n")
(define-color "schemecomment" "CommentColor")
(define-color "schemeparen" "ParenColor")
(define-color "schemeinputcol" "ParenColor")
(define-color "schemesymbol" "IdentifierColor")
(define-color "schemevalue" "ValueColor")
(define-color "schemevaluelink" "blue") (define-color "schemevaluelink" "blue")
(define-color "schemeresult" "NavyBlue") (define-color "schemeresult" "ResultColor")
(define-color "schemestdout" "Purple") (define-color "schemestdout" "OutputColor")
(define-color "schemevariablecol" "NavyBlue") (define-color "schemevariablecol" "IdentifierColor")
(printf "\\newcommand{\\schemevariable}[1]{{\\schemevariablecol{\\textsl{#1}}}}\n") (printf "\\newcommand{\\schemevariable}[1]{{\\schemevariablecol{\\textsl{#1}}}}\n")
(define-color "schemeerrorcol" "red") (define-color "schemeerrorcol" "red")
(printf "\\newcommand{\\schemeerror}[1]{{\\schemeerrorcol{\\textrm{\\textit{#1}}}}}\n") (printf "\\newcommand{\\schemeerror}[1]{{\\schemeerrorcol{\\textrm{\\textit{#1}}}}}\n")
@ -134,7 +140,6 @@
[(hspace) (let ([s (content->string (element-content e))]) [(hspace) (let ([s (content->string (element-content e))])
(case (string-length s) (case (string-length s)
[(0) (void)] [(0) (void)]
[(1) (printf "{\\texttt{ }}")] ; allows a line break to replace the space
[else [else
(printf "{\\texttt{~a}}" (printf "{\\texttt{~a}}"
(regexp-replace* #rx"." s "~"))]))] (regexp-replace* #rx"." s "~"))]))]

2
collects/scribble/manual.ss
View File

@ -64,7 +64,7 @@
[end-spaces (regexp-match-positions #rx" *$" s)]) [end-spaces (regexp-match-positions #rx" *$" s)])
(make-element "schemeinput" (make-element "schemeinput"
(list (hspace (cdar spaces)) (list (hspace (cdar spaces))
(make-element 'tt (list (substring s (cdar spaces) (caar end-spaces)))) (make-element #f (list (substring s (cdar spaces) (caar end-spaces))))
(hspace (- (cdar end-spaces) (caar end-spaces)))))))) (hspace (- (cdar end-spaces) (caar end-spaces))))))))
(define (verbatim s) (define (verbatim s)

12
collects/scribble/scheme.ss
View File

@ -89,7 +89,7 @@
values) values)
(if color? (if color?
(make-element cls (list v)) (make-element cls (list v))
(make-element 'tt (list v)))) (make-element #f (list v))))
content)) content))
(set! dest-col (+ dest-col len)))))])) (set! dest-col (+ dest-col len)))))]))
(define advance (define advance
@ -112,7 +112,10 @@
(let ([amt (- d-col dest-col)]) (let ([amt (- d-col dest-col)])
(when (positive? amt) (when (positive? amt)
(let ([old-dest-col dest-col]) (let ([old-dest-col dest-col])
(out (make-element 'hspace (list (make-string amt #\space))) #f) (out (if (and (= 1 amt) (not multi-line?))
(make-element 'tt (list " ")) ; allows a line break to replace the space
(make-element 'hspace (list (make-string amt #\space))))
#f)
(set! dest-col (+ old-dest-col amt)))))) (set! dest-col (+ old-dest-col amt))))))
(set! src-col c) (set! src-col c)
(hash-table-put! next-col-map src-col dest-col)))] (hash-table-put! next-col-map src-col dest-col)))]
@ -178,7 +181,10 @@
(out "; " comment-color) (out "; " comment-color)
(let ([v (syntax-object->datum (cadr (syntax->list c)))]) (let ([v (syntax-object->datum (cadr (syntax->list c)))])
(if (paragraph? v) (if (paragraph? v)
(map (lambda (v) (out v comment-color)) (paragraph-content v)) (map (lambda (v) (if (string? v)
(out v comment-color)
(out v #f)))
(paragraph-content v))
(out v comment-color)))] (out v comment-color)))]
[(and (pair? (syntax-e c)) [(and (pair? (syntax-e c))
(eq? (syntax-e (car (syntax-e c))) 'code:contract)) (eq? (syntax-e (car (syntax-e c))) 'code:contract))

56
collects/scribble/scribble.css
View File

@ -1,12 +1,11 @@
body { body {
color: black; color: black;
/* background-color: #e5e5e5;*/
background-color: #ffffff; background-color: #ffffff;
/*background-color: beige;*/
max-width: 35em; max-width: 35em;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
font-family: Times;
} }
.refpara { .refpara {
@ -130,7 +129,7 @@
list-style-type: upper-alpha; list-style-type: upper-alpha;
} }
tt i { i {
font-family: serif; font-family: serif;
} }
@ -138,12 +137,6 @@
font-family: serif; font-family: serif;
} }
/*
.verbatim {
color: #4d0000;
}
*/
.ghost { .ghost {
color: white; color: white;
} }
@ -157,15 +150,19 @@
background-color: #ddddff; background-color: #ddddff;
} }
.hspace {
font-family: Courier; font-size: 80%;
}
.schemeinput { .schemeinput {
color: brown; color: brown;
background-color: #eeeeee; background-color: #eeeeee;
font-family: monospace; font-family: Courier; font-size: 80%;
} }
.schemeparen { .schemeparen {
color: brown; color: #843c24;
font-family: monospace; font-family: Courier; font-size: 80%;
} }
.schemeopt { .schemeopt {
@ -175,7 +172,7 @@
.schemekeyword { .schemekeyword {
color: black; color: black;
font-weight: bold; font-weight: bold;
font-family: monospace; font-family: Courier; font-size: 80%;
} }
.schemeerror { .schemeerror {
@ -184,27 +181,25 @@
} }
.schemevariable { .schemevariable {
color: navy; color: #262680;
font-style: italic; font-style: italic;
font-family: monospace; font-family: Courier; font-size: 80%;
} }
.schemesymbol { .schemesymbol {
color: navy; color: #262680;
font-family: monospace; font-family: Courier; font-size: 80%;
} }
.schemevaluelink { .schemevaluelink {
text-decoration: none; text-decoration: none;
color: blue; color: blue;
font-family: monospace;
} }
.schemesyntaxlink { .schemesyntaxlink {
text-decoration: none; text-decoration: none;
color: black; color: black;
font-weight: bold; font-weight: bold;
font-family: monospace;
} }
.badlink { .badlink {
@ -213,23 +208,23 @@
} }
.schemeresult { .schemeresult {
color: navy; color: #0000af;
font-family: monospace; font-family: Courier; font-size: 80%;
} }
.schemestdout { .schemestdout {
color: purple; color: #960096;
font-family: monospace; font-family: Courier; font-size: 80%;
} }
.schemecomment { .schemecomment {
color: teal; color: #c2741f;
font-family: monospace; font-family: Courier; font-size: 80%;
} }
.schemevalue { .schemevalue {
color: green; color: #228b22;
font-family: monospace; font-family: Courier; font-size: 80%;
} }
.nonavigation { .nonavigation {
@ -251,13 +246,6 @@
text-align: right; text-align: right;
} }
/*
.smallprint hr {
text-align: left;
width: 40%;
}
*/
.footnoterule { .footnoterule {
text-align: left; text-align: left;
width: 40%; width: 40%;

3
collects/scribblings/scribble/struct.scrbl
View File

@ -52,7 +52,8 @@ A single document is reprsented as a @defterm{part}:
output may be collapsed togther or replaced output may be collapsed togther or replaced
with a line break. In the style with a line break. In the style
@scheme['hspace], all text is converted to @scheme['hspace], all text is converted to
uncollapsable spaces.} uncollapsable spaces that cannot be broken
across lines.}
@item{A symbol element is either @scheme['mdash], @item{A symbol element is either @scheme['mdash],
@scheme['ndash], @scheme['ldquo], @scheme['ndash], @scheme['ldquo],