factor: trim using lists

[factor.git] / extra / slides / slides.factor

diff --git a/extra/slides/slides.factor b/extra/slides/slides.factor
index 8e90d9132e11b9d9d3ad54897e2de96b5b16e656..e11c208cfb88fd7649eb85077c5465d72e333488 100644 (file)
--- a/extra/slides/slides.factor
+++ b/extra/slides/slides.factor
@@ -1,55 +1,51 @@
 ! Copyright (C) 2007, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays colors fry help.markup help.stylesheet
-io.styles kernel math math.ranges models namespaces parser
+USING: accessors arrays colors fonts help.markup help.stylesheet
+io.styles kernel literals math models namespaces parser ranges
 sequences ui ui.gadgets ui.gadgets.books ui.gadgets.panes
 ui.gestures ui.pens.gradient ;
 IN: slides
 
 CONSTANT: stylesheet
     H{
-        { default-span-style
+        { default-style
             H{
-                { font-name "sans-serif" }
-                { font-size 36 }
-            }
-        }
-        { default-block-style
-            H{
-                { wrap-margin 1100 }
-            }
-        }
-        { code-char-style
-            H{
-                { font-name "monospace" }
-                { font-size 36 }
+                { font-name $ default-sans-serif-font-name }
+                { font-size $[ default-font-size 3 * ] }
+                { wrap-margin $[ default-font-size 92 * ] }
             }
         }
         { code-style
             H{
+                { font-name $ default-monospace-font-name }
+                { font-size $[ default-font-size 3 * ] }
                 { page-color T{ rgba f 0.4 0.4 0.4 0.3 } }
             }
         }
         { snippet-style
             H{
-                { font-name "monospace" }
-                { font-size 36 }
+                { font-name $ default-monospace-font-name }
+                { font-size $[ default-font-size 3 * ] }
                 { foreground T{ rgba f 0.1 0.1 0.4 1 } }
             }
         }
         { table-content-style
-            H{ { wrap-margin 1000 } }
+            H{ { wrap-margin $[ default-font-size 83 * ] } }
         }
         { list-style
-            H{ { table-gap { 10 20 } } }
+            H{
+                { table-gap ${ default-font-size 5/6 *
+                               default-font-size 10/6 * }
+                }
+            }
         }
     }
 
 : $title ( string -- )
     [
         H{
-            { font-name "sans-serif" }
-            { font-size 48 }
+            { font-name $ default-sans-serif-font-name }
+            { font-size $[ default-font-size 4 * ] }
         } format
     ] ($block) ;
 
@@ -60,7 +56,7 @@ CONSTANT: stylesheet
                 T{ rgba f 0.25 0.25 0.25 1.0 }
                 T{ rgba f 1.0 1.0 1.0 0.0 }
             } <gradient> >>interior
-            { 800 10 } >>dim
+            ${ default-font-size 67 * default-font-size 5/6 * } >>dim
             { 1 0 } >>orientation
         gadget.
     ] ($block) ;
@@ -95,17 +91,21 @@ TUPLE: slides < book ;
 : prev-page ( book -- ) -1 change-page ;
 
 : strip-tease ( data -- seq )
-    first3 2 over length [a,b] [ head 3array ] with with with map ;
+    first3 2 over length [a..b] [ head 3array ] with with with map ;
 
 SYNTAX: STRIP-TEASE:
     parse-definition strip-tease append! ;
 
 \ slides H{
     { T{ button-down } [ request-focus ] }
+    { T{ key-down f f " " } [ next-page ] }
     { T{ key-down f f "DOWN" } [ next-page ] }
+    { T{ key-down f f "b" } [ prev-page ] }
     { T{ key-down f f "UP" } [ prev-page ] }
+    { T{ key-down f f "q" } [ close-window ] }
+    { T{ key-down f f "ESC" } [ close-window ] }
     { T{ key-down f f "f" } [ toggle-fullscreen ] }
 } set-gestures
 
-: slides-window ( slides -- )
-    '[ _ <slides> "Slides" open-window ] with-ui ;
+: slides-window ( slides title -- )
+    '[ _ <slides> _ open-window ] with-ui ;