Changeset 29

Timestamp:

21/05/06 12:16:32 (2 years ago)

Author:

al

Message:

horizontal bar charts plus new generated docs. added horizontal option to docs

Files:

• plotkit/trunk/PlotKit/Layout.js (modified) (4 diffs)
• plotkit/trunk/doc/PlotKit.Base.html (modified) (3 diffs)
• plotkit/trunk/doc/PlotKit.Base.txt (modified) (1 diff)
• plotkit/trunk/doc/PlotKit.Canvas.html (modified) (3 diffs)
• plotkit/trunk/doc/PlotKit.Canvas.txt (modified) (1 diff)
• plotkit/trunk/doc/PlotKit.Layout.html (modified) (4 diffs)
• plotkit/trunk/doc/PlotKit.Layout.txt (modified) (2 diffs)
• plotkit/trunk/doc/PlotKit.QuickStart.html (modified) (3 diffs)
• plotkit/trunk/doc/PlotKit.QuickStart.txt (modified) (1 diff)
• plotkit/trunk/doc/PlotKit.Renderer.html (modified) (3 diffs)
• plotkit/trunk/doc/PlotKit.Renderer.txt (modified) (1 diff)
• plotkit/trunk/doc/PlotKit.SVG.html (modified) (3 diffs)
• plotkit/trunk/doc/PlotKit.SVG.txt (modified) (1 diff)
• plotkit/trunk/doc/PlotKit.SweetCanvas.html (modified) (3 diffs)
• plotkit/trunk/doc/PlotKit.SweetCanvas.txt (modified) (1 diff)
• plotkit/trunk/doc/PlotKit.SweetSVG.html (modified) (3 diffs)
• plotkit/trunk/doc/PlotKit.SweetSVG.txt (modified) (1 diff)
• plotkit/trunk/doc/PlotKit.html (modified) (4 diffs)
• plotkit/trunk/doc/PlotKit.txt (modified) (2 diffs)
• plotkit/trunk/doc/SVGCanvasCompat.html (modified) (3 diffs)
• plotkit/trunk/doc/SVGCanvasCompat.txt (modified) (1 diff)
• plotkit/trunk/doc/doc.css (modified) (1 diff)
• plotkit/trunk/tests/quickstart.html (modified) (1 diff)

plotkit/trunk/PlotKit/Layout.js

@@ -53 +53 @@
-    this.options = {
-        "barWidthFillFraction": 0.75,
+        "barOrientation": "vertical",
-        "xOriginIsZero": true,
-        "yOriginIsZero": true,
@@ -155 +156 @@
-    this._evaluateScales();
-    if (this.style == "bar") {
-
+
+
+
+
+
+
-        this._evaluateBarTicks();
-    }
@@ -373 +379 @@
-};
-
+// Create the horizontal bars
+PlotKit.Layout.prototype._evaluateHorizBarCharts = function() {
+    var keys = MochiKit.Base.keys;
+    var items = MochiKit.Base.items;
+
+    var setCount = keys(this.datasets).length;
+
+    // work out how far separated values are
+    var xdelta = 10000000;
+    var xvalues = this._uniqueXValues();
+    for (var i = 1; i < xvalues.length; i++) {
+        xdelta = Math.min(Math.abs(xvalues[i] - xvalues[i-1]), xdelta);
+    }
+
+    var barWidth = 0;
+    var barWidthForSet = 0;
+    var barMargin = 0;
+    
+    // work out how far each far each bar is separated
+    if (xvalues.length == 1) {
+        // do something smarter if we only plot one value
+        xdelta = 1.0;
+        this.xscale = 1.0;
+        this.minxval = xvalues[0];
+        barWidth = 1.0 * this.options.barWidthFillFraction;
+        barWidthForSet = barWidth/setCount;
+        barMargin = (1.0 - this.options.barWidthFillFraction)/2;
+    }
+    else {
+        // readjust yscale to fix with bar charts
+        this.xscale = (1.0 - xdelta/this.xrange)/this.xrange;
+        barWidth = xdelta * this.xscale * this.options.barWidthFillFraction;
+        barWidthForSet = barWidth / setCount;
+        barMargin = xdelta * this.xscale * (1.0 - this.options.barWidthFillFraction)/2;
+    }
+
+    this.minxdelta = xdelta; // need this for tick positions
+
+    // add all the rects
+    this.bars = new Array();
+    var i = 0;
+    for (var setName in this.datasets) {
+        var dataset = this.datasets[setName];
+        for (var j = 0; j < dataset.length; j++) {
+            var item = dataset[j];
+            var rect = {
+                y: ((parseFloat(item[0]) - this.minxval) * this.xscale) + (i * barWidthForSet) + barMargin,
+                x: 0.0,
+                h: barWidthForSet,
+                w: ((parseFloat(item[1]) - this.minyval) * this.yscale),
+                xval: parseFloat(item[0]),
+                yval: parseFloat(item[1]),
+                name: setName
+            };
+            this.bars.push(rect);
+        }
+        i++;
+    }
+};
+
-
-// Create the line charts
@@ -516 +582 @@
-    };
-    this.xticks = MochiKit.Base.map(bind(centerInBar, this), this.xticks);
+    
+    if (this.options.barOrientation == "horizontal") {
+        // swap scales
+        var tempticks = this.xticks;
+        this.xticks = this.yticks;
+        this.yticks = tempticks;
+
+        // we need to invert the "yaxis" (which is now the xaxis when drawn)
+        var invert = function(tick) {
+            return [1.0 - tick[0], tick[1]];
+        }
+        this.xticks = MochiKit.Base.map(invert, this.xticks);
+    }
-};
-

