--- deliantra/Deliantra-Client/DC.pm	2006/07/23 08:58:43	1.103
+++ deliantra/Deliantra-Client/DC.pm	2006/07/23 16:11:12	1.105
@@ -61,63 +61,14 @@
    ${$_[0]}->()
 }
 
-package CFClient::PodToPango;
+sub asxml($) {
+   local $_ = $_[0];
 
-use base Pod::POM::View::Text;
+   s/&/&/g;
+   s/>/>/g;
+   s/</&lt;/g;
 
-our $VERSION = 1; # bump if resultant formatting changes
-
-our $indent = 0;
-
-*view_seq_code   =
-*view_seq_bold   = sub { "<b>$_[1]</b>" };
-*view_seq_italic = sub { "<i>$_[1]</i>" };
-*view_seq_space  =
-*view_seq_link   =
-*view_seq_index  = sub { CFClient::UI::Label::escape ($_[1]) };
-
-sub view_seq_text {
-   my $text = $_[1];
-   $text =~ s/\s+/ /g;
-   CFClient::UI::Label::escape ($text)
-}
-
-sub view_item {
-   ("\t" x ($indent / 4))
-   . $_[1]->title->present ($_[0])
-   . "\n\n"
-   . $_[1]->content->present ($_[0])
-}
-
-sub view_verbatim {
-   (join "",
-       map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
-          split /\n/, CFClient::UI::Label::escape ($_[1]))
-   . "\n"
-}
-
-sub view_textblock {
-   ("\t" x ($indent / 2)) . "$_[1]\n\n"
-}
-
-sub view_head1 {
-   "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
-   . $_[1]->content->present ($_[0])
-};
-
-sub view_head2 {
-   "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
-   . $_[1]->content->present ($_[0])
-};
-
-sub view_head3 {
-   "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
-   . $_[1]->content->present ($_[0])
-};
-
-sub view_over {
-   local $indent = $indent + $_[1]->indent;
-   $_[1]->content->present ($_[0])
+   $_
 }
 
 package CFClient::Database;
@@ -223,51 +174,6 @@
          or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
 }
 
-my $pod_cache = db_table "pod_cache";
-
-sub load_pod($$$$) {
-   my ($path, $filtertype, $filterversion, $filtercb) = @_;
-
-   stat $path
-      or die "$path: $!";
-
-   my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9];
-
-   my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } };
-
-   return $pom if $chash eq $phash;
-
-   my $pod = do {
-      local $/;
-      open my $pod, "<:utf8", $_[0]
-         or die "$_[0]: $!";
-      <$pod>
-   };
-
-   #utf8::downgrade $pod;
-
-   $pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
-
-   $pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
-
-   $pom
-}
-
-sub pod_to_pango($) {
-   my ($pom) = @_;
-
-   $pom->present ("CFClient::PodToPango")
-}
-
-sub pod_to_pango_list($) {
-   my ($pom) = @_;
-
-   [
-      map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
-         split /\n/, $pom->present ("CFClient::PodToPango")
-   ]
-}
-
 package CFClient::Layout;
 
 $CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub {
@@ -392,7 +298,7 @@
                : (
                   ["lock",   sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
                   ["$move_prefix all",   sub { $::CONN->send ("move $targ $self->{tag} 0") }],
-                  ["$move_prefix <n>", 
+                  ["$move_prefix &lt;n&gt;", 
                      sub {
                         do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
                      }