&My::Web::footer call is deprecated now, use just: exit;

[www.jankratochvil.net.git] / project / captive / doc / Macros.pm

diff --git a/project/captive/doc/Macros.pm b/project/captive/doc/Macros.pm
index c247d6f..1b24cf3 100755 (executable)
--- a/project/captive/doc/Macros.pm
+++ b/project/captive/doc/Macros.pm
@@ -31,21 +31,11 @@ our @EXPORT=qw(
 our @ISA=qw(Exporter);
 
 use My::Web;
-require CGI;
 Wrequire 'project::Lib';
 
 
 our $HTML_TEST=0;
 
-sub footer ($)
-{
-my($class)=@_;
-
-       print vskip "2ex";
-       project::captive::doc::Macros->navigate("footer");
-       My::Web->footer();
-}
-
 sub navigate ($;$)
 {
 my($class,$where)=@_;
@@ -97,10 +87,16 @@ sub productname
 {
 my($url,$name)=@_;
 
-       return '<span class="productname">'.a_href($url,CGI::escapeHTML($name)).'</span>';
+       return '<span class="productname">'.a_href($url,escapeHTML($name)).'</span>';
 }
 our($Wine,$ReactOS,$LinuxNTFS,$GnomeVFS,$GnomeVFSmodule,$gnulinux,$freespeech,$freebeer);
 
+sub _footer
+{
+       print vskip "2ex";
+       project::captive::doc::Macros->navigate("footer");
+}
+
 sub init ($%)
 {
 my($class,%args)=@_;
@@ -110,6 +106,7 @@ my($class,%args)=@_;
                        "heading_novskip"=>1,
                        "rel_start"=>"..",      # possibly overridable
                        "rel_up"=>".",  # possibly overridable
+                       "footing_delimit_sub_push"=>\&_footer,
                        "__PACKAGE__"=>caller(),        # possibly overridable
                        %args,
                        );