plotkit/trunk/doc/PlotKit.Base.html

@@ +1 @@
+
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en" >
-<head>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-<link href="doc.css" media="screen" rel="stylesheet" type="text/css" />
-
@@ -15 +18 @@
-
-<body>
+    <div id="header">
+        <div id="logo"><a href="http://www.liquidx.net/"><img src="http://media.liquidx.net/imgx/logo.png" width="256" height="128" alt="liquidx.net" /></a></div>
+                <div id="menu-hack">
+                        <div id="menu-l"><img src="http://media.liquidx.net/imgx/menu_l.png" width="17" height="28" alt="menu cap" /></div>
+                        <div id="menu-r"><img src="http://media.liquidx.net/imgx/menu_r.png" width="17" height="28" alt="menu cap" /></div>                     
+                <div id="menu-main">
+                        <ul id="menu" class="code">
+                        <li class="tab" id="blog"><a href="http://www.liquidx.net/" title="blog/home">blog</a></li>
+                        <li class="tab" id="code"><a href="http://www.liquidx.net/code/" title="software i have written">software</a></li>
+                        <li class="tab" id="dev"><a href="http://projects.liquidx.net/" title="source code for my open source projects">dev</a></li>      
+                        <li class="tab" id="photos"><a href="http://recoil.org/~al/albums/" title="photos and videos">photos</a></li>
+                        <li class="tab" id="research"><a href="http://al.tse.id.au/research/" title="research profile">research</a></li>
+                        <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
+                        <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
+                        <li class="tab" id="status"><a href="http://www.liquidx.net/status/" title="weather report for alastair">status</a></li>
+                        <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
+                        </ul>
+                </div>
+        </div>
+                <div id="quick">
+                        <span class="quickbutton"><a href="http://www.liquidx.net/albumartwidget/"><img src="http://media.liquidx.net/imgx/quick_widget.png" alt="album art widget" /></a></span>
+                        <span class="quickbutton"><a href="http://www.liquidx.net/plotkit/"><img src="http://media.liquidx.net/imgx/quick_plotkit.png" alt="plotkit" /></a></span>
+                        <span class="quickbutton"><a href="http://www.liquidx.net/fruity/"><img src="http://media.liquidx.net/imgx/quick_fruity.png" alt="fruity" /></a></span>
+                </div>
+                
+        </div>
+    
-    <div id="body">
-    <h1 class="header"><span>liquidx.net</span></h1>
-    <div class="menu">
-    <ul id="menu" class="code">
-        <li class="tab" id="blog"><a href="http://www.liquidx.net/" title="blog/home">blog</a></li>
-        <li class="tab" id="code"><a href="http://www.liquidx.net/code/" title="software i have written">software</a></li>
-        <li class="tab" id="dev"><a href="http://projects.liquidx.net/" title="source code for my open source projects">dev</a></li>      
-        <li class="tab" id="photos"><a href="http://recoil.org/~al/albums/" title="photos and videos">photos</a></li>
-         <li class="tab" id="research"><a href="http://al.tse.id.au/research/" title="research profile">research</a></li>
-         <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
-         <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
-         <li class="tab" id="status"><a href="http://www.liquidx.net/status" title="weather report for alastair">status</a></li>
-         <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
-    </ul>
-    </div>
-
-    <div id="content">
-<div class="page doc api">
-
@@ -191 +205 @@
-</div>
-</div>
+        
+        
-    
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-
-
-
-
-
-
-
-
+
+
-    </div>
-
-
-
-
-
+
+
+
-   <script type="text/javascript">
-   _uacct = "UA-58117-1";

