minor layout adjustments

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1562 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/tutorial/lisa2008/rrd-by-example/body.tex b/tutorial/lisa2008/rrd-by-example/body.tex
index 601a841966df67b9eeb2da2797334898066d2704..f14b1428cfd7933e7989715fe7ba3cd559adaa7e 100644 (file)
--- a/tutorial/lisa2008/rrd-by-example/body.tex
+++ b/tutorial/lisa2008/rrd-by-example/body.tex
@@ -15,7 +15,9 @@
   \setlength{\parskip}{1ex plus 0.5ex minus 0.2ex}
   \setlength{\parindent}{0pt}  
   \usepackage{times}
-  \newcommand{\addgraph}[1]{\begin{center}\framebox{\includegraphics[width=0.7\textwidth]{ex/#1}}\end{center}}
+  \newcommand{\addgraph}[1]{\begin{center}\framebox{\includegraphics[width=0.9\textwidth]{ex/#1}}\end{center}}
+  \addtolength{\voffset}{-2.5cm}
+  \addtolength{\textheight}{4cm}
 }
 \usepackage{alltt}
 \usepackage{listings}
@@ -722,6 +724,8 @@ LINE1:pred#0a0:Prediction
   prediction is now generally off by quite a bit, this causes the
   confidence band to grow as well.}
 
+\mode<article>{\newpage}
+
 \begin{frame}{hw demo: beta}
 \addgraph{HW-p1-a0_1-b0_001}\\
 \addgraph{HW-p1-a0_1-b0_1}
@@ -796,7 +800,7 @@ Tobi Oetiker <tobi@oetiker.ch>
 }
 
 \mode<article>{
-\vspace{3cm}
+\vspace{\stretch{1}}
 Tobias Oetiker <tobi@oetiker.ch>
 }
 \end{document}

diff --git a/tutorial/lisa2008/rrd-by-example/ex/graph-examples.pl b/tutorial/lisa2008/rrd-by-example/ex/graph-examples.pl
index 37bcb3d28627ef57af8d7303c541147992321f20..d2738ac5a72954a8da386d79b2ba896827a5a27a 100755 (executable)
--- a/tutorial/lisa2008/rrd-by-example/ex/graph-examples.pl
+++ b/tutorial/lisa2008/rrd-by-example/ex/graph-examples.pl
@@ -90,7 +90,7 @@ rg "LINE-width.pdf",
 
 rg "LINE-dash.pdf",
            'LINE1:a#ff00ff:LINE1\:a#ff00ff\:\:<b>dashes=10,10,80,10</b>\n:dashes=10,20,80,20',
-           'LINE2:b#ffaa00:LINE2\:b#ffaa00\:\:<b>dashes=1,3</b>\:<b>dash-offset=10</b>:dashes=1,3:dash-offset=3';
+           'LINE2:b#11aa00:LINE2\:b#11aa00\:\:<b>dashes=1,3</b>\:<b>dash-offset=10</b>:dashes=1,3:dash-offset=3';
 
 
 rg "DEF-step.pdf",
@@ -116,16 +116,16 @@ rg 'AREA-simple.pdf',
           'LINE2:b#1180fb:LINE\:b#11a03b\l';
 
 rg 'AREA-two.pdf',
-          'AREA:a#f1805b:<b>AREA</b>\:a#a1003b',
-          'AREA:b#1180fb:<b>AREA</b>\:b#11a03b\l';
+          'AREA:a#f1805b:<b>AREA</b>\:a#f1805b',
+          'AREA:b#21f08b:<b>AREA</b>\:b#21f08b\l';
 
 rg 'AREA-trans.pdf',
-          'AREA:a#f1805bff:AREA\:a#a1003b<b>ff</b>',
-          'AREA:b#1180fb60:AREA\:b#11a03b<b>60</b>\l';
+          'AREA:a#f1805bff:AREA\:a#f1805b<b>ff</b>',
+          'AREA:b#21808b60:AREA\:b#21808b60<b>60</b>\l';
 
 rg 'AREA-stack.pdf',
-          'AREA:a#f1805b:AREA\:a#a1003b',
-          'AREA:b#1180fb:AREA\:b#11a03b\:...\:<b>STACK</b>\l:STACK';
+          'AREA:a#f1805b:AREA\:a#f1805b',
+          'AREA:b#21808b:AREA\:b#21808b\:...\:<b>STACK</b>\l:STACK';
 
 rg 'SHIFT-simple.pdf',
           'DEF:c=x.rrd:a:AVERAGE',

diff --git a/tutorial/lisa2008/rrd-by-example/traffic/index.cgi b/tutorial/lisa2008/rrd-by-example/traffic/index.cgi
index 04dd1fdaa885d61f74dd0eb545a3527d5af4efa8..5947248180f7c17ab2d0feef72e2b1ed9fbd1d9d 100755 (executable)
--- a/tutorial/lisa2008/rrd-by-example/traffic/index.cgi
+++ b/tutorial/lisa2008/rrd-by-example/traffic/index.cgi
@@ -8,7 +8,10 @@
 
 <h2>The Bytes</h2>
 <table border="1" cellspacing="0" cellpadding="2">
-<tr><td>Period</td><td>Incoming</td><td>Outgoing</td><td>Total</td></tr>
+<tr><td>Period</td>
+    <td>Incoming</td>
+    <td>Outgoing</td>
+    <td>Total</td></tr>
 
 <!--
 <RRD::GRAPH -