diff --git a/collects/scribble/latex-render.ss b/collects/scribble/latex-render.ss index 0d8cdadc..d3be46e9 100644 --- a/collects/scribble/latex-render.ss +++ b/collects/scribble/latex-render.ss @@ -273,7 +273,10 @@ [index? (printf "\\begin{list}{}{\\parsep=0pt \\itemsep=1pt \\leftmargin=2ex \\itemindent=-2ex}\n")] [inline? (void)] [else - (printf "\n\n\\begin{~a}~a{@{}~a}\n~a" + (printf "\n\n~a\\begin{~a}~a{@{}~a}\n~a" + (if (string? (table-style t)) + (format "\\begin{~a}" (table-style t)) + "") tableform opt (string-append* @@ -325,9 +328,12 @@ (unless (null? (cdr flowss)) (loop (cdr flowss) (cdr row-styles))))) (unless inline? - (printf "~a\n\n\\end{~a}\n" - "" ; (if (equal? tableform "bigtabular") "\n\\\\" "") - tableform))))) + (printf "~a\n\n\\end{~a}~a\n" + "" + tableform + (if (string? (table-style t)) + (format "\\end{~a}" (table-style t)) + "")))))) null) (define/private (render-table-flow p part ri twidth vstyle) diff --git a/collects/scribble/private/manual-bib.ss b/collects/scribble/private/manual-bib.ss index 5a48f8be..20e89ace 100644 --- a/collects/scribble/private/manual-bib.ss +++ b/collects/scribble/private/manual-bib.ss @@ -64,7 +64,7 @@ (make-flow (list (make-table - "bibliography" + "SBibliography" (map (lambda (c) (let ([key (a-bib-entry-key c)] [val (a-bib-entry-val c)]) diff --git a/collects/scribble/scribble.css b/collects/scribble/scribble.css index 9e106afd..832ef53b 100644 --- a/collects/scribble/scribble.css +++ b/collects/scribble/scribble.css @@ -506,7 +506,7 @@ i { .techinside:hover { color: blue; } .techoutside:hover>.techinside { color: inherit; } -.bibliography td { +.SBibliography td { vertical-align: text-top; } diff --git a/collects/scribble/scribble.tex b/collects/scribble/scribble.tex index 06f19b33..0cdc9d3b 100644 --- a/collects/scribble/scribble.tex +++ b/collects/scribble/scribble.tex @@ -78,6 +78,16 @@ \newenvironment{bigtabular}{\begin{longtable}}{\end{longtable}\vspace{-3ex}} +\newenvironment{schemeblock}{}{} +\newenvironment{defmodule}{}{} +\newenvironment{prototype}{}{} +\newenvironment{argcontract}{}{} +\newenvironment{together}{}{} +\newenvironment{SBibliography}{}{} + +\newenvironment{compact}{\begin{itemize}}{\end{itemize}} +\newcommand{\compactItem}[1]{\item #1} + \newcommand{\SecRef}[2]{\S#1 ``#2''} \newcommand{\sectionhidden}[1]{\section{#1}} diff --git a/collects/scribblings/scribble/config.scrbl b/collects/scribblings/scribble/config.scrbl index 23fbb7a4..a27f064e 100644 --- a/collects/scribblings/scribble/config.scrbl +++ b/collects/scribblings/scribble/config.scrbl @@ -40,11 +40,12 @@ extend or configure Scribble fall into two groups: #:style `((css "inbox.css") (tex "inbox.tex"))]{Adding a Style} When a string is uses as a style in an @scheme[element], -@scheme[styled-paragraph], @scheme[styled-itemization], or -@scheme[blockquote], it corresponds to a CSS class for HTML output or -a Tex macro/environment for Latex output. In Latex output, the string -is used as a macro name for a @scheme[styled-paragraph] and an -environment name for a @scheme[itemization] or @scheme[blockquote]. In +@scheme[styled-paragraph], @scheme[table], +@scheme[styled-itemization], or @scheme[blockquote], it corresponds to +a CSS class for HTML output or a Tex macro/environment for Latex +output. In Latex output, the string is used as a macro name for a +@scheme[styled-paragraph] and an environment name for a +@scheme[table], @scheme[itemization], or @scheme[blockquote]. In addition, for an itemization, the style string is suffixed with @scheme["Item"] and used as a CSS class or Tex macro name to use for the itemization's items (in place of @tt{item} in the case of Latex). diff --git a/collects/scribblings/scribble/struct.scrbl b/collects/scribblings/scribble/struct.scrbl index 5920fce2..e36484d2 100644 --- a/collects/scribblings/scribble/struct.scrbl +++ b/collects/scribblings/scribble/struct.scrbl @@ -399,8 +399,8 @@ The @scheme[style] can be any of the following: @itemize[ - @item{A string that corresponds to a CSS class for - HTML output (see @secref["extra-style"]).} + @item{A string that corresponds to a CSS class for HTML output or an + environment for Latex output (see @secref["extra-style"]).} @item{@scheme['boxed] to render as a definition.}