aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@csail.mit.edu>2016-09-20 14:26:58 -0400
committerGravatar Adam Chlipala <adamc@csail.mit.edu>2016-09-20 14:26:58 -0400
commit6720a4578afab577f9721485fbb8e810104d6249 (patch)
tree29e6d22181a1bd58271a3b10ef5e457b37b9b06e /src
parentd41ec985e9839d5c01d69363cfca1dfda25536ab (diff)
Make HTML5 the default and add 'xhtml' .urp directive
Diffstat (limited to 'src')
-rw-r--r--src/compiler.sml3
-rw-r--r--src/settings.sml2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler.sml b/src/compiler.sml
index 87d175ed..4fe2dfd5 100644
--- a/src/compiler.sml
+++ b/src/compiler.sml
@@ -485,6 +485,8 @@ fun parseUrp' accLibs fname =
fun hasSpaceLine () =
case inputCommentableLine inf of
Content s => s = "debug" orelse s = "profile"
+ orelse s = "html5" orelse s = "xhtml"
+ orelse s = "noMangleSql" orelse s = "lessSafeFfi"
orelse CharVector.exists (fn ch => ch = #" " orelse ch = #"\t") s orelse hasSpaceLine ()
| EndOfFile => false
| OnlyComment => hasSpaceLine ()
@@ -890,6 +892,7 @@ fun parseUrp' accLibs fname =
| "timeFormat" => Settings.setTimeFormat arg
| "noMangleSql" => Settings.setMangleSql false
| "html5" => Settings.setIsHtml5 true
+ | "xhtml" => Settings.setIsHtml5 false
| "lessSafeFfi" => Settings.setLessSafeFfi true
| "file" =>
diff --git a/src/settings.sml b/src/settings.sml
index f4d399dc..5662d9d6 100644
--- a/src/settings.sml
+++ b/src/settings.sml
@@ -818,7 +818,7 @@ fun mangleSqlCatalog s =
else
lowercase s
-val html5 = ref false
+val html5 = ref true
fun setIsHtml5 b = html5 := b
fun getIsHtml5 () = !html5