diff -ur -xCVS ../print-6.x/print_pdf/print_pdf.info print_pdf/print_pdf.info
--- ../print-6.x/print_pdf/print_pdf.info	2008-08-22 00:03:40.000000000 +0200
+++ print_pdf/print_pdf.info	2008-10-02 23:29:49.000000000 +0200
@@ -1,6 +1,5 @@
 ; $Id: print_pdf.info,v 1.1.2.2 2008/08/21 22:03:40 jcnventura Exp $
 name = "PDF version"
 description = "Adds the capability to export pages as PDF."
-dependencies[] = print
-core=6.x
+dependencies = print
 package = "Printer, e-mail and PDF versions"
diff -ur -xCVS ../print-6.x/print_pdf/print_pdf.module print_pdf/print_pdf.module
--- ../print-6.x/print_pdf/print_pdf.module	2008-09-26 00:11:56.000000000 +0200
+++ print_pdf/print_pdf.module	2008-10-02 23:42:15.000000000 +0200
@@ -6,6 +6,9 @@
  * Display printer-friendly versions of Drupal pages
  */
 
+include_once('print_pdf.pages.inc');
+include_once('print_pdf.admin.inc');
+
 define('PRINTPDF_PATH', 'printpdf');
 
 define('PRINT_PDF_LINK_POS_DEFAULT', 'link');
@@ -25,62 +28,29 @@
 define('PRINT_PDF_FONT_SIZE_DEFAULT', 10);
 
 /**
- * Implementation of hook_theme().
- */
-function print_pdf_theme() {
-  return array(
-    'print_pdf_format_link' => array(
-      'arguments' => array(),
-    ),
-    'print_pdf_dompdf_footer' => array(
-      'arguments' => array(),
-      'file' => 'print_pdf.pages.inc',
-    ),
-    'print_pdf_tcpdf_header' => array(
-      'arguments' => array(),
-      'file' => 'print_pdf.pages.inc',
-    ),
-    'print_pdf_tcpdf_page' => array(
-      'arguments' => array(),
-      'file' => 'print_pdf.pages.inc',
-    ),
-    'print_pdf_tcpdf_content' => array(
-      'arguments' => array(),
-      'file' => 'print_pdf.pages.inc',
-    ),
-    'print_pdf_tcpdf_footer' => array(
-      'arguments' => array(),
-      'file' => 'print_pdf.pages.inc',
-    ),
-    'print_pdf_tcpdf_footer2' => array(
-      'arguments' => array(),
-      'file' => 'print_pdf.pages.inc',
-    ),
-  );
-}
-
-/**
  * Implementation of hook_menu().
  */
-function print_pdf_menu() {
+function print_pdf_menu($may_cache) {
   $items = array();
 
-  $items[PRINTPDF_PATH] = array(
-    'title' => 'Printer-friendly PDF',
-    'page callback' => 'print_pdf_controller',
-    'access arguments' => array('access print'),
-    'type' => MENU_CALLBACK,
-    'file' => 'print_pdf.pages.inc',
-  );
-  $items['admin/settings/print/pdf'] = array(
-    'title' => 'PDF',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('print_pdf_settings'),
-    'access arguments'  => array('administer print'),
-    'weight' => 3,
-    'type' => MENU_LOCAL_TASK,
-    'file' => 'print_pdf.admin.inc',
-  );
+  if ($may_cache) {
+    $items[] = array(
+      'path' => PRINTPDF_PATH,
+      'title' => t('Printer-friendly PDF'),
+      'callback' => 'print_pdf_controller',
+      'access' => user_access('access print'),
+      'type' => MENU_CALLBACK,
+    );
+    $items[] = array(
+      'path' => 'admin/settings/print/pdf',
+      'title' => t('PDF'),
+      'callback' => 'drupal_get_form',
+      'callback arguments' => array('print_pdf_settings'),
+      'access'  => user_access('administer print'),
+      'weight' => 3,
+      'type' => MENU_LOCAL_TASK,
+    );
+  }
 
   return $items;
 }
@@ -159,7 +129,7 @@
 /**
  * Implementation of hook_help().
  */
-function print_pdf_help($path, $arg) {
+function print_pdf_help($path) {
   $print_pdf_link_pos = variable_get('print_pdf_link_pos', array(PRINT_PDF_LINK_POS_DEFAULT => PRINT_PDF_LINK_POS_DEFAULT));
   if (print_pdf_link_allowed(array('path' => $path)) && (preg_match('!^node/!i', $path) == 0) &&
       !(empty($print_pdf_link_pos['link']) && empty($print_pdf_link_pos['corner']))) {
@@ -203,7 +173,7 @@
 /**
  * Implementation of hook_form_alter().
  */
-function print_pdf_form_alter(&$form, $form_state, $form_id) {
+function print_pdf_form_alter($form_id, &$form) {
   // Add the node-type settings option to activate the PDF version link
   if ($form_id == 'node_type_form') {
     $form['print']['print_pdf_display'] = array(
@@ -325,10 +295,10 @@
         // Link for this node type is disabled
         return FALSE;
       }
-      elseif (isset($node->book)) {
+      elseif (isset($node->parent)) {
         // Node is a book;
         $print_pdf_book_link = variable_get('print_pdf_book_link', PRINT_PDF_BOOK_LINK_DEFAULT);
-        if (!$print_pdf_book_link || !user_access('access printer-friendly version')) {
+        if (!$print_pdf_book_link || !user_access('see printer-friendly version')) {
           // Book link is disabled
           return FALSE;
         }