[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo ChangeLog doc/info-stnd.texi doc/versio...
From: |
Patrice Dumas |
Subject: |
texinfo ChangeLog doc/info-stnd.texi doc/versio... |
Date: |
Wed, 17 Mar 2010 22:01:05 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/03/17 22:01:05
Modified files:
. : ChangeLog
doc : info-stnd.texi version-stnd.texi
info : info.c info.h nodes.c
Log message:
* info/nodes.c (info_node_of_file_buffer_tags), info.c, info.h,
doc/info-stnd.texi:
new switch --strict-node-location to avoid being smart when
searching for nodes.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1034&r2=1.1035
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/info-stnd.texi?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/version-stnd.texi?cvsroot=texinfo&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/info.c?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/info.h?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/nodes.c?cvsroot=texinfo&r1=1.13&r2=1.14
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1034
retrieving revision 1.1035
diff -u -b -r1.1034 -r1.1035
--- ChangeLog 17 Mar 2010 18:39:26 -0000 1.1034
+++ ChangeLog 17 Mar 2010 22:01:04 -0000 1.1035
@@ -1,3 +1,10 @@
+2010-03-18 Patrice Dumas <address@hidden>
+
+ * info/nodes.c (info_node_of_file_buffer_tags), info.c, info.h,
+ doc/info-stnd.texi:
+ new switch --strict-node-location to avoid being smart when
+ searching for nodes.
+
2010-03-17 Karl Berry <address@hidden>
* doc/texinfo.txi (Copying Conditions): import better "free software"
Index: doc/info-stnd.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/info-stnd.texi,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- doc/info-stnd.texi 16 Mar 2009 12:41:57 -0000 1.27
+++ doc/info-stnd.texi 17 Mar 2010 22:01:05 -0000 1.28
@@ -1,5 +1,5 @@
vb\input texinfo.tex @c -*-texinfo-*-
address@hidden $Id: info-stnd.texi,v 1.27 2009/03/16 12:41:57 karl Exp $
address@hidden $Id: info-stnd.texi,v 1.28 2010/03/17 22:01:05 pertusus Exp $
@c We must \input texinfo.tex instead of texinfo, otherwise make
@c distcheck in the Texinfo distribution fails, because the texinfo Info
@c file is made first, and texi2dvi must include . first in the path.
@@ -307,6 +307,14 @@
display support.) This allows the speech synthesizers used by blind
persons to catch the output and convert it to audible speech.
address@hidden --strict-node-location
+This option causes Info not to search around when locating a node, and
+instead sticks to the information provided in the tag table in the info
+file. In general it is advisable not to use this option, since a
+malformed info file will become useless even if it is only slightly
+incorrect. The main use for this option is to be able to check that
+node locations are correctly setup in an info manual.
+
@item --subnodes
@cindex @code{--subnodes}, command line option
This option only has meaning when given in conjunction with
Index: doc/version-stnd.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/version-stnd.texi,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- doc/version-stnd.texi 20 Mar 2009 18:33:52 -0000 1.44
+++ doc/version-stnd.texi 17 Mar 2010 22:01:05 -0000 1.45
@@ -1,4 +1,4 @@
address@hidden UPDATED 16 March 2009
address@hidden UPDATED-MONTH March 2009
address@hidden UPDATED 17 March 2010
address@hidden UPDATED-MONTH March 2010
@set EDITION 4.13
@set VERSION 4.13
Index: info/info.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/info.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- info/info.c 14 Aug 2008 17:36:13 -0000 1.33
+++ info/info.c 17 Mar 2010 22:01:05 -0000 1.34
@@ -1,5 +1,5 @@
/* info.c -- Display nodes of Info files in multiple windows.
- $Id: info.c,v 1.33 2008/08/14 17:36:13 karl Exp $
+ $Id: info.c,v 1.34 2010/03/17 22:01:05 pertusus Exp $
Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
2004, 2005, 2007, 2008 Free Software Foundation, Inc.
@@ -82,6 +82,9 @@
/* Non-zero means print the absolute location of the file to be loaded. */
static int print_where_p = 0;
+/* Non-zero means don't try to be smart when searching for nodes. */
+int strict_node_location_p = 0;
+
#ifdef __MSDOS__
/* Non-zero indicates that screen output should be made 'speech-friendly'.
Since on MSDOS the usual behavior is to write directly to the video
@@ -113,6 +116,7 @@
{ "no-show-malformed-multibytes", 0, &show_malformed_multibyte_p, 0 },
{ "restore", 1, 0, RESTORE_OPTION },
{ "show-options", 0, 0, 'O' },
+ { "strict-node-location", 0, &strict_node_location_p, 1 },
{ "subnodes", 0, &dump_subnodes, 1 },
{ "usage", 0, 0, 'O' },
{ "version", 0, &print_version_p, 1 },
@@ -628,6 +632,7 @@
#endif
puts (_("\
+ --strict-node-location locate nodes without any searching.\n\
--subnodes recursively output menu items.\n\
--vi-keys use vi-like and less-like key bindings.\n\
--version display version information and exit.\n\
Index: info/info.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/info.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- info/info.h 10 May 2008 14:39:05 -0000 1.9
+++ info/info.h 17 Mar 2010 22:01:05 -0000 1.10
@@ -1,5 +1,5 @@
/* info.h -- Header file which includes all of the other headers.
- $Id: info.h,v 1.9 2008/05/10 14:39:05 gray Exp $
+ $Id: info.h,v 1.10 2010/03/17 22:01:05 pertusus Exp $
Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007
Free Software Foundation, Inc.
@@ -126,6 +126,9 @@
/* Non-zero means don't remove ANSI escape sequences from man pages. */
extern int raw_escapes_p;
+/* Non-zero means don't try to be smart when searching for nodes. */
+extern int strict_node_location_p;
+
/* Print FORMAT with ARG1 and ARG2. If the window system was initialized,
then the message is printed in the echo area. Otherwise, a message is
output to stderr. */
Index: info/nodes.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/nodes.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- info/nodes.c 23 Jan 2009 09:37:40 -0000 1.13
+++ info/nodes.c 17 Mar 2010 22:01:05 -0000 1.14
@@ -1,5 +1,5 @@
/* nodes.c -- how to get an Info file and node.
- $Id: nodes.c,v 1.13 2009/01/23 09:37:40 gray Exp $
+ $Id: nodes.c,v 1.14 2010/03/17 22:01:05 pertusus Exp $
Copyright (C) 1993, 1998, 1999, 2000, 2002, 2003, 2004, 2006, 2007,
2008, 2009 Free Software Foundation, Inc.
@@ -998,10 +998,16 @@
min = max = DEFAULT_INFO_FUDGE;
- if (tag->nodestart < DEFAULT_INFO_FUDGE)
+ if (strict_node_location_p)
+ {
+ min = 0;
+ max = 2;
+ }
+
+ if (tag->nodestart < min)
min = tag->nodestart;
- if (DEFAULT_INFO_FUDGE >
+ if (max >
(subfile->filesize - tag->nodestart))
max = subfile->filesize - tag->nodestart;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo ChangeLog doc/info-stnd.texi doc/versio...,
Patrice Dumas <=