texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo update (Thu Jan 31 13:53:01 EST 2008)


From: Karl Berry
Subject: texinfo update (Thu Jan 31 13:53:01 EST 2008)
Date: Thu, 31 Jan 2008 13:53:04 -0500

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.810
retrieving revision 1.811
diff -u -r1.810 -r1.811
--- ChangeLog   31 Jan 2008 17:46:22 -0000      1.810
+++ ChangeLog   31 Jan 2008 18:33:27 -0000      1.811
@@ -1,5 +1,21 @@
 2008-01-31  Karl Berry  <address@hidden>
 
+       * doc/texinfo.txi (Click Sequences): new section to document new
+       commands @arrow, @clicksequence, @click, and @clickstyle.
+       * doc/texinfo.tex (\clicksequence, \click, \clickstyle): define them.
+       * makeinfo/cmds.h,
+       * makeinfo/cmds.c (cm_arrow, cm_click, cm_clicksequence,
+       cm_clickstyle): new fns.
+       * insertion.h,
+       * insertion.c (get_item_function): no longer static.
+       * xml.h,
+       * xml.c (CLICK, CLICKSEQUENCE): new elements.
+       * util/texinfo.dtd (Inline.misc): add click and clicksequence.
+       (rarr): new entity.
+
+       * makeinfo/xml.c (xml_insert_entity): only do XML checks if we are
+       actually outputting XML; this routine is also used for HTML output.
+
        * makeinfo/makeinfo.c (convert_from_loaded_file): move
        xml_begin_document to after we are sure the output file is open.
 
Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- NEWS        22 Jan 2008 01:03:00 -0000      1.159
+++ NEWS        31 Jan 2008 18:33:27 -0000      1.160
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.159 2008/01/22 01:03:00 karl Exp $
+$Id: NEWS,v 1.160 2008/01/31 18:33:27 karl Exp $
 This NEWS file records noteworthy changes, very tersely.
 See the manual for detailed information.
 
@@ -22,6 +22,10 @@
 
 -------------------------------------------------------------------------------
 
+* Language:
+  . new commands @clicksequence, @click, and @clickstyle for documenting
+    GUI sequences, and @arrow for the default glyph used.
+
 * install-info:
   . Much work towards compatibility with Debian's independent
     implementation.  Changes in behavior:
@@ -53,7 +57,7 @@
   . language support for no removed/renamed to nb, per Norwegian translators.
   . new translation: es.
   . bug fixes in make check (and elsewhere).
-  . gettext 0.17.
+  . gettext 0.17, automake 1.10.1.
 
 
 4.11 (9 September 2007)
Index: doc/makeinfo.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/makeinfo.1,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- doc/makeinfo.1      2 Jan 2008 01:36:15 -0000       1.61
+++ doc/makeinfo.1      31 Jan 2008 18:33:28 -0000      1.62
@@ -1,4 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
 .TH MAKEINFO "1" "January 2008" "makeinfo 4.11.90" "User Commands"
 .SH NAME
 makeinfo \- translate Texinfo documents
Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- doc/texinfo.tex     15 Dec 2007 14:35:01 -0000      1.256
+++ doc/texinfo.tex     31 Jan 2008 18:33:28 -0000      1.257
@@ -3,11 +3,11 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2007-12-02.17}
+\def\texinfoversion{2008-01-31.09}
 %
-% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 2007,
+% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007 Free Software Foundation, Inc.
+% 2007, 2008 Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
@@ -2560,6 +2560,13 @@
 \let\env=\code
 \let\command=\code
 
