some more tweaks to the smart quote parser

Now all test cases succeed, but there is probably still trouble with certain
conditions.

darcs-hash:20070626181735-7ad00-dd6e51e37cda7ca63077a2779afe1753ad975f84.gz

_test/cases/inc/parser/parser_quotes.test.php

@@ -3,6 +3,12 @@ require_once 'parser.inc.php';
 
 class TestOfDoku_Parser_Quotes extends TestOfDoku_Parser {
 
+    function setup() {
+        parent::setup();
+        global $conf;
+        $conf['typography'] = 2;
+    }
+
     function TestOfDoku_Parser_Quotes() {
         $this->UnitTestCase('TestOfDoku_Parser_Quotes');
     }
@@ -255,7 +261,7 @@ class TestOfDoku_Parser_Quotes extends TestOfDoku_Parser {
             array('cdata',array('s world')),
             array('singlequoteclosing',array()),
             array('doublequoteclosing',array()),
-            array('cdata',array('.'."\n")),
+            array('cdata',array(".\n")),
             array('p_close',array()),
             array('document_end',array()),
         );

inc/parser/parser.php

@@ -757,26 +757,26 @@ class Doku_Parser_Mode_quotes extends Doku_Parser_Mode {
     function connectTo($mode) {
         global $conf;
 
-        $ws  =  '[\s/\#~:+=&%@\-;,\x28\x29\]\[{}><"\']';   // whitespace
-        $nws = '[^\s/\#~:+=&%@\-;,\x28\x29\]\[{}><"\']';  // non whitespace
+        $ws   =  '\s/\#~:+=&%@\-\x28\x29\]\[{}><"\'';   // whitespace
+        $punc =  ';,\.?!';
 
         if($conf['typography'] == 2){
             $this->Lexer->addSpecialPattern(
-                        "(?<=^|$ws)'(?=$nws)",$mode,'singlequoteopening'
+                        "(?<=^|[$ws])'(?=[^$ws$punc])",$mode,'singlequoteopening'
                     );
             $this->Lexer->addSpecialPattern(
-                        "(?<=^|$nws)'(?=$|$ws)",$mode,'singlequoteclosing'
+                        "(?<=^|[^$ws]|[$punc])'(?=$|[$ws$punc])",$mode,'singlequoteclosing'
                     );
             $this->Lexer->addSpecialPattern(
-                        "(?<=^|$nws)'(?=$|$nws)",$mode,'apostrophe'
+                        "(?<=^|[^$ws$punc])'(?=$|[^$ws$punc])",$mode,'apostrophe'
                     );
         }
 
         $this->Lexer->addSpecialPattern(
-                    "(?<=^|$ws)\"(?=$nws)",$mode,'doublequoteopening'
+                    "(?<=^|[$ws])\"(?=[^$ws$punc])",$mode,'doublequoteopening'
                 );
         $this->Lexer->addSpecialPattern(
-                    "(?<=^|$nws)\"",$mode,'doublequoteclosing'
+                    "\"",$mode,'doublequoteclosing'
                 );