[Po4a-commits] po4a/lib/Locale/Po4a Po.pm,1.43,1.44

[Martin Quinson]

Update of /cvsroot/po4a/po4a/lib/Locale/Po4a
In directory haydn:/tmp/cvs-serv23260/lib/Locale/Po4a

Modified Files:
	Po.pm 
Log Message:
porefs option

Index: Po.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Po.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- Po.pm	30 May 2005 07:15:21 -0000	1.43
+++ Po.pm	24 Jul 2005 17:07:34 -0000	1.44
@@ -46,6 +46,16 @@
 package description, debconf templates, and everything which may benefit
 from this.
 
+=head1 OPTIONS ACCEPTED BY THIS MODULE
+
+=over 4
+
+=item porefs
+
+This specifies the reference format. It can be one of 'none' to not produce
+any reference, 'noline' to not specify the line number, and 'full' to
+include complete references.
+
 
 =cut
 
@@ -93,11 +103,11 @@
 =cut
 
 sub new {
-    my $this = shift;
+    my ($this, $options) = (shift, shift);
     my $class = ref($this) || $this;
     my $self = {};
     bless $self, $class;
-    $self->initialize();
+    $self->initialize($options);
  
     my $filename = shift;
     $self->read($filename) if defined($filename) && length($filename);
@@ -105,9 +115,22 @@
 }
 
 sub initialize {
-    my $self = shift;
+    my ($self, $options) = (shift, shift);
     my $date = `date +'%Y-%m-%d %k:%M%z'`;
     chomp $date;
+#    $options = ref($options) || $options;
+
+    $self->{options}{'porefs'}= 'full';
+    foreach my $opt (keys %$options) {
+	if ($options->{$opt}) {
+	    die wrap_mod("po4a::po", dgettext ("po4a", "Unknown option: %s"), $opt) unless exists $self->{options}{$opt};
+	    $self->{options}{$opt} = $options->{$opt};
+	}
+    }
+    $self->{options}{'porefs'} =~ /^(full|noline|none)$/ ||
+        die wrap_mod("po4a::po", 
+                     dgettext ("po4a", "Invalid value for option 'porefs' ('%s' is not one of 'full', 'noline' or 'none')"), 
+                     $self->{options}{'porefs'});
 
     $self->{po}=();
     $self->{count}=0;
@@ -641,7 +664,7 @@
     my $res;
 
     return "" unless defined($text) && length($text); # Avoid returning the header.
-    my $validoption="wrap wrapcol";
+    my $validoption="reference wrap wrapcol";
     my %validoption;
 
     map { $validoption{$_}=1 } (split(/ /,$validoption));
@@ -850,7 +873,13 @@
 	$self->{header_comment}=$comment;
 	return;
     }
-    
+
+    if ($self->{options}{'porefs'} eq "none") {
+        $reference = "";
+    } elsif ($self->{options}{'porefs'} eq "noline") {
+        $reference =~ s/:[0-9]*/:1/g;
+    }
+
     if (defined($self->{po}{$msgid})) {
         warn wrap_mod("po4a::po", dgettext("po4a","msgid defined twice: %s"), $msgid) if (0); # FIXME: put a verbose stuff
 	if ($msgstr && $self->{po}{$msgid}{'msgstr'}