[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Sat Jul 31 15:22:01 EDT 2004)
|
From: |
Karl Berry |
|
Subject: |
texinfo update (Sat Jul 31 15:22:01 EDT 2004) |
|
Date: |
Sat, 31 Jul 2004 15:22:11 -0400 |
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.366
retrieving revision 1.367
diff -c -r1.366 -r1.367
*** ChangeLog 30 Jul 2004 20:45:15 -0000 1.366
--- ChangeLog 31 Jul 2004 18:49:51 -0000 1.367
***************
*** 1,3 ****
--- 1,11 ----
+ 2004-07-31 Karl Berry <address@hidden>
+
+ * doc/texinfo.txi,
+ * doc/texinfo.tex,
+ * makeinfo/cmds.c, cmds.h, xml.c, xml.h,
+ * util/texinfo.dtd: new command @abbr, suggested by Paul Eggert,
+ who also sent the original documentation.
+
2004-07-30 Karl Berry <address@hidden>
* info/infomap.c (initialize_vi_like_keymaps): bind j to
Index: NEWS
===================================================================
RCS file: /cvsroot/texinfo/texinfo/NEWS,v
retrieving revision 1.87
retrieving revision 1.88
diff -c -r1.87 -r1.88
*** NEWS 25 Jul 2004 00:21:29 -0000 1.87
--- NEWS 31 Jul 2004 18:49:51 -0000 1.88
***************
*** 1,4 ****
! $Id: NEWS,v 1.87 2004/07/25 00:21:29 wl Exp $
This file records noteworthy changes.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--- 1,4 ----
! $Id: NEWS,v 1.88 2004/07/31 18:49:51 karl Exp $
This file records noteworthy changes.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
***************
*** 22,27 ****
--- 22,28 ----
-------------------------------------------------------------------------------
* Language:
+ . new command @abbr for general abbreviations.
. new command @slanted to typeset text with a slanted font.
* Distribution:
. new convenience script texi2pdf, equivalent to texi2dvi --pdf (from
tetex).
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.166
retrieving revision 1.167
diff -c -r1.166 -r1.167
*** doc/texinfo.tex 28 Jul 2004 01:12:20 -0000 1.166
--- doc/texinfo.tex 31 Jul 2004 18:49:51 -0000 1.167
***************
*** 3,9 ****
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
! \def\texinfoversion{2004-07-27.17}
%
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
--- 3,9 ----
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
! \def\texinfoversion{2004-07-31.11}
%
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
***************
*** 1930,1935 ****
--- 1930,1939 ----
\def\sc#1{{\smallcaps#1}} % smallcaps font
\def\ii#1{{\it #1}} % italic font
+ % @acronym for "FBI", "NATO", and the like.
+ % We print this one point size smaller, since it's intended for
+ % all-uppercase.
+ %
\def\acronym#1{\doacronym #1,,\finish}
\def\doacronym#1,#2,#3\finish{%
{\selectfonts\lsize #1}%
***************
*** 1939,1945 ****
\fi
}
! % @pounds{} is a sterling sign, which is in the CM italic font.
%
\def\pounds{{\it\$}}
--- 1943,1961 ----
\fi
}
! % @abbr for "Comput. J." and the like.
! % No font change, but don't do end-of-sentence spacing.
! %
! \def\abbr#1{\doabbr #1,,\finish}
! \def\doabbr#1,#2,#3\finish{%
! {\frenchspacing #1}%
! \def\temp{#2}%
! \ifx\temp\empty \else
! \space ({\unsepspaces \ignorespaces \temp \unskip})%
! \fi
! }
!
! % @pounds{} is a sterling sign, which Knuth put in the CM italic font.
%
\def\pounds{{\it\$}}
Index: doc/texinfo.txi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.105
retrieving revision 1.106
diff -c -r1.105 -r1.106
*** doc/texinfo.txi 28 Jul 2004 12:42:25 -0000 1.105
--- doc/texinfo.txi 31 Jul 2004 18:49:51 -0000 1.106
***************
*** 1,5 ****
\input texinfo.tex @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.105 2004/07/28 12:42:25 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.
--- 1,5 ----
\input texinfo.tex @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.106 2004/07/31 18:49:51 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.
***************
*** 346,351 ****
--- 346,352 ----
* option:: Indicating option names.
* dfn:: Specifying definitions.
* cite:: Referring to books not in the Info system.
+ * abbr:: Indicating abbreviations.
* acronym:: Indicating acronyms.
* indicateurl:: Indicating a World Wide Web reference.
* email:: Indicating an electronic mail address.
***************
*** 6666,6671 ****
--- 6667,6673 ----
* option:: Indicating option names.
* dfn:: Specifying definitions.
* cite:: Referring to books not in the Info system.
+ * abbr:: Indicating abbreviations.
* acronym:: Indicating acronyms.
* indicateurl:: Indicating an example URL.
* email:: Indicating an electronic mail address.
***************
*** 6734,6739 ****
--- 6736,6744 ----
Indicate the name of a book.
@xref{cite,,@code{@@cite}}.
+ @item @@address@hidden@address@hidden
+ Indicate an abbreviation.
+
@item @@address@hidden@address@hidden
Indicate an acronym.
@xref{acronym,,@code{@@acronym}}.
***************
*** 7374,7405 ****
@end ignore
@node acronym
@subsection @code{@@address@hidden@var{acronym}[, @address@hidden
@findex acronym
@cindex NASA, as acronym
- @cindex F.B.I., as acronym
- @cindex Abbreviations, tagging
@cindex Acronyms, tagging
Use the @code{@@acronym} command for abbreviations written in all
capital letters, such as address@hidden'. The abbreviation is given as
the single argument in braces, as in @samp{@@address@hidden@}}. As
! a matter of style, or for particular abbreviations, you may prefer to
! use periods, as in @samp{@@address@hidden@}}.
! If the acronym is at the end of a sentence, remember to use the
! special @code{@@.} and similar commands (@pxref{Ending a Sentence}).
@cindex <acronym> tag
In @TeX{}, the acronym is printed in slightly smaller font. In the
! Info output, the argument is printed as-is. In HTML, Docbook, and
! XML, the @code{<acronym>} tag is used.
! @code{@@acronym} accepts an optional second argument, intended to be
! used for the meaning of the acronym. If present, it is printed in
! parentheses after the acronym. For instance (since GNU is a recursive
! acronym, we use @code{@@acronym} recursively):
@example
@@address@hidden, @@address@hidden@}'s Not address@hidden
--- 7379,7454 ----
@end ignore
+ @node abbr
+ @subsection @code{@@address@hidden@var{abbreviation}[, @address@hidden
+ @findex abbr
+
+ @cindex Abbreviations, tagging
+ You can use the @code{@@abbr} command for general abbreviations. The
+ abbreviation is given as the single argument in braces, as in
+ @samp{@@address@hidden@}}. As a matter of style, or for particular
+ abbreviations, you may prefer to omit periods, as in
+ @samp{@@address@hidden@} Stallman}.
+
+ @code{@@abbr} accepts an optional second argument, intended to be used
+ for the meaning of the abbreviation.
+
+ If the abbreviation ends with a lowercase letter and a period, and is
+ not at the end of a sentence, and has no second argument, remember to
+ use the @code{@@.} command (@pxref{Not Ending a
+ Sentence}) to get the correct spacing. However, you do not have to
+ use @code{@@.} within the abbreviation itself; Texinfo automatically
+ assumes periods within the abbreivation do not end a sentence.
+
+ @cindex <abbr> tag
+ In @TeX{} and in the Info output, the first argument is printed as-is;
+ if the second argument is present, it is printed in parentheses after
+ the abbreviation. In HTML and XML, the @code{<abbr>} tag is
+ used; in Docbook, the @code{<abbrev>} tag is used. For instance:
+
+ @example
+ @@address@hidden J., Computer address@hidden
+ @end example
+
+ @noindent produces:
+
+ @display
+ @abbr{Comput. J., Computer Journal}
+ @end display
+
+ For abbreviations consisting of all capital letters, you may prefer to
+ use the @code{@@acronym} command instead. See the next section for
+ more on the usage of these two commands.
+
+
@node acronym
@subsection @code{@@address@hidden@var{acronym}[, @address@hidden
@findex acronym
@cindex NASA, as acronym
@cindex Acronyms, tagging
Use the @code{@@acronym} command for abbreviations written in all
capital letters, such as address@hidden'. The abbreviation is given as
the single argument in braces, as in @samp{@@address@hidden@}}. As
! a matter of style, or for particular acronyms, you may prefer to
! use periods, as in @samp{@@address@hidden@}}.
!
! @code{@@acronym} accepts an optional second argument, intended to be
! used for the meaning of the acronym.
! If the acronym is at the end of a sentence, and if there is no second
! argument, remember to use the @code{@@.} or similar command
! (@pxref{Ending a Sentence}) to get the correct spacing.
@cindex <acronym> tag
In @TeX{}, the acronym is printed in slightly smaller font. In the
! Info output, the argument is printed as-is. In either format, if the
! second argument is present, it is printed in parentheses after the
! acronym. In HTML, Docbook, and XML, the @code{<acronym>} tag is
! used.
! For instance (since GNU is a recursive acronym, we use
! @code{@@acronym} recursively):
@example
@@address@hidden, @@address@hidden@}'s Not address@hidden
***************
*** 7415,7420 ****
--- 7464,7501 ----
capitals. Don't use @code{@@acronym} for this, since a name is not an
acronym. Use @code{@@sc} instead (@pxref{Smallcaps}).
+ @code{@@abbr} and @code{@@acronym} are closely related commands: they
+ both signal to the reader that a shortened form is being used, and
+ possibly give a meaning. When choosing whether to use these two
+ commands, please bear the following in mind.
+
+ @itemize @minus
+ @item
+ In standard English usage, acronyms are a subset of abbreviations:
+ they include pronounceable words like address@hidden', `radar', and
+ `snafu', and some sources also include syllable acronyms like
+ `Usenet', hybrids like address@hidden', and unpronounceable
+ initialisms like address@hidden'.
+
+ @item
+ In Texinfo, an acronym (but not an abbreviation) should consist only
+ of capital letters and periods, no lowercase.
+
+ @item
+ In @TeX{}, an acronym (but not an abbreviation) is printed in a
+ slightly smaller font.
+
+ @item
+ Some browsers place a dotted bottom border under abbreviations but not
+ acronyms.
+
+ @item
+ It's not essential to use these commands for all abbreviations. Text
+ is perfectly readable without them, and for common abbreviations like
+ `etc.@:', we consider them to be overkill.
+
+ @end itemize
+
@node indicateurl
@subsection @code{@@address@hidden@address@hidden
***************
*** 7557,7563 ****
@end display
As shown here, we recommend using @code{@@acronym} for actual
! abbreviations (@pxref{acronym}), and reserving @code{@@sc} for special
cases where you want small caps. The output is not the same
(@code{@@acronym} prints in a smaller text font, not the small caps
font), but more importantly it describes the actual text more
--- 7638,7644 ----
@end display
As shown here, we recommend using @code{@@acronym} for actual
! acronyms (@pxref{acronym}), and reserving @code{@@sc} for special
cases where you want small caps. The output is not the same
(@code{@@acronym} prints in a smaller text font, not the small caps
font), but more importantly it describes the actual text more
***************
*** 16248,16254 ****
@example
@@asis @@b @@cite @@code @@command @@dfn @@dmn @@dotless
@@emph @@env @@file @@indicateurl @@kbd @@key
! @@samp @@sc @@strong @@t @@var @@w
@end example
@noindent For @code{@@sc}, any letters are capitalized.
--- 16329,16335 ----
@example
@@asis @@b @@cite @@code @@command @@dfn @@dmn @@dotless
@@emph @@env @@file @@indicateurl @@kbd @@key
! @@samp @@sc @@slanted @@strong @@t @@var @@w
@end example
@noindent For @code{@@sc}, any letters are capitalized.
***************
*** 16298,16305 ****
@item @code{@@tie} @tab (space)
@end multitable
! An @code{@@acronym} command is replaced by the first argument,
! followed by the second argument in parentheses, if present.
@xref{acronym}.
An @code{@@email} command is replaced by the @var{text} argument if
--- 16379,16386 ----
@item @code{@@tie} @tab (space)
@end multitable
! An @code{@@acronym} or @code{@@abbr} command is replaced by the first
! argument, followed by the second argument in parentheses, if present.
@xref{acronym}.
An @code{@@email} command is replaced by the @var{text} argument if
***************
*** 16521,16529 ****
Generate the uppercase and lowercase Scandinavian A-ring letters,
respectively: @AA{}, @aa{}. @xref{Inserting Accents}.
! @item @@address@hidden@address@hidden
! Tag @var{abbrev} as an acronym, that is, an abbreviation written in all
! capital letters, such as `NASA'. @xref{acronym,, @code{acronym}}.
@item @@address@hidden@}
@itemx @@address@hidden@}
--- 16602,16614 ----
Generate the uppercase and lowercase Scandinavian A-ring letters,
respectively: @AA{}, @aa{}. @xref{Inserting Accents}.
! @item @@address@hidden@address@hidden
! Tag @var{abbreviation} as an abbreviation, such as `Comput.'.
! @xref{abbr,, @code{abbr}}.
!
! @item @@address@hidden@address@hidden
! Tag @var{acronym} as an acronym, such as `NASA'.
! @xref{acronym,, @code{acronym}}.
@item @@address@hidden@}
@itemx @@address@hidden@}
***************
*** 18218,18224 ****
Concurrent Versions System}) or RCS (see rcsintro(1)) version control
systems, which expand it into a string such as:
@example
! $Id: texinfo.txi,v 1.105 2004/07/28 12:42:25 karl Exp $
@end example
(This is useful in all sources that use version control, not just manuals.)
You may wish to include the @samp{$Id:} comment in the @code{@@copying}
--- 18303,18309 ----
Concurrent Versions System}) or RCS (see rcsintro(1)) version control
systems, which expand it into a string such as:
@example
! $Id: texinfo.txi,v 1.106 2004/07/31 18:49:51 karl Exp $
@end example
(This is useful in all sources that use version control, not just manuals.)
You may wish to include the @samp{$Id:} comment in the @code{@@copying}
***************
*** 18284,18290 ****
@verbatim
\input texinfo @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.105 2004/07/28 12:42:25 karl Exp $
@comment %**start of header
@setfilename sample.info
@include version.texi
--- 18369,18375 ----
@verbatim
\input texinfo @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.106 2004/07/31 18:49:51 karl Exp $
@comment %**start of header
@setfilename sample.info
@include version.texi
Index: doc/version.texi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** doc/version.texi 28 Jul 2004 12:42:30 -0000 1.15
--- doc/version.texi 31 Jul 2004 18:49:51 -0000 1.16
***************
*** 1,4 ****
! @set UPDATED 27 July 2004
@set UPDATED-MONTH July 2004
@set EDITION 4.7
@set VERSION 4.7
--- 1,4 ----
! @set UPDATED 31 July 2004
@set UPDATED-MONTH July 2004
@set EDITION 4.7
@set VERSION 4.7
Index: makeinfo/cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -c -r1.50 -r1.51
*** makeinfo/cmds.c 27 Jul 2004 00:06:31 -0000 1.50
--- makeinfo/cmds.c 31 Jul 2004 18:49:51 -0000 1.51
***************
*** 1,5 ****
/* cmds.c -- Texinfo commands.
! $Id: cmds.c,v 1.50 2004/07/27 00:06:31 karl Exp $
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
Foundation, Inc.
--- 1,5 ----
/* cmds.c -- Texinfo commands.
! $Id: cmds.c,v 1.51 2004/07/31 18:49:51 karl Exp $
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
Foundation, Inc.
***************
*** 82,87 ****
--- 82,88 ----
{ "OE", cm_special_char, BRACE_ARGS },
{ "TeX", cm_TeX, BRACE_ARGS },
{ "aa", cm_special_char, BRACE_ARGS },
+ { "abbr", cm_abbr, BRACE_ARGS },
{ "acronym", cm_acronym, BRACE_ARGS },
{ "ae", cm_special_char, BRACE_ARGS },
{ "afivepaper", cm_ignore_line, NO_BRACE_ARGS },
***************
*** 647,672 ****
cm_ignore_line ();
}
/* We keep acronyms with two arguments around, to be able to refer to them
later with only one argument. */
static ACRONYM_DESC *acronyms_stack = NULL;
! void
! cm_acronym (int arg)
{
! char *acronym, *description;
unsigned len;
/* We do everything at START. */
if (arg == END)
return;
! get_until_in_braces (",", &acronym);
if (input_text[input_text_offset] == ',')
input_text_offset++;
get_until_in_braces ("}", &description);
! canon_white (acronym);
canon_white (description);
/* If not enclosed in braces, strip after comma to be compatible
--- 648,675 ----
cm_ignore_line ();
}
+
+
/* We keep acronyms with two arguments around, to be able to refer to them
later with only one argument. */
static ACRONYM_DESC *acronyms_stack = NULL;
! static void
! cm_acronym_or_abbr (int arg, int is_abbr)
{
! char *aa, *description;
unsigned len;
/* We do everything at START. */
if (arg == END)
return;
! get_until_in_braces (",", &aa);
if (input_text[input_text_offset] == ',')
input_text_offset++;
get_until_in_braces ("}", &description);
! canon_white (aa);
canon_white (description);
/* If not enclosed in braces, strip after comma to be compatible
***************
*** 677,683 ****
while (description[i] != ',')
i++;
/* For now, just terminate the string at comma. */
! description[i] = '\0';
}
/* Get description out of braces. */
--- 680,686 ----
while (description[i] != ',')
i++;
/* For now, just terminate the string at comma. */
! description[i] = 0;
}
/* Get description out of braces. */
***************
*** 686,699 ****
len = strlen (description);
if (len && description[len-1] == '}')
! description[len-1] = '\0';
/* Save new description. */
if (strlen (description) > 0)
{
ACRONYM_DESC *new = xmalloc (sizeof (ACRONYM_DESC));
! new->acronym = xstrdup (acronym);
new->description = xstrdup (description);
new->next = acronyms_stack;
acronyms_stack = new;
--- 689,702 ----
len = strlen (description);
if (len && description[len-1] == '}')
! description[len-1] = 0;
/* Save new description. */
if (strlen (description) > 0)
{
ACRONYM_DESC *new = xmalloc (sizeof (ACRONYM_DESC));
! new->acronym = xstrdup (aa);
new->description = xstrdup (description);
new->next = acronyms_stack;
acronyms_stack = new;
***************
*** 701,707 ****
if (html)
{
! add_word ("<acronym");
if (strlen (description) > 0)
add_word_args (" title=\"%s\"", text_expansion (description));
--- 704,710 ----
if (html)
{
! add_word (is_abbr ? "<abbr" : "<acronym");
if (strlen (description) > 0)
add_word_args (" title=\"%s\"", text_expansion (description));
***************
*** 714,722 ****
while (temp)
{
! if (STREQ (acronym, temp->acronym) && strlen
(temp->description) > 0)
{
! add_word_args (" title=\"%s\"", text_expansion
(temp->description));
break;
}
temp = temp->next;
--- 717,727 ----
while (temp)
{
! if (STREQ (aa, temp->acronym)
! && strlen (temp->description) > 0)
{
! add_word_args (" title=\"%s\"",
! text_expansion (temp->description));
break;
}
temp = temp->next;
***************
*** 724,757 ****
}
add_char ('>');
! execute_string ("%s", acronym);
! add_word ("</acronym>");
}
else if (docbook)
{
! xml_insert_element (ACRONYM, START);
! execute_string ("%s", acronym);
! xml_insert_element (ACRONYM, END);
}
else if (xml)
{
! xml_insert_element (ACRONYM, START);
! xml_insert_element (ACRONYMWORD, START);
! execute_string ("%s", acronym);
! xml_insert_element (ACRONYMWORD, END);
if (strlen (description) > 0)
{
! xml_insert_element (ACRONYMDESC, START);
execute_string ("%s", description);
! xml_insert_element (ACRONYMDESC, END);
}
! xml_insert_element (ACRONYM, END);
}
else
! execute_string ("%s", acronym);
/* Put description into parenthesis after the acronym for all outputs
except XML. */
--- 729,762 ----
}
add_char ('>');
! execute_string ("%s", aa);
! add_word (is_abbr ? "</abbr>" : "</acronym>");
}
else if (docbook)
{
! xml_insert_element (is_abbr ? ABBREV : ACRONYM, START);
! execute_string ("%s", aa);
! xml_insert_element (is_abbr ? ABBREV : ACRONYM, END);
}
else if (xml)
{
! xml_insert_element (is_abbr ? ABBREV : ACRONYM, START);
! xml_insert_element (is_abbr ? ABBREVWORD : ACRONYMWORD, START);
! execute_string ("%s", aa);
! xml_insert_element (is_abbr ? ABBREVWORD : ACRONYMWORD, END);
if (strlen (description) > 0)
{
! xml_insert_element (is_abbr ? ABBREVDESC : ACRONYMDESC, START);
execute_string ("%s", description);
! xml_insert_element (is_abbr ? ABBREVDESC : ACRONYMDESC, END);
}
! xml_insert_element (is_abbr ? ABBREV : ACRONYM, END);
}
else
! execute_string ("%s", aa);
/* Put description into parenthesis after the acronym for all outputs
except XML. */
***************
*** 760,765 ****
--- 765,782 ----
}
void
+ cm_acronym (int arg)
+ {
+ cm_acronym_or_abbr (arg, 0);
+ }
+
+ void
+ cm_abbr (int arg)
+ {
+ cm_acronym_or_abbr (arg, 1);
+ }
+
+ void
cm_tt (int arg)
{
/* @t{} is a no-op in Info. */
Index: makeinfo/cmds.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** makeinfo/cmds.h 25 Jul 2004 00:17:21 -0000 1.7
--- makeinfo/cmds.h 31 Jul 2004 18:49:51 -0000 1.8
***************
*** 1,5 ****
/* cmds.h -- declarations for cmds.c.
! $Id: cmds.h,v 1.7 2004/07/25 00:17:21 wl Exp $
Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation,
Inc.
--- 1,5 ----
/* cmds.h -- declarations for cmds.c.
! $Id: cmds.h,v 1.8 2004/07/31 18:49:51 karl Exp $
Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation,
Inc.
***************
*** 109,114 ****
--- 109,115 ----
/* Emphasis and markup. */
extern void cm_acronym (int arg),
+ cm_abbr (int arg),
cm_b (int arg),
cm_cite (int arg, int position),
cm_code (int arg),
Index: makeinfo/xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -c -r1.48 -r1.49
*** makeinfo/xml.c 5 Jul 2004 22:23:24 -0000 1.48
--- makeinfo/xml.c 31 Jul 2004 18:49:51 -0000 1.49
***************
*** 1,5 ****
/* xml.c -- xml output.
! $Id: xml.c,v 1.48 2004/07/05 22:23:24 karl Exp $
Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--- 1,5 ----
/* xml.c -- xml output.
! $Id: xml.c,v 1.49 2004/07/31 18:49:51 karl Exp $
Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 91,96 ****
--- 91,100 ----
{ "acronymword", 0, 1, 0 },
{ "acronymdesc", 0, 1, 0 },
+ { "abbrev", 0, 1, 0 },
+ { "abbrevword", 0, 1, 0 },
+ { "abbrevdesc", 0, 1, 0 },
+
{ "tt", 0, 1, 0 },
{ "code", 0, 1, 0 },
{ "command", 0, 1, 0 },
***************
*** 297,302 ****
--- 301,310 ----
{ "", 0, 1, 0 }, /* ACRONYMWORD */
{ "", 0, 1, 0 }, /* ACRONYMDESC */
+ { "abbrev", 0, 1, 0 },
+ { "", 0, 1, 0 }, /* ABBREVWORD */
+ { "", 0, 1, 0 }, /* ABBREVDESC */
+
{ "literal", 0, 1, 0 }, /* TT */
{ "literal", 0, 1, 0 }, /* CODE */
{ "command", 0, 1, 0 }, /* COMMAND */
Index: makeinfo/xml.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** makeinfo/xml.h 11 Apr 2004 17:56:47 -0000 1.21
--- makeinfo/xml.h 31 Jul 2004 18:49:51 -0000 1.22
***************
*** 1,7 ****
/* xml.h -- xml output declarations.
! $Id: xml.h,v 1.21 2004/04/11 17:56:47 karl Exp $
! Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
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
--- 1,7 ----
/* xml.h -- xml output declarations.
! $Id: xml.h,v 1.22 2004/07/31 18:49:51 karl Exp $
! Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
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
***************
*** 17,23 ****
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
! Written by Philippe Martin <address@hidden>. */
#ifndef XML_H
#define XML_H
--- 17,23 ----
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
! Originally written by Philippe Martin <address@hidden>. */
#ifndef XML_H
#define XML_H
***************
*** 65,70 ****
--- 65,71 ----
NODENAME,
/* -- */
ACRONYM/* 37 */, ACRONYMWORD, ACRONYMDESC,
+ ABBREV, ABBREVWORD, ABBREVDESC,
TT, CODE, COMMAND_TAG, ENV, FILE_TAG, OPTION, SAMP, KBD, URL, KEY,
VAR, SC, DFN, EMPH, STRONG, CITE, NOTFIXEDWIDTH, I, B, R,
EXDENT,
Index: util/texinfo.dtd
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texinfo.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** util/texinfo.dtd 11 Apr 2004 17:56:47 -0000 1.1
--- util/texinfo.dtd 31 Jul 2004 18:49:51 -0000 1.2
***************
*** 1,4 ****
! <!-- $Id: texinfo.dtd,v 1.1 2004/04/11 17:56:47 karl Exp $
Document Type Definition for Texinfo.
Author: Philippe Martin (address@hidden)
--- 1,4 ----
! <!-- $Id: texinfo.dtd,v 1.2 2004/07/31 18:49:51 karl Exp $
Document Type Definition for Texinfo.
Author: Philippe Martin (address@hidden)
***************
*** 6,12 ****
Karl Eichwalder (address@hidden)
Alper Ersoy (address@hidden)
! Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
--- 6,12 ----
Karl Eichwalder (address@hidden)
Alper Ersoy (address@hidden)
! Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
***************
*** 100,106 ****
<!ENTITY % Inline.emphasize "strong | emph">
<!ENTITY % Inline.smallcaps "sc">
<!ENTITY % Inline.fonts "i | b | tt | r | titlefont">
! <!ENTITY % Inline.markup "code | command | env | file | option | samp | dfn |
cite | key | kbd | var | acronym | url | dmn">
<!ENTITY % Inline.math "math">
<!ENTITY % Inline.reference "xref | inforef | indexterm | email | uref |
anchor">
<!ENTITY % Inline.footnote "footnote">
--- 100,108 ----
<!ENTITY % Inline.emphasize "strong | emph">
<!ENTITY % Inline.smallcaps "sc">
<!ENTITY % Inline.fonts "i | b | tt | r | titlefont">
! <!ENTITY % Inline.markup "code | command | env | file | option | samp
! | dfn | cite | key | kbd | var | acronym
! | abbrev | url | dmn">
<!ENTITY % Inline.math "math">
<!ENTITY % Inline.reference "xref | inforef | indexterm | email | uref |
anchor">
<!ENTITY % Inline.footnote "footnote">
***************
*** 325,330 ****
--- 327,336 ----
<!ELEMENT acronymword (#PCDATA | %Inline.phrase;)*>
<!ELEMENT acronymdesc (#PCDATA | %Inline.phrase;)*>
+ <!ELEMENT abbrev (abbrevword, abbrevdesc?)>
+ <!ELEMENT abbrevword (#PCDATA | %Inline.phrase;)*>
+ <!ELEMENT abbrevdesc (#PCDATA | %Inline.phrase;)*>
+
<!-- math -->
<!ELEMENT math (#PCDATA | %Inline.phrase;)*>
P ChangeLog
P NEWS
P doc/texinfo.tex
P doc/texinfo.txi
P doc/version.texi
P makeinfo/cmds.c
P makeinfo/cmds.h
P makeinfo/xml.c
P makeinfo/xml.h
P util/texinfo.dtd
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Sat Jul 31 15:22:01 EDT 2004),
Karl Berry <=