X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fwww%2Flambdadelta%2Fbin%2Fxhtbl%2Fmatrix.ml;h=1c65c50043fe17fa2b070acb70063f45712c1e74;hb=57ae1762497a5f3ea75740e2908e04adb8642cc2;hp=62f6b194e73d35e54b64e19ce6769cd16b23f920;hpb=c0d87c3cdf879f61aa53e91f43580e9815ae7190;p=helm.git diff --git a/helm/www/lambdadelta/bin/xhtbl/matrix.ml b/helm/www/lambdadelta/bin/xhtbl/matrix.ml index 62f6b194e..1c65c5004 100644 --- a/helm/www/lambdadelta/bin/xhtbl/matrix.ml +++ b/helm/www/lambdadelta/bin/xhtbl/matrix.ml @@ -7,7 +7,8 @@ type cell = { ck: T.text list; (* contents *) cc: T.css; (* css classes *) cu: T.uri; (* uri *) - cx: T.ext; (* extension *) + cx: T.ext; (* extension *) + cn: T.anchor; (* named anchor *) cb: T.border; (* border *) } @@ -17,8 +18,10 @@ type matrix = { m: cell array array; (* matrix *) } +let strand a b = if a = "" then b else a + let empty = { - ck = []; cc = []; cu = ""; cx = ""; cb = T.border false; + ck = []; cc = []; cu = ""; cx = ""; cn = ""; cb = T.border false; } let make ts = { @@ -29,11 +32,12 @@ let make ts = { let set_key m y x kl = m.m.(y).(x) <- {m.m.(y).(x) with ck = kl} -let set_attrs m y x c u e = +let set_attrs m y x c u e n = m.m.(y).(x) <- {m.m.(y).(x) with cc = c @ m.m.(y).(x).cc; cu = u ^ m.m.(y).(x).cu; cx = m.m.(y).(x).cx ^ e; + cn = strand m.m.(y).(x).cn n; } let set_west m y x b =