--- deliantra/Deliantra-Client/DC/Pod.pm	2006/07/24 08:23:28	1.2
+++ deliantra/Deliantra-Client/DC/Pod.pm	2006/07/30 13:16:44	1.3
@@ -1,18 +1,18 @@
-package CFClient::Pod;
+package CFPlus::Pod;
 
 use strict;
 
 use Pod::POM;
 
-use CFClient;
-use CFClient::UI;
+use CFPlus;
+use CFPlus::UI;
 
 our $VERSION = 1.02; # bump if resultant formatting changes
 
 our @result;
 our $indent;
 
-package CFClient::Pod::AsMarkup;
+package CFPlus::Pod::AsMarkup;
 
 use strict;
 
@@ -23,14 +23,14 @@
 *view_seq_bold   = sub { "<b>$_[1]</b>" };
 *view_seq_italic = sub { "<i>$_[1]</i>" };
 *view_seq_space  =
-*view_seq_link   = sub { CFClient::asxml $_[1] };
+*view_seq_link   = sub { CFPlus::asxml $_[1] };
 *view_seq_zero   =
 *view_seq_index  = sub { };
 
 sub view_seq_text {
    my $text = $_[1];
    $text =~ s/\s+/ /g;
-   CFClient::asxml $text
+   CFPlus::asxml $text
 }
 
 sub view_item {
@@ -43,7 +43,7 @@
 sub view_verbatim {
    (join "",
        map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
-          split /\n/, CFClient::asxml $_[1])
+          split /\n/, CFPlus::asxml $_[1])
    . "\n"
 }
 
@@ -71,7 +71,7 @@
    $_[1]->content->present ($_[0])
 }
 
-package CFClient::Pod::AsParagraphs;
+package CFPlus::Pod::AsParagraphs;
 
 use strict;
 
@@ -88,7 +88,7 @@
 sub view_seq_text {
    my $text = $_[1];
    $text =~ s/\s+/ /g;
-   CFClient::asxml $text
+   CFPlus::asxml $text
 }
 
 sub view_seq_link {
@@ -99,7 +99,7 @@
    # ref
    # pod/ref
 
-   "<u>" . (CFClient::asxml $_[1]) . "</u>";
+   "<u>" . (CFPlus::asxml $_[1]) . "</u>";
 }
 
 sub view_item {
@@ -114,7 +114,7 @@
 sub view_verbatim {
    push @result, {
       indent => $indent * 16,
-      markup => "<tt>" . (CFClient::asxml $_[1]) . "</tt>\n",
+      markup => "<tt>" . (CFPlus::asxml $_[1]) . "</tt>\n",
    };
    ()
 }
@@ -166,7 +166,7 @@
       push @result, {
          indent => $indent * 16,
          markup => "\x{fffc}",
-         widget => [new CFClient::UI::Image path => "pod/" . $_[1]->text],
+         widget => [new CFPlus::UI::Image path => "pod/" . $_[1]->text],
       };
    }
    ()
@@ -178,9 +178,9 @@
    $item->content->present ($self);
 }
 
-package CFClient::Pod;
+package CFPlus::Pod;
 
-my $pod_cache = CFClient::db_table "pod_cache";
+my $pod_cache = CFPlus::db_table "pod_cache";
 
 sub load($$$$) {
    my ($path, $filtertype, $filterversion, $filtercb) = @_;
@@ -222,7 +222,7 @@
 
    local $indent = 0;
 
-   $pom->present ("CFClient::Pod::AsMarkup")
+   $pom->present ("CFPlus::Pod::AsMarkup")
 }
 
 sub as_paragraphs($) {
@@ -231,13 +231,13 @@
    local @result = ( { } );
    local $indent = 0;
 
-   $pom->present ("CFClient::Pod::AsParagraphs");
+   $pom->present ("CFPlus::Pod::AsParagraphs");
 
    [grep exists $_->{markup}, @result]
 }
 
 sub pod_paragraphs($) {
-   load CFClient::find_rcfile "pod/$_[0].pod",
+   load CFPlus::find_rcfile "pod/$_[0].pod",
       pod_paragraphs => 1, sub { as_paragraphs $_[0] };
 }