[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo ChangeLog texi2html/texi2html.pl texi2h...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo ChangeLog texi2html/texi2html.pl texi2h... |
|
Date: |
Thu, 12 Aug 2010 22:30:59 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/08/12 22:30:58
Modified files:
. : ChangeLog
texi2html : texi2html.pl
texi2html/test/invalid/res/unclosed_verb_line_commands:
unclosed_verb_line_commands.2
texi2html/test/invalid/res/verb_and_char_end_of_line:
verb_and_char_end_of_line.2
texi2html/test/invalid/res/verb_not_closed: verb_not_closed.2
texi2html/test/invalid/res_all/texi_unclosed_verb_line_commands:
unclosed_verb_line_commands.2
texi2html/test/invalid/res_all/unclosed_verb_line_commands:
unclosed_verb_line_commands.2
texi2html/test/invalid/res_all/verb_and_char_end_of_line:
verb_and_char_end_of_line.2
texi2html/test/invalid/res_all/verb_not_closed:
verb_not_closed.2
texi2html/test/invalid/res_info/texi_unclosed_verb_line_commands:
unclosed_verb_line_commands.2
texi2html/test/invalid/res_info/unclosed_verb_line_commands:
unclosed_verb_line_commands.2
texi2html/test/invalid/res_info/verb_and_char_end_of_line:
verb_and_char_end_of_line.2
texi2html/test/invalid/res_info/verb_not_closed:
verb_not_closed.2
Log message:
* texi2html/texi2html.pl (close_stack): more precise error
message when closing @verb. Karl report.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1100&r2=1.1101
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/texi2html.pl?cvsroot=texinfo&r1=1.420&r2=1.421
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/invalid/res/unclosed_verb_line_commands/unclosed_verb_line_commands.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/invalid/res/verb_and_char_end_of_line/verb_and_char_end_of_line.2?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/invalid/res/verb_not_closed/verb_not_closed.2?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/invalid/res_all/texi_unclosed_verb_line_commands/unclosed_verb_line_commands.2?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/invalid/res_all/unclosed_verb_line_commands/unclosed_verb_line_commands.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/invalid/res_all/verb_and_char_end_of_line/verb_and_char_end_of_line.2?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/invalid/res_all/verb_not_closed/verb_not_closed.2?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/invalid/res_info/texi_unclosed_verb_line_commands/unclosed_verb_line_commands.2?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/invalid/res_info/unclosed_verb_line_commands/unclosed_verb_line_commands.2?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/invalid/res_info/verb_and_char_end_of_line/verb_and_char_end_of_line.2?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/invalid/res_info/verb_not_closed/verb_not_closed.2?cvsroot=texinfo&r1=1.3&r2=1.4
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1100
retrieving revision 1.1101
diff -u -b -r1.1100 -r1.1101
--- ChangeLog 12 Aug 2010 22:05:13 -0000 1.1100
+++ ChangeLog 12 Aug 2010 22:30:56 -0000 1.1101
@@ -1,3 +1,8 @@
+2010-08-13 Patrice Dumas <address@hidden>
+
+ * texi2html/texi2html.pl (close_stack): more precise error
+ message when closing @verb. Karl report.
+
2010-08-12 Patrice Dumas <address@hidden>
* texi2html/texi2html.pl (prepare_htmlxref): also use the
Index: texi2html/texi2html.pl
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/texi2html.pl,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -b -r1.420 -r1.421
--- texi2html/texi2html.pl 12 Aug 2010 22:05:18 -0000 1.420
+++ texi2html/texi2html.pl 12 Aug 2010 22:30:57 -0000 1.421
@@ -90,7 +90,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.420 2010/08/12 22:05:18 pertusus Exp $
+# $Id: texi2html.pl,v 1.421 2010/08/12 22:30:57 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.gnu.org/software/texinfo/";;
@@ -15962,7 +15962,16 @@
# use the beginning of the @-command for the error message
# line number if available.
$located_line_nr = $stack->[$stack_level]->{'line_nr'} if
(defined($stack->[$stack_level]->{'line_nr'}));
+ # $state->{'verb'} may not be defined if the @verb{ opening
+ # is followed by an end of line.
+ if ($style eq 'verb' and defined($state->{'verb'}))
+ {
+ line_error (sprintf(__("address@hidden missing closing
delimiter sequence: %s}"), $style, $state->{'verb'}), $located_line_nr);
+ }
+ else
+ {
line_error (sprintf(__("%c%s missing close brace"), ord('@'),
$style), $located_line_nr);
+ }
my ($result, $command) = close_style_command($text, $stack,
$state, $line_nr, '');
add_prev($text, $stack, $result) if (defined($result));
Index:
texi2html/test/invalid/res/unclosed_verb_line_commands/unclosed_verb_line_commands.2
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/invalid/res/unclosed_verb_line_commands/unclosed_verb_line_commands.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
---
texi2html/test/invalid/res/unclosed_verb_line_commands/unclosed_verb_line_commands.2
20 Dec 2009 20:23:04 -0000 1.1
+++
texi2html/test/invalid/res/unclosed_verb_line_commands/unclosed_verb_line_commands.2
12 Aug 2010 22:30:57 -0000 1.2
@@ -1,15 +1,15 @@
unclosed_verb_line_commands.texi:36: Next reference to nonexistent
address@hidden@ '
unclosed_verb_line_commands.texi:34: warning: unreferenced node
address@hidden@ ,next,,Top'
-unclosed_verb_line_commands.texi:6: @verb missing close brace
-unclosed_verb_line_commands.texi:34: @verb missing close brace
-unclosed_verb_line_commands.texi:7: @verb missing close brace
-unclosed_verb_line_commands.texi:4: @verb missing close brace
+unclosed_verb_line_commands.texi:6: @verb missing closing delimiter sequence:
T}
+unclosed_verb_line_commands.texi:34: @verb missing closing delimiter sequence:
n}
+unclosed_verb_line_commands.texi:7: @verb missing closing delimiter sequence:
t}
+unclosed_verb_line_commands.texi:4: @verb missing closing delimiter sequence:
S}
unclosed_verb_line_commands.texi:10: Misplaced {
unclosed_verb_line_commands.texi:11: Misplaced {
unclosed_verb_line_commands.texi:12: Menu reference to nonexistent node
`nodesub@ '
unclosed_verb_line_commands.texi:20: Misplaced {
unclosed_verb_line_commands.texi:21: Misplaced {
-unclosed_verb_line_commands.texi:24: @verb missing close brace
-unclosed_verb_line_commands.texi:28: @verb missing close brace
+unclosed_verb_line_commands.texi:24: @verb missing closing delimiter sequence:
T}
+unclosed_verb_line_commands.texi:28: @verb missing closing delimiter sequence:
T}
unclosed_verb_line_commands.texi:28: warning: Requested float type
address@hidden @ @c listoffloats' not previously used
-unclosed_verb_line_commands.texi:30: @verb missing close brace
+unclosed_verb_line_commands.texi:30: @verb missing closing delimiter sequence:
e}
Index:
texi2html/test/invalid/res/verb_and_char_end_of_line/verb_and_char_end_of_line.2
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/invalid/res/verb_and_char_end_of_line/verb_and_char_end_of_line.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
---
texi2html/test/invalid/res/verb_and_char_end_of_line/verb_and_char_end_of_line.2
22 Dec 2009 23:27:50 -0000 1.2
+++
texi2html/test/invalid/res/verb_and_char_end_of_line/verb_and_char_end_of_line.2
12 Aug 2010 22:30:58 -0000 1.3
@@ -1,2 +1,2 @@
-verb_and_char_end_of_line.texi:5: @verb missing close brace
+verb_and_char_end_of_line.texi:5: @verb missing closing delimiter sequence: *}
verb_and_char_end_of_line.texi:20: @verb missing close brace
Index: texi2html/test/invalid/res/verb_not_closed/verb_not_closed.2
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/invalid/res/verb_not_closed/verb_not_closed.2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- texi2html/test/invalid/res/verb_not_closed/verb_not_closed.2 6 Sep
2009 12:53:20 -0000 1.5
+++ texi2html/test/invalid/res/verb_not_closed/verb_not_closed.2 12 Aug
2010 22:30:58 -0000 1.6
@@ -1,2 +1,2 @@
warning: Must specify a title with a title command or @top
-verb_not_closed.texi:11: @verb missing close brace
+verb_not_closed.texi:11: @verb missing closing delimiter sequence: *}
Index:
texi2html/test/invalid/res_all/texi_unclosed_verb_line_commands/unclosed_verb_line_commands.2
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/invalid/res_all/texi_unclosed_verb_line_commands/unclosed_verb_line_commands.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
---
texi2html/test/invalid/res_all/texi_unclosed_verb_line_commands/unclosed_verb_line_commands.2
5 Nov 2009 22:55:38 -0000 1.2
+++
texi2html/test/invalid/res_all/texi_unclosed_verb_line_commands/unclosed_verb_line_commands.2
12 Aug 2010 22:30:58 -0000 1.3
@@ -1 +1 @@
-unclosed_verb_line_commands.texi:3: @verb missing close brace
+unclosed_verb_line_commands.texi:3: @verb missing closing delimiter sequence:
s}
Index:
texi2html/test/invalid/res_all/unclosed_verb_line_commands/unclosed_verb_line_commands.2
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/invalid/res_all/unclosed_verb_line_commands/unclosed_verb_line_commands.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
---
texi2html/test/invalid/res_all/unclosed_verb_line_commands/unclosed_verb_line_commands.2
20 Dec 2009 20:23:04 -0000 1.1
+++
texi2html/test/invalid/res_all/unclosed_verb_line_commands/unclosed_verb_line_commands.2
12 Aug 2010 22:30:58 -0000 1.2
@@ -1,16 +1,16 @@
-unclosed_verb_line_commands.texi:3: @verb missing close brace
+unclosed_verb_line_commands.texi:3: @verb missing closing delimiter sequence:
s}
unclosed_verb_line_commands.texi:36: Next reference to nonexistent
address@hidden@ '
unclosed_verb_line_commands.texi:34: warning: unreferenced node
address@hidden@ ,next,,Top'
-unclosed_verb_line_commands.texi:6: @verb missing close brace
-unclosed_verb_line_commands.texi:34: @verb missing close brace
-unclosed_verb_line_commands.texi:7: @verb missing close brace
-unclosed_verb_line_commands.texi:4: @verb missing close brace
+unclosed_verb_line_commands.texi:6: @verb missing closing delimiter sequence:
T}
+unclosed_verb_line_commands.texi:34: @verb missing closing delimiter sequence:
n}
+unclosed_verb_line_commands.texi:7: @verb missing closing delimiter sequence:
t}
+unclosed_verb_line_commands.texi:4: @verb missing closing delimiter sequence:
S}
unclosed_verb_line_commands.texi:10: Misplaced {
unclosed_verb_line_commands.texi:11: Misplaced {
unclosed_verb_line_commands.texi:12: Menu reference to nonexistent node
`nodesub@ '
unclosed_verb_line_commands.texi:20: Misplaced {
unclosed_verb_line_commands.texi:21: Misplaced {
-unclosed_verb_line_commands.texi:24: @verb missing close brace
-unclosed_verb_line_commands.texi:28: @verb missing close brace
+unclosed_verb_line_commands.texi:24: @verb missing closing delimiter sequence:
T}
+unclosed_verb_line_commands.texi:28: @verb missing closing delimiter sequence:
T}
unclosed_verb_line_commands.texi:28: warning: Requested float type
address@hidden @ @c listoffloats' not previously used
-unclosed_verb_line_commands.texi:30: @verb missing close brace
+unclosed_verb_line_commands.texi:30: @verb missing closing delimiter sequence:
e}
Index:
texi2html/test/invalid/res_all/verb_and_char_end_of_line/verb_and_char_end_of_line.2
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/invalid/res_all/verb_and_char_end_of_line/verb_and_char_end_of_line.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
---
texi2html/test/invalid/res_all/verb_and_char_end_of_line/verb_and_char_end_of_line.2
22 Dec 2009 23:27:53 -0000 1.2
+++
texi2html/test/invalid/res_all/verb_and_char_end_of_line/verb_and_char_end_of_line.2
12 Aug 2010 22:30:58 -0000 1.3
@@ -1,2 +1,2 @@
-verb_and_char_end_of_line.texi:5: @verb missing close brace
+verb_and_char_end_of_line.texi:5: @verb missing closing delimiter sequence: *}
verb_and_char_end_of_line.texi:20: @verb missing close brace
Index: texi2html/test/invalid/res_all/verb_not_closed/verb_not_closed.2
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/invalid/res_all/verb_not_closed/verb_not_closed.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- texi2html/test/invalid/res_all/verb_not_closed/verb_not_closed.2 30 Aug
2009 23:11:33 -0000 1.3
+++ texi2html/test/invalid/res_all/verb_not_closed/verb_not_closed.2 12 Aug
2010 22:30:58 -0000 1.4
@@ -1 +1 @@
-verb_not_closed.texi:11: @verb missing close brace
+verb_not_closed.texi:11: @verb missing closing delimiter sequence: *}
Index:
texi2html/test/invalid/res_info/texi_unclosed_verb_line_commands/unclosed_verb_line_commands.2
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/invalid/res_info/texi_unclosed_verb_line_commands/unclosed_verb_line_commands.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
---
texi2html/test/invalid/res_info/texi_unclosed_verb_line_commands/unclosed_verb_line_commands.2
5 Nov 2009 22:55:40 -0000 1.2
+++
texi2html/test/invalid/res_info/texi_unclosed_verb_line_commands/unclosed_verb_line_commands.2
12 Aug 2010 22:30:58 -0000 1.3
@@ -1 +1 @@
-unclosed_verb_line_commands.texi:3: @verb missing close brace
+unclosed_verb_line_commands.texi:3: @verb missing closing delimiter sequence:
s}
Index:
texi2html/test/invalid/res_info/unclosed_verb_line_commands/unclosed_verb_line_commands.2
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/invalid/res_info/unclosed_verb_line_commands/unclosed_verb_line_commands.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
---
texi2html/test/invalid/res_info/unclosed_verb_line_commands/unclosed_verb_line_commands.2
22 Dec 2009 23:27:55 -0000 1.2
+++
texi2html/test/invalid/res_info/unclosed_verb_line_commands/unclosed_verb_line_commands.2
12 Aug 2010 22:30:58 -0000 1.3
@@ -1,17 +1,17 @@
-unclosed_verb_line_commands.texi:3: @verb missing close brace
+unclosed_verb_line_commands.texi:3: @verb missing closing delimiter sequence:
s}
unclosed_verb_line_commands.texi:36: Next reference to nonexistent
address@hidden@ '
unclosed_verb_line_commands.texi:34: warning: unreferenced node
address@hidden@ ,next,,Top'
-unclosed_verb_line_commands.texi:6: @verb missing close brace
-unclosed_verb_line_commands.texi:34: @verb missing close brace
-unclosed_verb_line_commands.texi:7: @verb missing close brace
-unclosed_verb_line_commands.texi:4: @verb missing close brace
+unclosed_verb_line_commands.texi:6: @verb missing closing delimiter sequence:
T}
+unclosed_verb_line_commands.texi:34: @verb missing closing delimiter sequence:
n}
+unclosed_verb_line_commands.texi:7: @verb missing closing delimiter sequence:
t}
+unclosed_verb_line_commands.texi:4: @verb missing closing delimiter sequence:
S}
unclosed_verb_line_commands.texi:10: Misplaced {
unclosed_verb_line_commands.texi:11: Misplaced {
unclosed_verb_line_commands.texi:12: Menu reference to nonexistent node
`nodesub@ '
unclosed_verb_line_commands.texi:20: Misplaced {
unclosed_verb_line_commands.texi:21: Misplaced {
-unclosed_verb_line_commands.texi:24: @verb missing close brace
-unclosed_verb_line_commands.texi:28: @verb missing close brace
+unclosed_verb_line_commands.texi:24: @verb missing closing delimiter sequence:
T}
+unclosed_verb_line_commands.texi:28: @verb missing closing delimiter sequence:
T}
unclosed_verb_line_commands.texi:28: warning: Requested float type
address@hidden @ @c listoffloats' not previously used
-unclosed_verb_line_commands.texi:30: @verb missing close brace
+unclosed_verb_line_commands.texi:30: @verb missing closing delimiter sequence:
e}
warning: Document without Top node.
Index:
texi2html/test/invalid/res_info/verb_and_char_end_of_line/verb_and_char_end_of_line.2
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/invalid/res_info/verb_and_char_end_of_line/verb_and_char_end_of_line.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
---
texi2html/test/invalid/res_info/verb_and_char_end_of_line/verb_and_char_end_of_line.2
22 Dec 2009 23:27:56 -0000 1.2
+++
texi2html/test/invalid/res_info/verb_and_char_end_of_line/verb_and_char_end_of_line.2
12 Aug 2010 22:30:58 -0000 1.3
@@ -1,2 +1,2 @@
-verb_and_char_end_of_line.texi:5: @verb missing close brace
+verb_and_char_end_of_line.texi:5: @verb missing closing delimiter sequence: *}
verb_and_char_end_of_line.texi:20: @verb missing close brace
Index: texi2html/test/invalid/res_info/verb_not_closed/verb_not_closed.2
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/invalid/res_info/verb_not_closed/verb_not_closed.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- texi2html/test/invalid/res_info/verb_not_closed/verb_not_closed.2 30 Aug
2009 23:11:34 -0000 1.3
+++ texi2html/test/invalid/res_info/verb_not_closed/verb_not_closed.2 12 Aug
2010 22:30:58 -0000 1.4
@@ -1 +1 @@
-verb_not_closed.texi:11: @verb missing close brace
+verb_not_closed.texi:11: @verb missing closing delimiter sequence: *}