[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/Text.pm t/results/fl...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Convert/Text.pm t/results/fl... |
|
Date: |
Sat, 04 Dec 2010 00:01:43 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/12/04 00:01:42
Modified files:
tp/Texinfo/Convert: Text.pm
tp/t/results/float: numbering_captions_listoffloats.pl
tp/t/results/invalid_nestings: on_section_line.pl
style_not_closed_no_newline_root_commands.pl
style_not_closed_root_commands.pl
unclosed_verb_on_section_line.pl
tp/t/results/macro: macro_in_misc_commands.pl
tp/t/results/misc_commands: text_before_line_command.pl
tp/t/results/sectioning: at_commands_in_refs.pl
character_and_spaces_in_refs.pl
complex.pl nodename_parentheses.pl
raiselowersections.pl sections.pl
semi_auto.pl
some_at_commands_in_ref_nodes.pl
tp/t/results/value: value_in_node.pl value_node_directions.pl
Log message:
Add numbers to the heading formatting.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/on_section_line.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_misc_commands.pl?cvsroot=texinfo&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/text_before_line_command.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/complex.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/nodename_parentheses.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/raiselowersections.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/sections.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/semi_auto.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/some_at_commands_in_ref_nodes.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_node.pl?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_node_directions.pl?cvsroot=texinfo&r1=1.29&r2=1.30
Patches:
Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- Texinfo/Convert/Text.pm 2 Dec 2010 09:17:32 -0000 1.25
+++ Texinfo/Convert/Text.pm 4 Dec 2010 00:01:40 -0000 1.26
@@ -878,6 +878,11 @@
my $current = shift;
my $text = shift;
+ $text = $current->{'number'}.' '.$text if (defined($current->{'number'}));
+ if ($current->{'cmdname'} eq 'appendix' and $current->{'level'} == 1) {
+ # FIXME i18n
+ $text = 'Appendix '.$text;
+ }
chomp ($text);
return '' if ($text !~ /\S/);
my $result = $text ."\n";
Index: t/results/float/numbering_captions_listoffloats.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/float/numbering_captions_listoffloats.pl 1 Dec 2010 22:39:45
-0000 1.1
+++ t/results/float/numbering_captions_listoffloats.pl 4 Dec 2010 00:01:40
-0000 1.2
@@ -5687,8 +5687,8 @@
-A chapter
-*********
+1 A chapter
+***********
Text in chapter
@@ -5712,8 +5712,8 @@
* section::
-A section
-=========
+1.1 A section
+=============
A text in float no caption a label a type.
@@ -5732,16 +5732,16 @@
-Section within unnumbered
-=========================
+1.2 Section within unnumbered
+=============================
Section within unnumbered
-Chapter with unnumbsubsec
-*************************
+2 Chapter with unnumbsubsec
+***************************
* unnumbered sec::
Chap
@@ -5760,8 +5760,8 @@
-Appendix for float
-******************
+Appendix A Appendix for float
+*****************************
Appendix
@@ -6725,8 +6725,8 @@
Warning 1: C A warning
-A chapter
-*********
+1 A chapter
+***********
Text in chapter
@@ -6750,8 +6750,8 @@
* section::
-A section
-=========
+1.1 A section
+=============
A text in float no caption a label a type.
@@ -6769,15 +6769,15 @@
5: C No type in unnumbered
-Section within unnumbered
-=========================
+1.2 Section within unnumbered
+=============================
Section within unnumbered
Text 6: C Section within unnumbered
-Chapter with unnumbsubsec
-*************************
+2 Chapter with unnumbsubsec
+***************************
* Menu:
@@ -6797,8 +6797,8 @@
2.1: C No type in unnumbered subsec in chapter
-Appendix for float
-******************
+Appendix A Appendix for float
+*****************************
Appendix
Index: t/results/invalid_nestings/on_section_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/on_section_line.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/invalid_nestings/on_section_line.pl 1 Dec 2010 22:39:45
-0000 1.21
+++ t/results/invalid_nestings/on_section_line.pl 4 Dec 2010 00:01:40
-0000 1.22
@@ -234,8 +234,8 @@
';
-$result_texts{'on_section_line'} = 'Text in titlefont exdent
-========================
+$result_texts{'on_section_line'} = '1 Text in titlefont exdent
+==========================
';
$result_sectioning{'on_section_line'} = {
Index: t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
1 Dec 2010 22:39:45 -0000 1.25
+++ t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
4 Dec 2010 00:01:41 -0000 1.26
@@ -348,8 +348,8 @@
* chapter::
not closed
-chapter
-*******
+1 chapter
+*********
still not closed
';
Index: t/results/invalid_nestings/style_not_closed_root_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/invalid_nestings/style_not_closed_root_commands.pl 1 Dec
2010 22:39:45 -0000 1.23
+++ t/results/invalid_nestings/style_not_closed_root_commands.pl 4 Dec
2010 00:01:41 -0000 1.24
@@ -361,8 +361,8 @@
not closed
-chapter
-*******
+1 chapter
+*********
still not closed
Index: t/results/invalid_nestings/unclosed_verb_on_section_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/invalid_nestings/unclosed_verb_on_section_line.pl 1 Dec 2010
22:39:45 -0000 1.12
+++ t/results/invalid_nestings/unclosed_verb_on_section_line.pl 4 Dec 2010
00:01:41 -0000 1.13
@@ -87,10 +87,10 @@
T}';
-$result_texts{'unclosed_verb_on_section_line'} = 'in section ruc
+$result_texts{'unclosed_verb_on_section_line'} = '1 in section ruc
Now text.
-=========================
+===========================
';
$result_sectioning{'unclosed_verb_on_section_line'} = {
Index: t/results/macro/macro_in_misc_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- t/results/macro/macro_in_misc_commands.pl 1 Dec 2010 22:39:45 -0000
1.38
+++ t/results/macro/macro_in_misc_commands.pl 4 Dec 2010 00:01:41 -0000
1.39
@@ -3867,8 +3867,8 @@
* node atext::
-chapter
-*******
+1 chapter
+*********
Index: t/results/misc_commands/text_before_line_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/misc_commands/text_before_line_command.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/misc_commands/text_before_line_command.pl 1 Dec 2010 22:39:46
-0000 1.5
+++ t/results/misc_commands/text_before_line_command.pl 4 Dec 2010 00:01:41
-0000 1.6
@@ -333,8 +333,8 @@
$result_texts{'text_before_line_command'} = 'before title
-i--- LD Version Scripts
-******************
+i--- 1 LD Version Scripts
+********************
ddd
aaa quotation
Index: t/results/sectioning/at_commands_in_refs.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/sectioning/at_commands_in_refs.pl 1 Dec 2010 22:39:46 -0000
1.21
+++ t/results/sectioning/at_commands_in_refs.pl 4 Dec 2010 00:01:41 -0000
1.22
@@ -17109,78 +17109,78 @@
* indicateurl::
* http://somewhere_aaa url /man.cgi/1/ls::
- { }
-****
+1 { }
+******
- !
+2 !
. . ? @
-******************
+********************
-LaTeX TeX * , (C) ... ...
-*************************
+3 LaTeX TeX * , (C) ... ...
+***************************
-== error--> Euro ! ==> -
-************************
+4 == error--> Euro ! ==> -
+**************************
->= <= ->
-********
+5 >= <= ->
+**********
-a o -!- # -| ? (R)
-******************
+6 a o -!- # -| ? (R)
+********************
+
+7 => o a b aa
+**************
-=> o a b aa
-************
+8 AA ae oe AE OE /o /O ss /l /L D d TH th
+*****************************************
-AA ae oe AE OE /o /O ss /l /L D d TH th
-***************************************
+9 a" e~ i^ a^ a` e\' c, e= e* e\'\' e;
+***********************************
-a" e~ i^ a^ a` e\' c, e= e* e\'\' e;
-*********************************
+10 e. e( e_ .e e< j ee[
+***********************
-e. e( e_ .e e< j ee[
-********************
+11 `` \'\' ` \' ,, ,
+*****************
-`` \'\' ` \' ,, ,
-**************
+12 << >> << >> < >
+******************
-<< >> << >> < >
+13 `` \'\' --- --
***************
-`` \'\' --- --
-************
-
-AAA AAA BBB
-***********
+14 AAA AAA BBB
+**************
-CCC CCC DDD
-***********
+15 CCC CCC DDD
+**************
-the someone address@hidden
-****************************
+16 the someone address@hidden
+*******************************
-f--ile1 f--ile
-***************
+17 f--ile1 f--ile
+******************
- @ {} .
-********
+18 @ {} .
+***********
-cite asis in @w b in r sc str t var dfn i
-*****************************************
+19 cite asis in @w b in r sc str t var dfn i
+********************************************
-env code option samp command file C-x ESC
-*****************************************
+20 env code option samp command file C-x ESC
+********************************************
-8.27in
-******
+21 8.27in
+*********
-sansserif slanted
-*****************
+22 sansserif slanted
+********************
-indicateurl
-***********
+23 indicateurl
+**************
-http://somewhere_aaa url /man.cgi/1/ls
-**************************************
+24 http://somewhere_aaa url /man.cgi/1/ls
+*****************************************
Index: t/results/sectioning/character_and_spaces_in_refs.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/sectioning/character_and_spaces_in_refs.pl 1 Dec 2010
22:39:47 -0000 1.21
+++ t/results/sectioning/character_and_spaces_in_refs.pl 4 Dec 2010
00:01:42 -0000 1.22
@@ -1527,8 +1527,8 @@
-Chapter with nodes
-******************
+1 Chapter with nodes
+********************
* !_"#$%&\'()*+-.::
* /;<=>?[\\]^_`|~::
Index: t/results/sectioning/complex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/complex.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/sectioning/complex.pl 1 Dec 2010 22:39:47 -0000 1.4
+++ t/results/sectioning/complex.pl 4 Dec 2010 00:01:42 -0000 1.5
@@ -2675,8 +2675,8 @@
* Third node unnumbered:: unnumbered in Top menu
* Last node no description::
-first node chapter
-******************
+1 first node chapter
+********************
first node chapter text
* unnumbered:: un
@@ -2695,26 +2695,26 @@
unnumbered subsection
---------------------
-numbered subsection
--------------------
+1.0.1 numbered subsection
+-------------------------
unnumbered subsection2
----------------------
-numbered subsection2
---------------------
+1.0.2 numbered subsection2
+--------------------------
unnumbered section2
===================
* numbered sub3::
-numbered subsection3
---------------------
+1.0.3 numbered subsection3
+--------------------------
-numbered section
-================
+1.1 numbered section
+====================
between node, node without sectioning node
@@ -2722,8 +2722,8 @@
Second node text
-second node chapter
-*******************
+2 second node chapter
+*********************
second node chapter text.
Index: t/results/sectioning/nodename_parentheses.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/nodename_parentheses.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/sectioning/nodename_parentheses.pl 1 Dec 2010 22:39:47
-0000 1.23
+++ t/results/sectioning/nodename_parentheses.pl 4 Dec 2010 00:01:42
-0000 1.24
@@ -902,20 +902,20 @@
* Other node::
* (manual)node::
-Section (nodename with parentheses)
-***********************************
+1 Section (nodename with parentheses)
+*************************************
Dummy section
-Section (nodename without parentheses)
-**************************************
+2 Section (nodename without parentheses)
+****************************************
Dummy link to .
Dummy link to .
-(manual)node
-************
+3 (manual)node
+**************
Dummy section with (manual)node node syntax.
Index: t/results/sectioning/raiselowersections.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/raiselowersections.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- t/results/sectioning/raiselowersections.pl 1 Dec 2010 22:39:47 -0000
1.24
+++ t/results/sectioning/raiselowersections.pl 4 Dec 2010 00:01:42 -0000
1.25
@@ -1277,8 +1277,8 @@
* Chapter::
* Second chapter::
-Chapter
-*******
+1 Chapter
+*********
* Chapter in included file::
@@ -1286,24 +1286,24 @@
\\input texinfo
-Chapter in included file
-========================
+1.1 Chapter in included file
+============================
* Section::
-Section
--------
+1.1.1 Section
+-------------
* Subsection::
-Subsection
-..........
+1.1.1.1 Subsection
+..................
-Second chapter
-**************
+2 Second chapter
+****************
Second chapter
Index: t/results/sectioning/sections.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/sections.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/sectioning/sections.pl 1 Dec 2010 22:39:47 -0000 1.20
+++ t/results/sectioning/sections.pl 4 Dec 2010 00:01:42 -0000 1.21
@@ -62,8 +62,8 @@
';
-$result_texts{'sections'} = 'a chapter
-*********
+$result_texts{'sections'} = '1 a chapter
+***********
';
$result_sectioning{'sections'} = {
Index: t/results/sectioning/semi_auto.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/semi_auto.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/sectioning/semi_auto.pl 1 Dec 2010 22:39:47 -0000 1.4
+++ t/results/sectioning/semi_auto.pl 4 Dec 2010 00:01:42 -0000 1.5
@@ -739,16 +739,16 @@
* Chap1::
* Section non auto::
-Chapter 1
-*********
+1 Chapter 1
+***********
* Sec in chapter::
-Sec in chapter
-==============
+1.1 Sec in chapter
+==================
-Section
-=======
+1.2 Section
+===========
';
$result_sectioning{'semi_auto'} = {
Index: t/results/sectioning/some_at_commands_in_ref_nodes.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/some_at_commands_in_ref_nodes.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/sectioning/some_at_commands_in_ref_nodes.pl 1 Dec 2010
22:39:47 -0000 1.21
+++ t/results/sectioning/some_at_commands_in_ref_nodes.pl 4 Dec 2010
00:01:42 -0000 1.22
@@ -1236,8 +1236,8 @@
* A sc node i" i" E=` /l C\', !::
-A sc node i" i" E=` /l C\', !
-****************************
+1 A sc node i" i" E=` /l C\', !
+******************************
see .
';
Index: t/results/value/value_in_node.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/value/value_in_node.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- t/results/value/value_in_node.pl 1 Dec 2010 22:39:47 -0000 1.36
+++ t/results/value/value_in_node.pl 4 Dec 2010 00:01:42 -0000 1.37
@@ -781,8 +781,8 @@
* Node 1 ::
-Chapter 1
-*********
+1 Chapter 1
+***********
* Section 1.1::
Index: t/results/value/value_node_directions.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/value/value_node_directions.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/value/value_node_directions.pl 1 Dec 2010 22:39:47 -0000
1.29
+++ t/results/value/value_node_directions.pl 4 Dec 2010 00:01:42 -0000
1.30
@@ -588,11 +588,11 @@
*******
bar
-BarFoo
-******
+1 BarFoo
+********
-bar
-***
+2 bar
+*****
';
$result_sectioning{'value_node_directions'} = {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Convert/Text.pm t/results/fl...,
Patrice Dumas <=