[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo doc/texinfo.txi doc/version.texi Change...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo doc/texinfo.txi doc/version.texi Change... |
|
Date: |
Tue, 07 Feb 2012 00:40:48 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/02/07 00:40:48
Modified files:
doc : texinfo.txi version.texi
. : ChangeLog
tp : Makefile.am texi2any.pl
tp/Texinfo : Common.pm
tp/Texinfo/Convert: Converter.pm
Added files:
tp/Texinfo/Convert: PlainTexinfo.pm
Log message:
* doc/texinfo.txi, tp/Texinfo/Common.pm, tp/texi2any.pl,
tp/Texinfo/Convert/PlainTexinfo.pm, tp/Makefile.am: new
converter,
converting the tree to Texinfo. Add a FIX_TEXINFO customization
variable for this converter, set in the default case.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.417&r2=1.418
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/version.texi?cvsroot=texinfo&r1=1.115&r2=1.116
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1322&r2=1.1323
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.am?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.126&r2=1.127
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/PlainTexinfo.pm?cvsroot=texinfo&rev=1.1
Patches:
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -b -r1.417 -r1.418
--- doc/texinfo.txi 5 Feb 2012 10:54:49 -0000 1.417
+++ doc/texinfo.txi 7 Feb 2012 00:40:45 -0000 1.418
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.417 2012/02/05 10:54:49 pertusus Exp $
address@hidden $Id: texinfo.txi,v 1.418 2012/02/07 00:40:45 pertusus Exp $
@c Ordinarily, Texinfo files have the extension .texi. But texinfo.texi
@c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
@@ -17076,6 +17076,12 @@
Instead of generating a regular output format, output a text representation
of the tree obtained by parsing the input texinfo document.
address@hidden PLAINTEXINFO
+Output the Texinfo source with all the macros, @code{@@include} and
address@hidden@@address@hidden@}} expanded. This is similar with setting
address@hidden, but instead of being output in addition to
+the normal conversion, output of Texinfo is the main output.
+
@item RAWTEXT
@cindex raw text output
Output raw text, with minimal formatting. For example, footnotes are
@@ -17283,9 +17289,9 @@
document.
@item DUMP_TEXI
-For debugging. If set, the result of the first pass is put in a file
-named @address@hidden, and the result of the second pass
-is put in @address@hidden
+For debugging. If set, there is no conversion done, only parsing and
+macros expansion. If @option{--macro-expand} is set the Texinfo source
+is also expanded to the corresponding file.
@item DUMP_TREE
For debugging. If set, the tree constructed upon parsing a Texinfo
@@ -17318,6 +17324,14 @@
@item EXTRA_HEAD
For HTML, additional text appearing within @code{<head>}.
address@hidden FIX_TEXINFO
+For plain Teixonfo (with @code{PLAINTEXINFO}). If set to false,
+the resulting Texinfo is not corrected of all errors, like missing
address@hidden@@end}.
+
+This only has effect when expanding Texinfo, as other converter will
+always try to output something sane even if the Texinfo is broken.
+
@item FOOTNOTE_END_HEADER_LEVEL
For address@hidden Header formatting level used for footnotes header
with footnotestyle end. @xref{Footnote Styles}.
@@ -21608,7 +21622,7 @@
Revision Control System}) or other version control systems, which
expand it into a string such as:
@example
-$Id: texinfo.txi,v 1.417 2012/02/05 10:54:49 pertusus Exp $
+$Id: texinfo.txi,v 1.418 2012/02/07 00:40:45 pertusus Exp $
@end example
(This is useful in all sources that use version control, not just manuals.)
You may wish to include the @samp{$Id:} comment in the @code{@@copying}
Index: doc/version.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- doc/version.texi 5 Feb 2012 10:54:49 -0000 1.115
+++ doc/version.texi 7 Feb 2012 00:40:46 -0000 1.116
@@ -1,4 +1,4 @@
address@hidden UPDATED 5 February 2012
address@hidden UPDATED 7 February 2012
@set UPDATED-MONTH February 2012
@set EDITION 4.13.90
@set VERSION 4.13.90
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1322
retrieving revision 1.1323
diff -u -b -r1.1322 -r1.1323
--- ChangeLog 7 Feb 2012 00:34:33 -0000 1.1322
+++ ChangeLog 7 Feb 2012 00:40:46 -0000 1.1323
@@ -1,3 +1,10 @@
+2012-02-07 Patrice Dumas <address@hidden>
+
+ * doc/texinfo.txi, tp/Texinfo/Common.pm, tp/texi2any.pl,
+ tp/Texinfo/Convert/PlainTexinfo.pm, tp/Makefile.am: new converter,
+ converting the tree to Texinfo. Add a FIX_TEXINFO customization
+ variable for this converter, set in the default case.
+
2012-02-05 Patrice Dumas <address@hidden>
* doc/texinfo.txi (Configuration Variables), tp/Texinfo/Common.pm,
Index: tp/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.am,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- tp/Makefile.am 6 Feb 2012 23:22:58 -0000 1.37
+++ tp/Makefile.am 7 Feb 2012 00:40:47 -0000 1.38
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.37 2012/02/06 23:22:58 pertusus Exp $
+# $Id: Makefile.am,v 1.38 2012/02/07 00:40:47 pertusus Exp $
# Makefile.am for texinfo/tp.
#
# Copyright 2011 Free Software Foundation, Inc.
@@ -54,6 +54,7 @@
convertersdir = $(pkgdatadir)/Texinfo/Convert
dist_converters_DATA = \
Texinfo/Convert/Texinfo.pm \
+ Texinfo/Convert/PlainTexinfo.pm \
Texinfo/Convert/Info.pm \
Texinfo/Convert/NodeNameNormalization.pm \
Texinfo/Convert/Converter.pm \
Index: tp/texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- tp/texi2any.pl 4 Feb 2012 23:39:27 -0000 1.109
+++ tp/texi2any.pl 7 Feb 2012 00:40:47 -0000 1.110
@@ -188,6 +188,7 @@
require Texinfo::Convert::XML;
require Texinfo::Convert::DocBook;
require Texinfo::Convert::TextContent;
+require Texinfo::Convert::PlainTexinfo;
require DebugTexinfo::DebugCount;
require DebugTexinfo::DebugTree;
@@ -709,6 +710,8 @@
$parser_default_options->{'values'}->{'texi2html'} = 1;
} elsif ($var eq 'DEBUGTREE') {
$format = set_format('debugtree', 1);
+ } elsif ($var eq 'PLAINTEXINFO') {
+ $format = set_format('plaintexinfo', 1);
} elsif ($var eq 'RAWTEXT') {
$format = set_format('rawtext', 1);
} elsif ($var eq 'TEXTCONTENT') {
@@ -836,6 +839,9 @@
'rawtext' => {
'converter' => sub{Texinfo::Convert::Text->converter(@_)},
},
+ 'plaintexinfo' => {
+ 'converter' => sub{Texinfo::Convert::PlainTexinfo->converter(@_)},
+ },
);
if (!$format_from_command_line and defined($ENV{'TEXINFO_OUTPUT_FORMAT'})
Index: tp/Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- tp/Texinfo/Common.pm 5 Feb 2012 22:22:08 -0000 1.126
+++ tp/Texinfo/Common.pm 7 Feb 2012 00:40:47 -0000 1.127
@@ -138,7 +138,7 @@
my @variable_settables_not_used = ('COMPLETE_IMAGE_PATHS', 'TOC_FILE');
my @formats_settable = (
- 'DEBUGCOUNT', 'DEBUGTREE', 'RAWTEXT', 'TEXTCONTENT'
+ 'DEBUGCOUNT', 'DEBUGTREE', 'RAWTEXT', 'TEXTCONTENT', 'PLAINTEXINFO'
);
my @variable_settables = (
@@ -179,7 +179,7 @@
'BEFORE_TOC_LINES', 'AFTER_TOC_LINES',
'SORT_ELEMENT_COUNT', 'SORT_ELEMENT_COUNT_WORDS',
'KEEP_TOP_EXTERNAL_REF',
- 'TEXI2HTML', 'IMAGE_LINK_PREFIX',
+ 'TEXI2HTML', 'IMAGE_LINK_PREFIX', 'FIX_TEXINFO',
# FIXME document
'TEXTCONTENT_COMMENT',
# FIXME Not strings. To be documented.
Index: tp/Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- tp/Texinfo/Convert/Converter.pm 5 Feb 2012 10:54:54 -0000 1.79
+++ tp/Texinfo/Convert/Converter.pm 7 Feb 2012 00:40:47 -0000 1.80
@@ -83,6 +83,8 @@
'allowcodebreaks' => 'true',
'footnotestyle' => 'end',
'deftypefnnewline' => 'off',
+# This is not used much as converters do their best to give a sane output
+ 'FIX_TEXINFO' => 1,
# This is the default, mainly for tests; the caller should set them. These
# values are what is used in tests of the Converters.
'PACKAGE_AND_VERSION' => 'texinfo',
Index: tp/Texinfo/Convert/PlainTexinfo.pm
===================================================================
RCS file: tp/Texinfo/Convert/PlainTexinfo.pm
diff -N tp/Texinfo/Convert/PlainTexinfo.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tp/Texinfo/Convert/PlainTexinfo.pm 7 Feb 2012 00:40:47 -0000 1.1
@@ -0,0 +1,70 @@
+# PlainTexinfo.pm: convert the Texinfo tree as Texinfo
+#
+# Copyright 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Original author: Patrice Dumas <address@hidden>
+
+# This calls Texinfo::Convert::Texinfo::convert while inheriting standard
+# functions from Texinfo::Convert::Converter.
+
+package Texinfo::Convert::PlainTexinfo;
+
+use 5.00405;
+use strict;
+
+use Texinfo::Convert::Converter;
+
+use vars qw($VERSION @ISA);
address@hidden = qw(Texinfo::Convert::Converter);
+
+my %defaults = (
+ 'OUTFILE' => '-',
+ 'EXTENSION' => '.txi',
+);
+
+sub converter_defaults($$)
+{
+ return %defaults;
+}
+
+sub convert_tree($$)
+{
+ my $self = shift;
+ my $root = shift;
+
+ return $self->_convert($root);
+}
+
+sub convert($$)
+{
+ my $self = shift;
+ my $root = shift;
+
+ return $self->_convert($root);
+}
+
+sub _convert($$);
+
+sub _convert($$)
+{
+ my $self = shift;
+ my $root = shift;
+
+ return Texinfo::Convert::Texinfo::convert($root,
+ $self->get_conf('FIX_TEXINFO'));
+}
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo doc/texinfo.txi doc/version.texi Change...,
Patrice Dumas <=