From 76cca479d925f9a724cde167511b589302d7e098 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sat, 16 Nov 2013 09:41:42 -0700 Subject: [PATCH] restore old Scribble default style, but make new style default for manuals Using #lang scribble/base produces HTML output in the old style, while #lang scribble/manual uses the new style. To get the new style without switching to `#lang scribble/manual`, use `manual-doc-style`. Related changes include the addition of `css-style-addition` and `js-style-addition`. original commit: b520b66c4e8e54909c7d7b1126044e984989e8ef --- .../scribblings/scribble/core.scrbl | 19 +- .../scribblings/scribble/how-to-paper.scrbl | 2 +- .../scribblings/scribble/manual.scrbl | 56 +- .../scribble-lib/scribble/HISTORY.txt | 13 +- .../scribble-lib/scribble/base-render.rkt | 10 +- .../scribble-lib/scribble/html-properties.rkt | 2 + .../scribble-lib/scribble/html-render.rkt | 36 +- .../{scribble-fonts.css => manual-fonts.css} | 0 .../scribble-lib/scribble/manual-racket.css | 300 ++++++++ .../scribble-lib/scribble/manual-style.css | 721 ++++++++++++++++++ .../scribble-lib/scribble/manual.rkt | 4 +- .../scribble-lib/scribble/manual/lang.rkt | 13 +- .../scribble/private/defaults.rkt | 12 +- .../scribble/private/manual-defaults.rkt | 24 + .../scribble-lib/scribble/racket.css | 175 ++--- .../scribble-lib/scribble/scribble.css | 623 ++++----------- 16 files changed, 1394 insertions(+), 616 deletions(-) rename pkgs/scribble-pkgs/scribble-lib/scribble/{scribble-fonts.css => manual-fonts.css} (100%) create mode 100644 pkgs/scribble-pkgs/scribble-lib/scribble/manual-racket.css create mode 100644 pkgs/scribble-pkgs/scribble-lib/scribble/manual-style.css create mode 100644 pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-defaults.rkt diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/core.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/core.scrbl index f9762a2c..30b22f2c 100644 --- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/core.scrbl +++ b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/core.scrbl @@ -1487,13 +1487,30 @@ to the top of the generated HTML page. The @racket[path] field can be a result of @racket[path->main-collects-relative].} +@defstruct[css-style-addition ([path (or/c path-string? + (cons/c 'collects (listof bytes?)) + url? + bytes?)])]{ + +Like @racket[css-addition], but added after any style files that are +specified by a document and before any style files that are provided +externally.} + @defstruct[js-addition ([path (or/c path-string? (cons/c 'collects (listof bytes?)) url? bytes?)])]{ -Like @racket[css-addition], but for a Javascript file instead of a CSS file.} +Like @racket[css-addition], but for a JavaScript file instead of a CSS file.} + + +@defstruct[js-style-addition ([path (or/c path-string? + (cons/c 'collects (listof bytes?)) + url? + bytes?)])]{ + +Like @racket[css-style-addition], but for a JavaScript file instead of a CSS file.} @defstruct[body-id ([value string?])]{ diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to-paper.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to-paper.scrbl index 19177dd0..341b6e14 100644 --- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to-paper.scrbl +++ b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to-paper.scrbl @@ -332,7 +332,7 @@ For example, (list "moose" "muffin"))] }| -else +renders as @result{ @tabular[#:sep @hspace[1] diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual.scrbl index cd5faf74..77ceb605 100644 --- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual.scrbl +++ b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual.scrbl @@ -11,18 +11,16 @@ @defmodulelang[scribble/manual]{The @racketmodname[scribble/manual] language provides all of @racketmodname[scribble/base] plus many additional functions that are specific to writing Racket -documentation. +documentation. It also associates @tech{style properties} with the +generated @racket[doc] export to select the default Racket manual +style for rendering; see @secref["manual-render-style"] for more +information. The @racketmodname[scribble/manual] name can also be used as a library with @racket[require], in which case it provides all of the same bindings, but without setting the reader or setting the default rendering format to the Racket manual format.} -With @hash-lang[], @racketmodname[scribble/manual] associates a -@racket[latex-defaults] @tech{style property} with its @racket[doc] -export to select the default Racket manual style for Latex -rendering---unless a style is supplied to @racket[title] that already -includes a @racket[latex-defaults] @tech{style property}. @local-table-of-contents[] @@ -1805,6 +1803,12 @@ abbreviation-ending period for use in the middle of a sentence.} @defthing[PLaneT element?]{@racket["PLaneT"] (to help make sure you get the letters in the right case).} +@defthing[manual-doc-style style?]{ + +A style to be used for a document's main @racket[part] to get the +style configuration of @racket[@#,hash-lang[] @#,racketmodname[scribble/manual]]. +See @secref["manual-render-style"].} + @defproc[(hash-lang) element?]{Returns an element for @hash-lang[] that is hyperlinked to an explanation.} @@ -1935,3 +1939,43 @@ from @racket[exported-index-desc] names the class or interface that contains the method. The @racket[class-tag] field provides a pointer to the start of the documentation for the method's class or interface.} + +@;---------------------------------------- + +@section[#:tag "manual-render-style"]{Manual Rendering Style} + +Using @racket[@#,hash-lang[] @#,racketmodname[scribble/manual]] for the +main @racket[part] of a document associates @tech{style properties} on +the @racket[doc] export to select the Racket manual style for +rendering. + +A @racket[html-defaults] @tech{style property} is added to +@racket[doc], unless @racket[doc]'s style already has a +@racket[html-defaults] @tech{style property} (e.g., supplied to +@racket[title]). Similarly, a @racket[latex-default] @tech{style +property} is added if one is not already present. Finally, an +@racket[css-style-addition] property is always added. + +For HTML rendering: + +@itemlist[ + + @item{The document's @tech{prefix file} is set to + @filepath{scribble-prefix.html}, as usual, in @racket[html-defaults].} + + @item{The document's @tech{style file} is set to + @filepath{manual-style.css} from the @filepath{scribble} + collection in @racket[html-defaults].} + + @item{The file @filepath{manual-files.css} from the + @filepath{scribble} collection is designated as an additional + accompanying file in @racket[html-defaults].} + + @item{The file @filepath{manual-racket.css} from the + @filepath{scribble} collection is added as a + @racket[css-style-addition].} + +] + +To obtain this configuration without using @racket[@#,hash-lang[] +@#,racketmodname[scribble/manual]], use @racket[manual-doc-style]. diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/HISTORY.txt b/pkgs/scribble-pkgs/scribble-lib/scribble/HISTORY.txt index a6245105..3aa8aa12 100644 --- a/pkgs/scribble-pkgs/scribble-lib/scribble/HISTORY.txt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/HISTORY.txt @@ -1,11 +1,16 @@ Version 1.1 -Change `verbatim' to support non-string arguments -Add `--html-tree' option to for rendering to multi-page HTML +Changed the HTML rendering style of `scribble/manual' +Changed `verbatim' to support non-string arguments +Added `--html-tree' option to for rendering to multi-page HTML with nested directories for nested parts +Added `css-style-addition' and `js-style-addition' for adding + style files that override library-level defaults but can be + overridden externally For HTML rendering, merge generated `style' attributes within a single tag -scribble/manual: changed `deprecated` to a function, and - generalized it by adding an optional `#:what` argument +scribble/manual: added `manual-doc-style' +scribble/manual: changed `deprecated' to a function, and + generalized it by adding an optional `#:what' argument Older versions See the "Racket core" release notes for a history of changes before diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/base-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/base-render.rkt index 1e8b348f..955d0af6 100644 --- a/pkgs/scribble-pkgs/scribble-lib/scribble/base-render.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/base-render.rkt @@ -757,17 +757,21 @@ (define/public (auto-extra-files? v) #f) (define/public (auto-extra-files-paths v) null) + (define/public (skip-extra-file? v) #f) (define/public (install-extra-files ds) - (for ([fn extra-files]) (install-file fn #:private-name? #f)) + (for ([fn extra-files]) + (unless (skip-extra-file? fn) + (install-file fn #:private-name? #f))) (unless prefix-file (for ([d (in-list ds)]) (let ([extras (ormap (lambda (v) (and (auto-extra-files? v) v)) (style-properties (part-style d)))]) (when extras (for ([fn (in-list (auto-extra-files-paths extras))]) - (install-file (collects-relative->path fn) - #:private-name? #f))))))) + (unless (skip-extra-file? fn) + (install-file (collects-relative->path fn) + #:private-name? #f)))))))) (define/public (render ds fns ri) ;; maybe this should happen even if fns is empty or all #f? diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/html-properties.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/html-properties.rkt index ef67d85a..65d3b415 100644 --- a/pkgs/scribble-pkgs/scribble-lib/scribble/html-properties.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/html-properties.rkt @@ -14,6 +14,8 @@ [html-defaults ([prefix-path (or/c bytes? path-string? (cons/c 'collects (listof bytes?)))] [style-path (or/c bytes? path-string? (cons/c 'collects (listof bytes?)))] [extra-files (listof (or/c path-string? (cons/c 'collects (listof bytes?))))])] + [css-style-addition ([path (or/c path-string? (cons/c 'collects (listof bytes?)) url? bytes?)])] + [js-style-addition ([path (or/c path-string? (cons/c 'collects (listof bytes?)) url? bytes?)])] [url-anchor ([name string?])] [alt-tag ([name (and/c string? #rx"^[a-zA-Z0-9]+$")])] diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt index f0eca43d..888c3f66 100644 --- a/pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt @@ -275,6 +275,11 @@ (define/override (auto-extra-files? v) (html-defaults? v)) (define/override (auto-extra-files-paths v) (html-defaults-extra-files v)) + (define/override (skip-extra-file? p) + (lookup-path (if (path? p) + p + (collects-relative->path p)) + alt-paths)) ;; ---------------------------------------- @@ -741,8 +746,11 @@ (define/public (render-one-part d ri fn number) (parameterize ([current-output-file fn]) - (let* ([defaults (ormap (lambda (v) (and (html-defaults? v) v)) - (style-properties (part-style d)))] + (let* ([defaults (let loop ([d d]) + (or (ormap (lambda (v) (and (html-defaults? v) v)) + (style-properties (part-style d))) + (let ([p (part-parent d ri)]) + (and p (loop p)))))] [prefix-file (or prefix-file (and defaults (let ([v (html-defaults-prefix-path defaults)]) @@ -763,7 +771,13 @@ `(title ,@(format-number number '(nbsp)) ,(content->string (strip-aux c) this d ri)))] [else `(title)])] - [dir-depth (part-nesting-depth d ri)]) + [dir-depth (part-nesting-depth d ri)] + [extract (lambda (pred get) (extract-part-style-files + d + ri + (lambda (p) (part-whole-page? p ri)) + pred + get))]) (unless (bytes? style-file) (unless (lookup-path style-file alt-paths) (install-file style-file))) @@ -793,13 +807,9 @@ (let ([p (lookup-path style-file alt-paths)]) (unless p (install-file style-file)) (scribble-css-contents style-file p dir-depth)))) - (append (extract-part-style-files - d - ri - (lambda (p) (part-whole-page? p ri)) - css-addition? - css-addition-path) + (append (extract css-addition? css-addition-path) (list style-file) + (extract css-style-addition? css-style-addition-path) style-extra-files)) ,(scribble-js-contents script-file (lookup-path script-file alt-paths) @@ -811,12 +821,8 @@ (unless p (install-file script-file)) (scribble-js-contents script-file p dir-depth)))) (append - (extract-part-style-files - d - ri - (lambda (p) (part-whole-page? p ri)) - js-addition? - js-addition-path) + (extract js-addition? js-addition-path) + (extract js-style-addition? js-style-addition-path) (reverse extra-script-files))) ,(xml:comment "[if IE 6]> tr:first-child > td > .together { + border-top: 0px; /* erase border on first instance of together */ +} + +.RktBlk { + white-space: normal; + text-align: left; +} + +.highlighted { + font-size: 1rem; + background-color: #fee; +} + +.defmodule { + font-family: 'Source Code Pro'; + padding: 0.25rem 0.75rem 0.5rem 0.5rem; + margin-bottom: 1rem; + width: 100%; + background-color: hsl(60, 29%, 94%); +} + +.defmodule a { + color: #444; +} + +.defmodule td span.hspace:first-child { +position: absolute; + width: 0; +} + +.specgrammar { + float: none; + padding-left: 1em; +} + + +.RBibliography td { + vertical-align: text-top; + padding-top: 1em; +} + +.leftindent { + margin-left: 2rem; + margin-right: 0em; +} + +.insetpara { + margin-left: 1em; + margin-right: 1em; +} + +.SCodeFlow .Rfilebox { + margin-left: -1em; /* see 17.2 of guide, module languages */ +} + +.Rfiletitle { + text-align: right; + background-color: #eee; +} + +.SCodeFlow .Rfiletitle { + border-top: 1px dotted gray; + border-right: 1px dotted gray; +} + + +.Rfilename { + border-top: 0; + border-right: 0; + padding-left: 0.5em; + padding-right: 0.5em; + background-color: inherit; +} + +.Rfilecontent { + margin: 0.5em; +} + +.RpackageSpec { + padding-right: 0; +} + +/* ---------------------------------------- */ +/* For background labels */ + +.RBackgroundLabel { + float: right; + width: 0px; + height: 0px; +} + +.RBackgroundLabelInner { + position: relative; + width: 25em; + left: -25.5em; + top: 0.20rem; /* sensitive to monospaced font choice */ + text-align: right; + z-index: 0; + font-weight: 300; + font-family: 'Source Code Pro'; + font-size: 0.9rem; + color: gray; +} + + +.RpackageSpec .Smaller { + font-weight: 300; + font-family: 'Source Code Pro'; + font-size: 0.9rem; +} + +.RForeground { + position: relative; + left: 0px; + top: 0px; + z-index: 1; +} \ No newline at end of file diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-style.css b/pkgs/scribble-pkgs/scribble-lib/scribble/manual-style.css new file mode 100644 index 00000000..b76e7791 --- /dev/null +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/manual-style.css @@ -0,0 +1,721 @@ + +/* See the beginning of "scribble.css". + This file is used by the `scribble/manual` language, along with + "manual-racket.css". */ + +@import url("manual-fonts.css"); + +* { + margin: 0; + padding: 0; +} + +@media all {html {font-size: 15px;}} +@media all and (max-width:940px){html {font-size: 14px;}} +@media all and (max-width:850px){html {font-size: 13px;}} +@media all and (max-width:830px){html {font-size: 12px;}} +@media all and (max-width:740px){html {font-size: 11px;}} + +/* CSS seems backward: List all the classes for which we want a + particular font, so that the font can be changed in one place. (It + would be nicer to reference a font definition from all the places + that we want it.) + + As you read the rest of the file, remember to double-check here to + see if any font is set. */ + +/* Monospace: */ +.maincolumn, .refpara, .refelem, .tocset, .stt, .hspace, .refparaleft, .refelemleft { + font-family: 'Source Code Pro', monospace; + white-space: inherit; + font-size: 1rem; +} + +.stt { + font-weight: 500; +} + +h2 .stt { + font-size: 2.7rem; +} + +.toptoclink .stt { + font-size: inherit; +} +.toclink .stt { + font-size: 90%; +} + +.RpackageSpec .stt { + font-weight: 300; + font-family: 'Source Code Pro'; + font-size: 0.9rem; +} + +h3 .stt, h4 .stt, h5 .stt { + color: #333; + font-size: 1.65rem; + font-weight: 400; +} + + +/* Serif: */ +.main, .refcontent, .tocview, .tocsub, .sroman, i { + font-family: 'Charter', serif; + font-size: 1.18rem; +} + + +/* Sans-serif: */ +.version, .versionNoNav, .ssansserif { + font-family: 'Fira', sans-serif; +} +.ssansserif { + font-family: 'Fira'; + font-weight: 500; + font-size: 0.9em; +} + +.tocset .ssansserif { + font-size: 100%; +} + +/* ---------------------------------------- */ + +p, .SIntrapara { + display: block; + margin: 0 0 1em 0; + line-height: 140%; +} + + +li { + list-style-position: outside; + margin-left: 1.2em; +} + +h1, h2, h3, h4, h5, h6, h7, h8 { + font-family: 'Fira'; + font-weight: 300; + font-size: 1.6rem; + color: #333; + margin-top: inherit; + margin-bottom: 1rem; + line-height: 125%; + -moz-font-feature-settings: 'tnum=1'; + -moz-font-feature-settings: 'tnum' 1; + -webkit-font-feature-settings: 'tnum' 1; + -o-font-feature-settings: 'tnum' 1; + -ms-font-feature-settings: 'tnum' 1; + font-feature-settings: 'tnum' 1; + +} + +h3, h4, h5, h6, h7, h8 { + border-top: 1px solid black; +} + + + +h2 { /* per-page main title */ + font-family: 'Miso'; + font-weight: bold; + margin-top: 4rem; + font-size: 3rem; + line-height: 110%; + width: 90%; +} + +h3, h4, h5, h6, h7, h8 { + margin-top: 2em; + padding-top: 0.1em; + margin-bottom: 0.75em; +} + +/* ---------------------------------------- */ +/* Main */ + +body { + color: black; + background-color: white; +} + +.maincolumn { + width: auto; + margin-top: 4rem; + margin-left: 17rem; + margin-right: 2rem; + margin-bottom: 10rem; /* to avoid fixed bottom nav bar */ + max-width: 700px; + min-width: 370px; /* below this size, code samples don't fit */ +} + +a { + text-decoration: inherit; +} + +a, .toclink, .toptoclink, .tocviewlink, .tocviewselflink, .tocviewtoggle, .plainlink, +.techinside, .techoutside:hover, .techinside:hover { + color: #07A; +} + +a:hover { + text-decoration: underline; +} + + +/* ---------------------------------------- */ +/* Navigation */ + +.navsettop, .navsetbottom { + left: 0; + width: 15rem; + height: 6rem; + font-family: 'Fira'; + font-size: 0.9rem; + border-bottom: 0px solid hsl(216, 15%, 70%); + background-color: inherit; + padding: 0; +} + +.navsettop { + position: absolute; + top: 0; + left: 0; + margin-bottom: 0; + border-bottom: 0; +} + +.navsettop a, .navsetbottom a { + color: black; +} + +.navsettop a:hover, .navsetbottom a:hover { + background: hsl(216, 78%, 95%); + text-decoration: none; +} + +.navleft, .navright { + position: static; + float: none; + margin: 0; + white-space: normal; +} + + +.navleft a { + display: inline-block; +} + +.navright a { + display: inline-block; + text-align: center; +} + +.navleft a, .navright a, .navright span { + display: inline-block; + padding: 0.5rem; + min-width: 1rem; +} + + +.navright { + height: 2rem; + white-space: nowrap; +} + + +.navsetbottom { + display: none; +} + +.nonavigation { + color: #889; +} + +.searchform { + display: block; + margin: 0; + padding: 0; + border-bottom: 1px solid #eee; + height: 4rem; +} + +.searchbox { + font-size: 1rem; + width: 12rem; + margin: 1rem; + padding: 0.25rem; + vertical-align: middle; + background-color: white; +} + +#search_box { + font-size: 0.8rem; +} + +/* ---------------------------------------- */ +/* Version */ + +.versionbox { + position: absolute; + float: none; + top: 0.25rem; + left: 17rem; + z-index: 11000; + height: 2em; + font-size: 70%; + font-weight: lighter; + width: inherit; + margin: 0; +} +.version, .versionNoNav { + font-size: inherit; +} +.version:before, .versionNoNav:before { + content: "v."; +} + + +/* ---------------------------------------- */ +/* Margin notes */ + +/* cancel scribvle.css styles: */ +.refpara, .refelem { + position: static; + float: none; + height: auto; + width: auto; + margin: 0; +} + +.refcolumn { + position: static; + display: block; + width: auto; + font-size: inherit; + margin: 2rem; + margin-left: 2rem; + padding: 0.5em; + padding-left: 0.75em; + padding-right: 1em; + background: hsl(60, 29%, 94%); + border: 1px solid #ccb; + border-left: 0.4rem solid #ccb; +} + +.refcontent p { + line-height: 1.5rem; + margin: 0; +} + +.refcontent p + p { + margin-top: 1em; +} + +.refcontent a { + font-weight: 400; +} + +.refcontent img { + width: 1.5em; +} + +.refpara, .refparaleft { + top: -1em; +} + + +@media all and (max-width:600px) { + .refcolumn { + margin-left: 0; + margin-right: 0; + } +} + + +@media all and (min-width:1260px) { + .refcolumn { + position: absolute; + left: 66rem; right: 3em; + margin: 0; + float: right; + max-width: 18rem; + } +} + +.refcontent { + font-family: 'Fira'; + font-size: 1rem; + line-height: 160%; + margin: 0 0 0 0; +} + + +.refparaleft, .refelemleft { + position: relative; + float: left; + right: 2em; + height: 0em; + width: 13em; + margin: 0em 0em 0em -13em; +} + +.refcolumnleft { + background-color: hsl(60, 29%, 94%); + display: block; + position: relative; + width: 13em; + font-size: 85%; + border: 0.5em solid hsl(60, 29%, 94%); + margin: 0 0 0 0; +} + + +/* ---------------------------------------- */ +/* Table of contents, left margin */ + +.tocset { + position: absolute; + float: none; + left: 0; + top: 0rem; + width: 14rem; + padding: 7rem 0.5rem 0.5rem 0.5rem; + background-color: hsl(216, 15%, 70%); + margin: 0; + +} + +.tocset td { + vertical-align: text-top; + padding-bottom: 0.4rem; + padding-left: 0.2rem; + line-height: 110%; + font-family: 'Fira'; + -moz-font-feature-settings: 'tnum=1'; + -moz-font-feature-settings: 'tnum' 1; + -webkit-font-feature-settings: 'tnum' 1; + -o-font-feature-settings: 'tnum' 1; + -ms-font-feature-settings: 'tnum' 1; + font-feature-settings: 'tnum' 1; + +} + +.tocset td a { + color: black; + font-weight: 400; +} + + +.tocview { + text-align: left; + background-color: inherit; +} + + +.tocview td, .tocsub td { + line-height: 1.3em; +} + + +.tocview table, .tocsub table { + width: 90%; +} + +.tocset td a.tocviewselflink { + font-weight: lighter; + font-size: 110%; /* monospaced styles below don't need to enlarge */ + color: white; +} + +.tocviewselflink { + text-decoration: none; +} + +.tocsub { + text-align: left; + margin-top: 0.5em; + background-color: inherit; +} + +.tocviewlist, .tocsublist { + margin-left: 0.2em; + margin-right: 0.2em; + padding-top: 0.2em; + padding-bottom: 0.2em; +} +.tocviewlist table { + font-size: 82%; +} + +.tocviewlisttopspace { + margin-bottom: 1em; +} + +.tocviewsublist, .tocviewsublistonly, .tocviewsublisttop, .tocviewsublistbottom { + margin-left: 0.4em; + border-left: 1px solid #99a; + padding-left: 0.8em; +} +.tocviewsublist { + margin-bottom: 1em; +} +.tocviewsublist table, +.tocviewsublistonly table, +.tocviewsublisttop table, +.tocviewsublistbottom table, +table.tocsublist { + font-size: 1rem; +} + +.tocviewsublist td, .tocviewsublistbottom td, .tocviewsublisttop td, .tocsub td, +.tocviewsublistonly td { + font-size: 90%; +} + + +.tocviewtoggle { + font-size: 75%; /* looks better, and avoids bounce when toggling sub-sections due to font alignments */ +} + +.tocsublist td { + padding-left: 0.5rem; + padding-top: 0.25rem; + text-indent: 0; +} + +.tocsublinknumber { + font-size: 100%; +} + +.tocsublink { + font-size: 82%; + text-decoration: none; +} + +.tocsubseclink { + font-size: 100%; + text-decoration: none; +} + +.tocsubnonseclink { + font-size: 82%; + text-decoration: none; + margin-left: 1rem; + padding-left: 0; + display: inline-block; +} + +/* the label "on this page" */ +.tocsubtitle { + display: block; + font-size: 62%; + font-family: 'Fira'; + font-weight: bolder; + font-style: normal; + letter-spacing: 2px; + text-transform: uppercase; + margin: 0.5em; +} + +.toptoclink { + font-weight: bold; + font-size: 110% +} + +/* hack to add space around .toptoclink because markup is all td */ +.toptoclink:after { + content: " "; + font-size: 3rem; +} + +.toclink { + font-size: inherit; +} + +/* ---------------------------------------- */ +/* Some inline styles */ + +.indexlink { + text-decoration: none; +} + +pre { + margin-left: 0; +} +blockquote { + margin-left: 0; +} + +.SCodeFlow { + border-left: 1px dotted black; + padding-left: 1em; + padding-right: 1em; + margin-top: 1em; + margin-bottom: 1em; + margin-left: 0em; + margin-right: 2em; + white-space: nowrap; + line-height: 1.4em; +} + +.SCodeFlow img { + margin-top: 0.5em; + margin-bottom: 0.5em; +} + +.SVInsetFlow, .SIntrapara > table.RBoxed { + margin: 0; + margin-top: 2em; + padding: 0.25em; + padding-bottom: 0.5em; + background: #f3f3f3; + box-sizing:border-box; + border-top: 1px solid #99b; + background: hsl(216, 78%, 95%); + background: -moz-linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95%) 100%); + background: -webkit-linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95%) 100%); + background: -o-linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95%) 100%); + background: -ms-linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95%) 100%); + background: linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95%) 100%); + +} + +.leftindent .SVInsetFlow { /* see e.g. section 4.5 of Racket Guide */ + margin-top: 1em; + margin-bottom: 1em; +} + +.SVInsetFlow a, .SCodeFlow a { + color: #07A; + font-weight: 500; +} + +.SubFlow { + display: block; + margin: 0em; +} + +.boxed { + width: 100%; + background-color: inherit; +} + +.techoutside { text-decoration: none; } + +.SAuthorListBox { + position: static; + float: none; + font-family: 'Fira'; + font-weight: 300; + font-size: 110%; + margin-top: 1rem; + margin-bottom: 3rem; + width: auto; + height: auto; +} + +.author > a { /* email links within author block */ + font-weight: inherit; + color: inherit; +} + +.SAuthorList { + font-size: 82%; +} +.SAuthorList:before { + content: "by "; +} +.author { + display: inline; + white-space: nowrap; +} + +/* phone + tablet styles */ + +@media all and (max-width:720px){ + + + @media all and (max-width:720px){ + + @media all {html {font-size: 15px;}} + @media all and (max-width:700px){html {font-size: 14px;}} + @media all and (max-width:630px){html {font-size: 13px;}} + @media all and (max-width:610px){html {font-size: 12px;}} + @media all and (max-width:550px){html {font-size: 11px;}} + @media all and (max-width:520px){html {font-size: 10px;}} + + .navsettop, .navsetbottom { + display: block; + position: absolute; + width: 100%; + height: 4rem; + border: 0; + background-color: hsl(216, 15%, 70%); + } + + .searchform { + display: inline; + border: 0; + } + + .navright { + position: absolute; + right: 1.5rem; + margin-top: 1rem; + border: 0px solid red; + } + + .navsetbottom { + display: block; + margin-top: 8rem; + } + + .tocset { + display: none; + } + + .tocset table, .tocset tbody, .tocset tr, .tocset td { + display: inline; + } + + .tocview { + display: none; + } + + .tocsub .tocsubtitle { + display: none; + } + + .versionbox { + top: 4.5rem; + left: 1rem; /* same distance as main-column */ + z-index: 11000; + height: 2em; + font-size: 70%; + font-weight: lighter; + } + + + .maincolumn { + margin-left: 1em; + margin-top: 7rem; + margin-bottom: 0rem; + } + + } + +} + +/* print styles : hide the navigation elements */ +@media print { + .tocset, + .navsettop, + .navsetbottom { display: none; } + .maincolumn { + width: auto; + margin-right: 13em; + margin-left: 0; + } +} \ No newline at end of file diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/manual.rkt index dd2375ea..f8431f2a 100644 --- a/pkgs/scribble-pkgs/scribble-lib/scribble/manual.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/manual.rkt @@ -12,12 +12,14 @@ "private/manual-unit.rkt" "private/manual-vars.rkt" "private/manual-bind.rkt" - "private/manual-utils.rkt") + "private/manual-utils.rkt" + "private/manual-defaults.rkt") (provide unsyntax make-binding-redirect-elements defidentifier current-display-width + manual-doc-style (all-from-out "base.rkt" "private/manual-style.rkt" "private/manual-scheme.rkt" diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang.rkt index 990b784d..b7f7a83b 100644 --- a/pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang.rkt @@ -1,17 +1,12 @@ #lang scheme/base (require scribble/doclang scribble/manual - "../private/defaults.rkt") + scribble/html-properties + "../private/manual-defaults.rkt") (provide (except-out (all-from-out scribble/doclang) #%module-begin) (all-from-out scribble/manual) - (rename-out [module-begin #%module-begin])) + (rename-out [module-begin #%module-begin]) + manual-doc-style) (define-syntax-rule (module-begin id . body) (#%module-begin id post-process () . body)) - -(define (post-process doc) - (add-defaults doc - (scribble-file "manual-prefix.tex") - (scribble-file "manual-style.tex") - null - #t)) diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/defaults.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/defaults.rkt index 9474a7b1..c4b4be2a 100644 --- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/defaults.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/private/defaults.rkt @@ -1,6 +1,7 @@ #lang scheme/base (require scribble/core scribble/latex-properties + scribble/html-properties setup/collects) (provide scribble-file @@ -18,11 +19,18 @@ (define (downloaded-file s) (build-path (find-system-path 'addon-dir) s)) -(define (add-defaults doc pfx styl extras version?) +(define (add-defaults doc pfx styl extras version? + #:html [html #f] + #:properties [properties null]) (struct-copy part doc [style (make-style (style-name (part-style doc)) ((if version? add-property (lambda (x y z) x)) (add-property - (style-properties (part-style doc)) + ((if html add-property (lambda (x y z) x)) + (append + (style-properties (part-style doc)) + properties) + html-defaults? + html) latex-defaults? (make-latex-defaults pfx diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-defaults.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-defaults.rkt new file mode 100644 index 00000000..8daf1add --- /dev/null +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-defaults.rkt @@ -0,0 +1,24 @@ +#lang scheme/base +(require scribble/core + scribble/html-properties + "defaults.rkt") + +(provide post-process + manual-doc-style) + +(define (post-process doc) + (add-defaults doc + (scribble-file "manual-prefix.tex") + (scribble-file "manual-style.tex") + null + #:html (html-defaults (scribble-file "scribble-prefix.html") + (scribble-file "manual-style.css") + (list + (scribble-file "manual-fonts.css"))) + #:properties (list + (css-style-addition + (scribble-file "manual-racket.css"))) + #t)) + +(define manual-doc-style + (part-style (post-process (part #f null #f plain null null null)))) diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/racket.css b/pkgs/scribble-pkgs/scribble-lib/scribble/racket.css index 3db861e8..40a949e7 100644 --- a/pkgs/scribble-pkgs/scribble-lib/scribble/racket.css +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/racket.css @@ -1,64 +1,56 @@ + /* See the beginning of "scribble.css". */ /* Monospace: */ - .RktIn, .RktRdr, .RktPn, .RktMeta, .RktMod, .RktKw, .RktVar, .RktSym, .RktRes, .RktOut, .RktCmt, .RktVal, -.RktBlk, .RktErr { - font-family: 'Source Code Pro', monospace; +.RktBlk { + font-family: monospace; white-space: inherit; - font-size: 1rem; } -/* this selctor grabs the first linked Racket symbol -in a definition box (i.e., the symbol being defined) */ -a.RktValDef, a.RktStxDef, a.RktSymDef, -span.RktValDef, span.RktStxDef, span.RktSymDef -{ - font-size: 1.15rem; - color: black; - font-weight: 600; -} - - +/* Serif: */ .inheritedlbl { - font-family: 'Fira', sans; + font-family: serif; } +/* Sans-serif: */ +.RBackgroundLabelInner { + font-family: sans-serif; +} /* ---------------------------------------- */ /* Inherited methods, left margin */ .inherited { - width: 95%; + width: 100%; margin-top: 0.5em; text-align: left; + background-color: #ECF5F5; } .inherited td { font-size: 82%; - padding-left: 0.5rem; - line-height: 1.3em; + padding-left: 1em; + text-indent: -0.8em; + padding-right: 0.2em; } - +.inheritedlbl { + font-style: italic; +} /* ---------------------------------------- */ /* Racket text styles */ .RktIn { color: #cc6633; - background-color: #eee; + background-color: #eeeeee; } .RktInBG { - background-color: #eee; -} - - -.refcolumn .RktInBG { - background-color: white; + background-color: #eeeeee; } .RktRdr { @@ -73,7 +65,7 @@ span.RktValDef, span.RktStxDef, span.RktSymDef } .RktMod { -/* color: black; */ + color: black; } .RktOpt { @@ -82,73 +74,46 @@ span.RktValDef, span.RktStxDef, span.RktSymDef .RktKw { color: black; - /* font-weight: bold; */ } .RktErr { color: red; font-style: italic; - font-weight: 400; } .RktVar { -position: relative; -left: -1px; font-style: italic; - color: #444; + color: #262680; + font-style: italic; } -.SVInsetFlow .RktVar { - font-weight: 400; - color: #444; -} - - .RktSym { -/* color: #444; */ + color: #262680; } +.RktSymDef { /* used with RktSym at def site */ +} - -.RktValLink, .RktStxLink, .RktModLink { +.RktValLink { text-decoration: none; - color: #07A; - font-weight: 500; - font-size: 1rem; + color: blue; } -/* for syntax links within headings */ -h2 a.RktStxLink, h3 a.RktStxLink, h4 a.RktStxLink, h5 a.RktStxLink, -h2 a.RktValLink, h3 a.RktValLink, h4 a.RktValLink, h5 a.RktValLink, -h2 .RktSym, h3 .RktSym, h4 .RktSym, h5 .RktSym, -h2 .RktMod, h3 .RktMod, h4 .RktMod, h5 .RktMod, -h2 .RktVal, h3 .RktVal, h4 .RktVal, h5 .RktVal, -h2 .RktPn, h3 .RktPn, h4 .RktPn, h5 .RktPn { - color: #333; - font-size: 1.65rem; - font-weight: 400; +.RktValDef { /* used with RktValLink at def site */ } -.toptoclink .RktStxLink, .toclink .RktStxLink, -.toptoclink .RktValLink, .toclink .RktValLink, -.toptoclink .RktModLink, .toclink .RktModLink { - color: inherit; +.RktModLink { + text-decoration: none; + color: blue; } -.tocset .RktValLink, .tocset .RktStxLink, .tocset .RktModLink { - color: black; - font-weight: 400; - font-size: 0.9rem; +.RktStxLink { + text-decoration: none; + color: black; } -.tocset td a.tocviewselflink .RktValLink, -.tocset td a.tocviewselflink .RktStxLink, -.tocset td a.tocviewselflink .RktMod, -.tocset td a.tocviewselflink .RktSym { - font-weight: lighter; - color: white; +.RktStxDef { /* used with RktStxLink at def site */ } - .RktRes { color: #0000af; } @@ -168,13 +133,8 @@ h2 .RktPn, h3 .RktPn, h4 .RktPn, h5 .RktPn { /* ---------------------------------------- */ /* Some inline styles */ -.together { /* for definitions grouped together in one box */ +.together { width: 100%; - border-top: 2px solid white; -} - -tbody > tr:first-child > td > .together { - border-top: 0px; /* erase border on first instance of together */ } .prototype, .argcontract, .RBoxed { @@ -189,7 +149,7 @@ tbody > tr:first-child > td > .together { } .RktBlk { - white-space: normal; + white-space: inherit; text-align: left; } @@ -207,39 +167,24 @@ tbody > tr:first-child > td > .together { } .highlighted { - font-size: 1rem; - background-color: #fee; + background-color: #ddddff; } .defmodule { -font-family: 'Source Code Pro'; - padding: 0.25rem 0.75rem 0.5rem 0.5rem; - margin-bottom: 1rem; - width: 100%; - background-color: hsl(60, 29%, 94%); -} - -.defmodule a { - color: #444; -} - -.defmodule td span.hspace:first-child { -position: absolute; - width: 0; + width: 100%; + background-color: #F5F5DC; } .specgrammar { - padding-left: 1em; + float: right; } - .RBibliography td { vertical-align: text-top; - padding-top: 1em; } .leftindent { - margin-left: 2rem; + margin-left: 1em; margin-right: 0em; } @@ -248,30 +193,29 @@ position: absolute; margin-right: 1em; } -.SCodeFlow .Rfilebox { - margin-left: -1em; /* see 17.2 of guide, module languages */ +.Rfilebox { } .Rfiletitle { text-align: right; - background-color: #eee; + margin: 0em 0em 0em 0em; } -.SCodeFlow .Rfiletitle { - border-top: 1px dotted gray; - border-right: 1px dotted gray; -} - - .Rfilename { + border-top: 1px solid #6C8585; + border-right: 1px solid #6C8585; padding-left: 0.5em; padding-right: 0.5em; + background-color: #ECF5F5; } .Rfilecontent { - margin: 0.5em; + margin: 0em 0em 0em 0em; } +.RpackageSpec { + padding-right: 0.5em; +} /* ---------------------------------------- */ /* For background labels */ @@ -286,20 +230,11 @@ position: absolute; position: relative; width: 25em; left: -25.5em; - top: 0.20rem; /* sensitive to monospaced font choice */ + top: 0px; text-align: right; + color: white; z-index: 0; - font-weight: 300; - font-family: 'Source Code Pro'; - font-size: 0.9rem; - color: gray; -} - - -.RpackageSpec .Smaller { - font-weight: 300; - font-family: 'Source Code Pro'; - font-size: 0.9rem; + font-weight: bold; } .RForeground { @@ -307,4 +242,4 @@ position: absolute; left: 0px; top: 0px; z-index: 1; -} \ No newline at end of file +} diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble.css b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble.css index cb10f385..f34b7198 100644 --- a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble.css +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble.css @@ -1,20 +1,7 @@ -@import url("scribble-fonts.css"); - - - -* { -margin: 0; -padding: 0; -} - - - -@media all {html {font-size: 15px;}} -@media all and (max-width:940px){html {font-size: 14px;}} -@media all and (max-width:850px){html {font-size: 13px;}} -@media all and (max-width:830px){html {font-size: 12px;}} -@media all and (max-width:740px){html {font-size: 11px;}} +/* This file is used by default by all Scribble documents. + See also "manual.css", which is added by default by the + `scribble/manual` language. */ /* CSS seems backward: List all the classes for which we want a particular font, so that the font can be changed in one place. (It @@ -26,110 +13,38 @@ padding: 0; /* Monospace: */ .maincolumn, .refpara, .refelem, .tocset, .stt, .hspace, .refparaleft, .refelemleft { - font-family: 'Source Code Pro', monospace; - white-space: inherit; - font-size: 1rem; + font-family: monospace; } -.stt { - font-weight: 500; -} - -h2 .stt { - font-size: 2.7rem; -} - -.toptoclink .stt { - font-size: inherit; -} -.toclink .stt { - font-size: 90%; -} - -.RpackageSpec .stt { - font-weight: 300; - font-family: 'Source Code Pro'; - font-size: 0.9rem; -} - -h3 .stt, h4 .stt, h5 .stt { - color: #333; - font-size: 1.65rem; - font-weight: 400; -} - - /* Serif: */ .main, .refcontent, .tocview, .tocsub, .sroman, i { - font-family: 'Charter', serif; - font-size: 1.18rem; + font-family: serif; } - /* Sans-serif: */ .version, .versionNoNav, .ssansserif { - font-family: 'Fira', sans-serif; + font-family: sans-serif; } .ssansserif { - font-family: 'Fira'; - font-weight: 500; - font-size: 0.9em; + font-size: 80%; + font-weight: bold; } -.tocset .ssansserif { - font-size: 100%; } - /* ---------------------------------------- */ p, .SIntrapara { display: block; - margin: 0 0 1em 0; - line-height: 140%; + margin: 1em 0; } - -li { - list-style-position: outside; - margin-left: 1.2em; -} - -h1, h2, h3, h4, h5, h6, h7, h8 { - font-family: 'Fira'; - font-weight: 300; - font-size: 1.6rem; - color: #333; - margin-bottom: 1rem; - line-height: 125%; - -moz-font-feature-settings: 'tnum=1'; --moz-font-feature-settings: 'tnum' 1; --webkit-font-feature-settings: 'tnum' 1; --o-font-feature-settings: 'tnum' 1; --ms-font-feature-settings: 'tnum' 1; -font-feature-settings: 'tnum' 1; - -} - -h3, h4, h5, h6, h7, h8 { - border-top: 1px solid black; -} - - - h2 { /* per-page main title */ - font-family: 'Miso'; - font-weight: bold; - margin-top: 4rem; - font-size: 3rem; - line-height: 110%; - width: 90%; + margin-top: 0; } h3, h4, h5, h6, h7, h8 { - margin-top: 2em; - padding-top: 0.1em; - margin-bottom: 0.75em; - } - + margin-top: 1.75em; + margin-bottom: 0.5em; +} .SSubSubSubSection { font-weight: bold; @@ -148,8 +63,8 @@ table p { /* Main */ body { -color: black; - background-color: white; + color: black; + background-color: #ffffff; } table td { @@ -158,198 +73,133 @@ table td { } .maincolumn { - margin-top: 4rem; - margin-left: 17rem; - margin-right: 2rem; - margin-bottom: 10rem; /* to avoid fixed bottom nav bar */ - max-width: 700px; - min-width: 370px; /* below this size, code samples don't fit */ + width: 43em; + margin-right: -40em; + margin-left: 15em; } - -a { - color: #07A; - text-decoration: inherit; +.main { + text-align: left; } - -a:hover { - text-decoration: underline; -} - - /* ---------------------------------------- */ /* Navigation */ .navsettop, .navsetbottom { - left: 0; - width: 15rem; - height: 6rem; -font-family: 'Fira'; - font-size: 0.9rem; - border-bottom: 0px solid hsl(216, 15%, 70%); + background-color: #f0f0e0; + padding: 0.25em 0 0.25em 0; } .navsettop { - position: absolute; - top: 0; - left: 0; + margin-bottom: 1.5em; + border-bottom: 2px solid #e0e0c0; } -.navsettop a, .navsetbottom a { - color: black; -} - -.navsettop a:hover, .navsetbottom a:hover { - background: hsl(216, 78%, 95%); - text-decoration: none; -} - - -.navleft a { - display: inline-block; -} - - -.navright a { - display: inline-block; - text-align: center; -} - -.navleft a, .navright a, .navright span { - display: inline-block; - padding: 0.5rem; - min-width: 1rem; -} - - -.navright { - height: 2rem; - white-space: nowrap; -} - - .navsetbottom { - display: none; + margin-top: 2em; + border-top: 2px solid #e0e0c0; } +.navleft { + margin-left: 1ex; + position: relative; + float: left; + white-space: nowrap; +} +.navright { + margin-right: 1ex; + position: relative; + float: right; + white-space: nowrap; +} .nonavigation { - color: #889; + color: #e0e0e0; } .searchform { - display: fixed; + display: inline; margin: 0; padding: 0; - border-bottom: 1px solid #eee; - height: 4rem; } .searchbox { - font-size: 1rem; - width: 12rem; - margin: 1rem; - padding: 0.25rem; + width: 16em; + margin: 0px; + padding: 0px; + background-color: #eee; + border: 1px solid #ddd; + text-align: center; vertical-align: middle; } -#search_box { - font-size: 0.8rem; -} - #contextindicator { position: fixed; background-color: #c6f; color: #000; font-family: monospace; font-weight: bold; - padding: 0.1rem 0.5rem; + padding: 2px 10px; display: none; right: 0; bottom: 0; } - /* ---------------------------------------- */ /* Version */ .versionbox { - position: absolute; - top: 0.25rem; - left: 17rem; - z-index: 11000; - height: 2em; - font-size: 70%; - font-weight: lighter; + position: relative; + float: right; + left: 2em; + height: 0em; + width: 13em; + margin: 0em -13em 0em 0em; } -.version:before, .versionNoNav:before { - content: "v."; +.version { + font-size: small; +} +.versionNoNav { + font-size: xx-small; /* avoid overlap with author */ } +.version:before, .versionNoNav:before { + content: "Version "; +} /* ---------------------------------------- */ /* Margin notes */ -.refcolumn { - display: block; - margin: 2rem; - margin-left: 2rem; - padding: 0.5em; - padding-left: 0.75em; - padding-right: 1em; - background: hsl(60, 29%, 94%); - border: 1px solid #ccb; - border-left: 0.4rem solid #ccb; -} - - -.refcontent p { - line-height: 1.5rem; - margin: 0; -} - -.refcontent p + p { - margin-top: 1em; -} - -.refcontent a { - font-weight: 400; -} - -.refcontent img { - width: 1.5em; +.refpara, .refelem { + position: relative; + float: right; + left: 2em; + height: 0em; + width: 13em; + margin: 0em -13em 0em 0em; } .refpara, .refparaleft { top: -1em; } - -@media all and (max-width:600px) { - .refcolumn { - margin-left: 0; - margin-right: 0; - } -} - - -@media all and (min-width:1260px) { - .refcolumn { - position: absolute; - left: 66rem; right: 3em; - margin: 0; - float: right; - max-width: 18rem; - } -} - -.refcontent { - font-family: 'Fira'; - font-size: 1rem; - line-height: 160%; +.refcolumn { + background-color: #F5F5DC; + display: block; + position: relative; + width: 13em; + font-size: 85%; + border: 0.5em solid #F5F5DC; margin: 0 0 0 0; } +.refcontent { + margin: 0 0 0 0; +} + +.refcontent p { + margin-top: 0; + margin-bottom: 0; +} .refparaleft, .refelemleft { position: relative; @@ -361,76 +211,53 @@ font-family: 'Fira'; } .refcolumnleft { - background-color: hsl(60, 29%, 94%); + background-color: #F5F5DC; display: block; position: relative; width: 13em; font-size: 85%; - border: 0.5em solid hsl(60, 29%, 94%); + border: 0.5em solid #F5F5DC; margin: 0 0 0 0; } +/* ---------------------------------------- */ +/* Table of contents, inline */ + +.toclink { + text-decoration: none; + color: blue; + font-size: 85%; +} + +.toptoclink { + text-decoration: none; + color: blue; + font-weight: bold; +} + /* ---------------------------------------- */ /* Table of contents, left margin */ .tocset { - position: absolute; - left: 0; - top: 0rem; - width: 14rem; - padding: 7rem 0.5rem 0.5rem 0.5rem; -background-color: hsl(216, 15%, 70%); - + position: relative; + float: left; + width: 12.5em; + margin-right: 2em; } - - - .tocset td { - vertical-align: text-top; - padding-bottom: 0.4rem; - padding-left: 0.2rem; - line-height: 110%; - font-family: 'Fira'; - -moz-font-feature-settings: 'tnum=1'; --moz-font-feature-settings: 'tnum' 1; --webkit-font-feature-settings: 'tnum' 1; --o-font-feature-settings: 'tnum' 1; --ms-font-feature-settings: 'tnum' 1; -font-feature-settings: 'tnum' 1; - + vertical-align: text-top; } -.tocset td a { - color: black; - font-weight: 400; -} - - .tocview { text-align: left; + background-color: #f0f0e0; } - -.tocview td, .tocsub td { - line-height: 1.3em; -} - - -.tocview table, .tocsub table { - width: 90%; -} - -.tocset td a.tocviewselflink { - font-weight: lighter; - font-size: 110%; /* monospaced styles below don't need to enlarge */ - color: white; -} - - .tocsub { text-align: left; margin-top: 0.5em; + background-color: #f0f0e0; } .tocviewlist, .tocsublist { @@ -449,7 +276,7 @@ font-feature-settings: 'tnum' 1; .tocviewsublist, .tocviewsublistonly, .tocviewsublisttop, .tocviewsublistbottom { margin-left: 0.4em; - border-left: 1px solid #99a; + border-left: 1px solid #bbf; padding-left: 0.8em; } .tocviewsublist { @@ -458,28 +285,37 @@ font-feature-settings: 'tnum' 1; .tocviewsublist table, .tocviewsublistonly table, .tocviewsublisttop table, -.tocviewsublistbottom table, -table.tocsublist { - font-size: 1rem; +.tocviewsublistbottom table { + font-size: 75%; } -.tocviewsublist td, .tocviewsublistbottom td, .tocviewsublisttop td, .tocsub td, -.tocviewsublistonly td { - font-size: 90%; +.tocviewtitle * { + font-weight: bold; } +.tocviewlink { + text-decoration: none; + color: blue; +} + +.tocviewselflink { + text-decoration: underline; + color: blue; +} .tocviewtoggle { + text-decoration: none; + color: blue; font-size: 75%; /* looks better, and avoids bounce when toggling sub-sections due to font alignments */ } .tocsublist td { - padding-left: 0.5rem; - padding-top: 0.25rem; + padding-left: 1em; + text-indent: -1em; } .tocsublinknumber { - font-size: 100%; + font-size: 82%; } .tocsublink { @@ -488,40 +324,22 @@ table.tocsublist { } .tocsubseclink { - font-size: 100%; + font-size: 82%; text-decoration: none; } .tocsubnonseclink { font-size: 82%; text-decoration: none; - margin-left: 1rem; - display: inline-block; + padding-left: 0.5em; } -/* the label "on this page" */ .tocsubtitle { - display: block; - font-size: 62%; - font-family: 'Fira'; - font-weight: bolder; - letter-spacing: 2px; - text-transform: uppercase; - margin: 0.5em; + font-size: 82%; + font-style: italic; + margin: 0.2em; } -.toptoclink { - font-weight: bold; - font-size: 110% -} - -/* hack to add space around .toptoclink because markup is all td */ -.toptoclink:after { - content: " "; - font-size: 3rem; -} - - /* ---------------------------------------- */ /* Some inline styles */ @@ -533,12 +351,8 @@ table.tocsublist { white-space: nowrap; } -pre { -/* margin-left: 2em; */ -} -blockquote { -/* margin-left: 2em; */ - } +pre { margin-left: 2em; } +blockquote { margin-left: 2em; } ol { list-style-type: decimal; } ol ol { list-style-type: lower-alpha; } @@ -546,52 +360,22 @@ ol ol ol { list-style-type: lower-roman; } ol ol ol ol { list-style-type: upper-alpha; } .SCodeFlow { -border-left: 1px dotted black; - padding-left: 1em; - padding-right: 1em; - margin-top: 1em; - margin-bottom: 1em; - margin-left: 0em; - margin-right: 2em; - white-space: nowrap; - line-height: 1.4em; + display: block; + margin-left: 1em; + margin-bottom: 0em; + margin-right: 1em; + margin-top: 0em; + white-space: nowrap; } -.SCodeFlow img { - margin-top: 0.5em; - margin-bottom: 0.5em; +.SVInsetFlow { + display: block; + margin-left: 0em; + margin-bottom: 0em; + margin-right: 0em; + margin-top: 0em; } - - -.SVInsetFlow, .SIntrapara > table.RBoxed { - margin-top: 2em; - padding: 0.25em; - padding-bottom: 0.5em; - background: #f3f3f3; - box-sizing:border-box; - border-top: 1px solid #99b; -background: hsl(216, 78%, 95%); -background: -moz-linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95%) 100%); -background: -webkit-linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95%) 100%); -background: -o-linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95%) 100%); -background: -ms-linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95%) 100%); -background: linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95%) 100%); - -} - -.leftindent .SVInsetFlow { /* see e.g. section 4.5 of Racket Guide */ - margin-top: 1em; - margin-bottom: 1em; -} - -.SVInsetFlow a, .SCodeFlow a { - color: #07A; - font-weight: 500; -} - - - .SubFlow { display: block; margin: 0em; @@ -599,6 +383,7 @@ background: linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95 .boxed { width: 100%; + background-color: #E8E8FF; } .hspace { @@ -614,8 +399,19 @@ background: linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95 } .plainlink { + text-decoration: none; + color: blue; } +.techoutside { text-decoration: underline; color: #b0b0b0; } +.techoutside:hover { text-decoration: underline; color: blue; } + +/* .techinside:hover doesn't work with FF, .techinside:hover> + .techinside doesn't work with IE, so use both (and IE doesn't + work with inherit in the second one, so use blue directly) */ +.techinside { color: black; } +.techinside:hover { color: blue; } +.techoutside:hover>.techinside { color: inherit; } .SCentered { text-align: center; @@ -636,13 +432,12 @@ background: linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95 /* A hack, inserted to break some Scheme ids: */ .mywbr { -display: inline-block; -height: 0; - width: 0; - font-size: 1px; + display: inline-block; + height: 0; + width: 0; + font-size: 1px; } - .compact li p { margin: 0em; padding: 0em; @@ -653,18 +448,14 @@ height: 0; } .SAuthorListBox { - font-family: 'Fira'; - font-weight: 300; - font-size: 110%; - margin-top: 1rem; - margin-bottom: 3rem; + position: relative; + float: right; + left: 2em; + top: -2.5em; + height: 0em; + width: 13em; + margin: 0em -13em 0em 0em; } - -.author > a { /* email links within author block */ - font-weight: inherit; - color: inherit; -} - .SAuthorList { font-size: 82%; } @@ -676,82 +467,6 @@ height: 0; white-space: nowrap; } -/* phone + tablet styles */ - -@media all and (max-width:720px){ - - - @media all and (max-width:720px){ - - @media all {html {font-size: 15px;}} -@media all and (max-width:700px){html {font-size: 14px;}} -@media all and (max-width:630px){html {font-size: 13px;}} -@media all and (max-width:610px){html {font-size: 12px;}} -@media all and (max-width:550px){html {font-size: 11px;}} -@media all and (max-width:520px){html {font-size: 10px;}} - - .navsettop, .navsetbottom { - display: block; - position: absolute; - width: 100%; - height: 4rem; - border: 0; - background-color: hsl(216, 15%, 70%); - } - - .searchform { - display: inline; - border: 0; - } - - .navright { - position: absolute; - right: 1.5rem; - margin-top: 1rem; - border: 0px solid red; - } - - .navsetbottom { - display: block; - margin-top: 8rem; - } - - .tocset { - display: none; -} - - .tocset table, .tocset tbody, .tocset tr, .tocset td { - display: inline; - } - - .tocview { - display: none; - } - - .tocsub .tocsubtitle { - display: none; - } - - .versionbox { - top: 4.5rem; - left: 1rem; /* same distance as main-column */ - z-index: 11000; - height: 2em; - font-size: 70%; - font-weight: lighter; - } - - - .maincolumn { - margin-left: 1em; - margin-top: 7rem; - margin-bottom: 0rem; - } - - -} - - /* print styles : hide the navigation elements */ @media print { .tocset, @@ -762,4 +477,4 @@ height: 0; margin-right: 13em; margin-left: 0; } -} \ No newline at end of file +}