Index: tolbase/lib/renderpane/renderpane.tcl
===================================================================
--- tolbase/lib/renderpane/renderpane.tcl	(revision 35458ba4a789092fed6e2abed8a1e2f2dae15162)
+++ tolbase/lib/renderpane/renderpane.tcl	(revision 066693f8a95271c426cf0224c958dbbf7095fd9e)
@@ -89,5 +89,5 @@
     # TBD: Some of this should probably be done as part of markup parsing.
     variable escapeMapping \
-        "&lt; < &gt; > &lb; \[ &rb; \] &amp; &"
+        "&lt; < &gt; > &lb; \[ &rb; \] &amp; & &ap; '"
 
     # Image List -- loaded images, for later destruction
Index: tolbase/lib/toltk/markuphelper.tcl
===================================================================
--- tolbase/lib/toltk/markuphelper.tcl	(revision 35458ba4a789092fed6e2abed8a1e2f2dae15162)
+++ tolbase/lib/toltk/markuphelper.tcl	(revision 066693f8a95271c426cf0224c958dbbf7095fd9e)
@@ -16,4 +16,6 @@
       <  &lt;
       >  &gt;
+      '  &ap;
+      &  &amp;
     }
     return [ string map $specialChars $text ]
@@ -187,5 +189,5 @@
       }
     }
-    return [ GetText ]
+    return "<m>[ GetText ]</m>"
   }
 }