Installed Autoconf/Automake machinery. Fixed a few things.

* src/guile/skribilo/evaluator.scm (skribe-load): Search through
  `%load-path' and try with a `.scm' extension (rather than the `.skr'
  one provided by the user).
  (skribe-include): Added a few debugging statements.

* src/guile/skribilo/lib.scm (fix-rest-arg): Handle the dot notation for
  rest arguments.

* src/guile/skribilo/reader/skribe.scm (%make-skribe-reader): Use
  SQUARE-BRACKET-FREE-SYMBOL-MISC-CHARS.

* src/guile/skribilo/skribe/index.scm: Use `define-public' instead of
  `define'.

* src/guile/skribilo/packages/*.scm: Moved to `skribilo/package'.

* LICENSE: Removed.

* COPYING: New.

* AUTHORS: New.

* NEWS: New.

* ChangeLog: New.

* configure.ac: New.

* Makefile.am: New.  In various directories.

git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-10

39 files changed, 2612 insertions, 390 deletions

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..bc03de5
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,8 @@
+Erick Gallesio and Manuel Serrano implemented Skribe,
+http://www.inria.fr/mimosa/fp/Skribe .
+
+Skribilo is based upon Skribe 1.2d and re-uses a large body of code
+written for Skribe by Erick and Manuel.  The port to Skribe and
+several enhancements were implemented by Ludovic Courtès.
+
+You can contact me at `ludovic.courtes@laas.fr'.
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..3912109
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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.
+
+    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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..cc89110
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,1225 @@
+# do not edit -- automatically generated by arch changelog
+# arch-tag: automatic-ChangeLog--lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2
+#
+
+2005-10-31 23:26:24 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-10
+
+    Summary:
+      Installed Autoconf/Automake machinery.  Fixed a few things.
+    Revision:
+      skribilo--devel--1.2--patch-10
+
+    * src/guile/skribilo/evaluator.scm (skribe-load): Search through
+      `%load-path' and try with a `.scm' extension (rather than the `.skr'
+      one provided by the user).
+      (skribe-include): Added a few debugging statements.
+    
+    * src/guile/skribilo/lib.scm (fix-rest-arg): Handle the dot notation for
+      rest arguments.
+    
+    * src/guile/skribilo/reader/skribe.scm (%make-skribe-reader): Use
+      SQUARE-BRACKET-FREE-SYMBOL-MISC-CHARS.
+    
+    * src/guile/skribilo/skribe/index.scm: Use `define-public' instead of
+      `define'.
+    
+    * src/guile/skribilo/packages/*.scm: Moved to `skribilo/package'.
+    
+    * LICENSE: Removed.
+    
+    * COPYING: New.
+    
+    * AUTHORS: New.
+    
+    * NEWS: New.
+    
+    * ChangeLog: New.
+    
+    * configure.ac: New.
+    
+    * Makefile.am: New.  In various directories.
+
+    new files:
+     .arch-ids/AUTHORS.id .arch-ids/COPYING.id
+     .arch-ids/Makefile.am.id .arch-ids/NEWS.id
+     .arch-ids/configure.ac.id AUTHORS COPYING ChangeLog
+     Makefile.am NEWS configure.ac doc/.arch-ids/Makefile.am.id
+     doc/Makefile.am doc/user/.arch-ids/Makefile.am.id
+     doc/user/Makefile.am src/.arch-ids/Makefile.am.id
+     src/Makefile.am src/guile/.arch-ids/Makefile.am.id
+     src/guile/Makefile.am
+     src/guile/skribilo/.arch-ids/Makefile.am.id
+     src/guile/skribilo/Makefile.am
+     src/guile/skribilo/coloring/.arch-ids/Makefile.am.id
+     src/guile/skribilo/coloring/Makefile.am
+     src/guile/skribilo/engine/.arch-ids/Makefile.am.id
+     src/guile/skribilo/engine/Makefile.am
+     src/guile/skribilo/package/.arch-ids/=id
+     src/guile/skribilo/package/.arch-ids/Makefile.am.id
+     src/guile/skribilo/package/Makefile.am
+     src/guile/skribilo/reader/.arch-ids/Makefile.am.id
+     src/guile/skribilo/reader/Makefile.am
+     src/guile/skribilo/skribe/.arch-ids/Makefile.am.id
+     src/guile/skribilo/skribe/Makefile.am
+
+    removed files:
+     .arch-ids/LICENSE.id LICENSE
+     src/guile/skribilo/packages/.arch-ids/=id
+
+    modified files:
+     doc/Makefile doc/user/start.skb doc/user/user.skb
+     src/guile/skribilo/Makefile.in
+     src/guile/skribilo/config.scm.in
+     src/guile/skribilo/engine/html.scm
+     src/guile/skribilo/engine/latex.scm
+     src/guile/skribilo/evaluator.scm src/guile/skribilo/lib.scm
+     src/guile/skribilo/package/french.scm
+     src/guile/skribilo/package/jfp.scm
+     src/guile/skribilo/package/letter.scm
+     src/guile/skribilo/package/lncs.scm
+     src/guile/skribilo/package/scribe.scm
+     src/guile/skribilo/package/sigplan.scm
+     src/guile/skribilo/package/slide.scm
+     src/guile/skribilo/package/web-article.scm
+     src/guile/skribilo/package/web-book.scm
+     src/guile/skribilo/reader/skribe.scm
+     src/guile/skribilo/skribe/index.scm
+
+    renamed files:
+     src/guile/skribilo/packages/.arch-ids/acmproc.scm.id
+       ==> src/guile/skribilo/package/.arch-ids/acmproc.scm.id
+     src/guile/skribilo/packages/.arch-ids/french.scm.id
+       ==> src/guile/skribilo/package/.arch-ids/french.scm.id
+     src/guile/skribilo/packages/.arch-ids/jfp.scm.id
+       ==> src/guile/skribilo/package/.arch-ids/jfp.scm.id
+     src/guile/skribilo/packages/.arch-ids/letter.scm.id
+       ==> src/guile/skribilo/package/.arch-ids/letter.scm.id
+     src/guile/skribilo/packages/.arch-ids/lncs.scm.id
+       ==> src/guile/skribilo/package/.arch-ids/lncs.scm.id
+     src/guile/skribilo/packages/.arch-ids/scribe.scm.id
+       ==> src/guile/skribilo/package/.arch-ids/scribe.scm.id
+     src/guile/skribilo/packages/.arch-ids/sigplan.scm.id
+       ==> src/guile/skribilo/package/.arch-ids/sigplan.scm.id
+     src/guile/skribilo/packages/.arch-ids/skribe.scm.id
+       ==> src/guile/skribilo/package/.arch-ids/skribe.scm.id
+     src/guile/skribilo/packages/.arch-ids/slide.scm.id
+       ==> src/guile/skribilo/package/.arch-ids/slide.scm.id
+     src/guile/skribilo/packages/.arch-ids/web-article.scm.id
+       ==> src/guile/skribilo/package/.arch-ids/web-article.scm.id
+     src/guile/skribilo/packages/.arch-ids/web-book.scm.id
+       ==> src/guile/skribilo/package/.arch-ids/web-book.scm.id
+     src/guile/skribilo/packages/acmproc.scm
+       ==> src/guile/skribilo/package/acmproc.scm
+     src/guile/skribilo/packages/french.scm
+       ==> src/guile/skribilo/package/french.scm
+     src/guile/skribilo/packages/jfp.scm
+       ==> src/guile/skribilo/package/jfp.scm
+     src/guile/skribilo/packages/letter.scm
+       ==> src/guile/skribilo/package/letter.scm
+     src/guile/skribilo/packages/lncs.scm
+       ==> src/guile/skribilo/package/lncs.scm
+     src/guile/skribilo/packages/scribe.scm
+       ==> src/guile/skribilo/package/scribe.scm
+     src/guile/skribilo/packages/sigplan.scm
+       ==> src/guile/skribilo/package/sigplan.scm
+     src/guile/skribilo/packages/skribe.scm
+       ==> src/guile/skribilo/package/skribe.scm
+     src/guile/skribilo/packages/slide.scm
+       ==> src/guile/skribilo/package/slide.scm
+     src/guile/skribilo/packages/web-article.scm
+       ==> src/guile/skribilo/package/web-article.scm
+     src/guile/skribilo/packages/web-book.scm
+       ==> src/guile/skribilo/package/web-book.scm
+
+    new directories:
+     src/guile/skribilo/package
+     src/guile/skribilo/package/.arch-ids
+
+    removed directories:
+     src/guile/skribilo/packages
+     src/guile/skribilo/packages/.arch-ids
+
+
+2005-10-31 16:16:54 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-9
+
+    Summary:
+      Moved the STkLos and Bigloo code to `legacy'.
+    Revision:
+      skribilo--devel--1.2--patch-9
+
+    Moved the STkLos and Bigloo code from `src' to `legacy'.
+
+    new files:
+     legacy/.arch-ids/=id legacy/bigloo/.arch-ids/=id
+     legacy/stklos/.arch-ids/=id
+
+    removed files:
+     .arch-ids/Makefile.id .arch-ids/configure.id Makefile
+     configure src/.arch-ids/Makefile.id src/Makefile
+     src/bigloo/.arch-ids/=id src/common/.arch-ids/=id
+     src/common/.arch-ids/api.scm.id
+     src/common/.arch-ids/bib.scm.id
+     src/common/.arch-ids/configure.scm.id
+     src/common/.arch-ids/configure.scm.in.id
+     src/common/.arch-ids/index.scm.id
+     src/common/.arch-ids/lib.scm.id
+     src/common/.arch-ids/param.scm.id
+     src/common/.arch-ids/sui.scm.id src/common/api.scm
+     src/common/bib.scm src/common/configure.scm
+     src/common/configure.scm.in src/common/index.scm
+     src/common/lib.scm src/common/param.scm src/common/sui.scm
+     src/stklos/.arch-ids/=id
+
+    renamed files:
+     src/bigloo/.arch-ids/Makefile.id
+       ==> legacy/bigloo/.arch-ids/Makefile.id
+     src/bigloo/.arch-ids/api.bgl.id
+       ==> legacy/bigloo/.arch-ids/api.bgl.id
+     src/bigloo/.arch-ids/api.sch.id
+       ==> legacy/bigloo/.arch-ids/api.sch.id
+     src/bigloo/.arch-ids/asm.scm.id
+       ==> legacy/bigloo/.arch-ids/asm.scm.id
+     src/bigloo/.arch-ids/bib.bgl.id
+       ==> legacy/bigloo/.arch-ids/bib.bgl.id
+     src/bigloo/.arch-ids/c.scm.id
+       ==> legacy/bigloo/.arch-ids/c.scm.id
+     src/bigloo/.arch-ids/color.scm.id
+       ==> legacy/bigloo/.arch-ids/color.scm.id
+     src/bigloo/.arch-ids/configure.bgl.id
+       ==> legacy/bigloo/.arch-ids/configure.bgl.id
+     src/bigloo/.arch-ids/debug.sch.id
+       ==> legacy/bigloo/.arch-ids/debug.sch.id
+     src/bigloo/.arch-ids/debug.scm.id
+       ==> legacy/bigloo/.arch-ids/debug.scm.id
+     src/bigloo/.arch-ids/engine.scm.id
+       ==> legacy/bigloo/.arch-ids/engine.scm.id
+     src/bigloo/.arch-ids/eval.scm.id
+       ==> legacy/bigloo/.arch-ids/eval.scm.id
+     src/bigloo/.arch-ids/evapi.scm.id
+       ==> legacy/bigloo/.arch-ids/evapi.scm.id
+     src/bigloo/.arch-ids/index.bgl.id
+       ==> legacy/bigloo/.arch-ids/index.bgl.id
+     src/bigloo/.arch-ids/lib.bgl.id
+       ==> legacy/bigloo/.arch-ids/lib.bgl.id
+     src/bigloo/.arch-ids/lisp.scm.id
+       ==> legacy/bigloo/.arch-ids/lisp.scm.id
+     src/bigloo/.arch-ids/main.scm.id
+       ==> legacy/bigloo/.arch-ids/main.scm.id
+     src/bigloo/.arch-ids/new.sch.id
+       ==> legacy/bigloo/.arch-ids/new.sch.id
+     src/bigloo/.arch-ids/output.scm.id
+       ==> legacy/bigloo/.arch-ids/output.scm.id
+     src/bigloo/.arch-ids/param.bgl.id
+       ==> legacy/bigloo/.arch-ids/param.bgl.id
+     src/bigloo/.arch-ids/parseargs.scm.id
+       ==> legacy/bigloo/.arch-ids/parseargs.scm.id
+     src/bigloo/.arch-ids/prog.scm.id
+       ==> legacy/bigloo/.arch-ids/prog.scm.id
+     src/bigloo/.arch-ids/read.scm.id
+       ==> legacy/bigloo/.arch-ids/read.scm.id
+     src/bigloo/.arch-ids/resolve.scm.id
+       ==> legacy/bigloo/.arch-ids/resolve.scm.id
+     src/bigloo/.arch-ids/source.scm.id
+       ==> legacy/bigloo/.arch-ids/source.scm.id
+     src/bigloo/.arch-ids/sui.bgl.id
+       ==> legacy/bigloo/.arch-ids/sui.bgl.id
+     src/bigloo/.arch-ids/types.scm.id
+       ==> legacy/bigloo/.arch-ids/types.scm.id
+     src/bigloo/.arch-ids/verify.scm.id
+       ==> legacy/bigloo/.arch-ids/verify.scm.id
+     src/bigloo/.arch-ids/writer.scm.id
+       ==> legacy/bigloo/.arch-ids/writer.scm.id
+     src/bigloo/.arch-ids/xml.scm.id
+       ==> legacy/bigloo/.arch-ids/xml.scm.id
+     src/bigloo/Makefile
+       ==> legacy/bigloo/Makefile
+     src/bigloo/api.bgl
+       ==> legacy/bigloo/api.bgl
+     src/bigloo/api.sch
+       ==> legacy/bigloo/api.sch
+     src/bigloo/asm.scm
+       ==> legacy/bigloo/asm.scm
+     src/bigloo/bib.bgl
+       ==> legacy/bigloo/bib.bgl
+     src/bigloo/c.scm
+       ==> legacy/bigloo/c.scm
+     src/bigloo/color.scm
+       ==> legacy/bigloo/color.scm
+     src/bigloo/configure.bgl
+       ==> legacy/bigloo/configure.bgl
+     src/bigloo/debug.sch
+       ==> legacy/bigloo/debug.sch
+     src/bigloo/debug.scm
+       ==> legacy/bigloo/debug.scm
+     src/bigloo/engine.scm
+       ==> legacy/bigloo/engine.scm
+     src/bigloo/eval.scm
+       ==> legacy/bigloo/eval.scm
+     src/bigloo/evapi.scm
+       ==> legacy/bigloo/evapi.scm
+     src/bigloo/index.bgl
+       ==> legacy/bigloo/index.bgl
+     src/bigloo/lib.bgl
+       ==> legacy/bigloo/lib.bgl
+     src/bigloo/lisp.scm
+       ==> legacy/bigloo/lisp.scm
+     src/bigloo/main.scm
+       ==> legacy/bigloo/main.scm
+     src/bigloo/new.sch
+       ==> legacy/bigloo/new.sch
+     src/bigloo/output.scm
+       ==> legacy/bigloo/output.scm
+     src/bigloo/param.bgl
+       ==> legacy/bigloo/param.bgl
+     src/bigloo/parseargs.scm
+       ==> legacy/bigloo/parseargs.scm
+     src/bigloo/prog.scm
+       ==> legacy/bigloo/prog.scm
+     src/bigloo/read.scm
+       ==> legacy/bigloo/read.scm
+     src/bigloo/resolve.scm
+       ==> legacy/bigloo/resolve.scm
+     src/bigloo/source.scm
+       ==> legacy/bigloo/source.scm
+     src/bigloo/sui.bgl
+       ==> legacy/bigloo/sui.bgl
+     src/bigloo/types.scm
+       ==> legacy/bigloo/types.scm
+     src/bigloo/verify.scm
+       ==> legacy/bigloo/verify.scm
+     src/bigloo/writer.scm
+       ==> legacy/bigloo/writer.scm
+     src/bigloo/xml.scm
+       ==> legacy/bigloo/xml.scm
+     src/stklos/.arch-ids/Makefile.in.id
+       ==> legacy/stklos/.arch-ids/Makefile.in.id
+     src/stklos/.arch-ids/biblio.stk.id
+       ==> legacy/stklos/.arch-ids/biblio.stk.id
+     src/stklos/.arch-ids/c-lex.l.id
+       ==> legacy/stklos/.arch-ids/c-lex.l.id
+     src/stklos/.arch-ids/c.stk.id
+       ==> legacy/stklos/.arch-ids/c.stk.id
+     src/stklos/.arch-ids/color.stk.id
+       ==> legacy/stklos/.arch-ids/color.stk.id
+     src/stklos/.arch-ids/configure.stk.id
+       ==> legacy/stklos/.arch-ids/configure.stk.id
+     src/stklos/.arch-ids/debug.stk.id
+       ==> legacy/stklos/.arch-ids/debug.stk.id
+     src/stklos/.arch-ids/engine.stk.id
+       ==> legacy/stklos/.arch-ids/engine.stk.id
+     src/stklos/.arch-ids/eval.stk.id
+       ==> legacy/stklos/.arch-ids/eval.stk.id
+     src/stklos/.arch-ids/lib.stk.id
+       ==> legacy/stklos/.arch-ids/lib.stk.id
+     src/stklos/.arch-ids/lisp-lex.l.id
+       ==> legacy/stklos/.arch-ids/lisp-lex.l.id
+     src/stklos/.arch-ids/lisp.stk.id
+       ==> legacy/stklos/.arch-ids/lisp.stk.id
+     src/stklos/.arch-ids/main.stk.id
+       ==> legacy/stklos/.arch-ids/main.stk.id
+     src/stklos/.arch-ids/output.stk.id
+       ==> legacy/stklos/.arch-ids/output.stk.id
+     src/stklos/.arch-ids/prog.stk.id
+       ==> legacy/stklos/.arch-ids/prog.stk.id
+     src/stklos/.arch-ids/reader.stk.id
+       ==> legacy/stklos/.arch-ids/reader.stk.id
+     src/stklos/.arch-ids/resolve.stk.id
+       ==> legacy/stklos/.arch-ids/resolve.stk.id
+     src/stklos/.arch-ids/runtime.stk.id
+       ==> legacy/stklos/.arch-ids/runtime.stk.id
+     src/stklos/.arch-ids/source.stk.id
+       ==> legacy/stklos/.arch-ids/source.stk.id
+     src/stklos/.arch-ids/types.stk.id
+       ==> legacy/stklos/.arch-ids/types.stk.id
+     src/stklos/.arch-ids/vars.stk.id
+       ==> legacy/stklos/.arch-ids/vars.stk.id
+     src/stklos/.arch-ids/verify.stk.id
+       ==> legacy/stklos/.arch-ids/verify.stk.id
+     src/stklos/.arch-ids/writer.stk.id
+       ==> legacy/stklos/.arch-ids/writer.stk.id
+     src/stklos/.arch-ids/xml-lex.l.id
+       ==> legacy/stklos/.arch-ids/xml-lex.l.id
+     src/stklos/.arch-ids/xml.stk.id
+       ==> legacy/stklos/.arch-ids/xml.stk.id
+     src/stklos/Makefile.in
+       ==> legacy/stklos/Makefile.in
+     src/stklos/biblio.stk
+       ==> legacy/stklos/biblio.stk
+     src/stklos/c-lex.l
+       ==> legacy/stklos/c-lex.l
+     src/stklos/c.stk
+       ==> legacy/stklos/c.stk
+     src/stklos/color.stk
+       ==> legacy/stklos/color.stk
+     src/stklos/configure.stk
+       ==> legacy/stklos/configure.stk
+     src/stklos/debug.stk
+       ==> legacy/stklos/debug.stk
+     src/stklos/engine.stk
+       ==> legacy/stklos/engine.stk
+     src/stklos/eval.stk
+       ==> legacy/stklos/eval.stk
+     src/stklos/lib.stk
+       ==> legacy/stklos/lib.stk
+     src/stklos/lisp-lex.l
+       ==> legacy/stklos/lisp-lex.l
+     src/stklos/lisp.stk
+       ==> legacy/stklos/lisp.stk
+     src/stklos/main.stk
+       ==> legacy/stklos/main.stk
+     src/stklos/output.stk
+       ==> legacy/stklos/output.stk
+     src/stklos/prog.stk
+       ==> legacy/stklos/prog.stk
+     src/stklos/reader.stk
+       ==> legacy/stklos/reader.stk
+     src/stklos/resolve.stk
+       ==> legacy/stklos/resolve.stk
+     src/stklos/runtime.stk
+       ==> legacy/stklos/runtime.stk
+     src/stklos/source.stk
+       ==> legacy/stklos/source.stk
+     src/stklos/types.stk
+       ==> legacy/stklos/types.stk
+     src/stklos/vars.stk
+       ==> legacy/stklos/vars.stk
+     src/stklos/verify.stk
+       ==> legacy/stklos/verify.stk
+     src/stklos/writer.stk
+       ==> legacy/stklos/writer.stk
+     src/stklos/xml-lex.l
+       ==> legacy/stklos/xml-lex.l
+     src/stklos/xml.stk
+       ==> legacy/stklos/xml.stk
+
+    new directories:
+     legacy legacy/.arch-ids legacy/bigloo legacy/bigloo/.arch-ids
+     legacy/stklos legacy/stklos/.arch-ids
+
+    removed directories:
+     src/bigloo src/bigloo/.arch-ids src/common
+     src/common/.arch-ids src/stklos src/stklos/.arch-ids
+
+
+2005-10-31 16:03:49 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-8
+
+    Summary:
+      Removed useless files, integrated packages.
+    Revision:
+      skribilo--devel--1.2--patch-8
+
+    * 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.
+
+
+2005-10-31 16:03:18 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-7
+
+    Summary:
+      Removed useless files, integrated packages.
+    Revision:
+      skribilo--devel--1.2--patch-7
+
+    * 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.
+
+    new files:
+     src/guile/skribilo/packages/.arch-ids/=id
+
+    removed files:
+     .arch-ids/README.java.id .arch-ids/skribe.prj.id README.java
+     bin/.arch-ids/=id bin/.arch-ids/skribe.bigloo.id
+     bin/.arch-ids/skribebibtex.bigloo.id bin/skribe.bigloo
+     bin/skribebibtex.bigloo skr/.arch-ids/=id
+     skr/.arch-ids/Makefile.id skr/Makefile skribe.prj
+     skribe/.arch-ids/=id skribe/.arch-ids/INSTALL.id
+     skribe/.arch-ids/LICENSE.id skribe/.arch-ids/Makefile.id
+     skribe/.arch-ids/README.id skribe/.arch-ids/README.java.id
+     skribe/.arch-ids/configure.id skribe/.arch-ids/skribe.prj.id
+     skribe/INSTALL skribe/LICENSE skribe/Makefile skribe/README
+     skribe/README.java skribe/configure skribe/doc/.arch-ids/=id
+     skribe/doc/.arch-ids/Makefile.dir.id
+     skribe/doc/.arch-ids/Makefile.id skribe/doc/Makefile
+     skribe/doc/Makefile.dir skribe/doc/dir/.arch-ids/=id
+     skribe/doc/dir/.arch-ids/dir.skb.id skribe/doc/dir/dir.skb
+     skribe/doc/img/.arch-ids/=id
+     skribe/doc/img/.arch-ids/bsd.gif.id
+     skribe/doc/img/.arch-ids/lambda.gif.id
+     skribe/doc/img/.arch-ids/linux.gif.id skribe/doc/img/bsd.gif
+     skribe/doc/img/lambda.gif skribe/doc/img/linux.gif
+     skribe/doc/skr/.arch-ids/=id
+     skribe/doc/skr/.arch-ids/api.skr.id
+     skribe/doc/skr/.arch-ids/env.skr.id
+     skribe/doc/skr/.arch-ids/extension.skr.id
+     skribe/doc/skr/.arch-ids/manual.skr.id skribe/doc/skr/api.skr
+     skribe/doc/skr/env.skr skribe/doc/skr/extension.skr
+     skribe/doc/skr/manual.skr skribe/doc/user/.arch-ids/=id
+     skribe/doc/user/.arch-ids/bib.skb.id
+     skribe/doc/user/.arch-ids/char.skb.id
+     skribe/doc/user/.arch-ids/colframe.skb.id
+     skribe/doc/user/.arch-ids/document.skb.id
+     skribe/doc/user/.arch-ids/emacs.skb.id
+     skribe/doc/user/.arch-ids/engine.skb.id
+     skribe/doc/user/.arch-ids/enumeration.skb.id
+     skribe/doc/user/.arch-ids/examples.skb.id
+     skribe/doc/user/.arch-ids/figure.skb.id
+     skribe/doc/user/.arch-ids/font.skb.id
+     skribe/doc/user/.arch-ids/footnote.skb.id
+     skribe/doc/user/.arch-ids/htmle.skb.id
+     skribe/doc/user/.arch-ids/image.skb.id
+     skribe/doc/user/.arch-ids/index.skb.id
+     skribe/doc/user/.arch-ids/justify.skb.id
+     skribe/doc/user/.arch-ids/latexe.skb.id
+     skribe/doc/user/.arch-ids/lib.skb.id
+     skribe/doc/user/.arch-ids/line.skb.id
+     skribe/doc/user/.arch-ids/links.skb.id
+     skribe/doc/user/.arch-ids/markup.skb.id
+     skribe/doc/user/.arch-ids/ornament.skb.id
+     skribe/doc/user/.arch-ids/package.skb.id
+     skribe/doc/user/.arch-ids/prgm.skb.id
+     skribe/doc/user/.arch-ids/sectioning.skb.id
+     skribe/doc/user/.arch-ids/skribe-config.skb.id
+     skribe/doc/user/.arch-ids/skribec.skb.id
+     skribe/doc/user/.arch-ids/skribeinfo.skb.id
+     skribe/doc/user/.arch-ids/slide.skb.id
+     skribe/doc/user/.arch-ids/start.skb.id
+     skribe/doc/user/.arch-ids/syntax.skb.id
+     skribe/doc/user/.arch-ids/table.skb.id
+     skribe/doc/user/.arch-ids/toc.skb.id
+     skribe/doc/user/.arch-ids/user.skb.id
+     skribe/doc/user/.arch-ids/xmle.skb.id skribe/doc/user/bib.skb
+     skribe/doc/user/char.skb skribe/doc/user/colframe.skb
+     skribe/doc/user/document.skb skribe/doc/user/emacs.skb
+     skribe/doc/user/engine.skb skribe/doc/user/enumeration.skb
+     skribe/doc/user/examples.skb skribe/doc/user/figure.skb
+     skribe/doc/user/font.skb skribe/doc/user/footnote.skb
+     skribe/doc/user/htmle.skb skribe/doc/user/image.skb
+     skribe/doc/user/index.skb skribe/doc/user/justify.skb
+     skribe/doc/user/latexe.skb skribe/doc/user/lib.skb
+     skribe/doc/user/line.skb skribe/doc/user/links.skb
+     skribe/doc/user/markup.skb skribe/doc/user/ornament.skb
+     skribe/doc/user/package.skb skribe/doc/user/prgm.skb
+     skribe/doc/user/sectioning.skb
+     skribe/doc/user/skribe-config.skb skribe/doc/user/skribec.skb
+     skribe/doc/user/skribeinfo.skb skribe/doc/user/slide.skb
+     skribe/doc/user/src/.arch-ids/=id
+     skribe/doc/user/src/.arch-ids/api1.skb.id
+     skribe/doc/user/src/.arch-ids/api10.skb.id
+     skribe/doc/user/src/.arch-ids/api11.skb.id
+     skribe/doc/user/src/.arch-ids/api12.skb.id
+     skribe/doc/user/src/.arch-ids/api13.skb.id
+     skribe/doc/user/src/.arch-ids/api14.skb.id
+     skribe/doc/user/src/.arch-ids/api15.skb.id
+     skribe/doc/user/src/.arch-ids/api16.skb.id
+     skribe/doc/user/src/.arch-ids/api17.skb.id
+     skribe/doc/user/src/.arch-ids/api18.skb.id
+     skribe/doc/user/src/.arch-ids/api19.skb.id
+     skribe/doc/user/src/.arch-ids/api2.skb.id
+     skribe/doc/user/src/.arch-ids/api20.skb.id
+     skribe/doc/user/src/.arch-ids/api3.skb.id
+     skribe/doc/user/src/.arch-ids/api4.skb.id
+     skribe/doc/user/src/.arch-ids/api5.skb.id
+     skribe/doc/user/src/.arch-ids/api6.skb.id
+     skribe/doc/user/src/.arch-ids/api7.skb.id
+     skribe/doc/user/src/.arch-ids/api8.skb.id
+     skribe/doc/user/src/.arch-ids/api9.skb.id
+     skribe/doc/user/src/.arch-ids/bib1.sbib.id
+     skribe/doc/user/src/.arch-ids/bib2.skb.id
+     skribe/doc/user/src/.arch-ids/bib3.skb.id
+     skribe/doc/user/src/.arch-ids/bib4.skb.id
+     skribe/doc/user/src/.arch-ids/bib5.skb.id
+     skribe/doc/user/src/.arch-ids/bib6.skb.id
+     skribe/doc/user/src/.arch-ids/index1.skb.id
+     skribe/doc/user/src/.arch-ids/index2.skb.id
+     skribe/doc/user/src/.arch-ids/index3.skb.id
+     skribe/doc/user/src/.arch-ids/links1.skb.id
+     skribe/doc/user/src/.arch-ids/links2.skb.id
+     skribe/doc/user/src/.arch-ids/prgm1.skb.id
+     skribe/doc/user/src/.arch-ids/prgm2.skb.id
+     skribe/doc/user/src/.arch-ids/prgm3.skb.id
+     skribe/doc/user/src/.arch-ids/slides.skb.id
+     skribe/doc/user/src/.arch-ids/start1.skb.id
+     skribe/doc/user/src/.arch-ids/start2.skb.id
+     skribe/doc/user/src/.arch-ids/start3.skb.id
+     skribe/doc/user/src/.arch-ids/start4.skb.id
+     skribe/doc/user/src/.arch-ids/start5.skb.id
+     skribe/doc/user/src/api1.skb skribe/doc/user/src/api10.skb
+     skribe/doc/user/src/api11.skb skribe/doc/user/src/api12.skb
+     skribe/doc/user/src/api13.skb skribe/doc/user/src/api14.skb
+     skribe/doc/user/src/api15.skb skribe/doc/user/src/api16.skb
+     skribe/doc/user/src/api17.skb skribe/doc/user/src/api18.skb
+     skribe/doc/user/src/api19.skb skribe/doc/user/src/api2.skb
+     skribe/doc/user/src/api20.skb skribe/doc/user/src/api3.skb
+     skribe/doc/user/src/api4.skb skribe/doc/user/src/api5.skb
+     skribe/doc/user/src/api6.skb skribe/doc/user/src/api7.skb
+     skribe/doc/user/src/api8.skb skribe/doc/user/src/api9.skb
+     skribe/doc/user/src/bib1.sbib skribe/doc/user/src/bib2.skb
+     skribe/doc/user/src/bib3.skb skribe/doc/user/src/bib4.skb
+     skribe/doc/user/src/bib5.skb skribe/doc/user/src/bib6.skb
+     skribe/doc/user/src/index1.skb skribe/doc/user/src/index2.skb
+     skribe/doc/user/src/index3.skb skribe/doc/user/src/links1.skb
+     skribe/doc/user/src/links2.skb skribe/doc/user/src/prgm1.skb
+     skribe/doc/user/src/prgm2.skb skribe/doc/user/src/prgm3.skb
+     skribe/doc/user/src/slides.skb skribe/doc/user/src/start1.skb
+     skribe/doc/user/src/start2.skb skribe/doc/user/src/start3.skb
+     skribe/doc/user/src/start4.skb skribe/doc/user/src/start5.skb
+     skribe/doc/user/start.skb skribe/doc/user/syntax.skb
+     skribe/doc/user/table.skb skribe/doc/user/toc.skb
+     skribe/doc/user/user.skb skribe/doc/user/xmle.skb
+     skribe/emacs/.arch-ids/=id skribe/emacs/.arch-ids/Makefile.id
+     skribe/emacs/.arch-ids/skribe.el.in.id skribe/emacs/Makefile
+     skribe/emacs/skribe.el.in skribe/etc/.arch-ids/=id
+     skribe/etc/.arch-ids/ChangeLog.id
+     skribe/etc/.arch-ids/Makefile.id
+     skribe/etc/.arch-ids/skribe-config.in.id skribe/etc/ChangeLog
+     skribe/etc/Makefile skribe/etc/bigloo/.arch-ids/=id
+     skribe/etc/bigloo/.arch-ids/Makefile.id
+     skribe/etc/bigloo/.arch-ids/Makefile.tpl.id
+     skribe/etc/bigloo/.arch-ids/configure.id
+     skribe/etc/bigloo/Makefile skribe/etc/bigloo/Makefile.tpl
+     skribe/etc/bigloo/autoconf/.arch-ids/=id
+     skribe/etc/bigloo/autoconf/.arch-ids/Makefile.id
+     skribe/etc/bigloo/autoconf/.arch-ids/bfildir.id
+     skribe/etc/bigloo/autoconf/.arch-ids/blibdir.id
+     skribe/etc/bigloo/autoconf/.arch-ids/bversion.id
+     skribe/etc/bigloo/autoconf/.arch-ids/getbversion.id
+     skribe/etc/bigloo/autoconf/.arch-ids/gmaketest.id
+     skribe/etc/bigloo/autoconf/Makefile
+     skribe/etc/bigloo/autoconf/bfildir
+     skribe/etc/bigloo/autoconf/blibdir
+     skribe/etc/bigloo/autoconf/bversion
+     skribe/etc/bigloo/autoconf/getbversion
+     skribe/etc/bigloo/autoconf/gmaketest
+     skribe/etc/bigloo/configure skribe/etc/skribe-config.in
+     skribe/etc/stklos/.arch-ids/=id
+     skribe/etc/stklos/.arch-ids/Makefile.config.in.id
+     skribe/etc/stklos/.arch-ids/Makefile.in.id
+     skribe/etc/stklos/.arch-ids/Makefile.skb.in.id
+     skribe/etc/stklos/.arch-ids/configure.id
+     skribe/etc/stklos/.arch-ids/configure.in.id
+     skribe/etc/stklos/Makefile.config.in
+     skribe/etc/stklos/Makefile.in
+     skribe/etc/stklos/Makefile.skb.in skribe/etc/stklos/configure
+     skribe/etc/stklos/configure.in skribe/examples/.arch-ids/=id
+     skribe/examples/.arch-ids/Makefile.id skribe/examples/Makefile
+     skribe/examples/slide/.arch-ids/=id
+     skribe/examples/slide/.arch-ids/Makefile.id
+     skribe/examples/slide/.arch-ids/PPRskribe.sty.id
+     skribe/examples/slide/.arch-ids/README.id
+     skribe/examples/slide/.arch-ids/advi.sty.id
+     skribe/examples/slide/Makefile
+     skribe/examples/slide/PPRskribe.sty
+     skribe/examples/slide/README skribe/examples/slide/advi.sty
+     skribe/examples/slide/ex/.arch-ids/=id
+     skribe/examples/slide/ex/.arch-ids/skribe.skb.id
+     skribe/examples/slide/ex/.arch-ids/syntax.scr.id
+     skribe/examples/slide/ex/skribe.skb
+     skribe/examples/slide/ex/syntax.scr
+     skribe/examples/slide/skb/.arch-ids/=id
+     skribe/examples/slide/skb/.arch-ids/slides.skb.id
+     skribe/examples/slide/skb/slides.skb
+     skribe/examples/slide/skr/.arch-ids/=id
+     skribe/examples/slide/skr/.arch-ids/local.skr.id
+     skribe/examples/slide/skr/local.skr skribe/skr/.arch-ids/=id
+     skribe/skr/.arch-ids/Makefile.id
+     skribe/skr/.arch-ids/acmproc.skr.id
+     skribe/skr/.arch-ids/base.skr.id
+     skribe/skr/.arch-ids/context.skr.id
+     skribe/skr/.arch-ids/french.skr.id
+     skribe/skr/.arch-ids/html.skr.id
+     skribe/skr/.arch-ids/html4.skr.id
+     skribe/skr/.arch-ids/jfp.skr.id
+     skribe/skr/.arch-ids/latex-simple.skr.id
+     skribe/skr/.arch-ids/latex.skr.id
+     skribe/skr/.arch-ids/letter.skr.id
+     skribe/skr/.arch-ids/lncs.skr.id
+     skribe/skr/.arch-ids/scribe.skr.id
+     skribe/skr/.arch-ids/sigplan.skr.id
+     skribe/skr/.arch-ids/skribe.skr.id
+     skribe/skr/.arch-ids/slide.skr.id
+     skribe/skr/.arch-ids/web-article.skr.id
+     skribe/skr/.arch-ids/web-book.skr.id
+     skribe/skr/.arch-ids/xml.skr.id skribe/skr/Makefile
+     skribe/skr/acmproc.skr skribe/skr/base.skr
+     skribe/skr/context.skr skribe/skr/french.skr
+     skribe/skr/html.skr skribe/skr/html4.skr skribe/skr/jfp.skr
+     skribe/skr/latex-simple.skr skribe/skr/latex.skr
+     skribe/skr/letter.skr skribe/skr/lncs.skr
+     skribe/skr/scribe.skr skribe/skr/sigplan.skr
+     skribe/skr/skribe.skr skribe/skr/slide.skr
+     skribe/skr/web-article.skr skribe/skr/web-book.skr
+     skribe/skr/xml.skr skribe/skribe.prj skribe/src/.arch-ids/=id
+     skribe/src/.arch-ids/Makefile.id skribe/src/Makefile
+     skribe/src/bigloo/.arch-ids/=id
+     skribe/src/bigloo/.arch-ids/Makefile.id
+     skribe/src/bigloo/.arch-ids/api.bgl.id
+     skribe/src/bigloo/.arch-ids/api.sch.id
+     skribe/src/bigloo/.arch-ids/asm.scm.id
+     skribe/src/bigloo/.arch-ids/bib.bgl.id
+     skribe/src/bigloo/.arch-ids/c.scm.id
+     skribe/src/bigloo/.arch-ids/color.scm.id
+     skribe/src/bigloo/.arch-ids/configure.bgl.id
+     skribe/src/bigloo/.arch-ids/debug.sch.id
+     skribe/src/bigloo/.arch-ids/debug.scm.id
+     skribe/src/bigloo/.arch-ids/engine.scm.id
+     skribe/src/bigloo/.arch-ids/eval.scm.id
+     skribe/src/bigloo/.arch-ids/evapi.scm.id
+     skribe/src/bigloo/.arch-ids/index.bgl.id
+     skribe/src/bigloo/.arch-ids/lib.bgl.id
+     skribe/src/bigloo/.arch-ids/lisp.scm.id
+     skribe/src/bigloo/.arch-ids/main.scm.id
+     skribe/src/bigloo/.arch-ids/new.sch.id
+     skribe/src/bigloo/.arch-ids/output.scm.id
+     skribe/src/bigloo/.arch-ids/param.bgl.id
+     skribe/src/bigloo/.arch-ids/parseargs.scm.id
+     skribe/src/bigloo/.arch-ids/prog.scm.id
+     skribe/src/bigloo/.arch-ids/read.scm.id
+     skribe/src/bigloo/.arch-ids/resolve.scm.id
+     skribe/src/bigloo/.arch-ids/source.scm.id
+     skribe/src/bigloo/.arch-ids/sui.bgl.id
+     skribe/src/bigloo/.arch-ids/types.scm.id
+     skribe/src/bigloo/.arch-ids/verify.scm.id
+     skribe/src/bigloo/.arch-ids/writer.scm.id
+     skribe/src/bigloo/.arch-ids/xml.scm.id
+     skribe/src/bigloo/Makefile skribe/src/bigloo/api.bgl
+     skribe/src/bigloo/api.sch skribe/src/bigloo/asm.scm
+     skribe/src/bigloo/bib.bgl skribe/src/bigloo/c.scm
+     skribe/src/bigloo/color.scm skribe/src/bigloo/configure.bgl
+     skribe/src/bigloo/debug.sch skribe/src/bigloo/debug.scm
+     skribe/src/bigloo/engine.scm skribe/src/bigloo/eval.scm
+     skribe/src/bigloo/evapi.scm skribe/src/bigloo/index.bgl
+     skribe/src/bigloo/lib.bgl skribe/src/bigloo/lisp.scm
+     skribe/src/bigloo/main.scm skribe/src/bigloo/new.sch
+     skribe/src/bigloo/output.scm skribe/src/bigloo/param.bgl
+     skribe/src/bigloo/parseargs.scm skribe/src/bigloo/prog.scm
+     skribe/src/bigloo/read.scm skribe/src/bigloo/resolve.scm
+     skribe/src/bigloo/source.scm skribe/src/bigloo/sui.bgl
+     skribe/src/bigloo/types.scm skribe/src/bigloo/verify.scm
+     skribe/src/bigloo/writer.scm skribe/src/bigloo/xml.scm
+     skribe/src/common/.arch-ids/=id
+     skribe/src/common/.arch-ids/api.scm.id
+     skribe/src/common/.arch-ids/bib.scm.id
+     skribe/src/common/.arch-ids/configure.scm.in.id
+     skribe/src/common/.arch-ids/index.scm.id
+     skribe/src/common/.arch-ids/lib.scm.id
+     skribe/src/common/.arch-ids/param.scm.id
+     skribe/src/common/.arch-ids/sui.scm.id
+     skribe/src/common/api.scm skribe/src/common/bib.scm
+     skribe/src/common/configure.scm.in skribe/src/common/index.scm
+     skribe/src/common/lib.scm skribe/src/common/param.scm
+     skribe/src/common/sui.scm skribe/src/stklos/.arch-ids/=id
+     skribe/src/stklos/.arch-ids/Makefile.in.id
+     skribe/src/stklos/.arch-ids/biblio.stk.id
+     skribe/src/stklos/.arch-ids/c-lex.l.id
+     skribe/src/stklos/.arch-ids/c.stk.id
+     skribe/src/stklos/.arch-ids/color.stk.id
+     skribe/src/stklos/.arch-ids/configure.stk.id
+     skribe/src/stklos/.arch-ids/debug.stk.id
+     skribe/src/stklos/.arch-ids/engine.stk.id
+     skribe/src/stklos/.arch-ids/eval.stk.id
+     skribe/src/stklos/.arch-ids/lib.stk.id
+     skribe/src/stklos/.arch-ids/lisp-lex.l.id
+     skribe/src/stklos/.arch-ids/lisp.stk.id
+     skribe/src/stklos/.arch-ids/main.stk.id
+     skribe/src/stklos/.arch-ids/output.stk.id
+     skribe/src/stklos/.arch-ids/prog.stk.id
+     skribe/src/stklos/.arch-ids/reader.stk.id
+     skribe/src/stklos/.arch-ids/resolve.stk.id
+     skribe/src/stklos/.arch-ids/runtime.stk.id
+     skribe/src/stklos/.arch-ids/source.stk.id
+     skribe/src/stklos/.arch-ids/types.stk.id
+     skribe/src/stklos/.arch-ids/vars.stk.id
+     skribe/src/stklos/.arch-ids/verify.stk.id
+     skribe/src/stklos/.arch-ids/writer.stk.id
+     skribe/src/stklos/.arch-ids/xml-lex.l.id
+     skribe/src/stklos/.arch-ids/xml.stk.id
+     skribe/src/stklos/Makefile.in skribe/src/stklos/biblio.stk
+     skribe/src/stklos/c-lex.l skribe/src/stklos/c.stk
+     skribe/src/stklos/color.stk skribe/src/stklos/configure.stk
+     skribe/src/stklos/debug.stk skribe/src/stklos/engine.stk
+     skribe/src/stklos/eval.stk skribe/src/stklos/lib.stk
+     skribe/src/stklos/lisp-lex.l skribe/src/stklos/lisp.stk
+     skribe/src/stklos/main.stk skribe/src/stklos/output.stk
+     skribe/src/stklos/prog.stk skribe/src/stklos/reader.stk
+     skribe/src/stklos/resolve.stk skribe/src/stklos/runtime.stk
+     skribe/src/stklos/source.stk skribe/src/stklos/types.stk
+     skribe/src/stklos/vars.stk skribe/src/stklos/verify.stk
+     skribe/src/stklos/writer.stk skribe/src/stklos/xml-lex.l
+     skribe/src/stklos/xml.stk skribe/tools/.arch-ids/=id
+     skribe/tools/.arch-ids/Makefile.id skribe/tools/Makefile
+     skribe/tools/skribebibtex/.arch-ids/=id
+     skribe/tools/skribebibtex/bigloo/.arch-ids/=id
+     skribe/tools/skribebibtex/bigloo/.arch-ids/Makefile.id
+     skribe/tools/skribebibtex/bigloo/.arch-ids/main.scm.id
+     skribe/tools/skribebibtex/bigloo/.arch-ids/skribebibtex.scm.id
+     skribe/tools/skribebibtex/bigloo/Makefile
+     skribe/tools/skribebibtex/bigloo/main.scm
+     skribe/tools/skribebibtex/bigloo/skribebibtex.scm
+     skribe/tools/skribebibtex/stklos/.arch-ids/=id
+     skribe/tools/skribebibtex/stklos/.arch-ids/Makefile.id
+     skribe/tools/skribebibtex/stklos/.arch-ids/bibtex-lex.l.id
+     skribe/tools/skribebibtex/stklos/.arch-ids/bibtex-parser.y.id
+     skribe/tools/skribebibtex/stklos/.arch-ids/main.stk.id
+     skribe/tools/skribebibtex/stklos/Makefile
+     skribe/tools/skribebibtex/stklos/bibtex-lex.l
+     skribe/tools/skribebibtex/stklos/bibtex-parser.y
+     skribe/tools/skribebibtex/stklos/main.stk
+
+    modified files:
+     doc/skr/env.skr doc/user/user.skb
+     src/guile/skribilo/engine/lout.scm
+     src/guile/skribilo/evaluator.scm
+     src/guile/skribilo/packages/french.scm
+     src/guile/skribilo/packages/jfp.scm
+     src/guile/skribilo/packages/letter.scm
+     src/guile/skribilo/packages/lncs.scm
+     src/guile/skribilo/packages/scribe.scm
+     src/guile/skribilo/packages/sigplan.scm
+     src/guile/skribilo/packages/slide.scm
+     src/guile/skribilo/packages/web-article.scm
+     src/guile/skribilo/reader/skribe.scm
+     src/guile/skribilo/skribe/param.scm
+     src/guile/skribilo/types.scm
+
+    renamed files:
+     skr/.arch-ids/acmproc.skr.id
+       ==> src/guile/skribilo/packages/.arch-ids/acmproc.scm.id
+     skr/.arch-ids/french.skr.id
+       ==> src/guile/skribilo/packages/.arch-ids/french.scm.id
+     skr/.arch-ids/jfp.skr.id
+       ==> src/guile/skribilo/packages/.arch-ids/jfp.scm.id
+     skr/.arch-ids/letter.skr.id
+       ==> src/guile/skribilo/packages/.arch-ids/letter.scm.id
+     skr/.arch-ids/lncs.skr.id
+       ==> src/guile/skribilo/packages/.arch-ids/lncs.scm.id
+     skr/.arch-ids/scribe.skr.id
+       ==> src/guile/skribilo/packages/.arch-ids/scribe.scm.id
+     skr/.arch-ids/sigplan.skr.id
+       ==> src/guile/skribilo/packages/.arch-ids/sigplan.scm.id
+     skr/.arch-ids/skribe.skr.id
+       ==> src/guile/skribilo/packages/.arch-ids/skribe.scm.id
+     skr/.arch-ids/slide.skr.id
+       ==> src/guile/skribilo/packages/.arch-ids/slide.scm.id
+     skr/.arch-ids/web-article.skr.id
+       ==> src/guile/skribilo/packages/.arch-ids/web-article.scm.id
+     skr/.arch-ids/web-book.skr.id
+       ==> src/guile/skribilo/packages/.arch-ids/web-book.scm.id
+     skr/acmproc.skr
+       ==> src/guile/skribilo/packages/acmproc.scm
+     skr/french.skr
+       ==> src/guile/skribilo/packages/french.scm
+     skr/jfp.skr
+       ==> src/guile/skribilo/packages/jfp.scm
+     skr/letter.skr
+       ==> src/guile/skribilo/packages/letter.scm
+     skr/lncs.skr
+       ==> src/guile/skribilo/packages/lncs.scm
+     skr/scribe.skr
+       ==> src/guile/skribilo/packages/scribe.scm
+     skr/sigplan.skr
+       ==> src/guile/skribilo/packages/sigplan.scm
+     skr/skribe.skr
+       ==> src/guile/skribilo/packages/skribe.scm
+     skr/slide.skr
+       ==> src/guile/skribilo/packages/slide.scm
+     skr/web-article.skr
+       ==> src/guile/skribilo/packages/web-article.scm
+     skr/web-book.skr
+       ==> src/guile/skribilo/packages/web-book.scm
+
+    new directories:
+     src/guile/skribilo/packages
+     src/guile/skribilo/packages/.arch-ids
+
+    removed directories:
+     bin bin/.arch-ids skr skr/.arch-ids skribe skribe/.arch-ids
+     skribe/doc skribe/doc/.arch-ids skribe/doc/dir
+     skribe/doc/dir/.arch-ids skribe/doc/img
+     skribe/doc/img/.arch-ids skribe/doc/skr
+     skribe/doc/skr/.arch-ids skribe/doc/user
+     skribe/doc/user/.arch-ids skribe/doc/user/src
+     skribe/doc/user/src/.arch-ids skribe/emacs
+     skribe/emacs/.arch-ids skribe/etc skribe/etc/.arch-ids
+     skribe/etc/bigloo skribe/etc/bigloo/.arch-ids
+     skribe/etc/bigloo/autoconf
+     skribe/etc/bigloo/autoconf/.arch-ids skribe/etc/stklos
+     skribe/etc/stklos/.arch-ids skribe/examples
+     skribe/examples/.arch-ids skribe/examples/slide
+     skribe/examples/slide/.arch-ids skribe/examples/slide/ex
+     skribe/examples/slide/ex/.arch-ids skribe/examples/slide/skb
+     skribe/examples/slide/skb/.arch-ids skribe/examples/slide/skr
+     skribe/examples/slide/skr/.arch-ids skribe/skr
+     skribe/skr/.arch-ids skribe/src skribe/src/.arch-ids
+     skribe/src/bigloo skribe/src/bigloo/.arch-ids
+     skribe/src/common skribe/src/common/.arch-ids
+     skribe/src/stklos skribe/src/stklos/.arch-ids skribe/tools
+     skribe/tools/.arch-ids skribe/tools/skribebibtex
+     skribe/tools/skribebibtex/.arch-ids
+     skribe/tools/skribebibtex/bigloo
+     skribe/tools/skribebibtex/bigloo/.arch-ids
+     skribe/tools/skribebibtex/stklos
+     skribe/tools/skribebibtex/stklos/.arch-ids
+
+
+2005-07-02 17:06:50 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-6
+
+    Summary:
+      Cosmetic changes.
+    Revision:
+      skribilo--devel--1.2--patch-6
+
+    * src/guile/skribilo/resolve.scm:  Minor cosmetic changes.
+
+    modified files:
+     src/guile/skribilo/resolve.scm
+
+
+2005-07-02 12:40:07 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-5
+
+    Summary:
+      Minor fixes for file/line error reporting.
+    Revision:
+      skribilo--devel--1.2--patch-5
+
+    * src/guile/skribilo/lib.scm (skribe-line-error):  Removed.
+      (skribe-ast-error):  Fixed.  Use `location-line' instead of
+      `location-pos'.
+      (skribe-error):  Fixed.
+      (%skribe-warn):  Use the file and line number of CURRENT-INPUT-PORT by
+      default.
+    
+    * src/guile/skribilo/types.scm:  Export `location-file', `location-line'
+      and `location-pos'.
+      (initialize):  New method for `<ast>' objects, initialize slot `loc'
+      with information from CURRENT-INPUT-PORT.
+      (ast-location):  Fixed.
+
+    modified files:
+     src/guile/skribilo/lib.scm src/guile/skribilo/types.scm
+
+
+2005-07-02 03:51:27 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-4
+
+    Summary:
+      First real document produced!
+    Revision:
+      skribilo--devel--1.2--patch-4
+
+    Lots of things, including:
+    
+    * src/guile/skribilo/engine/lout.scm:  New file.
+    
+    First real document produced!
+
+    new files:
+     src/guile/skribilo/engine/.arch-ids/lout.scm.id
+     src/guile/skribilo/engine/lout.scm
+
+    modified files:
+     src/guile/README src/guile/skribilo.scm
+     src/guile/skribilo/debug.scm src/guile/skribilo/engine.scm
+     src/guile/skribilo/engine/base.scm
+     src/guile/skribilo/engine/context.scm
+     src/guile/skribilo/engine/html.scm
+     src/guile/skribilo/engine/html4.scm
+     src/guile/skribilo/engine/latex.scm src/guile/skribilo/lib.scm
+     src/guile/skribilo/module.scm src/guile/skribilo/runtime.scm
+     src/guile/skribilo/skribe/api.scm
+     src/guile/skribilo/skribe/bib.scm
+     src/guile/skribilo/skribe/utils.scm
+     src/guile/skribilo/types.scm src/guile/skribilo/vars.scm
+     src/guile/skribilo/verify.scm src/guile/skribilo/writer.scm
+
+
+2005-07-02 02:04:46 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-3
+
+    Summary:
+      Started relying on the per-module reader;  first doc produced ever!
+    Revision:
+      skribilo--devel--1.2--patch-3
+
+    First document compiled by Skribilo to HTML!
+    
+    * src/guile/skribilo/module.scm (define-skribe-module):  Use the
+      `#:reader' option of `define-module' (not yet integrated in Guile 1.7).
+    
+    Plus lots of other things...
+
+    modified files:
+     src/guile/README src/guile/skribilo.scm
+     src/guile/skribilo/biblio.scm
+     src/guile/skribilo/engine/html.scm
+     src/guile/skribilo/evaluator.scm src/guile/skribilo/lib.scm
+     src/guile/skribilo/module.scm src/guile/skribilo/output.scm
+     src/guile/skribilo/resolve.scm src/guile/skribilo/runtime.scm
+     src/guile/skribilo/skribe/api.scm
+     src/guile/skribilo/skribe/bib.scm
+     src/guile/skribilo/skribe/utils.scm
+     src/guile/skribilo/source.scm src/guile/skribilo/types.scm
+     src/guile/skribilo/vars.scm src/guile/skribilo/verify.scm
+     src/guile/skribilo/writer.scm
+
+
+2005-07-01 23:55:56 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-2
+
+    Summary:
+      Lots of changes, again.
+    Revision:
+      skribilo--devel--1.2--patch-2
+
+    Lots of changes, notably the following:
+    
+    * skr/*.skr:  Moved engines to `src/guile/skribilo/engine'.
+    
+    * src/guile/skribilo/engine.scm (lookup-engine):  Rewritten.  Don't use
+      the auto-load alist.
+    
+    * src/guile/skribilo/evaluator.scm:  New name of the `eval' module.
+      `eval' couldn't be used as the module base-name because of Guile's
+      recursive module name space.
+
+    new files:
+     src/guile/README src/guile/skribilo/engine/.arch-ids/=id
+
+    modified files:
+     src/guile/skribilo.scm src/guile/skribilo/biblio.scm
+     src/guile/skribilo/config.scm.in src/guile/skribilo/debug.scm
+     src/guile/skribilo/engine.scm
+     src/guile/skribilo/engine/base.scm
+     src/guile/skribilo/engine/context.scm
+     src/guile/skribilo/engine/html.scm
+     src/guile/skribilo/engine/html4.scm
+     src/guile/skribilo/engine/latex-simple.scm
+     src/guile/skribilo/engine/xml.scm
+     src/guile/skribilo/evaluator.scm src/guile/skribilo/lib.scm
+     src/guile/skribilo/module.scm src/guile/skribilo/output.scm
+     src/guile/skribilo/reader.scm src/guile/skribilo/resolve.scm
+     src/guile/skribilo/runtime.scm src/guile/skribilo/source.scm
+     src/guile/skribilo/writer.scm {arch}/=tagging-method
+
+    renamed files:
+     skr/.arch-ids/base.skr.id
+       ==> src/guile/skribilo/engine/.arch-ids/base.scm.id
+     skr/.arch-ids/context.skr.id
+       ==> src/guile/skribilo/engine/.arch-ids/context.scm.id
+     skr/.arch-ids/html.skr.id
+       ==> src/guile/skribilo/engine/.arch-ids/html.scm.id
+     skr/.arch-ids/html4.skr.id
+       ==> src/guile/skribilo/engine/.arch-ids/html4.scm.id
+     skr/.arch-ids/latex-simple.skr.id
+       ==> src/guile/skribilo/engine/.arch-ids/latex-simple.scm.id
+     skr/.arch-ids/latex.skr.id
+       ==> src/guile/skribilo/engine/.arch-ids/latex.scm.id
+     skr/.arch-ids/xml.skr.id
+       ==> src/guile/skribilo/engine/.arch-ids/xml.scm.id
+     skr/base.skr
+       ==> src/guile/skribilo/engine/base.scm
+     skr/context.skr
+       ==> src/guile/skribilo/engine/context.scm
+     skr/html.skr
+       ==> src/guile/skribilo/engine/html.scm
+     skr/html4.skr
+       ==> src/guile/skribilo/engine/html4.scm
+     skr/latex-simple.skr
+       ==> src/guile/skribilo/engine/latex-simple.scm
+     skr/latex.skr
+       ==> src/guile/skribilo/engine/latex.scm
+     skr/xml.skr
+       ==> src/guile/skribilo/engine/xml.scm
+     src/guile/skribilo/.arch-ids/eval.scm.id
+       ==> src/guile/skribilo/.arch-ids/evaluator.scm.id
+     src/guile/skribilo/eval.scm
+       ==> src/guile/skribilo/evaluator.scm
+
+    new directories:
+     src/guile/skribilo/engine src/guile/skribilo/engine/.arch-ids
+
+
+2005-07-01 13:33:34 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-1
+
+    Summary:
+      Lots of changes.
+    Revision:
+      skribilo--devel--1.2--patch-1
+
+    Too many changes to describe here, among which, moving the `(skribe)' module
+    namespace to `(skribilo)'.  This is work in progress.
+    
+
+    new files:
+     src/guile/skribilo/.arch-ids/config.scm.in.id
+     src/guile/skribilo/.arch-ids/module.scm.id
+     src/guile/skribilo/.arch-ids/reader.scm.id
+     src/guile/skribilo/coloring/.arch-ids/=id
+     src/guile/skribilo/config.scm.in src/guile/skribilo/module.scm
+     src/guile/skribilo/reader.scm
+     src/guile/skribilo/reader/.arch-ids/=id
+     src/guile/skribilo/skribe/.arch-ids/=id
+     src/guile/skribilo/skribe/.arch-ids/api.scm.id
+     src/guile/skribilo/skribe/.arch-ids/bib.scm.id
+     src/guile/skribilo/skribe/.arch-ids/index.scm.id
+     src/guile/skribilo/skribe/.arch-ids/param.scm.id
+     src/guile/skribilo/skribe/.arch-ids/sui.scm.id
+     src/guile/skribilo/skribe/.arch-ids/utils.scm.id
+     src/guile/skribilo/skribe/api.scm
+     src/guile/skribilo/skribe/bib.scm
+     src/guile/skribilo/skribe/index.scm
+     src/guile/skribilo/skribe/param.scm
+     src/guile/skribilo/skribe/sui.scm
+     src/guile/skribilo/skribe/utils.scm
+
+    removed files:
+     src/guile/skribe/.arch-ids/configure.scm.id
+     src/guile/skribe/configure.scm
+
+    modified files:
+     src/guile/skribilo.scm src/guile/skribilo/biblio.scm
+     src/guile/skribilo/color.scm src/guile/skribilo/coloring/c.scm
+     src/guile/skribilo/coloring/lisp.scm
+     src/guile/skribilo/coloring/xml.scm
+     src/guile/skribilo/debug.scm src/guile/skribilo/engine.scm
+     src/guile/skribilo/eval.scm src/guile/skribilo/lib.scm
+     src/guile/skribilo/output.scm src/guile/skribilo/prog.scm
+     src/guile/skribilo/reader/skribe.scm
+     src/guile/skribilo/resolve.scm src/guile/skribilo/runtime.scm
+     src/guile/skribilo/source.scm src/guile/skribilo/types.scm
+     src/guile/skribilo/vars.scm src/guile/skribilo/verify.scm
+     src/guile/skribilo/writer.scm
+
+    renamed files:
+     src/guile/skribe/.arch-ids/=id
+       ==> src/guile/skribilo/.arch-ids/=id
+     src/guile/skribe/.arch-ids/Makefile.in.id
+       ==> src/guile/skribilo/.arch-ids/Makefile.in.id
+     src/guile/skribe/.arch-ids/biblio.scm.id
+       ==> src/guile/skribilo/.arch-ids/biblio.scm.id
+     src/guile/skribe/.arch-ids/c-lex.l.id
+       ==> src/guile/skribilo/coloring/.arch-ids/c-lex.l.id
+     src/guile/skribe/.arch-ids/c.scm.id
+       ==> src/guile/skribilo/coloring/.arch-ids/c.scm.id
+     src/guile/skribe/.arch-ids/color.scm.id
+       ==> src/guile/skribilo/.arch-ids/color.scm.id
+     src/guile/skribe/.arch-ids/debug.scm.id
+       ==> src/guile/skribilo/.arch-ids/debug.scm.id
+     src/guile/skribe/.arch-ids/engine.scm.id
+       ==> src/guile/skribilo/.arch-ids/engine.scm.id
+     src/guile/skribe/.arch-ids/eval.scm.id
+       ==> src/guile/skribilo/.arch-ids/eval.scm.id
+     src/guile/skribe/.arch-ids/lib.scm.id
+       ==> src/guile/skribilo/.arch-ids/lib.scm.id
+     src/guile/skribe/.arch-ids/lisp-lex.l.id
+       ==> src/guile/skribilo/coloring/.arch-ids/lisp-lex.l.id
+     src/guile/skribe/.arch-ids/lisp.scm.id
+       ==> src/guile/skribilo/coloring/.arch-ids/lisp.scm.id
+     src/guile/skribe/.arch-ids/output.scm.id
+       ==> src/guile/skribilo/.arch-ids/output.scm.id
+     src/guile/skribe/.arch-ids/prog.scm.id
+       ==> src/guile/skribilo/.arch-ids/prog.scm.id
+     src/guile/skribe/.arch-ids/reader.scm.id
+       ==> src/guile/skribilo/reader/.arch-ids/skribe.scm.id
+     src/guile/skribe/.arch-ids/resolve.scm.id
+       ==> src/guile/skribilo/.arch-ids/resolve.scm.id
+     src/guile/skribe/.arch-ids/runtime.scm.id
+       ==> src/guile/skribilo/.arch-ids/runtime.scm.id
+     src/guile/skribe/.arch-ids/source.scm.id
+       ==> src/guile/skribilo/.arch-ids/source.scm.id
+     src/guile/skribe/.arch-ids/types.scm.id
+       ==> src/guile/skribilo/.arch-ids/types.scm.id
+     src/guile/skribe/.arch-ids/vars.scm.id
+       ==> src/guile/skribilo/.arch-ids/vars.scm.id
+     src/guile/skribe/.arch-ids/verify.scm.id
+       ==> src/guile/skribilo/.arch-ids/verify.scm.id
+     src/guile/skribe/.arch-ids/writer.scm.id
+       ==> src/guile/skribilo/.arch-ids/writer.scm.id
+     src/guile/skribe/.arch-ids/xml-lex.l.id
+       ==> src/guile/skribilo/coloring/.arch-ids/xml-lex.l.id
+     src/guile/skribe/.arch-ids/xml.scm.id
+       ==> src/guile/skribilo/coloring/.arch-ids/xml.scm.id
+     src/guile/skribe/c-lex.l
+       ==> src/guile/skribilo/coloring/c-lex.l
+     src/guile/skribe/c.scm
+       ==> src/guile/skribilo/coloring/c.scm
+     src/guile/skribe/lisp-lex.l
+       ==> src/guile/skribilo/coloring/lisp-lex.l
+     src/guile/skribe/lisp.scm
+       ==> src/guile/skribilo/coloring/lisp.scm
+     src/guile/skribe/reader.scm
+       ==> src/guile/skribilo/reader/skribe.scm
+     src/guile/skribe/xml-lex.l
+       ==> src/guile/skribilo/coloring/xml-lex.l
+     src/guile/skribe/xml.scm
+       ==> src/guile/skribilo/coloring/xml.scm
+
+    new directories:
+     src/guile/skribilo/.arch-ids src/guile/skribilo/coloring
+     src/guile/skribilo/coloring/.arch-ids
+     src/guile/skribilo/reader src/guile/skribilo/reader/.arch-ids
+     src/guile/skribilo/skribe src/guile/skribilo/skribe/.arch-ids
+
+    removed directories:
+     src/guile/skribe/.arch-ids
+
+    renamed directories:
+     src/guile/skribe
+       ==> src/guile/skribilo
+
+
+2005-06-24 07:29:38 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	base-0
+
+    Summary:
+      tag of lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-5
+    Revision:
+      skribilo--devel--1.2--base-0
+
+    (automatically generated log message)
+
+    new patches:
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--base-0
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-1
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-2
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-3
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-4
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-5
+
+
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index dbf912f..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
----------------------------------------------------------------------
-   Skribe    
-                                                                     
-     Copyright (c) 2003, 2004 -- Erick Gallesio, Manuel Serrano
-                                                                     
-     Bug descriptions, use reports, comments or suggestions are      
-     welcome. Send them to                                           
-       skribe@sophia.inria.fr                                        
-       http://www.inria.fr/mimosa/fp/Skribe
-                                                                     
-   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.
-
-   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.                                               
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..3920780
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = src doc
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..a8e220f
--- /dev/null
+++ b/NEWS
@@ -0,0 +1 @@
+No news today.
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..a4bc494
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,36 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.59)
+AC_INIT(skribilo, 1.2, ludovic.courtes@laas.fr)
+AM_INIT_AUTOMAKE(skribilo, 1.2)
+
+AC_CONFIG_SRCDIR([src/guile/skribilo/reader.scm])
+
+# Look for Guile.
+GUILE_PROGS
+GUILE_SITE_DIR
+
+# Need guile-reader 0.2.
+GUILE_MODULE_REQUIRED([system reader])
+
+# Look for Lout.
+AC_PATH_PROG([LOUT], [lout], [not-found])
+AM_CONDITIONAL([HAVE_LOUT], [test "x$LOUT" != "xnot-found"])
+
+AC_SUBST([SKRIBILO_DOC_DIR], ["$datadir/doc/skribilo"])
+AC_SUBST([SKRIBILO_EXT_DIR], ["$datadir/skribilo/1.2/"])
+AC_SUBST([SKRIBILO_SKR_PATH], ["$GUILE_SITE/"])
+
+AC_OUTPUT([Makefile
+	   src/Makefile
+	   src/guile/Makefile
+	   src/guile/skribilo/Makefile
+	   src/guile/skribilo/config.scm
+	   src/guile/skribilo/engine/Makefile
+	   src/guile/skribilo/reader/Makefile
+	   src/guile/skribilo/package/Makefile
+	   src/guile/skribilo/skribe/Makefile
+	   src/guile/skribilo/coloring/Makefile
+	   doc/Makefile
+	   doc/user/Makefile])
diff --git a/doc/Makefile b/doc/Makefile
index 934389e..7a177fc 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,233 +1,420 @@
-#*=====================================================================*/
-#*    serrano/prgm/project/skribe/doc/Makefile                         */
-#*    -------------------------------------------------------------    */
-#*    Author      :  Manuel Serrano                                    */
-#*    Creation    :  Mon Sep  1 10:29:28 2003                          */
-#*    Last change :  Wed Mar 10 11:16:48 2004 (serrano)                */
-#*    Copyright   :  2003-04 Manuel Serrano                            */
-#*    -------------------------------------------------------------    */
-#*    The Makefile to build the Skribe documentation.                  */
-#*=====================================================================*/
-include ../etc/Makefile.config
-include ../etc/$(SYSTEM)/Makefile.skb
-
-#*---------------------------------------------------------------------*/
-#*    Compiler and tools                                               */
-#*---------------------------------------------------------------------*/
-BINDIR		= ../bin
-LIBDIR		= ../lib
-LATEX		= latex
-DVIPS		= dvips
-
-SKRIBEVERBOSE	= -v1
-SKRIBEWARNING	= -w1
-SFLAGS		= $(SKRIBEVERBOSE) $(SKRIBEWARNING) \
-                  -I ../skr \
-                  -I skr \
-                  -P img \
-                  -S .. \
-                  --custom emit-sui=yes \
-                  --eval '(define *skribe-bin* "$(SKRIBE)")' \
-                  --eval '(define *skribebibtex-bin* "$(SKRIBEBIBTEX)")'
-
-#*---------------------------------------------------------------------*/
-#*    Doc skr                                                          */
-#*---------------------------------------------------------------------*/
-_SKR		= manual.skr env.skr api.skr extension.skr
-SKR		= $(_SKR:%=skr/%)
-
-#*---------------------------------------------------------------------*/
-#*    Images                                                           */
-#*---------------------------------------------------------------------*/
-_IMG		= bsd.gif lambda.gif linux.gif
-IMG		= $(_IMG:%=img/%) 
-
-#*---------------------------------------------------------------------*/
-#*    User document                                                    */
-#*---------------------------------------------------------------------*/
-_USERMAIN	= user.skb
-_USEROTHERS	= start.skb syntax.skb \
-                  markup.skb document.skb \
-                  sectioning.skb toc.skb ornament.skb line.skb font.skb \
-		  justify.skb enumeration.skb \
-                  examples.skb colframe.skb figure.skb image.skb table.skb \
-                  footnote.skb char.skb \
-                  links.skb index.skb bib.skb prgm.skb \
-                  engine.skb htmle.skb latexe.skb xmle.skb \
-                  emacs.skb skribec.skb skribe-config.skb \
-                  lib.skb slide.skb package.skb
-_USERSRC	= start1.skb start2.skb start3.skb start4.skb  start5.skb \
-                  api1.skb api2.skb api3.skb api4.skb api5.skb \
-                  api6.skb api7.skb api8.skb api9.skb api10.skb \
-                  api11.skb api12.skb api13.skb api14.skb api15.skb \
-                  api16.skb api17.skb api18.skb api19.skb api20.skb \
-                  links1.skb links2.skb \
-                  index1.skb index2.skb index3.skb \
-                  bib1.sbib bib2.skb bib3.skb bib4.skb bib5.skb bib6.skb \
-                  prgm1.skb prgm2.skb prgm3.skb slides.skb
-
-USERMAIN	= $(_USERMAIN:%=user/%) 
-USEROTHERS	= $(_USEROTHERS:%=user/%) 
-USERSRC		= $(_USERSRC:%=user/src/%) 
-USERSKB		= $(USERMAIN) $(USEROTHERS) $(USERSRC)
-
-#*---------------------------------------------------------------------*/
-#*    User document                                                    */
-#*---------------------------------------------------------------------*/
-_DIRMAIN	= dir.skb
-_DIROTHERS	= 
-_DIRSRC		= 
-
-DIRMAIN		= $(_DIRMAIN:%=dir/%) 
-DIROTHERS	= $(_DIROTHERS:%=dir/%) 
-DIRSRC		= $(_DIRSRC:%=dir/src/%) 
-DIRSKB		= $(DIRMAIN) $(DIROTHERS) $(DIRSRC)
-
-#*---------------------------------------------------------------------*/
-#*    Suffixes                                                         */
-#*---------------------------------------------------------------------*/
-.SUFFIXES:
-.SUFFIXES: .skb .man .html .sui
-
-#*---------------------------------------------------------------------*/
-#*    All                                                              */
-#*---------------------------------------------------------------------*/
-.PHONY: user dir
-
-all: user dir
-re: re.html re.dir
-
-#*---------------------------------------------------------------------*/
-#*    pop                                                              */
-#*---------------------------------------------------------------------*/
-.PHONY: pop
-
-pop:
-	@ echo doc/Makefile doc/Makefile.dir
-	@ echo $(USERSKB:%=doc/%)
-	@ echo $(DIRSKB:%=doc/%)
-	@ echo $(SKR:%=doc/%)
-	@ echo $(IMG:%=doc/%)
-
-#*---------------------------------------------------------------------*/
-#*    user                                                             */
-#*---------------------------------------------------------------------*/
-.PHONY: user re.html user.html
-
-user: user.html user.sui
-user.html: html/user.html html/img/lambda.gif html/img/bsd.gif html/img/linux.gif
-user.sui: html/user.sui
-
-user.ps: tex/user.dvi
-	(cd tex; $(DVIPS) user.dvi -o user.ps)
-
-user.dvi: tex/user.dvi
-tex/user.dvi: tex/user.tex
-	(cd tex; $(LATEX) user.tex)
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# doc/Makefile.  Generated from Makefile.in by configure.
+
+# 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, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+srcdir = .
+top_srcdir = ..
+
+pkgdatadir = $(datadir)/skribilo
+pkglibdir = $(libdir)/skribilo
+pkgincludedir = $(includedir)/skribilo
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
+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 = doc
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.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 =
+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
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = ${SHELL} /home/ludo/src/skribilo/missing --run aclocal-1.9
+AMTAR = ${SHELL} /home/ludo/src/skribilo/missing --run tar
+AUTOCONF = ${SHELL} /home/ludo/src/skribilo/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/ludo/src/skribilo/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/ludo/src/skribilo/missing --run automake-1.9
+AWK = gawk
+CYGPATH_W = echo
+DEFS = -DPACKAGE_NAME=\"skribilo\" -DPACKAGE_TARNAME=\"skribilo\" -DPACKAGE_VERSION=\"1.2\" -DPACKAGE_STRING=\"skribilo\ 1.2\" -DPACKAGE_BUGREPORT=\"ludovic.courtes@laas.fr\" -DPACKAGE=\"skribilo\" -DVERSION=\"1.2\" 
+ECHO_C = 
+ECHO_N = -n
+ECHO_T = 
+GUILE = /usr/bin/guile
+GUILE_CONFIG = /usr/bin/guile-config
+GUILE_SITE = /usr/share/guile/site
+GUILE_TOOLS = /usr/bin/guile-tools
+HAVE_LOUT_FALSE = #
+HAVE_LOUT_TRUE = 
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+LIBOBJS = 
+LIBS = 
+LOUT = /usr/bin/lout
+LTLIBOBJS = 
+MAKEINFO = ${SHELL} /home/ludo/src/skribilo/missing --run makeinfo
+PACKAGE = skribilo
+PACKAGE_BUGREPORT = ludovic.courtes@laas.fr
+PACKAGE_NAME = skribilo
+PACKAGE_STRING = skribilo 1.2
+PACKAGE_TARNAME = skribilo
+PACKAGE_VERSION = 1.2
+PATH_SEPARATOR = :
+SET_MAKE = 
+SHELL = /bin/sh
+SKRIBILO_DOC_DIR = ${prefix}/share/doc/skribilo
+SKRIBILO_EXT_DIR = ${prefix}/share/skribilo/1.2/
+SKRIBILO_SKR_PATH = /usr/share/guile/site/
+STRIP = 
+VERSION = 1.2
+ac_ct_STRIP = 
+am__leading_dot = .
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+bindir = ${exec_prefix}/bin
+build_alias = 
+datadir = ${prefix}/share
+exec_prefix = ${prefix}
+host_alias = 
+includedir = ${prefix}/include
+infodir = ${prefix}/info
+install_sh = /home/ludo/src/skribilo/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localstatedir = ${prefix}/var
+mandir = ${prefix}/man
+mkdir_p = mkdir -p --
+oldincludedir = /usr/include
+prefix = /usr/local
+program_transform_name = s,x,x,
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+sysconfdir = ${prefix}/etc
+target_alias = 
+SUBDIRS = user
+all: all-recursive
 
