tuned;

--- a/src/Pure/General/symbol.scala	Sat Aug 13 13:42:35 2011 +0200
+++ b/src/Pure/General/symbol.scala	Sat Aug 13 13:48:26 2011 +0200
@@ -179,7 +179,7 @@
         tab.get(x) match {
           case None => tab += (x -> y)
           case Some(z) =>
-            error("Duplicate mapping of \"" + x + "\" to \"" + y + "\" vs. \"" + z + "\"")
+            error("Duplicate mapping of " + quote(x) + " to " + quote(y) + " vs. " + quote(z))
         }
       }
       tab

--- a/src/Pure/General/yxml.scala	Sat Aug 13 13:42:35 2011 +0200
+++ b/src/Pure/General/yxml.scala	Sat Aug 13 13:48:26 2011 +0200
@@ -50,7 +50,7 @@
   private def err_element() = err("bad element")
   private def err_unbalanced(name: String) =
     if (name == "") err("unbalanced element")
-    else err("unbalanced element \"" + name + "\"")
+    else err("unbalanced element " + quote(name))
 
   private def parse_attrib(source: CharSequence) = {
     val s = source.toString

--- a/src/Pure/Isar/parse.scala	Sat Aug 13 13:42:35 2011 +0200
+++ b/src/Pure/Isar/parse.scala	Sat Aug 13 13:48:26 2011 +0200
@@ -50,7 +50,7 @@
       token(s, pred) ^^ (_.content)
 
     def keyword(name: String): Parser[String] =
-      atom(Token.Kind.KEYWORD.toString + " \"" + name + "\"",
+      atom(Token.Kind.KEYWORD.toString + " " + quote(name),
         tok => tok.kind == Token.Kind.KEYWORD && tok.content == name)
 
     def name: Parser[String] = atom("name declaration", _.is_name)

--- a/src/Tools/jEdit/src/isabelle_markup.scala	Sat Aug 13 13:42:35 2011 +0200
+++ b/src/Tools/jEdit/src/isabelle_markup.scala	Sat Aug 13 13:48:26 2011 +0200
@@ -165,7 +165,7 @@
 
   val tooltip: Markup_Tree.Select[String] =
   {
-    case Text.Info(_, XML.Elem(Markup.Entity(kind, name), _)) => kind + " \"" + name + "\""
+    case Text.Info(_, XML.Elem(Markup.Entity(kind, name), _)) => kind + " " + quote(name)
     case Text.Info(_, XML.Elem(Markup(Markup.ML_TYPING, _), body)) =>
       Pretty.string_of(List(Pretty.block(XML.Text("ML:") :: Pretty.Break(1) :: body)),
         margin = Isabelle.Int_Property("tooltip-margin"))

--- a/src/Tools/jEdit/src/isabelle_sidekick.scala	Sat Aug 13 13:42:35 2011 +0200
+++ b/src/Tools/jEdit/src/isabelle_sidekick.scala	Sat Aug 13 13:48:26 2011 +0200
@@ -167,7 +167,7 @@
               new Isabelle_Sidekick.Asset(command.toString, range.start, range.stop) {
                 override def getShortString: String = content
                 override def getLongString: String = info_text
-                override def toString = "\"" + content + "\" " + range.toString
+                override def toString = quote(content) + " " + range.toString
               })
           })
     }