Add some css and an xsl transformation to make the admonitions look much better.

Add css to adjust the width, padding and borders of the table.

Add a manual_style.svg file that I was using to compare colors etc, might come
in handy.

git-svn-id: svn://localhost/ardour2/trunk@1419 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/manual/css/ardour_manual.css b/manual/css/ardour_manual.css
index 0e49a345148ef933c15757cc48ce27c8377a387d..cfe7a54b7f5ba9c31c401528d25e8a14f9142c1d 100644 (file)
--- a/manual/css/ardour_manual.css
+++ b/manual/css/ardour_manual.css
@@ -2,8 +2,8 @@
 body {
        background-color: white;
        margin:0 auto;
-       font-family: "Bitstream Vera Sans","Lucida Grande", verdana, "Luxi Sans","Trebuchet MS", helvetica,verdana,arial,sans-serif;
-       font-size:12px;
+       font-family: "Bitstream Vera Sans","Lucida Grande", "Luxi Sans", verdana, "Trebuchet MS", helvetica,verdana,arial,sans-serif;
+       font-size:9pt;
        max-width:55em;
        padding:2em;
        color:#333;
@@ -12,10 +12,13 @@ body {
 
 /* Links */
 
+/* these colors need work */
+
 a:link {
        color:#7f83a4;
 }
 
+/* This is too light */
 a:visited {
        color:#adabc8;
 }
@@ -34,19 +37,91 @@ img {
 
 
 .screen {
-       background-color:#dddddd;
-       color:#333333;
+       background-color:#d5d1b9;
+       color:#333;
 }
 
-pre,code{ 
+pre,code { 
        padding:.3em 1em;
        font-size:0.9em;
        font-family:"Bitstream vera mono",monospace;
 }
 
+pre {
+       display:block;
+       overflow:auto;
+}
+
+code {
+       white-space:nowrap;
+       background-color:#bbb;
+       color:#222;
+}
+
+.command,
+.filename,
+.literal,
+.option {
+       font-weight:bold;
+}
+
+/* Admonitions */
+div.note,
+div.tip,
+div.important,
+div.caution,
+div.warning {
+       background: #27272b url(images/admon-bg.png) top left repeat;
+       color:white;
+       padding:0.8em;
+       margin-bottom:1.5em;
+}
+
+div.note .title,
+div.tip .title,
+div.important .title,
+div.caution .title,
+div.warning .title {
+       font-size:1.3em;
+       color: white;
+}
+
+div.note p,
+div.tip p,
+div.caution p,
+div.warning p,
+div.important p {
+       padding-left:0.5em;
+}
+
+/* Tables */
+
+table {
+       width:100%;
+       border-right:1px solid #aaa;
+       border-collapse:collapse;
+       border-top:1px solid #aaa;
+       border-left:1px solid #aaa;
+       border-bottom:1px solid #aaa;
+}
+
+table th {
+       padding:.2em .5em;
+}
+
+table td {
+       padding:.10em .5em;
+}
+
+table,td,th {
+       border-color:#777 !important;
+}
+
 /* Headings */
 
+
 h1,h2,h3,h4,h5,h6 {
+       /* this color is too purpley */
        color:#565690;
        line-height:130%;
        margin-top:0em;
@@ -75,8 +150,3 @@ h5.formalpara {
        font-size:1em;
        margin-top:2em;
 }
-
-/* Element rules*/
-hr{border-collapse: collapse;border-style:none;border-top: 1px dotted #ccc;width:100% !important;}
-sup{color:#999;}
-

diff --git a/manual/images/admon-bg.png b/manual/images/admon-bg.png
new file mode 100644 (file)
index 0000000..37406fa
Binary files /dev/null and b/manual/images/admon-bg.png differ

diff --git a/manual/images/manual_style.svg b/manual/images/manual_style.svg
new file mode 100644 (file)
index 0000000..86f03ad
--- /dev/null
+++ b/manual/images/manual_style.svg
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   sodipodi:docbase="/home/timbyr/devel/ardour/svn/trunk/manual"
+   sodipodi:docname="ardour-brand.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.50389632"
+     inkscape:cx="561.43067"
+     inkscape:cy="641.45043"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="898"
+     inkscape:window-height="619"
+     inkscape:window-x="113"
+     inkscape:window-y="25" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <text
+       xml:space="preserve"
+       style="font-size:78.99777222px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="128.04803"
+       y="108.97908"
+       id="text1872"><tspan
+         sodipodi:role="line"
+         x="128.04803"
+         y="108.97908"
+         id="tspan2797">Ardour Style</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:53.98735046px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="207.30774"
+       y="638.5484"
+       id="text1876"><tspan
+         sodipodi:role="line"
+         x="207.30774"
+         y="638.5484"
+         id="tspan1884">Color Palette</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:62.71745682px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="280.23593"
+       y="235.28851"
+       id="text5438"><tspan
+         sodipodi:role="line"
+         id="tspan5440"
+         x="280.23593"
+         y="235.28851">Fonts?</tspan></text>
+    <rect
+       style="opacity:1;fill:black;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.0999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect6347"
+       width="304.3186"
+       height="134.66357"
+       x="60"
+       y="677.36218" />
+    <rect
+       style="opacity:1;fill:#adabc8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.0999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2772"
+       width="50.002544"
+       height="51.012703"
+       x="269.99744"
+       y="721.30762" />
+    <rect
+       y="721.3111"
+       x="206.13791"
+       height="51.005806"
+       width="50.953224"
+       id="rect2770"
+       style="opacity:1;fill:#7f83a4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.0999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       y="721.30762"
+       x="143.22905"
+       height="51.012703"
+       width="50.002544"
+       id="rect2774"
+       style="opacity:1;fill:#565690;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.0999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:#f3f3d2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.0999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect5460"
+       width="49.692257"
+       height="51.275845"
+       x="79.999985"
+       y="721.17609" />
+    <rect
+       style="opacity:1;fill:#d5d1b9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.0999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2768"
+       width="325"
+       height="135"
+       x="365"
+       y="677.36218" />
+    <rect
+       style="opacity:1;fill:#555;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.0999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect7236"
+       width="75.380852"
+       height="71.096375"
+       x="380"
+       y="711.26581" />
+    <rect
+       style="opacity:1;fill:#7f83a4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.0999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1888"
+       width="50.953224"
+       height="51.005806"
+       x="549.52209"
+       y="721.3111" />
+    <rect
+       y="721.30762"
+       x="609.99744"
+       height="51.012703"
+       width="50.002544"
+       id="rect4551"
+       style="opacity:1;fill:#adabc8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.0999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:#565690;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.0999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3662"
+       width="50.002544"
+       height="51.012703"
+       x="489.99747"
+       y="721.30762" />
+    <text
+       xml:space="preserve"
+       style="font-size:77.09712982px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="501.05905"
+       y="710.0827"
+       id="text2776"
+       transform="scale(1.105424,0.90463)"><tspan
+         sodipodi:role="line"
+         id="tspan2778"
+         x="501.05905"
+         y="710.0827">?</tspan></text>
+  </g>
+</svg>

diff --git a/manual/xml/mouse_operations_ruler.xml b/manual/xml/mouse_operations_ruler.xml
index c7cecb7172388e80c42ca9a8aaf601c3dd0b986f..fd41327b567600fcf53e4b7af869ae492caa9fa8 100644 (file)
--- a/manual/xml/mouse_operations_ruler.xml
+++ b/manual/xml/mouse_operations_ruler.xml
@@ -77,7 +77,7 @@
                        <tbody>
                                <row>
                                        <entry>
-                                               Button1 drag
+                                               <mousebutton>Button1</mousebutton> drag
                                        </entry>
                                        <entry>
                                                define a new punch or loop range

diff --git a/manual/xsl/html.xsl b/manual/xsl/html.xsl
index 974c11becd6e9020bc22c57eb83e59e781afc1bb..80a0a7772a8e85fcbae8f8c94426a38b2976e755 100644 (file)
--- a/manual/xsl/html.xsl
+++ b/manual/xsl/html.xsl
@@ -88,4 +88,16 @@ section toc
 part toc
 </xsl:param>
 
+<xsl:template name="nongraphical.admonition">
+       <div class="{name(.)}">
+               <h2 class="title">
+                       <xsl:call-template name="anchor"/>
+                       <xsl:if test="$admon.textlabel != 0 or title">
+                               <xsl:apply-templates select="." mode="object.title.markup"/>
+                       </xsl:if>
+               </h2>
+               <xsl:apply-templates/>
+       </div>
+</xsl:template>
+
 </xsl:stylesheet>