+% @clicksequence{File @click{} Open ...}
+\def\clicksequence#1{\begingroup #1\endgroup}
+
+% @clickstyle @arrow   (by default)
+\parseargdef\clickstyle{\def\click{#1}}
+\def\click{\arrow}
+
 % @uref (abbreviation for `urlref') takes an optional (comma-separated)
 % second argument specifying the text to display and an optional third
 % arg as text to display instead of (rather than in addition to) the url
@@ -5652,14 +5659,15 @@
 
 % @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
 %
-% Since these characters are used in examples, it should be an even number of
+% Since these characters are used in examples, they should be an even number of
 % \tt widths. Each \tt character is 1en, so two makes it 1em.
 %
 \def\point{$\star$}
-\def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
-\def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}}
+\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}}
+\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
+\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}}
 \def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
-\def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}}
+\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}}
 
 % The @error{} command.
 % Adapted from the TeXbook's \boxit.
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- doc/texinfo.txi     30 Jan 2008 19:40:13 -0000      1.216
+++ doc/texinfo.txi     31 Jan 2008 18:33:28 -0000      1.217
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.216 2008/01/30 19:40:13 karl Exp $
address@hidden $Id: texinfo.txi,v 1.217 2008/01/31 18:33:28 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.
 
@@ -452,6 +452,7 @@
 * textdegree::                  How to insert the degrees symbol.
 * minus::                       How to insert a minus sign.
 * math::                        How to format a mathematical expression.
+* Click Sequences::             Inserting GUI usage sequences.
 * Glyphs::                      How to indicate results of evaluation,
                                  expansion of macros, errors, etc.
 
@@ -10051,6 +10052,7 @@
 * textdegree::                  How to insert the degrees symbol.
 * minus::                       How to insert a minus sign.
 * math::                        How to format a mathematical expression.
+* Click Sequences::             Inserting GUI usage sequences.
 * Glyphs::                      How to indicate results of evaluation,
                                  expansion of macros, errors, etc.
 @end menu
@@ -11014,6 +11016,56 @@
 (@pxref{Raw Formatter Commands}).
 
 
address@hidden Click Sequences
address@hidden Click Sequences
address@hidden Click sequences
address@hidden Sequence of clicks
+
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 simple right arrow (@samp{->} in
+Info) by default; this glyph is also available independently via the
+command @code{@@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
+(@pxref{itemize,,@code{@@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 Glyphs
 @section Glyphs for Examples
 @cindex Glyphs
@@ -17343,10 +17395,14 @@
 the title is underlined with periods.  @xref{subsubsection,, The
 `subsub' address@hidden
 
address@hidden @@address@hidden@}
+Produce a normal right arrow glyph: @address@hidden  Used by default
+for @code{@@click}.  @xref{Click Sequences}.
+
 @item @@asis
 Used following @code{@@table}, @code{@@ftable}, and @code{@@vtable} to
 print the table's first column without highlighting (``as is'').
address@hidden Tables, , Making a Two-column address@hidden
address@hidden Tables}.
 
 @item @@author @var{author}
 Typeset @var{author} flushleft and underline it.  @xref{title
@@ -17410,6 +17466,18 @@
 Highlight the name of a book or other reference that lacks a
 companion Info file.  @xref{cite, , @code{@@address@hidden
 
address@hidden @@address@hidden@}
+Represent a single ``click'' in a GUI.  Used within
address@hidden@@clicksequence}.  @xref{Click Sequences}.
+
address@hidden @@address@hidden@var{action} @@address@hidden@} @address@hidden
+Represent a sequence of clicks in a GUI.  @xref{Click Sequences}.
+
address@hidden @@clickstyle @@@var{cmd}
+Execute @@@var{cmd} for each @code{@@click}; the default is
address@hidden@@arrow}.  The usual following empty braces on @@@var{cmd} are
+omitted.  @xref{Click Sequences}.
+
 @item @@clear @var{flag}
 Unset @var{flag}, preventing the Texinfo formatting commands from
 formatting text between subsequent pairs of @code{@@ifset @var{flag}}
