[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[7507] update diff-for-test-parsetexi.diff
From: |
gavinsmith0123 |
Subject: |
[7507] update diff-for-test-parsetexi.diff |
Date: |
Sun, 13 Nov 2016 18:04:43 +0000 (UTC) |
Revision: 7507
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7507
Author: gavin
Date: 2016-11-13 18:04:42 +0000 (Sun, 13 Nov 2016)
Log Message:
-----------
update diff-for-test-parsetexi.diff
Modified Paths:
--------------
trunk/tp/diff-for-test-parsetexi.diff
Modified: trunk/tp/diff-for-test-parsetexi.diff
===================================================================
--- trunk/tp/diff-for-test-parsetexi.diff 2016-11-13 16:08:59 UTC (rev
7506)
+++ trunk/tp/diff-for-test-parsetexi.diff 2016-11-13 18:04:42 UTC (rev
7507)
@@ -1,8 +1,8 @@
Index: Texinfo/Convert/Converter.pm
===================================================================
---- Texinfo/Convert/Converter.pm (revision 7436)
+--- Texinfo/Convert/Converter.pm (revision 7488)
+++ Texinfo/Convert/Converter.pm (working copy)
-@@ -1133,6 +1133,8 @@ sub _collect_leading_trailing_spaces_arg($$)
+@@ -1136,6 +1136,8 @@
return @result;
}
@@ -11,7 +11,7 @@
sub _table_item_content_tree($$$)
{
my $self = shift;
-@@ -1157,7 +1159,8 @@ sub _table_item_content_tree($$$)
+@@ -1160,7 +1162,8 @@
'contents' => $contents,
'parent' => $command,};
$command->{'args'} = [$arg];
@@ -23,18 +23,9 @@
$converted_tree->{'contents'} = $contents;
Index: Texinfo/ModulePath.pm.in
===================================================================
---- Texinfo/ModulePath.pm.in (revision 7422)
+--- Texinfo/ModulePath.pm.in (revision 7490)
+++ Texinfo/ModulePath.pm.in (working copy)
-@@ -19,6 +19,8 @@ sub init (;$$) {
-
- if (defined($ENV{'top_builddir'}) and !defined($ENV{'top_srcdir'})) {
- $ENV{'top_srcdir'} = $ENV{'top_builddir'};
-+ } elsif (defined($ENV{'top_srcdir'}) and !defined($ENV{'top_builddir'})) {
-+ $ENV{'top_builddir'} = $ENV{'top_srcdir'};
- }
-
- if (!$lib_dir) {
-@@ -46,6 +48,7 @@ sub init (;$$) {
+@@ -51,6 +51,7 @@
if ('@USE_EXTERNAL_UNIDECODE@' ne 'yes') {
unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 'Text-Unidecode',
'lib'));
}
@@ -44,9 +35,9 @@
if (!$libexec_dir) {
Index: Texinfo/Parser.pm
===================================================================
---- Texinfo/Parser.pm (revision 7472)
+--- Texinfo/Parser.pm (revision 7506)
+++ Texinfo/Parser.pm (working copy)
-@@ -33,6 +33,9 @@ package Texinfo::Parser;
+@@ -33,6 +33,9 @@
use 5.006;
use strict;
@@ -58,9 +49,9 @@
Index: Texinfo/Report.pm
===================================================================
---- Texinfo/Report.pm (revision 7422)
+--- Texinfo/Report.pm (revision 7496)
+++ Texinfo/Report.pm (working copy)
-@@ -48,7 +48,8 @@ use File::Basename;
+@@ -48,7 +48,8 @@
use Locale::Messages;
# to be able to load a parser if none was given to gdt.
@@ -70,7 +61,7 @@
# return the errors and warnings
sub errors($)
-@@ -381,7 +382,8 @@ sub gdt($$;$$)
+@@ -392,7 +393,8 @@
}
}
#my $parser = Texinfo::Parser::parser($parser_conf);
@@ -82,18 +73,19 @@
}
Index: Texinfo/Structuring.pm
===================================================================
---- Texinfo/Structuring.pm (revision 7480)
+--- Texinfo/Structuring.pm (revision 7506)
+++ Texinfo/Structuring.pm (working copy)
-@@ -396,7 +396,7 @@ sub nodes_tree($)
+@@ -396,7 +396,8 @@
foreach my $node (@{$self->{'nodes'}}) {
if ($node->{'extra'}->{'normalized'} eq 'Top') {
$top_node = $node;
-- my $top_node_up_content_tree = Texinfo::Parser::parse_texi_line($self,
-+ my $top_node_up_content_tree = Parsetexi::parse_texi_line($self,
- $self->{'TOP_NODE_UP'});
+- my $parser = Texinfo::Parser::simple_parser ($self->{'conf'});
++ #my $parser = Texinfo::Parser::simple_parser ($self->{'conf'});
++ my $parser = Parsetexi::parser ($self->{'conf'});
+ my $top_node_up_content_tree
+ = $parser->parse_texi_line($self->{'TOP_NODE_UP'});
$top_node_up
- = {'type' => 'top_node_up',
-@@ -637,7 +637,7 @@ sub nodes_tree($)
+@@ -644,7 +645,7 @@
'extra' => $node_direction };
$node->{'node_'.$direction}->{'extra'}->{'top_node_up'}
= $node;
@@ -106,7 +98,7 @@
===================================================================
--- t/test_utils.pl (revision 7480)
+++ t/test_utils.pl (working copy)
-@@ -43,7 +43,8 @@ Texinfo::ModulePath::init();
+@@ -43,7 +43,8 @@
use Test::More;
@@ -116,7 +108,7 @@
use Texinfo::Convert::Text;
use Texinfo::Convert::Texinfo;
use Texinfo::Structuring;
-@@ -730,7 +731,8 @@ sub test($$)
+@@ -730,7 +731,8 @@
# push @tested_formats, @{$self->{'test_formats'}};
}
@@ -130,7 +122,7 @@
===================================================================
--- texi2any.pl (revision 7480)
+++ texi2any.pl (working copy)
-@@ -273,8 +273,8 @@ if ($configured_version eq '@' . 'PACKAGE_VERSION@
+@@ -273,8 +273,8 @@
} else {
# used in the standalone perl module, as $hardcoded_version is undef
# and it should never be configured in that setup
@@ -141,7 +133,7 @@
}
}
my $configured_package = '@PACKAGE@';
-@@ -1068,7 +1068,14 @@ if ($call_texi2dvi) {
+@@ -1068,7 +1068,14 @@
document_warn(__('--Xopt option without printed output'));
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [7507] update diff-for-test-parsetexi.diff,
gavinsmith0123 <=