[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog NEWS TODO texi2html.init te...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog NEWS TODO texi2html.init te... |
|
Date: |
Sat, 25 Apr 2009 14:54:52 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 09/04/25 14:54:50
Modified files:
. : ChangeLog NEWS TODO texi2html.init texi2html.pl
translations.pl
doc : texi2html.texi
examples : docbook.init html32.init info.init
mediawiki.init noheaders.init roff.init
xml.init
i18n : de en es fr ja nl no pt pt_BR
test/layout/res/formatting_regions: formatting_regions.html
test/macros/res/include-value: include-value.html
test/manuals : tests.txt
test/manuals/res/mini_ker: mini_ker.html
test/manuals/res/texi_cvs: cvs.passfirst cvs.passtexi cvs.texi
test/manuals/res/texi_info-stnd: info-stnd.passfirst
info-stnd.passtexi
info-stnd.texi
test/manuals/res/texi_mini_ker: mini_ker.passfirst
mini_ker.passtexi mini_ker.texi
test/manuals/res/texi_texinfo: texinfo.passfirst
texinfo.passtexi texinfo.texi
test/misc/res/texi_viper: viper.passfirst viper.passtexi
viper.texi
test/tar_manual/res/texi_tar: tar.passfirst tar.passtexi
tar.texi
test/texi2html_manual/res/texi_texi2html: texi2html.passfirst
texi2html.passtexi
texi2html.texi
test/xemacs_manual/res/texi_xemacs: xemacs.passfirst
xemacs.passtexi xemacs.texi
Log message:
* texi2html.pl, texi2html.init: handle @direntry and
@dircategory
better.
Add a function reference $line_command and a hash
%line_command_map
for processing line @-commands and use it for @title, @subtitle
and
@author, with a corresponding change in the titlepage
formatting
also allowing to have something more in line with what texi2dvi
produces.
verbatiminclude is now a $raw command argument distinct from
verbatim.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.372&r2=1.373
http://cvs.savannah.gnu.org/viewcvs/texi2html/NEWS?cvsroot=texi2html&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.186&r2=1.187
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.274&r2=1.275
http://cvs.savannah.gnu.org/viewcvs/texi2html/translations.pl?cvsroot=texi2html&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.texi?cvsroot=texi2html&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/docbook.init?cvsroot=texi2html&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/html32.init?cvsroot=texi2html&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/info.init?cvsroot=texi2html&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/mediawiki.init?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/noheaders.init?cvsroot=texi2html&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/roff.init?cvsroot=texi2html&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/xml.init?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/de?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/en?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/es?cvsroot=texi2html&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/fr?cvsroot=texi2html&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/ja?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/nl?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/no?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/pt?cvsroot=texi2html&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/pt_BR?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_regions/formatting_regions.html?cvsroot=texi2html&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/include-value/include-value.html?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/tests.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/mini_ker/mini_ker.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texi_cvs/cvs.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texi_cvs/cvs.passtexi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texi_cvs/cvs.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texi_info-stnd/info-stnd.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texi_info-stnd/info-stnd.passtexi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texi_info-stnd/info-stnd.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texi_mini_ker/mini_ker.passfirst?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texi_mini_ker/mini_ker.passtexi?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texi_mini_ker/mini_ker.texi?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texi_texinfo/texinfo.passfirst?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texi_texinfo/texinfo.passtexi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texi_texinfo/texinfo.texi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/texi_viper/viper.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/texi_viper/viper.passtexi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/texi_viper/viper.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/tar_manual/res/texi_tar/tar.passfirst?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/tar_manual/res/texi_tar/tar.passtexi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/tar_manual/res/texi_tar/tar.texi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/texi2html_manual/res/texi_texi2html/texi2html.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/texi2html_manual/res/texi_texi2html/texi2html.passtexi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/texi2html_manual/res/texi_texi2html/texi2html.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/xemacs_manual/res/texi_xemacs/xemacs.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/xemacs_manual/res/texi_xemacs/xemacs.passtexi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/xemacs_manual/res/texi_xemacs/xemacs.texi?cvsroot=texi2html&r1=1.1&r2=1.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -b -r1.372 -r1.373
--- ChangeLog 23 Apr 2009 10:13:07 -0000 1.372
+++ ChangeLog 25 Apr 2009 14:54:41 -0000 1.373
@@ -1,3 +1,15 @@
+2009-04-25 Patrice Dumas <address@hidden>
+
+ * texi2html.pl, texi2html.init: handle @direntry and @dircategory
+ better.
+ Add a function reference $line_command and a hash %line_command_map
+ for processing line @-commands and use it for @title, @subtitle and
+ @author, with a corresponding change in the titlepage formatting
+ also allowing to have something more in line with what texi2dvi
+ produces.
+ verbatiminclude is now a $raw command argument distinct from
+ verbatim.
+
2009-04-23 Patrice Dumas <address@hidden>
* texi2html.pl, texi2html.init: use the float name and number as
Index: NEWS
===================================================================
RCS file: /cvsroot/texi2html/texi2html/NEWS,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- NEWS 2 Apr 2009 09:13:47 -0000 1.94
+++ NEWS 25 Apr 2009 14:54:41 -0000 1.95
@@ -14,6 +14,11 @@
and apply the @-command given as @table argument. Correspondingly,
some arguments of $table_item have been removed.
+* Formatting of titlepage chaned, and @title, @subtitle and @author
+ are now handled by $line_command.
+
+* verbatiminclude is now a $raw command argument distinct from verbatim.
+
1.82 (2009-01-05)
* NEW FEATURES
Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- TODO 16 Apr 2009 21:57:29 -0000 1.89
+++ TODO 25 Apr 2009 14:54:41 -0000 1.90
@@ -268,11 +268,9 @@
texi2html uses simple_format which removes most @commands but uses
entities
-* clean formatting/def_cmds.texi to remove invalid texinfo and put it
- in an ifset.
-
-* if a 'term' triggers no_paragraph, the ouput may be more valid. But a
- center won't have any effect in it.
+* Certainly an obsolete issue, now @center cannot be in @item:
+ if a 'term' triggers no_paragraph, the ouput
+ may be more valid. But a center won't have any effect in it.
* texi2dvi doesn't accept @table in @format
@@ -347,17 +345,6 @@
* makeinfo --no-header implies --no-split (and default for out file is stdout).
-* in @titlepage, @title, @authors and similar commands should be
- formatted when they happen and not at the beginning.
-
- @titlepage
- @titlefont{Software}
- @sp 1
- @title for something
- @subtitle subtitle
- @author by Somebody and Someone
- @author and Other people
-
* makeinfo.init not uptodate with makeinfo --html. Index entries link back
now. And also look at floats?
menu name is used instead of node in menu links url text.
@@ -375,9 +362,9 @@
* no line numbers when in footnotes.
-* ignore spaces at end of @item line for @(|v|f)table. Also maybe
- after @item, but to be careful with things prepended or commands used
- in for the whole line.
+* Certainly partly done: ignore spaces at end of @item line for @(|v|f)table.
+ Also maybe after @item, but to be careful with things prepended or
+ commands used in for the whole line.
* add --command command line that gives inserted lines.
@@ -430,7 +417,7 @@
* @image in info, remove last end of line in file.txt
-* have a special debug more where text processing is traced. It means
+* have a special debug mode where text processing is traced. It means
that PASS_TEXT/SCAN_TEXT is shown and substitute_line (and maybe
other like substitute_text) and shown, now that there is a nice
context information.
@@ -450,3 +437,6 @@
horizontal and vertical rules.
* @anchor{} should always ignore following whitespace (including newlines)
+
+* in info, @. @! and @? should always be followed by at least 2 spaces
+ even in text, not only on end of lines.
Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -b -r1.186 -r1.187
--- texi2html.init 23 Apr 2009 21:19:43 -0000 1.186
+++ texi2html.init 25 Apr 2009 14:54:41 -0000 1.187
@@ -12,7 +12,7 @@
# Afterwards, load the file with command-line
# option -init-file <your_init_file>
#
-# $Id: texi2html.init,v 1.186 2009/04/23 21:19:43 pertusus Exp $
+# $Id: texi2html.init,v 1.187 2009/04/25 14:54:41 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -295,6 +295,9 @@
#
##############################################################################
+# --split-size
+$SPLIT_SIZE = 300000;
+
# If true do table of contents even if there is no @content
$DO_CONTENTS = undef;
@@ -1108,24 +1111,17 @@
my $has_top_heading = shift;
my $element = shift;
- # for redefining navigation buttons use:
- # my $buttons = [...];
- # as it is, 'Top', 'Contents', 'Index', 'About' are printed
- my $buttons = address@hidden;
-
- my $nw;
# a dirty hack. A section is considered to be empty if there are 2
# lines or less in it. Indeed, this catches the sectionning command like
# @top and the @node.
if (scalar(@$Texi2HTML::THIS_SECTION) > 2)
{
# if top-level node has content
- $nw = main::print_lines($fh, $Texi2HTML::THIS_SECTION);
+ main::print_lines($fh, $Texi2HTML::THIS_SECTION);
}
else
{
# 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, $titlepage_simple_format) =
main::do_special_region_lines('titlepage',$Texi2HTML::THISDOC{'state'});
@@ -1136,13 +1132,13 @@
if (@{$Texi2HTML::OVERVIEW} and
!$Texi2HTML::THISDOC{'setshortcontentsaftertitlepage'})
{
print $fh '<h2> ' . $Texi2HTML::NAME{'Overview'} . "</h2>\n" .
"<blockquote\n";
- my $nw = main::print_lines($fh, $Texi2HTML::OVERVIEW);
+ main::print_lines($fh, $Texi2HTML::OVERVIEW);
print $fh "</blockquote>\n";
}
elsif (@{$Texi2HTML::TOC_LINES} and
!$Texi2HTML::THISDOC{'setcontentsaftertitlepage'})
{
print $fh '<h1> ' . $Texi2HTML::NAME{'Contents'} . "</h1>\n";
- my $nw = main::print_lines($fh, $Texi2HTML::TOC_LINES);
+ main::print_lines($fh, $Texi2HTML::TOC_LINES);
}
}
}
@@ -1859,33 +1855,44 @@
my $titlepage_no_texi = shift;
my $titlepage_simple_format = shift;
- my $result = '';
+# my $result = '';
+# my $title = '';
+# $title = $Texi2HTML::THISDOC{'title'} if
(defined($Texi2HTML::THISDOC{'title'}) and $Texi2HTML::THISDOC{'title'} !~
/^\s*$/);
+# if ($title ne ''
+# or @{$Texi2HTML::THISDOC{'subtitles'}}
+# or @{$Texi2HTML::THISDOC{'authors'}})
+# {
+# $result = "<div align=\"center\">\n";
+# if ($title ne '')
+# {
+# $result .= '<h1>' . $title . "</h1>\n";
+# }
+# foreach my $subtitle (@{$Texi2HTML::THISDOC{'subtitles'}})
+# {
+# $result .= '<h2>' . $subtitle . "</h2>\n";
+# }
+# foreach my $author (@{$Texi2HTML::THISDOC{'authors'}})
+# {
+# $result .= '<strong> ' . $author . " </strong><br>\n";
+# }
+# $result .= "</div>\n$DEFAULT_RULE\n";
+# }
+
+# $Texi2HTML::TITLEPAGE = $titlepage_text;
+
+# $Texi2HTML::TITLEPAGE = $result . $Texi2HTML::TITLEPAGE;
+
+ $Texi2HTML::TITLEPAGE = $titlepage_text;
+ if ($titlepage_text eq '')
+ {
my $title = '';
$title = $Texi2HTML::THISDOC{'title'} if
(defined($Texi2HTML::THISDOC{'title'}) and $Texi2HTML::THISDOC{'title'} !~
/^\s*$/);
- if ($title ne ''
- or @{$Texi2HTML::THISDOC{'subtitles'}}
- or @{$Texi2HTML::THISDOC{'authors'}})
- {
- $result = "<div align=\"center\">\n";
if ($title ne '')
{
- $result .= '<h1>' . $title . "</h1>\n";
- }
- foreach my $subtitle (@{$Texi2HTML::THISDOC{'subtitles'}})
- {
- $result .= '<h2>' . $subtitle . "</h2>\n";
- }
- foreach my $author (@{$Texi2HTML::THISDOC{'authors'}})
- {
- $result .= '<strong> ' . $author . " </strong><br>\n";
+ $Texi2HTML::TITLEPAGE = '<h1
align="center">'."$title</h1>\n$DEFAULT_RULE\n";
}
- $result .= "</div>\n$DEFAULT_RULE\n";
}
- $Texi2HTML::TITLEPAGE = $titlepage_text;
-
- $Texi2HTML::TITLEPAGE = $result . $Texi2HTML::TITLEPAGE;
-
if ($Texi2HTML::THISDOC{'setcontentsaftertitlepage'} and
(defined($Texi2HTML::THISDOC{'inline_contents'}->{'contents'})) and
@{$Texi2HTML::THISDOC{'inline_contents'}->{'contents'}})
{
foreach my
$line(@{$Texi2HTML::THISDOC{'inline_contents'}->{'contents'}})
@@ -3037,7 +3044,8 @@
%stop_paragraph_command = (
'titlefont' => 1,
'insertcopying' => 1,
- 'sp' => 1
+ 'sp' => 1,
+ 'verbatiminclude' => 1
);
# on bug-texinfo verified that code_style shouldn't be used for anything
@@ -3163,6 +3171,12 @@
}
}
+%line_command_map = (
+ 'title' => 'h1',
+ 'subtitle' => 'h3 align="right"',
+ 'author' => 'strong',
+);
+
%unicode_diacritical = (
'H' => '030B',
'ringaccent' => '030A',
@@ -3996,7 +4010,7 @@
'ifnotinfo' => 1,
'ifnotxml' => 1,
'ifnotdocbook' => 1,
- 'direntry' => 0,
+ 'direntry' => 'raw',
'verbatim' => 'raw',
'ifclear' => 'value',
'ifset' => 'value' ,
@@ -4427,6 +4441,7 @@
$colon_command = \&t2h_default_colon_command;
$simple_command = \&t2h_default_simple_command;
$thing_command = \&t2h_default_thing_command;
+$line_command = \&t2h_default_line_command;
# return the line after preserving things according to misc_command map.
# You should not change it. It is here, nevertheless, to be used
@@ -6052,8 +6067,9 @@
my $style = shift;
my $text = shift;
my $expanded = 1 if (grep {$style eq $_} @EXPAND);
- if ($style eq 'verbatim' or ($style eq 'tex' and $expanded))
+ if ($style eq 'verbatim' or $style eq 'verbatiminclude' or ($style eq
'tex' and $expanded))
{
+ $style = 'verbatim' if ($style eq 'verbatiminclude');
return "<pre class=\"$style\">" . &$protect_text($text) . '</pre>';
}
elsif ($style eq 'html' and $expanded)
@@ -6077,7 +6093,7 @@
{
my $style = shift;
my $text = shift;
- if ($style eq 'verbatim' or grep {$style eq $_} @EXPAND)
+ if ($style eq 'verbatim' or $style eq 'verbatiminclude' or grep {$style eq
$_} @EXPAND)
{
return $text;
}
@@ -6683,4 +6699,29 @@
return undef;
}
+sub t2h_default_line_command($$$$)
+{
+ my $command = shift;
+ my $arg_text = shift;
+ my $arg_texi = shift;
+ my $state = shift;
+
+ return '' if ($arg_text eq '');
+ my $style = $line_command_map{$command};
+ if ($style)
+ {
+ my $attribute_text = '';
+ if ($style =~ /^(\w+)(\s+.*)/)
+ {
+ $style = $1;
+ $attribute_text = $2;
+ }
+ $arg_text = "<${style}$attribute_text>$arg_text</$style>";
+ }
+ $arg_text .= "<br>" if ($command eq 'author');
+ $arg_text .= "\n";
+ $arg_text .= "$DEFAULT_RULE\n" if ($command eq 'title');
+ return $arg_text;
+}
+
1;
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -b -r1.274 -r1.275
--- texi2html.pl 23 Apr 2009 21:19:44 -0000 1.274
+++ texi2html.pl 25 Apr 2009 14:54:42 -0000 1.275
@@ -79,7 +79,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.274 2009/04/23 21:19:44 pertusus Exp $
+# $Id: texi2html.pl,v 1.275 2009/04/25 14:54:42 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -212,6 +212,7 @@
$SUBDIR
$IDX_SUMMARY
$SPLIT
+$SPLIT_SIZE
$SHORT_REF
@EXPAND
$EXPAND
@@ -469,6 +470,7 @@
$index_summary_file_end
$index_summary_file_begin
$style
+$line_command
$format
$normal_text
$empty_line
@@ -522,6 +524,7 @@
%simple_format_simple_map_texi
%simple_format_style_map_texi
%simple_format_texi_map
+%line_command_map
%command_type
%paragraph_style
%stop_paragraph_command
@@ -1784,9 +1787,11 @@
$format_type{'group'} = 'group';
-$format_type{'titlepage'} = 'region';
-$format_type{'copying'} = 'region';
-$format_type{'documentdescription'} = 'region';
+my @special_regions = ('titlepage', 'copying', 'documentdescription');
+foreach my $region (@special_regions)
+{
+ $format_type{$region} = 'region';
+}
foreach my $key (keys(%format_type))
{
@@ -1822,7 +1827,11 @@
}
# raw formats which are expanded especially
-my @raw_regions = ('html', 'verbatim', 'tex', 'xml', 'docbook');
+my @raw_regions = ('html', 'tex', 'xml', 'docbook');
+foreach my $format (keys(%Texi2HTML::Config::texi_formats_map))
+{
+ push @raw_regions, $format if
($Texi2HTML::Config::texi_formats_map{$format} eq 'raw');
+}
# The css formats are associated with complex format commands, and associated
# with the 'pre_style' key
@@ -2625,6 +2634,13 @@
verbose => 'quit after NUM errors (default 1000).',
};
+$T2H_OPTIONS -> {'split-size'} =
+{
+ type => '=s',
+ linkage => \$Texi2HTML::Config::SPLIT_SIZE,
+ verbose => 'split Info files at size s (default 300000).',
+};
+
$T2H_OPTIONS -> {'monolithic'} =
{
type => '!',
@@ -4722,6 +4738,12 @@
$novalidate = 1;
$Texi2HTML::THISDOC{$macro} = 1;
}
+ elsif ($macro eq 'dircategory' and ($line =~ /^\s+(.*)\s*$/))
+ {
+ my $arg = $1;
+ $Texi2HTML::THISDOC{"${macro}_texi"} = $arg;
+ $Texi2HTML::THISDOC{$macro} = substitute_line($arg, "address@hidden");
+ }
elsif (grep {$_ eq $macro} ('settitle','shorttitlepage','title')
and ($line =~ /^\s+(.*)$/))
{
@@ -4997,11 +5019,11 @@
if ($state->{'remove_texi'})
{
- add_prev ($text, $stack,
&$Texi2HTML::Config::raw_no_texi('verbatim', $verb_text));
+ add_prev ($text, $stack,
&$Texi2HTML::Config::raw_no_texi('verbatiminclude', $verb_text));
}
else
{
- add_prev($text, $stack,
&$Texi2HTML::Config::raw('verbatim', $verb_text));
+ add_prev($text, $stack,
&$Texi2HTML::Config::raw('verbatiminclude', $verb_text));
}
close VERBINCLUDE;
}
@@ -11916,13 +11938,29 @@
}
}
+ unless ($state->{'raw'} or $state->{'verb'} or $state->{'keep_texi'})
+ {
+ #Â first the line commands are taken into account
+ my $next_command = next_tag($cline);
+ if (defined($next_command) and
defined($Texi2HTML::Config::line_command_map{$next_command}))
+ {
+ close_paragraph($text, $stack, $state, "address@hidden",
$line_nr, 1) if ($Texi2HTML::Config::stop_paragraph_command{$next_command});
+ my $arg_texi = $cline;
+ $arg_texi =~ s/address@hidden//;
+ $arg_texi =~ s/\s*$//;
+ my $arg_line = substitute_line($arg_texi, "address@hidden",
duplicate_formatting_state($state));
+ add_prev ($text, $stack,
&$Texi2HTML::Config::line_command($next_command, $arg_line, $arg_texi, $state));
+ return '';
+ }
+
#Â The commands to ignore are ignored now in case after ignoring them
#Â there is an empty line, to be able to stop the paragraph
my $leading_spaces = '';
+
while (1)
{
my $next_tag = next_tag($cline);
- close_paragraph($text, $stack, $state, "address@hidden", $line_nr,
1) if ($Texi2HTML::Config::stop_paragraph_command{$next_tag} and
!$state->{'keep_texi'});
+ close_paragraph($text, $stack, $state, "address@hidden",
$line_nr, 1) if ($Texi2HTML::Config::stop_paragraph_command{$next_tag});
if (defined($next_tag) and
defined($Texi2HTML::Config::misc_command{$next_tag}) and
!$Texi2HTML::Config::misc_command{$next_tag}->{'keep'})
{
$cline =~ s/^(\s*)address@hidden//;
@@ -11936,7 +11974,7 @@
}
add_prev ($text, $stack, $leading_spaces);
return '' if (!defined($cline) or $cline eq '');
-
+ }
my $top_stack = top_stack($stack);
if (($top_stack->{'format'} and $top_stack->{'format'} eq
'menu_description') or $state->{'raw'} or $state->{'preformatted'} or
$state->{'no_paragraph'} or $state->{'keep_texi'} or $state->{'remove_texi'})
{ # empty lines are left unmodified in these contexts.
@@ -14463,11 +14501,11 @@
($Texi2HTML::THISDOC{'css_import_lines'}, $Texi2HTML::THISDOC{'css_lines'})
= collect_all_css_files();
- %region_lines = (
- 'titlepage' => [ ],
- 'documentdescription' => [ ],
- 'copying' => [ ],
- );
+ %region_lines = ();
+ foreach my $region (@special_regions)
+ {
+ $region_lines{$region} = [];
+ }
texinfo_initialization(0);
@@ -14529,11 +14567,11 @@
'place' => [],
};
- %region_initial_state = (
- 'titlepage' => { },
- 'documentdescription' => { },
- 'copying' => { },
- );
+ %region_initial_state = ();
+ foreach my $region (@special_regions)
+ {
+ $region_initial_state{$region} = { };
+ }
# to determine if a command has to be processed the following are interesting
# (and can be faked):
Index: translations.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/translations.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- translations.pl 8 Jan 2009 00:21:34 -0000 1.25
+++ translations.pl 25 Apr 2009 14:54:42 -0000 1.26
@@ -68,7 +68,6 @@
'November' => 'novembre',
'October' => 'octobre',
'Overview' => 'Vue d\'ensemble',
- 'Overview:' => 'Vue d\'ensemble@ :',
'Prev' => 'address@hidden'address@hidden'edent',
'PrevFile' => '',
'Previous file' => 'Fichier
address@hidden'address@hidden'edent',
@@ -128,6 +127,7 @@
' This document was generated
%{who_and_when_generated} using %{program_homepage_href}.' => ' Ce document a
été généré %{who_and_when_generated} en
utilisant %{program_homepage_href}.',
' where the <strong> Example </strong>
assumes that the current position is at <strong> Subsubsection One-Two-Three
</strong> of a document of the following structure:' => ' Dans cet exemple on
est à <strong> Sous section un-deux-trois </strong> dans un document
dont la structure est :',
'%{node_file_href} section `%{section}\' in
<cite>%{book}</cite>' => '%{node_file_href} section `%{section}\' dans
<cite>%{book}</cite>',
+ 'Overview:' => 'Vue d\'ensemble@ :',
'See' => 'Voir',
'See %{node_file_href} <cite>%{book}</cite>'
=> 'Voir %{node_file_href} <cite>%{book}</cite>',
'See %{node_file_href} section `%{section}\'
in <cite>%{book}</cite>' => 'Voir %{node_file_href} section `%{section}\' dans
<cite>%{book}</cite>',
@@ -247,7 +247,6 @@
'November' => 'Novembro',
'October' => 'Outubro',
'Overview' => 'address@hidden geral',
- 'Overview:' => 'address@hidden geral:',
'Prev' => 'address@hidden'evio',
'PrevFile' => '',
'Previous file' => '',
@@ -304,6 +303,7 @@
};
$T2H_OBSOLETE_STRINGS->{'pt_BR'} = {
+ 'Overview:' => 'address@hidden geral:',
'See' => 'Veja',
'about (help)' => 'sobre (ajuda)',
'beginning of this chapter or previous
chapter' => 'come@,{c}o desse address@hidden'itulo ou address@hidden'itulo
anterior',
@@ -401,7 +401,6 @@
'November' => 'November',
'October' => 'Oktober',
'Overview' => '',
- 'Overview:' => '',
'Prev' => '',
'PrevFile' => '',
'Previous file' => '',
@@ -534,7 +533,6 @@
'November' => '11æ',
'October' => '10æ',
'Overview' => 'æ¦è¦',
- 'Overview:' => 'æ¦è¦:',
'Prev' => 'å',
'PrevFile' => '',
'Previous file' => '',
@@ -591,6 +589,7 @@
};
$T2H_OBSOLETE_STRINGS->{'ja'} = {
+ 'Overview:' => 'æ¦è¦:',
'about (help)' => '使ç¨æ³ (ãã«ã)',
'beginning of this chapter or previous
chapter' => 'ãã®ç« ã¾ãã¯åã®ç« ã®åé ',
'cover (top) of document' =>
'ææ¸ã®è¡¨ç´ (ããã)',
@@ -685,7 +684,6 @@
'November' => 'Novembro',
'October' => 'Outubro',
'Overview' => 'address@hidden geral',
- 'Overview:' => 'address@hidden geral:',
'Prev' => 'address@hidden'evio',
'PrevFile' => '',
'Previous file' => '',
@@ -742,6 +740,7 @@
};
$T2H_OBSOLETE_STRINGS->{'pt'} = {
+ 'Overview:' => 'address@hidden geral:',
'See' => 'Veja',
'about (help)' => 'sobre (ajuda)',
'beginning of this chapter or previous
chapter' => 'come@,{c}o desse address@hidden'itulo ou address@hidden'itulo
anterior',
@@ -839,7 +838,6 @@
'November' => 'November',
'October' => 'Oktober',
'Overview' => '@"Ubersicht',
- 'Overview:' => '@"Ubersicht:',
'Prev' => '',
'PrevFile' => '',
'Previous file' => '',
@@ -896,6 +894,7 @@
};
$T2H_OBSOLETE_STRINGS->{'de'} = {
+ 'Overview:' => '@"Ubersicht:',
'See' => 'Siehe',
'section' => 'Abschnitt',
'see' => 'siehe'
@@ -972,7 +971,6 @@
'November' => '',
'October' => '',
'Overview' => '',
- 'Overview:' => '',
'Prev' => '',
'PrevFile' => '',
'Previous file' => '',
@@ -1101,7 +1099,6 @@
'November' => 'noviembre',
'October' => 'octubre',
'Overview' => 'address@hidden'amica',
- 'Overview:' => 'address@hidden'amica:',
'Prev' => 'Ant',
'PrevFile' => 'ArchivoAnt',
'Previous file' => 'Archivo anterior',
@@ -1158,6 +1155,7 @@
};
$T2H_OBSOLETE_STRINGS->{'es'} = {
+ 'Overview:' => 'address@hidden'amica:',
'See' => 'address@hidden'ease',
'section' => 'address@hidden'on',
'see' => 'address@hidden'ease'
@@ -1234,7 +1232,6 @@
'November' => 'november',
'October' => 'oktober',
'Overview' => '',
- 'Overview:' => '',
'Prev' => '',
'PrevFile' => '',
'Previous file' => '',
Index: doc/texi2html.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.texi,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- doc/texi2html.texi 2 Apr 2009 09:13:48 -0000 1.82
+++ doc/texi2html.texi 25 Apr 2009 14:54:42 -0000 1.83
@@ -1597,8 +1597,7 @@
@item $Texi2HTML::TOC_LINES
Lines of table of contents. @xref{Special pages}.
@item $Texi2HTML::TITLEPAGE
-The title page formatted with special title commands (@code{@@author},
address@hidden@@title}) expanded. @xref{Title page}.
+The title page formatted. @xref{Title page}.
@end vtable
@c -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -2114,15 +2113,15 @@
The title page is first formatted using the text appearing in
the @code{@@titlepage} section, and put in @variable{$Texi2HTML::TITLEPAGE}.
-The information appearing in @code{@@title}, @code{@@subtitle} or
address@hidden@@author} is then added using the following
+More formatting can be done using the following
function reference:
@deffn {Function Reference} titlepage
This function should complete @code{$Texi2HTML::TITLEPAGE}.
@end deffn
-In the default case, in this function the table of contents and short
+In the default case, in this function the title is output if
+there is no titlepage, the table of contents and short
table of contents are also added if they are to be output and
@code{@@setcontentsaftertitlepage}
or @code{@@setshortcontentsaftertitlepage} appear in the document
@@ -2342,6 +2341,8 @@
* Style and accent commands::
* Anchors images and spaces:: Formatting of @code{@@anchor},
@code{@@image}, @code{@@sp}, @code{@@acronym}, @code{@@abbr}
* Text:: Some characters are processed specially
+* Line commands:: Formatting of @@-commands taking a line as
+ argument
* Strings:: @command{texi2html} write some strings in the
output
different for each languages
@c * Skipped commands::
@@ -2825,6 +2826,27 @@
@end deftypefn
@c --------------------------------------------------------
address@hidden Line commands
address@hidden Customizing of line command output
+
+@@-commands that appear on a line and take the line as argument may
+be formatted especially, if they are in the @variable{%line_command_map}.
+In that case the following function reference is used to format the
+@@-command:
+
address@hidden {Function Reference} $resulting_text line_command $command
$arg_text $arg_texi $state
address@hidden the @@-command. @var{$arg_text} is the @@-command formatted
+argument, @var{$arg_texi} is the @@-command argument without any formatting.
address@hidden is a structure that holds informations
+about the state of the parsing.
+The resulting text is @var{$resulting_text}.
address@hidden deftypefn
+
+In the default case, @@-commands appearing in @code{@@titlepage},
address@hidden@@title}, @code{@@subtitle}, @code{@@author} are formatted
+by this function.
+
address@hidden --------------------------------------------------------
@node Strings
@section Customizing strings written by @command{texi2html}
@@ -3560,11 +3582,14 @@
@node Special regions
@section Formatting of special regions (@code{@@verbatim}, @code{@@cartouche},
@code{@@quotation})
-Regions corresponding with raw text, like @code{@@verbatim}, @code{@@html}
-or @code{@@tex} are formatted according to the following function reference:
+Regions corresponding with raw text, like @code{@@verbatim}, @code{@@html},
address@hidden@@tex} or the content of the file given in
@code{@@verbatiminclude}
+argument are formatted according to the following function reference:
@deftypefn {Function Reference} $raw_region raw $command $text
@var{$command} is the command name, @var{$text} is the raw text.
+In the default case, if @var{$command} is @code{verbatiminclude}
+the text is the content of the @code{@@verbatiminclude} file argument.
@end deftypefn
If address@hidden is used, @code{@@tex} regions are handled differently,
@@ -4509,6 +4534,9 @@
@item $format_list_item_texi should now modify directly the @@item argument
and apply the @@-command given as @@table argument. Correspondingly,
some arguments of $table_item have been removed.
address@hidden Formatting of titlepage chaned, and @@title, @@subtitle and
@@author
+ are now handled by $line_command
address@hidden verbatiminclude is now a $raw command argument distinct from
verbatim.
@end itemize
@item API changes between 1.78 and 1.80:
@itemize @bullet
Index: examples/docbook.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/docbook.init,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- examples/docbook.init 2 Apr 2009 09:13:48 -0000 1.18
+++ examples/docbook.init 25 Apr 2009 14:54:43 -0000 1.19
@@ -1470,7 +1470,7 @@
my $style = shift;
my $text = shift;
- if ($style eq 'verbatim')
+ if ($style eq 'verbatim' or $style eq 'verbatiminclude')
{
return docbook_add_id('screen').'>' . &$protect_text($text) .
'</screen>';
}
Index: examples/html32.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/html32.init,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- examples/html32.init 9 Jan 2009 21:20:07 -0000 1.23
+++ examples/html32.init 25 Apr 2009 14:54:43 -0000 1.24
@@ -219,7 +219,7 @@
my $style = shift;
my $text = shift;
my $expanded = 1 if (grep {$style eq $_} @EXPAND);
- if ($style eq 'verbatim' or ($style eq 'tex' and $expanded))
+ if ($style eq 'verbatim' or $style eq 'verbatiminclude' or ($style eq
'tex' and $expanded))
{
return "<pre>" . &$protect_text($text) . '</pre>';
}
Index: examples/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/info.init,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- examples/info.init 23 Apr 2009 21:03:23 -0000 1.32
+++ examples/info.init 25 Apr 2009 14:54:43 -0000 1.33
@@ -28,6 +28,8 @@
use strict;
+$Data::Dumper::Maxdepth = 5;
+
$USE_NODES = 1;
$USE_SECTIONS = 0;
@EXPAND = ('info');
@@ -59,6 +61,10 @@
$misc_command{'noindent'}->{'keep'} = 1;
$misc_command{'indent'}->{'keep'} = 1;
+%line_command_map = (
+ 'dircategory' => ''
+);
+
# sc and var upcase.
my @simple_quoted_commands = ('cite', 'code', 'command', 'env', 'file', 'kbd',
'option', 'samp');
@@ -261,6 +267,8 @@
$listoffloats_entry = \&info_default_listoffloats_entry;
$listoffloats = \&info_default_listoffloats;
$colon_command = \&info_default_colon_command;
+$raw = \&info_default_raw;
+$line_command = \&info_default_line_command;
sub info_default_accent($$$)
@@ -348,6 +356,8 @@
#Â FIXME initialize
my %info_default_state_map = ();
my $info_default_state;
+my $info_default_out_file_nr = 0;
+my $info_default_dir_specification = '';
sub info_default_reset_state($)
{
@@ -978,6 +988,9 @@
}
elsif ($content->{'command'} eq 'paragraph' and
$info_state->{'align_stack'}->[-1]->{'command'} eq 'normal')
{
+ #Â empty paragraph
+ goto new_text if (!$content->{'content'});
+
my $paragraphindent = $Texi2HTML::THISDOC{'paragraphindent'};
$paragraphindent = $Texi2HTML::Config::PARAGRAPHINDENT if
(!defined($paragraphindent));
$paragraphindent = 0 if ($paragraphindent eq 'none');
@@ -1670,11 +1683,15 @@
($dummy, $dummy, $dummy, $dummy, $result) =
info_default_process_text($result, 0, '', undef, undef, 1,
$info_default_max_column);
$result .= "\n\n";
$result .= "$Texi2HTML::THISDOC{'copying_comment'}";
+ if ($info_default_dir_specification)
+ {
+ $result .= "$info_default_dir_specification\n";
+ }
+ print $fh $result;
my $state = $Texi2HTML::THISDOC{'state'};
my $info_state = info_default_get_state ($state);
$info_state->{'offset_in_file'} = length($result);
$info_state->{'blank_line'} = 1 if ($Texi2HTML::THISDOC{'copying_comment'}
eq '');
- print $fh $result;
}
sub info_default_parent_format($)
@@ -2088,6 +2105,14 @@
my $fh = shift;
my $end_foot_navigation = shift;
my $element = shift;
+ my $state = $Texi2HTML::THISDOC{'state'};
+ my $info_state = info_default_get_state ($state);
+
+ if ($info_state->{'offset_in_file'} > (1+$info_default_out_file_nr) *
$SPLIT_SIZE)
+ {
+ $info_default_out_file_nr++;
+ print STDERR "X-$info_default_out_file_nr:
$info_state->{'offset_in_file'}\n";
+ }
}
sub info_default_one_section($$)
@@ -2884,4 +2909,33 @@
return info_default_store_text($state,$result,'listoffloats');
}
+sub info_default_raw($$)
+{
+ my $style = shift;
+ my $text = shift;
+ my $expanded = 1 if (grep {$style eq $_} @EXPAND);
+ if ($style eq 'verbatim' or $style eq 'verbatiminclude' or $expanded)
+ {
+ return info_default_store_text(undef,$text, $style);
+ }
+ if ($style eq 'direntry')
+ {
+ $info_default_dir_specification .= "START-INFO-DIR-ENTRY\n"
+ .$text. "END-INFO-DIR-ENTRY\n";
+ }
+ return '';
+}
+
+sub info_default_line_command($$$$)
+{
+ my $command = shift;
+ my $arg_text = shift;
+ my $arg_texi = shift;
+ my $state = shift;
+
+ return '' if ($arg_text eq '');
+ $info_default_dir_specification .= "INFO-DIR-SECTION $arg_text\n";
+ return '';
+}
+
1;
Index: examples/mediawiki.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/mediawiki.init,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- examples/mediawiki.init 3 Nov 2008 12:33:16 -0000 1.12
+++ examples/mediawiki.init 25 Apr 2009 14:54:43 -0000 1.13
@@ -8,7 +8,7 @@
# Load the file with command-line
# option -init-file mediawiki.init
#
-# $Id: mediawiki.init,v 1.12 2008/11/03 12:33:16 pertusus Exp $
+# $Id: mediawiki.init,v 1.13 2009/04/25 14:54:43 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -232,27 +232,39 @@
my $titlepage_no_texi = shift;
my $titlepage_simple_text = shift;
- my $result = '';
- if (@{$Texi2HTML::THISDOC{'titles'}}
- or @{$Texi2HTML::THISDOC{'subtitles'}}
- or @{$Texi2HTML::THISDOC{'authors'}})
+# my $result = '';
+# if (@{$Texi2HTML::THISDOC{'titles'}}
+# or @{$Texi2HTML::THISDOC{'subtitles'}}
+# or @{$Texi2HTML::THISDOC{'authors'}})
+# {
+# foreach my $title (@{$Texi2HTML::THISDOC{'titles'}})
+# {
+# $result .= '== ' . $title . " ==\n";
+# }
+# foreach my $subtitle (@{$Texi2HTML::THISDOC{'subtitles'}})
+# {
+# $result .= '=== ' . $subtitle . " ===\n";
+# }
+# foreach my $author (@{$Texi2HTML::THISDOC{'authors'}})
+# {
+# $result .= '<strong> ' . $author . " </strong><br>\n";
+# }
+# $result .= "$DEFAULT_RULE\n" if $DEFAULT_RULE;
+# }
+
+ $Texi2HTML::TITLEPAGE = $titlepage_text;
+ $Texi2HTML::TITLEPAGE = $titlepage_text;
+ if ($titlepage_text eq '')
+ {
+ my $title = '';
+ $title = $Texi2HTML::THISDOC{'title'} if
(defined($Texi2HTML::THISDOC{'title'}) and $Texi2HTML::THISDOC{'title'} !~
/^\s*$/);
+ if ($title ne '')
{
- foreach my $title (@{$Texi2HTML::THISDOC{'titles'}})
- {
- $result .= '== ' . $title . " ==\n";
- }
- foreach my $subtitle (@{$Texi2HTML::THISDOC{'subtitles'}})
- {
- $result .= '=== ' . $subtitle . " ===\n";
- }
- foreach my $author (@{$Texi2HTML::THISDOC{'authors'}})
- {
- $result .= '<strong> ' . $author . " </strong><br>\n";
+ $Texi2HTML::TITLEPAGE = "== $title ==\n";
}
- $result .= "$DEFAULT_RULE\n" if $DEFAULT_RULE;
}
- $Texi2HTML::TITLEPAGE = $result . $titlepage_text;
+ return $Texi2HTML::TITLEPAGE;
}
sub mediawiki_titlefont($$$)
@@ -601,6 +613,31 @@
. "</tr></table>\n";
}
+$line_command = \&mediawiki_line_command;
+
+sub mediawiki_line_command($$$$)
+{
+ my $command = shift;
+ my $arg_text = shift;
+ my $arg_texi = shift;
+ my $state = shift;
+
+ return '' if ($arg_text eq '');
+ if ($command eq 'title')
+ {
+ $arg_text = '== ' .$arg_text. " ==\n";
+ }
+ elsif ($command eq 'subtitle')
+ {
+ $arg_text = '=== ' .$arg_text. " ===\n";
+ }
+ elsif ($command eq 'author')
+ {
+ $arg_text = '<strong> ' .$arg_text. " </strong><br>\n";
+ }
+ return $arg_text;
+}
+
## a simple menu entry ref in case we aren't in a standard menu context
#$simple_menu_link = \&mediawiki_simple_menu_link;
Index: examples/noheaders.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/noheaders.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- examples/noheaders.init 8 Nov 2008 20:02:51 -0000 1.13
+++ examples/noheaders.init 25 Apr 2009 14:54:43 -0000 1.14
@@ -31,7 +31,7 @@
$one_section = \&T2H_NOHEAD_one_section;
#$print_Top_header = \&T2H_NOHEAD_print_Top_header;
$print_Top_footer = \&T2H_NOHEAD_print_Top_footer;
-$print_Top = \&T2H_NOHEAD_print_Top;
+#$print_Top = \&T2H_NOHEAD_print_Top;
#$print_misc_header = \&T2H_NOHEAD_print_misc_header;
$print_misc_footer = \&T2H_NOHEAD_print_misc_footer;
#$print_misc = \&T2H_NOHEAD_print_misc;
@@ -80,42 +80,6 @@
my $fh = shift;
print $fh "$SMALL_RULE\n";
}
-sub T2H_NOHEAD_print_Top
-{
- my $fh = shift;
- my $has_top_heading = shift;
-
- # FIXME take what is in texi2html.init, or maybe this is not needed
- # anymore
- if (@$Texi2HTML::THIS_SECTION)
- {
- # if top-level node has content, then print it with extra header
- #print $fh "<h1>$Texi2HTML::NAME{Top}</h1>\n"
-# print $fh "<h1 class=\"settitle\">$Texi2HTML::NAME{Top}</h1>\n"
-# unless ($has_top_heading);
- main::print_lines($fh, $Texi2HTML::THIS_SECTION);
- }
- else
- {
- # 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, $titlepage_simple_text) =
main::do_special_region_lines('titlepage',$Texi2HTML::THISDOC{'state'});
- &$titlepage([],$titlepage_text, $titlepage_no_texi,
$titlepage_simple_text);
- print $fh $Texi2HTML::TITLEPAGE;
- if (@{$Texi2HTML::OVERVIEW})
- {
- print $fh '<h2> ' . &$I('Overview:') . "</h2>\n" .
"<blockquote>\n";
- my $nw = main::print_lines($fh, $Texi2HTML::OVERVIEW);
- print $fh "</blockquote>\n";
- }
- elsif (@{$Texi2HTML::TOC_LINES})
- {
- print $fh '<h1> ' . &$I('Table of contents') . "</h1>\n";
- my $nw = main::print_lines($fh, $Texi2HTML::TOC_LINES);
- }
- }
-}
###################################################################
# Layout of Toc, Overview, and Footnotes pages
Index: examples/roff.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/roff.init,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- examples/roff.init 2 Apr 2009 09:13:48 -0000 1.28
+++ examples/roff.init 25 Apr 2009 14:54:43 -0000 1.29
@@ -108,6 +108,7 @@
or @{$Texi2HTML::THISDOC{'subtitles'}}
or @{$Texi2HTML::THISDOC{'authors'}})
{
+#Â FIXME obsolete, use $line_command instead
foreach my $title (@{$Texi2HTML::THISDOC{'titles'}})
{
$result .= ".sz +10\n.ce\n" . protect_spaces($title) . "\n.sz
-10\n";
@@ -1001,7 +1002,7 @@
my $style = shift;
my $text = shift;
my $expanded = 1 if (grep {$style eq $_} @EXPAND);
- if ($style eq 'verbatim' or ($expanded and ($style eq 'tex' or $style eq
'html')))
+ if ($style eq 'verbatim' or $style eq 'verbatiminclude' or ($expanded and
($style eq 'tex' or $style eq 'html')))
{
chomp ($text);
return ".(l M\n\\fR\\&\\f(CW" . &$protect_text($text) . "\\fR\n.)l\n" ;
Index: examples/xml.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/xml.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- examples/xml.init 2 Apr 2009 09:13:48 -0000 1.14
+++ examples/xml.init 25 Apr 2009 14:54:43 -0000 1.15
@@ -51,6 +51,8 @@
$stop_paragraph_command{'caption'} = 1;
$stop_paragraph_command{'shortcaption'} = 1;
+%line_command_map = ();
+
$format_map{'copying'} = '';
$format_map{'titlepage'} = 'titlepage';
$format_map{'documentdescription'} = 'documentdescription';
@@ -1183,7 +1185,7 @@
my $style = shift;
my $text = shift;
- if ($style eq 'verbatim')
+ if ($style eq 'verbatim' or $style eq 'verbatiminclude')
{
return '<verbatim xml:space="preserve">' . &$protect_text($text) .
'</verbatim>';
}
Index: i18n/de
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/de,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- i18n/de 16 May 2008 09:33:06 -0000 1.12
+++ i18n/de 25 Apr 2009 14:54:44 -0000 1.13
@@ -68,7 +68,6 @@
'November' => 'November',
'October' => 'Oktober',
'Overview' => '@"Ubersicht',
- 'Overview:' => '@"Ubersicht:',
'Prev' => '',
'PrevFile' => '',
'Previous file' => '',
@@ -125,6 +124,7 @@
};
$T2H_OBSOLETE_STRINGS->{'de'} = {
+ 'Overview:' => '@"Ubersicht:',
'See' => 'Siehe',
'section' => 'Abschnitt',
'see' => 'siehe'
Index: i18n/en
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/en,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- i18n/en 16 May 2008 09:33:07 -0000 1.10
+++ i18n/en 25 Apr 2009 14:54:44 -0000 1.11
@@ -68,7 +68,6 @@
'November' => '',
'October' => '',
'Overview' => '',
- 'Overview:' => '',
'Prev' => '',
'PrevFile' => '',
'Previous file' => '',
Index: i18n/es
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/es,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- i18n/es 29 Aug 2008 15:05:45 -0000 1.13
+++ i18n/es 25 Apr 2009 14:54:44 -0000 1.14
@@ -68,7 +68,6 @@
'November' => 'noviembre',
'October' => 'octubre',
'Overview' => 'address@hidden'amica',
- 'Overview:' => 'address@hidden'amica:',
'Prev' => 'Ant',
'PrevFile' => 'ArchivoAnt',
'Previous file' => 'Archivo anterior',
@@ -125,6 +124,7 @@
};
$T2H_OBSOLETE_STRINGS->{'es'} = {
+ 'Overview:' => 'address@hidden'amica:',
'See' => 'address@hidden'ease',
'section' => 'address@hidden'on',
'see' => 'address@hidden'ease'
Index: i18n/fr
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/fr,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- i18n/fr 19 Jul 2008 21:26:20 -0000 1.15
+++ i18n/fr 25 Apr 2009 14:54:44 -0000 1.16
@@ -68,7 +68,6 @@
'November' => 'novembre',
'October' => 'octobre',
'Overview' => 'Vue d\'ensemble',
- 'Overview:' => 'Vue d\'ensemble@ :',
'Prev' => 'address@hidden'address@hidden'edent',
'PrevFile' => '',
'Previous file' => 'Fichier
address@hidden'address@hidden'edent',
@@ -128,6 +127,7 @@
' This document was generated
%{who_and_when_generated} using %{program_homepage_href}.' => ' Ce document a
été généré %{who_and_when_generated} en
utilisant %{program_homepage_href}.',
' where the <strong> Example </strong>
assumes that the current position is at <strong> Subsubsection One-Two-Three
</strong> of a document of the following structure:' => ' Dans cet exemple on
est à <strong> Sous section un-deux-trois </strong> dans un document
dont la structure est :',
'%{node_file_href} section `%{section}\' in
<cite>%{book}</cite>' => '%{node_file_href} section `%{section}\' dans
<cite>%{book}</cite>',
+ 'Overview:' => 'Vue d\'ensemble@ :',
'See' => 'Voir',
'See %{node_file_href} <cite>%{book}</cite>'
=> 'Voir %{node_file_href} <cite>%{book}</cite>',
'See %{node_file_href} section `%{section}\'
in <cite>%{book}</cite>' => 'Voir %{node_file_href} section `%{section}\' dans
<cite>%{book}</cite>',
Index: i18n/ja
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/ja,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- i18n/ja 16 May 2008 09:33:08 -0000 1.3
+++ i18n/ja 25 Apr 2009 14:54:44 -0000 1.4
@@ -68,7 +68,6 @@
'November' => '11æ',
'October' => '10æ',
'Overview' => 'æ¦è¦',
- 'Overview:' => 'æ¦è¦:',
'Prev' => 'å',
'PrevFile' => '',
'Previous file' => '',
@@ -125,6 +124,7 @@
};
$T2H_OBSOLETE_STRINGS->{'ja'} = {
+ 'Overview:' => 'æ¦è¦:',
'about (help)' => '使ç¨æ³ (ãã«ã)',
'beginning of this chapter or previous
chapter' => 'ãã®ç« ã¾ãã¯åã®ç« ã®åé ',
'cover (top) of document' =>
'ææ¸ã®è¡¨ç´ (ããã)',
Index: i18n/nl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/nl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- i18n/nl 16 May 2008 09:33:09 -0000 1.12
+++ i18n/nl 25 Apr 2009 14:54:44 -0000 1.13
@@ -68,7 +68,6 @@
'November' => 'November',
'October' => 'Oktober',
'Overview' => '',
- 'Overview:' => '',
'Prev' => '',
'PrevFile' => '',
'Previous file' => '',
Index: i18n/no
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/no,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- i18n/no 16 May 2008 09:33:09 -0000 1.12
+++ i18n/no 25 Apr 2009 14:54:44 -0000 1.13
@@ -68,7 +68,6 @@
'November' => 'november',
'October' => 'oktober',
'Overview' => '',
- 'Overview:' => '',
'Prev' => '',
'PrevFile' => '',
'Previous file' => '',
Index: i18n/pt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/pt,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- i18n/pt 16 May 2008 09:33:10 -0000 1.15
+++ i18n/pt 25 Apr 2009 14:54:44 -0000 1.16
@@ -68,7 +68,6 @@
'November' => 'Novembro',
'October' => 'Outubro',
'Overview' => 'address@hidden geral',
- 'Overview:' => 'address@hidden geral:',
'Prev' => 'address@hidden'evio',
'PrevFile' => '',
'Previous file' => '',
@@ -125,6 +124,7 @@
};
$T2H_OBSOLETE_STRINGS->{'pt'} = {
+ 'Overview:' => 'address@hidden geral:',
'See' => 'Veja',
'about (help)' => 'sobre (ajuda)',
'beginning of this chapter or previous
chapter' => 'come@,{c}o desse address@hidden'itulo ou address@hidden'itulo
anterior',
Index: i18n/pt_BR
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/pt_BR,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- i18n/pt_BR 16 May 2008 09:33:10 -0000 1.6
+++ i18n/pt_BR 25 Apr 2009 14:54:44 -0000 1.7
@@ -68,7 +68,6 @@
'November' => 'Novembro',
'October' => 'Outubro',
'Overview' => 'address@hidden geral',
- 'Overview:' => 'address@hidden geral:',
'Prev' => 'address@hidden'evio',
'PrevFile' => '',
'Previous file' => '',
@@ -125,6 +124,7 @@
};
$T2H_OBSOLETE_STRINGS->{'pt_BR'} = {
+ 'Overview:' => 'address@hidden geral:',
'See' => 'Veja',
'about (help)' => 'sobre (ajuda)',
'beginning of this chapter or previous
chapter' => 'come@,{c}o desse address@hidden'itulo ou address@hidden'itulo
anterior',
Index: test/layout/res/formatting_regions/formatting_regions.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_regions/formatting_regions.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- test/layout/res/formatting_regions/formatting_regions.html 16 Apr 2009
08:37:23 -0000 1.21
+++ test/layout/res/formatting_regions/formatting_regions.html 25 Apr 2009
14:54:45 -0000 1.22
@@ -686,14 +686,12 @@
<td valign="middle" align="left">[<a href="#constructs"
title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
</tr></table>
-<div align="center">
<h1>title –a</h1>
-<h2>formatting subtitle –a</h2>
-<h2>subtitle 2 –a</h2>
-<strong> author1 –a with accents in name Téça </strong><br>
-<strong> author2 –a </strong><br>
-</div>
<hr>
+<h3 align="right">formatting subtitle –a</h3>
+<h3 align="right">subtitle 2 –a</h3>
+<strong>author1 –a with accents in name Téça</strong><br>
+<strong>author2 –a</strong><br>
<p>Titlepage
</p>
Index: test/macros/res/include-value/include-value.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/macros/res/include-value/include-value.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/macros/res/include-value/include-value.html 2 Apr 2009 09:15:17
-0000 1.4
+++ test/macros/res/include-value/include-value.html 25 Apr 2009 14:54:45
-0000 1.5
@@ -46,18 +46,18 @@
<p>testvar include: This is the <em>included</em> file (include-value2.txi).
</p>
-<p>testvar verbatiminclude: <pre class="verbatim">This is the @emph{included}
file (include-value2.txi).
-</pre></p>
+<p>testvar verbatiminclude: </p><pre class="verbatim">This is the
@emph{included} file (include-value2.txi).
+</pre>
<p>test-var include: This is the <em>included</em> file (include-value2.txi).
</p>
-<p>test-var verbatiminclude: <pre class="verbatim">This is the @emph{included}
file (include-value2.txi).
-</pre></p>
+<p>test-var verbatiminclude: </p><pre class="verbatim">This is the
@emph{included} file (include-value2.txi).
+</pre>
<p>test_var include: This is the <em>included</em> file (include-value2.txi).
</p>
-<p>test_var verbatiminclude: <pre class="verbatim">This is the @emph{included}
file (include-value2.txi).
-</pre></p>
+<p>test_var verbatiminclude: </p><pre class="verbatim">This is the
@emph{included} file (include-value2.txi).
+</pre>
<hr size="1">
<p>
Index: test/manuals/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/tests.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/manuals/tests.txt 29 Aug 2008 15:06:19 -0000 1.2
+++ test/manuals/tests.txt 25 Apr 2009 14:54:45 -0000 1.3
@@ -8,4 +8,6 @@
ccvs cvs.texi -split chapter -init cvs.init
ccvs_mediawiki cvs.texi -init mediawiki.init -split chapter
ccvs_mediawiki_nosplit cvs.texi -init mediawiki.init -init cvs.init
+ccvs_info cvs.texi -init info.init
mini_ker mini_ker.texi --split section --node-files --use-nodes --iftex --init
book.init --init mini_ker_t2h.init --init tex4ht.init
+texinfo_info texinfo.texi -init info.init
Index: test/manuals/res/mini_ker/mini_ker.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/mini_ker/mini_ker.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/manuals/res/mini_ker/mini_ker.html 2 Apr 2009 09:15:50 -0000
1.8
+++ test/manuals/res/mini_ker/mini_ker.html 25 Apr 2009 14:54:45 -0000
1.9
@@ -63,13 +63,11 @@
<td valign="middle" align="left">[<a href="Concepts-index.html#Concepts-index"
title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="mini_ker_abt.html#SEC_About"
title="About (help)"> ? </a>]</td>
</tr></table>
-<div align="center">
<h1>Miniker manual</h1>
-<h2>for Miniker version 102, 28 March 2002</h2>
-<strong> The TEF Collaboration </strong><br>
-</div>
<hr>
+<h3 align="right">for Miniker version 102, 28 March 2002</h3>
+<strong>The TEF Collaboration</strong><br>
<p>Copyright (C) 2004, 2005, 2006, 2007 Alain Lahellec<br>
Index: test/manuals/res/texi_cvs/cvs.passfirst
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/texi_cvs/cvs.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res/texi_cvs/cvs.passfirst 18 Aug 2008 18:05:14 -0000
1.1
+++ test/manuals/res/texi_cvs/cvs.passfirst 25 Apr 2009 14:54:45 -0000
1.2
@@ -53,7 +53,13 @@
cvs.texi(,90)
cvs.texi(,96)
cvs.texi(,97) @dircategory GNU Packages
+cvs.texi(,98) @direntry
+cvs.texi(,99) * CVS: (cvs). Concurrent Versions System
+cvs.texi(,100) @end direntry
cvs.texi(,101) @dircategory Individual utilities
+cvs.texi(,102) @direntry
+cvs.texi(,103) * cvs: (cvs)CVS commands. Concurrent Versions System
+cvs.texi(,104) @end direntry
cvs.texi(,105)
cvs.texi(,106) @comment The titlepage section does not appear in the Info file.
cvs.texi(,127)
Index: test/manuals/res/texi_cvs/cvs.passtexi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/texi_cvs/cvs.passtexi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/manuals/res/texi_cvs/cvs.passtexi 29 Aug 2008 15:06:26 -0000
1.2
+++ test/manuals/res/texi_cvs/cvs.passtexi 25 Apr 2009 14:54:46 -0000
1.3
@@ -53,7 +53,13 @@
cvs.texi(,90)
cvs.texi(,96)
cvs.texi(,97) @dircategory GNU Packages
+cvs.texi(,98) @direntry
+cvs.texi(,99) * CVS: (cvs). Concurrent Versions System
+cvs.texi(,100) @end direntry
cvs.texi(,101) @dircategory Individual utilities
+cvs.texi(,102) @direntry
+cvs.texi(,103) * cvs: (cvs)CVS commands. Concurrent Versions System
+cvs.texi(,104) @end direntry
cvs.texi(,105)
cvs.texi(,106) @comment The titlepage section does not appear in the Info file.
cvs.texi(,107) @titlepage
Index: test/manuals/res/texi_cvs/cvs.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/texi_cvs/cvs.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res/texi_cvs/cvs.texi 18 Aug 2008 18:05:15 -0000 1.1
+++ test/manuals/res/texi_cvs/cvs.texi 25 Apr 2009 14:54:46 -0000 1.2
@@ -54,7 +54,13 @@
@dircategory GNU Packages
address@hidden
+* CVS: (cvs). Concurrent Versions System
address@hidden direntry
@dircategory Individual utilities
address@hidden
+* cvs: (cvs)CVS commands. Concurrent Versions System
address@hidden direntry
@comment The titlepage section does not appear in the Info file.
@titlepage
Index: test/manuals/res/texi_info-stnd/info-stnd.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/manuals/res/texi_info-stnd/info-stnd.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res/texi_info-stnd/info-stnd.passfirst 18 Aug 2008 18:05:15
-0000 1.1
+++ test/manuals/res/texi_info-stnd/info-stnd.passfirst 25 Apr 2009 14:54:46
-0000 1.2
@@ -13,6 +13,10 @@
info-stnd.texi(,11)
info-stnd.texi(,34)
info-stnd.texi(,35) @dircategory Texinfo documentation system
+info-stnd.texi(,36) @direntry
+info-stnd.texi(,37) * info standalone: (info-stnd). Read Info
documents without Emacs.
+info-stnd.texi(,38) * infokey: (info-stnd)Invoking infokey. Compile Info
customizations.
+info-stnd.texi(,39) @end direntry
info-stnd.texi(,40)
info-stnd.texi(,49)
info-stnd.texi(,50) @contents
Index: test/manuals/res/texi_info-stnd/info-stnd.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/manuals/res/texi_info-stnd/info-stnd.passtexi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res/texi_info-stnd/info-stnd.passtexi 18 Aug 2008 18:05:15
-0000 1.1
+++ test/manuals/res/texi_info-stnd/info-stnd.passtexi 25 Apr 2009 14:54:46
-0000 1.2
@@ -35,6 +35,10 @@
info-stnd.texi(,33) @end copying
info-stnd.texi(,34)
info-stnd.texi(,35) @dircategory Texinfo documentation system
+info-stnd.texi(,36) @direntry
+info-stnd.texi(,37) * info standalone: (info-stnd). Read Info
documents without Emacs.
+info-stnd.texi(,38) * infokey: (info-stnd)Invoking infokey. Compile Info
customizations.
+info-stnd.texi(,39) @end direntry
info-stnd.texi(,40)
info-stnd.texi(,41) @titlepage
info-stnd.texi(,42) @title GNU Info
Index: test/manuals/res/texi_info-stnd/info-stnd.texi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/manuals/res/texi_info-stnd/info-stnd.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res/texi_info-stnd/info-stnd.texi 18 Aug 2008 18:05:15
-0000 1.1
+++ test/manuals/res/texi_info-stnd/info-stnd.texi 25 Apr 2009 14:54:46
-0000 1.2
@@ -36,6 +36,10 @@
@end copying
@dircategory Texinfo documentation system
address@hidden
+* info standalone: (info-stnd). Read Info documents without Emacs.
+* infokey: (info-stnd)Invoking infokey. Compile Info customizations.
address@hidden direntry
@titlepage
@title GNU Info
Index: test/manuals/res/texi_mini_ker/mini_ker.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/manuals/res/texi_mini_ker/mini_ker.passfirst,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/manuals/res/texi_mini_ker/mini_ker.passfirst 9 Jan 2009 21:20:47
-0000 1.3
+++ test/manuals/res/texi_mini_ker/mini_ker.passfirst 25 Apr 2009 14:54:46
-0000 1.4
@@ -15,6 +15,9 @@
mini_ker.texi(,26) @syncodeindex fn vr
mini_ker.texi(,27)
mini_ker.texi(,28) @dircategory Miscellaneous
+mini_ker.texi(,29) @direntry
+mini_ker.texi(,30) * Miniker: (mini_ker). The mini_ker modeling
tool.
+mini_ker.texi(,31) @end direntry
mini_ker.texi(,32)
mini_ker.texi(,33)
mini_ker.texi(,48)
Index: test/manuals/res/texi_mini_ker/mini_ker.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/manuals/res/texi_mini_ker/mini_ker.passtexi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/manuals/res/texi_mini_ker/mini_ker.passtexi 9 Jan 2009 21:20:47
-0000 1.4
+++ test/manuals/res/texi_mini_ker/mini_ker.passtexi 25 Apr 2009 14:54:47
-0000 1.5
@@ -15,6 +15,9 @@
mini_ker.texi(,26) @syncodeindex fn vr
mini_ker.texi(,27)
mini_ker.texi(,28) @dircategory Miscellaneous
+mini_ker.texi(,29) @direntry
+mini_ker.texi(,30) * Miniker: (mini_ker). The mini_ker modeling
tool.
+mini_ker.texi(,31) @end direntry
mini_ker.texi(,32)
mini_ker.texi(,33)
mini_ker.texi(,34) @copying
Index: test/manuals/res/texi_mini_ker/mini_ker.texi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/manuals/res/texi_mini_ker/mini_ker.texi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/manuals/res/texi_mini_ker/mini_ker.texi 9 Jan 2009 21:20:48
-0000 1.3
+++ test/manuals/res/texi_mini_ker/mini_ker.texi 25 Apr 2009 14:54:47
-0000 1.4
@@ -16,6 +16,9 @@
@syncodeindex fn vr
@dircategory Miscellaneous
address@hidden
+* Miniker: (mini_ker). The mini_ker modeling tool.
address@hidden direntry
@copying
Index: test/manuals/res/texi_texinfo/texinfo.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/manuals/res/texi_texinfo/texinfo.passfirst,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/manuals/res/texi_texinfo/texinfo.passfirst 9 Jan 2009 21:20:48
-0000 1.2
+++ test/manuals/res/texi_texinfo/texinfo.passfirst 25 Apr 2009 14:54:47
-0000 1.3
@@ -37,6 +37,13 @@
texinfo.texi(,35)
texinfo.texi(,57)
texinfo.texi(,58) @dircategory Texinfo documentation system
+texinfo.texi(,59) @direntry
+texinfo.texi(,60) * Texinfo: (texinfo). The GNU documentation format.
+texinfo.texi(,61) * install-info: (texinfo)Invoking install-info. Update
info/dir entries.
+texinfo.texi(,62) * texi2dvi: (texinfo)Format with texi2dvi. Print
Texinfo documents.
+texinfo.texi(,63) * texindex: (texinfo)Format with tex/texindex. Sort Texinfo
index files.
+texinfo.texi(,64) * makeinfo: (texinfo)Invoking makeinfo. Translate
Texinfo source.
+texinfo.texi(,65) @end direntry
texinfo.texi(,66)
texinfo.texi(,67) @c Before release, run C-u C-c C-u C-a
(texinfo-all-menus-update with a
texinfo.texi(,68) @c prefix arg). This updates the node pointers, which
texinfmt.el needs.
Index: test/manuals/res/texi_texinfo/texinfo.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/manuals/res/texi_texinfo/texinfo.passtexi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/manuals/res/texi_texinfo/texinfo.passtexi 9 Jan 2009 21:20:49
-0000 1.2
+++ test/manuals/res/texi_texinfo/texinfo.passtexi 25 Apr 2009 14:54:47
-0000 1.3
@@ -58,6 +58,13 @@
texinfo.texi(,56) @end copying
texinfo.texi(,57)
texinfo.texi(,58) @dircategory Texinfo documentation system
+texinfo.texi(,59) @direntry
+texinfo.texi(,60) * Texinfo: (texinfo). The GNU documentation format.
+texinfo.texi(,61) * install-info: (texinfo)Invoking install-info. Update
info/dir entries.
+texinfo.texi(,62) * texi2dvi: (texinfo)Format with texi2dvi. Print
Texinfo documents.
+texinfo.texi(,63) * texindex: (texinfo)Format with tex/texindex. Sort Texinfo
index files.
+texinfo.texi(,64) * makeinfo: (texinfo)Invoking makeinfo. Translate
Texinfo source.
+texinfo.texi(,65) @end direntry
texinfo.texi(,66)
texinfo.texi(,67) @c Before release, run C-u C-c C-u C-a
(texinfo-all-menus-update with a
texinfo.texi(,68) @c prefix arg). This updates the node pointers, which
texinfmt.el needs.
Index: test/manuals/res/texi_texinfo/texinfo.texi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/manuals/res/texi_texinfo/texinfo.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/manuals/res/texi_texinfo/texinfo.texi 9 Jan 2009 21:20:50 -0000
1.2
+++ test/manuals/res/texi_texinfo/texinfo.texi 25 Apr 2009 14:54:47 -0000
1.3
@@ -59,6 +59,13 @@
@end copying
@dircategory Texinfo documentation system
address@hidden
+* Texinfo: (texinfo). The GNU documentation format.
+* install-info: (texinfo)Invoking install-info. Update info/dir entries.
+* texi2dvi: (texinfo)Format with texi2dvi. Print Texinfo documents.
+* texindex: (texinfo)Format with tex/texindex. Sort Texinfo index files.
+* makeinfo: (texinfo)Invoking makeinfo. Translate Texinfo source.
address@hidden direntry
@c Before release, run C-u C-c C-u C-a (texinfo-all-menus-update with a
@c prefix arg). This updates the node pointers, which texinfmt.el needs.
Index: test/misc/res/texi_viper/viper.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/misc/res/texi_viper/viper.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/misc/res/texi_viper/viper.passfirst 18 Aug 2008 18:05:57 -0000
1.1
+++ test/misc/res/texi_viper/viper.passfirst 25 Apr 2009 14:54:47 -0000
1.2
@@ -5,6 +5,11 @@
viper.texi(,7) @setfilename viper
viper.texi(,8)
viper.texi(,9) @dircategory Editors
+viper.texi(,10) @direntry
+viper.texi(,11) * VIPER: (viper). The newest Emacs VI-emulation mode.
+viper.texi(,12) (also, A VI Plan for Emacs Rescue
+viper.texi(,13) or the VI PERil.)
+viper.texi(,14) @end direntry
viper.texi(,15)
viper.texi(,19)
viper.texi(,32)
Index: test/misc/res/texi_viper/viper.passtexi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/misc/res/texi_viper/viper.passtexi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/misc/res/texi_viper/viper.passtexi 18 Aug 2008 18:05:57 -0000
1.1
+++ test/misc/res/texi_viper/viper.passtexi 25 Apr 2009 14:54:48 -0000
1.2
@@ -5,6 +5,11 @@
viper.texi(,7) @setfilename viper
viper.texi(,8)
viper.texi(,9) @dircategory Editors
+viper.texi(,10) @direntry
+viper.texi(,11) * VIPER: (viper). The newest Emacs VI-emulation mode.
+viper.texi(,12) (also, A VI Plan for Emacs Rescue
+viper.texi(,13) or the VI PERil.)
+viper.texi(,14) @end direntry
viper.texi(,15)
viper.texi(,19)
viper.texi(,20) @titlepage
Index: test/misc/res/texi_viper/viper.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/misc/res/texi_viper/viper.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/misc/res/texi_viper/viper.texi 18 Aug 2008 18:05:57 -0000 1.1
+++ test/misc/res/texi_viper/viper.texi 25 Apr 2009 14:54:48 -0000 1.2
@@ -7,6 +7,11 @@
@setfilename viper
@dircategory Editors
address@hidden
+* VIPER: (viper). The newest Emacs VI-emulation mode.
+ (also, A VI Plan for Emacs Rescue
+ or the VI PERil.)
address@hidden direntry
@titlepage
Index: test/tar_manual/res/texi_tar/tar.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/tar_manual/res/texi_tar/tar.passfirst,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/tar_manual/res/texi_tar/tar.passfirst 29 Aug 2008 15:06:52 -0000
1.2
+++ test/tar_manual/res/texi_tar/tar.passfirst 25 Apr 2009 14:54:48 -0000
1.3
@@ -79,8 +79,14 @@
tar.texi(,30)
tar.texi(,53)
tar.texi(,54) @dircategory Archiving
+tar.texi(,55) @direntry
+tar.texi(,56) * Tar: (tar). Making tape (or disk) archives.
+tar.texi(,57) @end direntry
tar.texi(,58)
tar.texi(,59) @dircategory Individual utilities
+tar.texi(,60) @direntry
+tar.texi(,61) * tar: (tar)tar invocation. Invoking
@GNUTAR{}.
+tar.texi(,62) @end direntry
tar.texi(,63)
tar.texi(,64) @shorttitlepage @acronym{GNU} @command{tar}
tar.texi(,65)
Index: test/tar_manual/res/texi_tar/tar.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/tar_manual/res/texi_tar/tar.passtexi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/tar_manual/res/texi_tar/tar.passtexi 29 Aug 2008 15:06:52 -0000
1.2
+++ test/tar_manual/res/texi_tar/tar.passtexi 25 Apr 2009 14:54:48 -0000
1.3
@@ -101,8 +101,14 @@
tar.texi(,52) @end copying
tar.texi(,53)
tar.texi(,54) @dircategory Archiving
+tar.texi(,55) @direntry
+tar.texi(,56) * Tar: (tar). Making tape (or disk) archives.
+tar.texi(,57) @end direntry
tar.texi(,58)
tar.texi(,59) @dircategory Individual utilities
+tar.texi(,60) @direntry
+tar.texi(,61) * tar: (tar)tar invocation. Invoking
@GNUTAR{}.
+tar.texi(,62) @end direntry
tar.texi(,63)
tar.texi(,64) @shorttitlepage @acronym{GNU} @command{tar}
tar.texi(,65)
Index: test/tar_manual/res/texi_tar/tar.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/tar_manual/res/texi_tar/tar.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/tar_manual/res/texi_tar/tar.texi 29 Aug 2008 15:06:53 -0000
1.2
+++ test/tar_manual/res/texi_tar/tar.texi 25 Apr 2009 14:54:48 -0000
1.3
@@ -102,8 +102,14 @@
@end copying
@dircategory Archiving
address@hidden
+* Tar: (tar). Making tape (or disk) archives.
address@hidden direntry
@dircategory Individual utilities
address@hidden
+* tar: (tar)tar invocation. Invoking @GNUTAR{}.
address@hidden direntry
@shorttitlepage @acronym{GNU} @command{tar}
Index: test/texi2html_manual/res/texi_texi2html/texi2html.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/texi2html_manual/res/texi_texi2html/texi2html.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/texi2html_manual/res/texi_texi2html/texi2html.passfirst 18 Aug
2008 18:09:39 -0000 1.1
+++ test/texi2html_manual/res/texi_texi2html/texi2html.passfirst 25 Apr
2009 14:54:48 -0000 1.2
@@ -69,6 +69,9 @@
texi2html.texi(,79) @c where the documentation system lives.
texi2html.texi(,80) @c What do you think?
texi2html.texi(,81) @dircategory Texinfo documentation system
+texi2html.texi(,82) @direntry
+texi2html.texi(,83) * Texi2html: (texi2html). Texinfo to HTML Converter.
+texi2html.texi(,84) @end direntry
texi2html.texi(,85) @c --------------------------------------------------------
texi2html.texi(,119) @c
--------------------------------------------------------
texi2html.texi(,156) @c
========================================================
Index: test/texi2html_manual/res/texi_texi2html/texi2html.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/texi2html_manual/res/texi_texi2html/texi2html.passtexi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/texi2html_manual/res/texi_texi2html/texi2html.passtexi 18 Aug 2008
18:09:39 -0000 1.1
+++ test/texi2html_manual/res/texi_texi2html/texi2html.passtexi 25 Apr 2009
14:54:49 -0000 1.2
@@ -69,6 +69,9 @@
texi2html.texi(,79) @c where the documentation system lives.
texi2html.texi(,80) @c What do you think?
texi2html.texi(,81) @dircategory Texinfo documentation system
+texi2html.texi(,82) @direntry
+texi2html.texi(,83) * Texi2html: (texi2html). Texinfo to HTML Converter.
+texi2html.texi(,84) @end direntry
texi2html.texi(,85) @c --------------------------------------------------------
texi2html.texi(,119) @c
--------------------------------------------------------
texi2html.texi(,120) @titlepage
Index: test/texi2html_manual/res/texi_texi2html/texi2html.texi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/texi2html_manual/res/texi_texi2html/texi2html.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/texi2html_manual/res/texi_texi2html/texi2html.texi 18 Aug 2008
18:09:39 -0000 1.1
+++ test/texi2html_manual/res/texi_texi2html/texi2html.texi 25 Apr 2009
14:54:49 -0000 1.2
@@ -70,6 +70,9 @@
@c where the documentation system lives.
@c What do you think?
@dircategory Texinfo documentation system
address@hidden
+* Texi2html: (texi2html). Texinfo to HTML Converter.
address@hidden direntry
@c --------------------------------------------------------
@c --------------------------------------------------------
@titlepage
Index: test/xemacs_manual/res/texi_xemacs/xemacs.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/xemacs_manual/res/texi_xemacs/xemacs.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/xemacs_manual/res/texi_xemacs/xemacs.passfirst 18 Aug 2008 18:09:44
-0000 1.1
+++ test/xemacs_manual/res/texi_xemacs/xemacs.passfirst 25 Apr 2009 14:54:49
-0000 1.2
@@ -3,6 +3,9 @@
xemacs.texi(,4)
xemacs.texi(,5)
xemacs.texi(,7) @dircategory XEmacs Editor
+xemacs.texi(,8) @direntry
+xemacs.texi(,9) * XEmacs: (xemacs). XEmacs Editor.
+xemacs.texi(,10) @end direntry
xemacs.texi(,11)
xemacs.texi(,12) This file documents the XEmacs editor.
xemacs.texi(,13)
Index: test/xemacs_manual/res/texi_xemacs/xemacs.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/xemacs_manual/res/texi_xemacs/xemacs.passtexi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/xemacs_manual/res/texi_xemacs/xemacs.passtexi 18 Aug 2008 18:09:45
-0000 1.1
+++ test/xemacs_manual/res/texi_xemacs/xemacs.passtexi 25 Apr 2009 14:54:49
-0000 1.2
@@ -3,6 +3,9 @@
xemacs.texi(,4)
xemacs.texi(,5)
xemacs.texi(,7) @dircategory XEmacs Editor
+xemacs.texi(,8) @direntry
+xemacs.texi(,9) * XEmacs: (xemacs). XEmacs Editor.
+xemacs.texi(,10) @end direntry
xemacs.texi(,11)
xemacs.texi(,12) This file documents the XEmacs editor.
xemacs.texi(,13)
Index: test/xemacs_manual/res/texi_xemacs/xemacs.texi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/xemacs_manual/res/texi_xemacs/xemacs.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/xemacs_manual/res/texi_xemacs/xemacs.texi 18 Aug 2008 18:09:45
-0000 1.1
+++ test/xemacs_manual/res/texi_xemacs/xemacs.texi 25 Apr 2009 14:54:49
-0000 1.2
@@ -4,6 +4,9 @@
@dircategory XEmacs Editor
address@hidden
+* XEmacs: (xemacs). XEmacs Editor.
address@hidden direntry
This file documents the XEmacs editor.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog NEWS TODO texi2html.init te...,
Patrice Dumas <=