*** pdf.orig	Thu Nov 11 16:31:32 2004
--- pdf	Thu Nov 11 16:31:32 2004
***************
*** 22,32 ****
  
  
  
  use CGI::Carp qw( fatalsToBrowser );
  use CGI;
- use lib ( '.' );
- use lib ( '../lib' );
  use TWiki;
  use IO::File;
  use POSIX qw(tmpnam);
  
--- 22,32 ----
  
  
  
+ BEGIN { unshift @INC, '.'; require 'setlib.cfg'; }
  use CGI::Carp qw( fatalsToBrowser );
  use CGI;
  use TWiki;
+ use TWiki::Render;
  use IO::File;
  use POSIX qw(tmpnam);
  
***************
*** 39,49 ****
  # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  
  # local path to your twiki data
! my $localWebDir 	= "/usr/local/apache2/twiki/";
  # web URL of your twiki instalation
! my $webDirUrl 		= "https://ike.nzqa.solnet.co.nz/twiki/";
  # specify path to htmldoc
! my $htmldocCmd 		= "/usr/local/bin/htmldoc";
  
  &main();
  
--- 39,49 ----
  # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  
  # local path to your twiki data
! my $localWebDir         = "/usr/local/apache2/twiki/";
  # web URL of your twiki instalation
! my $webDirUrl           = "https://ike.nzqa.solnet.co.nz/twiki/";
  # specify path to htmldoc
! my $htmldocCmd          = "/usr/local/bin/htmldoc";
  
  &main();
  
***************
*** 370,376 ****
  
      if( ! $viewRaw ) {
          $text = &TWiki::handleCommonTags( $text, $topic );
!         $text = &TWiki::getRenderedVersion( $text );
      }
  
      if( $TWiki::doLogTopicView ) {
--- 370,376 ----
  
      if( ! $viewRaw ) {
          $text = &TWiki::handleCommonTags( $text, $topic );
!         $text = &TWiki::Render::getRenderedVersion( $text );
      }
  
      if( $TWiki::doLogTopicView ) {
***************
*** 443,449 ****
  
      if( $topicExists ) {
          $revuser = &TWiki::userToWikiName( $revuser );
!         my $temp = &TWiki::getRenderedVersion( "r1.$rev - $revdate GMT - $revuser" );
          $tmpl =~ s/%REVINFO%/$temp$mirrorNote/go;
      } else {
          $tmpl =~ s/%REVINFO%/$mirrorNote/go;
--- 443,449 ----
  
      if( $topicExists ) {
          $revuser = &TWiki::userToWikiName( $revuser );
!         my $temp = &TWiki::Render::getRenderedVersion( "r1.$rev - $revdate GMT - $revuser" );
          $tmpl =~ s/%REVINFO%/$temp$mirrorNote/go;
      } else {
          $tmpl =~ s/%REVINFO%/$mirrorNote/go;
***************
*** 455,461 ****
      } else {
          $tmpl = &TWiki::handleMetaTags( $webName, $topic, $tmpl, $meta, ( $rev == $maxrev ) );
      }
!     $tmpl = &TWiki::getRenderedVersion( $tmpl, "", $meta ); ## better to use meta rendering?
      $tmpl =~ s/%TEXT%/$text/go;
      $tmpl =~ s/%MAXREV%/1.$maxrev/go;
      $tmpl =~ s/%CURRREV%/1.$rev/go;
--- 455,461 ----
      } else {
          $tmpl = &TWiki::handleMetaTags( $webName, $topic, $tmpl, $meta, ( $rev == $maxrev ) );
      }
!     $tmpl = &TWiki::Render::getRenderedVersion( $tmpl, "", $meta ); ## better to use meta rendering?
      $tmpl =~ s/%TEXT%/$text/go;
      $tmpl =~ s/%MAXREV%/1.$maxrev/go;
      $tmpl =~ s/%CURRREV%/1.$rev/go;