diff options
| author | Ludovic Courtes | 2005-12-04 21:25:49 +0000 |
|---|---|---|
| committer | Ludovic Courtes | 2005-12-04 21:25:49 +0000 |
| commit | 714296f422f9789081b8216aca0c2e4be0668efc (patch) | |
| tree | ab3b278564578d0ffa0b691481dfa3fd27a1af0d /src/guile/skribilo/engine | |
| parent | a8fe8dda53e5e3625d14d5ad0cb8fe27da5cfaf8 (diff) | |
| parent | 42e397a7d41c5e71e783e0033b5171b933595588 (diff) | |
| download | skribilo-714296f422f9789081b8216aca0c2e4be0668efc.tar.gz skribilo-714296f422f9789081b8216aca0c2e4be0668efc.tar.lz skribilo-714296f422f9789081b8216aca0c2e4be0668efc.zip | |
Merge from lcourtes@laas.fr--2005-mobile
Patches applied:
* lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2 (patch 16)
- Added the `~' markup. Added SRFI-62 and SRFI-30 support to the Skribe
reader.
git-archimport-id: lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-19
Diffstat (limited to 'src/guile/skribilo/engine')
| -rw-r--r-- | src/guile/skribilo/engine/html.scm | 8 | ||||
| -rw-r--r-- | src/guile/skribilo/engine/latex.scm | 6 | ||||
| -rw-r--r-- | src/guile/skribilo/engine/lout.scm | 4 |
3 files changed, 13 insertions, 5 deletions
diff --git a/src/guile/skribilo/engine/html.scm b/src/guile/skribilo/engine/html.scm index 01708c8..b5c7a55 100644 --- a/src/guile/skribilo/engine/html.scm +++ b/src/guile/skribilo/engine/html.scm @@ -1411,6 +1411,14 @@ :after "</p>") ;*---------------------------------------------------------------------*/ +;* ~ ... */ +;*---------------------------------------------------------------------*/ +(markup-writer '~ + :before " " + :after #f + :action #f) + +;*---------------------------------------------------------------------*/ ;* footnote ... */ ;*---------------------------------------------------------------------*/ (markup-writer 'footnote diff --git a/src/guile/skribilo/engine/latex.scm b/src/guile/skribilo/engine/latex.scm index 2a59b4f..90e32cf 100644 --- a/src/guile/skribilo/engine/latex.scm +++ b/src/guile/skribilo/engine/latex.scm @@ -478,9 +478,9 @@ colors)) ;*---------------------------------------------------------------------*/ -;* &~ ... */ +;* ~ ... */ ;*---------------------------------------------------------------------*/ -(markup-writer '&~ +(markup-writer '~ :before "~" :action #f) @@ -1468,7 +1468,7 @@ (if t (begin (output t e) - (output "~" e (markup-writer-get '&~ e)))))) + (output "~" e (markup-writer-get '~ e)))))) :after (lambda (n e) (let* ((c (handle-ast (markup-body n))) (id (markup-ident c))) diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm index 6d3dbfa..1ae5cd0 100644 --- a/src/guile/skribilo/engine/lout.scm +++ b/src/guile/skribilo/engine/lout.scm @@ -941,9 +941,9 @@ (list r g b))))))) ;*---------------------------------------------------------------------*/ -;* &~ ... */ +;* ~ ... */ ;*---------------------------------------------------------------------*/ -(markup-writer '&~ :before "~" :action #f) +(markup-writer '~ :before "~" :action #f) (define (lout-page-orientation orientation) ;; Return a string representing the Lout page orientation name for symbol |