[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog TODO formats/info.init test...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog TODO formats/info.init test... |
|
Date: |
Sun, 02 Aug 2009 15:54:07 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 09/08/02 15:54:07
Modified files:
. : ChangeLog TODO
formats : info.init
test/coverage/res_info/float: float.info
test/formatting/res_info/float_copying: float_copying.info
test/formatting/res_info/float_with_at_commands:
float_with_at_commands.info
test/info_coverage/res_info/float: float.info
test/info_coverage/res_info/float_long_captions:
float_long_captions.info
test/info_coverage/res_info/simple_float: simple_float.info
test/sectionning/res_info/equivalent_nodes:
equivalent_nodes.info
test/sectionning/res_info/equivalent_nodes_no_node:
equivalent_nodes.info
Log message:
* formats/info.init: put float text and caption in the right
order
in listoffloats such that it is a menu entry that can be
followed
in info.
Use the basenames in the Info preamble.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.400&r2=1.401
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.112&r2=1.113
http://cvs.savannah.gnu.org/viewcvs/texi2html/formats/info.init?cvsroot=texi2html&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_info/float/float.info?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/float_copying/float_copying.info?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/float_with_at_commands/float_with_at_commands.info?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/info_coverage/res_info/float/float.info?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/info_coverage/res_info/float_long_captions/float_long_captions.info?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/info_coverage/res_info/simple_float/simple_float.info?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_info/equivalent_nodes/equivalent_nodes.info?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res_info/equivalent_nodes_no_node/equivalent_nodes.info?cvsroot=texi2html&r1=1.1&r2=1.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -b -r1.400 -r1.401
--- ChangeLog 2 Aug 2009 14:12:10 -0000 1.400
+++ ChangeLog 2 Aug 2009 15:54:02 -0000 1.401
@@ -1,5 +1,12 @@
2009-08-02 Patrice Dumas <address@hidden>
+ * formats/info.init: put float text and caption in the right order
+ in listoffloats such that it is a menu entry that can be followed
+ in info.
+ Use the basenames in the Info preamble.
+
+2009-08-02 Patrice Dumas <address@hidden>
+
* texi2html.pl, texi2html.init: treat @alias like a normal misc
commmand.
Keep @macros definitions in output, treat them as raw environments
Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- TODO 2 Aug 2009 14:12:10 -0000 1.112
+++ TODO 2 Aug 2009 15:54:03 -0000 1.113
@@ -455,34 +455,3 @@
* formatting/float_copying index entries in insertcopying are not right.
Maybe it is because they are in footnotes. Or maybe because they are
in a caption.
-
-* it would better to output just the basenames in the Info preamble.
-
-* This input:
-
----------------------------
address@hidden Figure,a44
-First figure.
address@hidden caption.}
address@hidden float
-
-List of figures:
address@hidden Figure
address@hidden
---------------------
-
-should actually produce something like:
-
-------------------------------
-First figure.
-
-Figure 1: Example caption.
-
- List of figures:
-
-* Menu:
-
-* Figure 1: a44. Example caption.
-
-
-
Index: formats/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/formats/info.init,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- formats/info.init 2 Aug 2009 14:12:11 -0000 1.15
+++ formats/info.init 2 Aug 2009 15:54:03 -0000 1.16
@@ -211,7 +211,8 @@
$info_default_index_length_to_node = 41;
$info_default_listoffloat_caption_entry_length = 41;
-$info_default_listoffloat_append = '...: ';
+#$info_default_listoffloat_append = '...: ';
+$info_default_listoffloat_append = '...';
push @command_handler_init, \&info_default_init_accent_enable_encoding;
push @command_handler_init, \&info_default_init_variables;
@@ -2041,15 +2042,13 @@
sub info_default_header ()
{
return $Texi2HTML::THISDOC{'info_header'} if
(defined($Texi2HTML::THISDOC{'info_header'}));
- #my $result = "This is $setfilename, produced by
$Texi2HTML::THISDOC{program} from $Texi2HTML::THISDOC{'input_file_name'}.\n\n";
- #Â the following is wrong, $Texi2HTML::THISDOC{'input_file_name'}
- #Â should be used
- #Â directly, but then tests are not reproducible in out of source builds
- # FIXME see Karl mail, it is right with the basename
- my $basename = $Texi2HTML::THISDOC{'input_file_name'};
- $basename =~ s/^.*\/// if ($TEST);
- $basename = $STDIN_DOCU_NAME if ($basename eq '-');
- my $result = "This is $Texi2HTML::THISDOC{'filename'}->{'top'}, produced
by makeinfo version 4.13 from $basename. ";
+# $Texi2HTML::THISDOC{'program'}
+ my $input_basename = $Texi2HTML::THISDOC{'input_file_name'};
+ $input_basename =~ s/^.*\///; # if ($TEST);
+ $input_basename = $STDIN_DOCU_NAME if ($input_basename eq '-');
+ my $output_basename = $Texi2HTML::THISDOC{'filename'}->{'top'};
+ $output_basename =~ s/^.*\///;
+ my $result = "This is $output_basename, produced by makeinfo version 4.13
from $input_basename. ";
my $dummy;
($dummy, $dummy, $dummy, $dummy, $result) =
info_default_process_para_text($result, 0, '', undef, undef,
get_conf('fillcolumn'));
$result .= "\n\n";
@@ -3395,25 +3394,48 @@
my $result = '';
$caption .= ':' if ($caption ne '');
- my $caption_entry = "* $float_style: $caption";
- my $length = 0;
- while ($caption_entry =~ s/^(\S+\s*)//)
+ my $caption_entry = "* $float_style: $float->{'text'}.";
+ if (length($caption_entry) >
$info_default_listoffloat_caption_entry_length)
+ {
+ $caption_entry .= "\n" . ' ' x
$info_default_listoffloat_caption_entry_length;
+ }
+ else
+ {
+ $caption_entry .= ' ' x
($info_default_listoffloat_caption_entry_length - length($caption_entry));
+ }
+ my $length = $info_default_listoffloat_caption_entry_length;
+ while ($caption =~ s/^(\S+\s*)//)
{
my $new_word = $1;
- if (length($new_word) + $length >
($info_default_listoffloat_caption_entry_length - 3) or (length($new_word) +
$length + length($info_default_listoffloat_append) >
$info_default_listoffloat_caption_entry_length and $caption_entry ne ''))
+ if ((length($new_word) + $length) > get_conf('fillcolumn') - 3)
{
- $result .= $info_default_listoffloat_append;
+ $caption_entry .= $info_default_listoffloat_append;
last;
}
else
{
- $result .= $new_word;
+ $caption_entry .= $new_word;
$length += length($new_word);
}
}
- $result .= ' ' x ($info_default_listoffloat_caption_entry_length -
length($result));
+ #while ($caption_entry =~ s/^(\S+\s*)//)
+ #{
+ # my $new_word = $1;
+ # if (length($new_word) + $length >
($info_default_listoffloat_caption_entry_length - 3) or (length($new_word) +
$length + length($info_default_listoffloat_append) >
$info_default_listoffloat_caption_entry_length and $caption_entry ne ''))
+ # {
+ # $result .= $info_default_listoffloat_append;
+ # last;
+ # }
+ # else
+ # {
+ # $result .= $new_word;
+ # $length += length($new_word);
+ # }
+ #}
+ #$result .= ' ' x ($info_default_listoffloat_caption_entry_length -
length($result));
- return "${result}$float->{'text'}.\n";
+ #return "${result}$float->{'text'}.\n";
+ return $caption_entry. "\n";
}
sub info_default_listoffloats($$$)
Index: test/coverage/res_info/float/float.info
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/coverage/res_info/float/float.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/coverage/res_info/float/float.info 21 Jun 2009 09:25:41 -0000
1.1
+++ test/coverage/res_info/float/float.info 2 Aug 2009 15:54:03 -0000
1.2
@@ -10,14 +10,16 @@
* Menu:
-* Text 1: TeX and ...: text with a lot of features.
-* Text 1.1: Text in chapter: text in chapter.
-* Text 1.2: An example of float ...: float with a lot of features and no
shortcaption.
+* Text 1: text with a lot of features. TeX and _te'i^`an_url'_ AND ...
+* Text 1.1: text in chapter. Text in chapter:
+* Text 1.2: float with a lot of features and no shortcaption.
+ An example of float ...
* Text 1.3: text in section.
-* Text 5: unnumbered float: unnumbered float.
-* Text 6: Section within unnumbered: Section within unnumbered float.
-* Text 2.1: Chapter with subsec: Chapter with subsec float.
-* Text 2.2: unnumbered sec float: unnumbered sec float.
+* Text 5: unnumbered float. unnumbered float:
+* Text 6: Section within unnumbered float.
+ Section within unnumbered:
+* Text 2.1: Chapter with subsec float. Chapter with subsec:
+* Text 2.2: unnumbered sec float. unnumbered sec float:
After the listoffloats.
@@ -244,23 +246,25 @@
* Menu:
-* Text 1: TeX and ...: text with a lot of features.
-* Text 1.1: Text in chapter: text in chapter.
-* Text 1.2: An example of float ...: float with a lot of features and no
shortcaption.
+* Text 1: text with a lot of features. TeX and _te'i^`an_url'_ AND ...
+* Text 1.1: text in chapter. Text in chapter:
+* Text 1.2: float with a lot of features and no shortcaption.
+ An example of float ...
* Text 1.3: text in section.
-* Text 5: unnumbered float: unnumbered float.
-* Text 6: Section within unnumbered: Section within unnumbered float.
-* Text 2.1: Chapter with subsec: Chapter with subsec float.
-* Text 2.2: unnumbered sec float: unnumbered sec float.
+* Text 5: unnumbered float. unnumbered float:
+* Text 6: Section within unnumbered float.
+ Section within unnumbered:
+* Text 2.1: Chapter with subsec float. Chapter with subsec:
+* Text 2.2: unnumbered sec float. unnumbered sec float:
* Menu:
-* the'ore`me 1.1: A the'ore`me: theoreme.
+* the'ore`me 1.1: theoreme. A the'ore`me:
[index ]
* Menu:
-* float example: Top. (line 37)
+* float example: Top. (line 39)
* float example in caption: Top. (line 11)
* float example in caption 2: chapter. (line 13)
@@ -268,32 +272,32 @@
Tag Table:
Node: Top72
-Ref: text with a lot of features857
-Ref: label but no type1522
-Ref: label but no type and no caption1573
-Ref: label but no type 21776
-Ref: warning in top1818
-Ref: Top-Footnote-11887
-Ref: Top-Footnote-21923
-Node: chapter1967
-Ref: text in chapter2069
-Ref: float with a lot of features and no shortcaption2113
-Ref: theoreme2513
-Ref: label but no type in chapter2557
-Ref: warning in chapter2603
-Ref: chapter-Footnote-12707
-Node: section2753
-Ref: text in section2832
-Node: Unnumbered2886
-Ref: unnumbered float3048
-Ref: label but no type in unnumbered3081
-Node: Section within unnumbered3128
-Ref: Section within unnumbered float3260
-Node: Chapter with unnumbsubsec3322
-Ref: Chapter with subsec float3514
-Node: unnumbered sec3551
-Ref: unnumbered sec float3657
-Ref: label but no type in unnumbered subsec in chapter3695
-Node: list of floats3762
+Ref: text with a lot of features911
+Ref: label but no type1576
+Ref: label but no type and no caption1627
+Ref: label but no type 21830
+Ref: warning in top1872
+Ref: Top-Footnote-11941
+Ref: Top-Footnote-21977
+Node: chapter2021
+Ref: text in chapter2123
+Ref: float with a lot of features and no shortcaption2167
+Ref: theoreme2567
+Ref: label but no type in chapter2611
+Ref: warning in chapter2657
+Ref: chapter-Footnote-12761
+Node: section2807
+Ref: text in section2886
+Node: Unnumbered2940
+Ref: unnumbered float3102
+Ref: label but no type in unnumbered3135
+Node: Section within unnumbered3182
+Ref: Section within unnumbered float3314
+Node: Chapter with unnumbsubsec3376
+Ref: Chapter with subsec float3568
+Node: unnumbered sec3605
+Ref: unnumbered sec float3711
+Ref: label but no type in unnumbered subsec in chapter3749
+Node: list of floats3816
End Tag Table
Index: test/formatting/res_info/float_copying/float_copying.info
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_info/float_copying/float_copying.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
Binary files /tmp/cvsy4cEKg and /tmp/cvsbszY0Z differ
Index:
test/formatting/res_info/float_with_at_commands/float_with_at_commands.info
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_info/float_with_at_commands/float_with_at_commands.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res_info/float_with_at_commands/float_with_at_commands.info
28 Jun 2009 23:45:34 -0000 1.1
+++ test/formatting/res_info/float_with_at_commands/float_with_at_commands.info
2 Aug 2009 15:54:04 -0000 1.2
@@ -13,7 +13,7 @@
* Menu:
-* entre'e 1: La premie`re ...: premie`re entre'e.
+* entre'e 1: premie`re entre'e. La premie`re entre'e est ...
Index: test/info_coverage/res_info/float/float.info
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/info_coverage/res_info/float/float.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/info_coverage/res_info/float/float.info 28 Jul 2009 18:42:20
-0000 1.1
+++ test/info_coverage/res_info/float/float.info 2 Aug 2009 15:54:04
-0000 1.2
@@ -10,14 +10,16 @@
* Menu:
-* Text 1: TeX and ...: text with a lot of features.
-* Text 1.1: Text in chapter: text in chapter.
-* Text 1.2: An example of float ...: float with a lot of features and no
shortcaption.
+* Text 1: text with a lot of features. TeX and _te'i^`an_url'_ AND ...
+* Text 1.1: text in chapter. Text in chapter:
+* Text 1.2: float with a lot of features and no shortcaption.
+ An example of float ...
* Text 1.3: text in section.
-* Text 5: unnumbered float: unnumbered float.
-* Text 6: Section within unnumbered: Section within unnumbered float.
-* Text 2.1: Chapter with subsec: Chapter with subsec float.
-* Text 2.2: unnumbered sec float: unnumbered sec float.
+* Text 5: unnumbered float. unnumbered float:
+* Text 6: Section within unnumbered float.
+ Section within unnumbered:
+* Text 2.1: Chapter with subsec float. Chapter with subsec:
+* Text 2.2: unnumbered sec float. unnumbered sec float:
After the listoffloats.
@@ -237,23 +239,25 @@
* Menu:
-* Text 1: TeX and ...: text with a lot of features.
-* Text 1.1: Text in chapter: text in chapter.
-* Text 1.2: An example of float ...: float with a lot of features and no
shortcaption.
+* Text 1: text with a lot of features. TeX and _te'i^`an_url'_ AND ...
+* Text 1.1: text in chapter. Text in chapter:
+* Text 1.2: float with a lot of features and no shortcaption.
+ An example of float ...
* Text 1.3: text in section.
-* Text 5: unnumbered float: unnumbered float.
-* Text 6: Section within unnumbered: Section within unnumbered float.
-* Text 2.1: Chapter with subsec: Chapter with subsec float.
-* Text 2.2: unnumbered sec float: unnumbered sec float.
+* Text 5: unnumbered float. unnumbered float:
+* Text 6: Section within unnumbered float.
+ Section within unnumbered:
+* Text 2.1: Chapter with subsec float. Chapter with subsec:
+* Text 2.2: unnumbered sec float. unnumbered sec float:
* Menu:
-* the'ore`me 1.1: A the'ore`me: theoreme.
+* the'ore`me 1.1: theoreme. A the'ore`me:
[index ]
* Menu:
-* float example: Top. (line 30)
+* float example: Top. (line 32)
* float example in caption: Top. (line 11)
* float example in caption 2: chapter. (line 13)
@@ -261,32 +265,32 @@
Tag Table:
Node: Top72
-Ref: text with a lot of features857
-Ref: label but no type1453
-Ref: label but no type and no caption1504
-Ref: label but no type 21707
-Ref: warning in top1749
-Ref: Top-Footnote-11818
-Ref: Top-Footnote-21854
-Node: chapter1898
-Ref: text in chapter2000
-Ref: float with a lot of features and no shortcaption2044
-Ref: theoreme2444
-Ref: label but no type in chapter2488
-Ref: warning in chapter2534
-Ref: chapter-Footnote-12638
-Node: section2684
-Ref: text in section2763
-Node: Unnumbered2817
-Ref: unnumbered float2979
-Ref: label but no type in unnumbered3012
-Node: Section within unnumbered3059
-Ref: Section within unnumbered float3191
-Node: Chapter with unnumbsubsec3253
-Ref: Chapter with subsec float3445
-Node: unnumbered sec3482
-Ref: unnumbered sec float3588
-Ref: label but no type in unnumbered subsec in chapter3626
-Node: list of floats3693
+Ref: text with a lot of features911
+Ref: label but no type1507
+Ref: label but no type and no caption1558
+Ref: label but no type 21761
+Ref: warning in top1803
+Ref: Top-Footnote-11872
+Ref: Top-Footnote-21908
+Node: chapter1952
+Ref: text in chapter2054
+Ref: float with a lot of features and no shortcaption2098
+Ref: theoreme2498
+Ref: label but no type in chapter2542
+Ref: warning in chapter2588
+Ref: chapter-Footnote-12692
+Node: section2738
+Ref: text in section2817
+Node: Unnumbered2871
+Ref: unnumbered float3033
+Ref: label but no type in unnumbered3066
+Node: Section within unnumbered3113
+Ref: Section within unnumbered float3245
+Node: Chapter with unnumbsubsec3307
+Ref: Chapter with subsec float3499
+Node: unnumbered sec3536
+Ref: unnumbered sec float3642
+Ref: label but no type in unnumbered subsec in chapter3680
+Node: list of floats3747
End Tag Table
Index: test/info_coverage/res_info/float_long_captions/float_long_captions.info
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/info_coverage/res_info/float_long_captions/float_long_captions.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/info_coverage/res_info/float_long_captions/float_long_captions.info
28 Jul 2009 18:42:20 -0000 1.1
+++ test/info_coverage/res_info/float_long_captions/float_long_captions.info
2 Aug 2009 15:54:04 -0000 1.2
@@ -13,8 +13,8 @@
* Menu:
-* Text 1: AAAAAAAAAAAAAAAA BBBBB ...: text1.
-* Text 2: AAAAAAAAAAAAAAAA ...: text2.
+* Text 1: text1. AAAAAAAAAAAAAAAA BBBBB ...
+* Text 2: text2. AAAAAAAAAAAAAAAA BBBBBB ...
Index: test/info_coverage/res_info/simple_float/simple_float.info
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/info_coverage/res_info/simple_float/simple_float.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/info_coverage/res_info/simple_float/simple_float.info 28 Jul 2009
18:42:23 -0000 1.1
+++ test/info_coverage/res_info/simple_float/simple_float.info 2 Aug 2009
15:54:04 -0000 1.2
@@ -41,15 +41,15 @@
* Menu:
-* Text 1: Shortcaption Label: Label.
-* Text 2: Caption Label no sc: Label no sc.
+* Text 1: Label. Shortcaption Label:
+* Text 2: Label no sc. Caption Label no sc:
* Text 3: Label no cap.
Listoffloats
* Menu:
-* 1: label no type: label no type.
+* 1: label no type. label no type:
* 2: label no type no cap.
Index: test/sectionning/res_info/equivalent_nodes/equivalent_nodes.info
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/sectionning/res_info/equivalent_nodes/equivalent_nodes.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Index: test/sectionning/res_info/equivalent_nodes_no_node/equivalent_nodes.info
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/sectionning/res_info/equivalent_nodes_no_node/equivalent_nodes.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog TODO formats/info.init test...,
Patrice Dumas <=