* 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;

     1

     2

body

     3

{

     4

    background-color: #444;

     5

    font: 11px/1.8em sans-serif;

     6

    margin: 0;

     7

    padding-bottom: 50px;

     8

    color: #ccc;

     9

}

    10

    11

a, a:visited

    12

{

    13

    text-decoration: none;

    14

    color: #7f9ab5;

    15

}

    16

    17

.header

    18

{

    19

    background-color: #aaa;

    20

    padding: 3px 0 3px 120px;

    21

    margin-top: 50px;

    22

    color: #3a5f85;

    23

    border-top: 5px solid #333;

    24

    font-size: 20px;

    25

    font-weight: bold;

    26

}

    27

    28

.last_mod

    29

{

    30

    padding-left: 120px;

    31

    background-color: #333;

    32

    border-bottom: 1px solid #000;

    33

    font-size: 0.85em;

    34

    color: #999;

    35

}

    36

    37

.percent

    38

{

    39

    display: none;

    40

    color: #7f9ab5;

    41

    font-weight: bold;

    42

    position: absolute;

    43

    left: 115px;

    44

}

    45

    46

.linenum

    47

{

    48

    color: #7f9ab5;

    49

    position: absolute;

    50

    left: 0;

    51

    font-size: 9px;

    52

    font-weight: normal;

    53

    font-style: normal;

    54

    width: 60px;

    55

    text-align: right;

    56

}

    57

    58

.linenum-folded

    59

{

    60

    color: #666;

    61

}

    62

    63

.timer

    64

{

    65

    color: #666;

    66

    position: absolute;

    67

    top: 5px;

    68

    right: 10px;

    69

}

    70

    71

.outline

    72

{

    73

    width: 400px;

    74

    margin: 20px 0 0 150px;

    75

    display: none;

    76

    cursor: pointer;

    77

}

    78

    79

.outline ul

    80

{

    81

    margin: 0;

    82

    padding: 0 10px 0 5px;

    83

    list-style-type: none;

    84

}

    85

    86

.outline ul li

    87

{

    88

    padding: 0 0 0 10px;

    89

    display: block;

    90

    color: #fff;

    91

    font-size: 14px;

    92

    font-weight: bold;

    93

}

    94

    95

.outline ul li:hover

    96

{

    97

    color: #fff;

    98

}

    99

   100

.outline ul li ul li

   101

{

   102

    border-left: 1px solid #666;

   103

    color: #ccc;

   104

    font-size: 11px;

   105

    font-weight: normal;

   106

}

   107

   108

.outline ul li ul li:hover

   109

{

   110

    border-left: 1px solid #aaa;

   111

}

   112

   113

.done

   114

{

   115

    color: #777 !important;

   116

    font-style: italic;

   117

}

   118

   119

.done:after

   120

{

   121

    font-size: 0.9em;

   122

    content: " (done)";

   123

}

   124

   125

.comment

   126

{

   127

    padding-right: 2px !important;

   128

    font-style: italic;

   129

    border-top: 1px solid #666;

   130

    border-bottom: 1px solid #666;

   131

    border-right: 1px solid #666;

   132

}

   133

   134

.comment_pre

   135

{  

   136

    font-style: normal;

   137

    font-family: courier;

   138

    white-space: pre;

   139

}

   140

   141

.comment:hover

   142

{

   143

    border-top: 1px solid #aaa;

   144

    border-bottom: 1px solid #aaa;

   145

    border-right: 1px solid #aaa;

   146

}

   147

   148

.selected

   149

{

   150

    background-color: #3d3d3d;

   151

}

   152