add #lang scribble/manual; change latex table rendering to use a smaller minipage for multiple columns of non-para/table cell flows
svn: r13839 original commit: 0321cad60e6311ed1881327ddccb94949871216c
This commit is contained in:
parent
0bd5ae64c7
commit
c571d7f881
|
@ -259,7 +259,10 @@
|
||||||
(and m
|
(and m
|
||||||
(equal? "bigtabular" (car m))
|
(equal? "bigtabular" (car m))
|
||||||
(= 1 (length (car (table-flowss (cadr m))))))))]
|
(= 1 (length (car (table-flowss (cadr m))))))))]
|
||||||
[boxline "{\\setlength{\\unitlength}{\\linewidth}\\begin{picture}(1,0)\\put(0,0){\\line(1,0){1}}\\end{picture}}"])
|
[boxline "{\\setlength{\\unitlength}{\\linewidth}\\begin{picture}(1,0)\\put(0,0){\\line(1,0){1}}\\end{picture}}"]
|
||||||
|
[twidth (if (null? (table-flowss t))
|
||||||
|
1
|
||||||
|
(length (car (table-flowss t))))])
|
||||||
(unless (or (null? flowss) (null? (car flowss)))
|
(unless (or (null? flowss) (null? (car flowss)))
|
||||||
(parameterize ([current-table-mode
|
(parameterize ([current-table-mode
|
||||||
(if inline? (current-table-mode) (list tableform t))]
|
(if inline? (current-table-mode) (list tableform t))]
|
||||||
|
@ -306,7 +309,7 @@
|
||||||
(loop (cdr flows) (add1 n))]
|
(loop (cdr flows) (add1 n))]
|
||||||
[else n]))])
|
[else n]))])
|
||||||
(unless (= cnt 1) (printf "\\multicolumn{~a}{l}{" cnt))
|
(unless (= cnt 1) (printf "\\multicolumn{~a}{l}{" cnt))
|
||||||
(render-table-flow (car flows) part ri)
|
(render-table-flow (car flows) part ri twidth)
|
||||||
(unless (= cnt 1) (printf "}"))
|
(unless (= cnt 1) (printf "}"))
|
||||||
(unless (null? (list-tail flows cnt)) (printf " &\n"))))
|
(unless (null? (list-tail flows cnt)) (printf " &\n"))))
|
||||||
(unless (null? (cdr flows)) (loop (cdr flows)))))
|
(unless (null? (cdr flows)) (loop (cdr flows)))))
|
||||||
|
@ -321,7 +324,7 @@
|
||||||
tableform)))))
|
tableform)))))
|
||||||
null)
|
null)
|
||||||
|
|
||||||
(define/private (render-table-flow p part ri)
|
(define/private (render-table-flow p part ri twidth)
|
||||||
;; Emit a \\ between blocks:
|
;; Emit a \\ between blocks:
|
||||||
(let loop ([ps (flow-paragraphs p)])
|
(let loop ([ps (flow-paragraphs p)])
|
||||||
(cond
|
(cond
|
||||||
|
@ -330,7 +333,7 @@
|
||||||
(let ([minipage? (not (or (paragraph? (car ps))
|
(let ([minipage? (not (or (paragraph? (car ps))
|
||||||
(table? (car ps))))])
|
(table? (car ps))))])
|
||||||
(when minipage?
|
(when minipage?
|
||||||
(printf "\\begin{minipage}{\\linewidth}\n"))
|
(printf "\\begin{minipage}{~a\\linewidth}\n" (/ 1.0 twidth)))
|
||||||
(render-block (car ps) part ri #f)
|
(render-block (car ps) part ri #f)
|
||||||
(when minipage?
|
(when minipage?
|
||||||
(printf " \\end{minipage}\n"))
|
(printf " \\end{minipage}\n"))
|
||||||
|
|
4
collects/scribble/manual/lang.ss
Normal file
4
collects/scribble/manual/lang.ss
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
#lang scheme
|
||||||
|
(require scribble/doclang scribble/manual)
|
||||||
|
(provide (all-from-out scribble/doclang
|
||||||
|
scribble/manual))
|
10
collects/scribble/manual/lang/reader.ss
Normal file
10
collects/scribble/manual/lang/reader.ss
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
#lang s-exp syntax/module-reader
|
||||||
|
|
||||||
|
scribble/manual/lang
|
||||||
|
|
||||||
|
#:read scribble:read-inside
|
||||||
|
#:read-syntax scribble:read-syntax-inside
|
||||||
|
#:whole-body-readers? #t
|
||||||
|
#:wrapper1 (lambda (t) (list* 'doc '() (t)))
|
||||||
|
|
||||||
|
(require (prefix-in scribble: "../../reader.ss"))
|
Loading…
Reference in New Issue
Block a user