# HG changeset patch
# User immler@in.tum.de
# Date 1237840334 -3600
# Node ID e647f063ffad4cadd7f7ef3ec4ceb9851bcc9776
# Parent  e3ca0658fb6a21cf49724c9632ceb4ed413e8bfc# Parent  fc851e58a610dc3464adb003cfb26e77d2824ca6
merged: resolved conflicts with Markups: ML-syntax styles in styles.props

diff -r e3ca0658fb6a -r e647f063ffad src/Tools/jEdit/makedist
--- a/src/Tools/jEdit/makedist	Fri Mar 20 12:46:57 2009 +0100
+++ b/src/Tools/jEdit/makedist	Mon Mar 23 21:32:14 2009 +0100
@@ -80,7 +80,8 @@
 cp -R "$JEDIT_HOME/." "$JEDIT/."
 rm -rf "$JEDIT/jEdit" "$JEDIT/build-support"
 
-cp -R jars "$JEDIT/jars"
+mkdir -p "$JEDIT/jars"
+cp -R jars/. "$JEDIT/jars/."
 
 cp -R "$THIS/dist-template/." "$JEDIT/."
 
diff -r e3ca0658fb6a -r e647f063ffad src/Tools/jEdit/plugin/Isabelle.props
--- a/src/Tools/jEdit/plugin/Isabelle.props	Fri Mar 20 12:46:57 2009 +0100
+++ b/src/Tools/jEdit/plugin/Isabelle.props	Mon Mar 23 21:32:14 2009 +0100
@@ -1,13 +1,17 @@
 ## Isabelle plugin properties
+##
+##:encoding=ISO-8859-1:
 
 #identification
 plugin.isabelle.jedit.Plugin.name=Isabelle
-plugin.isabelle.jedit.Plugin.author=Johannes Hölzl, Fabian Immler, Makarius Wenzel
+plugin.isabelle.jedit.Plugin.author=Johannes H�lzl, Fabian Immler, Makarius Wenzel
 plugin.isabelle.jedit.Plugin.version=0.0.1
 plugin.isabelle.jedit.Plugin.description=Isabelle/Isar live document editing
 
 #system parameters
-plugin.isabelle.jedit.Plugin.activate=startup
+# jEdit only needs to load the plugin the first time the user accesses it
+# the presence of this property (activate=defer) also tells jEdit the plugin is using the new API
+plugin.isabelle.jedit.Plugin.activate=defer
 plugin.isabelle.jedit.Plugin.usePluginHome=false
 plugin.isabelle.jedit.Plugin.jars=Pure.jar core-renderer.jar scala-library.jar
 
diff -r e3ca0658fb6a -r e647f063ffad src/Tools/jEdit/plugin/styles.props
--- a/src/Tools/jEdit/plugin/styles.props	Fri Mar 20 12:46:57 2009 +0100
+++ b/src/Tools/jEdit/plugin/styles.props	Mon Mar 23 21:32:14 2009 +0100
@@ -8,4 +8,14 @@
 options.isabelle.styles.literal.foreground=#808000
 options.isabelle.styles.ident.foreground=#C0C000
 options.isabelle.styles.doc_source.foreground=#C00000
-options.isabelle.styles.ML_source.foreground=#C00000
\ No newline at end of file
+options.isabelle.styles.ML_source.foreground=#C00000
+options.isabelle.styles.malformed=#FF0000
+#ML
+options.isabelle.styles.ML_keyword.foreground=#000080
+options.isabelle.styles.ML_ident.foreground=#000080
+options.isabelle.styles.ML_tvar.foreground=#
+options.isabelle.styles.ML_numeral.foreground=#808000
+options.isabelle.styles.ML_char.foreground=#C0C000
+options.isabelle.styles.ML_string.foreground=#C0C000
+options.isabelle.styles.ML_comment.foreground=#808080
+options.isabelle.styles.ML_malformed.foreground=#FF0000
diff -r e3ca0658fb6a -r e647f063ffad src/Tools/jEdit/src/jedit/DynamicTokenMarker.scala
--- a/src/Tools/jEdit/src/jedit/DynamicTokenMarker.scala	Fri Mar 20 12:46:57 2009 +0100
+++ b/src/Tools/jEdit/src/jedit/DynamicTokenMarker.scala	Mon Mar 23 21:32:14 2009 +0100
@@ -50,6 +50,9 @@
     Markup.INNER_COMMENT,
     Markup.SORT, Markup.TYP, Markup.TERM, Markup.PROP,
     Markup.ATTRIBUTE, Markup.METHOD,
+    // ML syntax
+    Markup.ML_KEYWORD, Markup.ML_IDENT, Markup.ML_TVAR, Markup.ML_NUMERAL,
+    Markup.ML_CHAR, Markup.ML_STRING, Markup.ML_COMMENT, Markup.ML_MALFORMED,
     // embedded source text
     Markup.ML_SOURCE, Markup.DOC_SOURCE, Markup.ANTIQ, Markup.ML_ANTIQ,
     Markup.DOC_ANTIQ,