*** empty log message ***

* empty log message *
Olivier Duvernois
1 parent e69683f4
Showing 5 changed files with 105 additions and 45 deletions Show diff stats
anubis_dev/library/tools/basis.anubis
anubis_dev/library/widgets3/henri_2.jpg
anubis_dev/library/widgets3/hypertext.anubis
anubis_dev/library/widgets3/richard.jpg
anubis_dev/library/widgets3/try_ht.anubis
@@ -29,7 +29,7 @@
          *** (4.2.3) Lenght
       *** (4.3) A syntactical variant for 'append'
       *** (4.4) Merging two lists
-         *** (4.4.1) with standrad comparison
+         *** (4.4.1) with standard comparison
          *** (4.4.2) with a non standard comparison:
       *** (4.5) Quick sorting of lists.
       *** (4.6) Randomly shuffling a list. 
@@ -42,6 +42,7 @@
          *** (4.8.3) 'map' a list to a list
       *** (4.9) Check that all elements of a list have a given property
       *** (4.10) Replace element in a list by its new_value
+      *** (4.11) Get a List($A) from a List($B)
    *** (5) A generic 'identity' function 
    *** (6) Printable trees. 
       *** (6.1) Definition
@@ -351,6 +352,8 @@ public define String
  
  
       *** (4.1) Find element(s)
+
+         *** (4.1.1) as nth from a list
  
 public define Maybe($T)
   nth
@@ -398,6 +401,56 @@ public define $T
      }. 
  
  
+         *** (4.1.2) Get a List($A) from a List($B)
+
+public define List($A)
+   find_elements
+     (
+       List($B)             l,
+       $B -> Bool        test,
+       $B -> List($A)    to_a
+     ) =
+   if l is 
+     {
+       []       then [],
+       [h . t]  then 
+         if test(h)
+           then append(to_a(h),find_elements(t,test,to_a))
+           else find_elements(t,test,to_a)
+     }.
+   
+public define List($A)
+   find_elements
+     (
+       List($B)       l,
+       $B -> Bool  test,
+       $B -> $A    to_a
+     ) =
+   if l is 
+     {
+       []       then [],
+       [h . t]  then 
+         if test(h)
+           then [to_a(h) . find_elements(t,test,to_a)]
+           else find_elements(t,test,to_a)
+     }.
+   
+   
+public define List($A)
+   find_elements
+     (
+       List($B)       l,
+       $B -> $A    to_a
+     ) =
+   if l is 
+     {
+       []       then [],
+       [h . t]  then [to_a(h) . find_elements(t,to_a)]
+     }.
+   
+   
+   
+   
       *** (4.2) member
  
  
@@ -808,6 +861,10 @@ public define List($T)
      }.
  
  
+   
+   
+   
+   
    *** (5) A generic 'identity' function 
  
  
@@ -542,9 +542,9 @@ define BlockContent
    BlockContent bc1 + BlockContent bc2 = 
     if bc1 is 
       {
-        empty          then bc2,
-        text(w,_)      then text(w,bc2),
-        link(w,a,i,_)  then link(w,a,i,bc2)
+        empty           then bc2,
+        text(w,bc)      then text(w,bc+bc2),
+        link(w,a,i,bc)  then link(w,a,i,bc+bc2)
       }.
  
  
@@ -594,6 +594,16 @@ define String
        link(s,a,i,b)  then s+concat_bcont(b),
      }.
  
+define String
+   print_bl
+     (
+       List(BlockLine) lbl
+     ) =
+   if lbl is 
+     {
+      []      then "",
+      [h . t] then concat_bcont(cont(h))+"|"+print_bl(t)
+     }.
  
          *** (4.2.1) Transform the text to List(BlockLine)
          *************************************************
@@ -684,27 +694,26 @@ define (List(BlockLine),BlockContent)
        (BlockContent,String) -> BlockLine      to_middle,
        String -> BlockContent                   to_bcont,
        List(BlockLine)                            so_far