plotkit/trunk/doc/PlotKit.Base.txt

@@ -1 @@
-
+x
-{% load markup %}
-{% block pageid %}code{% endblock %}

plotkit/trunk/doc/PlotKit.Canvas.html

@@ +1 @@
+
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en" >
-<head>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-<link href="doc.css" media="screen" rel="stylesheet" type="text/css" />
-
@@ -15 +18 @@
-
-<body>
+    <div id="header">
+        <div id="logo"><a href="http://www.liquidx.net/"><img src="http://media.liquidx.net/imgx/logo.png" width="256" height="128" alt="liquidx.net" /></a></div>
+                <div id="menu-hack">
+                        <div id="menu-l"><img src="http://media.liquidx.net/imgx/menu_l.png" width="17" height="28" alt="menu cap" /></div>
+                        <div id="menu-r"><img src="http://media.liquidx.net/imgx/menu_r.png" width="17" height="28" alt="menu cap" /></div>                     
+                <div id="menu-main">
+                        <ul id="menu" class="code">
+                        <li class="tab" id="blog"><a href="http://www.liquidx.net/" title="blog/home">blog</a></li>
+                        <li class="tab" id="code"><a href="http://www.liquidx.net/code/" title="software i have written">software</a></li>
+                        <li class="tab" id="dev"><a href="http://projects.liquidx.net/" title="source code for my open source projects">dev</a></li>      
+                        <li class="tab" id="photos"><a href="http://recoil.org/~al/albums/" title="photos and videos">photos</a></li>
+                        <li class="tab" id="research"><a href="http://al.tse.id.au/research/" title="research profile">research</a></li>
+                        <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
+                        <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
+                        <li class="tab" id="status"><a href="http://www.liquidx.net/status/" title="weather report for alastair">status</a></li>
+                        <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
+                        </ul>
+                </div>
+        </div>
+                <div id="quick">
+                        <span class="quickbutton"><a href="http://www.liquidx.net/albumartwidget/"><img src="http://media.liquidx.net/imgx/quick_widget.png" alt="album art widget" /></a></span>
+                        <span class="quickbutton"><a href="http://www.liquidx.net/plotkit/"><img src="http://media.liquidx.net/imgx/quick_plotkit.png" alt="plotkit" /></a></span>
+                        <span class="quickbutton"><a href="http://www.liquidx.net/fruity/"><img src="http://media.liquidx.net/imgx/quick_fruity.png" alt="fruity" /></a></span>
+                </div>
+                
+        </div>
+    
-    <div id="body">
-    <h1 class="header"><span>liquidx.net</span></h1>
-    <div class="menu">
-    <ul id="menu" class="code">
-        <li class="tab" id="blog"><a href="http://www.liquidx.net/" title="blog/home">blog</a></li>
-        <li class="tab" id="code"><a href="http://www.liquidx.net/code/" title="software i have written">software</a></li>
-        <li class="tab" id="dev"><a href="http://projects.liquidx.net/" title="source code for my open source projects">dev</a></li>      
-        <li class="tab" id="photos"><a href="http://recoil.org/~al/albums/" title="photos and videos">photos</a></li>
-         <li class="tab" id="research"><a href="http://al.tse.id.au/research/" title="research profile">research</a></li>
-         <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
-         <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
-         <li class="tab" id="status"><a href="http://www.liquidx.net/status" title="weather report for alastair">status</a></li>
-         <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
-    </ul>
-    </div>
-
-    <div id="content">
-<div class="page doc api">
-
@@ -96 +110 @@
-</div>
-</div>
+        
+        
-    
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-
-
-
-
-
-
-
-
+
+
-    </div>
-
-</div>
-
-
-
+
+<script src="http://www.google-analytics.com/urchin.js" 
-   <script type="text/javascript">
-   _uacct = "UA-58117-1";

