Fixed problem with list lines not being formatted

Added CVS hooks for <hr> and Question/Answer (Q. and A.) lines

diff --git a/lib/wiki.php b/lib/wiki.php
index adb382afb2d34fa1589a2c99aacd5c6656c8d387..e71478b48cfe4bf3286a286bbd85aa9c43c77a2d 100644 (file)
--- a/lib/wiki.php
+++ b/lib/wiki.php
@@ -144,6 +144,9 @@ class Wiki {
           break;  \r
         }  \r
       }        \r
+\r
+    // apply formatting to remainder of line\r
+    $line = $this->line_replace( $line );\r
       \r
     // generate appropriate list tag\r
     $ltag = "";\r
@@ -172,13 +175,13 @@ class Wiki {
     }\r
     \r
     // ---- (at least) means a <HR>\r
-    $line = eregi_replace( "^-{4}.*", "<hr />", $line );\r
+    $line = eregi_replace( "^-{4}.*", "<div class=\"hr\"><hr /></div>", $line );\r
     \r
     // is this a list line (starts with * # ; :)    \r
     if (eregi( "^[*#;:] ", $line )) {\r
       $line = $this->do_list( $line );         \r
     }          \r
-    \r
+\r
    // typographic conventions\r
     $line = eregi_replace( "--", "&#8212;", $line );\r
     $line = eregi_replace( " - ", " &#8211; ", $line );\r
@@ -289,6 +292,20 @@ class Wiki {
                $buffer = $buffer . eregi_replace( "^\%","",$line) . "\n";\r
                $this->block_state = STATE_NOTIKI;\r
         }      \r
+        else\r
+        if (eregi("^Q. ",$line) ) {\r
+          // Question - para with a question class\r
+          $buffer = $buffer . "<p class=\"question\">\n";\r
+          $buffer = $buffer . eregi_replace( "^Q. ","",$line) . "\n";\r
+          $this->block_state = STATE_PARAGRAPH;\r
+        }\r
+        else\r
+        if (eregi("^A. ",$line) ) {\r
+          // Answer - para with an answer class\r
+          $buffer = $buffer . "<p class=\"answer\">\n";\r
+          $buffer = $buffer . eregi_replace( "^A. ","",$line ) . "\n";\r
+          $this->block_state = STATE_PARAGRAPH;\r
+        }\r
         else {\r
           // ordinary paragraph\r
           $buffer = $buffer . "<p>\n";\r