update in basic_2

[helm.git] / helm / www / lambdadelta / bin / xhtbl / pass3.ml

diff --git a/helm/www/lambdadelta/bin/xhtbl/pass3.ml b/helm/www/lambdadelta/bin/xhtbl/pass3.ml
index 4513828b5867e2bf010f1f616767c0acb29c8084..d2455a30ac4257e1fb7a55c22767b3ed61b9dacd 100644 (file)
--- a/helm/www/lambdadelta/bin/xhtbl/pass3.ml
+++ b/helm/www/lambdadelta/bin/xhtbl/pass3.ml
@@ -1,23 +1,32 @@
-module A = Array
+module L = List
+module S = String
+module V = Array
 
+module T = Table
 module M = Matrix
-module C = Css
+module A = Attr
 
 type status = {
    m: M.matrix;
-   a: C.atoms;
+   c: T.css A.atoms;
+   u: T.uri A.atoms;
+   x: T.ext A.atoms;
 }
 
-let initial a m = {
-   m = m; a = a;
+let initial c u x m = {
+   m = m; c = c; u = u; x = x
 }
 
 let process_cell st y x c =
-   M.set_css st.m y x (C.get_css st.a y x)
+   M.set_attrs st.m y x
+      (A.get_attr L.concat [] st.c y x)
+      (A.get_attr (S.concat "") "" st.u y x)
+      (A.get_attr (S.concat "") "" st.x y x)
+      ""
 
 let process_row st y row =
-   A.iteri (process_cell st y) row
+   V.iteri (process_cell st y) row
 
-let process css matrix =
-   let st = initial css matrix in
-   A.iteri (process_row st) matrix.M.m
+let process css uri ext matrix =
+   let st = initial css uri ext matrix in
+   V.iteri (process_row st) matrix.M.m