--- deliantra/server/lib/cf/pod.pm	2007/04/18 17:57:24	1.6
+++ deliantra/server/lib/cf/pod.pm	2008/09/08 11:37:08	1.16
@@ -12,12 +12,15 @@
 
 use base "Pod::POM::View";
 
-sub asxml($) {
+my %E = (
+   "<" => "E<lt>",
+   ">" => "E<gt>",
+);
+
+sub aspod($) {
    local $_ = $_[0];
 
-   s/&/&amp;/g;
-   s/>/&gt;/g;
-   s/</&lt;/g;
+   s/[<>]/$E{$1}/g;
 
    $_
 }
@@ -25,7 +28,6 @@
 sub flatten($) {
    local $_ = $_[0];
 
-   s/<[^>]+>//g;
    s/^\s+//;
    s/\s+$//;
    s/\s+/ /g;
@@ -33,18 +35,18 @@
    $_
 }
 
-*view_seq_file   =
-*view_seq_code   =
-*view_seq_bold   = sub { "<b>$_[1]</b>" };
-*view_seq_italic = sub { "<i>$_[1]</i>" };
-*view_seq_zero   = sub { };
+*view_seq_file   = sub { "B<$_[1]>" };
+*view_seq_code   = sub { "B<$_[1]>" };
+*view_seq_bold   = sub { "B<$_[1]>" };
+*view_seq_italic = sub { "I<$_[1]>" };
+*view_seq_zero   = sub { "Z<>" };
 *view_seq_space  = sub { my $text = $_[1]; $text =~ s/ /\xa0/g; $text };
 *view_seq_index  = sub { push @{ $result[-1]{index} }, $_[1]; "" };
 
 sub view_seq_text {
    my $text = $_[1];
    $text =~ s/\s+/ /g;
-   asxml $text
+   aspod $text
 }
 
 sub view_seq_link {
@@ -53,7 +55,7 @@
    my $text = $link =~ s/^(.*)\|// ? $1 : $link;
 
    if ($link =~ /http:/) {
-      "<u>" . (asxml $link) . "</u>"
+      "U<" . (aspod $link) . ">"
    } else {
       ()
    }
@@ -78,7 +80,7 @@
       type   => "verbatim",
       indent => $indent * 16,
       level  => $level,
-      markup => asxml $_[1],
+      markup => $_[1],
    };
    ()
 }
@@ -185,35 +187,35 @@
    my ($path) = @_;
 
    Coro::Storable::thaw cf::cache "cf::pod::as_paragraphs/$path" => [$path],
-      1 => sub {
+      6 => sub {
          my ($src) = @_;
+
          cf::fork_call {
             my $pod = $src->[0];
             utf8::decode $pod;
-            Coro::Storable::freeze pom_as_paragraphs +(Pod::POM->new->parse_text ($pod))
+            Coro::Storable::blocking_nfreeze pom_as_paragraphs +(Pod::POM->new->parse_text ($pod))
          }
       };
 }
 
-sub as_text($) {
+# format as cfpod-style text
+sub as_cfpod($) {
    my ($pars) = @_;
 
    my $res;
 
    for my $par (@$pars) {
       if ($par->{type} =~ /^head\d+$/) {
-         $res .= "$par->{markup}\n\n";
+         $res .= "B<$par->{markup}>\n\n";
       } elsif ($par->{type} eq "verbatim") {
-         $res .= "\n$par->{markup}\n\n";
+         $res .= "$par->{markup}\n\n";
       } elsif ($par->{type} eq "item") {
-         $res .= "\n* $par->{markup}\n\n";
+         $res .= "* I<$par->{markup}>\n\n";
       } else {
-         $res .= "$par->{markup}\n";
+         $res .= "$par->{markup}\n\n";
       }
    }
 
-   $res =~ s/\n\n+/\n/g;
-
    $res
 }