? html.pl ? html.po ? mylo ? mypo ? out.po ? po4a-normalize.output ? po4a-normalize.po ? t/tmp ? t/data-22/po4a-normalize.output ? t/data-22/po4a-normalize.po Index: lib/Locale/Po4a/Xhtml.pm =================================================================== RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Xhtml.pm,v retrieving revision 1.2 diff -u -r1.2 Xhtml.pm --- lib/Locale/Po4a/Xhtml.pm 4 Sep 2005 07:09:09 -0000 1.2 +++ lib/Locale/Po4a/Xhtml.pm 11 Jun 2006 14:01:58 -0000 @@ -86,32 +86,9 @@ my %options = @_; $self->SUPER::initialize(%options); - #$self->{options}{'tagsonly'}=1; $self->{options}{'wrap'}=1; - $self->{options}{'doctype'}=$self->{options}{'doctype'} || 'docbook xml'; - $self->{options}{'tags'}.=' -
-
- - - - - - - - - - - - - - - - - '; + $self->{options}{'doctype'}=$self->{options}{'doctype'} || 'html'; + $self->{options}{'inline'}.=' Index: lib/Locale/Po4a/Xml.pm =================================================================== RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Xml.pm,v retrieving revision 1.46 diff -u -r1.46 Xml.pm --- lib/Locale/Po4a/Xml.pm 12 Apr 2006 23:46:01 -0000 1.46 +++ lib/Locale/Po4a/Xml.pm 11 Jun 2006 14:01:59 -0000 @@ -404,6 +404,9 @@ ##### Generic XML tag types #####' my @tag_types = ( + { beginning => "!--#", + end => "--", + breaking => 0}, { beginning => "!--", end => "--", breaking => 0, Index: t/22-html.t =================================================================== RCS file: /cvsroot/po4a/po4a/t/22-html.t,v retrieving revision 1.1 diff -u -r1.1 22-html.t --- t/22-html.t 28 Nov 2004 22:38:57 -0000 1.1 +++ t/22-html.t 11 Jun 2006 14:02:00 -0000 @@ -8,30 +8,23 @@ my @tests; -mkdir "t/tmp" unless -e "t/tmp"; +mkdir "t/tmp" unless -e "t/tmp" or die "Can't create test directory t/tmp\n"; my $diff_po_flags = " -I '^# SOME' -I '^# Test' ". "-I '^\"POT-Creation-Date: ' -I '^\"Content-Transfer-Encoding:'"; push @tests, { - 'run' => 'perl ../../po4a-gettextize -f html -m ../data-22/html.html -p html.po', - 'test'=> "diff -u $diff_po_flags ../data-22/html.po html.po", - 'doc' => 'General', -}, { - 'run' => 'perl ../../po4a-normalize -f html ../data-22/spaces.html', - 'test'=> "diff -u $diff_po_flags ../data-22/spaces.po po4a-normalize.po". - "&& diff -u $diff_po_flags ../data-22/spaces_out.html po4a-normalize.output", - 'doc' => 'Spaces', -}, { - 'run' => 'perl ../../po4a-gettextize -f html -m ../data-22/attribute.html -p attribute.po;'. - 'sed "s/msgstr \"\"/msgstr \"baz\"/" attribute.po > attribute2.po;'. - 'perl ../../po4a-translate -f html -m ../data-22/attribute.html -p attribute2.po -l attribute.html' - , - 'test'=> "diff -u $diff_po_flags ../data-22/attribute_out.html attribute.html", - 'doc' => 'Attribute replacement' -}; + 'run' => 'perl ../../po4a-gettextize -f xhtml -m ../data-22/html.html -p html.po', + 'test'=> "diff -u $diff_po_flags ../data-22/html.po html.po", + 'doc' => 'Text extraction', + }, { + 'run' => 'perl ../../po4a-normalize -f xhtml ../data-22/html.html', + 'test'=> "diff -u $diff_po_flags ../data-22/html.po po4a-normalize.po". + "&& diff -u $diff_po_flags ../data-22/po4a-normalize.output po4a-normalize.output", + 'doc' => 'normalisation test', + }; -use Test::More tests => 6; +use Test::More tests => 4; chdir "t/tmp" || die "Can't chdir to my test directory"; Index: t/data-22/html.html =================================================================== RCS file: /cvsroot/po4a/po4a/t/data-22/html.html,v retrieving revision 1.1 diff -u -r1.1 html.html --- t/data-22/html.html 28 Nov 2004 22:38:57 -0000 1.1 +++ t/data-22/html.html 11 Jun 2006 14:02:00 -0000 @@ -15,12 +15,16 @@ alt="Some text" title="My picture" /> Strongnot strong + Another line with space and no closing. My link, - link on next line, line on same line. + link on next line, line on same line. - + + + and some text without a paragraph mark. +
- - '; + $self->{options}{'doctype'}=$self->{options}{'doctype'} || 'html'; + $self->{options}{'inline'}.=' Index: lib/Locale/Po4a/Xml.pm =================================================================== RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Xml.pm,v retrieving revision 1.46 diff -u -r1.46 Xml.pm --- lib/Locale/Po4a/Xml.pm 12 Apr 2006 23:46:01 -0000 1.46 +++ lib/Locale/Po4a/Xml.pm 11 Jun 2006 14:01:59 -0000 @@ -404,6 +404,9 @@ ##### Generic XML tag types #####' my @tag_types = ( + { beginning => "!--#", + end => "--", + breaking => 0}, { beginning => "!--", end => "--", breaking => 0, Index: t/22-html.t =================================================================== RCS file: /cvsroot/po4a/po4a/t/22-html.t,v retrieving revision 1.1 diff -u -r1.1 22-html.t --- t/22-html.t 28 Nov 2004 22:38:57 -0000 1.1 +++ t/22-html.t 11 Jun 2006 14:02:00 -0000 @@ -8,30 +8,23 @@ my @tests; -mkdir "t/tmp" unless -e "t/tmp"; +mkdir "t/tmp" unless -e "t/tmp" or die "Can't create test directory t/tmp\n"; my $diff_po_flags = " -I '^# SOME' -I '^# Test' ". "-I '^\"POT-Creation-Date: ' -I '^\"Content-Transfer-Encoding:'"; push @tests, { - 'run' => 'perl ../../po4a-gettextize -f html -m ../data-22/html.html -p html.po', - 'test'=> "diff -u $diff_po_flags ../data-22/html.po html.po", - 'doc' => 'General', -}, { - 'run' => 'perl ../../po4a-normalize -f html ../data-22/spaces.html', - 'test'=> "diff -u $diff_po_flags ../data-22/spaces.po po4a-normalize.po". - "&& diff -u $diff_po_flags ../data-22/spaces_out.html po4a-normalize.output", - 'doc' => 'Spaces', -}, { - 'run' => 'perl ../../po4a-gettextize -f html -m ../data-22/attribute.html -p attribute.po;'. - 'sed "s/msgstr \"\"/msgstr \"baz\"/" attribute.po > attribute2.po;'. - 'perl ../../po4a-translate -f html -m ../data-22/attribute.html -p attribute2.po -l attribute.html' - , - 'test'=> "diff -u $diff_po_flags ../data-22/attribute_out.html attribute.html", - 'doc' => 'Attribute replacement' -}; + 'run' => 'perl ../../po4a-gettextize -f xhtml -m ../data-22/html.html -p html.po', + 'test'=> "diff -u $diff_po_flags ../data-22/html.po html.po", + 'doc' => 'Text extraction', + }, { + 'run' => 'perl ../../po4a-normalize -f xhtml ../data-22/html.html', + 'test'=> "diff -u $diff_po_flags ../data-22/html.po po4a-normalize.po". + "&& diff -u $diff_po_flags ../data-22/po4a-normalize.output po4a-normalize.output", + 'doc' => 'normalisation test', + }; -use Test::More tests => 6; +use Test::More tests => 4; chdir "t/tmp" || die "Can't chdir to my test directory"; Index: t/data-22/html.html =================================================================== RCS file: /cvsroot/po4a/po4a/t/data-22/html.html,v retrieving revision 1.1 diff -u -r1.1 html.html --- t/data-22/html.html 28 Nov 2004 22:38:57 -0000 1.1 +++ t/data-22/html.html 11 Jun 2006 14:02:00 -0000 @@ -15,12 +15,16 @@ alt="Some text" title="My picture" /> Strongnot strong + Another line with space and no closing. My link, - link on next line, line on same line. + link on next line, line on same line. - + + + and some text without a paragraph mark. +
Strongnot strong
Another line with space and no closing.
My link, - link on next line, line on same line. + link on next line, line on same line.