@@ -18998,7 +19066,7 @@
 (@url{http://www.gnu.org/software/rcs}) version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.216 2008/01/30 19:40:13 karl Exp $
+$Id: texinfo.txi,v 1.217 2008/01/31 18:33:28 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}
@@ -19072,7 +19140,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.216 2008/01/30 19:40:13 karl Exp $
address@hidden $Id: texinfo.txi,v 1.217 2008/01/31 18:33:28 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi
Index: doc/version-stnd.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/version-stnd.texi,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- doc/version-stnd.texi       30 Jan 2008 19:40:13 -0000      1.23
+++ doc/version-stnd.texi       31 Jan 2008 18:33:28 -0000      1.24
@@ -1,4 +1,4 @@
address@hidden UPDATED 24 January 2008
address@hidden UPDATED 30 January 2008
 @set UPDATED-MONTH January 2008
 @set EDITION 4.11.90
 @set VERSION 4.11.90
Index: doc/version.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- doc/version.texi    30 Jan 2008 19:40:13 -0000      1.51
+++ doc/version.texi    31 Jan 2008 18:33:28 -0000      1.52
@@ -1,4 +1,4 @@
address@hidden UPDATED 18 January 2008
address@hidden UPDATED 31 January 2008
 @set UPDATED-MONTH January 2008
 @set EDITION 4.11.90
 @set VERSION 4.11.90
Index: makeinfo/.gdbinit
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/.gdbinit,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- makeinfo/.gdbinit   23 Jan 2008 19:28:22 -0000      1.40
+++ makeinfo/.gdbinit   31 Jan 2008 18:33:27 -0000      1.41
@@ -269,3 +269,6 @@
 
 # removing wrong direntry indentation in source
 set args -o - $ttests/direntryspace.tex
+
+# seg fault
+set args -o /tmp/  --xml $ttests/click.tex
Index: makeinfo/cmds.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- makeinfo/cmds.c     24 Oct 2007 20:03:35 -0000      1.78
+++ makeinfo/cmds.c     31 Jan 2008 18:33:27 -0000      1.79
@@ -1,8 +1,8 @@
 /* cmds.c -- Texinfo commands.
-   $Id: cmds.c,v 1.78 2007/10/24 20:03:35 karl Exp $
+   $Id: cmds.c,v 1.79 2008/01/31 18:33:27 karl Exp $
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2008 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
@@ -100,6 +100,7 @@
   { "appendixsec", cm_appendixsec, NO_BRACE_ARGS },
   { "appendixsubsec", cm_appendixsubsec, NO_BRACE_ARGS },
   { "appendixsubsubsec", cm_appendixsubsubsec, NO_BRACE_ARGS },
+  { "arrow", cm_arrow, BRACE_ARGS },
   { "asis", cm_no_op, BRACE_ARGS },
   { "author", cm_author, NO_BRACE_ARGS },
   { "b", cm_b, BRACE_ARGS },
@@ -115,6 +116,9 @@
   { "cindex", cm_cindex, NO_BRACE_ARGS },
   { "cite", cm_cite, BRACE_ARGS },
   { "clear", cm_clear, NO_BRACE_ARGS },
+  { "click", cm_click, BRACE_ARGS },
+  { "clicksequence", cm_clicksequence, BRACE_ARGS },
+  { "clickstyle", cm_clickstyle, NO_BRACE_ARGS },
   { "code", cm_code, BRACE_ARGS },
   { "comma", cm_comma, BRACE_ARGS },
   { "command", cm_code, BRACE_ARGS },
@@ -1714,11 +1718,56 @@
       filling_enabled = save_filling_enabled;
       indented_fill = save_indented_fill;
       close_single_paragraph ();
-      if (looking_at("\n"))
+      if (looking_at ("\n"))
         insert ('\n');
     }
 }
 
+
+/* Define what @click{} does.  */
+static char *click_command = "@arrow";
+
+void
+cm_clickstyle (void)
+{
+  click_command = get_item_function ();
+
+  if (looking_at ("\n"))
+    {
+      input_text_offset++;
+      line_number++;
+    }
+}
+
+/* @clicksequence{File @click{} Open} */
+void
+cm_clicksequence (int arg)
+{
+  if (xml)
+    xml_insert_element (CLICKSEQUENCE, arg);
+}
+
+void
+cm_click (int arg)
+{
+  if (xml)
+    xml_insert_element (CLICK, arg);
+  else if (arg == END)
+    execute_string ("%s{}", click_command);
+}
+
+
+/* Generic right arrow, default clickstyle.  */
+void
+cm_arrow (int arg)
+{
+  if (arg == END)
+    if (html || xml)
+      xml_insert_entity ("rarr");
+    else
+      add_word ("->");
+}
+
 /* Show what an expression returns. */
 void
 cm_result (int arg)
Index: makeinfo/cmds.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/cmds.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- makeinfo/cmds.h     15 Jul 2007 11:51:12 -0000      1.13
+++ makeinfo/cmds.h     31 Jan 2008 18:33:27 -0000      1.14
@@ -1,7 +1,7 @@
 /* cmds.h -- declarations for cmds.c.
-   $Id: cmds.h,v 1.13 2007/07/15 11:51:12 olegkat Exp $
+   $Id: cmds.h,v 1.14 2008/01/31 18:33:27 karl Exp $
 
-   Copyright (C) 1998, 1999, 2002, 2003, 2004, 2007
+   Copyright (C) 1998, 1999, 2002, 2003, 2004, 2007, 2008
    Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -88,7 +88,11 @@
 /* Special insertions.  */
 extern void cm_LaTeX (int arg),
   cm_TeX (int arg),
+  cm_arrow (int arg),
   cm_bullet (int arg),
+  cm_click (int arg),
+  cm_clicksequence (int arg),
+  cm_clickstyle (void),
   cm_colon (void),
   cm_comma (int arg),
   cm_copyright (int arg),
Index: makeinfo/insertion.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- makeinfo/insertion.c        23 Jan 2008 19:28:21 -0000      1.67
+++ makeinfo/insertion.c        31 Jan 2008 18:33:27 -0000      1.68
@@ -1,5 +1,5 @@
 /* insertion.c -- insertions for Texinfo.
-   $Id: insertion.c,v 1.67 2008/01/23 19:28:21 karl Exp $
+   $Id: insertion.c,v 1.68 2008/01/31 18:33:27 karl Exp $
 
    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
    2007, 2008 Free Software Foundation, Inc.
@@ -143,7 +143,7 @@
    change it to "@ ", since "@" by itself is not a command.  This makes
    "@ ", "@\t", and "@\n" all the same, but their default meanings are
    the same anyway, and let's not worry about supporting redefining them.  */
-static char *
+char *
 get_item_function (void)
 {
   char *item_function;
Index: makeinfo/insertion.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/insertion.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- makeinfo/insertion.h        1 Jul 2007 21:20:32 -0000       1.14
+++ makeinfo/insertion.h        31 Jan 2008 18:33:27 -0000      1.15
@@ -1,7 +1,7 @@
 /* insertion.h -- declarations for insertion.c.
-   $Id: insertion.h,v 1.14 2007/07/01 21:20:32 karl Exp $
+   $Id: insertion.h,v 1.15 2008/01/31 18:33:27 karl Exp $
 
-   Copyright (C) 1998, 1999, 2001, 2002, 2003, 2007
+   Copyright (C) 1998, 1999, 2001, 2002, 2003, 2007, 2008
    Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -77,4 +77,6 @@
 extern int command_needs_braces (char *cmd);
 
 extern enum insertion_type find_type_from_name (char *name);
+
+extern char *get_item_function (void);
 #endif /* !INSERTION_H */
Index: makeinfo/xml.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- makeinfo/xml.c      3 Dec 2007 01:38:43 -0000       1.74
+++ makeinfo/xml.c      31 Jan 2008 18:33:27 -0000      1.75
@@ -1,7 +1,7 @@
 /* xml.c -- xml output, both TexinfoML and Docbook.
-   $Id: xml.c,v 1.74 2007/12/03 01:38:43 karl Exp $
+   $Id: xml.c,v 1.75 2008/01/31 18:33:27 karl Exp $
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -165,6 +165,9 @@
 
   { "dmn",                 0, 1, 0 },
 
+  { "clicksequence",       0, 1, 0 },
+  { "click",               0, 1, 0 },
+
   { "xref",                0, 1, 0 },
   { "xrefnodename",        0, 1, 0 },
   { "xrefinfoname",        0, 1, 0 },
@@ -379,6 +382,9 @@
 
   { "",                    0, 1, 0 }, /* DIMENSION */
 
+  { "",                    0, 1, 0 }, /* CLICKSEQUENCE */
+  { "",                    0, 1, 0 }, /* CLICK */
+
   { "xref",                0, 1, 0 }, /* XREF */
   { "link",                0, 1, 0 }, /* XREFNODENAME */
   { "",                    0, 1, 0 }, /* XREFINFONAME */
@@ -1050,15 +1056,18 @@
 {
   int saved_escape_html = escape_html;
 
-  if (!book_started)
-    return;
-  if (docbook && !only_macro_expansion && (in_menu || in_detailmenu))
-    return;
+  if (xml)
+    {
+    if (!book_started)
+      return;
+    if (docbook && !only_macro_expansion && (in_menu || in_detailmenu))
+      return;
 
-  if (!xml_in_para && !xml_no_para && !only_macro_expansion
-      && xml_element_list[xml_current_element ()].contains_para
-      && !in_fixed_width_font)
-    xml_start_para ();
+    if (!xml_in_para && !xml_no_para && !only_macro_expansion
+        && xml_element_list[xml_current_element ()].contains_para
+        && !in_fixed_width_font)
+      xml_start_para ();
+  }
 
   escape_html = 0;
   add_char ('&');
Index: makeinfo/xml.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/xml.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- makeinfo/xml.h      24 Oct 2007 20:03:36 -0000      1.31
+++ makeinfo/xml.h      31 Jan 2008 18:33:28 -0000      1.32
@@ -1,7 +1,7 @@
 /* xml.h -- xml (including Docbook) output declarations.
-   $Id: xml.h,v 1.31 2007/10/24 20:03:36 karl Exp $
+   $Id: xml.h,v 1.32 2008/01/31 18:33:28 karl Exp $
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008
    Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -79,6 +79,7 @@
   ITEMIZE, ITEMFUNCTION, ITEM, ENUMERATE, TABLE, TABLEITEM, TABLETERM,
   INDEXTERM, 
   MATH, DIMENSION,
+  CLICKSEQUENCE, CLICK,
   XREF, XREFNODENAME, XREFINFONAME, XREFPRINTEDDESC, XREFINFOFILE,
     XREFPRINTEDNAME, 
   INFOREF, INFOREFNODENAME, INFOREFREFNAME, INFOREFINFONAME, 
Index: util/texinfo.dtd
===================================================================
RCS file: /sources/texinfo/texinfo/util/texinfo.dtd,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- util/texinfo.dtd    15 Jul 2007 11:51:12 -0000      1.12
+++ util/texinfo.dtd    31 Jan 2008 18:33:27 -0000      1.13
@@ -1,8 +1,8 @@
-<!-- $Id: texinfo.dtd,v 1.12 2007/07/15 11:51:12 olegkat Exp $
+<!-- $Id: texinfo.dtd,v 1.13 2008/01/31 18:33:27 karl Exp $
    Document Type Definition for Texinfo XML output (the '-'-xml option).
 
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
-  Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+  Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
@@ -107,7 +107,7 @@
                           | dfn | cite | key | kbd | var | acronym | url"> 
 <!ENTITY % Inline.math "math | dmn">
 <!ENTITY % Inline.reference "xref | inforef | indexterm | email | uref">
-<!ENTITY % Inline.misc "logo | punct">
+<!ENTITY % Inline.misc "click | clicksequence | logo | punct">
 
 <!ENTITY % Inline.phrase
            "%Inline.emphasize;  | %Inline.misc; | %Inline.fonts;
@@ -492,7 +492,8 @@
 <!ENTITY aring "&#xe5;">
 <!ENTITY szlig "&#xdf;">
 
-<!ENTITY rArr "&#x21D2;">
+<!ENTITY rarr "&#x2192;">
+<!ENTITY rArr "&#x21d2;">
 
 <!ENTITY macr "&#xaf;">
 
P ChangeLog
P NEWS
P doc/makeinfo.1
P doc/texinfo.tex
P doc/texinfo.txi
P doc/version-stnd.texi
P doc/version.texi
P makeinfo/.gdbinit
P makeinfo/cmds.c
P makeinfo/cmds.h
P makeinfo/insertion.c
P makeinfo/insertion.h
P makeinfo/xml.c
P makeinfo/xml.h
P util/texinfo.dtd




reply via email to

[Prev in Thread] Current Thread [Next in Thread]