aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am1
-rw-r--r--src/guile/Makefile.am4
-rw-r--r--src/guile/skribilo/Makefile.am9
-rw-r--r--src/guile/skribilo/Makefile.in517
-rw-r--r--src/guile/skribilo/coloring/Makefile.am2
-rw-r--r--src/guile/skribilo/config.scm.in2
-rw-r--r--src/guile/skribilo/engine/Makefile.am5
-rw-r--r--src/guile/skribilo/engine/html.scm2
-rw-r--r--src/guile/skribilo/engine/latex.scm2
-rw-r--r--src/guile/skribilo/evaluator.scm54
-rw-r--r--src/guile/skribilo/lib.scm23
-rw-r--r--src/guile/skribilo/package/Makefile.am4
-rw-r--r--src/guile/skribilo/package/acmproc.scm (renamed from src/guile/skribilo/packages/acmproc.scm)0
-rw-r--r--src/guile/skribilo/package/french.scm (renamed from src/guile/skribilo/packages/french.scm)2
-rw-r--r--src/guile/skribilo/package/jfp.scm (renamed from src/guile/skribilo/packages/jfp.scm)2
-rw-r--r--src/guile/skribilo/package/letter.scm (renamed from src/guile/skribilo/packages/letter.scm)2
-rw-r--r--src/guile/skribilo/package/lncs.scm (renamed from src/guile/skribilo/packages/lncs.scm)2
-rw-r--r--src/guile/skribilo/package/scribe.scm (renamed from src/guile/skribilo/packages/scribe.scm)2
-rw-r--r--src/guile/skribilo/package/sigplan.scm (renamed from src/guile/skribilo/packages/sigplan.scm)2
-rw-r--r--src/guile/skribilo/package/skribe.scm (renamed from src/guile/skribilo/packages/skribe.scm)0
-rw-r--r--src/guile/skribilo/package/slide.scm (renamed from src/guile/skribilo/packages/slide.scm)2
-rw-r--r--src/guile/skribilo/package/web-article.scm (renamed from src/guile/skribilo/packages/web-article.scm)2
-rw-r--r--src/guile/skribilo/package/web-book.scm (renamed from src/guile/skribilo/packages/web-book.scm)2
-rw-r--r--src/guile/skribilo/reader/Makefile.am2
-rw-r--r--src/guile/skribilo/reader/skribe.scm20
-rw-r--r--src/guile/skribilo/skribe/Makefile.am2
-rw-r--r--src/guile/skribilo/skribe/index.scm12
27 files changed, 553 insertions, 126 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..1d3db1f
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = guile
diff --git a/src/guile/Makefile.am b/src/guile/Makefile.am
new file mode 100644
index 0000000..afe4667
--- /dev/null
+++ b/src/guile/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = skribilo
+
+bin_SCRIPTS = skribilo.scm
+EXTRA_DIST = README
diff --git a/src/guile/skribilo/Makefile.am b/src/guile/skribilo/Makefile.am
new file mode 100644
index 0000000..c86f2f3
--- /dev/null
+++ b/src/guile/skribilo/Makefile.am
@@ -0,0 +1,9 @@
+guilemoduledir = $(GUILE_SITE)/skribilo
+dist_guilemodule_DATA = biblio.scm color.scm config.scm \
+ debug.scm engine.scm evaluator.scm \
+ lib.scm module.scm output.scm prog.scm \
+ reader.scm resolve.scm runtime.scm \
+ source.scm types.scm vars.scm verify.scm \
+ writer.scm
+
+SUBDIRS = reader engine package skribe coloring
diff --git a/src/guile/skribilo/Makefile.in b/src/guile/skribilo/Makefile.in
index 80a26de..add7d0e 100644
--- a/src/guile/skribilo/Makefile.in
+++ b/src/guile/skribilo/Makefile.in
@@ -1,110 +1,463 @@
-#
-# Makefile.in -- Skribe Src Makefile
-#
-# Copyright © 2003-2004 Erick Gallesio - I3S-CNRS/ESSI <eg@essi.fr>
-#
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
-#
-# Author: Erick Gallesio [eg@essi.fr]
-# Creation date: 10-Aug-2003 20:26 (eg)
-# Last file update: 6-Mar-2004 16:00 (eg)
-#
-include ../../etc/stklos/Makefile.skb
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
-prefix=@PREFIX@
+@SET_MAKE@
-SKR = $(wildcard ../../skr/*.skr)
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = src/guile/skribilo
+DIST_COMMON = $(dist_guilemodule_DATA) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.scm.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES = config.scm
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-exec-recursive install-info-recursive \
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(guilemoduledir)"
+dist_guilemoduleDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_guilemodule_DATA)
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+GUILE = @GUILE@
+GUILE_CONFIG = @GUILE_CONFIG@
+GUILE_SITE = @GUILE_SITE@
+GUILE_TOOLS = @GUILE_TOOLS@
+HAVE_LOUT_FALSE = @HAVE_LOUT_FALSE@
+HAVE_LOUT_TRUE = @HAVE_LOUT_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LOUT = @LOUT@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SKRIBILO_DOC_DIR = @SKRIBILO_DOC_DIR@
+SKRIBILO_EXT_DIR = @SKRIBILO_EXT_DIR@
+SKRIBILO_SKR_PATH = @SKRIBILO_SKR_PATH@
+STRIP = @STRIP@
+VERSION = @VERSION@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__leading_dot = @am__leading_dot@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+guilemoduledir = $(GUILE_SITE)/skribilo
+dist_guilemodule_DATA = biblio.scm color.scm config.scm \
+ debug.scm engine.scm evaluator.scm \
+ lib.scm module.scm output.scm prog.scm \
+ reader.scm resolve.scm runtime.scm \
+ source.scm types.scm vars.scm verify.scm \
+ writer.scm
-DEPS= ../common/configure.scm ../common/param.scm ../common/api.scm \
- ../common/index.scm ../common/bib.scm ../common/lib.scm
+SUBDIRS = reader engine package skribe coloring
+all: all-recursive
-SRCS= biblio.stk c.stk color.stk configure.stk debug.stk engine.stk \
- eval.stk lib.stk lisp.stk main.stk output.stk prog.stk reader.stk \
- resolve.stk runtime.stk source.stk types.stk vars.stk \
- verify.stk writer.stk xml.stk
+.SUFFIXES:
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/guile/skribilo/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/guile/skribilo/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
-LEXFILES = c-lex.l lisp-lex.l xml-lex.l
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-LEXSRCS = c-lex.stk lisp-lex.stk xml-lex.stk
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+config.scm: $(top_builddir)/config.status $(srcdir)/config.scm.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+uninstall-info-am:
+install-dist_guilemoduleDATA: $(dist_guilemodule_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(guilemoduledir)" || $(mkdir_p) "$(DESTDIR)$(guilemoduledir)"
+ @list='$(dist_guilemodule_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(dist_guilemoduleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(guilemoduledir)/$$f'"; \
+ $(dist_guilemoduleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(guilemoduledir)/$$f"; \
+ done
-BINDIR=../../bin
+uninstall-dist_guilemoduleDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_guilemodule_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(guilemoduledir)/$$f'"; \
+ rm -f "$(DESTDIR)$(guilemoduledir)/$$f"; \
+ done
-EXE= $(BINDIR)/skribe.stklos
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
-PRCS_FILES = Makefile.in $(SRCS) $(LEXFILES)
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
-SFLAGS=
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
-all: $(EXE)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
-Makefile: Makefile.in
- (cd ../../etc/stklos; autoconf; configure)
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
-$(EXE): $(DEPS) $(BINDIR) $(LEXSRCS) $(SRCS)
- stklos-compile $(SFLAGS) -o $(EXE) main.stk && \
- chmod $(BMASK) $(EXE)
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-#
-# Lex files
-#
-lisp-lex.stk: lisp-lex.l
- stklos-genlex lisp-lex.l lisp-lex.stk lisp-lex
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+ for dir in "$(DESTDIR)$(guilemoduledir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
-xml-lex.stk: xml-lex.l
- stklos-genlex xml-lex.l xml-lex.stk xml-lex
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-c-lex.stk: c-lex.l
- stklos-genlex c-lex.l c-lex.stk c-lex
+installcheck: installcheck-recursive
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+clean-generic:
-install: $(INSTALL_BINDIR)
- cp $(EXE) $(INSTALL_BINDIR)/skribe.stklos \
- && chmod $(BMASK) $(INSTALL_BINDIR)/skribe.stklos
- rm -f $(INSTALL_BINDIR)/skribe
- ln -s skribe.stklos $(INSTALL_BINDIR)/skribe
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-uninstall:
- rm $(INSTALL_BINDIR)/skribe
- rm $(INSTALL_BINDIR)/skribe.stklos
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
-$(BINDIR):
- mkdir -p $(BINDIR) && chmod a+rx $(BINDIR)
+clean-am: clean-generic mostlyclean-am
-$(INSTALL_BINDIR):
- mkdir -p $(INSTALL_BINDIR) && chmod a+rx $(INSTALL_BINDIR)
+distclean: distclean-recursive
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
-##
-## Services
-##
-tags: TAGS
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-dist_guilemoduleDATA
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
-TAGS: $(SRCS)
- etags -l scheme $(SRCS)
+ps-am:
-pop:
- @echo $(PRCS_FILES:%=src/stklos/%)
+uninstall-am: uninstall-dist_guilemoduleDATA uninstall-info-am
-links:
- ln -s $(DEPS) .
- ln -s $(SKR) .
+uninstall-info: uninstall-info-recursive
-clean:
- /bin/rm -f skribe $(EXE) *~ TAGS *.scm *.skr
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ clean clean-generic clean-recursive ctags ctags-recursive \
+ distclean distclean-generic distclean-recursive distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am \
+ install-dist_guilemoduleDATA install-exec install-exec-am \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-dist_guilemoduleDATA \
+ uninstall-info-am
-distclean: clean
- /bin/rm -f Makefile
- /bin/rm -f ../common/configure.scm
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/guile/skribilo/coloring/Makefile.am b/src/guile/skribilo/coloring/Makefile.am
new file mode 100644
index 0000000..d518553
--- /dev/null
+++ b/src/guile/skribilo/coloring/Makefile.am
@@ -0,0 +1,2 @@
+guilemoduledir = $(GUILE_SITE)/skribilo
+dist_guilemodule_DATA = c.scm lisp.scm xml.scm
diff --git a/src/guile/skribilo/config.scm.in b/src/guile/skribilo/config.scm.in
index a5e3b7c..51e7a93 100644
--- a/src/guile/skribilo/config.scm.in
+++ b/src/guile/skribilo/config.scm.in
@@ -3,7 +3,7 @@
(define-module (skribilo config))
-(define-public (skribilo-release) "1.3")
+(define-public (skribilo-release) "1.2")
(define-public (skribilo-url) "http://www.laas.fr/~lcourtes/")
(define-public (skribilo-doc-directory) "@SKRIBILO_DOC_DIR@")
(define-public (skribilo-extension-directory) "@SKRIBILO_EXT_DIR@")
diff --git a/src/guile/skribilo/engine/Makefile.am b/src/guile/skribilo/engine/Makefile.am
new file mode 100644
index 0000000..7b6ec2c
--- /dev/null
+++ b/src/guile/skribilo/engine/Makefile.am
@@ -0,0 +1,5 @@
+guilemoduledir = $(GUILE_SITE)/skribilo/engine
+dist_guilemodule_DATA = base.scm context.scm html.scm html4.scm \
+ latex-simple.scm latex.scm \
+ lout.scm \
+ xml.scm
diff --git a/src/guile/skribilo/engine/html.scm b/src/guile/skribilo/engine/html.scm
index 3ad7da6..6e0dc85 100644
--- a/src/guile/skribilo/engine/html.scm
+++ b/src/guile/skribilo/engine/html.scm
@@ -82,7 +82,7 @@
;*---------------------------------------------------------------------*/
;* html-engine ... */
;*---------------------------------------------------------------------*/
-(define html-engine
+(define-public html-engine
;; setup the html engine
(default-engine-set!
(make-engine 'html
diff --git a/src/guile/skribilo/engine/latex.scm b/src/guile/skribilo/engine/latex.scm
index 8bd0ae3..2a59b4f 100644
--- a/src/guile/skribilo/engine/latex.scm
+++ b/src/guile/skribilo/engine/latex.scm
@@ -16,6 +16,8 @@
;* @ref ../../doc/user/latexe.skb:ref@ */
;*=====================================================================*/
+(define-skribe-module (skribilo engine latex))
+
;*---------------------------------------------------------------------*/
;* latex-verbatim-encoding ... */
;*---------------------------------------------------------------------*/
diff --git a/src/guile/skribilo/evaluator.scm b/src/guile/skribilo/evaluator.scm
index 616144d..974d72a 100644
--- a/src/guile/skribilo/evaluator.scm
+++ b/src/guile/skribilo/evaluator.scm
@@ -39,8 +39,11 @@
(skribilo types)
(skribilo lib)
(skribilo vars)
+
(ice-9 optargs)
- (oop goops))
+ (oop goops)
+ (srfi srfi-13)
+ (srfi srfi-1))
@@ -49,6 +52,9 @@
(define *skribe-loaded* '()) ;; List of already loaded files
(define *skribe-load-options* '())
+;;;
+;;; %EVALUATE
+;;;
(define (%evaluate expr)
(let ((result (eval expr (current-module))))
(if (or (ast? result) (markup? result))
@@ -84,6 +90,8 @@
(reader %default-reader))
(with-debug 2 'skribe-eval-port
(debug-item "engine=" engine)
+ (debug-item "reader=" reader)
+
(let ((e (if (symbol? engine) (find-engine engine) engine)))
(debug-item "e=" e)
(if (not (is-a? e <engine>))
@@ -114,22 +122,31 @@
((engine? engine) engine)
((not (symbol? engine))
(skribe-error 'skribe-load
- "Illegal engine" engine))
+ "illegal engine" engine))
(else engine)))
- (path (cond
- ((not path) (skribe-path))
- ((string? path) (list path))
- ((not (and (list? path) (every? string? path)))
- (skribe-error 'skribe-load "Illegal path" path))
- (else path)))
- (filep (search-path path file)))
+ (path (append (cond
+ ((not path) (skribe-path))
+ ((string? path) (list path))
+ ((not (and (list? path) (every? string? path)))
+ (skribe-error 'skribe-load "illegal path" path))
+ (else path))
+ %load-path))
+ (filep (or (search-path path file)
+ (search-path (append path %load-path) file)
+ (search-path (append path %load-path)
+ (let ((dot (string-rindex file #\.)))
+ (if dot
+ (string-append
+ (string-take file dot)
+ ".scm")
+ file))))))
(set! *skribe-load-options* opt)
(unless (and (string? filep) (file-exists? filep))
(skribe-error 'skribe-load
(string-append "cannot find `" file "' in path")
- (skribe-path)))
+ path))
;; Load this file if not already done
(unless (member filep *skribe-loaded*)
@@ -149,22 +166,25 @@
;;;
(define* (skribe-include file #:optional (path (skribe-path)))
(unless (every string? path)
- (skribe-error 'skribe-include "Illegal path" path))
+ (skribe-error 'skribe-include "illegal path" path))
(let ((path (search-path path file)))
(unless (and (string? path) (file-exists? path))
(skribe-error 'skribe-load
- (format "Cannot find ~S in path" file)
+ (format #t "cannot find ~S in path" file)
path))
(when (> *skribe-verbose* 0)
(format (current-error-port) " [including file: ~S]\n" path))
(with-input-from-file path
(lambda ()
- (let Loop ((exp (read (current-input-port)))
+ (let Loop ((exp (%default-reader (current-input-port)))
(res '()))
+ (format (current-error-port) "exp=~a~%" exp)
(if (eof-object? exp)
- (if (and (pair? res) (null? (cdr res)))
- (car res)
- (reverse! res))
- (Loop (read (current-input-port))
+ (begin
+ (format (current-error-port) "include: eof reached~%")
+ (if (and (pair? res) (null? (cdr res)))
+ (car res)
+ (reverse! res)))
+ (Loop (%default-reader (current-input-port))
(cons (%evaluate exp) res))))))))
diff --git a/src/guile/skribilo/lib.scm b/src/guile/skribilo/lib.scm
index 8667f7e..d916db4 100644
--- a/src/guile/skribilo/lib.scm
+++ b/src/guile/skribilo/lib.scm
@@ -99,12 +99,23 @@
(let loop ((args args)
(result '())
(rest-arg #f))
- (if (null? args)
- (if rest-arg (append (reverse result) rest-arg) (reverse result))
- (let ((is-rest-arg? (eq? (car args) #:rest)))
- (loop (if is-rest-arg? (cddr args) (cdr args))
- (if is-rest-arg? result (cons (car args) result))
- (if is-rest-arg? (list (car args) (cadr args)) rest-arg))))))
+ (cond ((null? args)
+ (if rest-arg
+ (append (reverse result) rest-arg)
+ (reverse result)))
+
+ ((list? args)
+ (let ((is-rest-arg? (eq? (car args) #:rest)))
+ (loop (if is-rest-arg? (cddr args) (cdr args))
+ (if is-rest-arg? result (cons (car args) result))
+ (if is-rest-arg?
+ (list (car args) (cadr args))
+ rest-arg))))
+
+ ((pair? args)
+ (loop '()
+ (cons (car args) result)
+ (list #:rest (cdr args)))))))
(let ((name (car bindings))
(opts (cdr bindings)))
diff --git a/src/guile/skribilo/package/Makefile.am b/src/guile/skribilo/package/Makefile.am
new file mode 100644
index 0000000..6e047d3
--- /dev/null
+++ b/src/guile/skribilo/package/Makefile.am
@@ -0,0 +1,4 @@
+guilemoduledir = $(GUILE_SITE)/skribilo/package
+dist_guilemodule_DATA = acmproc.scm french.scm jfp.scm letter.scm \
+ lncs.scm scribe.scm sigplan.scm skribe.scm \
+ slide.scm web-article.scm web-book.scm
diff --git a/src/guile/skribilo/packages/acmproc.scm b/src/guile/skribilo/package/acmproc.scm
index 4accc7c..4accc7c 100644
--- a/src/guile/skribilo/packages/acmproc.scm
+++ b/src/guile/skribilo/package/acmproc.scm
diff --git a/src/guile/skribilo/packages/french.scm b/src/guile/skribilo/package/french.scm
index 3e454f5..bd095db 100644
--- a/src/guile/skribilo/packages/french.scm
+++ b/src/guile/skribilo/package/french.scm
@@ -9,7 +9,7 @@
;* French Skribe style */
;*=====================================================================*/
-(define-skribe-module (skribilo packages french))
+(define-skribe-module (skribilo package french))
;*---------------------------------------------------------------------*/
;* LaTeX configuration */
diff --git a/src/guile/skribilo/packages/jfp.scm b/src/guile/skribilo/package/jfp.scm
index e34a4fe..108b938 100644
--- a/src/guile/skribilo/packages/jfp.scm
+++ b/src/guile/skribilo/package/jfp.scm
@@ -9,7 +9,7 @@
;* The Skribe style for JFP articles. */
;*=====================================================================*/
-(define-skribe-module (skribilo packages jfp))
+(define-skribe-module (skribilo package jfp))
;*---------------------------------------------------------------------*/
;* LaTeX global customizations */
diff --git a/src/guile/skribilo/packages/letter.scm b/src/guile/skribilo/package/letter.scm
index 565a1eb..1c39301 100644
--- a/src/guile/skribilo/packages/letter.scm
+++ b/src/guile/skribilo/package/letter.scm
@@ -9,7 +9,7 @@
;* Skribe style for letters */
;*=====================================================================*/
-(define-skribe-module (skribilo packages letter))
+(define-skribe-module (skribilo package letter))
;*---------------------------------------------------------------------*/
;* document */
diff --git a/src/guile/skribilo/packages/lncs.scm b/src/guile/skribilo/package/lncs.scm
index 4aadacc..2f027d0 100644
--- a/src/guile/skribilo/packages/lncs.scm
+++ b/src/guile/skribilo/package/lncs.scm
@@ -9,7 +9,7 @@
;* The Skribe style for LNCS articles. */
;*=====================================================================*/
-(define-skribe-module (skribilo packages lncs))
+(define-skribe-module (skribilo package lncs))
;*---------------------------------------------------------------------*/
;* LaTeX global customizations */
diff --git a/src/guile/skribilo/packages/scribe.scm b/src/guile/skribilo/package/scribe.scm
index c97f8e9..8e99c76 100644
--- a/src/guile/skribilo/packages/scribe.scm
+++ b/src/guile/skribilo/package/scribe.scm
@@ -9,7 +9,7 @@
;* Scribe Compatibility kit */
;*=====================================================================*/
-(define-skribe-module (skribilo packages scribe))
+(define-skribe-module (skribilo package scribe))
;*---------------------------------------------------------------------*/
;* style ... */
diff --git a/src/guile/skribilo/packages/sigplan.scm b/src/guile/skribilo/package/sigplan.scm
index c4ea1e2..b5269dc 100644
--- a/src/guile/skribilo/packages/sigplan.scm
+++ b/src/guile/skribilo/package/sigplan.scm
@@ -9,7 +9,7 @@
;* The Skribe style for ACMPROC articles. */
;*=====================================================================*/
-(define-skribe-module (skribilo packages sigplan))
+(define-skribe-module (skribilo package sigplan))
;*---------------------------------------------------------------------*/
;* LaTeX global customizations */
diff --git a/src/guile/skribilo/packages/skribe.scm b/src/guile/skribilo/package/skribe.scm
index 86425ac..86425ac 100644
--- a/src/guile/skribilo/packages/skribe.scm
+++ b/src/guile/skribilo/package/skribe.scm
diff --git a/src/guile/skribilo/packages/slide.scm b/src/guile/skribilo/package/slide.scm
index 54ac21c..37ee054 100644
--- a/src/guile/skribilo/packages/slide.scm
+++ b/src/guile/skribilo/package/slide.scm
@@ -9,7 +9,7 @@
;* Skribe style for slides */
;*=====================================================================*/
-(define-skribe-module (skribilo packages slide))
+(define-skribe-module (skribilo package slide))
;*---------------------------------------------------------------------*/
;* slide-options */
diff --git a/src/guile/skribilo/packages/web-article.scm b/src/guile/skribilo/package/web-article.scm
index f853231..6a480be 100644
--- a/src/guile/skribilo/packages/web-article.scm
+++ b/src/guile/skribilo/package/web-article.scm
@@ -9,7 +9,7 @@
;* A Skribe style for producing web articles */
;*=====================================================================*/
-(define-skribe-module (skribilo packages web-article))
+(define-skribe-module (skribilo package web-article))
;*---------------------------------------------------------------------*/
;* &web-article-load-options ... */
diff --git a/src/guile/skribilo/packages/web-book.scm b/src/guile/skribilo/package/web-book.scm
index f907c8b..a954c7a 100644
--- a/src/guile/skribilo/packages/web-book.scm
+++ b/src/guile/skribilo/package/web-book.scm
@@ -9,6 +9,8 @@
;* The Skribe web book style. */
;*=====================================================================*/
+(define-skribe-module (skribilo package web-book))
+
;*---------------------------------------------------------------------*/
;* html customization */
;*---------------------------------------------------------------------*/
diff --git a/src/guile/skribilo/reader/Makefile.am b/src/guile/skribilo/reader/Makefile.am
new file mode 100644
index 0000000..a1c58fb
--- /dev/null
+++ b/src/guile/skribilo/reader/Makefile.am
@@ -0,0 +1,2 @@
+guilemoduledir = $(GUILE_SITE)/skribilo/reader
+dist_guilemodule_DATA = skribe.scm
diff --git a/src/guile/skribilo/reader/skribe.scm b/src/guile/skribilo/reader/skribe.scm
index 78f1814..714f19e 100644
--- a/src/guile/skribilo/reader/skribe.scm
+++ b/src/guile/skribilo/reader/skribe.scm
@@ -54,6 +54,7 @@ the Skribe syntax."
(sharp-reader (r:make-reader (cons dsssl-keyword-reader
(map r:standard-token-reader
'(character srfi-4
+ vector
number+radix
boolean)))
#f ;; use default fault handler
@@ -61,16 +62,25 @@ the Skribe syntax."
(colon-keywords ;; keywords à la `:key' fashion
(r:make-token-reader #\:
(r:token-reader-procedure
- (r:standard-token-reader 'keyword)))))
+ (r:standard-token-reader 'keyword))))
+ (square-bracket-free-symbol-misc-chars
+ (let* ((tr (r:standard-token-reader 'guile-symbol-misc-chars))
+ (tr-spec (r:token-reader-specification tr))
+ (tr-proc (r:token-reader-procedure tr)))
+ (r:make-token-reader (filter (lambda (chr)
+ (not (or (eq? chr #\[)
+ (eq? chr #\]))))
+ tr-spec)
+ tr-proc))))
(r:make-reader (cons* (r:make-token-reader #\# sharp-reader)
colon-keywords
+ square-bracket-free-symbol-misc-chars
(map r:standard-token-reader
`(whitespace
- sexp string number
- symbol-lower-case
- symbol-upper-case
- symbol-misc-chars
+ sexp string guile-number
+ guile-symbol-lower-case
+ guile-symbol-upper-case
quote-quasiquote-unquote
semicolon-comment
skribe-exp)))
diff --git a/src/guile/skribilo/skribe/Makefile.am b/src/guile/skribilo/skribe/Makefile.am
new file mode 100644
index 0000000..2850c4d
--- /dev/null
+++ b/src/guile/skribilo/skribe/Makefile.am
@@ -0,0 +1,2 @@
+guilemoduledir = $(GUILE_SITE)/skribilo
+dist_guilemodule_DATA = api.scm bib.scm index.scm param.scm sui.scm utils.scm
diff --git a/src/guile/skribilo/skribe/index.scm b/src/guile/skribilo/skribe/index.scm
index 840a179..415cadf 100644
--- a/src/guile/skribilo/skribe/index.scm
+++ b/src/guile/skribilo/skribe/index.scm
@@ -36,24 +36,24 @@
;*---------------------------------------------------------------------*/
;* index? ... */
;*---------------------------------------------------------------------*/
-(define (index? obj)
+(define-public (index? obj)
(hashtable? obj))
;*---------------------------------------------------------------------*/
;* *index-table* ... */
;*---------------------------------------------------------------------*/
-(define *index-table* #f)
+(define-public *index-table* #f)
;*---------------------------------------------------------------------*/
;* make-index-table ... */
;*---------------------------------------------------------------------*/
-(define (make-index-table ident)
+(define-public (make-index-table ident)
(make-hashtable))
;*---------------------------------------------------------------------*/
;* default-index ... */
;*---------------------------------------------------------------------*/
-(define (default-index)
+(define-public (default-index)
(if (not *index-table*)
(set! *index-table* (make-index-table "default-index")))
*index-table*)
@@ -61,7 +61,7 @@
;*---------------------------------------------------------------------*/
;* resolve-the-index ... */
;*---------------------------------------------------------------------*/
-(define (resolve-the-index loc i c indexes split char-offset header-limit col)
+(define-public (resolve-the-index loc i c indexes split char-offset header-limit col)
;; fetch the descriminating index name letter
(define (index-ref n)
(let ((name (markup-option n 'name)))
@@ -70,7 +70,7 @@
(string-ref name char-offset))))
;; sort a bucket of entries (the entries in a bucket share there name)
(define (sort-entries-bucket ie)
- (sort ie
+ (sort ie
(lambda (i1 i2)
(or (not (markup-option i1 :note))
(markup-option i2 :note)))))