[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Tue Feb 19 10:23:01 EST 2008)
|
From: |
Karl Berry |
|
Subject: |
texinfo update (Tue Feb 19 10:23:01 EST 2008) |
|
Date: |
Tue, 19 Feb 2008 10:23:05 -0500 |
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.822
retrieving revision 1.823
diff -u -r1.822 -r1.823
--- ChangeLog 18 Feb 2008 01:05:59 -0000 1.822
+++ ChangeLog 19 Feb 2008 14:58:28 -0000 1.823
@@ -1,3 +1,14 @@
+2008-02-19 Karl Berry <address@hidden>
+
+ * info/infodoc.c (info_internal_help_text): rearrangements.
+ * info/session.c (cursor_movement_scrolls_p): 1 by default.
+ * info/window.c (window_scroll_step): 1 by default.
+ * info/infomap.c <key bindings>: h to info_get_help_window,
+ H to info_get_info_help_node,
+ PgUp to info_scroll_backward, PgDown to info_scroll_forward,
+ move q to after C-x C-c .
+ Suggestions from Benno Schulenberg, 04 Jan 2008 23:20:46.
+
2008-02-17 Karl Berry <address@hidden>
* util/texi2dvi (EGREP): need egrep early.
Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- NEWS 11 Feb 2008 16:47:13 -0000 1.161
+++ NEWS 19 Feb 2008 14:58:29 -0000 1.162
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.161 2008/02/11 16:47:13 karl Exp $
+$Id: NEWS,v 1.162 2008/02/19 14:58:29 karl Exp $
This NEWS file records noteworthy changes, very tersely.
See the manual for detailed information.
@@ -48,8 +48,16 @@
. New section in the Texinfo manual describing all this.
* Info:
- . regular expression searches are now the default for both regular
- and incremental searches.
+ Our goal with these changes to the default interface is to make Info
+ documents more easily and quickly readable, especially by non-experts.
+ . the PageUp and PageDown keys move through the whole document by
+ default, instead of just the current node.
+ . the h command shows the basic help, and H starts the Info tutorial.
+ . the scroll-step variable is set to 1 by default, for smooth scrolling.
+ . the cursor-movement-scrolls-p variable is set to 1 by default, so
+ link searches look through the whole document.
+ . regular expression searches are supported, and are the default for
+ both regular and incremental searches.
. the new R command toggles between regexp and literal-string searches.
. the precise line number specified in index entries is used if available.
. --usage=info shows usage for standalone Info.
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/TODO,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- TODO 10 Feb 2008 00:05:26 -0000 1.41
+++ TODO 19 Feb 2008 14:58:29 -0000 1.42
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.41 2008/02/10 00:05:26 karl Exp $
+$Id: TODO,v 1.42 2008/02/19 14:58:29 karl Exp $
This is the todo list for GNU Texinfo.
If you are interested in working on any of these, email address@hidden
@@ -134,6 +134,10 @@
- Support multibyte character sets, principally UTF-8; most
critically, do not break multibyte characters across lines.
http://lists.gnu.org/archive/html/bug-texinfo/2006-08/msg00001.html
+ - The help message does not report Down/Up for next/prev-line.
+ - It would be nice for h in the help window to quit help.
+ - It would be nice to be able to specify a preferred key to report in
+ the help message, instead of using the last one set; cf. q vs. C-x C-c.
- Full-text search across all info files installed on the system.
- Perhaps comply with LANGUAGE setting on a per-node basis, to allow
incremental translation of Texinfo files.
Index: info/infodoc.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infodoc.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- info/infodoc.c 3 Dec 2007 01:38:42 -0000 1.16
+++ info/infodoc.c 19 Feb 2008 14:58:29 -0000 1.17
@@ -1,8 +1,8 @@
/* infodoc.c -- functions which build documentation nodes.
- $Id: infodoc.c,v 1.16 2007/12/03 01:38:42 karl Exp $
+ $Id: infodoc.c,v 1.17 2008/02/19 14:58:29 karl Exp $
- Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2006, 2007
- Free Software Foundation, Inc.
+ Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 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
@@ -51,16 +51,13 @@
"\n",
N_("Selecting other nodes:\n\
----------------------\n"),
- N_("\\%-10[next-node] Move to the \"next\" node of this node.\n"),
- N_("\\%-10[prev-node] Move to the \"previous\" node of this node.\n"),
- N_("\\%-10[up-node] Move \"up\" from this node.\n"),
- N_("\\%-10[menu-item] Pick menu item specified by name.\n\
- Picking a menu item causes another node to be selected.\n"),
- N_("\\%-10[xref-item] Follow a cross reference. Reads name of
reference.\n"),
- N_("\\%-10[history-node] Move to the last node seen in this window.\n"),
+ N_("\\%-10[global-next-node] Move to the next node in the document.\n"),
+ N_("\\%-10[global-prev-node] Move to the previous node in the document.\n"),
N_("\\%-10[move-to-next-xref] Skip to next hypertext link [*].\n"),
- N_("\\%-10[move-to-prev-xref] Skip to previous hypertext link [*].\n"),
N_("\\%-10[select-reference-this-line] Follow the hypertext link under
cursor.\n"),
+ N_("\\%-10[move-to-prev-xref] Skip to previous hypertext link [*].\n"),
+ N_("\\%-10[up-node] Move \"up\" from this node.\n"),
+ N_("\\%-10[history-node] Move to the last node seen in this window.\n"),
N_("\\%-10[dir-node] Move to the `directory' node. Equivalent to
`\\[goto-node] (DIR)'.\n"),
N_("\\%-10[top-node] Move to the Top node. Equivalent to `\\[goto-node]
Top'.\n"),
"\n",
@@ -69,25 +66,29 @@
"\n",
N_("Moving within a node:\n\
---------------------\n"),
- N_("\\%-10[beginning-of-node] Go to the beginning of this node.\n"),
+ N_("\\%-10[beginning-of-node] Go to the beginning this node.\n"),
N_("\\%-10[end-of-node] Go to the end of this node.\n"),
- N_("\\%-10[next-line] Scroll forward 1 line.\n"),
- N_("\\%-10[prev-line] Scroll backward 1 line.\n"),
- N_("\\%-10[scroll-forward] Scroll forward a page.\n"),
- N_("\\%-10[scroll-backward] Scroll backward a page.\n"),
+ N_("\\%-10[next-line] Scroll forward one line.\n"),
+ N_("\\%-10[prev-line] Scroll backward one line.\n"),
+ N_("\\%-10[scroll-forward-page-only] Scroll forward within this node.\n"),
+ N_("\\%-10[scroll-backward-page-only] Scroll backward within this node.\n"),
"\n",
N_("Other commands:\n\
---------------\n"),
+ N_("\\%-10[search] Search forward for a specified string\n\
+ and select the node in which the next occurrence is found.\n"),
+ N_("\\%-10[search-backward] Search backward for a specified string\n\
+ and select the node in which the previous occurrence is
found.\n"),
N_("1...9 Pick first...ninth item in this node's menu.\n"),
N_("\\%-10[last-menu-item] Pick last item in this node's menu.\n"),
+ N_("\\%-10[menu-item] Pick menu item specified by name.\n"),
N_("\\%-10[index-search] Search for a specified string in the index entries
of this Info\n\
file, and select the node referenced by the first entry
found.\n"),
+ N_("\\%-10[xref-item] Follow a cross reference. Reads name of
reference.\n"),
N_("\\%-10[goto-node] Move to node specified by name.\n\
You may include a filename as well, as in
(FILENAME)NODENAME.\n"),
- N_("\\%-10[search] Search forward for a specified string\n\
- and select the node in which the next occurrence is found.\n"),
- N_("\\%-10[search-backward] Search backward for a specified string\n\
- and select the node in which the previous occurrence is
found.\n"),
+ N_("\\%-10[next-node] Move to the next node of current section.\n"),
+ N_("\\%-10[prev-node] Move to the previous node of current section.\n"),
NULL
};
Index: info/infomap.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infomap.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- info/infomap.c 17 Dec 2007 19:12:11 -0000 1.14
+++ info/infomap.c 19 Feb 2008 14:58:29 -0000 1.15
@@ -1,7 +1,7 @@
/* infomap.c -- keymaps for Info.
- $Id: infomap.c,v 1.14 2007/12/17 19:12:11 karl Exp $
+ $Id: infomap.c,v 1.15 2008/02/19 14:58:29 karl Exp $
- Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007
+ Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -269,6 +269,7 @@
return 1;
}
+
/* Initialize the standard info keymaps. */
Keymap info_keymap = NULL;
@@ -312,9 +313,9 @@
= ((Keymap) echo_area_keymap[ESC].function)[i].function
= info_add_digit_to_numeric_arg;
}
- ((Keymap) info_keymap[ESC].function)['-'].function =
- ((Keymap) echo_area_keymap[ESC].function)['-'].function =
- info_add_digit_to_numeric_arg;
+ ((Keymap) info_keymap[ESC].function)['-'].function
+ = ((Keymap) echo_area_keymap[ESC].function)['-'].function
+ = info_add_digit_to_numeric_arg;
info_keymap['-'].function = info_add_digit_to_numeric_arg;
@@ -495,7 +496,7 @@
/* Arrow key bindings for Info windows keymap. */
map = info_keymap;
- keymap_bind_keyseq (map, term_kN, &map[Control ('v')]); /* pagedown */
+ keymap_bind_keyseq (map, term_kN, &map[SPC]); /* pagedown */
keymap_bind_keyseq (map, term_ku, &map[Control ('p')]); /* up */
keymap_bind_keyseq (map, "\033OA", &map[Control ('p')]);
keymap_bind_keyseq (map, "\033[A", &map[Control ('p')]);
@@ -508,9 +509,9 @@
keymap_bind_keyseq (map, term_kl, &map[Control ('b')]); /* left */
keymap_bind_keyseq (map, "\033OD", &map[Control ('b')]);
keymap_bind_keyseq (map, "\033[D", &map[Control ('b')]);
- keymap_bind_keyseq (map, term_kh, &map['b']); /* home */
- keymap_bind_keyseq (map, term_ke, &map['e']); /* end */
- keymap_bind_keyseq (map, term_kD, &map[DEL]); /* delete */
+ keymap_bind_keyseq (map, term_kh, &map['b']); /* home */
+ keymap_bind_keyseq (map, term_ke, &map['e']); /* end */
+ keymap_bind_keyseq (map, term_kD, &map[DEL]); /* delete */
map = (Keymap)info_keymap[ESC].function;
keymap_bind_keyseq (map, term_kl, &map['b']); /* left */
@@ -519,7 +520,7 @@
keymap_bind_keyseq (map, term_kr, &map['f']); /* right */
keymap_bind_keyseq (map, "\033OB", &map['f']);
keymap_bind_keyseq (map, "\033[B", &map['f']);
- keymap_bind_keyseq (map, term_kN, &map[Control ('v')]); /* pagedown */
+ keymap_bind_keyseq (map, term_kN, &map[SPC]); /* pagedown */
keymap_bind_keyseq (map, term_kP, &map[DEL]); /* pageup */
keymap_bind_keyseq (map, term_kD, &map[DEL]); /* delete */
@@ -527,9 +528,10 @@
`ESC map' section, is something like:
keymap_bind_keyseq (map, term_kP, &((KeyMap)map[ESC].function).map['v']);
*/
- keymap_bind_keyseq (info_keymap/*sic*/, term_kP, &map['v']); /* pageup */
+ keymap_bind_keyseq (info_keymap/*sic*/, term_kP, &map[DEL]); /* pageup */
}
+
static void
initialize_vi_like_keymaps ()
{
@@ -552,21 +554,21 @@
echo_area_keymap[i].function = ea_insert;
echo_area_keymap[ESC].type = ISKMAP;
- echo_area_keymap[ESC].function = (InfoCommand *)keymap_make_keymap ();
+ echo_area_keymap[ESC].function = (InfoCommand *) keymap_make_keymap ();
echo_area_keymap[Control ('x')].type = ISKMAP;
- echo_area_keymap[Control ('x')].function =
- (InfoCommand *)keymap_make_keymap ();
+ echo_area_keymap[Control ('x')].function
+ = (InfoCommand *)keymap_make_keymap ();
/* Bind numeric arg functions for both echo area and info window maps. */
for (i = '0'; i < '9' + 1; i++)
{
- info_keymap[i].function =
- ((Keymap) echo_area_keymap[ESC].function)[i].function =
- info_add_digit_to_numeric_arg;
+ info_keymap[i].function
+ = ((Keymap) echo_area_keymap[ESC].function)[i].function
+ = info_add_digit_to_numeric_arg;
}
- info_keymap['-'].function =
- ((Keymap) echo_area_keymap[ESC].function)['-'].function =
- info_add_digit_to_numeric_arg;
+ info_keymap['-'].function
+ = ((Keymap) echo_area_keymap[ESC].function)['-'].function
+ = info_add_digit_to_numeric_arg;
/* Bind the echo area routines. */
map = echo_area_keymap;
@@ -822,7 +824,7 @@
`ESC map' section, is something like:
keymap_bind_keyseq (map, term_kP, &((KeyMap)map[ESC].function).map['v']);
*/
- keymap_bind_keyseq (info_keymap/*sic*/, term_kP, &map['v']); /* pageup */
+ keymap_bind_keyseq (info_keymap/*sic*/, term_kP, &map[DEL]); /* pageup */
}
void
@@ -889,14 +891,14 @@
'f', NUL, A_info_xref_item,
'g', NUL, A_info_goto_node,
'G', NUL, A_info_menu_sequence,
- 'h', NUL, A_info_get_info_help_node,
+ 'h', NUL, A_info_get_help_window,
+ 'H', NUL, A_info_get_info_help_node,
'i', NUL, A_info_index_search,
'l', NUL, A_info_history_node,
'm', NUL, A_info_menu_item,
'n', NUL, A_info_next_node,
'O', NUL, A_info_goto_invocation_node,
'p', NUL, A_info_prev_node,
- 'q', NUL, A_info_quit,
'r', NUL, A_info_xref_item,
'R', NUL, A_info_toggle_regexp,
's', NUL, A_info_search,
@@ -968,12 +970,15 @@
CONTROL('x'), 't', NUL, A_info_tile_windows,
CONTROL('x'), 'w', NUL, A_info_toggle_wrap,
+ /* We want help to report q, not C-x C-c. */
+ 'q', NUL, A_info_quit,
+
/* Arrow key bindings for info keymaps. It seems that some
terminals do not match their termcap entries, so it's best to just
define everything with both of the usual prefixes. */
- SK_ESCAPE, SK_PAGE_UP, NUL,
A_info_scroll_backward_page_only,
- SK_ESCAPE, SK_PAGE_DOWN, NUL,
A_info_scroll_forward_page_only,
+ SK_ESCAPE, SK_PAGE_UP, NUL, A_info_scroll_backward,
+ SK_ESCAPE, SK_PAGE_DOWN, NUL, A_info_scroll_forward,
SK_ESCAPE, SK_UP_ARROW, NUL, A_info_prev_line,
'\033', 'O', 'A', NUL, A_info_prev_line,
'\033', '[', 'A', NUL, A_info_prev_line,
@@ -1191,7 +1196,6 @@
'N', NUL, A_info_search_previous,
'O', NUL, A_info_goto_invocation_node,
'p', NUL, A_info_prev_node,
- 'q', NUL, A_info_quit,
'Q', NUL, A_info_quit,
':', 'q', NUL, A_info_quit,
':', 'Q', NUL, A_info_quit,
@@ -1259,12 +1263,15 @@
CONTROL('x'), 'w', NUL, A_info_toggle_wrap,
CONTROL('x'), ',', NUL, A_info_next_index_match,
+ /* We want help to report q, not C-x C-c. */
+ 'q', NUL, A_info_quit,
+
/* Arrow key bindings for info keymaps. It seems that some
terminals do not match their termcap entries, so it's best to just
define everything with both of the usual prefixes. */
- SK_ESCAPE, SK_PAGE_UP, NUL,
A_info_scroll_backward_page_only,
- SK_ESCAPE, SK_PAGE_DOWN, NUL,
A_info_scroll_forward_page_only,
+ SK_ESCAPE, SK_PAGE_UP, NUL, A_info_scroll_backward,
+ SK_ESCAPE, SK_PAGE_DOWN, NUL, A_info_scroll_forward,
SK_ESCAPE, SK_UP_ARROW, NUL, A_info_up_line,
'\033', 'O', 'A', NUL, A_info_up_line,
'\033', '[', 'A', NUL, A_info_up_line,
Index: info/session.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/session.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- info/session.c 11 Feb 2008 16:47:13 -0000 1.27
+++ info/session.c 19 Feb 2008 14:58:29 -0000 1.28
@@ -1,5 +1,5 @@
/* session.c -- user windowing interface to Info.
- $Id: session.c,v 1.27 2008/02/11 16:47:13 karl Exp $
+ $Id: session.c,v 1.28 2008/02/19 14:58:29 karl Exp $
Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
2004, 2007, 2008 Free Software Foundation, Inc.
@@ -959,7 +959,7 @@
};
/* Controls whether scroll-behavior affects line movement commands */
-int cursor_movement_scrolls_p = 0;
+int cursor_movement_scrolls_p = 1;
/* Default window sizes for scrolling commands. */
int default_window_size = -1; /* meaning 1 window-full */
Index: info/window.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/window.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- info/window.c 19 Oct 2007 18:43:20 -0000 1.8
+++ info/window.c 19 Feb 2008 14:58:29 -0000 1.9
@@ -1,7 +1,7 @@
/* window.c -- windows in Info.
- $Id: window.c,v 1.8 2007/10/19 18:43:20 karl Exp $
+ $Id: window.c,v 1.9 2008/02/19 14:58:29 karl Exp $
- Copyright (C) 1993, 1997, 1998, 2001, 2002, 2003, 2004, 2007
+ Copyright (C) 1993, 1997, 1998, 2001, 2002, 2003, 2004, 2007, 2008
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -917,11 +917,11 @@
calculate_line_starts (window);
}
-/* Global variable control redisplay of scrolled windows. If non-zero, it
- is the desired number of lines to scroll the window in order to make
- point visible. A user might set this to 1 for smooth scrolling. If
- set to zero, the line containing point is centered within the window. */
-int window_scroll_step = 0;
+/* Global variable control redisplay of scrolled windows. If non-zero,
+ it is the desired number of lines to scroll the window in order to
+ make point visible. A value of 1 produces smooth scrolling. If set
+ to zero, the line containing point is centered within the window. */
+int window_scroll_step = 1;
/* Adjust the pagetop of WINDOW such that the cursor point will be visible. */
void
P ChangeLog
P NEWS
P TODO
P info/infodoc.c
P info/infomap.c
P info/session.c
P info/window.c
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Tue Feb 19 10:23:01 EST 2008),
Karl Berry <=