plotkit/trunk/doc/PlotKit.Canvas.txt

@@ -1 @@
-
+x
-{% load markup %}
-{% block pageid %}code{% endblock %}

plotkit/trunk/doc/PlotKit.Layout.html

@@ +1 @@
+
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en" >
-<head>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-<link href="doc.css" media="screen" rel="stylesheet" type="text/css" />
-
@@ -15 +18 @@
-
-<body>
+    <div id="header">
+        <div id="logo"><a href="http://www.liquidx.net/"><img src="http://media.liquidx.net/imgx/logo.png" width="256" height="128" alt="liquidx.net" /></a></div>
+                <div id="menu-hack">
+                        <div id="menu-l"><img src="http://media.liquidx.net/imgx/menu_l.png" width="17" height="28" alt="menu cap" /></div>
+                        <div id="menu-r"><img src="http://media.liquidx.net/imgx/menu_r.png" width="17" height="28" alt="menu cap" /></div>                     
+                <div id="menu-main">
+                        <ul id="menu" class="code">
+                        <li class="tab" id="blog"><a href="http://www.liquidx.net/" title="blog/home">blog</a></li>
+                        <li class="tab" id="code"><a href="http://www.liquidx.net/code/" title="software i have written">software</a></li>
+                        <li class="tab" id="dev"><a href="http://projects.liquidx.net/" title="source code for my open source projects">dev</a></li>      
+                        <li class="tab" id="photos"><a href="http://recoil.org/~al/albums/" title="photos and videos">photos</a></li>
+                        <li class="tab" id="research"><a href="http://al.tse.id.au/research/" title="research profile">research</a></li>
+                        <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
+                        <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
+                        <li class="tab" id="status"><a href="http://www.liquidx.net/status/" title="weather report for alastair">status</a></li>
+                        <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
+                        </ul>
+                </div>
+        </div>
+                <div id="quick">
+                        <span class="quickbutton"><a href="http://www.liquidx.net/albumartwidget/"><img src="http://media.liquidx.net/imgx/quick_widget.png" alt="album art widget" /></a></span>
+                        <span class="quickbutton"><a href="http://www.liquidx.net/plotkit/"><img src="http://media.liquidx.net/imgx/quick_plotkit.png" alt="plotkit" /></a></span>
+                        <span class="quickbutton"><a href="http://www.liquidx.net/fruity/"><img src="http://media.liquidx.net/imgx/quick_fruity.png" alt="fruity" /></a></span>
+                </div>
+                
+        </div>
+    
-    <div id="body">
-    <h1 class="header"><span>liquidx.net</span></h1>
-    <div class="menu">
-    <ul id="menu" class="code">
-        <li class="tab" id="blog"><a href="http://www.liquidx.net/" title="blog/home">blog</a></li>
-        <li class="tab" id="code"><a href="http://www.liquidx.net/code/" title="software i have written">software</a></li>
-        <li class="tab" id="dev"><a href="http://projects.liquidx.net/" title="source code for my open source projects">dev</a></li>      
-        <li class="tab" id="photos"><a href="http://recoil.org/~al/albums/" title="photos and videos">photos</a></li>
-         <li class="tab" id="research"><a href="http://al.tse.id.au/research/" title="research profile">research</a></li>
-         <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
-         <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
-         <li class="tab" id="status"><a href="http://www.liquidx.net/status" title="weather report for alastair">status</a></li>
-         <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
-    </ul>
-    </div>
-
-    <div id="content">
-<div class="page doc api">
-
@@ -69 +83 @@
-        <td>0.75</td>
-    </tr>
+    <tr>
+        <th>barOrientation</th>
+        <td>Orientation of a bar chart. <b>(PlotKit 0.9+ only)</b></td>
+        <td>String ("vertical", "horizontal")</td>
+        <td>vertical</td>
+    </tr>
+    
-    <tr>
-        <th>xAxis</th>
@@ -343 +364 @@
-</div>
-</div>
+        
+        
-    
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-
-
-
-
-
-
-
-
+
+
-    </div>
-
-
-
-
-
+
+
+
-   <script type="text/javascript">
-   _uacct = "UA-58117-1";

