diff options
| author |  Adam Chlipala <adam@chlipala.net> | 2012-05-13 14:27:29 -0400 |
|---|---|---|
| committer | Adam Chlipala <adam@chlipala.net> | 2012-05-13 14:27:29 -0400 |
| commit | fed7038ac8d5e3dddbae85a217abab96f406e02d (patch) | |
| tree | 4df2911728427b4f84558c03f672ac370427e815 | |
| parent | 5ea8935a8499c04b5f10e48dd11c35623539b286 (diff) | |
Fix hyphenation for demos; parse CSS class 'table' as 'tabl'
| -rw-r--r-- | src/demo.sml | 4 | ||||
| -rw-r--r-- | src/urweb.grm | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/demo.sml b/src/demo.sml index 6897bfa2..747bbd2c 100644 --- a/src/demo.sml +++ b/src/demo.sml @@ -424,6 +424,10 @@ fun make' {prefix, dirname, guided} = | Settings.Prefix => TextIO.output (outf, "*"); TextIO.output (outf, " "); TextIO.output (outf, #to rule); + if #hyphenate rule then + TextIO.output (outf, " [-]") + else + (); TextIO.output (outf, "\n"))) (#rewrites combined); filters "url" (#filterUrl combined); filters "mime" (#filterMime combined); diff --git a/src/urweb.grm b/src/urweb.grm index c6545f47..1419ef3f 100644 --- a/src/urweb.grm +++ b/src/urweb.grm @@ -246,7 +246,14 @@ fun tnamesOf (e, _) = | EDisjointApp e => tnamesOf e | _ => [] -fun classOut (s, pos) = (EVar ([], String.translate (fn #"-" => "_" | ch => str ch) s, Infer), pos) +fun classOut (s, pos) = + let + val s = case s of + "table" => "tabl" + | _ => s + in + (EVar ([], String.translate (fn #"-" => "_" | ch => str ch) s, Infer), pos) + end fun parseClass s pos = case String.tokens Char.isSpace s of |