Repaired rendering of ''emph ''' bold emph '' bold ''' to produce valid HTML.

diff --git a/includes/Parser.php b/includes/Parser.php
index b0b869a..2f9b9cc 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -688,7 +688,7 @@ class Parser
                        $state["strong"] = FALSE;
                } else {
                        $s = "<strong>";
-                       $state["strong"] = isset($token["pos"]) ? $token["pos"] : true;
+                       $state["strong"] = $token["pos"];
                }
                return $s;
        }
@@ -706,7 +706,7 @@ class Parser
                        $state["em"] = FALSE;
                } else {
                        $s = "<em>";
-                       $state["em"] = isset($token["pos"]) ? $token["pos"] : true;
+                       $state["em"] = $token["pos"];
 
                }
                return $s;
@@ -729,10 +729,10 @@ class Parser
                } elseif ( $state["strong"] !== false ) {
                        $s .= "</strong><em>";
                        $state["strong"] = FALSE;
-                       $state["em"] = @$token["pos"];
+                       $state["em"] = $token["pos"];
                } else { # not $em and not $strong
                        $s .= "<strong><em>";
-                       $state["strong"] = $state["em"] = isset($token["pos"]) ? $token["pos"] : true;
+                       $state["strong"] = $state["em"] = $token["pos"];
                }
                return $s;
        }

diff --git a/includes/Tokenizer.php b/includes/Tokenizer.php
index 2c61c65..0b313d5 100644 (file)
--- a/includes/Tokenizer.php
+++ b/includes/Tokenizer.php
@@ -137,6 +137,7 @@ class Tokenizer {
                                                               && $this->mText[$this->mPos+1] == "'" )
                                                        {
                                                                $queueToken["type"] .= "'";
+                                                               $queueToken["pos"] = $this->mPos;
                                                                $this->mPos ++;
                                                        }