[Po4a-commits] "po4a/lib/Locale/Po4a Docbook.pm, 1.17, 1.18 Xml.pm, 1.55, 1.56"

[Nicolas FRANCOIS]

Update of /cvsroot/po4a/po4a/lib/Locale/Po4a
In directory alioth:/tmp/cvs-serv18520/lib/Locale/Po4a

Modified Files:
	Docbook.pm Xml.pm 
Log Message:
Handle the nodefault option in the Xml module. It was declared in the Xml
module, but implemented only in Docbook.


Index: Docbook.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Docbook.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Docbook.pm	17 Jun 2007 00:19:39 -0000	1.17
+++ Docbook.pm	16 Aug 2007 17:21:28 -0000	1.18
@@ -89,9 +89,7 @@
 	$self->{options}{'tagsonly'}=1;
 	$self->{options}{'wrap'}=1;
 	$self->{options}{'doctype'}=$self->{options}{'doctype'} || 'docbook xml';
-	my ($additional_tags, $additional_inline) = ("", "");
-	my $tag;
-	foreach $tag qw(
+	$self->{options}{'tags'} .= '
 		<abbrev>
 		<acronym>
 		<arg>
@@ -139,12 +137,8 @@
 		<term>
 		<title>
 		<titleabbrev>
-		<userinput>) {
-		if (not defined $self->{nodefault}{$tag}) {
-			$additional_tags .= " $tag";
-		}
-	}
-	foreach $tag qw(
+		<userinput>';
+	$self->{options}{'inline'} .= '
 		<action>
 		<affiliation>
 		<anchor>
@@ -242,14 +236,9 @@
 		<varname>
 		<wordasword>
 		<xref>
-		<year>) {
-		if (not defined $self->{nodefault}{$tag}) {
-			$additional_inline .= " $tag";
-		}
-	}
-	$self->{options}{'tags'} .= $additional_tags;
-	$self->{options}{'inline'} .= $additional_inline;
+		<year>';
 	$self->{options}{'attributes'}.='
 		lang';
+
 	$self->treat_options;
 }

Index: Xml.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Xml.pm,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- Xml.pm	12 Aug 2007 11:41:51 -0000	1.55
+++ Xml.pm	16 Aug 2007 17:21:28 -0000	1.56
@@ -1345,9 +1345,20 @@
 
 sub treat_options {
 	my $self = shift;
+        
+	$self->{options}{'nodefault'} =~ /\s*(.*)\s*/s;
+	my %list_nodefault;
+	foreach (split(/\s+/s,$1)) {
+	    $list_nodefault{$_} = 1;
+	}
+	$self->{nodefault} = \%list_nodefault;
 
 	$self->{options}{'tags'} =~ /\s*(.*)\s*/s;
-	my @list_tags = split(/\s+/s,$1);
+	my @list_tags;
+	foreach my $tag (split(/\s+/s,$1)) {
+		push @list_tags, $tag
+			unless $list_nodefault{$tag};
+	}
 	$self->{tags} = \@list_tags;
 
 	$self->{options}{'attributes'} =~ /\s*(.*)\s*/s;
@@ -1355,19 +1366,16 @@
 	$self->{attributes} = \@list_attr;
 
 	$self->{options}{'inline'} =~ /\s*(.*)\s*/s;
-	my @list_inline = split(/\s+/s,$1);
+	my @list_inline;
+	foreach my $tag (split(/\s+/s,$1)) {
+		push @list_inline, $tag
+			unless $list_nodefault{$tag};
+	}
 	$self->{inline} = \@list_inline;
 
 	$self->{options}{'placeholder'} =~ /\s*(.*)\s*/s;
 	my @list_placeholder = split(/\s+/s,$1);
 	$self->{placeholder} = \@list_placeholder;
-        
-	$self->{options}{'nodefault'} =~ /\s*(.*)\s*/s;
-	my %list_nodefault;
-	foreach (split(/\s+/s,$1)) {
-	    $list_nodefault{$_} = 1;
-	}
-	$self->{nodefault} = \%list_nodefault;
 }
 
 =head2 GETTING TEXT FROM THE INPUT DOCUMENT