From 1fa5101511e62785ac98bb462711f08a09cad275 Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
Date: Sun, 24 Sep 2006 21:58:14 +0000
Subject: [PATCH] [1.1.1] - Clarify usage of %Core.TidyFormat - Add
 test-settings.sample.php, to facilitate benchmark and unit test running

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@456 48356398-32a2-884e-a903-53898d9a118a
---
 NEWS                               |  6 ++++++
 library/HTMLPurifier/Generator.php | 14 ++++++++------
 test-settings.sample.php           | 17 +++++++++++++++++
 3 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 test-settings.sample.php

diff --git a/NEWS b/NEWS
index 0d777cfd..93d3a524 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,12 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
 1.1.1, unknown projected release date
 - Various documentation updates
 - Fixed parse error in configuration documentation script
+- Fixed fatal error in benchmark scripts, slightly augmented
+- As far as possible, whitespace is preserved in-between table children
+- Configuration option to optionally Tidy up output for indentation to make up
+  for dropped whitespace by DOMLex (pretty-printing for the entire application
+  should be done by a page-wide Tidy)
+- Sample test-settings.php file included
 
 1.1.0, released 2006-09-16
 - Made URI validator more forgiving: will ignore leading and trailing
diff --git a/library/HTMLPurifier/Generator.php b/library/HTMLPurifier/Generator.php
index 7adfa81a..72ca3921 100644
--- a/library/HTMLPurifier/Generator.php
+++ b/library/HTMLPurifier/Generator.php
@@ -26,14 +26,16 @@ HTMLPurifier_ConfigSchema::define(
 // extension constraints could be factored into ConfigSchema
 HTMLPurifier_ConfigSchema::define(
     'Core', 'TidyFormat', false, 'bool',
-    'Determines whether or not to run Tidy on the final output for pretty '.
-    'formatting reasons, such as indentation and wrap.  This can greatly '.
+    '<p>Determines whether or not to run Tidy on the final output for pretty '.
+    'formatting reasons, such as indentation and wrap.</p><p>This can greatly '.
     'improve readability for editors who are hand-editing the HTML, but is '.
     'by no means necessary as HTML Purifier has already fixed all major '.
-    'errors the HTML may have had and could potentially result in data loss '.
-    'due to bugs in Tidy. Tidy is a non-default extension, and this directive '.
-    'will silently fail if Tidy is not available. This '.
-    'directive was available since 1.1.1.'
+    'errors the HTML may have had. Tidy is a non-default extension, and this directive '.
+    'will silently fail if Tidy is not available.</p><p>If you are looking to make '.
+    'the overall look of your page\'s source better, I recommend running Tidy '.
+    'on the entire page rather than just user-content (after all, the '.
+    'indentation relative to the containing blocks will be incorrect).</p><p>This '.
+    'directive was available since 1.1.1.</p>'
 );
 
 /**
diff --git a/test-settings.sample.php b/test-settings.sample.php
new file mode 100644
index 00000000..1fbcfe4e
--- /dev/null
+++ b/test-settings.sample.php
@@ -0,0 +1,17 @@
+<?php
+
+// This file is necessary to run the unit tests and profiling
+// scripts.
+
+// Is PEAR available on your system? If it isn't, set to false. If PEAR
+// is not part of the default include_path, add it.
+$GLOBALS['HTMLPurifierTest']['PEAR'] = true;
+
+// How many times should profiling scripts iterate over the function? More runs 
+// means more accurate results, but they'll take longer to perform.
+$GLOBALS['HTMLPurifierTest']['Runs'] = 2;
+
+// Where is SimpleTest located?
+$simpletest_location = '/path/to/simpletest/';
+
+?>
\ No newline at end of file
-- 
2.11.4.GIT