From 6720a4578afab577f9721485fbb8e810104d6249 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Tue, 20 Sep 2016 14:26:58 -0400 Subject: Make HTML5 the default and add 'xhtml' .urp directive --- src/compiler.sml | 3 +++ src/settings.sml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src') 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 -- cgit v1.2.3