aboutsummaryrefslogtreecommitdiff
path: root/src/guile/skribilo/engine/lout.scm
diff options
context:
space:
mode:
authorLudovic Courtes2005-10-31 16:03:18 +0000
committerLudovic Courtes2005-10-31 16:03:18 +0000
commite9509518623d016880392237a298d4561a3b6a0b (patch)
tree9de28d4985d0c1f8b040900ce23714de8531e46f /src/guile/skribilo/engine/lout.scm
parent409e8a99bf90ddb8e5d40c6dd8559ad1d97b925f (diff)
downloadskribilo-e9509518623d016880392237a298d4561a3b6a0b.tar.gz
skribilo-e9509518623d016880392237a298d4561a3b6a0b.tar.lz
skribilo-e9509518623d016880392237a298d4561a3b6a0b.zip
Removed useless files, integrated packages.
* src/guile/skribilo/packages: New directory and files. * bin: Removed. * skr: Removed (files moved to `src/guile/skribilo/packages'). * skribe: Removed. * doc/skr/env.skr (*courtes-mail*): New. * doc/user/user.skb: Removed postal addresses, added my name. * src/guile/skribilo/engine/lout.scm: Uncommented the slide-related markup writers. * src/guile/skribilo/evaluator.scm (%evaluate): Try weird things with source properties. * src/guile/skribilo/reader/skribe.scm: Comply with the new guile-reader API. * src/guile/skribilo/types.scm: Removed the special `initialize' method for ASTs which was supposed to set their location. git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-7
Diffstat (limited to 'src/guile/skribilo/engine/lout.scm')
-rw-r--r--src/guile/skribilo/engine/lout.scm174
1 files changed, 87 insertions, 87 deletions
diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm
index b675e8a..b466ac1 100644
--- a/src/guile/skribilo/engine/lout.scm
+++ b/src/guile/skribilo/engine/lout.scm
@@ -2876,93 +2876,93 @@
;*---------------------------------------------------------------------*/
;* Slides */
;* */
-;* At some point, this should move to `slide.skr'. */
-;*---------------------------------------------------------------------*/
-; (skribe-load "slide.skr")
-
-; (markup-writer 'slide
-; ;; FIXME: In `slide.skr', `:ident' is systematically generated.
-; :options '(:title :number :toc :ident) ;; '(:bg :vspace :image)
-
-; :validate (lambda (n e)
-; (eq? (engine-custom e 'document-type) 'slides))
-
-; :before (lambda (n e)
-; (display "\n@Overhead\n")
-; (display " @Title { ")
-; (output (markup-option n :title) e)
-; (display " }\n")
-; (if (markup-ident n)
-; (begin
-; (display " @Tag { ")
-; (display (lout-tagify (markup-ident n)))
-; (display " }\n")))
-; (if (markup-option n :number)
-; (begin
-; (display " @BypassNumber { ")
-; (output (markup-option n :number) e)
-; (display " }\n")))
-; (display "@Begin\n")
-
-; ;; `doc' documents produce their PDF outline right after
-; ;; `@Text @Begin'; other types of documents must produce it
-; ;; as part of their first chapter.
-; (lout-output-pdf-meta-info (ast-document n) e))
-
-; :after "@End @Overhead\n")
-
-; (markup-writer 'slide-vspace
-; :options '(:unit)
-; :validate (lambda (n e)
-; (and (pair? (markup-body n))
-; (number? (car (markup-body n)))))
-; :action (lambda (n e)
-; (printf "\n//~a~a # slide-vspace\n"
-; (car (markup-body n))
-; (case (markup-option n :unit)
-; ((cm) "c")
-; ((point points pt) "p")
-; ((inch inches) "i")
-; (else
-; (skribe-error 'lout
-; "Unknown vspace unit"
-; (markup-option n :unit)))))))
-
-; (markup-writer 'slide-pause
-; ;; FIXME: Use a `pdfmark' custom action and a PDF transition action.
-; ;; << /Type /Action
-; ;; << /S /Trans
-; ;; entry in the trans dict
-; ;; << /Type /Trans /S /Dissolve >>
-; :action (lambda (n e)
-; (let ((filter (make-string-replace lout-verbatim-encoding))
-; (pdfmark "
-; [ {ThisPage} << /Trans << /S /Wipe /Dm /V /D 3 /M /O >> >> /PUT pdfmark"))
-; (display (lout-embedded-postscript-code
-; (filter pdfmark))))))
-
-; ;; For movies, see
-; ;; http://www.tug.org/tex-archive/macros/latex/contrib/movie15/movie15.sty .
-; (markup-writer 'slide-embed
-; :options '(:alt :geometry :rgeometry :geometry-opt :command)
-; ;; FIXME: `pdfmark'.
-; ;; << /Type /Action /S /Launch
-; :action (lambda (n e)
-; (let ((command (markup-option n :command))
-; (filter (make-string-replace lout-verbatim-encoding))
-; (pdfmark "[ /Rect [ 0 ysize xsize 0 ]
-; /Name /Comment
-; /Contents (This is an embedded application)
-; /ANN pdfmark
-
-; [ /Type /Action
-; /S /Launch
-; /F (~a)
-; /OBJ pdfmark"))
-; (display (string-append
-; "4c @Wide 3c @High "
-; (lout-embedded-postscript-code
-; (filter (format #f pdfmark command))))))))
+;* At some point, we might want to move this to `slide.scm'. */
+;*---------------------------------------------------------------------*/
+
+(use-modules (skribilo packages slide))
+
+(markup-writer 'slide
+ :options '(:title :number :toc :ident) ;; '(:bg :vspace :image)
+
+ :validate (lambda (n e)
+ (eq? (engine-custom e 'document-type) 'slides))
+
+ :before (lambda (n e)
+ (display "\n@Overhead\n")
+ (display " @Title { ")
+ (output (markup-option n :title) e)
+ (display " }\n")
+ (if (markup-ident n)
+ (begin
+ (display " @Tag { ")
+ (display (lout-tagify (markup-ident n)))
+ (display " }\n")))
+ (if (markup-option n :number)
+ (begin
+ (display " @BypassNumber { ")
+ (output (markup-option n :number) e)
+ (display " }\n")))
+ (display "@Begin\n")
+
+ ;; `doc' documents produce their PDF outline right after
+ ;; `@Text @Begin'; other types of documents must produce it
+ ;; as part of their first chapter.
+ (lout-output-pdf-meta-info (ast-document n) e))
+
+ :after "@End @Overhead\n")
+
+(markup-writer 'slide-vspace
+ :options '(:unit)
+ :validate (lambda (n e)
+ (and (pair? (markup-body n))
+ (number? (car (markup-body n)))))
+ :action (lambda (n e)
+ (printf "\n//~a~a # slide-vspace\n"
+ (car (markup-body n))
+ (case (markup-option n :unit)
+ ((cm) "c")
+ ((point points pt) "p")
+ ((inch inches) "i")
+ (else
+ (skribe-error 'lout
+ "Unknown vspace unit"
+ (markup-option n :unit)))))))
+
+(markup-writer 'slide-pause
+ ;; FIXME: Use a `pdfmark' custom action and a PDF transition action.
+ ;; << /Type /Action
+ ;; << /S /Trans
+ ;; entry in the trans dict
+ ;; << /Type /Trans /S /Dissolve >>
+ :action (lambda (n e)
+ (let ((filter (make-string-replace lout-verbatim-encoding))
+ (pdfmark "
+[ {ThisPage} << /Trans << /S /Wipe /Dm /V /D 3 /M /O >> >> /PUT pdfmark"))
+ (display (lout-embedded-postscript-code
+ (filter pdfmark))))))
+
+For movies, see
+http://www.tug.org/tex-archive/macros/latex/contrib/movie15/movie15.sty .
+(markup-writer 'slide-embed
+ :options '(:alt :geometry :rgeometry :geometry-opt :command)
+ ;; FIXME: `pdfmark'.
+ ;; << /Type /Action /S /Launch
+ :action (lambda (n e)
+ (let ((command (markup-option n :command))
+ (filter (make-string-replace lout-verbatim-encoding))
+ (pdfmark "[ /Rect [ 0 ysize xsize 0 ]
+ /Name /Comment
+ /Contents (This is an embedded application)
+ /ANN pdfmark
+
+[ /Type /Action
+ /S /Launch
+ /F (~a)
+ /OBJ pdfmark"))
+ (display (string-append
+ "4c @Wide 3c @High "
+ (lout-embedded-postscript-code
+ (filter (format #f pdfmark command))))))))
;*---------------------------------------------------------------------*/
;* Restore the base engine */