-     ) = 
+     ) =
    if nth(i,line) is 
      { 
        failure   then
          with new_words_line = (String)(words_line+" "+word),
               bc_and_line = (String)(concat_bcont(bc)+new_words_line),
          if is_too_large_c(bc_and_line)
-           then ([middle(bc+to_bcont(words_line)) . so_far],to_bcont(word))
+           then  ([middle(bc+to_bcont(words_line)) . so_far],to_bcont(word))
            else (so_far,to_bcont(bc_and_line))
        success(c) then
          if c = ' '
            then // the test on 'words_line' is to avoid a space as first character to begin
                 // the all text to print
                 with new_words_line = (String)(words_line+(if words_line = "" then "" else " ")+word),
+                //with new_words_line = (String)(words_line+word),
                 if is_too_large_c(new_words_line+concat_bcont(bc))
-                  then //print("too_large = ["+new_words_line+concat_bcont(bc)+"]\n");
-                        transforming_text(line,empty,i+1,is_too_large,is_too_large,to_middle,
+                  then transforming_text(line,empty,i+1,is_too_large,is_too_large,to_middle,
                                          word+" ","",to_middle,to_bcont,
                                          [to_bline(bc,words_line) . so_far])
-                  else //print("not_too_large = ["+new_words_line+concat_bcont(bc)+"]\n");
-                       transforming_text(line,bc,i+1,is_too_large_c,is_too_large,to_bline,
+                  else transforming_text(line,bc,i+1,is_too_large_c,is_too_large,to_bline,
                                          "",new_words_line,to_middle,to_bcont,so_far)
            else transforming_text(line,bc,i+1,is_too_large_c,is_too_large,to_bline,
                                   word+implode([c]),words_line,to_middle,to_bcont,so_far)
@@ -748,11 +757,13 @@ define (List(BlockLine),BlockContent)
                       transforming_text(t,empty,is_too_large_i,is_too_large,to_first,
                                         to_flast,to_middle,to_first,to_last,to_bcont,
                                         bc_to_bl,[bc_to_bl(new_bc) . new_lbl]+so_far))
-           else transforming_text(t,empty,is_too_large_i,is_too_large,to_first,
+   
+           else if t is []
+                 then (so_far,add_bc)
+                 else transforming_text(t,empty,is_too_large_i,is_too_large,to_first,
                                         to_flast,to_middle,to_first,to_last,to_bcont,
                                         bc_to_bl,[to_flast(add_bc,"")]+so_far)
      }.
-
  
  
  
@@ -797,7 +808,7 @@ define List(BlockLine)
        [h . t] then
          if h is 
           {
-            new_paragraph(txt)  then 
+            new_paragraph(txt)  then
               if transforming_text
                    (split_string_into_lines(txt),b_cont,is_too_large_i,is_too_large,
                     (BlockContent bc,String s) |-> first(bc+text(s,empty)),
@@ -811,7 +822,7 @@ define List(BlockLine)
               append(reverse(new_lbl),
                      transforming_text(t,is_too_large_i,is_too_large,new_bc)),
  
-            to_continue(txt)    then
+            to_continue(txt)    then 
               if transforming_text
                    (split_string_into_lines(txt),b_cont,is_too_large,is_too_large,
                     (BlockContent bc,String s) |-> middle(bc+text(s,empty)),
@@ -825,7 +836,7 @@ define List(BlockLine)
               append(reverse(new_lbl),
                      transforming_text(t,is_too_large_i,is_too_large,new_bc)),
  
-            new_paragraph(lk,i) then
+            new_paragraph(lk,i) then 
               if transforming_text
                    (split_string_into_lines(txt(lk)),b_cont,is_too_large_i,is_too_large,
                     (BlockContent bc,String s) |-> first(bc+link(s,action(lk),i,empty)),
@@ -2252,11 +2263,19 @@ define List(LinkRectangle)
       link_rectangle(index(act_lr),lrect(act_lr),state,action(act_lr))).
  
  
+define List(WidgetRectangle)
+   get_visited_wid_rect
+     (
+       List(LinkRectangle)  llr
+     ) =
+   find_elements(llr,
+                 (LinkRectangle lr) |-> state(lr)=visited,
+                 (LinkRectangle lr) |-> wid_rect(lrect(lr))).
+   
  
          *** (8.2.2) When mouse moves...
          *******************************
  
- define Maybe((List(LinkRectangle),List(WidgetRectangle),Maybe(LinkRectangle)))
 define Maybe((List(LinkRectangle),List(WidgetRectangle),LinkRectangle))
    mouse_over_lk_rect
      (
@@ -2279,7 +2298,7 @@ define Maybe((List(LinkRectangle),List(WidgetRectangle),LinkRectangle))
                                           mouse_over  then mouse_over,
                                           visited     then visited
                                         },action(h)),
-                 success(([active_lk. so_far],
+                 success(([active_lk . append(t,so_far)],
                           wid_rect,
                           active_lk))
            else mouse_over_lk_rect(t,mx,my,[h . so_far])
@@ -2298,7 +2317,6 @@ define WidgetAnswer
        Var(List(LinkRectangle))        lk_rect,
        Var(Maybe(LinkRectangle))   active_link
      ) =
- //print_lkr(*lk_rect);
    if e is 
      {
        mouse_gone               then 
@@ -2309,7 +2327,7 @@ define WidgetAnswer
               active_link <- failure;
               handled(wid_rect(lrect(a_lk)))
            },
-       mouse_move(ks,mx,my)     then //print("mx="+mx+" | my="+my+"\n");
+       mouse_move(ks,mx,my)     then
          if mouse_over_lk_rect(*lk_rect,mx,my,[]) is 
            {
              failure    then 
@@ -2325,8 +2343,8 @@ define WidgetAnswer
                  },
              success(s) then if s is (new_lk_rect,wid_rect,a_lk)
                then  lk_rect <- new_lk_rect;
-                          active_link <- success(a_lk);
-                          handled(wid_rect)
+                     active_link <- success(a_lk);
+                     handled(wid_rect)
            },
        mouse_click(ks,mc,mx,my) then 
          if *active_link is 
@@ -2339,8 +2357,8 @@ define WidgetAnswer
                   left_up     then 
                     lk_rect <- move_link_state(*lk_rect,a_lk,visited);
                     action(a_lk)(etb);
-                     active_link <- failure;
-                    not_handled(wid_rect(lrect(a_lk))),
+                    active_link <- failure;
+                    handled(wid_rect(lrect(a_lk))),
                   middle_down then not_handled([]),
                   middle_up   then not_handled([]),
                   right_down  then not_handled([]),
@@ -2362,7 +2380,7 @@ define List((String,Int32,WidgetRectangle))
    if llr is 
      {
        []      then [],
-       [h . t] then if ls=state(h) then lrect(h) else rect_to_draw(t,ls)
+       [h . t] then if ls=state(h) then append(lrect(h),rect_to_draw(t,ls)) else rect_to_draw(t,ls)
      }.
  
  
@@ -2413,25 +2431,9 @@ define One
        HyperTextParameters           parms,
        Int32                     htc_width
      ) =
-   draw_links_visited(dtb,parms,rect_to_draw(*lk_rect,visited));
    draw_links_mouse_over
-      (dtb,parms,rect_to_draw(*lk_rect,mouse_over),lighten(text_color(effect(parms)))).
-   if *active_lk is 
-     {
-       failure      then 
-               draw_links_visited(dtb,parms,rect_to_draw(*lk_rect,visited)),
-       success(a_lk) then
-         if state(a_lk) is 
-           {
-             normal     then unique,
-             mouse_over then
-               draw_links_mouse_over
-                  (dtb,parms,rect_to_draw(*lk_rect,mouse_over),lighten(text_color(effect(parms)))),
-             visited     then 
-               draw_links_visited(dtb,parms,rect_to_draw(*lk_rect,visited))
-           }
-     }.
-   
+      (dtb,parms,rect_to_draw(*lk_rect,mouse_over),lighten(text_color(effect(parms))));
+   draw_links_visited(dtb,parms,rect_to_draw(*lk_rect,visited)).
  
  
    *** () Creating the widget
@@ -54,7 +54,7 @@ define LinkWidget
    link_richard = 
    link("Richard Coeur  de Lion",
         (WidgetEventToolBox w) |-> 
-          forget(open_host_window(100,100,"Richard Coeur de Lion",create_image("richard.jpg")))).
+          forget(open_host_window(100,150,"Richard Coeur de Lion",create_image("richard.jpg")))).
  
 define LinkWidget
    link_john = 
@@ -256,14 +256,15 @@ define One
    forget(open_host_window(10,10,"Text & Link/ Left",
           create_hypertext
            (font,normal(red),failure,350,3,2,18,left,
-            hypertext_l1+link_richard+hypertext_l2+empty,
-            //hypertext_l11+link_henri2+hypertext_l12+link_richard+hypertext_l2+empty,
+            //hypertext_l1+link_richard+hypertext_l2+empty,
+            hypertext_l11+link_henri2+hypertext_l12+link_richard+hypertext_l2+empty,
             //hypertext_l1+link_richard+hypertext_l3+link_john+hypertext_l4+empty,
             success(yellow))));
  
    forget(open_host_window(400,10,"Text & Link/ Right",
           create_hypertext
            (font,normal(red),failure,350,3,2,18,right,
+            //hypertext_l1+link_richard+hypertext_l3+link_john+hypertext_l4+empty,
             hypertext_l1+link_richard+hypertext_l2+empty,
             success(yellow))));