/[svn]/web/site.cd
ViewVC logotype

Diff of /web/site.cd

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1263 by abate, Tue Jul 10 18:33:42 2007 UTC revision 1264 by abate, Tue Jul 10 18:36:10 2007 UTC
# Line 39  Line 39 
39  type Content =  type Content =
40     [ ( <p {|style=?String|}>[InlineText*]     [ ( <p {|style=?String|}>[InlineText*]
41       | <ul {||}>[<li {||}>Content *]       | <ul {||}>[<li {||}>Content *]
42       | <ol {||}>[<li {||}>Content *]       | <ol {|style=?String|}>[<li {||}>Content *]
43       | <section title=String>Content       | <section title=String>Content
44       | <sample highlight=?"true"|"false">String       | <sample highlight=?"true"|"false">String
45       | <xmlsample highlight=?"true"|"false">String       | <xmlsample highlight=?"true"|"false">String
# Line 139  Line 139 
139    
140  let ul([H:Xli*] -> [H:Xul?]) [] -> [] | l -> [ <ul>l ]  let ul([H:Xli*] -> [H:Xul?]) [] -> [] | l -> [ <ul>l ]
141    
142  let ol([H:Xli*] -> [H:Xol?]) [] -> [] | l -> [ <ol>l ]  let ol(([H:Xli*],{|style=?String|}) -> [H:Xol?])
143          ([],_) -> []
144        | (l,s&{|style=?String|}) -> [ <ol (s)>l ]
145    
146    
147    
148  let display_sitemap (h : Tree) :  H:Xli =  let display_sitemap (h : Tree) :  H:Xli =
149    let ch = map h . children with x -> display_sitemap x in    let ch = map h . children with x -> display_sitemap x in
# Line 245  Line 249 
249     | <code>x -> [ <b>[ <tt>(highlight x) ] ]     | <code>x -> [ <b>[ <tt>(highlight x) ] ]
250     | <local href=l>txt -> [ (local_link (sitemap,l,txt)) ]     | <local href=l>txt -> [ (local_link (sitemap,l,txt)) ]
251     | <(tag & (`b|`i|`tt|`em)) (attr)>x -> [ <(tag) (attr)>(text x) ]     | <(tag & (`b|`i|`tt|`em)) (attr)>x -> [ <(tag) (attr)>(text x) ]
252       | <footnote nocount=_>_ ->
253          let n = string_of !footnote_counter in
254          [ <a name=[ 'bnote' !n ]>[]
255            <a href=[ '#note' !n ]>[ '[' !n ']' ] ]
256    
257     | <footnote>c ->     | <footnote>c ->
258        footnote_counter := !footnote_counter + 1;        footnote_counter := !footnote_counter + 1;
259        let n = string_of !footnote_counter in        let n = string_of !footnote_counter in
# Line 290  Line 299 
299          [ <ul>[ <li>[ <a href=url>title '. ' !(text com) ] ] ]          [ <ul>[ <li>[ <a href=url>title '. ' !(text com) ] ] ]
300     | <ul>lis ->     | <ul>lis ->
301          ul (map lis with <li>x -> <li>(content x))          ul (map lis with <li>x -> <li>(content x))
302     | <ol>lis ->     | <ol (attr) >lis ->
303          ol (map lis with <li>x -> <li>(content x))          ol ((map lis with <li>x -> <li>(content x) ),(attr))
304     | H:Xtable & x ->     | H:Xtable & x ->
305         [ <table width="100%">[<tr>[<td align="center">[x]]] ]         [ <table width="100%">[<tr>[<td align="center">[x]]] ]
306     | <p (attr)>x -> [ <p (attr)>(text x) ]     | <p (attr)>x -> [ <p (attr)>(text x) ]
Legend:
Removed from v.1263  
changed lines
  Added in v.1264
CVS Admin">CVS Admin
 ViewVC Help
Powered by ViewVC 1.1.5