about summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorLudovic Court`es2006-12-04 08:14:05 +0000
committerLudovic Court`es2006-12-04 08:14:05 +0000
commit434bc748f845dd776392fcf2a9762a509070e251 (patch)
tree2337a09576d1fef0dbfcdfb78b213057f06374ce /doc
parent571d41ac337819d4a5bbdbdb1f0c8f13c542059c (diff)
parentfedce06edf8768b927ca91fb22ade620ac77ec2a (diff)
downloadskribilo-434bc748f845dd776392fcf2a9762a509070e251.tar.gz
skribilo-434bc748f845dd776392fcf2a9762a509070e251.tar.lz
skribilo-434bc748f845dd776392fcf2a9762a509070e251.zip
Merge from skribilo@sv.gnu.org--2006
Patches applied:

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

   - Merge from skribilo@sv.gnu.org--2006/skribilo--devo--1.2
   - eq/lout: Fixed `limit'.
   - eq/lout: Improved typesetting of parentheses.
   - eq: Added support for `:mul-style'.
   - eq/lout: Fixed binomial coefficient.
   - eq: Support automatic detection of inlining.
   - doc: Updated the `eq' markup documentation.

 * skribilo@sv.gnu.org--2006/skribilo--devo--1.2  (patch 15-33)

   - Lout engine: Better cover sheet for `doc' documents.
   - outline reader: Support keywords.
   - lout: bib-ref+: Gracefully handle `unref' objects.
   - Introduced `markup-number-string'.
   - `base' package: Added `numref'.
   - doc: Documented `numref'.
   - Cleaned up `(skribilo biblio)' a bit.
   - eq:  Added the `:div-style' option.
   - doc: Documented `eq' and the `:div-style' option.
   - eq: Added `limit' and `combinations'.
   - eq: Properly handle operator precedence.
   - eq: Added `eq-display' and the `:align-with' option for `eq'.
   - doc: Augmented the `eq' doc, documented `eq-display'.
   - eq/lout: Fixed `limit'.
   - eq/lout: Improved typesetting of parentheses.
   - eq: Added support for `:mul-style'.
   - eq/lout: Fixed binomial coefficient.
   - eq: Support automatic detection of inlining.
   - doc: Updated the `eq' markup documentation.

git-archimport-id: lcourtes@laas.fr--2005-libre/skribilo--devo--1.2--patch-86
Diffstat (limited to 'doc')
-rw-r--r--doc/user/eq.skb11
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/user/eq.skb b/doc/user/eq.skb
index 1ef0208..fb8c3ef 100644
--- a/doc/user/eq.skb
+++ b/doc/user/eq.skb
@@ -90,13 +90,18 @@ particular operator. ]
 are summarized here:])
       
       (doc-markup 'eq
-	          `((:inline? [A boolean indicating whether the equation
-is to appear "inline", i.e., within a paragraph.  If the engine supports
-it, it may adjust various parameters such as in-equation spacing
+	          `((:inline? [If ,(code [auto]), Skribilo will
+automatically determine whether the equation is to be "in-line".
+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.])
 	            (: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.])
+	            (:mul-style [A symbol denoting the default style for
+multiplications.  This should be one of ,(code [space]), ,(code
+[cross]), ,(code [asterisk]) or ,(code [dot]).])
 	            (:div-style [A symbol denoting the default style for
 divisions.  This should be one of ,(code [over]), ,(code [fraction]),
 ,(code [div]) and ,(code [slash]).  Per-,(code [eq:/]) ,(code