[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog texi2html.pl test/invalid/M...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog texi2html.pl test/invalid/M... |
|
Date: |
Thu, 17 Sep 2009 08:51:05 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 09/09/17 08:51:05
Modified files:
. : ChangeLog texi2html.pl
test/invalid : Makefile.am Makefile.in
test/macros : Makefile.am Makefile.in
Added files:
test/formatting/res_info/line_commands_comments_spaces:
`setfilename.info '
test/invalid : unclosed_verb_line_commands.texi
test/macros : setfilename_space_comment.texi
space_end_setfilename.texi
test/macros/res_info/space_in_setfilename: ` name '
Log message:
* texi2html.pl: use global information for @printindex not
associated with any element.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.435&r2=1.436
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.334&r2=1.335
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/line_commands_comments_spaces/setfilename.info%32?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/Makefile.am?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/Makefile.in?cvsroot=texi2html&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/unclosed_verb_line_commands.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/Makefile.am?cvsroot=texi2html&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/Makefile.in?cvsroot=texi2html&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/setfilename_space_comment.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/space_end_setfilename.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_info/space_in_setfilename/%32%32name%32%32?cvsroot=texi2html&rev=1.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -b -r1.435 -r1.436
--- ChangeLog 16 Sep 2009 08:43:13 -0000 1.435
+++ ChangeLog 17 Sep 2009 08:51:04 -0000 1.436
@@ -1,3 +1,8 @@
+2009-09-17 Patrice Dumas <address@hidden>
+
+ * texi2html.pl: use global information for @printindex not
+ associated with any element.
+
2009-09-16 Patrice Dumas <address@hidden>
* texi2html.pl, texi2html.init: hold the index entries gathered
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -b -r1.334 -r1.335
--- texi2html.pl 16 Sep 2009 08:43:13 -0000 1.334
+++ texi2html.pl 17 Sep 2009 08:51:04 -0000 1.335
@@ -86,7 +86,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.334 2009/09/16 08:43:13 pertusus Exp $
+# $Id: texi2html.pl,v 1.335 2009/09/17 08:51:04 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -1009,7 +1009,7 @@
my @letters = ();
foreach my $letter_entry
(@{$Texi2HTML::THISDOC{'index_letters_array'}->{$index_name}})
{
- push @letters, $letter_entry->{'letter'};
+ push @letters, $letter_entry;
$entries_count += scalar(@{$letter_entry->{'entries'}});
# Don't split if document is not split
if (get_conf('SPLIT') and $SPLIT_INDEX and $entries_count >=
$SPLIT_INDEX)
@@ -1023,23 +1023,6 @@
}
}
-
-#Â this is used for indices that don't appear to be associated
-sub t2h_default_prepare_printindex_unsplit_groups($)
-{
- my $printindex = shift;
- my $index_name = $printindex->{'name'};
- my @letter_groups = ();
- return if (!exists($t2h_default_index_letters_array{$index_name}));
- my @letters_split = @{$t2h_default_index_letters_array{$index_name}};
- foreach my $letters_split (@letters_split)
- {
- push @{$letter_groups[0]->{'letters'}}, @$letters_split;
- }
- $letter_groups[0]->{'element'} = {'file' => '', 'id' =>
"$printindex->{'region'}_printindex"};
- $printindex->{'split_groups'} = address@hidden;
-}
-
sub t2h_default_associate_index_element($$$$)
{
my $element = shift;
@@ -1138,8 +1121,8 @@
#print STDERR "Pushing $element, $element->{'texi'}, $printindex\n";
foreach my $split_group (@letter_groups)
{
- my $first_letter = $split_group->{'letters'}->[0];
- my $last_letter = $split_group->{'letters'}->[-1];
+ my $first_letter = $split_group->{'letters'}->[0]->{'letter'};
+ my $last_letter = $split_group->{'letters'}->[-1]->{'letter'};
if (!$split_group->{'element'})
{
#construct new element name
@@ -1198,7 +1181,7 @@
{
push @{$current_element->{'place'}}, $place;
}
- $printindex->{'split_groups'} = address@hidden;
+ $printindex->{'split_groups'} = address@hidden;# if
(scalar(@letter_groups)>1);
#print STDERR "$index_name processed for $element, $element->{'texi'}
(@{$printindex->{'split_groups'}})\n";
}
@@ -1219,8 +1202,8 @@
#print STDERR " I Processing $printindex $printindex->{'name'}
(@{$printindex->{'split_groups'}})\n";
foreach my $split_group (@{$printindex->{'split_groups'}})
{
- my $first_letter = $split_group->{'letters'}->[0];
- my $last_letter = $split_group->{'letters'}->[-1];
+ my $first_letter = $split_group->{'letters'}->[0]->{'letter'};
+ my $last_letter = $split_group->{'letters'}->[-1]->{'letter'};
my $new_element = $split_group->{'element'};
next if ($current_element eq $new_element);
@@ -1305,34 +1288,47 @@
my $printindex = shift;
# could be cross verified with argument
- my %letter_entries;
my $identifier_index_nr = 0;
#print STDERR "Doing printindex $index_name\n";
- return '' if (! defined($printindex->{'split_groups'}));
- my @split_letters = @{$printindex->{'split_groups'}};
+ my @split_letters;
- return '' if (!scalar(@split_letters));
+ if (defined($printindex->{'split_groups'}) and
scalar(@{$printindex->{'split_groups'}}))
+ {
+ @split_letters = @{$printindex->{'split_groups'}};
+ }
+ elsif (defined($Texi2HTML::THISDOC{'index_letters_array'}->{$index_name})
and scalar(@{$Texi2HTML::THISDOC{'index_letters_array'}->{$index_name}}))
+ {
+ my $element = $printindex->{'associated_element'};
+ #Â this happens for printindex before the first element.
+ $element = {'file' => '', 'id' => "$printindex->{'region'}_printindex"}
if (!defined($element));
+ @split_letters = ({ 'letters' =>
$Texi2HTML::THISDOC{'index_letters_array'}->{$index_name}, 'element' =>
$element});
+ }
+ else
+ {
+ return '';
+ }
foreach my $split_group (@split_letters)
{
#do summmary
my @non_alpha = ();
my @alpha = ();
- my $file = $split_group->{'element'}->{'file'};
- #print STDERR "$index_name @{$split_group->{'letters'}}: $file\n";
+ #print STDERR "$index_name @{$split_group->{'letters'}}\n";
# letter_id could be done once for all instead of for each split_group
# and outside of t2h_default_summary_letter (or t2h_default_summary_letter
# could be simplified and inlined
my %letter_id;
foreach my $summary_split_group (@split_letters)
{
- foreach my $letter (@{$summary_split_group->{'letters'}})
+ foreach my $letter_entry (@{$summary_split_group->{'letters'}})
{
+ my $letter = $letter_entry->{'letter'};
my $dest_file = '';
$dest_file = $summary_split_group->{'element'}->{'file'}
if ($summary_split_group ne $split_group);
my $index_element_id = $summary_split_group->{'element'}->{'id'};
my $default_identifier = $index_element_id . "_$identifier_index_nr";
+ #print STDERR "$split_group $summary_split_group
$summary_split_group->{'element'} $summary_split_group->{'element'}->{'id'}
$identifier_index_nr $index_element_id $default_identifier\n";
$identifier_index_nr++;
my ($result, $identifier, $is_symbol) =
&$summary_letter($letter, $dest_file, $default_identifier,
$index_element_id, '', '', $index_name);
@@ -1359,11 +1355,11 @@
$t2h_symbol_indices = 0;
my $letters_text = '';
- #foreach my $letter_entry (@{$split_group->{'letters'}})
- foreach my $letter (@{$split_group->{'letters'}})
+ foreach my $letter_entry (@{$split_group->{'letters'}})
{
+ my $letter = $letter_entry->{'letter'};
my $entries_text = '';
- foreach my $index_entry_ref
(@{$Texi2HTML::THISDOC{'index_letters_hash'}->{$index_name}->{$letter}})
+ foreach my $index_entry_ref (@{$letter_entry->{'entries'}})
{
my ($text_href, $entry_file, $element_file, $entry_target,
$entry_element_target, $formatted_entry, $element_href,
$entry_element_text)
@@ -5791,7 +5787,6 @@
my @sorted_letter_entries = (sort {uc($a->{'key'}) cmp
uc($b->{'key'})} (@{$letters_hash{$letter}}));
push @{$Texi2HTML::THISDOC{'index_letters_array'}->{$index_name}}, {
'letter' => $letter, 'entries' => address@hidden };
- $Texi2HTML::THISDOC{'index_letters_hash'}->{$index_name}->{$letter}
= address@hidden;
}
}
Texi2HTML::Config::t2h_default_init_split_indices();
@@ -7138,18 +7133,6 @@
print STDERR "# no element at all, setting
$element_before_anything->{'file'} for $element_before_anything->{'texi'}\n" if
($T2H_DEBUG & $DEBUG_ELEMENTS);
}
}
- #Â prepare printindices that are not in elements
- foreach my $region (keys %{$Texi2HTML::THISDOC{'indices'}})
- {
- foreach my $index_name (keys
%{$Texi2HTML::THISDOC{'indices'}->{$region}})
- {
- foreach my $printindex
(@{$Texi2HTML::THISDOC{'indices'}->{$region}->{$index_name}})
- {
- next if ($printindex->{'split_groups'});
-
Texi2HTML::Config::t2h_default_prepare_printindex_unsplit_groups($printindex);
- }
- }
- }
# correct the id and file for the things placed in footnotes
foreach my $place(@{$footnote_element->{'place'}})
@@ -15847,8 +15830,6 @@
%{$Texi2HTML::THISDOC{'index_letters_array'}} = (); #Â holds the sorted
#Â index letters for each index name. The sorted
#Â letters hold the sorted index entries
- %{$Texi2HTML::THISDOC{'index_letters_hash'}} = (); #Â the same but letters
- #Â are in a hash
my ($doc_lines, $doc_numbers) = pass_structure($texi_lines, $lines_numbers);
if ($T2H_DEBUG & $DEBUG_TEXI)
Index: test/invalid/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/invalid/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/invalid/Makefile.am 15 Sep 2009 18:21:44 -0000 1.10
+++ test/invalid/Makefile.am 17 Sep 2009 08:51:05 -0000 1.11
@@ -13,6 +13,7 @@
ref_to_unknown_node.texi def_bad_defx_command.texi \
direntry_dircategory_after_first_node.texi node_too_much_arguments.texi \
bad_documentencoding.texi error_in_footnote_caption.texi \
+ unclosed_verb_line_commands.texi \
tests.txt res res_all res_info
DISTCLEANFILES = l2h_tmp_dir.init tests.log tests.out
Index: test/invalid/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/invalid/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- test/invalid/Makefile.in 15 Sep 2009 18:21:44 -0000 1.16
+++ test/invalid/Makefile.in 17 Sep 2009 08:51:05 -0000 1.17
@@ -148,6 +148,7 @@
ref_to_unknown_node.texi def_bad_defx_command.texi \
direntry_dircategory_after_first_node.texi node_too_much_arguments.texi \
bad_documentencoding.texi error_in_footnote_caption.texi \
+ unclosed_verb_line_commands.texi \
tests.txt res res_all res_info
DISTCLEANFILES = l2h_tmp_dir.init tests.log tests.out
Index: test/macros/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/macros/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- test/macros/Makefile.am 15 Sep 2009 18:21:51 -0000 1.13
+++ test/macros/Makefile.am 17 Sep 2009 08:51:05 -0000 1.14
@@ -11,7 +11,8 @@
test_include_with_setfilename.texi no_arg_macro.texi \
simple_imbricated_macro.texi test_paths.texi \
setfilename_comment.texi double_setfilename.texi bad_setfilename.texi \
- space_in_setfilename.texi \
+ space_in_setfilename.texi space_end_setfilename.texi
+ setfilename_space_comment.texi \
address@hidden \
file.texi inc_file.texi macro_included.texi my-bib-macros.texi \
incl-incl.txi included_file_with_setfilename.texi \
Index: test/macros/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/macros/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- test/macros/Makefile.in 15 Sep 2009 18:21:51 -0000 1.18
+++ test/macros/Makefile.in 17 Sep 2009 08:51:05 -0000 1.19
@@ -146,11 +146,7 @@
test_include_with_setfilename.texi no_arg_macro.texi \
simple_imbricated_macro.texi test_paths.texi \
setfilename_comment.texi double_setfilename.texi bad_setfilename.texi \
- space_in_setfilename.texi \
- address@hidden \
- file.texi inc_file.texi macro_included.texi my-bib-macros.texi \
- incl-incl.txi included_file_with_setfilename.texi \
- tests.txt res res_all res_info
+ space_in_setfilename.texi space_end_setfilename.texi
DISTCLEANFILES = l2h_tmp_dir.init tests.log tests.out
all: all-am
@@ -335,6 +331,11 @@
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am
+ setfilename_space_comment.texi \
+ address@hidden \
+ file.texi inc_file.texi macro_included.texi my-bib-macros.texi \
+ incl-incl.txi included_file_with_setfilename.texi \
+ tests.txt res res_all res_info
distclean-local:
rm -rf out out_all out_info diffs
Index: test/formatting/res_info/line_commands_comments_spaces/setfilename.info
===================================================================
RCS file:
test/formatting/res_info/line_commands_comments_spaces/setfilename.info
diff -N test/formatting/res_info/line_commands_comments_spaces/setfilename.info
Binary files /dev/null and /tmp/cvsoCYHRU differ
Index: test/invalid/unclosed_verb_line_commands.texi
===================================================================
RCS file: test/invalid/unclosed_verb_line_commands.texi
diff -N test/invalid/unclosed_verb_line_commands.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/invalid/unclosed_verb_line_commands.texi 17 Sep 2009 08:51:05
-0000 1.1
@@ -0,0 +1,37 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden @verb{setfilename.info @c setfilename
address@hidden @verb{Settitle @c settittle
+
address@hidden @verb{Top @c comment mode
address@hidden @verb{top element@ @comment @top
+
address@hidden
+* (gcc)node::{@ @c comment menu entry
+* node {name:(truc)node@ @c comment menu entru node
+* nodesub@ ::
+* next::
address@hidden menu
+
address@hidden @verb{Heading @ @c heading
+
address@hidden quotation argument is put within @b and prepended, therefore a
@verb{
address@hidden will extend to the end of the file.
address@hidden {truc@ @c quotation
+In quotation
address@hidden quotation
+
address@hidden @verb{Text @ , label @ @c float
+Float
address@hidden float
+
address@hidden @verb{Text @ @c listoffloats
+
address@hidden index @verb{entry @c index entry
+
address@hidden cp @c printindex
+
address@hidden @verb{nodesub@ ,next,,Top
+
address@hidden next, @verb{nodesub@
address@hidden @c bye
Index: test/macros/setfilename_space_comment.texi
===================================================================
RCS file: test/macros/setfilename_space_comment.texi
diff -N test/macros/setfilename_space_comment.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/macros/setfilename_space_comment.texi 17 Sep 2009 08:51:05 -0000
1.1
@@ -0,0 +1,5 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden file @c comment
+
address@hidden
Index: test/macros/space_end_setfilename.texi
===================================================================
RCS file: test/macros/space_end_setfilename.texi
diff -N test/macros/space_end_setfilename.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/macros/space_end_setfilename.texi 17 Sep 2009 08:51:05 -0000
1.1
@@ -0,0 +1,5 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden file
+
address@hidden
Index: test/macros/res_info/space_in_setfilename/ name
===================================================================
RCS file: test/macros/res_info/space_in_setfilename/ name
diff -N test/macros/res_info/space_in_setfilename/ name
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/macros/res_info/space_in_setfilename/ name 17 Sep 2009 08:51:05
-0000 1.1
@@ -0,0 +1,3 @@
+This is name , produced by makeinfo version 4.13 from
+space_in_setfilename.texi.
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog texi2html.pl test/invalid/M...,
Patrice Dumas <=