(Embedded LaTeX): Fix typos and implement small improvements

	throughout this chapter.

diff --git a/man/org.texi b/man/org.texi
index cfd1db5ea282139addb21240b4cc470174a6ed42..26d0f25f90b0c6e385956f7cae9fcbf66b7ba57e 100644 (file)
--- a/man/org.texi
+++ b/man/org.texi
@@ -3,7 +3,7 @@
 @setfilename ../info/org
 @settitle Org Mode Manual
 
-@set VERSION 4.39
+@set VERSION 4.40
 @set DATE June 2006
 
 @dircategory Emacs
@@ -198,7 +198,7 @@ The weekly/daily agenda
 
 Embedded LaTeX
 
-* Math symbols::                TeX macros for symbols and greek letters
+* Math symbols::                TeX macros for symbols and Greek letters
 * Subscripts and Superscripts::  Simple syntax for raising/lowering text
 * LaTeX fragments::             Complex formulas made easy
 * Processing LaTeX fragments::  Previewing LaTeX processing
@@ -3372,7 +3372,7 @@ not necessary (but OK) to surround multi-character sub- and superscripts
 with curly braces.  For example
 
 @example
-The mass if the sun is M_sun = 1.989 x 10^30 kg.  The radius o
+The mass if the sun is M_sun = 1.989 x 10^30 kg.  The radius of
 the sun is R_@{sun@} = 6.96 x 10^8 m.
 @end example
 
@@ -3400,13 +3400,16 @@ snippets will be identified as LaTeX source code:
 @itemize @bullet
 @item
 Environments of any kind.  The only requirement is that the
-@code{\begin} statements appears on a new line, preceded by only
+@code{\begin} statement appears on a new line, preceded by only
 whitespace.
 @item
-Text within the usual La@TeX{} math delimiters.  Org-mode recognizes
-single @samp{$} characters as math delimiters only if they are directly
-attached to the surrounded text, with no whitespace in between.  For the
-other delimiters, there is no such restriction.
+Text within the usual La@TeX{} math delimiters.  To avoid conflicts with
+currency specifications, single @samp{$} characters are only recognized
+as math delimiters if the enclosed text contains at most two line breaks,
+is directly attached to the @samp{$} characters with no whitespace in
+between, and if the closing @samp{$} is followed by whitespace or
+punctuation.  For the other delimiters, there is no such restriction, so
+when in doubt, use @samp{\(...\)} as inline math delimiters.
 @end itemize
 
 @noindent For example:
@@ -3416,7 +3419,7 @@ other delimiters, there is no such restriction.
 x=\sqrt@{b@}                                % even tables, figures
 \end@{equation@}                            % etc
 
-If $a=\sqrt@{b@}$ and \( b=2 \), then the solution must be
+If $a^2=b$ and \( b=2 \), then the solution must be
 either $$ a=+\sqrt@{2@} $$ or \[ a=-\sqrt@{2@} \].
 @end example
 
@@ -3459,8 +3462,12 @@ setting is active:
 CDLaTeX-mode is a minor mode that is normally used in combination with a
 major LaTeX mode like AUCTeX in order to speed-up insertion of
 environments and math templates.  Inside Org-mode, you can make use of
-some of the features of cdlatex-mode by turning on a special minor mode
-with @code{M-x org-cdlatex-mode}.  You can also turn it on for all
+some of the features of cdlatex-mode.  You need to install
+@file{cdlatex.el} and @file{texmathp.el} (the latter comes also with
+AUCTeX) from @url{http://www.astro.uva.nl/~dominik/Tools/cdlatex}.
+Don't turn cdlatex-mode itself under Org-mode, but use the light
+version @code{org-cdlatex-mode} that comes as part of Org-mode.  Turn it
+on for the current buffer with @code{M-x org-cdlatex-mode}, or for all
 Org-mode files with
 
 @lisp
@@ -3476,8 +3483,8 @@ Environment templates can be inserted with @kbd{C-c @{}.
 @item
 @kindex @key{TAB}
 The @key{TAB} key will do template expansion if the cursor is inside a
-LaTeX fragment@footnote{Org-mode has a heuristic method to test if the
-cursor is inside such a fragment, see the documentation of the function
+LaTeX fragment@footnote{Org-mode has a method to test if the cursor is
+inside such a fragment, see the documentation of the function
 @code{org-inside-LaTeX-fragment-p}.}.  For example, @key{TAB} will
 expand @code{fr} to @code{\frac@{@}@{@}} and position the cursor
 correctly inside the first brace.  Another @key{TAB} will get you into
@@ -3485,8 +3492,7 @@ the second brace.  Even outside fragments, @key{TAB} will expand
 environment abbreviations at the beginning of a line.  For example, if
 you write @samp{equ} at the beginning of a line and press @key{TAB},
 this abbreviation will be expanded to an @code{equation} environment.
-To get a list of all abbreviations, type @kbd{M-x
-cdlatex-command-help}. 
+To get a list of all abbreviations, type @kbd{M-x cdlatex-command-help}.
 @item
 @kindex _
 @kindex ^
@@ -3570,8 +3576,8 @@ at a different level, specify it with a prefix argument.  For example,
 creates only top level headlines and does the rest as items.  When
 headlines are converted to items, the indentation of the text following
 the headline is changed to fit nicely under the item.  This is done with
-the assumption that the first bodyline indicates the base indenation of
-the body text.  Any indenation larger than this is adjusted to preserve
+the assumption that the first bodyline indicates the base indentation of
+the body text.  Any indentation larger than this is adjusted to preserve
 the layout relative to the first line.  Should there be lines with less
 indentation than the first, these are left alone.
 
@@ -4369,7 +4375,7 @@ what this means in different contexts.
 
 @itemize @minus
 @item
-If there are highlichts in the buffer from the creation of a sparse
+If there are highlights in the buffer from the creation of a sparse
 tree, or from clock display, remove these highlights.
 @item
 If the cursor is in one of the special @code{#+KEYWORD} lines, this
@@ -4838,6 +4844,8 @@ patched CSS formatting into the HTML exporter, and inspired the agenda.
 @i{Kai Grossjohann} pointed out key-binding conflicts caused by
 Org-mode.
 @item
+@i{Leon Liu} asked for embedded LaTeX and tested it.
+@item
 @i{Stefan Monnier} provided a patch to keep the Emacs-Lisp compiler
 happy.
 @item
@@ -4872,7 +4880,7 @@ other things.
 Linking to VM/BBDB/GNUS was inspired by @i{Tom Shannon}'s
 @file{organizer-mode.el}.
 @item
-@i{Daniel Sinder} came up with the idea of internal archiving my locking
+@i{Daniel Sinder} came up with the idea of internal archiving by locking
 subtrees.
 @item
 @i{David O'Toole} wrote @file{org-publish.el} and drafted the manual