tuned rendering;
authorwenzelm
Mon, 12 Jun 2017 20:24:40 +0200
changeset 66075 408a5325379c
parent 66074 4329cc78c2a1
child 66076 8bd8750a2f9b
tuned rendering;
etc/isabelle.css
src/Pure/Thy/present.scala
--- a/etc/isabelle.css	Mon Jun 12 20:06:55 2017 +0200
+++ b/etc/isabelle.css	Mon Jun 12 20:24:40 2017 +0200
@@ -66,6 +66,8 @@
 .comment        { color: #CC0000; }
 .improper       { color: #FF5050; }
 .bad            { background-color: #FF6A6A; }
+.quoted         { background-color: rgba(139,139,139,0.05); }
+.antiquoted     { background-color: rgba(255,200,50,0.1); }
 
 
 /* message background */
--- a/src/Pure/Thy/present.scala	Mon Jun 12 20:06:55 2017 +0200
+++ b/src/Pure/Thy/present.scala	Mon Jun 12 20:24:40 2017 +0200
@@ -104,9 +104,9 @@
   /* theory document */
 
   private val document_span_elements =
-    Markup.Elements(Rendering.text_color.keySet + Markup.NUMERAL + Markup.COMMENT)
+    Rendering.foreground_elements ++ Rendering.text_color_elements + Markup.NUMERAL + Markup.COMMENT
 
-  def make_html(xml: XML.Body): XML.Body =
+  private def make_html(xml: XML.Body): XML.Body =
     xml map {
       case XML.Wrapped_Elem(markup, body1, body2) =>
         XML.Wrapped_Elem(markup, make_html(body1), make_html(body2))
@@ -119,12 +119,9 @@
             case _ =>
               make_html(body)
           }
-        Rendering.text_color.get(name) match {
-          case Some(c) =>
-            HTML.span(c.toString, html)
-          case None =>
-            if (document_span_elements(name)) HTML.span(name, html)
-            else XML.Elem(markup, html)
+        Rendering.foreground.get(name) orElse Rendering.text_color.get(name) match {
+          case Some(c) => HTML.span(c.toString, html)
+          case None => HTML.span(name, html)
         }
       case XML.Text(text) =>
         XML.Text(Symbol.decode(text))