Merge from skribilo@sv.gnu.org--2006

Patches applied:

 * lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2  (patch 100-109)

   - `base' engine: Fixed autoload issue.
   - Merge from skribilo@sv.gnu.org--2006/skribilo--devo--1.2
   - eq: Implemented equation numbering.
   - eq/lout: Use the new `@BypassNumber' option for numbered displays.
   - eq: Updated doc for `:number'.
   - eq/lout: Fixed spacing around in-line equations.

 * skribilo@sv.gnu.org--2006/skribilo--devo--1.2  (patch 60-121)

   - `base' engine: Fixed autoload issue.
   - evaluator: Modularized the evaluation process.
   - biblio: Adding missing `use-module'.
   - Added an experimental `diff' package.
   - `diff' package: Fixes and hacking.
   - `lout' engine: Skip lines in `color'.
   - `diff' package: Various fixes.
   - `eq' package: Added `eq:set'.
   - `diff' package: Use actual markups and writers.
   - Slightly optimized `make-string-replace'.
   - `diff' package: Compute diffs on selected options.
   - `diff' package: Preserve space around diff'd strings.
   - `diff' package: Handle commands appropriately.
   - `lout' engine: Fixed space handling with `color'.
   - `base' package: Introduced `breakable-space'.
   - doc: Documented spacing.
   - `diff' package: Use `breakable-space' instead of `~' in
     `annotated-string-diff'.
   - `diff' package: Fixed off-by-one in string diff.
   - biblio template: Small fix.
   - Added support for source location tracking.
   - Added source location tracking to various packages.
   - Moved legacy source location code to `compat'.
   - Reduced reliance on the debugging evaluator (improves performance).
   - Fixed computation of `&invocation-location'.
   - `diff' package: Added basic source location support.
   - Renamed module `(differ)' to `(diff)'.
   - Fixed `find-up'.
   - `eq' package: Properly handle auto-inlining.
   - `lncs' package: Fixed for non-LaTeX engines.
   - `eq' package: Added support for Lout's new `eq2'.
   - `diff': Included Aubrey Jaffer's fix for `diff:edits'.
   - Fixed `index'.
   - biblio: Implemented the `name+year' label style.
   - doc: Documented the `:labels' option of `the-bibliography'.
   - Resolve <command>s too.
   - eq/biblio: Small additions.
   - Fixed handling of figure numbering in `ref'.
   - Added support for Guile-Lint.
   - Started cleaning up packages using Guile-Lint.
   - Tiny Automake fix.
   - Removed useless file.
   - lib: Minor fixes that make Guile-Lint happy.
   - More package cleanups.
   - More linting.
   - Cleaned up the source code fontifiers (under `coloring').
   - Cleaned up the `biblio' modules.
   - Cleaned up the core modules.
   - Optimized `make-general-string-replace'.
   - Fixed location reporting for `verify' warnings.
   - Slight optimization/cleanup of AST traversal functions.
   - Added a `:&location' argument to `table'.
   - Switched all engines to a native Guile module.
   - Reduced dependency on `(skribilo module)'.
   - Lout engine: Work around bug with tables within floating figures.
   - Updated the top-level documentation files.
   - Fixed top-level Makefile.
   - lout engine: Export `lout-output-pdf-meta-info'.
   - `lncs' package: Prettified bibliography output.
   - eq: Implemented equation numbering.
   - eq/lout: Use the new `@BypassNumber' option for numbered displays.
   - eq: Updated doc for `:number'.
   - eq/lout: Fixed spacing around in-line equations.

git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-77

1 files changed, 6 insertions, 1 deletions

diff --git a/doc/user/eq.skb b/doc/user/eq.skb
index fb8c3ef..ff46b5c 100644
--- a/doc/user/eq.skb
+++ b/doc/user/eq.skb
@@ -1,6 +1,6 @@
 ;;; eq.skb  --  Equation formatting.
 ;;;
-;;; Copyright 2006  Ludovic Courtès <ludovic.courtes@laas.fr>
+;;; Copyright 2006, 2007  Ludovic Courtès <ludovic.courtes@laas.fr>
 ;;;
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
@@ -96,6 +96,11 @@ Otherwise, it should be a boolean indicating whether the equation is to
 appear "in-line", i.e., within a paragraph.  If the engine supports it,
 it may adjust various parameters such as in-equation spacing
 accordingly.])
+		    (:number [If true, then a number is automatically
+assigned to the equation and displayed.  If it is a string, then that
+string is used as the equation's number.  If ,(code [#f]), then the
+equation is left unnumbered.  Note that this option is only taken into
+account for displayed equations.])
 	            (:renderer [The engine that should be used to render
 the equation.  This allows, for instance, to use the Lout engine to
 render equations in HTML.])