plotkit/trunk/doc/PlotKit.Layout.txt

@@ -1 @@
-
+x
-{% load markup %}
-{% block pageid %}code{% endblock %}
@@ -50 +50 @@
-        </tr>
-        <tr>
+                <th>barOrientation</th>
+                <td>Orientation of a bar chart. <b>(PlotKit 0.9+ only)</b></td>
+                <td>String ("vertical", "horizontal")</td>
+                <td>vertical</td>
+        </tr>
+        
+        <tr>
-                <th>xAxis</th>
-                <td>Minimum and Maximum values on the X axis.</td>

plotkit/trunk/doc/PlotKit.QuickStart.html

@@ +1 @@
+
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en" >
-<head>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-<script type="text/javascript" src="/js/mochi/MochiKit.js"></script>
-<script type="text/javascript" src="/js/plotkit/Base.js"></script>
@@ -20 +23 @@
-
-<body>
+    <div id="header">
+        <div id="logo"><a href="http://www.liquidx.net/"><img src="http://media.liquidx.net/imgx/logo.png" width="256" height="128" alt="liquidx.net" /></a></div>
+                <div id="menu-hack">
+                        <div id="menu-l"><img src="http://media.liquidx.net/imgx/menu_l.png" width="17" height="28" alt="menu cap" /></div>
+                        <div id="menu-r"><img src="http://media.liquidx.net/imgx/menu_r.png" width="17" height="28" alt="menu cap" /></div>                     
+                <div id="menu-main">
+                        <ul id="menu" class="code">
+                        <li class="tab" id="blog"><a href="http://www.liquidx.net/" title="blog/home">blog</a></li>
+                        <li class="tab" id="code"><a href="http://www.liquidx.net/code/" title="software i have written">software</a></li>
+                        <li class="tab" id="dev"><a href="http://projects.liquidx.net/" title="source code for my open source projects">dev</a></li>      
+                        <li class="tab" id="photos"><a href="http://recoil.org/~al/albums/" title="photos and videos">photos</a></li>
+                        <li class="tab" id="research"><a href="http://al.tse.id.au/research/" title="research profile">research</a></li>
+                        <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
+                        <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
+                        <li class="tab" id="status"><a href="http://www.liquidx.net/status/" title="weather report for alastair">status</a></li>
+                        <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
+                        </ul>
+                </div>
+        </div>
+                <div id="quick">
+                        <span class="quickbutton"><a href="http://www.liquidx.net/albumartwidget/"><img src="http://media.liquidx.net/imgx/quick_widget.png" alt="album art widget" /></a></span>
+                        <span class="quickbutton"><a href="http://www.liquidx.net/plotkit/"><img src="http://media.liquidx.net/imgx/quick_plotkit.png" alt="plotkit" /></a></span>
+                        <span class="quickbutton"><a href="http://www.liquidx.net/fruity/"><img src="http://media.liquidx.net/imgx/quick_fruity.png" alt="fruity" /></a></span>
+                </div>
+                
+        </div>
+    
-    <div id="body">
-    <h1 class="header"><span>liquidx.net</span></h1>
-    <div class="menu">
-    <ul id="menu" class="code">
-        <li class="tab" id="blog"><a href="http://www.liquidx.net/" title="blog/home">blog</a></li>
-        <li class="tab" id="code"><a href="http://www.liquidx.net/code/" title="software i have written">software</a></li>
-        <li class="tab" id="dev"><a href="http://projects.liquidx.net/" title="source code for my open source projects">dev</a></li>      
-        <li class="tab" id="photos"><a href="http://recoil.org/~al/albums/" title="photos and videos">photos</a></li>
-         <li class="tab" id="research"><a href="http://al.tse.id.au/research/" title="research profile">research</a></li>
-         <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
-         <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
-         <li class="tab" id="status"><a href="http://www.liquidx.net/status" title="weather report for alastair">status</a></li>
-         <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
-    </ul>
-    </div>
-
-    <div id="content">
-<div class="page doc">
-
@@ -292 +306 @@
-</script>
-</div>
+        
+