[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog TODO texi2html.init Tests/f...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog TODO texi2html.init Tests/f... |
|
Date: |
Sun, 07 Oct 2007 13:22:46 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 07/10/07 13:22:46
Modified files:
. : ChangeLog TODO texi2html.init
Tests/formatting_res: formatting_regions.2
formatting_regions.html
Tests/index_table_res: index_special_region.html
index_special_region_1.html
index_special_region_fot.html
index_special_region_no_insertcopying.html
examples : book.init mediawiki.init noheaders.init
roff.init
Log message:
Use the actual state for titlepage generation in print_Top.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.283&r2=1.284
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.130&r2=1.131
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/formatting_regions.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/formatting_regions.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/index_table_res/index_special_region.html?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/index_table_res/index_special_region_1.html?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/index_table_res/index_special_region_fot.html?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/index_table_res/index_special_region_no_insertcopying.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/book.init?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/mediawiki.init?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/noheaders.init?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/roff.init?cvsroot=texi2html&r1=1.15&r2=1.16
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -b -r1.283 -r1.284
--- ChangeLog 7 Oct 2007 12:07:09 -0000 1.283
+++ ChangeLog 7 Oct 2007 13:22:44 -0000 1.284
@@ -3,6 +3,7 @@
* texi2html.pl: better handling of special regions.
* Tests/*: test for more possibility regarding titlepage output
or not with copying output or not.
+ Use the actual state for titlepage generation in print_Top.
rename formatting-regions to formatting_regions.
2007-10-06 Patrice Dumas <address@hidden>
Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- TODO 7 Oct 2007 12:07:09 -0000 1.40
+++ TODO 7 Oct 2007 13:22:45 -0000 1.41
@@ -121,9 +121,7 @@
* roff is certainly not uptodate. At least the @quote* and @guillem*
-* ducument $documentdescription and $copying_comment. Document $titlepage.
-
-* when titlepage is output, output the corresponding footnotes.
+* ducument $documentdescription, $copying_comment and $titlepage.
* maybe be quiet during special region expansion outside of document. It
is not very clear that it is wrong, though.
Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- texi2html.init 7 Oct 2007 12:07:09 -0000 1.130
+++ texi2html.init 7 Oct 2007 13:22:45 -0000 1.131
@@ -12,7 +12,7 @@
# Afterwards, load the file with command-line
# option -init-file <your_init_file>
#
-# $Id: texi2html.init,v 1.130 2007/10/07 12:07:09 pertusus Exp $
+# $Id: texi2html.init,v 1.131 2007/10/07 13:22:45 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -914,10 +914,10 @@
{
# top-level node is fully enclosed in @ifnothtml
# print fulltitle, subtitle, author, Overview or table of contents
+ # redo the titlepage with the actual state
+ my ($titlepage_text, $titlepage_no_texi) =
main::do_special_region_lines('titlepage',$Texi2HTML::THISDOC{'state'});
+ &$titlepage([],$titlepage_text, $titlepage_no_texi);
print $fh $Texi2HTML::TITLEPAGE;
-# FIXME the following could be better for footnotes to appear, but it
-# seems the the state isn't correctly setup.
-# print $fh
"".main::do_special_region_lines('titlepage',$Texi2HTML::THISDOC{'state'});
if (@{$Texi2HTML::OVERVIEW} and
!$Texi2HTML::THISDOC{'setshortcontentsaftertitlepage'})
{
print $fh '<h2> ' . $Texi2HTML::NAME{'Overview'} . "</h2>\n" .
"<blockquote\n";
Index: Tests/formatting_res/formatting_regions.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/formatting_res/formatting_regions.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Tests/formatting_res/formatting_regions.2 7 Oct 2007 12:07:10 -0000
1.1
+++ Tests/formatting_res/formatting_regions.2 7 Oct 2007 13:22:45 -0000
1.2
@@ -111,6 +111,56 @@
** TeX requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before: after
+** Unknown command address@hidden' (left as is)
+** TeX requires {}
+** no image file for f-ile, (using f-ile.jpg)
+*** no file argument for @image
+*** no file argument for @image
+** no image file for address@hidden:jk _" %@:}, (using address@hidden:jk _"
%@:}.jpg)
+** no image file for @file{f--ile}@@@., (using @file{f--ile}@@@address@hidden
ext} address@hidden)
+*** '}' without opening '{' before:
+*** '}' without opening '{' before: after
+*** '{' without macro. Before:
+*** '{' without macro. Before: and after
+*** Undefined node `node' in @ref
+*** Undefined node `' in @ref
+*** Undefined node `' in @ref
+*** Undefined node `node' in @ref
+*** Undefined node `node' in @ref
+*** Undefined node `node' in @ref
+*** Undefined node `' in @ref
+*** Need a node name for @inforef
+*** Need a node name for @inforef
+*** Need a node name for @inforef
+** Unknown command address@hidden' (left as is)
+** TeX requires {}
+** no image file for f-ile, (using f-ile.jpg)
+*** no file argument for @image
+*** no file argument for @image
+** no image file for address@hidden:jk _" %@:}, (using address@hidden:jk _"
%@:}.jpg)
+** no image file for @file{f--ile}@@@., (using @file{f--ile}@@@address@hidden
ext} address@hidden)
+*** '}' without opening '{' before:
+*** '}' without opening '{' before: after
+*** '{' without macro. Before:
+*** '{' without macro. Before: and after
+*** Undefined node `node' in @ref
+*** Undefined node `' in @ref
+*** Undefined node `' in @ref
+*** Undefined node `node' in @ref
+*** Undefined node `node' in @ref
+*** Undefined node `node' in @ref
+*** Undefined node `' in @ref
+*** Need a node name for @inforef
+*** Need a node name for @inforef
+*** Need a node name for @inforef
+** Unknown command address@hidden' (left as is)
+** TeX requires {}
+*** '}' without opening '{' before:
+*** '}' without opening '{' before: after
+** Unknown command address@hidden' (left as is)
+** TeX requires {}
+*** '}' without opening '{' before:
+*** '}' without opening '{' before: after
** Unknown command address@hidden' (left as is) (l. 527 in mymacro)
** TeX requires {} (l. 527 in mymacro)
** no image file for f-ile, (using f-ile.jpg)
Index: Tests/formatting_res/formatting_regions.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/formatting_res/formatting_regions.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Tests/formatting_res/formatting_regions.html 7 Oct 2007 12:07:10
-0000 1.1
+++ Tests/formatting_res/formatting_regions.html 7 Oct 2007 13:22:45
-0000 1.2
@@ -702,8 +702,8 @@
<code>@,{--c}</code> –c,
<code>@dotless{--a}</code> –a
<code>@dotless{a}</code> a
-<code>@footnote{in footnote}</code> <a href="#t_htitlepage_FOOT1">(1)</a>
-<code>@footnote{in footnote2}</code> <a href="#t_htitlepage_FOOT2">(2)</a>
+<code>@footnote{in footnote}</code> <a name="t_htitlepage_DOCF1"
href="#t_htitlepage_FOOT1">(1)</a>
+<code>@footnote{in footnote2}</code> <a name="t_htitlepage_DOCF2"
href="#t_htitlepage_FOOT2">(2)</a>
</p>
<p><code>@image{f--ile,,e--xt}</code> <img src="./f--ile.jpg" alt="f--ile">
<code>@image{f--ile,,,,e--xt}</code> <img src="./f--ile.e--xt" alt="f--ile">
@@ -1253,8 +1253,8 @@
<code>@,{--c}</code> –c,
<code>@dotless{--a}</code> –a
<code>@dotless{a}</code> a
-<code>@footnote{in footnote}</code> <a href="#t_hcopying_FOOT1">(1)</a>
-<code>@footnote{in footnote2}</code> <a href="#t_hcopying_FOOT2">(2)</a>
+<code>@footnote{in footnote}</code> <a name="t_hcopying_DOCF1"
href="#t_hcopying_FOOT1">(1)</a>
+<code>@footnote{in footnote2}</code> <a name="t_hcopying_DOCF2"
href="#t_hcopying_FOOT2">(2)</a>
</p>
<p><code>@image{f--ile,,e--xt}</code> <img src="./f--ile.jpg" alt="f--ile">
<code>@image{f--ile,,,,e--xt}</code> <img src="./f--ile.e--xt" alt="f--ile">
@@ -3005,8 +3005,8 @@
<code>@,{--c}</code> –c,
<code>@dotless{--a}</code> –a
<code>@dotless{a}</code> a
-<code>@footnote{in footnote}</code> <a name="t_hcopying_DOCF1"
href="#t_hcopying_FOOT1">(1)</a>
-<code>@footnote{in footnote2}</code> <a name="t_hcopying_DOCF2"
href="#t_hcopying_FOOT2">(2)</a>
+<code>@footnote{in footnote}</code> <a href="#t_hcopying_FOOT1">(1)</a>
+<code>@footnote{in footnote2}</code> <a href="#t_hcopying_FOOT2">(2)</a>
</p>
<p><code>@image{f--ile,,e--xt}</code> <img src="./f--ile.jpg" alt="f--ile">
<code>@image{f--ile,,,,e--xt}</code> <img src="./f--ile.e--xt" alt="f--ile">
@@ -4174,7 +4174,15 @@
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
</tr></table>
<h1>Footnotes</h1>
-<h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
+<h3><a name="t_htitlepage_FOOT1" href="#t_htitlepage_DOCF1">(1)</a></h3>
+<p>in footnote
+</p><h3><a name="t_htitlepage_FOOT2" href="#t_htitlepage_DOCF2">(2)</a></h3>
+<p>in footnote2
+</p><h3><a name="t_hcopying_FOOT1" href="#t_hcopying_DOCF1">(1)</a></h3>
+<p>in footnote
+</p><h3><a name="t_hcopying_FOOT2" href="#t_hcopying_DOCF2">(2)</a></h3>
+<p>in footnote2
+</p><h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote
</p><h3><a name="FOOT2" href="#DOCF2">(2)</a></h3>
<p>in footnote2
@@ -4182,10 +4190,6 @@
<p>in footnote
</p><h3><a name="FOOT4" href="#DOCF4">(4)</a></h3>
<p>in footnote2
-</p><h3><a name="t_hcopying_FOOT1" href="#t_hcopying_DOCF1">(1)</a></h3>
-<p>in footnote
-</p><h3><a name="t_hcopying_FOOT2" href="#t_hcopying_DOCF2">(2)</a></h3>
-<p>in footnote2
</p><h3><a name="FOOT5" href="#DOCF5">(5)</a></h3>
<p>in footnote
</p><hr size="1">
Index: Tests/index_table_res/index_special_region.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/index_table_res/index_special_region.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Tests/index_table_res/index_special_region.html 7 Oct 2007 12:07:11
-0000 1.4
+++ Tests/index_table_res/index_special_region.html 7 Oct 2007 13:22:45
-0000 1.5
@@ -60,13 +60,13 @@
<p><a name="Titlepage-anchor"></a>
</p>
-<p>This is the titlepage<a
href="index_special_region_fot.html#t_htitlepage_FOOT1">(1)</a>
+<p>This is the titlepage<a name="t_htitlepage_DOCF1"
href="index_special_region_fot.html#t_htitlepage_FOOT1">(1)</a>
</p>
<p><a name="Copying-information"></a>
</p>
<p>This is a test manual, trivially and explicitly in the public
-domain<a href="index_special_region_fot.html#t_hcopying_FOOT1">(1)</a>.
+domain<a name="t_hcopying_DOCF1"
href="index_special_region_fot.html#t_hcopying_FOOT1">(1)</a>.
</p>
<h1> Table of Contents</h1>
Index: Tests/index_table_res/index_special_region_1.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/index_table_res/index_special_region_1.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Tests/index_table_res/index_special_region_1.html 7 Oct 2007 12:07:11
-0000 1.5
+++ Tests/index_table_res/index_special_region_1.html 7 Oct 2007 13:22:45
-0000 1.6
@@ -69,10 +69,9 @@
<h1 class="chapter"> 1. Chapter </h1>
-<p><a name="Copying-information"></a>
-</p>
+
<p>This is a test manual, trivially and explicitly in the public
-domain<a name="t_hcopying_DOCF1"
href="index_special_region_fot.html#t_hcopying_FOOT1">(1)</a>.
+domain<a href="index_special_region_fot.html#t_hcopying_FOOT1">(1)</a>.
</p>
Index: Tests/index_table_res/index_special_region_fot.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/index_table_res/index_special_region_fot.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Tests/index_table_res/index_special_region_fot.html 7 Oct 2007 12:07:12
-0000 1.5
+++ Tests/index_table_res/index_special_region_fot.html 7 Oct 2007 13:22:45
-0000 1.6
@@ -57,7 +57,11 @@
<td valign="middle" align="left">[<a
href="index_special_region_abt.html#SEC_About" title="About (help)"> ?
</a>]</td>
</tr></table>
<h1>Footnotes</h1>
-<h3><a name="t_hcopying_FOOT1"
href="index_special_region_1.html#t_hcopying_DOCF1">(1)</a></h3>
+<h3><a name="t_htitlepage_FOOT1"
href="index_special_region.html#t_htitlepage_DOCF1">(1)</a></h3>
+<p><a name="Titlepage-footnote-anchor"></a>
+This is a fine document.
+</p>
+<h3><a name="t_hcopying_FOOT1"
href="index_special_region.html#t_hcopying_DOCF1">(1)</a></h3>
<p><a name="Public-domain-reference"></a> The public
domain is something you should allready know
</p>
Index: Tests/index_table_res/index_special_region_no_insertcopying.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/index_table_res/index_special_region_no_insertcopying.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Tests/index_table_res/index_special_region_no_insertcopying.html 7 Oct
2007 12:07:12 -0000 1.1
+++ Tests/index_table_res/index_special_region_no_insertcopying.html 7 Oct
2007 13:22:46 -0000 1.2
@@ -60,13 +60,13 @@
<p><a name="Titlepage-anchor"></a>
</p>
-<p>This is the titlepage<a
href="index_special_region_no_insertcopying_fot.html#t_htitlepage_FOOT1">(1)</a>
+<p>This is the titlepage<a name="t_htitlepage_DOCF1"
href="index_special_region_no_insertcopying_fot.html#t_htitlepage_FOOT1">(1)</a>
</p>
<p><a name="Copying-information"></a>
</p>
<p>This is a test manual, trivially and explicitly in the public
-domain<a
href="index_special_region_no_insertcopying_fot.html#t_hcopying_FOOT1">(1)</a>.
+domain<a name="t_hcopying_DOCF1"
href="index_special_region_no_insertcopying_fot.html#t_hcopying_FOOT1">(1)</a>.
</p>
<h1> Table of Contents</h1>
Index: examples/book.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/book.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- examples/book.init 30 Sep 2007 12:47:41 -0000 1.7
+++ examples/book.init 7 Oct 2007 13:22:46 -0000 1.8
@@ -120,6 +120,8 @@
my $buttons = address@hidden;
&$print_head_navigation($fh, $buttons) if ($SPLIT or $SECTION_NAVIGATION);
+ my ($titlepage_text, $titlepage_no_texi) =
main::do_special_region_lines('titlepage',$Texi2HTML::THISDOC{'state'});
+ &$titlepage([],$titlepage_text, $titlepage_no_texi);
print $fh $Texi2HTML::TITLEPAGE;
print $fh "<h1 class=\"settitle\">$Texi2HTML::NAME{Top}</h1>\n"
unless ($has_top_heading);
Index: examples/mediawiki.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/mediawiki.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- examples/mediawiki.init 22 Aug 2005 19:26:10 -0000 1.4
+++ examples/mediawiki.init 7 Oct 2007 13:22:46 -0000 1.5
@@ -8,7 +8,7 @@
# Load the file with command-line
# option -init-file mediawiki.init
#
-# $Id: mediawiki.init,v 1.4 2005/08/22 19:26:10 dprice Exp $
+# $Id: mediawiki.init,v 1.5 2007/10/07 13:22:46 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -190,6 +190,9 @@
{
# top-level node is fully enclosed in @ifnothtml
# print fulltitle, subtitle, author, Overview
+ # redo the titlepage with the actual state
+ my ($titlepage_text, $titlepage_no_texi) =
main::do_special_region_lines('titlepage',$Texi2HTML::THISDOC{'state'});
+ &$titlepage([],$titlepage_text, $titlepage_no_texi);
print $fh $Texi2HTML::TITLEPAGE;
if (@{$Texi2HTML::OVERVIEW})
{
@@ -212,6 +215,10 @@
sub mediawiki_titlepage()
{
+ my $titlepage_lines = shift;
+ my $titlepage_text = shift;
+ my $titlepage_no_texi = shift;
+
my $result = '';
if (@{$Texi2HTML::THISDOC{'titles'}}
or @{$Texi2HTML::THISDOC{'subtitles'}}
@@ -232,7 +239,7 @@
$result .= "$DEFAULT_RULE\n" if $DEFAULT_RULE;
}
- $Texi2HTML::TITLEPAGE = $result . $Texi2HTML::TITLEPAGE;
+ $Texi2HTML::TITLEPAGE = $result . $titlepage_text;
}
sub mediawiki_titlefont($$$)
Index: examples/noheaders.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/noheaders.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- examples/noheaders.init 30 Sep 2007 12:47:41 -0000 1.7
+++ examples/noheaders.init 7 Oct 2007 13:22:46 -0000 1.8
@@ -83,6 +83,9 @@
{
# top-level node is fully enclosed in @ifnothtml
# print fulltitle, subtitle, author, Overview
+ # redo the titlepage with the actual state
+ my ($titlepage_text, $titlepage_no_texi) =
main::do_special_region_lines('titlepage',$Texi2HTML::THISDOC{'state'});
+ &$titlepage([],$titlepage_text, $titlepage_no_texi);
print $fh $Texi2HTML::TITLEPAGE;
if (@{$Texi2HTML::OVERVIEW})
{
Index: examples/roff.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/roff.init,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- examples/roff.init 5 Oct 2007 12:10:59 -0000 1.15
+++ examples/roff.init 7 Oct 2007 13:22:46 -0000 1.16
@@ -59,6 +59,9 @@
my $buttons = address@hidden;
&$print_head_navigation($fh, $buttons);
+ # redo the titlepage with the actual state
+ my ($titlepage_text, $titlepage_no_texi) =
main::do_special_region_lines('titlepage',$Texi2HTML::THISDOC{'state'});
+ &$titlepage([],$titlepage_text, $titlepage_no_texi);
print $fh $Texi2HTML::TITLEPAGE;
main::print_lines($fh, $Texi2HTML::THIS_SECTION);
}
@@ -73,6 +76,10 @@
sub T2H_ROFF_titlepage ()
{
+ my $titlepage_lines = shift;
+ my $titlepage_text = shift;
+ my $titlepage_no_texi = shift;
+
my $result = '';
if (@{$Texi2HTML::THISDOC{'titles'}}
or @{$Texi2HTML::THISDOC{'subtitles'}}
@@ -95,7 +102,7 @@
}
if (($result ne '') or ($Texi2HTML::TITLEPAGE ne ''))
{
- $Texi2HTML::TITLEPAGE = ".tp\n" . $result . $Texi2HTML::TITLEPAGE .
".++ C\n";
+ $Texi2HTML::TITLEPAGE = ".tp\n" . $result . $titlepage_text . ".++
C\n";
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init Tests/f...,
Patrice Dumas <=