[Po4a-commits] r2673 - in /trunk: lib/Locale/Po4a/AsciiDoc.pm lib/Locale/Po4a/Chooser.pm lib/Locale/Po4a/Text.pm t/30-asciidoc.t t/30-text.t
barbier at users.alioth.debian.org
barbier at users.alioth.debian.org
Fri Oct 26 22:19:07 UTC 2012
Author: barbier
Date: Fri Oct 26 22:19:07 2012
New Revision: 2673
URL: http://svn.debian.org/wsvn/po4a/?sc=1&rev=2673
Log:
Promote AsciiDoc to its own format, and deprecate -o asciidoc in Text format
Added:
trunk/lib/Locale/Po4a/AsciiDoc.pm
trunk/t/30-asciidoc.t
- copied, changed from r2672, trunk/t/30-text.t
Removed:
trunk/t/30-text.t
Modified:
trunk/lib/Locale/Po4a/Chooser.pm
trunk/lib/Locale/Po4a/Text.pm
Added: trunk/lib/Locale/Po4a/AsciiDoc.pm
URL: http://svn.debian.org/wsvn/po4a/trunk/lib/Locale/Po4a/AsciiDoc.pm?rev=2673&op=file
==============================================================================
--- trunk/lib/Locale/Po4a/AsciiDoc.pm (added)
+++ trunk/lib/Locale/Po4a/AsciiDoc.pm Fri Oct 26 22:19:07 2012
@@ -1,0 +1,573 @@
+#!/usr/bin/perl -w
+
+=encoding UTF-8
+
+=head1 NAME
+
+Locale::Po4a::AsciiDoc - convert AsciiDoc documents from/to PO files
+
+=head1 DESCRIPTION
+
+The po4a (PO for anything) project goal is to ease translations (and more
+interestingly, the maintenance of translations) using gettext tools on
+areas where they were not expected like documentation.
+
+Locale::Po4a::AsciiDoc is a module to help the translation of documentation in
+the AsciiDoc format.
+languages.
+
+=cut
+
+package Locale::Po4a::AsciiDoc;
+
+use 5.006;
+use strict;
+use warnings;
+
+require Exporter;
+use vars qw(@ISA @EXPORT);
+ at ISA = qw(Locale::Po4a::TransTractor);
+ at EXPORT = qw();
+
+use Locale::Po4a::TransTractor;
+use Locale::Po4a::Common;
+
+=head1 OPTIONS ACCEPTED BY THIS MODULE
+
+These are this module's particular options:
+
+=over
+
+=item B<nobullets>
+
+Deactivate detection of bullets.
+
+By default, when a bullet is detected, the bullet paragraph is not considered
+as a verbatim paragraph (with the no-wrap flag in the PO file), but the module
+rewraps this paragraph in the generated PO file and in the translation.
+
+=cut
+
+my $bullets = 1;
+
+my @comments = ();
+
+sub initialize {
+ my $self = shift;
+ my %options = @_;
+
+ $self->{options}{'nobullets'} = 1;
+ $self->{options}{'debug'}='';
+ $self->{options}{'verbose'} = 1;
+
+ foreach my $opt (keys %options) {
+ die wrap_mod("po4a::asciidoc",
+ dgettext("po4a", "Unknown option: %s"), $opt)
+ unless exists $self->{options}{$opt};
+ $self->{options}{$opt} = $options{$opt};
+ }
+
+ if (defined $options{'nobullets'}) {
+ $bullets = 0;
+ }
+}
+
+my $RE_SECTION_TEMPLATES = "sect1|sect2|sect3|sect4|preface|colophon|dedication|synopsis|index";
+my $RE_STYLE_ADMONITION = "TIP|NOTE|IMPORTANT|WARNING|CAUTION";
+my $RE_STYLE_PARAGRAPH = "normal|literal|verse|quote|listing|abstract|partintro|comment|example|sidebar|source|music|latex|graphviz";
+my $RE_STYLE_NUMBERING = "arabic|loweralpha|upperalpha|lowerroman|upperroman";
+my $RE_STYLE_LIST = "appendix|horizontal|qanda|glossary|bibliography";
+my $RE_STYLES = "$RE_SECTION_TEMPLATES|$RE_STYLE_ADMONITION|$RE_STYLE_PARAGRAPH|$RE_STYLE_NUMBERING|$RE_STYLE_LIST|float";
+
+BEGIN {
+ my $UnicodeGCString_available = 0;
+ $UnicodeGCString_available = 1 if (eval { require Unicode::GCString });
+ eval {
+ sub columns($$$) {
+ my $text = shift;
+ my $encoder = shift;
+ $text = $encoder->decode($text) if (defined($encoder) && $encoder->name ne "ascii");
+ if ($UnicodeGCString_available) {
+ return Unicode::GCString->new($text)->columns();
+ } else {
+ return length($text) if !(defined($encoder) && $encoder->name ne "ascii");
+ die wrap_mod("po4a::asciidoc",
+ dgettext("po4a", "Detection of two line titles failed at %s\nInstall the Unicode::GCString module!"), shift)
+ }
+ }
+ };
+}
+
+sub parse {
+ my $self = shift;
+ my ($line,$ref);
+ my $paragraph="";
+ my $wrapped_mode = 1;
+ my $expect_header = 1;
+ my $end_of_paragraph = 0;
+ ($line,$ref)=$self->shiftline();
+ my $file = $ref;
+ $file =~ s/:[0-9]+$// if defined($line);
+ while (defined($line)) {
+ $ref =~ m/^(.*):[0-9]+$/;
+ if ($1 ne $file) {
+ $file = $1;
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph="";
+ $wrapped_mode = 1;
+ $expect_header = 1;
+ }
+
+ chomp($line);
+ $self->{ref}="$ref";
+ if ((defined $self->{verbatim}) and ($self->{verbatim} == 3)) {
+ # Untranslated blocks
+ $self->pushline($line."\n");
+ if ($line =~ m/^~{4,}$/) {
+ undef $self->{verbatim};
+ undef $self->{type};
+ $wrapped_mode = 1;
+ }
+ } elsif ((defined $self->{verbatim}) and ($self->{verbatim} == 2)) {
+ # CommentBlock
+ if ($line =~ m/^\/{4,}$/) {
+ undef $self->{verbatim};
+ undef $self->{type};
+ $wrapped_mode = 1;
+ } else {
+ push @comments, $line;
+ }
+ } elsif ((not defined($self->{verbatim})) and ($line =~ m/^(\+|--)$/)) {
+ # List Item Continuation or List Block
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph="";
+ $self->pushline($line."\n");
+ } elsif ((not defined($self->{verbatim})) and
+ ($line =~ m/^(={4,}|-{4,}|~{4,}|\^{4,}|\+{4,})$/) and
+ (defined($paragraph) )and
+ ($paragraph =~ m/^[^\n]*\n$/s) and
+ (columns($paragraph, $self->{TT}{po_in}{encoder}, $ref) == (length($line)))) {
+ # Found title
+ $wrapped_mode = 0;
+ my $level = $line;
+ $level =~ s/^(.).*$/$1/;
+ $paragraph =~ s/\n$//s;
+ my $t = $self->translate($paragraph,
+ $self->{ref},
+ "Title $level",
+ "comment" => join("\n", @comments),
+ "wrap" => 0);
+ $self->pushline($t."\n");
+ $paragraph="";
+ @comments=();
+ $wrapped_mode = 1;
+ $self->pushline(($level x (columns($t, $self->{TT}{po_in}{encoder}, $ref)))."\n");
+ } elsif ($line =~ m/^(={1,5})( +)(.*?)( +\1)?$/) {
+ my $titlelevel1 = $1;
+ my $titlespaces = $2;
+ my $title = $3;
+ my $titlelevel2 = $4||"";
+ # Found one line title
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $wrapped_mode = 0;
+ $paragraph="";
+ my $t = $self->translate($title,
+ $self->{ref},
+ "Title $titlelevel1",
+ "comment" => join("\n", @comments),
+ "wrap" => 0);
+ $self->pushline($titlelevel1.$titlespaces.$t.$titlelevel2."\n");
+ @comments=();
+ $wrapped_mode = 1;
+ } elsif ($line =~ m/^(\/{4,}|\+{4,}|-{4,}|\.{4,}|\*{4,}|_{4,}|={4,}|~{4,}|\|={4,})$/) {
+ # Found one delimited block
+ my $t = $line;
+ $t =~ s/^(.).*$/$1/;
+ my $type = "delimited block $t";
+ if (defined $self->{verbatim} and ($self->{type} ne $type)) {
+ $paragraph .= "$line\n";
+ } else {
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ if ( (defined $self->{type})
+ and ($self->{type} eq $type)) {
+ undef $self->{type};
+ undef $self->{verbatim};
+ $wrapped_mode = 1;
+ } else {
+ if ($t eq "\/") {
+ # CommentBlock, should not be treated
+ $self->{verbatim} = 2;
+ } elsif ($t eq "+") {
+ # PassthroughBlock
+ $wrapped_mode = 0;
+ $self->{verbatim} = 1;
+ } elsif ($t eq "-" or $t eq "|") {
+ # ListingBlock
+ $wrapped_mode = 0;
+ $self->{verbatim} = 1;
+ } elsif ($t eq ".") {
+ # LiteralBlock
+ $wrapped_mode = 0;
+ $self->{verbatim} = 1;
+ } elsif ($t eq "*") {
+ # SidebarBlock
+ $wrapped_mode = 1;
+ } elsif ($t eq "_") {
+ # QuoteBlock
+ if ( (defined $self->{type})
+ and ($self->{type} eq "verse")) {
+ $wrapped_mode = 0;
+ $self->{verbatim} = 1;
+ } else {
+ $wrapped_mode = 1;
+ }
+ } elsif ($t eq "=") {
+ # ExampleBlock
+ $wrapped_mode = 1;
+ } elsif ($t eq "~") {
+ # Filter blocks, TBC: not translated
+ $wrapped_mode = 0;
+ $self->{verbatim} = 3;
+ }
+ $self->{type} = $type;
+ }
+ $paragraph="";
+ $self->pushline($line."\n") unless defined($self->{verbatim}) && $self->{verbatim} == 2;
+ }
+ } elsif ((not defined($self->{verbatim})) and ($line =~ m/^\/\/(.*)/)) {
+ # Comment line
+ push @comments, $1;
+ } elsif (not defined $self->{verbatim} and
+ ($line =~ m/^\[\[([^\]]*)\]\]$/)) {
+ # Found BlockId
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph="";
+ $wrapped_mode = 1;
+ $self->pushline($line."\n");
+ undef $self->{bullet};
+ undef $self->{indent};
+ } elsif (not defined $self->{verbatim} and
+ ($paragraph eq "") and
+ ($line =~ m/^((?:$RE_STYLE_ADMONITION):\s+)(.*)$/)) {
+ my $type = $1;
+ my $text = $2;
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph=$text."\n";
+ $wrapped_mode = 1;
+ $self->pushline($type);
+ undef $self->{bullet};
+ undef $self->{indent};
+ } elsif (not defined $self->{verbatim} and
+ ($line =~ m/^\[($RE_STYLES)\]$/)) {
+ my $type = $1;
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph="";
+ $wrapped_mode = 1;
+ $self->pushline($line."\n");
+ if ($type eq "verse") {
+ $wrapped_mode = 0;
+ }
+ undef $self->{bullet};
+ undef $self->{indent};
+ } elsif (not defined $self->{verbatim} and
+ ($line =~ m/^\[(['"]?)(verse|quote)\1, +(.*)\]$/)) {
+ my $quote = $1 || '';
+ my $type = $2;
+ my $arg = $3;
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph="";
+ my $t = $self->translate($arg,
+ $self->{ref},
+ "$type",
+ "comment" => join("\n", @comments),
+ "wrap" => 0);
+ $self->pushline("[$quote$type$quote, $t]\n");
+ @comments=();
+ $wrapped_mode = 1;
+ if ($type eq "verse") {
+ $wrapped_mode = 0;
+ }
+ $self->{type} = $type;
+ undef $self->{bullet};
+ undef $self->{indent};
+ } elsif (not defined $self->{verbatim} and
+ ($line =~ m/^\[icon="(.*)"\]$/)) {
+ my $arg = $1;
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph="";
+ my $t = $self->translate($arg,
+ $self->{ref},
+ "icon",
+ "comment" => join("\n", @comments),
+ "wrap" => 0);
+ $self->pushline("[icon=\"$t\"]\n");
+ @comments=();
+ $wrapped_mode = 1;
+ undef $self->{bullet};
+ undef $self->{indent};
+ } elsif (not defined $self->{verbatim} and
+ ($line =~ m/^\[icons=None, +caption="(.*)"\]$/)) {
+ my $arg = $1;
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph="";
+ my $t = $self->translate($arg,
+ $self->{ref},
+ "caption",
+ "comment" => join("\n", @comments),
+ "wrap" => 0);
+ $self->pushline("[icons=None, caption=\"$t\"]\n");
+ @comments=();
+ $wrapped_mode = 1;
+ undef $self->{bullet};
+ undef $self->{indent};
+ } elsif (not defined $self->{verbatim} and
+ ($line =~ m/^(\s*)([*_+`'#[:alnum:]].*)((?:::|;;|\?\?|:-)(?: *\\)?)$/)) {
+ my $indent = $1;
+ my $label = $2;
+ my $labelend = $3;
+ # Found labeled list
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph="";
+ $wrapped_mode = 1;
+ $self->{bullet} = "";
+ $self->{indent} = $indent;
+ my $t = $self->translate($label,
+ $self->{ref},
+ "Labeled list",
+ "comment" => join("\n", @comments),
+ "wrap" => 0);
+ $self->pushline("$indent$t$labelend\n");
+ @comments=();
+ } elsif (not defined $self->{verbatim} and
+ ($line =~ m/^(\s*)(\S.*)((?:::|;;)\s+)(.*)$/)) {
+ my $indent = $1;
+ my $label = $2;
+ my $labelend = $3;
+ my $labeltext = $4;
+ # Found Horizontal Labeled Lists
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph=$labeltext."\n";
+ $wrapped_mode = 1;
+ $self->{bullet} = "";
+ $self->{indent} = $indent;
+ my $t = $self->translate($label,
+ $self->{ref},
+ "Labeled list",
+ "comment" => join("\n", @comments),
+ "wrap" => 0);
+ $self->pushline("$indent$t$labelend");
+ @comments=();
+ } elsif (not defined $self->{verbatim} and
+ ($line =~ m/^\:(\S.*?)(:\s*)(.*)$/)) {
+ my $attrname = $1;
+ my $attrsep = $2;
+ my $attrvalue = $3;
+ # Found a Attribute entry
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph="";
+ $wrapped_mode = 1;
+ undef $self->{bullet};
+ undef $self->{indent};
+ my $t = $self->translate($attrvalue,
+ $self->{ref},
+ "Attribute :$attrname:",
+ "comment" => join("\n", @comments),
+ "wrap" => 0);
+ $self->pushline(":$attrname$attrsep$t\n");
+ @comments=();
+ } elsif (not defined $self->{verbatim} and
+ ($line !~ m/^\.\./) and ($line =~ m/^\.(\S.*)$/)) {
+ my $title = $1;
+ # Found block title
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph="";
+ $wrapped_mode = 1;
+ undef $self->{bullet};
+ undef $self->{indent};
+ my $t = $self->translate($title,
+ $self->{ref},
+ "Block title",
+ "comment" => join("\n", @comments),
+ "wrap" => 0);
+ $self->pushline(".$t\n");
+ @comments=();
+ } elsif (not defined $self->{verbatim} and
+ ($line =~ m/^(\s*)((?:[-*o+]|(?:[0-9]+[.\)])|(?:[a-z][.\)])|\([0-9]+\)|\.|\.\.)\s+)(.*)$/)) {
+ my $indent = $1||"";
+ my $bullet = $2;
+ my $text = $3;
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph = $text."\n";
+ $self->{indent} = $indent;
+ $self->{bullet} = $bullet;
+ } elsif (not defined $self->{verbatim} and
+ ($line =~ m/^((?:<?[0-9]+)?> +)(.*)$/)) {
+ my $bullet = $1;
+ my $text = $2;
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph = $text."\n";
+ $self->{indent} = "";
+ $self->{bullet} = $bullet;
+ } elsif (not defined $self->{verbatim} and
+ (defined $self->{bullet} and $line =~ m/^(\s+)(.*)$/)) {
+ my $indent = $1;
+ my $text = $2;
+ if (not defined $self->{indent}) {
+ $paragraph .= $text."\n";
+ $self->{indent} = $indent;
+ } elsif (length($paragraph) and (length($self->{bullet}) + length($self->{indent}) == length($indent))) {
+ $paragraph .= $text."\n";
+ } else {
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph = $text."\n";
+ $self->{indent} = $indent;
+ $self->{bullet} = "";
+ }
+ } elsif ($line =~ /^\s*$/) {
+ # Break paragraphs on lines containing only spaces
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph="";
+ $wrapped_mode = 1 unless defined($self->{verbatim});
+ $self->pushline($line."\n");
+ undef $self->{controlkey};
+ } elsif ($line =~ /^-- $/) {
+ # Break paragraphs on email signature hint
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph="";
+ $wrapped_mode = 1;
+ $self->pushline($line."\n");
+ } elsif ( $line =~ /^=+$/
+ or $line =~ /^_+$/
+ or $line =~ /^-+$/) {
+ $wrapped_mode = 0;
+ $paragraph .= $line."\n";
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph="";
+ $wrapped_mode = 1;
+ } else {
+ if ($line =~ /^\s/) {
+ # A line starting by a space indicates a non-wrap
+ # paragraph
+ $wrapped_mode = 0;
+ }
+ undef $self->{bullet};
+ undef $self->{indent};
+ # TODO: comments
+ $paragraph .= $line."\n";
+ }
+ # paragraphs starting by a bullet, or numbered
+ # or paragraphs with a line containing many consecutive spaces
+ # (more than 3)
+ # are considered as verbatim paragraphs
+ $wrapped_mode = 0 if ( $paragraph =~ m/^(\*|[0-9]+[.)] )/s
+ or $paragraph =~ m/[ \t][ \t][ \t]/s);
+ if ($end_of_paragraph) {
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ $paragraph="";
+ $wrapped_mode = 1;
+ $end_of_paragraph = 0;
+ }
+ ($line,$ref)=$self->shiftline();
+ }
+ if (length $paragraph) {
+ do_paragraph($self,$paragraph,$wrapped_mode);
+ }
+}
+
+sub do_paragraph {
+ my ($self, $paragraph, $wrap) = (shift, shift, shift);
+ my $type = shift || $self->{type} || "Plain text";
+ return if ($paragraph eq "");
+
+# DEBUG
+# my $b;
+# if (defined $self->{bullet}) {
+# $b = $self->{bullet};
+# } else {
+# $b = "UNDEF";
+# }
+# $type .= " verbatim: '".($self->{verbatim}||"NONE")."' bullet: '$b' indent: '".($self->{indent}||"NONE")."' type: '".($self->{type}||"NONE")."'";
+
+ if ($bullets and not $wrap and not defined $self->{verbatim}) {
+ # Detect bullets
+ # | * blah blah
+ # |<spaces> blah
+ # | ^-- aligned
+ # <empty line>
+ #
+ # Other bullets supported:
+ # - blah o blah + blah
+ # 1. blah 1) blah (1) blah
+TEST_BULLET:
+ if ($paragraph =~ m/^(\s*)((?:[-*o+]|([0-9]+[.\)])|\([0-9]+\))\s+)([^\n]*\n)(.*)$/s) {
+ my $para = $5;
+ my $bullet = $2;
+ my $indent1 = $1;
+ my $indent2 = "$1".(' ' x length $bullet);
+ my $text = $4;
+ while ($para !~ m/$indent2(?:[-*o+]|([0-9]+[.\)])|\([0-9]+\))\s+/
+ and $para =~ s/^$indent2(\S[^\n]*\n)//s) {
+ $text .= $1;
+ }
+ # TODO: detect if a line starts with the same bullet
+ if ($text !~ m/\S[ \t][ \t][ \t]+\S/s) {
+ my $bullet_regex = quotemeta($indent1.$bullet);
+ $bullet_regex =~ s/[0-9]+/\\d\+/;
+ if ($para eq '' or $para =~ m/^$bullet_regex\S/s) {
+ my $trans = $self->translate($text,
+ $self->{ref},
+ "Bullet: '$indent1$bullet'",
+ "wrap" => 1,
+ "wrapcol" => - (length $indent2));
+ $trans =~ s/^/$indent1$bullet/s;
+ $trans =~ s/\n(.)/\n$indent2$1/sg;
+ $self->pushline( $trans."\n" );
+ if ($para eq '') {
+ return;
+ } else {
+ # Another bullet
+ $paragraph = $para;
+ goto TEST_BULLET;
+ }
+ }
+ }
+ }
+ }
+
+ my $end = "";
+ if ($wrap) {
+ $paragraph =~ s/^(.*?)(\n*)$/$1/s;
+ $end = $2 || "";
+ }
+ my $t = $self->translate($paragraph,
+ $self->{ref},
+ $type,
+ "comment" => join("\n", @comments),
+ "wrap" => $wrap);
+ @comments = ();
+ if (defined $self->{bullet}) {
+ my $bullet = $self->{bullet};
+ my $indent1 = $self->{indent};
+ my $indent2 = $indent1.(' ' x length($bullet));
+ $t =~ s/^/$indent1$bullet/s;
+ $t =~ s/\n(.)/\n$indent2$1/sg;
+ }
+ $self->pushline( $t.$end );
+}
+
+1;
+
+=head1 STATUS OF THIS MODULE
+
+Tested successfully on simple text files and NEWS.Debian files.
+
+=head1 AUTHORS
+
+ Nicolas François <nicolas.francois at centraliens.net>
+
+=head1 COPYRIGHT AND LICENSE
+
+ Copyright 2005-2008 by Nicolas FRANÇOIS <nicolas.francois at centraliens.net>.
+
+This program is free software; you may redistribute it and/or modify it
+under the terms of GPL (see the COPYING file).
Modified: trunk/lib/Locale/Po4a/Chooser.pm
URL: http://svn.debian.org/wsvn/po4a/trunk/lib/Locale/Po4a/Chooser.pm?rev=2673&op=diff
==============================================================================
--- trunk/lib/Locale/Po4a/Chooser.pm (original)
+++ trunk/lib/Locale/Po4a/Chooser.pm Fri Oct 26 22:19:07 2012
@@ -37,6 +37,8 @@
$modname = 'BibTex';
} elsif ($module eq 'tex') {
$modname = 'TeX';
+ } elsif ($module eq 'asciidoc') {
+ $modname = 'AsciiDoc';
} else {
$modname = ucfirst($module);
}
@@ -57,6 +59,7 @@
sub list {
warn wrap_msg(gettext("List of valid formats:")
# ."\n - ".gettext("bibtex: BibTex bibliography format.")
+ ."\n - ".gettext("asciidoc: AsciiDoc format.")
."\n - ".gettext("dia: uncompressed Dia diagrams.")
."\n - ".gettext("docbook: DocBook XML.")
."\n - ".gettext("guide: Gentoo Linux's XML documentation format.")
Modified: trunk/lib/Locale/Po4a/Text.pm
URL: http://svn.debian.org/wsvn/po4a/trunk/lib/Locale/Po4a/Text.pm?rev=2673&op=diff
==============================================================================
--- trunk/lib/Locale/Po4a/Text.pm (original)
+++ trunk/lib/Locale/Po4a/Text.pm Fri Oct 26 22:19:07 2012
@@ -208,6 +208,8 @@
if (defined $options{'asciidoc'}) {
$parse_func = \&parse_asciidoc;
$asciidoc=1;
+ warn wrap_mod("po4a::text",
+ dgettext("po4a", "asciidoc option deprecated, use asciidoc format instead of text"));
}
if (defined $options{'control'}) {
@@ -318,7 +320,7 @@
sub parse_control {
my ($self,$line,$ref,$paragraph,$wrapped_mode,$expect_header,$end_of_paragraph) = @_;
if ($line =~ m/^([^ :]*): *(.*)$/) {
- warn "Unrecognized section: '$paragraph'\n"
+ warn wrap_mod("po4a::text", dgettext("po4a", "Unrecognized section: %s"), $paragraph)
unless $paragraph eq "";
my $tag = $1;
my $val = $2;
Copied: trunk/t/30-asciidoc.t (from r2672, trunk/t/30-text.t)
URL: http://svn.debian.org/wsvn/po4a/trunk/t/30-asciidoc.t?rev=2673&op=diff
==============================================================================
--- trunk/t/30-text.t (original)
+++ trunk/t/30-asciidoc.t Fri Oct 26 22:19:07 2012
@@ -23,7 +23,7 @@
# Tables are currently badly supported.
next if $AsciiDocTest =~ m/Tables/;
push @tests, {
- 'run' => "perl ../../po4a-normalize -f text -o asciidoc ../data-30/$AsciiDocTest.asciidoc",
+ 'run' => "perl ../../po4a-normalize -f asciidoc ../data-30/$AsciiDocTest.asciidoc",
'test'=> "perl ../compare-po.pl ../data-30/$AsciiDocTest.po po4a-normalize.po".
"&& cmp ../data-30/$AsciiDocTest.out po4a-normalize.output",
'doc' => "$AsciiDocTest test"
@@ -31,22 +31,22 @@
}
push @tests, {
- 'run' => "$UGCS perl ../../po4a-gettextize -f text -o asciidoc -m ../data-30/Titles.asciidoc -l ../data-30/TitlesUTF8.asciidoc -L UTF-8 -p TitlesUTF8.po",
+ 'run' => "$UGCS perl ../../po4a-gettextize -f asciidoc -m ../data-30/Titles.asciidoc -l ../data-30/TitlesUTF8.asciidoc -L UTF-8 -p TitlesUTF8.po",
'test'=> "$UGCS perl ../compare-po.pl ../data-30/TitlesUTF8.po TitlesUTF8.po",
'doc' => "$UGCS test titles with UTF-8 encoding"
};
push @tests, {
- 'run' => "$UGCS msgattrib --clear-fuzzy -o TitlesUTF8.po TitlesUTF8.po && perl ../../po4a-translate -f text -o asciidoc -m ../data-30/Titles.asciidoc -l TitlesUTF8.asciidoc -p TitlesUTF8.po",
+ 'run' => "$UGCS msgattrib --clear-fuzzy -o TitlesUTF8.po TitlesUTF8.po && perl ../../po4a-translate -f asciidoc -m ../data-30/Titles.asciidoc -l TitlesUTF8.asciidoc -p TitlesUTF8.po",
'test'=> "$UGCS diff TitlesUTF8.asciidoc ../data-30/TitlesUTF8.asciidoc",
'doc' => "$UGCS translate titles with UTF-8 encoding"
};
push @tests, {
- 'run' => "$UGCS perl ../../po4a-gettextize -f text -o asciidoc -m ../data-30/Titles.asciidoc -l ../data-30/TitlesLatin1.asciidoc -L iso-8859-1 -p TitlesLatin1.po",
+ 'run' => "$UGCS perl ../../po4a-gettextize -f asciidoc -m ../data-30/Titles.asciidoc -l ../data-30/TitlesLatin1.asciidoc -L iso-8859-1 -p TitlesLatin1.po",
'test'=> "$UGCS perl ../compare-po.pl ../data-30/TitlesLatin1.po TitlesLatin1.po",
'doc' => "$UGCS test titles with latin1 encoding"
};
push @tests, {
- 'run' => "$UGCS msgattrib --clear-fuzzy -o TitlesLatin1.po TitlesLatin1.po && perl ../../po4a-translate -f text -o asciidoc -m ../data-30/Titles.asciidoc -l TitlesLatin1.asciidoc -p TitlesLatin1.po",
+ 'run' => "$UGCS msgattrib --clear-fuzzy -o TitlesLatin1.po TitlesLatin1.po && perl ../../po4a-translate -f asciidoc -m ../data-30/Titles.asciidoc -l TitlesLatin1.asciidoc -p TitlesLatin1.po",
'test'=> "$UGCS diff TitlesLatin1.asciidoc ../data-30/TitlesLatin1.asciidoc",
'doc' => "$UGCS translate titles with latin1 encoding"
};
More information about the Po4a-commits
mailing list