From 647ff26379190e1624e3dd64690618cf00d97abd Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
Date: Sun, 30 Jul 2006 15:29:22 +0000
Subject: [PATCH] Minor tweaks to documentation and Enum (case-sensitivity is
 now boolean).

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@128 48356398-32a2-884e-a903-53898d9a118a
---
 docs/dtd/xhtml1-purified.dtd          | 3 ++-
 docs/spec.txt                         | 4 ++++
 library/HTMLPurifier/AttrDef/Enum.php | 3 ++-
 library/HTMLPurifier/Definition.php   | 6 ++++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/dtd/xhtml1-purified.dtd b/docs/dtd/xhtml1-purified.dtd
index 09fbd209..8751b294 100644
--- a/docs/dtd/xhtml1-purified.dtd
+++ b/docs/dtd/xhtml1-purified.dtd
@@ -6,7 +6,8 @@
      Move to style! -->
 <!ENTITY % TextAlign "DEPRECATED align (left|center|right|justify) #IMPLIED">
 
-<!-- type and start should have CSS equivalents -->
+<!-- type and start should have CSS equivalents, but they'll need to
+be translated intelligently -->
 <!ENTITY % ULStyle "(disc|square|circle)">
 <!-- Ordered list numbering style
 
diff --git a/docs/spec.txt b/docs/spec.txt
index 12875643..946aa61f 100644
--- a/docs/spec.txt
+++ b/docs/spec.txt
@@ -385,6 +385,10 @@ These are the elements that only have %attrs:
 These are the elements that only have %attrs and need an alignment transform
     div, p, h1, h2, h3, h4, h5, h6
 
+----
+
+Prepend style transformations, as CSS takes precedence.
+
 == PART 5 - stringify ==
 
     Status: A+ (done completely!)
diff --git a/library/HTMLPurifier/AttrDef/Enum.php b/library/HTMLPurifier/AttrDef/Enum.php
index 7cb7ec4c..94e24603 100644
--- a/library/HTMLPurifier/AttrDef/Enum.php
+++ b/library/HTMLPurifier/AttrDef/Enum.php
@@ -8,7 +8,8 @@ class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef
     var $case_sensitive = false; // values according to W3C spec
     
     function HTMLPurifier_AttrDef_Enum(
-      $valid_values = array(), $case_sensitive = false) {
+        $valid_values = array(), $case_sensitive = false) {
+        
         $this->valid_values = array_flip($valid_values);
         $this->case_sensitive = $case_sensitive;
     }
diff --git a/library/HTMLPurifier/Definition.php b/library/HTMLPurifier/Definition.php
index 8dca40ee..acbcbbbc 100644
--- a/library/HTMLPurifier/Definition.php
+++ b/library/HTMLPurifier/Definition.php
@@ -60,6 +60,8 @@ class HTMLPurifier_Definition
         // and also know the assumptions the code makes about what this
         // contains for optimization purposes (see fixNesting)
         
+        // child info
+        
         $e_special_extra = 'img';
         $e_special_basic = 'br | span | bdo';
         $e_special = "$e_special_basic | $e_special_extra";
@@ -153,6 +155,10 @@ class HTMLPurifier_Definition
         
         $this->info['child']['a']    = $e_a_content;
         
+        // attribute info
+        
+        $a_dir = new HTMLPurifier_AttrDef_Enum(array('ltr','rtl'), false);
+        
     }
     
 }