* Use a 'user block' character instead of a 'body block' for the settings line,
authorMahlon E. Smith <mahlon@martini.nu>
Thu, 29 Oct 2009 15:27:35 -0700
changeset 3 1b5eb968d2c4
parent 2 fdcab4072085
child 4 4fe151fd3b80
* Use a 'user block' character instead of a 'body block' for the settings line, as suggested by David J. Patrick <djp@linuxcaffe.ca>. * Ignore all user blocks (wrapped or otherwise.) * Display body (not wrapped) text as 'pre' in css. diff --git a/Apache/OTL.pm b/Apache/OTL.pm --- a/Apache/OTL.pm +++ b/Apache/OTL.pm @@ -1,7 +1,7 @@ # # VimOutliner (OTL) XHTML pretty printer for mod_perl2/apache2. # -# Copyright (c) 2006, Mahlon E. Smith <mahlon@martini.nu> +# Copyright (c) 2006-2009, Mahlon E. Smith <mahlon@martini.nu> # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -40,7 +40,7 @@ sub handler { - my $VERSION = '0.5'; + my $VERSION = '0.6'; my $ID = '$Id$'; my $r = shift; my $t0 = Time::HiRes::gettimeofday; @@ -70,7 +70,10 @@ percent => qr/(\[.\]) (\d+)%/, todo => qr/(\[_\]) /, done => qr/(\[X\]) /, - comment => qr/^(?:\t+)?:(.+)/, + user => qr/^(?:\t+)?\<(.+)/, + user_wrap => qr/^(?:\t+)?\>(.+)/, + body_wrap => qr/^(?:\t+)?:(.+)/, + body => qr/^(?:\t+)?;(.+)/, time => qr/(\d{2}:\d{2}:\d{2})/, date => qr/(\d{2,4}-\d{2}-\d{2})/, subitem => qr/^\t(?!\t)/, @@ -104,8 +107,8 @@ # get optional settings and otl title { my $settings = shift @blocks; - if ($settings =~ $re{comment}) { - %opt = map { split /=/ } split /\s?:/, $settings; + if ($settings =~ $re{user}) { + %opt = map { split /=/ } split /\s?:/, $1; } # if the first group wasn't a comment, @@ -116,6 +119,10 @@ } } + # Now that we have tried to detect settings, + # remove any level 0 blocks that are user data. + @blocks = grep { $_ !~ /^[\<\>]/ } @blocks; + # GET args override settings $opt{$_} = $get->{$_} foreach keys %$get; @@ -133,7 +140,7 @@ <!-- generated by otl_handler $VERSION Mahlon E. Smith <mahlon\@martini.nu> - http://www.martini.nu/ + http://projects.martini.nu/apache-otl/ Get VimOutliner at: http://www.vimoutliner.org/ --> @@ -195,13 +202,18 @@ foreach my $block ( sort { sorter(\%opt, \%re) } @blocks ) { # separate outline items - my @lines = grep { $_ !~ /$re{'hideline'}/ } split /\n/, $block; + my @lines; + foreach my $line ( split /\n/, $block ) { + push @lines, $line unless $line =~ $re{hideline} || + $line =~ $re{user} || $line =~ $re{user_wrap}; + } + my $data = []; # build structure and get item counts my ( $subs, $comments, $subsubs ) = ( 0, 0, 0 ); foreach ( @lines ) { - if (/$re{comment}/) { + if (/$re{body_wrap}/) { $comments++; } elsif (/$re{subitem}/) { @@ -245,9 +257,10 @@ } my $li_class = '>'; - $li_class = ' class="todo">' if $line =~ s#$re{todo}##; - $li_class = ' class="done">' if $line =~ s#$re{done}##; - $li_class = ' class="comment">' if $line =~ s#$re{comment}#$1#; + $li_class = ' class="todo">' if $line =~ s#$re{todo}##; + $li_class = ' class="done">' if $line =~ s#$re{done}##; + $li_class = ' class="comment_pre">' if $line =~ s#$re{body}#$1#; + $li_class = ' class="comment">' if $line =~ s#$re{body_wrap}#$1#; if ( $next_level == $level || $next_level == 0 ) { $r->print( "$in<li" . $li_class . "$line</li>\n" ); diff --git a/README b/README --- a/README +++ b/README @@ -45,8 +45,9 @@ --------------------------------------------------------------------- Settings for the otl_handler are stored on the first line of the otl -files themselves, prefixed by a colon. See the sample.otl for an -example settings line. All settings are entirely optional. +files themselves, prefixed by the 'user no wrap' character, '<'. See +the sample.otl for an example settings line. All settings are entirely +optional. title Type: string diff --git a/sample.otl b/sample.otl --- a/sample.otl +++ b/sample.otl @@ -1,4 +1,4 @@ -:title=Sample OTL list :counts=1 :timer=1 :style=styles/theme1.css :legend=1 :last_mod=1 +<:title=Sample OTL list :counts=1 :timer=1 :style=styles/theme1.css :legend=1 :last_mod=1 : Theme examples: : <a href="sample.otl">basic</a> <a href="sample.otl?counts=0&amp;style=styles/theme2.css&amp;legend=0&amp;js=/javascript/jquery.js,/javascript/theme2.js">advanced</a> <a href="sample.otl?counts=0&amp;style=styles/theme3.css&amp;legend=0&amp;timer=0&amp;js=/javascript/jquery.js,/javascript/theme3.js&amp;sort=1">advanced2</a> diff --git a/styles/theme1.css b/styles/theme1.css --- a/styles/theme1.css +++ b/styles/theme1.css @@ -37,6 +37,13 @@ font-family: sans; } +.comment_pre +{ + font-style: normal; + font-family: courier; + white-space: pre; +} + .counts { margin-left: 10px; diff --git a/styles/theme2.css b/styles/theme2.css --- a/styles/theme2.css +++ b/styles/theme2.css @@ -131,6 +131,13 @@ border-right: 1px solid #666; } +.comment_pre +{ + font-style: normal; + font-family: courier; + white-space: pre; +} + .comment:hover { border-top: 1px solid #aaa; diff --git a/styles/theme3.css b/styles/theme3.css --- a/styles/theme3.css +++ b/styles/theme3.css @@ -88,6 +88,13 @@ margin-bottom: 3px; } +#content .comment_pre +{ + font-style: normal; + font-family: courier; + white-space: pre; +} + #content { position: absolute;
Apache/OTL.pm
README
javascript/jquery.js
sample.otl
styles/theme1.css
styles/theme2.css
styles/theme3.css
--- a/Apache/OTL.pm	Fri Jul 24 07:49:52 2009 -0700
+++ b/Apache/OTL.pm	Thu Oct 29 15:27:35 2009 -0700
@@ -1,7 +1,7 @@
 #
 # VimOutliner (OTL) XHTML pretty printer for mod_perl2/apache2.
 #
