summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adam@chlipala.net>2011-12-20 19:02:04 -0500
committerGravatar Adam Chlipala <adam@chlipala.net>2011-12-20 19:02:04 -0500
commit8e27e217fa4b6fbf34f588e70036fa7a21df5183 (patch)
tree5358ac1a4e610aa945310524d94aa0aeaf8cc3ac /lib
parentf7b9d1cc2d003582e03ad151bfe54f3d5fa51eb7 (diff)
Redo HTML context classification, to keep regular <body> tags out of <table> and <tr>
Diffstat (limited to 'lib')
-rw-r--r--lib/ur/basis.urs42
1 files changed, 21 insertions, 21 deletions
diff --git a/lib/ur/basis.urs b/lib/ur/basis.urs
index 83f23cae..a2209150 100644
--- a/lib/ur/basis.urs
+++ b/lib/ur/basis.urs
@@ -662,24 +662,24 @@ val useMore : ctx ::: {Unit} -> use1 ::: {Type} -> use2 ::: {Type}
xml ctx use1 bind
-> xml ctx (use1 ++ use2) bind
-con xhtml = xml [Html]
+con html = [Html]
+con head = [Head]
+con body = [Dyn, Body]
+con form = [Dyn, Body, Form]
+con subform = [Dyn, Body, Subform]
+con tabl = [Dyn, Table]
+con tr = [Dyn, Tr]
+
+con xhtml = xml html
con page = xhtml [] []
-con xbody = xml [Body] [] []
-con xtable = xml [Body, Table] [] []
-con xtr = xml [Body, Tr] [] []
-con xform = xml [Body, Form] [] []
+con xbody = xml body [] []
+con xtable = xml tabl [] []
+con xtr = xml tr [] []
+con xform = xml form [] []
(*** HTML details *)
-con html = [Html]
-con head = [Head]
-con body = [Body]
-con form = [Body, Form]
-con subform = [Body, Subform]
-con tabl = [Body, Table]
-con tr = [Body, Tr]
-
type queryString
val show_queryString : show queryString
@@ -697,8 +697,8 @@ val redirect : t ::: Type -> url -> transaction t
type id
val fresh : transaction id
-val dyn : ctx ::: {Unit} -> use ::: {Type} -> bind ::: {Type} -> [ctx ~ body] => unit
- -> tag [Signal = signal (xml (body ++ ctx) use bind)] (body ++ ctx) [] use bind
+val dyn : ctx ::: {Unit} -> use ::: {Type} -> bind ::: {Type} -> [ctx ~ [Dyn]] => unit
+ -> tag [Signal = signal (xml ([Dyn] ++ ctx) use bind)] ([Dyn] ++ ctx) [] use bind
val head : unit -> tag [] html head [] []
val title : unit -> tag [] head [] [] []
@@ -763,7 +763,7 @@ val img : bodyTag ([Alt = string, Src = url, Width = int, Height = int,
Onload = transaction unit] ++ boxAttrs)
val form : ctx ::: {Unit} -> bind ::: {Type}
- -> [[Body, Form, Table] ~ ctx] =>
+ -> [[Body, Form] ~ ctx] =>
option css_class
-> xml ([Body, Form] ++ ctx) [] bind
-> xml ([Body] ++ ctx) [] []
@@ -864,16 +864,16 @@ val ctextarea : cformTag ([Value = string, Rows = int, Cols = int, Source = sour
val tabl : other ::: {Unit} -> [other ~ [Body, Table]] => unit
-> tag ([Border = int] ++ boxAttrs)
- ([Body] ++ other) ([Body, Table] ++ other) [] []
-val tr : other ::: {Unit} -> [other ~ [Body, Table, Tr]] => unit
+ ([Body] ++ other) ([Table] ++ other) [] []
+val tr : other ::: {Unit} -> [other ~ [Table, Tr]] => unit
-> tag tableAttrs
- ([Body, Table] ++ other) ([Body, Tr] ++ other) [] []
+ ([Table] ++ other) ([Tr] ++ other) [] []
val th : other ::: {Unit} -> [other ~ [Body, Tr]] => unit
-> tag ([Colspan = int, Rowspan = int] ++ tableAttrs)
- ([Body, Tr] ++ other) ([Body] ++ other) [] []
+ ([Tr] ++ other) ([Body] ++ other) [] []
val td : other ::: {Unit} -> [other ~ [Body, Tr]] => unit
-> tag ([Colspan = int, Rowspan = int] ++ tableAttrs)
- ([Body, Tr] ++ other) ([Body] ++ other) [] []
+ ([Tr] ++ other) ([Body] ++ other) [] []
(** Aborting *)