[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo ChangeLog doc/texinfo.txi doc/.cvsignore
|
From: |
karl |
|
Subject: |
texinfo ChangeLog doc/texinfo.txi doc/.cvsignore |
|
Date: |
Sun, 13 Jan 2013 19:13:19 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: karl <karl> 13/01/13 19:13:19
Modified files:
. : ChangeLog
doc : texinfo.txi .cvsignore
Log message:
(Special Insertions): @ in node names
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1511&r2=1.1512
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.518&r2=1.519
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/.cvsignore?cvsroot=texinfo&r1=1.13&r2=1.14
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1511
retrieving revision 1.1512
diff -u -b -r1.1511 -r1.1512
--- ChangeLog 12 Jan 2013 16:56:40 -0000 1.1511
+++ ChangeLog 13 Jan 2013 19:13:18 -0000 1.1512
@@ -1,3 +1,14 @@
+2013-01-13 Karl Berry <address@hidden>
+
+ * doc/texinfo.txi (Special Insertions): node names with @,
+ restructure.
+
+ * po_document/LINGUAS (ja, es.us-ascii): remove.
+ * tp/maintain/regenerate_docstr.sh: shorten name of
+ regenerate_document_strings_make_rules.sh.
+ * tp/Makefile.docstr: shorten name of generated file, too.
+ * tp/Makefile.am: renames.
+
2013-01-12 Karl Berry <address@hidden>
* doc/texinfo.txi (Internationalization of Document Strings):
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -b -r1.518 -r1.519
--- doc/texinfo.txi 12 Jan 2013 16:56:41 -0000 1.518
+++ doc/texinfo.txi 13 Jan 2013 19:13:19 -0000 1.519
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.518 2013/01/12 16:56:41 karl Exp $
address@hidden $Id: texinfo.txi,v 1.519 2013/01/13 19:13:19 karl Exp $
@c Ordinarily, Texinfo files have the extension .texi. But texinfo.texi
@c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
@@ -431,30 +431,21 @@
Combining Indices
-* syncodeindex:: How to merge two indices, using @code{@@code}
+* @code{@@syncodeindex}:: How to merge two indices, using
@code{@@code}
font for the merged-from index.
-* synindex:: How to merge two indices, using the
+* @code{@@synindex}:: How to merge two indices, using the
roman font for the merged-from index.
Special Insertions
-* Special Characters:: Inserting @@ @address@hidden , \ #.
+* Special Characters:: Inserting @@ @address@hidden , \ #
* Inserting Quote Characters:: Inserting left and right quotes, in code.
-* Inserting Space:: How to insert the right amount of space
- within a sentence.
-* Inserting Accents:: How to insert accents and special characters.
-* Inserting Quotation Marks:: How to insert quotation marks.
-* Dots Bullets:: How to insert dots and bullets.
-* TeX and copyright:: How to insert the @TeX{} logo
- and the copyright symbol.
-* euro:: How to insert the Euro currency symbol.
-* pounds:: How to insert the pounds currency symbol.
-* textdegree:: How to insert the degrees symbol.
-* minus:: How to insert a minus sign.
-* geq leq:: How to insert greater/less-than-or-equal signs.
-* math:: How to format a mathematical expression.
-* Click Sequences:: Inserting GUI usage sequences.
-* Glyphs:: How to indicate results of evaluation,
+* Inserting Space:: Inserting the right amount of whitespace.
+* Inserting Accents:: Inserting accents and special characters.
+* Inserting Quotation Marks:: Inserting quotation marks.
+* Inserting Math:: Formatting mathematical expressions.
+* Glyphs for Text:: Inserting Dots, bullets, currencies, etc.
+* Glyphs for Programming:: Indicating results of evaluation,
expansion of macros, errors, etc.
Special Characters: Inserting @@ @address@hidden , \ #
@@ -470,29 +461,31 @@
* Multiple Spaces:: Inserting multiple spaces.
* Not Ending a Sentence:: Sometimes a . doesn't end a sentence.
* Ending a Sentence:: Sometimes it does.
-* frenchspacing:: Specifying end-of-sentence spacing.
-* dmn:: How to format a dimension.
-
-Inserting Ellipsis and Bullets
-
-* dots:: How to insert dots @dots{}
-* bullet:: How to insert a bullet.
+* @code{@@frenchspacing}:: Specifying end-of-sentence spacing.
+* @code{@@dmn}:: Formatting a dimension.
-Inserting @TeX{} and Legal Symbols: @copyright{}, @registeredsymbol{}
+Glyphs for Text
-* tex:: The @TeX{} logos.
-* copyright symbol:: The copyright symbol (c in a circle).
-* registered symbol:: The registered symbol (R in a circle).
+* @code{@@tex}:: The @TeX{} logos.
+* @code{@@copyright}:: The copyright symbol (c in a circle).
+* @code{@@registered}:: The registered symbol (R in a circle).
+* @code{@@dots}:: How to insert ellipses: @dots{} and
@enddots{}
+* @code{@@bullet}:: How to insert a bullet: @bullet{}
+* @code{@@pounds}:: How to insert the pounds currency symbol.
+* @code{@@textdegree}:: How to insert the degrees symbol.
+* @code{@@minus}:: How to insert a minus sign.
+* @code{@@geq @@leq}:: How to insert greater/less-than-or-equal
signs.
-Glyphs for Examples
+Glyphs for Programming
* Glyphs Summary::
-* result:: How to show the result of expression.
-* expansion:: How to indicate an expansion.
-* Print Glyph:: How to indicate printed output.
-* Error Glyph:: How to indicate an error message.
-* Equivalence:: How to indicate equivalence.
-* Point Glyph:: How to indicate the location of point.
+* @code{@@result}:: How to show the result of expression.
+* @code{@@expansion}:: How to indicate an expansion.
+* @code{@@print}:: How to indicate generated output.
+* @code{@@error}:: How to indicate an error message.
+* @code{@@equiv}:: How to indicate equivalence.
+* @code{@@point}:: How to indicate the location of point.
+* Click Sequences:: Inserting GUI usage sequences.
Forcing and Preventing Breaks
@@ -2908,9 +2901,8 @@
well always include them.
Any command that affects document formatting as a whole makes sense to
-include in the header. @code{@@synindex} (@pxref{synindex,,
address@hidden), for instance, is another command often included in
-the header.
+include in the header. @code{@@synindex} (@address@hidden@@synindex}}),
+for instance, is another command often included in the header.
Thus, the beginning of a Texinfo file generally looks approximately
like this:
@@ -10357,14 +10349,14 @@
@code{@@code}.
@menu
-* syncodeindex:: How to merge two indices, using @code{@@code}
+* @code{@@syncodeindex}:: How to merge two indices, using
@code{@@code}
font for the merged-from index.
-* synindex:: How to merge two indices, using the
+* @code{@@synindex}:: How to merge two indices, using the
roman font for the merged-from index.
@end menu
address@hidden syncodeindex
address@hidden @code{@@syncodeindex}
@subsection @code{@@syncodeindex}: Combining indices using @code{@@code}
@findex syncodeindex
@@ -10434,7 +10426,7 @@
@code{@@code} font as you would expect.
address@hidden synindex
address@hidden @code{@@synindex}
@subsection @code{@@synindex}: Combining indices
@findex synindex
@@ -10551,30 +10543,20 @@
@item The degrees symbol.
@item The minus sign.
@item Mathematical expressions.
address@hidden Glyphs for evaluation, macros, errors, etc.
address@hidden Glyphs for examples of programming: evaluation, macros, errors,
etc.
@item Footnotes.
address@hidden Images.
@end itemize
@end iftex
@menu
-* Special Characters:: Inserting @@ @address@hidden , \ #.
+* Special Characters:: Inserting @@ @address@hidden , \ #
* Inserting Quote Characters:: Inserting left and right quotes, in code.
-* Inserting Space:: How to insert the right amount of space
- within a sentence.
-* Inserting Accents:: How to insert accents and special characters.
-* Inserting Quotation Marks:: How to insert quotation marks.
-* Dots Bullets:: How to insert dots and bullets.
-* TeX and copyright:: How to insert the @TeX{} logo
- and the copyright symbol.
-* euro:: How to insert the Euro currency symbol.
-* pounds:: How to insert the pounds currency symbol.
-* textdegree:: How to insert the degrees symbol.
-* minus:: How to insert a minus sign.
-* geq leq:: How to insert greater/less-than-or-equal signs.
-* math:: How to format a mathematical expression.
-* Click Sequences:: Inserting GUI usage sequences.
-* Glyphs:: How to indicate results of evaluation,
+* Inserting Space:: Inserting the right amount of whitespace.
+* Inserting Accents:: Inserting accents and special characters.
+* Inserting Quotation Marks:: Inserting quotation marks.
+* Inserting Math:: Formatting mathematical expressions.
+* Glyphs for Text:: Inserting Dots, bullets, currencies, etc.
+* Glyphs for Programming:: Indicating results of evaluation,
expansion of macros, errors, etc.
@end menu
@@ -10622,11 +10604,12 @@
@node Inserting Braces
@subsection Inserting address@hidden address@hidden' with @code{@@@{ @@@}} and
@code{@@l address@hidden@}}
address@hidden Braces, inserting
+
@findex @{ @r{(literal @address@hidden)}
@findex @} @r{(literal @address@hidden)}
@findex @@address@hidden@} @r{(literal @address@hidden)}
@findex @@address@hidden@} @r{(literal @address@hidden)}
address@hidden Braces, inserting
@code{@@@{} produces a single @address@hidden in the output, and @code{@@@}}
produces a single @address@hidden Do not put braces after either an
@@ -10642,8 +10625,9 @@
@node Inserting a Comma
@subsection Inserting `,' with @code{@@address@hidden@}}
address@hidden Comma, inserting
+
@findex comma
address@hidden Comma, inserting
Ordinarily, a comma `,' is a normal character that can be simply typed
in your input where you need it.
@@ -10674,8 +10658,9 @@
@node Inserting a Backslash
@subsection Inserting `\' with @code{@@address@hidden@}}
address@hidden Backslash, inserting
+
@findex backslash
address@hidden Backslash, inserting
Ordinarily, a backslash `\' is a normal character in Texinfo that can
be simply typed in your input where you need it. The result is to
@@ -10695,9 +10680,9 @@
@end example
Texinfo documents may also use \ as a command character inside
address@hidden@@math} (@xref{math},, @code{@@math}). In this case, @code{@@\}
-or @code{\backslash} produces a ``math'' backslash (from the math
-symbol font), while @code{@@address@hidden@}} produces a typewriter
address@hidden@@math} (@pxref{Inserting Math}). In this case, @code{@@\} or
address@hidden produces a ``math'' backslash (from the math symbol
+font), while @code{@@address@hidden@}} produces a typewriter
backslash as usual.
Although @samp{@@address@hidden@}} can be used nearly anywhere, there
@@ -10706,6 +10691,7 @@
@node Inserting a Hashsign
@subsection Inserting `#' with @code{@@address@hidden@}}
+
@findex @@address@hidden@} @r{(literal @samp{#})}
@cindex Inserting #
@cindex Hash sign, inserting
@@ -10804,8 +10790,8 @@
* Multiple Spaces:: Inserting multiple spaces.
* Not Ending a Sentence:: Sometimes a . doesn't end a sentence.
* Ending a Sentence:: Sometimes it does.
-* frenchspacing:: Specifying end-of-sentence spacing.
-* dmn:: How to format a dimension.
+* @code{@@frenchspacing}:: Specifying end-of-sentence spacing.
+* @code{@@dmn}:: Formatting a dimension.
@end menu
@@ -10970,8 +10956,10 @@
ends the sentence; there is no need to use @code{@@.}.
address@hidden frenchspacing
address@hidden @code{@@frenchspacing}
@subsection @code{@@frenchspacing} @var{val}: Control Sentence Spacing
+
address@hidden@c old name
@findex frenchspacing
@cindex French spacing
@cindex Sentences, spacing after
@@ -11013,8 +11001,10 @@
Formats}).
address@hidden dmn
address@hidden @code{@@dmn}
@subsection @code{@@address@hidden@address@hidden: Format a Dimension
+
address@hidden@c old name
@cindex Thin space between number, dimension
@cindex Dimension formatting
@cindex Format a dimension
@@ -11355,88 +11345,118 @@
@end example
address@hidden Dots Bullets
address@hidden Inserting Ellipsis and Bullets
address@hidden Typesetting ellipses and bullets
-
-An @dfn{ellipsis} (a line of dots) would be spaced wrong when typeset
-as a string of periods, so a special command is used for ellipsis in
-Texinfo. The @code{@@bullet} command is special, too.
-
-Each of these commands is followed by a pair of braces, @address@hidden@}},
-without any whitespace between the name of the command and the braces.
-(You need to use braces with these commands because you can use them
-next to other text; without the braces, the formatters would be
-confused. @xref{Command Syntax, , @@-Command Syntax}.)
-
address@hidden
-* dots:: How to insert dots @dots{}
-* bullet:: How to insert a bullet.
address@hidden menu
-
address@hidden Inserting Math
address@hidden @code{@@math}: Inserting Mathematical Expressions
address@hidden dots
address@hidden @code{@@address@hidden@} (@dots{}) and @code{@@address@hidden@}
(@enddots{})
address@hidden@c old name
address@hidden math
address@hidden Mathematical expressions, inserting
address@hidden Formulas, mathematical
address@hidden dots
address@hidden enddots
address@hidden Inserting dots
address@hidden Inserting ellipsis
address@hidden Dots, inserting
address@hidden Ellipsis, inserting
+You can write a short mathematical expression with the @code{@@math}
+command. Write the mathematical expression between braces, like this:
-Use the @code{@@address@hidden@}} command to generate an ellipsis, which is
-three dots in a row, appropriately spaced @dots{} like so. Do
-not simply write three periods in the input file; that would work for
-the Info file output, but would produce the wrong amount of space
-between the periods in the printed manual.
-
-Similarly, the @code{@@address@hidden@}} command generates an
-end-of-sentence ellipsis, which has different spacing afterwards,
address@hidden Look closely to see the difference.
address@hidden
+@@address@hidden(a + b)(a + b) = a^2 + 2ab + address@hidden
address@hidden example
@iftex
-Here is an ellipsis: @dots{}
-Here are three periods in a row: ...
address@hidden This produces the following in @TeX{}:
+
address@hidden
address@hidden(a + b)(a + b) = a^2 + 2ab + b^2}
address@hidden display
-In printed output, the three periods in a row are much closer together than
-the dots in the ellipsis.
address@hidden and the following in other formats:
@end iftex
address@hidden
address@hidden This produces the following in Info and HTML:
address@hidden ifnottex
address@hidden
+(a + b)(a + b) = a^2 + 2ab + b^2
address@hidden example
address@hidden bullet
address@hidden @code{@@address@hidden@} (@bullet{})
+The @code{@@math} command has no special effect on the Info and HTML
+output. @command{makeinfo} expands any @@-commands as usual,
+but it does not try to produce good mathematical formatting in any
+way.
address@hidden bullet
+However, as far as the @TeX{} output is concerned, plain @TeX{}
+mathematical commands are allowed in @code{@@math}, starting with
address@hidden, and the plain @TeX{} math characters like @samp{^} and
address@hidden are also recognized. In essence, @code{@@math} drops you
+into plain @TeX{} math mode.
-Use the @code{@@address@hidden@}} command to generate a large round dot, or
-the closest possible thing to one. In Info, an asterisk is used.
+This allows you to conveniently write superscripts and subscripts (as
+in the above example), and also to use all the plain @TeX{} math
+control sequences for symbols, functions, and so on, and thus get
+proper formatting in the @TeX{} output, at least.
-Here is a bullet: @bullet{}
+It's best to use @samp{\} instead of @samp{@@} for any such
+mathematical commands; otherwise, @command{makeinfo} will complain.
+On the other hand, @command{makeinfo} allows input with matching (but
+unescaped) braces, such as @address@hidden@}}, although it complains
+about such bare braces in regular input.
-When you use @code{@@bullet} in @code{@@itemize}, you do not need to
-type the braces, because @code{@@itemize} supplies them.
-(@address@hidden@@itemize}}).
+Here's an example:
+
address@hidden
+@@address@hidden 2\pi \equiv \cos address@hidden
address@hidden example
+
address@hidden
address@hidden which looks like this in @TeX{}:
address@hidden
address@hidden 2\pi \equiv \cos 3\pi}
address@hidden display
+
address@hidden and
address@hidden iftex
address@hidden which looks like the input in Info and HTML:
address@hidden
+\sin 2\pi \equiv \cos 3\pi
address@hidden example
+
address@hidden \ @r{(literal \ in @code{@@math})}
+Since @samp{\} is an escape character inside @code{@@math}, you can
+use @code{@@\} to get a literal backslash (@code{\\} will work in
address@hidden, but you'd get the literal two characters @samp{\\} in Info).
address@hidden@@\} is not defined outside of @code{@@math}, since a @samp{\}
+ordinarily produces a literal (typewriter) @samp{\}. You can also use
address@hidden@@address@hidden@}} in any mode to get a typewriter backslash.
address@hidden a Backslash}.
+
address@hidden Displayed equations
address@hidden Equations, displayed
+For displayed equations, you must at present use @TeX{} directly
+(@pxref{Raw Formatter Commands}).
address@hidden TeX and copyright
address@hidden Inserting @TeX{} and Legal Symbols: @copyright{},
@registeredsymbol{}
address@hidden Glyphs for Text
address@hidden Glyphs for Text
-The logo address@hidden' is typeset in a special fashion and it needs an
-@@-command. The copyright and registered symbols, address@hidden' and
address@hidden', is also special. Each of these commands is
-followed by a pair of braces, @address@hidden@}}, without any whitespace
-between the name of the command and the braces.
address@hidden Glyphs for text
address@hidden Textual glyphs
@menu
-* tex:: The @TeX{} logos.
-* copyright symbol:: The copyright symbol (c in a circle).
-* registered symbol:: The registered symbol (R in a circle).
+* @code{@@TeX @@LaTeX}:: The @TeX{} logos.
+* @code{@@copyright}:: The copyright symbol (c in a circle).
+* @code{@@registered}:: The registered symbol (R in a circle).
+* @code{@@dots}:: How to insert ellipses: @dots{} and
@enddots{}
+* @code{@@bullet}:: How to insert a bullet: @bullet{}
+* @code{@@euro}:: How to insert the euro currency symbol.
+* @code{@@pounds}:: How to insert the pounds currency symbol.
+* @code{@@textdegree}:: How to insert the degrees symbol.
+* @code{@@minus}:: How to insert a minus sign.
+* @code{@@geq @@leq}:: How to insert greater/less-than-or-equal
signs.
@end menu
address@hidden tex
address@hidden @code{@@TeX @@LaTeX}
@subsection @code{@@address@hidden@} (@TeX{}) and @code{@@address@hidden@}
(@LaTeX{})
+
address@hidden@c old name
@findex TeX
@findex LaTeX
@cindex Logos, @TeX{}
@@ -11454,22 +11474,29 @@
@TeX{}, very loosely analogous to Texinfo in that it emphasizes
logical structure, but much (much) larger.)
-The spelling of these commands are unusual among Texinfo commands in
-that they use both uppercase and lowercase letters.
+The spelling of these commands are unusual for Texinfo, in that they
+use both uppercase and lowercase letters.
address@hidden copyright symbol
address@hidden @code{@@copyright}
@subsection @code{@@address@hidden@}} (@copyright{})
+
address@hidden address@hidden old name
@findex copyright
@cindex Copyright symbol
Use the @code{@@address@hidden@}} command to generate the copyright
-symbol, address@hidden'. Where possible, this is a @samp{c}
-inside a circle; in Info, this is @samp{(C)}.
+symbol, address@hidden'. Where possible, this is a @samp{c} inside a
+circle; in Info, this is @samp{(C)}.
+
+Legally, it's not necessary to use the copyright symbol; the English
+word `Copyright' suffices, according to international treaty.
address@hidden registered symbol
address@hidden @code{@@registered}
@subsection @code{@@address@hidden@}} (@registeredsymbol{})
+
address@hidden address@hidden old name
@findex registeredsymbol
@cindex Registered symbol
@@ -11478,8 +11505,57 @@
@samp{R} inside a circle; in Info, this is @samp{(R)}.
address@hidden euro
address@hidden @code{@@address@hidden@} (@euro{}): Euro Currency Symbol
address@hidden @code{@@dots}
address@hidden @code{@@dots} (@dots{}) and @code{@@enddots} (@enddots{})
+
address@hidden@c old name
address@hidden dots
address@hidden enddots
address@hidden Inserting dots
address@hidden Inserting ellipsis
address@hidden Dots, inserting
address@hidden Ellipsis, inserting
+
address@hidden address@hidden old name
+
+An @dfn{ellipsis} (a sequence of dots) would be spaced wrong when
+typeset as a string of periods, so a special command is used in
+Texinfo: use the @code{@@address@hidden@}} command to generate a normal
+ellipsis, which is three dots in a row, appropriately spaced @dots{}
+like so. To emphasize: do not simply write three periods in the input
+file; that would work for the Info file output, but would produce the
+wrong amount of space between the periods in the printed manual.
+
+The @code{@@address@hidden@}} command generates an end-of-sentence
+ellipsis, which also has three dots, but with different spacing
+afterwards, @enddots{} Look closely to see the difference.
+
+Here is an ellipsis: @dots{}
+Here are three periods in a row: ...
+
+In printed (and usually HTML) output, the three periods in a row are
+much closer together than the dots in the ellipsis.
+
+
address@hidden @code{@@bullet}
address@hidden @code{@@bullet} (@bullet{})
+
address@hidden@c old name
address@hidden bullet
+
+Use the @code{@@address@hidden@}} command to generate a large round dot, or
+the closest possible thing to one. In Info, an asterisk is used.
+Here is a bullet: @bullet{}
+
+When you use @code{@@bullet} in @code{@@itemize}, you do not need to
+type the braces, because @code{@@itemize} supplies them.
+(@address@hidden@@itemize}}).
+
+
address@hidden @code{@@euro}
address@hidden @code{@@euro} (@euro{}): Euro Currency Symbol
+
address@hidden@c old name
@findex euro
@cindex Euro symbol
@@ -11489,8 +11565,8 @@
Texinfo cannot magically synthesize support for the Euro symbol where
the underlying system (fonts, software, whatever) does not support it.
-Therefore, in many cases it is preferable to use the word ``Euro''.
-(In banking contexts, the abbreviation for the Euro is EUR.)
+Therefore, you may find it preferable to use the word ``Euro''. (In
+banking contexts, the abbreviation for the Euro is EUR.)
@cindex ISO 8859-15, and Euro
@cindex Latin 9, and Euro
@@ -11512,8 +11588,10 @@
instructions.
address@hidden pounds
address@hidden @code{@@address@hidden@} (@pounds{}): Pounds Sterling
address@hidden @code{@@pounds}
address@hidden @code{@@pounds} (@pounds{}): Pounds Sterling
+
address@hidden@c old name
@findex pounds
@cindex Pounds symbol
@@ -11522,8 +11600,10 @@
Otherwise, it is @samp{#}.
address@hidden textdegree
address@hidden @code{@@address@hidden@} (@textdegree{}): Degrees Symbol
address@hidden @code{@@textdegree}
address@hidden @code{@@textdegree} (@textdegree{}): Degrees Symbol
+
address@hidden@c old name
@findex textdegree
@cindex Degree symbol
@@ -11532,8 +11612,10 @@
it is an @samp{o}.
address@hidden minus
address@hidden @code{@@address@hidden@} (@minus{}): Inserting a Minus Sign
address@hidden @code{@@minus}
address@hidden @code{@@minus} (@minus{}): Inserting a Minus Sign
+
address@hidden@c old name
@findex minus
@cindex Minus sign
@@ -11564,9 +11646,16 @@
in an itemized list, you do not need to type the braces
(@address@hidden@@itemize}}).
+If you actually want to typeset some math that does a subtraction, it
+is better to use @code{@@math}. Then the regular @samp{-} character
+produces a minus sign, as in @code{@@address@hidden@}} (@pxref{Inserting
+Math}).
+
+
address@hidden @code{@@geq @@leq}
address@hidden @code{@@geq} (@geq{}) and @code{@@leq} (@leq{}): Inserting
Relations
address@hidden geq leq
address@hidden @code{@@address@hidden@}} (@geq{}) and @code{@@address@hidden@}}
(@leq{}): Inserting Relations
address@hidden address@hidden old name
@findex geq
@findex leq
@@ -11576,146 +11665,12 @@
@samp{>=} and @samp{<=} are output.
address@hidden math
address@hidden @code{@@math}: Inserting Mathematical Expressions
address@hidden math
address@hidden Mathematical expressions, inserting
address@hidden Formulas, mathematical
-
-You can write a short mathematical expression with the @code{@@math}
-command. Write the mathematical expression between braces, like this:
-
address@hidden
-@@address@hidden(a + b)(a + b) = a^2 + 2ab + address@hidden
address@hidden example
-
address@hidden
address@hidden This produces the following in @TeX{}:
-
address@hidden
address@hidden(a + b)(a + b) = a^2 + 2ab + b^2}
address@hidden display
-
address@hidden and the following in other formats:
address@hidden iftex
address@hidden
address@hidden This produces the following in Info and HTML:
address@hidden ifnottex
-
address@hidden
-(a + b)(a + b) = a^2 + 2ab + b^2
address@hidden example
-
-The @code{@@math} command has no special effect on the Info and HTML
-output. @command{makeinfo} expands any @@-commands as usual,
-but it does not try to produce good mathematical formatting in any
-way.
-
-However, as far as the @TeX{} output is concerned, plain @TeX{}
-mathematical commands are allowed in @code{@@math}, starting with
address@hidden, and the plain @TeX{} math characters like @samp{^} and
address@hidden are also recognized. In essence, @code{@@math} drops you
-into plain @TeX{} math mode.
-
-This allows you to conveniently write superscripts and subscripts (as
-in the above example), and also to use all the plain @TeX{} math
-control sequences for symbols, functions, and so on, and thus get
-proper formatting in the @TeX{} output, at least.
-
-It's best to use @samp{\} instead of @samp{@@} for any such
-mathematical commands; otherwise, @command{makeinfo} will complain.
-On the other hand, @command{makeinfo} allows input with matching (but
-unescaped) braces, such as @address@hidden@}}, although it complains
-about such bare braces in regular input.
-
-Here's an example:
-
address@hidden
-@@address@hidden 2\pi \equiv \cos address@hidden
address@hidden example
-
address@hidden
address@hidden which looks like this in @TeX{}:
address@hidden
address@hidden 2\pi \equiv \cos 3\pi}
address@hidden display
-
address@hidden and
address@hidden iftex
address@hidden which looks like the input in Info and HTML:
address@hidden
-\sin 2\pi \equiv \cos 3\pi
address@hidden example
-
address@hidden \ @r{(literal \ in @code{@@math})}
-Since @samp{\} is an escape character inside @code{@@math}, you can
-use @code{@@\} to get a literal backslash (@code{\\} will work in
address@hidden, but you'd get the literal two characters @samp{\\} in Info).
address@hidden@@\} is not defined outside of @code{@@math}, since a @samp{\}
-ordinarily produces a literal (typewriter) @samp{\}. You can also use
address@hidden@@address@hidden@}} in any mode to get a typewriter backslash.
address@hidden a Backslash}.
-
address@hidden Displayed equations
address@hidden Equations, displayed
-For displayed equations, you must at present use @TeX{} directly
-(@pxref{Raw Formatter Commands}).
-
-
address@hidden Click Sequences
address@hidden Click Sequences
address@hidden Click sequences
address@hidden Sequence of clicks
address@hidden GUI click sequence
-
address@hidden clicksequence
-When documenting graphical interfaces, it is necessary to describe
-sequences such as `Click on @samp{File}, then choose @samp{Open}, then
address@hidden'. Texinfo offers commands @code{@@clicksequence} and
address@hidden to represent this, typically used like this:
-
address@hidden
address@hidden @@address@hidden @@address@hidden@} address@hidden @dots{}
address@hidden example
-
address@hidden
-which produces:
-
address@hidden
address@hidden @clicksequence{File @click{} Open} @dots{}
address@hidden display
-
address@hidden click
address@hidden arrow
-The @code{@@click} command produces a right arrow by default; this
-glyph is also available independently via the command
address@hidden@@address@hidden@}}.
-
address@hidden clickstyle
-You can change the glyph produced by @code{@@click} with the command
address@hidden@@clickstyle}, which takes a command name as its single argument
-on the rest of the line, much like @code{@@itemize} and friends
-(@address@hidden@@itemize}}). The command should produce a glyph, and
-the usual empty braces @address@hidden@}} are omitted. Here's an example:
-
address@hidden
-@@clickstyle @@result
address@hidden @@address@hidden @@address@hidden@} address@hidden @dots{}
address@hidden example
-
address@hidden
-now produces:
-
address@hidden
address@hidden @result
address@hidden @clicksequence{File @click{} Open} @dots{}
address@hidden display
-
address@hidden Glyphs for Programming
address@hidden Glyphs for Programming
address@hidden Glyphs
address@hidden Glyphs for Examples
address@hidden Glyphs
address@hidden Glyphs for programming
@cindex Examples, glyphs for
address@hidden Programming, glyphs for
In Texinfo, code is often illustrated in examples that are delimited
by @code{@@example} and @code{@@end example}, or by @code{@@lisp} and
@@ -11723,7 +11678,7 @@
evaluation or an expansion using @address@hidden or
@address@hidden Likewise, there are commands to insert glyphs to
indicate printed output, error messages, equivalence of expressions,
-and the location of point in an editor.
+the location of point in an editor, and GUI operation sequences.
The glyph-insertion commands do not need to be used within an example,
but most often they are. All glyph-insertion commands are followed by
@@ -11731,12 +11686,13 @@
@menu
* Glyphs Summary::
-* result:: How to show the result of expression.
-* expansion:: How to indicate an expansion.
-* Print Glyph:: How to indicate printed output.
-* Error Glyph:: How to indicate an error message.
-* Equivalence:: How to indicate equivalence.
-* Point Glyph:: How to indicate the location of point.
+* @code{@@result}:: How to show the result of expression.
+* @code{@@expansion}:: How to indicate an expansion.
+* @code{@@print}:: How to indicate generated output.
+* @code{@@error}:: How to indicate an error message.
+* @code{@@equiv}:: How to indicate equivalence.
+* @code{@@point}:: How to indicate the location of point.
+* Click Sequences:: Inserting GUI usage sequences.
@end menu
@@ -11747,32 +11703,39 @@
@table @asis
@item @result{}
address@hidden@@address@hidden@}} points to the result of an expression.
address@hidden@@address@hidden@}} indicates the result of an expression.
@item @expansion{}
address@hidden@@address@hidden@}} shows the results of a macro expansion.
address@hidden@@address@hidden@}} indicates the results of a macro expansion.
@item @print{}
@code{@@address@hidden@}} indicates printed output.
@item @error{}
address@hidden@@address@hidden@}} indicates that the following text is an error
message.
address@hidden@@address@hidden@}} indicates the following text is an error
message.
@item @equiv{}
@code{@@address@hidden@}} indicates the exact equivalence of two forms.
@item @point{}
@code{@@address@hidden@}} shows the location of point.
+
address@hidden @clicksequence{A @click{} B}
address@hidden@@address@hidden @@address@hidden@} B} indicates a GUI operation
+sequence: first A, then clicking B, or choosing B from a menu, or
+otherwise selecting it.
@end table
address@hidden result
address@hidden @code{@@address@hidden@}} (@result{}): Indicating Evaluation
address@hidden @code{@@result}
address@hidden @code{@@address@hidden@}} (@result{}): Result of an Expression
+
address@hidden@c old name
address@hidden result
@cindex Result of an expression
@cindex Indicating evaluation
@cindex Evaluation glyph
@cindex Value of an expression, indicating
address@hidden result
Use the @code{@@address@hidden@}} command to indicate the result of
evaluating an expression.
@@ -11792,8 +11755,10 @@
may be read as address@hidden(cdr '(1 2 3))} evaluates to @code{(2 3)}''.
address@hidden expansion
address@hidden @code{@@expansion}
@subsection @code{@@address@hidden@}} (@expansion{}): Indicating an Expansion
+
address@hidden@c old name
@cindex Expansion, indicating
@cindex Macro expansion, indicating
@findex expansion
@@ -11843,13 +11808,16 @@
@code{@@address@hidden@}} and @code{@@address@hidden@}} commands are indented.
address@hidden Print Glyph
address@hidden @code{@@address@hidden@}} (@print{}): Indicating Printed Output
address@hidden Printed output, indicating
address@hidden @code{@@print}
address@hidden @code{@@address@hidden@}} (@print{}): Indicating Generated Output
+
address@hidden address@hidden old name
@findex print
address@hidden Printed output, indicating
-Sometimes an expression will print output during its execution. You
-can indicate the printed output with the @code{@@address@hidden@}} command.
+Sometimes an expression will generate output during its execution.
+You can indicate such displayed output with the @code{@@address@hidden@}}
+command.
The @code{@@address@hidden@}} command is displayed as @address@hidden, either
a horizontal dash butting against a vertical bar or (when that is not
@@ -11883,8 +11851,10 @@
@end lisp
address@hidden Error Glyph
address@hidden @code{@@error}
@subsection @code{@@address@hidden@}} (@error{}): Indicating an Error Message
+
address@hidden address@hidden old name
@cindex Error message, indicating
@findex error
@@ -11922,11 +11892,13 @@
Wrong type argument: integer-or-marker-p, x
@end lisp
address@hidden@error{}} itself is not part of the error message.
+The word @address@hidden itself is not part of the error message.
address@hidden Equivalence
address@hidden @code{@@equiv}
@subsection @code{@@address@hidden@}} (@equiv{}): Indicating Equivalence
+
address@hidden@c oldname
@cindex Equivalence, indicating
@findex equiv
@@ -11957,8 +11929,10 @@
identical results to evaluating @code{(list 'keymap)}.
address@hidden Point Glyph
address@hidden @code{@@point}
@subsection @code{@@address@hidden@}} (@point{}): Indicating Point in a Buffer
+
address@hidden address@hidden old name
@cindex Point, indicating in a buffer
@findex point
@@ -12016,6 +11990,57 @@
@end example
address@hidden Click Sequences
address@hidden Click Sequences
+
address@hidden Click sequences
address@hidden Sequence of clicks
address@hidden GUI click sequence
+
address@hidden clicksequence
+When documenting graphical interfaces, it is necessary to describe
+sequences such as `Click on @samp{File}, then choose @samp{Open}, then
address@hidden'. Texinfo offers commands @code{@@clicksequence} and
address@hidden to represent this, typically used like this:
+
address@hidden
address@hidden @@address@hidden @@address@hidden@} address@hidden @dots{}
address@hidden example
+
address@hidden
+which produces:
+
address@hidden
address@hidden @clicksequence{File @click{} Open} @dots{}
address@hidden display
+
address@hidden click
address@hidden arrow
+The @code{@@click} command produces a right arrow by default; this
+glyph is also available independently via the command
address@hidden@@address@hidden@}}.
+
address@hidden clickstyle
+You can change the glyph produced by @code{@@click} with the command
address@hidden@@clickstyle}, which takes a command name as its single argument
+on the rest of the line, much like @code{@@itemize} and friends
+(@address@hidden@@itemize}}). The command should produce a glyph, and
+the usual empty braces @address@hidden@}} are omitted. Here's an example:
+
address@hidden
+@@clickstyle @@result
address@hidden @@address@hidden @@address@hidden@} address@hidden @dots{}
address@hidden example
+
address@hidden
+now produces:
+
address@hidden
address@hidden @result
address@hidden @clicksequence{File @click{} Open} @dots{}
address@hidden display
+
+
@node Breaks
@chapter Forcing and Preventing Breaks
@@ -14553,7 +14578,7 @@
@command{makeinfo} will accept anything consisting of alphanumerics,
and (except as the first character) @samp{-}. The @samp{_} character
is excluded so that macros can be called inside @code{@@math} without
-a following space (@pxref{math,,@code{@@math}}).
+a following space (@pxref{Inserting Math}).
If a macro needs no parameters, you can define it either with an empty
list (@samp{@@macro foo @address@hidden) or with no braces at all
(@samp{@@macro
@@ -16188,7 +16213,7 @@
@pindex address@hidden, installing}
@cindex Euro font, installing
If you intend to use the @code{@@euro} command, you should install the
-Euro font, if it is not already installed. @xref{euro}.
+Euro font, if it is not already installed. @address@hidden@@euro}}.
@pindex texinfo.cnf @r{installation}
@cindex Customizing of @TeX{} for Texinfo
@@ -19997,7 +20022,7 @@
@itemx @@address@hidden@}
Insert a backslash, @samp{\}; @code{@@address@hidden@}} works
anywhere, while @code{@@\} works only inside @code{@@math}.
address@hidden a Backslash}, and @ref{math,,@code{math}}.
address@hidden a Backslash}, and @ref{Inserting Math}.
@item @@^
@itemx @@`
@@ -20097,7 +20122,7 @@
@item @@address@hidden@}
Generate a large round dot, @bullet{} (@samp{*} in Info). Often used
-with @code{@@table}. @xref{bullet, , @code{@@bullet}}.
+with @code{@@table}. @address@hidden@@bullet}}.
@item @@bye
Stop formatting a file. The formatters do not see anything in the
@@ -20371,7 +20396,7 @@
@item @@address@hidden@address@hidden
Format a unit of measure, as in address@hidden Causes @TeX{} to insert a
thin space before @var{dimension}. No effect in Info.
address@hidden, , @code{@@dmn}}.
address@hidden@code{@@dmn}}.
@item @@docbook
Enter Docbook completely. Pair with @code{@@end docbook}. @xref{Raw
@@ -20399,7 +20424,7 @@
@item @@address@hidden@}
Generate an ellipsis, @address@hidden
address@hidden, , @code{@@dots}}.
address@hidden@code{@@dots}}.
@item @@address@hidden@var{address}[, @address@hidden
Indicate an electronic mail address.
@@ -20415,7 +20440,7 @@
@item @@address@hidden@}
Generate an end-of-sentence ellipsis, like this: @enddots{}
address@hidden,,@code{@@address@hidden@}}}.
address@hidden@code{@@dots}}.
@item @@enumerate address@hidden
Begin a numbered list, using @code{@@item} for each entry.
@@ -20428,11 +20453,11 @@
@item @@address@hidden@}
Indicate to the reader the exact equivalence of two forms with a
-glyph: @address@hidden @xref{Equivalence}.
+glyph: @address@hidden @address@hidden@@equiv}}.
@item @@address@hidden@}
Indicate to the reader with a glyph that the following text is
-an error message: @address@hidden @xref{Error Glyph}.
+an error message: @address@hidden @address@hidden@@error}}.
@item @@address@hidden@address@hidden
Report @var{msg} as an error to standard error, and exit unsuccessfully.
@@ -20440,8 +20465,7 @@
@xref{Conditionals}, and @ref{External Macro Processors}.
@item @@address@hidden@}
-Generate the Euro currency sign.
address@hidden,,@code{@@address@hidden@}}}.
+Generate the Euro currency sign. @address@hidden@@euro}}.
@item @@evenfooting address@hidden @@| address@hidden @@| address@hidden
@itemx @@evenheading address@hidden @@| address@hidden @@| address@hidden
@@ -20470,8 +20494,7 @@
@item @@address@hidden@}
Indicate the result of a macro expansion to the reader with a special
-glyph: @address@hidden
address@hidden, , @expansion{} Indicating an Expansion}.
+glyph: @address@hidden @address@hidden@@expansion}}.
@item @@address@hidden@address@hidden
Highlight the name of a file, buffer, node, directory, etc. @xref{file, ,
@@ -20520,8 +20543,7 @@
Pair with @code{@@end format}. @xref{example,, @code{@@example}}.
@item @@frenchspacing @var{on-off}
-Control spacing after punctuation. @xref{frenchspacing,,
address@hidden@@frenchspacing}}.
+Control spacing after punctuation. @address@hidden@@frenchspacing}}.
@item @@ftable @var{formatting-command}
Begin a two-column table, using @code{@@item} for each entry.
@@ -20530,7 +20552,7 @@
@code{@@table}, except for indexing. @address@hidden@@ftable @@vtable}}.
@item @@address@hidden@}
-Generate a greater-than-or-equal sign, address@hidden'. @xref{geq leq}.
+Generate a greater-than-or-equal sign, address@hidden'. @address@hidden@@geq
@@leq}}.
@item @@group
Disallow page breaks within following text. Pair with @code{@@end
@@ -20721,7 +20743,7 @@
Generate the @LaTeX{} logo. @xref{tex, , @TeX{} and @LaTeX{}}.
@item @@address@hidden@}
-Generate a less-than-or-equal sign, address@hidden'. @xref{geq leq}.
+Generate a less-than-or-equal sign, address@hidden'. @address@hidden@@geq
@@leq}}.
@item @@lisp
Begin an example of Lisp code. Indent text, do not fill, and select
@@ -20747,15 +20769,14 @@
@@chapheading}}.
@item @@address@hidden@address@hidden
-Format a mathematical expression.
address@hidden, , @code{@@math}: Inserting Mathematical Expressions}.
+Format a mathematical expression. @xref{Inserting Math}.
@item @@menu
Mark the beginning of a menu of nodes. No effect in a printed manual.
Pair with @code{@@end menu}. @xref{Menus}.
@item @@address@hidden@}
-Generate a minus sign, address@hidden'. @xref{minus, , @code{@@minus}}.
+Generate a minus sign, address@hidden'. @address@hidden@@minus}}.
@item @@multitable @var{column-width-spec}
Begin a multi-column table. Begin each row with @code{@@item} or
@@ -20830,21 +20851,20 @@
the Entries of an Index}.
@item @@address@hidden@}
-Indicate the position of point in a buffer to the reader with a
-glyph: @address@hidden @xref{Point Glyph, , Indicating
-Point in a Buffer}.
+Indicate the position of point in a buffer to the reader with a glyph:
address@hidden@point{}}. @address@hidden@@point}}.
@item @@address@hidden@}
Generate the pounds sterling currency sign.
address@hidden,,@code{@@address@hidden@}}}.
address@hidden@code{@@pounds}}.
@item @@address@hidden@}
-Indicate printed output to the reader with a glyph:
address@hidden@print{}}. @xref{Print Glyph}.
+Indicate printed output to the reader with a glyph: @address@hidden
address@hidden@code{@@print}}.
@item @@printindex @var{index-name}
-Generate the alphabetized index for @var{index-name} (using two columns in a
printed
-manual). @xref{Printing Indices & Menus}.
+Generate the alphabetized index for @var{index-name} (using two
+columns in a printed manual). @xref{Printing Indices & Menus}.
@item @@address@hidden@var{node}, address@hidden, address@hidden,
address@hidden, address@hidden@}
Make a reference that starts with a lowercase `see' in a printed
@@ -20901,7 +20921,7 @@
@item @@address@hidden@}
Indicate the result of an expression to the reader with a special
-glyph: @address@hidden @xref{result, , @code{@@result}}.
+glyph: @address@hidden @address@hidden@@result}}.
@item @@address@hidden@address@hidden
Generate a ring accent over the next character, as in @ringaccent{o}.
@@ -21076,8 +21096,7 @@
Formatter Commands}.
@item @@address@hidden@}
-Generate the degree symbol.
address@hidden,,@code{@@address@hidden@}}}.
+Generate the degree symbol. @address@hidden@@textdegree}}.
@item @@thischapter
@itemx @@thischaptername
@@ -21908,7 +21927,7 @@
as:
@example
-$Id: texinfo.txi,v 1.518 2013/01/12 16:56:41 karl Exp $
+$Id: texinfo.txi,v 1.519 2013/01/13 19:13:19 karl Exp $
@end example
(This is potentially useful in all sources that use version control,
Index: doc/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/doc/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- doc/.cvsignore 26 Nov 2012 01:25:35 -0000 1.13
+++ doc/.cvsignore 13 Jan 2013 19:13:19 -0000 1.14
@@ -2,6 +2,7 @@
*.html
*.info
*.pdf
+*.t2p
Makefile
Makefile.in
info-stnd.??
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo ChangeLog doc/texinfo.txi doc/.cvsignore,
karl <=