-# Copyright (c) 2006, Mahlon E. Smith <mahlon@martini.nu>
+# Copyright (c) 2006-2009, Mahlon E. Smith <mahlon@martini.nu>
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -40,7 +40,7 @@
 
 sub handler
 {
-    my $VERSION = '0.5';
+    my $VERSION = '0.6';
     my $ID      = '$Id$';
     my $r       = shift;
     my $t0      = Time::HiRes::gettimeofday;
@@ -70,7 +70,10 @@
         percent     => qr/(\[.\]) (\d+)%/,
         todo        => qr/(\[_\]) /,
         done        => qr/(\[X\]) /,
-        comment     => qr/^(?:\t+)?:(.+)/,
+        user        => qr/^(?:\t+)?\<(.+)/,
+        user_wrap   => qr/^(?:\t+)?\>(.+)/,
+        body_wrap   => qr/^(?:\t+)?:(.+)/,
+        body        => qr/^(?:\t+)?;(.+)/,
         time        => qr/(\d{2}:\d{2}:\d{2})/,
         date        => qr/(\d{2,4}-\d{2}-\d{2})/,
         subitem     => qr/^\t(?!\t)/,
@@ -104,8 +107,8 @@
     # get optional settings and otl title
     {
         my $settings = shift @blocks;
-        if ($settings =~ $re{comment}) {
-            %opt = map { split /=/ } split /\s?:/, $settings;
+        if ($settings =~ $re{user}) {
+            %opt = map { split /=/ } split /\s?:/, $1;
         }
         
         # if the first group wasn't a comment,
@@ -116,6 +119,10 @@
         }
     }
 
+    # Now that we have tried to detect settings,
+    # remove any level 0 blocks that are user data.
+    @blocks = grep { $_ !~ /^[\<\>]/ } @blocks;
+
     # GET args override settings
     $opt{$_} = $get->{$_} foreach keys %$get;
 
@@ -133,7 +140,7 @@
     <!--
         generated by otl_handler $VERSION
         Mahlon E. Smith <mahlon\@martini.nu>
-        http://www.martini.nu/
+        http://projects.martini.nu/apache-otl/
 
         Get VimOutliner at: http://www.vimoutliner.org/
     -->
@@ -195,13 +202,18 @@
 
     foreach my $block ( sort { sorter(\%opt, \%re) } @blocks ) {
         # separate outline items
-        my @lines = grep { $_ !~ /$re{'hideline'}/ } split /\n/, $block;
+        my @lines;
+        foreach my $line ( split /\n/, $block ) {
+            push @lines, $line unless $line =~ $re{hideline} ||
+                $line =~ $re{user} || $line =~ $re{user_wrap};
+        }
+
         my $data  = [];
 
         # build structure and get item counts
         my ( $subs, $comments, $subsubs ) = ( 0, 0, 0 );
         foreach ( @lines ) {
-            if (/$re{comment}/) {
+            if (/$re{body_wrap}/) {
                 $comments++;
             }
             elsif (/$re{subitem}/) {
@@ -245,9 +257,10 @@
             }
 
             my $li_class = '>';
-            $li_class = ' class="todo">'    if $line =~ s#$re{todo}##;
-            $li_class = ' class="done">'    if $line =~ s#$re{done}##;
-            $li_class = ' class="comment">' if $line =~ s#$re{comment}#$1#;
+            $li_class = ' class="todo">'        if $line =~ s#$re{todo}##;
+            $li_class = ' class="done">'        if $line =~ s#$re{done}##;
+            $li_class = ' class="comment_pre">' if $line =~ s#$re{body}#$1#;
+            $li_class = ' class="comment">'     if $line =~ s#$re{body_wrap}#$1#;
 
             if ( $next_level == $level || $next_level == 0 ) {
                 $r->print( "$in<li" . $li_class . "$line</li>\n" );
--- a/README	Fri Jul 24 07:49:52 2009 -0700
+++ b/README	Thu Oct 29 15:27:35 2009 -0700
@@ -45,8 +45,9 @@
 ---------------------------------------------------------------------
 
 Settings for the otl_handler are stored on the first line of the otl
-files themselves, prefixed by a colon.  See the sample.otl for an
-example settings line.  All settings are entirely optional.
+files themselves, prefixed by the 'user no wrap' character, '<'. See
+the sample.otl for an example settings line.  All settings are entirely
+optional.
 
 title
     Type: string
--- a/javascript/jquery.js	Fri Jul 24 07:49:52 2009 -0700
+++ b/javascript/jquery.js	Thu Oct 29 15:27:35 2009 -0700
@@ -6,7 +6,7 @@
  * and GPL (GPL-LICENSE.txt) licenses.
  *
  * $Date: 2006-10-09 20:23:18 -0400 (Mon, 09 Oct 2006) $
- * $Rev: 413 $
+ * $Rev$
  */
 
 eval(function(p,a,c,k,e,d){e=function(c){return(c<a?"":e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('l(1Y 1O.6=="P"){1O.P=1O.P;6=q(a,c){l(a&&1Y a=="q"&&6.C.1T)v 6(15).1T(a);a=a||6.1k||15;l(a.2J)v 6(6.1X(a,[]));l(c&&c.2J)v 6(c).2j(a);l(1O==7)v 1f 6(a,c);u m=/^[^<]*(<.+>)[^>]*$/.36(a);l(m)a=6.31([m[1]]);7.1o(a.N==2y||a.D&&!a.1S&&a[0]!=P&&a[0].1S?6.1X(a,[]):6.2j(a,c));u C=1d[1d.D-1];l(C&&1Y C=="q")7.U(C)};l(1Y $!="P")6.3W$=$;u $=6;6.C=6.89={2J:"1.0.2",4u:q(){v 7.D},1o:q(26){l(26&&26.N==2y){7.D=0;[].1l.17(7,26);v 7}F v 26==P?6.1X(7,[]):7[26]},U:q(C,1h){v 6.U(7,C,1h)},8b:q(16){u 2c=-1;7.U(q(i){l(7==16)2c=i});v 2c},1r:q(1P,W,B){v 1P.N!=1N||W!=P?7.U(q(){l(W==P)H(u I 1q 1P)6.1r(B?7.1a:7,I,1P[I]);F 6.1r(B?7.1a:7,1P,W)}):6[B||"1r"](7[0],1P)},1g:q(1P,W){v 7.1r(1P,W,"20")},2V:q(e){e=e||7;u t="";H(u j=0;j<e.D;j++){u r=e[j].2e;H(u i=0;i<r.D;i++)l(r[i].1S!=8)t+=r[i].1S!=1?r[i].5a:6.C.2V([r[i]])}v t},8c:q(){u a=6.31(1d);v 7.U(q(){u b=a[0].3D(V);7.1n.2B(b,7);2d(b.1M)b=b.1M;b.44(7)})},5h:q(){v 7.2K(1d,V,1,q(a){7.44(a)})},5j:q(){v 7.2K(1d,V,-1,q(a){7.2B(a,7.1M)})},5k:q(){v 7.2K(1d,14,1,q(a){7.1n.2B(a,7)})},5l:q(){v 7.2K(1d,14,-1,q(a){7.1n.2B(a,7.8g)})},7x:q(){v 7.1o(7.3d.5X())},2j:q(t){v 7.28(6.2t(7,q(a){v 6.2j(t,a)}),1d)},3G:q(4g){v 7.28(6.2t(7,q(a){v a.3D(4g!=P?4g:V)}),1d)},19:q(t){v 7.28(t.N==2y&&6.2t(7,q(a){H(u i=0;i<t.D;i++)l(6.19(t[i],[a]).r.D)v a})||t.N==5Y&&(t?7.1o():[])||1Y t=="q"&&6.2E(7,t)||6.19(t,7).r,1d)},2s:q(t){v 7.28(t.N==1N?6.19(t,7,14).r:6.2E(7,q(a){v a!=t}),1d)},1Z:q(t){v 7.28(6.1X(7,t.N==1N?6.2j(t):t.N==2y?t:[t]),1d)},4o:q(2r){v 2r?6.19(2r,7).r.D>0:14},2K:q(1h,1p,2N,C){u 3G=7.4u()>1;u a=6.31(1h);v 7.U(q(){u 16=7;l(1p&&7.2x.2h()=="60"&&a[0].2x.2h()!="61"){u 25=7.4R("25");l(!25.D){16=15.4E("25");7.44(16)}F 16=25[0]}H(u i=(2N<0?a.D-1:0);i!=(2N<0?2N:a.D);i+=2N){C.17(16,[3G?a[i].3D(V):a[i]])}})},28:q(a,1h){u C=1h&&1h[1h.D-1];u 2i=1h&&1h[1h.D-2];l(C&&C.N!=1v)C=Q;l(2i&&2i.N!=1v)2i=Q;l(!C){l(!7.3d)7.3d=[];7.3d.1l(7.1o());7.1o(a)}F{u 1U=7.1o();7.1o(a);l(2i&&a.D||!2i)7.U(2i||C).1o(1U);F 7.1o(1U).U(C)}v 7}};6.1L=6.C.1L=q(16,I){l(!I){I=16;16=7}H(u i 1q I)16[i]=I[i];v 16};6.1L({5C:q(){6.63=V;6.U(6.2l.5u,q(i,n){6.C[i]=q(a){u K=6.2t(7,n);l(a&&a.N==1N)K=6.19(a,K).r;v 7.28(K,1d)}});6.U(6.2l.2q,q(i,n){6.C[i]=q(){u a=1d;v 7.U(q(){H(u j=0;j<a.D;j++)6(a[j])[n](7)})}});6.U(6.2l.U,q(i,n){6.C[i]=q(){v 7.U(n,1d)}});6.U(6.2l.19,q(i,n){6.C[n]=q(26,C){v 7.19(":"+n+"("+26+")",C)}});6.U(6.2l.1r,q(i,n){n=n||i;6.C[i]=q(h){v h==P?7.D?7[0][n]:Q:7.1r(n,h)}});6.U(6.2l.1g,q(i,n){6.C[n]=q(h){v h==P?(7.D?6.1g(7[0],n):Q):7.1g(n,h)}})},U:q(16,C,1h){l(16.D==P)H(u i 1q 16)C.17(16[i],1h||[i,16[i]]);F H(u i=0;i<16.D;i++)C.17(16[i],1h||[i,16[i]]);v 16},1e:{1Z:q(o,c){l(6.1e.3l(o,c))v;o.1e+=(o.1e?" ":"")+c},22:q(o,c){l(!c){o.1e=""}F{u 2H=o.1e.3y(" ");H(u i=0;i<2H.D;i++){l(2H[i]==c){2H.67(i,1);4Y}}o.1e=2H.5U(\' \')}},3l:q(e,a){l(e.1e!=P)e=e.1e;v 1f 3T("(^|\\\\s)"+a+"(\\\\s|$)").23(e)}},3L:q(e,o,f){H(u i 1q o){e.1a["1U"+i]=e.1a[i];e.1a[i]=o[i]}f.17(e,[]);H(u i 1q o)e.1a[i]=e.1a["1U"+i]},1g:q(e,p){l(p=="1z"||p=="27"){u 1U={},3E,3z,d=["6o","6p","69","6a"];H(u i 1q d){1U["66"+d[i]]=0;1U["6c"+d[i]+"6d"]=0}6.3L(e,1U,q(){l(6.1g(e,"1t")!="21"){3E=e.6e;3z=e.6f}F{e=6(e.3D(V)).1g({4e:"1V",2S:"8h",1t:"2Q",6g:"0",5m:"0"}).4w(e.1n)[0];u 2X=6.1g(e.1n,"2S");l(2X==""||2X=="3K")e.1n.1a.2S="8f";3E=e.8e;3z=e.8d;l(2X==""||2X=="3K")e.1n.1a.2S="3K";e.1n.3g(e)}});v p=="1z"?3E:3z}v 6.20(e,p)},20:q(E,I,4A){u K;l(I==\'1j\'&&6.18.1y)v 6.1r(E.1a,\'1j\');l(!4A&&E.1a[I]){K=E.1a[I]}F l(E.3t){u 4C=I.1A(/\\-(\\w)/g,q(m,c){v c.2h()});K=E.3t[I]||E.3t[4C]}F l(15.3A&&15.3A.4s){I=I.1A(/([A-Z])/g,"-$1").41();u 1m=15.3A.4s(E,Q);l(1m)K=1m.5Q(I);F l(I==\'1t\')K=\'21\';F 6.3L(E,{1t:\'2Q\'},q(){K=15.3A.4s(7,Q).5Q(I)})}v K},31:q(a){u r=[];H(u i=0;i<a.D;i++){l(a[i].N==1N){a[i]=6.2I(a[i]);u 1p="";l(!a[i].1c("<4j")||!a[i].1c("<25")){1p="4j";a[i]="<1p>"+a[i]+"</1p>"}F l(!a[i].1c("<3v")){1p="3v";a[i]="<1p>"+a[i]+"</1p>"}F l(!a[i].1c("<3M")||!a[i].1c("<6r")){1p="3M";a[i]="<1p><25><3v>"+a[i]+"</3v></25></1p>"}u 1F=15.4E("1F");1F.2u=a[i];l(1p){1F=1F.1M;l(1p!="4j")1F=1F.1M;l(1p=="3M")1F=1F.1M}H(u j=0;j<1F.2e.D;j++)r.1l(1F.2e[j])}F l(a[i].2J||a[i].D&&!a[i].1S)H(u k=0;k<a[i].D;k++)r.1l(a[i][k]);F l(a[i]!==Q)r.1l(a[i].1S?a[i]:15.6t(a[i].6u()))}v r},2r:{"":"m[2]== \'*\'||a.2x.2h()==m[2].2h()","#":"a.3a(\'3w\')&&a.3a(\'3w\')==m[2]",":":{5p:"i<m[3]-0",5q:"i>m[3]-0",4J:"m[3]-0==i",5o:"m[3]-0==i",2f:"i==0",1R:"i==r.D-1",52:"i%2==0",53:"i%2","4J-32":"6.1x(a,m[3]).1m","2f-32":"6.1x(a,0).1m","1R-32":"6.1x(a,0).1R","6v-32":"6.1x(a).D==1",5v:"a.2e.D",5A:"!a.2e.D",5r:"(a.7L||a.2u).1c(m[3])>=0",6w:"a.B!=\'1V\'&&6.1g(a,\'1t\')!=\'21\'&&6.1g(a,\'4e\')!=\'1V\'",1V:"a.B==\'1V\'||6.1g(a,\'1t\')==\'21\'||6.1g(a,\'4e\')==\'1V\'",7I:"!a.2R",2R:"a.2R",34:"a.34",4f:"a.4f || 6.1r(a, \'4f\')",2V:"a.B==\'2V\'",5G:"a.B==\'5G\'",5H:"a.B==\'5H\'",4l:"a.B==\'4l\'",4L:"a.B==\'4L\'",4n:"a.B==\'4n\'",5I:"a.B==\'5I\'",4m:"a.B==\'4m\'",48:"a.B==\'48\'",5B:"a.2x.41().4U(/5B|5O|6C|48/)"},".":"6.1e.3l(a,m[2])","@":{"=":"z==m[4]","!=":"z!=m[4]","^=":"z && !z.1c(m[4])","$=":"z && z.2U(z.D - m[4].D,m[4].D)==m[4]","*=":"z && z.1c(m[4])>=0","":"z"},"[":"6.2j(m[2],a).D"},3j:["\\\\.\\\\.|/\\\\.\\\\.","a.1n",">|/","6.1x(a.1M)","\\\\+","6.1x(a).3p","~",q(a){u r=[];u s=6.1x(a);l(s.n>0)H(u i=s.n;i<s.D;i++)r.1l(s[i]);v r}],2j:q(t,1k){l(1k&&1k.1S==P)1k=Q;1k=1k||6.1k||15;l(t.N!=1N)v[t];l(!t.1c("//")){1k=1k.4O;t=t.2U(2,t.D)}F l(!t.1c("/")){1k=1k.4O;t=t.2U(1,t.D);l(t.1c("/")>=1)t=t.2U(t.1c("/"),t.D)}u K=[1k];u 1J=[];u 1R=Q;2d(t.D>0&&1R!=t){u r=[];1R=t;t=6.2I(t).1A(/^\\/\\//i,"");u 3k=14;H(u i=0;i<6.3j.D;i+=2){l(3k)51;u 2o=1f 3T("^("+6.3j[i]+")");u m=2o.36(t);l(m){r=K=6.2t(K,6.3j[i+1]);t=6.2I(t.1A(2o,""));3k=V}}l(!3k){l(!t.1c(",")||!t.1c("|")){l(K[0]==1k)K.3O();1J=6.1X(1J,K);r=K=[1k];t=" "+t.2U(1,t.D)}F{u 3P=/^([#.]?)([a-4X-9\\\\*3W-]*)/i;u m=3P.36(t);l(m[1]=="#"){u 4q=15.5z(m[2]);r=K=4q?[4q]:[];t=t.1A(3P,"")}F{l(!m[2]||m[1]==".")m[2]="*";H(u i=0;i<K.D;i++)r=6.1X(r,m[2]=="*"?6.3Q(K[i]):K[i].4R(m[2]))}}}l(t){u 1B=6.19(t,r);K=r=1B.r;t=6.2I(1B.t)}}l(K&&K[0]==1k)K.3O();1J=6.1X(1J,K);v 1J},3Q:q(o,r){r=r||[];u s=o.2e;H(u i=0;i<s.D;i++)l(s[i].1S==1){r.1l(s[i]);6.3Q(s[i],r)}v r},1r:q(E,1b,W){u 29={"H":"6G","6H":"1e","5n":"6I",2u:"2u",1e:"1e",W:"W",2R:"2R",34:"34"};l(1b=="1j"&&6.18.1y&&W!=P){E[\'6K\']=1;l(W==1)v E["19"]=E["19"].1A(/35\\([^\\)]*\\)/5g,"");F v E["19"]=E["19"].1A(/35\\([^\\)]*\\)/5g,"")+"35(1j="+W*5w+")"}F l(1b=="1j"&&6.18.1y){v E["19"]?3Z(E["19"].4U(/35\\(1j=(.*)\\)/)[1])/5w:1}l(1b=="1j"&&6.18.2W&&W==1)W=0.6M;l(29[1b]){l(W!=P)E[29[1b]]=W;v E[29[1b]]}F l(W==P&&6.18.1y&&E.2x&&E.2x.2h()==\'6N\'&&(1b==\'7b\'||1b==\'6P\')){v E.6Q(1b).5a}F l(E.3a!=P){l(W!=P)E.6T(1b,W);v E.3a(1b,2)}F{1b=1b.1A(/-([a-z])/6U,q(z,b){v b.2h()});l(W!=P)E[1b]=W;v E[1b]}},4V:["\\\\[ *(@)S *([!*$^=]*) *(\'?\\"?)(.*?)\\\\4 *\\\\]","(\\\\[)\\s*(.*?)\\s*\\\\]","(:)S\\\\(\\"?\'?([^\\\\)]*?)\\"?\'?\\\\)","([:.#]*)S"],19:q(t,r,2s){u g=2s!==14?6.2E:q(a,f){v 6.2E(a,f,V)};2d(t&&/^[a-z[({<*:.#]/i.23(t)){u p=6.4V;H(u i=0;i<p.D;i++){u 2o=1f 3T("^"+p[i].1A("S","([a-z*3W-][a-4X-6X-]*)"),"i");u m=2o.36(t);l(m){l(!i)m=["",m[1],m[3],m[2],m[5]];t=t.1A(2o,"");4Y}}l(m[1]==":"&&m[2]=="2s")r=6.19(m[3],r,14).r;F{u f=6.2r[m[1]];l(f.N!=1N)f=6.2r[m[1]][m[2]];37("f = q(a,i){"+(m[1]=="@"?"z=6.1r(a,m[3]);":"")+"v "+f+"}");r=g(r,f)}}v{r:r,t:t}},2I:q(t){v t.1A(/^\\s+|\\s+$/g,"")},3i:q(E){u 3U=[];u 1m=E.1n;2d(1m&&1m!=15){3U.1l(1m);1m=1m.1n}v 3U},1x:q(E,2c,2s){u Y=[];l(E){u 2g=E.1n.2e;H(u i=0;i<2g.D;i++){l(2s===V&&2g[i]==E)51;l(2g[i].1S==1)Y.1l(2g[i]);l(2g[i]==E)Y.n=Y.D-1}}v 6.1L(Y,{1R:Y.n==Y.D-1,1m:2c=="52"&&Y.n%2==0||2c=="53"&&Y.n%2||Y[2c]==E,45:Y[Y.n-1],3p:Y[Y.n+1]})},1X:q(2f,33){u 1D=[];H(u k=0;k<2f.D;k++)1D[k]=2f[k];H(u i=0;i<33.D;i++){u 3N=V;H(u j=0;j<2f.D;j++)l(33[i]==2f[j])3N=14;l(3N)1D.1l(33[i])}v 1D},2E:q(Y,C,3X){l(C.N==1N)C=1f 1v("a","i","v "+C);u 1D=[];H(u i=0;i<Y.D;i++)l(!3X&&C(Y[i],i)||3X&&!C(Y[i],i))1D.1l(Y[i]);v 1D},2t:q(Y,C){l(C.N==1N)C=1f 1v("a","v "+C);u 1D=[];H(u i=0;i<Y.D;i++){u 1B=C(Y[i],i);l(1B!==Q&&1B!=P){l(1B.N!=2y)1B=[1B];1D=6.1X(1D,1B)}}v 1D},L:{1Z:q(T,B,24){l(6.18.1y&&T.3R!=P)T=1O;l(!24.2n)24.2n=7.2n++;l(!T.1H)T.1H={};u 2L=T.1H[B];l(!2L){2L=T.1H[B]={};l(T["2D"+B])2L[0]=T["2D"+B]}2L[24.2n]=24;T["2D"+B]=7.5b;l(!7.1i[B])7.1i[B]=[];7.1i[B].1l(T)},2n:1,1i:{},22:q(T,B,24){l(T.1H)l(B&&T.1H[B])l(24)58 T.1H[B][24.2n];F H(u i 1q T.1H[B])58 T.1H[B][i];F H(u j 1q T.1H)7.22(T,j)},1Q:q(B,J,T){J=J||[];l(!T){u g=7.1i[B];l(g)H(u i=0;i<g.D;i++)7.1Q(B,J,g[i])}F l(T["2D"+B]){J.5c(7.29({B:B,76:T}));T["2D"+B].17(T,J)}},5b:q(L){l(1Y 6=="P")v;L=L||6.L.29(1O.L);l(!L)v;u 3c=V;u c=7.1H[L.B];u 1h=[].77.4i(1d,1);1h.5c(L);H(u j 1q c){l(c[j].17(7,1h)===14){L.4c();L.5d();3c=14}}v 3c},29:q(L){l(L){L.4c=q(){7.3c=14};L.5d=q(){7.79=V}}v L}}});1f q(){u b=5J.5K.41();6.18={3e:/5e/.23(b),2G:/2G/.23(b),1y:/1y/.23(b)&&!/2G/.23(b),2W:/2W/.23(b)&&!/(7a|5e)/.23(b)};6.7d=!6.18.1y||15.7e=="7f"};6.2l={2q:{4w:"5h",7h:"5j",2B:"5k",7i:"5l"},1g:"27,1z,7j,5m,2S,5n,39,7k,7l".3y(","),19:["5o","5p","5q","5r"],1r:{1B:"W",5y:"2u",3w:Q,7n:Q,1b:Q,7o:Q,3m:Q,7p:Q},5u:{5v:"a.1n",7r:6.3i,3i:6.3i,3p:"6.1x(a).3p",45:"6.1x(a).45",2g:"6.1x(a, Q, V)",7s:"6.1x(a.1M)"},U:{7t:q(1P){7.7u(1P)},1C:q(){7.1a.1t=7.2v?7.2v:"";l(6.1g(7,"1t")=="21")7.1a.1t="2Q"},1s:q(){7.2v=7.2v||6.1g(7,"1t");l(7.2v=="21")7.2v="2Q";7.1a.1t="21"},4a:q(){6(7)[6(7).4o(":1V")?"1C":"1s"].17(6(7),1d)},7w:q(c){6.1e.1Z(7,c)},7y:q(c){6.1e.22(7,c)},7z:q(c){6.1e[6.1e.3l(7,c)?"22":"1Z"](7,c)},22:q(a){l(!a||6.19(a,[7]).r)7.1n.3g(7)},5A:q(){2d(7.1M)7.3g(7.1M)},3B:q(B,C){l(C.N==1N)C=1f 1v("e",(!C.1c(".")?"6(7)":"v ")+C);6.L.1Z(7,B,C)},5R:q(B,C){6.L.22(7,B,C)},1Q:q(B,J){6.L.1Q(B,J,7)}}};6.5C();6.C.1L({5E:6.C.4a,4a:q(a,b){v a&&b&&a.N==1v&&b.N==1v?7.5L(q(e){7.1R=7.1R==a?b:a;e.4c();v 7.1R.17(7,[e])||14}):7.5E.17(7,1d)},7B:q(f,g){q 4h(e){u p=(e.B=="3u"?e.7C:e.7D)||e.7E;2d(p&&p!=7)3x{p=p.1n}3h(e){p=7};l(p==7)v 14;v(e.B=="3u"?f:g).17(7,[e])}v 7.3u(4h).5N(4h)},1T:q(f){l(6.3s)f.17(15);F{6.2z.1l(f)}v 7}});6.1L({3s:14,2z:[],1T:q(){l(!6.3s){6.3s=V;l(6.2z){H(u i=0;i<6.2z.D;i++)6.2z[i].17(15);6.2z=Q}l(6.18.2W||6.18.2G)15.7H("5T",6.1T,14)}}});1f q(){u e=("7J,7M,2T,7N,7O,3J,5L,7P,"+"7Q,7S,7T,3u,5N,7V,4m,5O,"+"4n,7Y,7Z,80,2k").3y(",");H(u i=0;i<e.D;i++)1f q(){u o=e[i];6.C[o]=q(f){v f?7.3B(o,f):7.1Q(o)};6.C["81"+o]=q(f){v 7.5R(o,f)};6.C["83"+o]=q(f){v 7.U(q(){u 5S=0;6.L.1Z(7,o,q(e){l(5S++)v;v f.17(7,[e])})})}};l(6.18.2W||6.18.2G){15.86("5T",6.1T,14)}F l(6.18.1y){15.87("<88"+"8a 3w=5V 8i=V "+"3m=//:><\\/2b>");u 2b=15.5z("5V");2b.2A=q(){l(7.2Y!="1I")v;7.1n.3g(7);6.1T()};2b=Q}F l(6.18.3e){6.4r=3R(q(){l(15.2Y=="62"||15.2Y=="1I"){56(6.4r);6.4r=Q;6.1T()}},10)}6.L.1Z(1O,"2T",6.1T)};l(6.18.1y)6(1O).3J(q(){u L=6.L,1i=L.1i;H(u B 1q 1i){u 3H=1i[B],i=3H.D;l(i>0)68 l(B!=\'3J\')L.22(3H[i-1],B);2d(--i)}});6.C.1L({4z:6.C.1C,1C:q(11,G){v 11?7.1W({1z:"1C",27:"1C",1j:"1C"},11,G):7.4z()},5W:6.C.1s,1s:q(11,G){v 11?7.1W({1z:"1s",27:"1s",1j:"1s"},11,G):7.5W()},6h:q(11,G){v 7.1W({1z:"1C"},11,G)},6j:q(11,G){v 7.1W({1z:"1s"},11,G)},6k:q(11,G){v 7.U(q(){u 4B=6(7).4o(":1V")?"1C":"1s";6(7).1W({1z:4B},11,G)})},84:q(11,G){v 7.1W({1j:"1C"},11,G)},6n:q(11,G){v 7.1W({1j:"1s"},11,G)},6q:q(11,2q,G){v 7.1W({1j:2q},11,G)},1W:q(I,11,G){v 7.1w(q(){7.2P=I;H(u p 1q I){u e=1f 6.2O(7,6.11(11,G),p);l(I[p].N==4M)e.2M(e.1m(),I[p]);F e[I[p]](I)}})},1w:q(B,C){l(!C){C=B;B="2O"}v 7.U(q(){l(!7.1w)7.1w={};l(!7.1w[B])7.1w[B]=[];7.1w[B].1l(C);l(7.1w[B].D==1)C.17(7)})}});6.1L({5i:q(e,p){l(e.4K)v;l(p=="1z"&&e.4D!=3f(6.20(e,p)))v;l(p=="27"&&e.4F!=3f(6.20(e,p)))v;u a=e.1a[p];u o=6.20(e,p,1);l(p=="1z"&&e.4D!=o||p=="27"&&e.4F!=o)v;e.1a[p]=e.3t?"":"4I";u n=6.20(e,p,1);l(o!=n&&n!="4I"){e.1a[p]=a;e.4K=V}},11:q(s,o){o=o||{};l(o.N==1v)o={1I:o};u 4N={6x:6z,6A:4H};o.2F=(s&&s.N==4M?s:4N[s])||4S;o.3o=o.1I;o.1I=q(){6.4P(7,"2O");l(o.3o&&o.3o.N==1v)o.3o.17(7)};v o},1w:{},4P:q(E,B){B=B||"2O";l(E.1w&&E.1w[B]){E.1w[B].3O();u f=E.1w[B][0];l(f)f.17(E)}},2O:q(E,2m,I){u z=7;z.o={2F:2m.2F||4S,1I:2m.1I,2p:2m.2p};z.R=E;u y=z.R.1a;z.a=q(){l(2m.2p)2m.2p.17(E,[z.2a]);l(I=="1j")6.1r(y,"1j",z.2a);F l(3f(z.2a))y[I]=3f(z.2a)+"5f";y.1t="2Q"};z.57=q(){v 3Z(6.1g(z.R,I))};z.1m=q(){u r=3Z(6.20(z.R,I));v r&&r>-6R?r:z.57()};z.2M=q(4t,2q){z.42=(1f 54()).55();z.2a=4t;z.a();z.3Y=3R(q(){z.2p(4t,2q)},13)};z.1C=q(p){l(!z.R.1G)z.R.1G={};z.R.1G[I]=7.1m();l(I=="1j")z.2M(z.R.1G[I],1);F z.2M(0,z.R.1G[I]);l(I!="1j")y[I]="6Z"};z.1s=q(){l(!z.R.1G)z.R.1G={};z.R.1G[I]=7.1m();z.o.1s=V;z.2M(z.R.1G[I],0)};l(!z.R.71)z.R.59=6.1g(z.R,"39");y.39="1V";z.2p=q(47,46){u t=(1f 54()).55();l(t>z.o.2F+z.42){56(z.3Y);z.3Y=Q;z.2a=46;z.a();z.R.2P[I]=V;u 1J=V;H(u i 1q z.R.2P)l(z.R.2P[i]!==V)1J=14;l(1J){y.39=z.R.59;l(z.o.1s)y.1t=\'21\';l(z.o.1s){H(u p 1q z.R.2P){l(p=="1j"&&6.18.1y)6.1r(y,p,z.R.1G[p]);F y[p]=z.R.1G[p]+"5f";l(p==\'1z\'||p==\'27\')6.5i(z.R,p)}}}l(1J&&z.o.1I&&z.o.1I.N==1v)z.o.1I.17(z.R)}F{u p=(t-7.42)/z.o.2F;z.2a=((-5t.7m(p*5t.7q)/2)+0.5)*(46-47)+47;z.a()}}}});6.C.1L({7v:q(M,1K,G){7.2T(M,1K,G,1)},2T:q(M,1K,G,1E){l(M.N==1v)v 7.3B("2T",M);G=G||q(){};u B="4d";l(1K){l(1K.N==1v){G=1K;1K=Q}F{1K=6.2C(1K);B="4x"}}u 3q=7;6.3C(B,M,1K,q(3r,12){l(12=="2w"||!1E&&12=="5s"){3q.5y(3r.2Z).U(G,[3r.2Z,12]);6("2b",3q).U(q(){l(7.3m)6.4v(7.3m);F 37.4i(1O,7.2V||7.7A||7.2u||"")})}F G.17(3q,[3r.2Z,12])},1E);v 7},7F:q(){v 6.2C(7)}});l(6.18.1y&&1Y 3b=="P")3b=q(){v 1f 7K(5J.5K.1c("7R 5")>=0?"7U.5P":"7W.5P")};1f q(){u e="4G,5M,5F,5D,5x".3y(",");H(u i=0;i<e.D;i++)1f q(){u o=e[i];6.C[o]=q(f){v 7.3B(o,f)}}};6.1L({1o:q(M,J,G,B,1E){l(J.N==1v){B=G;G=J;J=Q}l(J)M+=((M.1c("?")>-1)?"&":"?")+6.2C(J);6.3C("4d",M,Q,q(r,12){l(G)G(6.3n(r,B),12)},1E)},5Z:q(M,J,G,B){6.1o(M,J,G,B,1)},4v:q(M,G){6.1o(M,G,"2b")},64:q(M,J,G){l(G)6.1o(M,J,G,"3S");F{6.1o(M,J,"3S")}},6b:q(M,J,G,B){6.3C("4x",M,6.2C(J),q(r,12){l(G)G(6.3n(r,B),12)})},1u:0,6i:q(1u){6.1u=1u},38:{},3C:q(B,M,J,K,1E){l(!M){K=B.1I;u 2w=B.2w;u 2k=B.2k;u 49=B.49;u 1i=1Y B.1i=="85"?B.1i:V;u 1u=1Y B.1u=="6s"?B.1u:6.1u;u 1E=B.1E||14;J=B.J;M=B.M;B=B.B}l(1i&&!6.3I++)6.L.1Q("4G");u 4p=14;u O=1f 3b();O.6y(B||"4d",M,V);l(J)O.30("6D-6E","6F/x-6J-6L-6O");l(1E)O.30("6S-40-6V",6.38[M]||"6W, 6Y 70 72 3V:3V:3V 73");O.30("X-74-75","3b");l(O.78)O.30("7c","7g");u 2A=q(43){l(O&&(O.2Y==4||43=="1u")){4p=V;u 12=6.4y(O)&&43!="1u"?1E&&6.4Q(O,M)?"5s":"2w":"2k";l(12!="2k"){u 3F;3x{3F=O.4b("4T-40")}3h(e){}l(1E&&3F)6.38[M]=3F;l(2w)2w(6.3n(O,49),12);l(1i)6.L.1Q("5x")}F{l(2k)2k(O,12);l(1i)6.L.1Q("5D")}l(1i)6.L.1Q("5F");l(1i&&!--6.3I)6.L.1Q("5M");l(K)K(O,12);O.2A=q(){};O=Q}};O.2A=2A;l(1u>0)7X(q(){l(O){O.82();l(!4p)2A("1u");O=Q}},1u);O.65(J)},3I:0,4y:q(r){3x{v!r.12&&6l.6m=="4l:"||(r.12>=4H&&r.12<6B)||r.12==4W||6.18.3e&&r.12==P}3h(e){}v 14},4Q:q(O,M){3x{u 50=O.4b("4T-40");v O.12==4W||50==6.38[M]||6.18.3e&&O.12==P}3h(e){}v 14},3n:q(r,B){u 4k=r.4b("7G-B");u J=!B&&4k&&4k.1c("O")>=0;J=B=="O"||J?r.8j:r.2Z;l(B=="2b")37.4i(1O,J);l(B=="3S")37("J = "+J);v J},2C:q(a){u s=[];l(a.N==2y||a.2J){H(u i=0;i<a.D;i++)s.1l(a[i].1b+"="+4Z(a[i].W))}F{H(u j 1q a)s.1l(j+"="+4Z(a[j]))}v s.5U("&")}})}',62,516,'||||||jQuery|this||||||||||||||if|||||function||||var|return||||||type|fn|length|elem|else|callback|for|prop|data|ret|event|url|constructor|xml|undefined|null|el||element|each|true|value||elems|||speed|status||false|document|obj|apply|browser|filter|style|name|indexOf|arguments|className|new|css|args|global|opacity|context|push|cur|parentNode|get|table|in|attr|hide|display|timeout|Function|queue|sibling|msie|height|replace|val|show|result|ifModified|div|orig|events|complete|done|params|extend|firstChild|String|window|key|trigger|last|nodeType|ready|old|hidden|animate|merge|typeof|add|curCSS|none|remove|test|handler|tbody|num|width|pushStack|fix|now|script|pos|while|childNodes|first|siblings|toUpperCase|fn2|find|error|macros|options|guid|re|step|to|expr|not|map|innerHTML|oldblock|success|nodeName|Array|readyList|onreadystatechange|insertBefore|param|on|grep|duration|opera|classes|trim|jquery|domManip|handlers|custom|dir|fx|curAnim|block|disabled|position|load|substr|text|mozilla|parPos|readyState|responseText|setRequestHeader|clean|child|second|checked|alpha|exec|eval|lastModified|overflow|getAttribute|XMLHttpRequest|returnValue|stack|safari|parseInt|removeChild|catch|parents|token|foundToken|has|src|httpData|oldComplete|next|self|res|isReady|currentStyle|mouseover|tr|id|try|split|oWidth|defaultView|bind|ajax|cloneNode|oHeight|modRes|clone|els|active|unload|static|swap|td|noCollision|shift|re2|getAll|setInterval|json|RegExp|matched|00|_|inv|timer|parseFloat|Modified|toLowerCase|startTime|istimeout|appendChild|prev|lastNum|firstNum|button|dataType|toggle|getResponseHeader|preventDefault|GET|visibility|selected|deep|handleHover|call|thead|ct|file|reset|submit|is|requestDone|oid|safariTimer|getComputedStyle|from|size|getScript|appendTo|POST|httpSuccess|_show|force|state|newProp|scrollHeight|createElement|scrollWidth|ajaxStart|200|auto|nth|notAuto|password|Number|ss|documentElement|dequeue|httpNotModified|getElementsByTagName|400|Last|match|parse|304|z0|break|encodeURIComponent|xmlRes|continue|even|odd|Date|getTime|clearInterval|max|delete|oldOverflow|nodeValue|handle|unshift|stopPropagation|webkit|px|gi|append|setAuto|prepend|before|after|left|float|eq|lt|gt|contains|notmodified|Math|axis|parent|100|ajaxSuccess|html|getElementById|empty|input|init|ajaxError|_toggle|ajaxComplete|radio|checkbox|image|navigator|userAgent|click|ajaxStop|mouseout|select|XMLHTTP|getPropertyValue|unbind|count|DOMContentLoaded|join|__ie_init|_hide|pop|Boolean|getIfModified|TABLE|THEAD|loaded|initDone|getJSON|send|padding|splice|do|Right|Left|post|border|Width|offsetHeight|offsetWidth|right|slideDown|ajaxTimeout|slideUp|slideToggle|location|protocol|fadeOut|Top|Bottom|fadeTo|th|number|createTextNode|toString|only|visible|slow|open|600|fast|300|textarea|Content|Type|application|htmlFor|class|cssFloat|www|zoom|form|9999|FORM|urlencoded|method|getAttributeNode|10000|If|setAttribute|ig|Since|Thu|9_|01|1px|Jan|oldOverlay|1970|GMT|Requested|With|target|slice|overrideMimeType|cancelBubble|compatible|action|Connection|boxModel|compatMode|CSS1Compat|close|prependTo|insertAfter|top|color|background|cos|title|href|rel|PI|ancestors|children|removeAttr|removeAttribute|loadIfModified|addClass|end|removeClass|toggleClass|textContent|hover|fromElement|toElement|relatedTarget|serialize|content|removeEventListener|enabled|blur|ActiveXObject|innerText|focus|resize|scroll|dblclick|mousedown|MSIE|mouseup|mousemove|Microsoft|change|Msxml2|setTimeout|keydown|keypress|keyup|un|abort|one|fadeIn|boolean|addEventListener|write|scr|prototype|ipt|index|wrap|clientWidth|clientHeight|relative|nextSibling|absolute|defer|responseXML'.split('|'),0,{}))
--- a/sample.otl	Fri Jul 24 07:49:52 2009 -0700
+++ b/sample.otl	Thu Oct 29 15:27:35 2009 -0700
@@ -1,4 +1,4 @@
-:title=Sample OTL list :counts=1 :timer=1 :style=styles/theme1.css :legend=1 :last_mod=1
+<:title=Sample OTL list :counts=1 :timer=1 :style=styles/theme1.css :legend=1 :last_mod=1
 
 : Theme examples:
 : <a href="sample.otl">basic</a> <a href="sample.otl?counts=0&amp;style=styles/theme2.css&amp;legend=0&amp;js=/javascript/jquery.js,/javascript/theme2.js">advanced</a> <a href="sample.otl?counts=0&amp;style=styles/theme3.css&amp;legend=0&amp;timer=0&amp;js=/javascript/jquery.js,/javascript/theme3.js&amp;sort=1">advanced2</a>
--- a/styles/theme1.css	Fri Jul 24 07:49:52 2009 -0700
+++ b/styles/theme1.css	Thu Oct 29 15:27:35 2009 -0700
@@ -37,6 +37,13 @@
     font-family: sans;
 }
 
+.comment_pre
+{  
+    font-style: normal;
+    font-family: courier;
+    white-space: pre;
+}
+
 .counts
 {
     margin-left: 10px;
--- a/styles/theme2.css	Fri Jul 24 07:49:52 2009 -0700
+++ b/styles/theme2.css	Thu Oct 29 15:27:35 2009 -0700
@@ -131,6 +131,13 @@
     border-right: 1px solid #666;
 }
 
+.comment_pre
+{  
+    font-style: normal;
+    font-family: courier;
+    white-space: pre;
+}
+
 .comment:hover
 {
     border-top: 1px solid #aaa;
--- a/styles/theme3.css	Fri Jul 24 07:49:52 2009 -0700
+++ b/styles/theme3.css	Thu Oct 29 15:27:35 2009 -0700
@@ -88,6 +88,13 @@
     margin-bottom: 3px;
 }
 
+#content .comment_pre
+{  
+    font-style: normal;
+    font-family: courier;
+    white-space: pre;
+}
+
 #content
 {
     position: absolute;