]> git.donarmstrong.com Git - lilypond.git/commitdiff
Docs: Add Kurt Kroon's design for testing, auto-insert CSS in deve/index pages
authorReinhold Kainhofer <reinhold@kainhofer.com>
Wed, 1 Oct 2008 16:21:17 +0000 (18:21 +0200)
committerReinhold Kainhofer <reinhold@kainhofer.com>
Wed, 1 Oct 2008 16:22:39 +0000 (18:22 +0200)
Documentation/de/index.html.in
Documentation/devel.html.in
Documentation/es/index.html.in
Documentation/fr/index.html.in
Documentation/index.html.in
Documentation/lilypond-blue.css [new file with mode: 0644]
buildscripts/postprocess_html.py
lilypond-texi2html.init

index e0893a90061eab04f7a7f6e1d5dbe1cf15e22c89..72543683a16bf3f3afbb242cf3550ea8c5ac8002 100644 (file)
     <meta name="description"
           content="Allgemeiner Index der Standard-Dokumentation f&uuml;r
                    LilyPond @TOPLEVEL_VERSION@">
-<link rel="stylesheet" type="text/css" href="lilypond.css" title="Default Style">
-<link rel="alternate stylesheet" type="text/css" title="Patrick McCarty's design" href="lilypond-mccarty.css">
-<!--[if lte IE 7]>
-<link href="lilypond-ie-fixes.css" rel="stylesheet" type="text/css">
-<![endif]-->
   </head>
   
   <body>
index 9fcaeb54a1575db59479a1898eff42dd9e1d3bc1..daab2f9eb152a442414b8971382e7d0b5c9e18d5 100644 (file)
     <meta name="description"
           content="Top-level index to developers documentation for
                    LilyPond @TOPLEVEL_VERSION@">
-<link rel="stylesheet" type="text/css" href="lilypond.css" title="Default Style">
-<link rel="alternate stylesheet" type="text/css" title="Patrick McCarty's design" href="lilypond-mccarty.css">
-<!--[if lte IE 7]>
-<link href="lilypond-ie-fixes.css" rel="stylesheet" type="text/css">
-<![endif]-->
   </head>
   
   <body>
index 809aae0dc9b63f95c929d4fa83405c688d578672..8306276def91d3204b8991dacf67aba4b3820d47 100644 (file)
     <meta name="description"
           content="Top-level index to the standard documentation for
                    LilyPond @TOPLEVEL_VERSION@">
-<link rel="stylesheet" type="text/css" href="lilypond.css" title="Default Style">
-<link rel="alternate stylesheet" type="text/css" title="Patrick McCarty's design" href="lilypond-mccarty.css">
-<!--[if lte IE 7]>
-<link href="lilypond-ie-fixes.css" rel="stylesheet" type="text/css">
-<![endif]-->
   </head>
 
   <body>
index 085f03da723c628c6073b676194712ad9e379d58..eff5e7f7b44e2b7b99e7a557c1c007e6934f867a 100644 (file)
     <meta name="description"
           content="Top-level index to the standard documentation for
                    LilyPond @TOPLEVEL_VERSION@">
-<link rel="stylesheet" type="text/css" href="lilypond.css" title="Default Style">
-<link rel="alternate stylesheet" type="text/css" title="Patrick McCarty's design" href="lilypond-mccarty.css">
-<!--[if lte IE 7]>
-<link href="lilypond-ie-fixes.css" rel="stylesheet" type="text/css">
-<![endif]-->
   </head>
   
   <body>
index f7cfe4d47236d9e02659674ca5eb50dafe92bf2f..c5c6af483f945322c8becc6703d1e99592ae9f97 100644 (file)
     <meta name="description"
           content="Top-level index to the standard documentation for
                    LilyPond @TOPLEVEL_VERSION@">
-<link rel="stylesheet" type="text/css" href="lilypond.css" title="Default Style">
-<link rel="alternate stylesheet" type="text/css" title="Patrick McCarty's design" href="lilypond-mccarty.css">
-<!--[if lte IE 7]>
-<link href="lilypond-ie-fixes.css" rel="stylesheet" type="text/css">
-<![endif]-->
   </head>
   
   <body>
diff --git a/Documentation/lilypond-blue.css b/Documentation/lilypond-blue.css
new file mode 100644 (file)
index 0000000..a2e93c3
--- /dev/null
@@ -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; }
+}
index 63416e4b713ce6023e36cc7cce6a5cf8f5c0b21a..a3302c98e48130a93e3de80aa768712bffa1f1be 100644 (file)
@@ -125,7 +125,14 @@ doctype_re = re.compile ('(?i)<!DOCTYPE')
 doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">\n'
 css_re = re.compile ('(?i)<link rel="stylesheet" type="text/css" ([^>]*)href="[^">]*?lilypond.*\.css"([^>]*)>')
 end_head_tag_re = re.compile ('(?i)</head>')
-css_link = '<link rel="stylesheet" type="text/css" href="%sDocumentation/lilypond.css">\n'
+css_link = """    <link rel="stylesheet" type="text/css" title="Patrick McCarty's design" href="%(rel)sDocumentation/lilypond-mccarty.css">
+    <link rel="alternate stylesheet" type="text/css" href="%(rel)sDocumentation/lilypond.css" title="Andrew Hawryluk's design">
+    <link rel="alternate stylesheet" type="text/css" href="%(rel)sDocumentation/lilypond-blue.css" title="Kurt Kroon's blue design">
+    <!--[if lte IE 7]>
+    <link href="%(rel)sDocumentation/lilypond-ie-fixes.css" rel="stylesheet" type="text/css">
+    <![endif]-->
+"""
+
 
 def add_header (s, prefix):
     """Add header (<body>, 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) + '</head>', s)
+            s = end_head_tag_re.sub ((css_link % {'rel': depth}) + '</head>', s)
     return s
 
 title_tag_re = re.compile ('.*?<title>(.*?)</title>', re.DOTALL)
index e64a3606c4f568f88caaa3a119d5c5765b8d56d1..8587ca76e5e63292495c6795380872bb665e7a1a 100644 (file)
@@ -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;