--- deliantra/Deliantra-Client/DC/Pod.pm	2006/08/14 03:04:18	1.11
+++ deliantra/Deliantra-Client/DC/Pod.pm	2007/12/26 20:46:39	1.16
@@ -1,11 +1,11 @@
-package CFPlus::Pod;
+package dc::Pod;
 
 use strict;
 use utf8;
 
 use Storable;
 
-our $VERSION = 1;
+our $VERSION = 1.03;
 
 our $goto_document = sub { };
 our %wiki;
@@ -14,7 +14,7 @@
 my $MA_SEP = "\x{fcd1}";
 my $MA_END = "\x{fcd2}";
 
-*wiki = Storable::retrieve CFPlus::find_rcfile "docwiki.pst";
+*wiki = Storable::retrieve dc::find_rcfile "docwiki.pst";
 
 sub goto_document($) {
    $goto_document->(split /\//, $_[0]);
@@ -45,7 +45,7 @@
    grep { is_prefix_of $_, @path }
       map @$_,
          $kw eq "*" ? @wiki{sort keys %wiki}
-                    : grep $_, $wiki{$kw}
+                    : $wiki{$kw} || ()
 }
 
 sub full_path_of($) {
@@ -116,7 +116,7 @@
    link => sub {
       my ($par, $text, $link) = @_;
 
-      "<span foreground='#ffff00'>↺</span><span foreground='#c0c0ff' underline='single'>" . (CFPlus::asxml $text) . "</span>"
+      "<span foreground='#ffff00'>↺</span><span foreground='#c0c0ff' underline='single'>" . (dc::asxml $text) . "</span>"
    },
 );
 
@@ -136,23 +136,24 @@
 
 my %as_paragraphs = (
    image => sub {
-      my ($par, $path) = @_;
+      my ($par, $path, $flags) = @_;
 
-      push @{ $par->{widget} }, new CFPlus::UI::Image path => $path;
+      push @{ $par->{widget} }, new dc::UI::Image path => $path,
+         $flags & 1 ? (max_h => $::FONTSIZE) : ();
 
       "\x{fffc}"
    },
    link => sub {
       my ($par, $text, $link) = @_;
 
-      push @{ $par->{widget} }, new CFPlus::UI::Label
-         markup     => "<span foreground='#ffff00'>↺</span><span foreground='#c0c0ff' underline='single'>" . (CFPlus::asxml $text) . "</span>",
+      push @{ $par->{widget} }, new dc::UI::Label
+         markup     => "<span foreground='#ffff00'>↺</span><span foreground='#c0c0ff' underline='single'>" . (dc::asxml $text) . "</span>",
          fontsize   => 0.8,
          can_hover  => 1,
          can_events => 1,
          padding_x  => 0,
          padding_y  => 0,
-         tooltip    => "Go to <i>" . (CFPlus::asxml $link) . "</i>",
+         tooltip    => "Go to <i>" . (dc::asxml $link) . "</i>",
          on_button_up => sub {
             goto_document $link;
          };