# HG changeset patch
# User wenzelm
# Date 1515014971 -3600
# Node ID 4254cfd15b00ff9e9cd9141e5348795d6a5fea57
# Parent  3ee6da3781835894eadb460351e5ae0bdc4e135c
more tight HTML output: avoid extra lines within <pre>;

diff -r 3ee6da378183 -r 4254cfd15b00 src/Pure/Thy/html.scala
--- a/src/Pure/Thy/html.scala	Wed Jan 03 20:55:13 2018 +0100
+++ b/src/Pure/Thy/html.scala	Wed Jan 03 22:29:31 2018 +0100
@@ -97,7 +97,7 @@
     Set("head", "body", "meta", "div", "pre", "p", "title", "h1", "h2", "h3", "h4", "h5", "h6",
       "ul", "ol", "dl", "li", "dt", "dd")
 
-  def output(body: XML.Body, s: StringBuilder, hidden: Boolean)
+  def output(body: XML.Body, s: StringBuilder, hidden: Boolean, structural: Boolean)
   {
     def elem(markup: Markup)
     {
@@ -116,22 +116,22 @@
         case XML.Elem(markup, Nil) =>
           s += '<'; elem(markup); s ++= "/>"
         case XML.Elem(markup, ts) =>
-          if (structural_elements(markup.name)) s += '\n'
+          if (structural && structural_elements(markup.name)) s += '\n'
           s += '<'; elem(markup); s += '>'
           ts.foreach(tree)
           s ++= "</"; s ++= markup.name; s += '>'
-          if (structural_elements(markup.name)) s += '\n'
+          if (structural && structural_elements(markup.name)) s += '\n'
         case XML.Text(txt) =>
           output(txt, s, hidden = hidden, permissive = true)
       }
     body.foreach(tree)
   }
 
-  def output(body: XML.Body, hidden: Boolean): String =
-    Library.make_string(output(body, _, hidden))
+  def output(body: XML.Body, hidden: Boolean, structural: Boolean): String =
+    Library.make_string(output(body, _, hidden, structural))
 
-  def output(tree: XML.Tree, hidden: Boolean): String =
-    output(List(tree), hidden)
+  def output(tree: XML.Tree, hidden: Boolean, structural: Boolean): String =
+    output(List(tree), hidden, structural)
 
 
   /* attributes */
@@ -333,14 +333,17 @@
       List("http-equiv" -> "Content-Type", "content" -> "text/html; charset=utf-8")), Nil)
 
   def output_document(head: XML.Body, body: XML.Body,
-    css: String = "isabelle.css", hidden: Boolean = true): String =
+    css: String = "isabelle.css",
+    hidden: Boolean = true,
+    structural: Boolean = true): String =
   {
     cat_lines(
       List(header,
         output(
           XML.elem("head", head_meta :: (if (css == "") Nil else List(style_file(css))) ::: head),
-          hidden = hidden),
-        output(XML.elem("body", body), hidden = hidden)))
+          hidden = hidden, structural = structural),
+        output(XML.elem("body", body),
+          hidden = hidden, structural = structural)))
   }
 
 
@@ -389,9 +392,12 @@
   }
 
   def write_document(dir: Path, name: String, head: XML.Body, body: XML.Body,
-    css: String = isabelle_css.base_name, hidden: Boolean = true)
+    css: String = isabelle_css.base_name,
+    hidden: Boolean = true,
+    structural: Boolean = true)
   {
     init_dir(dir)
-    File.write(dir + Path.basic(name), output_document(head, body, css = css, hidden = hidden))
+    File.write(dir + Path.basic(name),
+      output_document(head, body, css = css, hidden = hidden, structural = structural))
   }
 }
diff -r 3ee6da378183 -r 4254cfd15b00 src/Pure/Thy/present.scala
--- a/src/Pure/Thy/present.scala	Wed Jan 03 20:55:13 2018 +0100
+++ b/src/Pure/Thy/present.scala	Wed Jan 03 22:29:31 2018 +0100
@@ -116,7 +116,7 @@
         List(
           HTML.style(HTML.fonts_css(fonts_url) + File.read(HTML.isabelle_css)),
           HTML.title(title)),
-        List(HTML.source(body)), css = "")
+        List(HTML.source(body)), css = "", structural = false)
 
     val name = snapshot.node_name
     if (plain_text) {
@@ -160,7 +160,9 @@
     }
 
   private def html_class(c: String, html: XML.Body): XML.Tree =
-    if (html_div(html)) HTML.div(c, html) else HTML.span(c, html)
+    if (html.forall(_ == HTML.no_text)) HTML.no_text
+    else if (html_div(html)) HTML.div(c, html)
+    else HTML.span(c, html)
 
   private def make_html(xml: XML.Body): XML.Body =
     xml map {
diff -r 3ee6da378183 -r 4254cfd15b00 src/Tools/VSCode/src/state_panel.scala
--- a/src/Tools/VSCode/src/state_panel.scala	Wed Jan 03 20:55:13 2018 +0100
+++ b/src/Tools/VSCode/src/state_panel.scala	Wed Jan 03 22:29:31 2018 +0100
@@ -70,7 +70,7 @@
                 HTML.style_file(HTML.isabelle_css),
                 HTML.script(controls_script)),
               List(controls, HTML.source(text)),
-              css = "")
+              css = "", structural = true)
           output(content)
         })