(.*?)

From 85735008e32130aa4c0d903b9d544670e35f6e63 Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Wed, 1 Oct 2008 18:21:17 +0200 Subject: [PATCH] Docs: Add Kurt Kroon's design for testing, auto-insert CSS in deve/index pages --- Documentation/de/index.html.in | 5 - Documentation/devel.html.in | 5 - Documentation/es/index.html.in | 5 - Documentation/fr/index.html.in | 5 - Documentation/index.html.in | 5 - Documentation/lilypond-blue.css | 370 +++++++++++++++++++++++++++++++ buildscripts/postprocess_html.py | 11 +- lilypond-texi2html.init | 3 +- 8 files changed, 381 insertions(+), 28 deletions(-) create mode 100644 Documentation/lilypond-blue.css diff --git a/Documentation/de/index.html.in b/Documentation/de/index.html.in index e0893a9006..72543683a1 100644 --- a/Documentation/de/index.html.in +++ b/Documentation/de/index.html.in @@ -12,11 +12,6 @@ - - - diff --git a/Documentation/devel.html.in b/Documentation/devel.html.in index 9fcaeb54a1..daab2f9eb1 100644 --- a/Documentation/devel.html.in +++ b/Documentation/devel.html.in @@ -12,11 +12,6 @@ - - - diff --git a/Documentation/es/index.html.in b/Documentation/es/index.html.in index 809aae0dc9..8306276def 100644 --- a/Documentation/es/index.html.in +++ b/Documentation/es/index.html.in @@ -12,11 +12,6 @@ - - - diff --git a/Documentation/fr/index.html.in b/Documentation/fr/index.html.in index 085f03da72..eff5e7f7b4 100644 --- a/Documentation/fr/index.html.in +++ b/Documentation/fr/index.html.in @@ -12,11 +12,6 @@ - - - diff --git a/Documentation/index.html.in b/Documentation/index.html.in index f7cfe4d472..c5c6af483f 100644 --- a/Documentation/index.html.in +++ b/Documentation/index.html.in @@ -12,11 +12,6 @@ - - - diff --git a/Documentation/lilypond-blue.css b/Documentation/lilypond-blue.css new file mode 100644 index 0000000000..a2e93c3c62 --- /dev/null +++ b/Documentation/lilypond-blue.css @@ -0,0 +1,370 @@ +/**********************************************************/ +/* PAGE-WIDE SETTINGS */ +/**********************************************************/ + +html { + height: 100%; +} + +body { + background-color: white; + color: black; + font-size: 80%; + height: 100%; + line-height: 1.25em; + margin: 0 auto; + padding: 0; +} + + +/***********************************************************/ +/* HEADERS */ +/***********************************************************/ + +.chapter, .section, .subsection, +.appendix, .appendixsec, .appendixsubsec, +.unnumberedsubsubsec, .subsubheading, +.unnumbered, .subheading { + border-bottom: 1px dashed black; + color: #204a87; + padding-bottom: 0.4em; + margin-bottom: 1em; + margin-top: 1em; +} + +.settitle { + background-color: #eef; + border-bottom: 1px solid #3465A4; + font-size: 2em; + margin: 0.25em 0 0 0; + padding: 0.75em; + text-align: center; +} + +.chapter { + font-size: 1.8em; +} + +.section { + font-size: 1.6em; +} + +.subsection { + font-size: 1.4em; +} + +.unnumberedsubsubsec { + font-size: 1.25em; +} + +.subsubheading { + font-size: 1em; + font-weight: bold; +} + +/***********************************************************/ +/* LINKS */ +/***********************************************************/ + +a:link { + /* color: #4169e1; */ + /* color: #3555b6; */ + color: #3465a4; +} + +a:visited { + color: #8f5902; +} + +a:hover { + color: #ce5c00; +} + +a:active { + color: #73d216; +} + +/***********************************************************/ +/* BLOCK FORMATTING */ +/***********************************************************/ + +blockquote { + border: thin solid #3465a4; + border-width: 0 0 0 2px; + margin: 1em 0 1em 3em; + padding: 0; +} + +blockquote p { + margin: 0; + padding: 1em; +} + +blockquote blockquote { + border: thick red dashed; +} + +.verbatim, .example .example, .lisp { + font-size: 1em; + margin: 0; + padding: 1em; +} + +.example { + padding: 0; + margin: 0; +} + +hr { + height: 0; + padding: 0; + border: 0; + margin: 0; + text-indent: -999em; +} + +table.cartouche { + background: #eee; + border: 1px solid #3465a4; + border-width: 1px 0; + width: 85%; + padding: 0 0.5em; + margin: 0 auto; +} + +table.cartouche p { + padding: 1em; + margin: 0; +} + +table.cartouche td { + border: none; +} + +/***********************************************************/ +/* MAIN CONTENT */ +/***********************************************************/ + +div#main { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 27%; + padding: 0; + margin: 0; + overflow: auto; +} + +div#main li { + padding: 0 1em 0.5em 0; +} + +div#main ul { + margin: 0; +} + +h1, h2, h3, h4, p, table, address, dt { + padding-left: 1em; + padding-right: 1em; +} + +p { + margin: 1em 0; +} + +#languages { + margin: 0; + padding: 1em; +} + +pre.menu-comment { + font-size: 1em; + padding-top: 1em; + padding-bottom: 0; + margin: 0; +} + +/***********************************************************/ +/* TOC SIDEBAR */ +/***********************************************************/ + +div#tocframe { + position: absolute; + top: 0; + right: 73%; + bottom: 0; + left: 0; + padding: 0; + margin: 0; + overflow: auto; + background-color: #f9f9ff; + z-index: 100; + list-style-type: none; + font-size: 0.83em; + line-height: 1.4em; +} + +/* position: fixed for savvy browsers */ + +@media screen { + body > div#tocframe { + position: fixed + } +} + +/* +#tocframe a:link, #tocframe a:visited { + text-decoration: none; +} + +#tocframe a:hover { + text-decoration: underline; +} +*/ + +div#tocframe h4 { + font-size: 1.2em; + font-weight: normal; + color: #344; + background-color: #eef; + padding: 2px 0 1px 1em; + border-bottom: 1px solid #3465A4; + margin: 0; +} + +#tocframe .contents { + background-color: transparent; + list-style-type: none; + padding: 0; + border: 0; + margin: 0; +} + +#tocframe ul.toc { + padding: 1em 0.5em; + list-style-type: none; + margin: 0; +} + +#tocframe ul.toc ul.toc { + padding: 0; + margin: 0; +} + +#tocframe ul.toc li { + padding: 0; + margin: 0; +} + +#tocframe ul.toc > li { + font-size: 1em; +} + +#tocframe ul.toc li li { + padding-left: 1em; +} + +li.toc_current { + font-weight: bold; + font-style: italic; +} + +li.toc_current ul { + font-weight: normal; + font-style: normal; + background: transparent; +} + + +/***********************************************************/ +/* NAVIGATION */ +/***********************************************************/ + +.nav_table { + background-color: #eef; + border: 1px solid #3465A4; + border-width: 0 0 1px 0; + font-size: 0.8em; + margin: 0; + padding: 0; + width: 100%; +} + +div.header { + background-color: #be6; + text-align: center; + padding: 0.5em; + margin: 0; + height: auto; +} + +div.header h1 { + padding: 0.5em; + margin: 0; +} + +div.subheader { + background-color: #ddd; + padding: 0; + border-top: 5px solid #899; + border-bottom: 1px solid #9aa; + margin: 0; + text-align: center; +} + +div.subheader p { + padding: 0.5em; + margin: 0; +} + +table#navigation { + line-height: 1.5; + padding: 0; + margin: 1em auto; +} + +table#navigation td { + padding: 0.5em 0.75em; +} + +table#navigation ul { + padding-left: 0.5em; + margin-bottom: 1em; +} + +table .title { + font-weight: bold; +} + +.footer { + background-color: #fff; + border: none; + font-size: 0.8em; + text-indent: 1em; + padding: 1.5em 0; + margin: 0; +} + +.footer p { + line-height: 1.5; + padding: 0; + margin: 0 0.25em; +} + +table.menu { + margin: 0 0 1em; +} + +/***********************************************************/ +/* OVERRIDES FOR PRINTING */ +/***********************************************************/ + +@media print { + body { padding-left: 0; font: 10pt Georgia, Garamond, serif;} + /* Hide the sidebar: */ + #tocframe { display: none; } + .nav_table { display: none; } + /* Let #main expand to fill the new space */ + div#main { position: static; left: 0; } +} diff --git a/buildscripts/postprocess_html.py b/buildscripts/postprocess_html.py index 63416e4b71..a3302c98e4 100644 --- a/buildscripts/postprocess_html.py +++ b/buildscripts/postprocess_html.py @@ -125,7 +125,14 @@ doctype_re = re.compile ('(?i)\n' css_re = re.compile ('(?i)]*)href="[^">]*?lilypond.*\.css"([^>]*)>') end_head_tag_re = re.compile ('(?i)') -css_link = '\n' +css_link = """ + + + +""" + def add_header (s, prefix): """Add header (, doctype and CSS)""" @@ -144,7 +151,7 @@ def add_header (s, prefix): if css_re.search (s) == None: depth = (prefix.count ('/') - 1) * '../' - s = end_head_tag_re.sub ((css_link % depth) + '', s) + s = end_head_tag_re.sub ((css_link % {'rel': depth}) + '', s) return s title_tag_re = re.compile ('.*?(.*?)', re.DOTALL) diff --git a/lilypond-texi2html.init b/lilypond-texi2html.init index e64a3606c4..8587ca76e5 100644 --- a/lilypond-texi2html.init +++ b/lilypond-texi2html.init @@ -77,7 +77,8 @@ package Texi2HTML::Config; {FILENAME => "lilypond-mccarty.css", TITLE => "Patrick McCarty's design"} ); @Texi2HTML::Config::ALT_CSS_REFS = ( - {FILENAME => "lilypond.css", TITLE => "Andrew Hawryluk's design" } + {FILENAME => "lilypond.css", TITLE => "Andrew Hawryluk's design" }, + {FILENAME => "lilypond-blue.css", TITLE => "Kurt Kroon's blue design" }, ); $Texi2HTML::Config::USE_ACCESSKEY = 1; $Texi2HTML::Config::USE_LINKS = 1; -- 2.39.2