-html/user.html html/user.sui: html $(USERSKB) $(SKR) 
-	$(MAKE) re.html
-
-tex/user.tex: tex $(USERSKB) $(SKR) tex/img/lambda.eps tex/img/bsd.eps tex/img/linux.eps
-	$(MAKE) re.tex
-
-# gif
-html/img/lambda.gif: html/img img/lambda.gif
-	cp img/lambda.gif html/img/lambda.gif
-
-html/img/linux.gif: html/img img/linux.gif
-	cp img/linux.gif html/img/linux.gif
-
-html/img/bsd.gif: html/img img/bsd.gif
-	cp img/bsd.gif html/img/bsd.gif
-
-# eps image
-tex/img/lambda.eps: tex/img img/lambda.gif
-	convert img/lambda.gif tex/img/lambda.eps
-
-tex/img/linux.eps: tex/img img/linux.gif
-	convert img/linux.gif tex/img/linux.eps
-
-tex/img/bsd.eps: tex/img img/bsd.gif
-	convert img/bsd.gif tex/img/bsd.eps
-
-re.html: 
-	$(SKRIBE) $(SFLAGS) $(USERMAIN) \
-                  --base html -I user -S user \
-                  -o html/user.html
-
-re.tex: 
-	$(SKRIBE) $(SFLAGS) $(USERMAIN) \
-                  --base tex -I user -S user \
-                  -o tex/user.tex
-
-#*---------------------------------------------------------------------*/
-#*    dir                                                              */
-#*---------------------------------------------------------------------*/
-.PHONY: dir re.dir dir.html
-
-dir: dir.html
-dir.html: html/dir.html
-
-html/dir.html: html $(DIRSKB) $(SKR) 
-	$(MAKE) re.dir
-
-re.dir: 
-	$(MAKE) -f Makefile.dir SKRIBE="$(SKRIBE)" BASE=html
-
-#*---------------------------------------------------------------------*/
-#*    Misc                                                             */
-#*---------------------------------------------------------------------*/
-html:
-	mkdir -p html
-
-html/img:
-	mkdir -p html/img
-
-tex:
-	mkdir -p tex
-
-tex/img:
-	mkdir -p tex/img
-
-gethtml:
-	@ echo "html/user.html"
-
-#*---------------------------------------------------------------------*/
-#*    install/uinstall                                                 */
-#*---------------------------------------------------------------------*/
-.PHONY: install uninstall
-
-install: $(DESTDIR)$(INSTALL_DOCDIR) $(DESTDIR)$(INSTALL_SKRDIR)/doc/skr
-	cp -r html/* $(DESTDIR)$(INSTALL_DOCDIR) \
-            && chmod $(BMASK) $(DESTDIR)$(INSTALL_DOCDIR)/* \
-            && chmod a+rx $(DESTDIR)$(INSTALL_DOCDIR)/img
-	cp -r skr/* $(DESTDIR)$(INSTALL_SKRDIR)/doc/skr \
-            && chmod a+rx $(DESTDIR)$(INSTALL_SKRDIR)/doc \
-            && chmod a+rx $(DESTDIR)$(INSTALL_SKRDIR)/doc/skr \
-            && chmod $(BMASK) $(DESTDIR)$(INSTALL_SKRDIR)/doc/skr/*
-	cp Makefile.dir $(DESTDIR)$(INSTALL_DOCDIR) \
-            && chmod $(BMASK) $(DESTDIR)$(INSTALL_DOCDIR)/Makefile.dir
-	cp dir/dir.skb $(DESTDIR)$(INSTALL_DOCDIR) \
-            && chmod $(BMASK) $(DESTDIR)$(INSTALL_DOCDIR)/dir.skb
-
-uninstall:
-	$(RM) -rf $(DESTDIR)$(INSTALL_DOCDIR)
-
-$(DESTDIR)$(INSTALL_DOCDIR):
-	mkdir -p $(DESTDIR)$(INSTALL_DOCDIR) && chmod a+rx $(DESTDIR)$(INSTALL_DOCDIR)
-
-
-$(DESTDIR)$(INSTALL_SKRDIR)/doc/skr:
-	mkdir -p $(DESTDIR)$(INSTALL_SKRDIR)/doc/skr \
-            && chmod -R a+rx $(DESTDIR)$(INSTALL_SKRDIR)/doc
-
-#*---------------------------------------------------------------------*/
-#*    Clean                                                            */
-#*---------------------------------------------------------------------*/
-.PHONY: clean
+.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  doc/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  doc/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;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(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
+uninstall-info-am:
+
+# 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"
+
+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
+
+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
+
+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
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+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
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+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:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+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
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+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
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.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-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-info-am
 
-clean:
-	$(RM) -rf html
-	$(RM) -rf tex
-	$(RM) -f  img/bsd.eps img/linux.eps 
+# 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/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..1b8257b
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = user
diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
new file mode 100644
index 0000000..33d16ce
--- /dev/null
+++ b/doc/user/Makefile.am
@@ -0,0 +1,22 @@
+BUILT_SOURCES = user.html
+
+skribilo = $(top_srcdir)/src/guile/skribilo.scm
+load_path = $(top_srcdir)/src/guile:$(top_srcdir)/src/guile/skribilo/package
+
+%.html: %.skb
+	GUILE_LOAD_PATH=$(load_path) \
+	$(skribilo) --target html -I ../ -o $@ $<
+
+if HAVE_LOUT
+
+BUILT_SOURCES += user.ps
+
+%.lout: %.skb
+	GUILE_LOAD_PATH=$(load_path) \
+	$(skribilo) --target lout -I ../ -o $@ $<
+
+%.ps: %.lout
+	$(LOUT) -c $(<:%.lout=%) -o $@ $<
+
+endif
+
diff --git a/doc/user/start.skb b/doc/user/start.skb
index f3c1e28..d437b3a 100644
--- a/doc/user/start.skb
+++ b/doc/user/start.skb
@@ -14,13 +14,12 @@
 ;*---------------------------------------------------------------------*/
 (chapter :title "Getting Started"
 
-(p [
-In this chapter, the syntax of a Skribe text is presented ,(emph "informally").
-In particular, the Skribe syntax is compared to the HTML syntax. Then,
-it is presented how one can use Skribe to make dynamic text
-(i.e texts which are generated by the system rather than entered-in by hand. 
-Finally, It is also
-presented how Skribe source files can be processed.])
+(p [ In this chapter, the syntax of a Skribe text is presented ,(emph
+"informally").  In particular, the Skribe syntax is compared to the HTML
+syntax. Then, it is presented how one can use Skribe to make dynamic
+text (i.e texts which are generated by the system rather than entered-in
+by hand).  Finally, It is also presented how Skribe source files can be
+processed.])
 
 ;*--- Hello world -----------------------------------------------------*/
 (section :title "Hello World!" [
diff --git a/doc/user/user.skb b/doc/user/user.skb
index 334dd5c..d5ed06b 100644
--- a/doc/user/user.skb
+++ b/doc/user/user.skb
@@ -36,7 +36,7 @@
 ;*---------------------------------------------------------------------*/
 ;*    The document                                                     */
 ;*---------------------------------------------------------------------*/
-(document :title "Skribe User Manual"
+(document :title "Skribilo User Manual"
    :env '((example-counter 0) (example-env ()))
    :author (list (author :name "Erick Gallesio"
 		    :affiliation "Université de Nice - Sophia Antipolis"
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)))))