techtonik               Fri Oct 29 05:58:19 2004 EDT

  Modified files:              
    /phpdoc/htmlhelp    filter_files.php 
  Log:
  fixed some errors in .HHP refinement block
  added _index.html to [FILES] section
  
http://cvs.php.net/diff.php/phpdoc/htmlhelp/filter_files.php?r1=1.5&r2=1.6&ty=u
Index: phpdoc/htmlhelp/filter_files.php
diff -u phpdoc/htmlhelp/filter_files.php:1.5 phpdoc/htmlhelp/filter_files.php:1.6
--- phpdoc/htmlhelp/filter_files.php:1.5        Mon Oct 18 16:30:48 2004
+++ phpdoc/htmlhelp/filter_files.php    Fri Oct 29 05:58:18 2004
@@ -52,14 +52,14 @@
    
     // Rewrite HHP file to make UK English default language like in template
     // prior to DocBook XSL 1.66.1. Add supplementary files to [FILES] section
-    // and also insert [MERGE] section
+    // and also insert [MERGE FILES] section
     $hhp_file = "$HTML_TARGET/php_manual_$LANGUAGE.hhp";
 
     if (file_exists($hhp_file)) {
         $php_hhp = join("", file($hhp_file));
 
         // Get rid of hh autoindex "feature" and set UK English language
-        $php_hhp = preg_replace("|Auto Index=Yes(\W+)\w|i","\w",$php_hhp);
+        $php_hhp = preg_replace("|Auto Index=Yes\W+|i","",$php_hhp);
         $php_hhp = str_replace("Language=0x0409 English (UNITED 
STATES)","Language=0x0809 English (UNITED KINGDOM)",$php_hhp);
 
         // Capturing line delimiter
@@ -73,11 +73,12 @@
             if ($entry != "." && $entry != ".." && !is_dir($entry))
                 $supp_files .= $delim.$entry;
         }
+        $supp_files .= $delim."_index.html";
 
         // Insert [MERGE] section and supplemental files 
         $php_hhp = preg_replace(
            "|\[FILES\]((\W+)\w)|i",
-           "[MERGE]$2php_manual_notes.chm$2$2[FILES]$supp_files$1",
+           "[MERGE FILES]$2php_manual_notes.chm$2$2[FILES]$supp_files$1",
            $php_hhp);
         $fp = fopen($hhp_file, "w");
         fwrite($fp, $php_hhp);
@@ -105,7 +106,7 @@
 
     // Replace title with simple <title> content [shorter, without tags]
     $content = preg_replace(
-        '!<h(\d)[^>]*>.+</h\1>!Us',
+        '!<div><h(\d)[^>]*>.+</h\1></div>!Us',
         "<h1 class=\"masterheader\"><span id=\"pageTitle\">$page_title</span></h1>",
         $content,
         1

Reply via email to