New upstream version 1.08
gregor herrmann
1 year, 7 months ago
0 | 0 | Release history for HTML-Tiny |
1 | ||
2 | 1.08 Wed 07 Sep 2022 | |
3 | - <frame> and <iframe> are no longer on the list of self-closing tags. | |
4 | Thanks to Graham Knop for catching this | |
5 | - Updated packaging | |
1 | 6 | |
2 | 7 | 1.07 Thu 01 Sep 2022 |
3 | 8 | - No functional changes |
0 | 0 | Changes |
1 | Makefile.PL | |
1 | 2 | examples/js.pl |
2 | 3 | examples/simple.pl |
3 | 4 | examples/table.pl |
5 | inc/WriteMakefile.pl | |
4 | 6 | inc/boilerplate.pl |
5 | 7 | lib/HTML/Tiny.pm |
6 | Makefile.PL | |
7 | MANIFEST | |
8 | 8 | t/010-simple.t |
9 | 9 | t/020-coverage.t |
10 | 10 | t/030-tags.t |
11 | 11 | t/040-lazy.t |
12 | 12 | t/050-validate_tag.t |
13 | MANIFEST | |
13 | 14 | META.yml Module YAML meta-data (added by MakeMaker) |
14 | 15 | META.json Module JSON meta-data (added by MakeMaker) |
15 | 16 | LICENSE |
39 | 39 | "web" : "https://rt.cpan.org/Public/Dist/Display.html?Name=HTML-Tiny" |
40 | 40 | }, |
41 | 41 | "license" : [ |
42 | "http://dev.perl.org/licenses/" | |
42 | "https://dev.perl.org/licenses/" | |
43 | 43 | ], |
44 | 44 | "repository" : { |
45 | 45 | "type" : "git", |
47 | 47 | "web" : "https://github.com/ap/HTML-Tiny" |
48 | 48 | } |
49 | 49 | }, |
50 | "version" : "1.07", | |
50 | "version" : "1.08", | |
51 | 51 | "x_copyright" : { |
52 | 52 | "holder" : "Andy Armstrong", |
53 | 53 | "year" : 2008 |
19 | 19 | perl: '5.006' |
20 | 20 | resources: |
21 | 21 | bugtracker: https://rt.cpan.org/Public/Dist/Display.html?Name=HTML-Tiny |
22 | license: http://dev.perl.org/licenses/ | |
22 | license: https://dev.perl.org/licenses/ | |
23 | 23 | repository: https://github.com/ap/HTML-Tiny.git |
24 | version: '1.07' | |
24 | version: '1.08' | |
25 | 25 | x_copyright: |
26 | 26 | holder: 'Andy Armstrong' |
27 | 27 | year: 2008 |
2 | 2 | my $sc = q<https://github.com/ap/HTML-Tiny>; |
3 | 3 | my $bt = q<https://rt.cpan.org/Public/Dist/Display.html?Name=HTML-Tiny>; |
4 | 4 | |
5 | my %META = ( | |
5 | our %META = ( | |
6 | 6 | name => 'HTML-Tiny', |
7 | 7 | author => [ 'Andy Armstrong <andy@hexten.net>', 'Aristotle Pagaltzis <pagaltzis@gmx.de>' ], |
8 | 8 | x_copyright => { holder => 'Andy Armstrong', year => 2008 }, |
9 | 9 | license => 'perl_5', |
10 | 10 | resources => { |
11 | license => [ 'http://dev.perl.org/licenses/' ], | |
11 | license => [ q<https://dev.perl.org/licenses/> ], | |
12 | 12 | repository => { type => 'git', url => "$sc.git", web => $sc }, |
13 | 13 | bugtracker => { web => $bt }, |
14 | 14 | }, |
27 | 27 | }, |
28 | 28 | ); |
29 | 29 | |
30 | sub MY::postamble { -f 'META.yml' ? return : <<'' } | |
31 | create_distdir : MANIFEST | |
32 | distdir : MANIFEST | |
33 | MANIFEST : | |
34 | ( git ls-files ':!author/' ':!README.pod' ; echo MANIFEST ) | sort -f > MANIFEST | |
35 | distdir : boilerplate | |
36 | .PHONY : boilerplate | |
37 | boilerplate : distmeta | |
38 | $(PERL) -Ilib inc/boilerplate.pl $(DISTVNAME) | |
30 | our $manifest_cmd = q[git ls-files ':!author/' ':!README.pod']; | |
39 | 31 | |
40 | ## BOILERPLATE ############################################################### | |
41 | require ExtUtils::MakeMaker; | |
42 | ||
43 | my %MM_ARGS; | |
44 | ||
45 | # have to do this since old EUMM dev releases miss the eval $VERSION line | |
46 | my $eumm_version = eval $ExtUtils::MakeMaker::VERSION; | |
47 | my $mymeta = $eumm_version >= 6.57_02; | |
48 | my $mymeta_broken = $mymeta && $eumm_version < 6.57_07; | |
49 | ||
50 | (my $basepath = (-d 'lib' ? 'lib/' : '') . $META{name}) =~ s{-}{/}g; | |
51 | ||
52 | ($MM_ARGS{NAME} = $META{name}) =~ s/-/::/g; | |
53 | $MM_ARGS{VERSION_FROM} = "$basepath.pm"; | |
54 | $MM_ARGS{ABSTRACT_FROM} = -f "$basepath.pod" ? "$basepath.pod" : "$basepath.pm"; | |
55 | $META{license} = [ $META{license} ] | |
56 | if $META{license} && !ref $META{license}; | |
57 | $MM_ARGS{LICENSE} = $META{license}[0] | |
58 | if $META{license} && $eumm_version >= 6.30; | |
59 | $MM_ARGS{NO_MYMETA} = 1 | |
60 | if $mymeta_broken; | |
61 | $MM_ARGS{META_ADD} = { 'meta-spec' => { version => 2 }, %META } | |
62 | unless -f 'META.yml'; | |
63 | $MM_ARGS{PL_FILES} ||= {}; | |
64 | $MM_ARGS{NORECURS} = 1 | |
65 | if not exists $MM_ARGS{NORECURS}; | |
66 | ||
67 | for (qw(configure build test runtime)) { | |
68 | my $key = $_ eq 'runtime' ? 'PREREQ_PM' : uc $_.'_REQUIRES'; | |
69 | my $r = $MM_ARGS{$key} = { | |
70 | %{$META{prereqs}{$_}{requires} || {}}, | |
71 | %{delete $MM_ARGS{$key} || {}}, | |
72 | }; | |
73 | defined $r->{$_} or delete $r->{$_} for keys %$r; | |
74 | } | |
75 | ||
76 | $MM_ARGS{MIN_PERL_VERSION} = eval delete $MM_ARGS{PREREQ_PM}{perl} || 0; | |
77 | ||
78 | delete $MM_ARGS{MIN_PERL_VERSION} | |
79 | if $eumm_version < 6.47_01; | |
80 | $MM_ARGS{BUILD_REQUIRES} = {%{$MM_ARGS{BUILD_REQUIRES}}, %{delete $MM_ARGS{TEST_REQUIRES}}} | |
81 | if $eumm_version < 6.63_03; | |
82 | $MM_ARGS{PREREQ_PM} = {%{$MM_ARGS{PREREQ_PM}}, %{delete $MM_ARGS{BUILD_REQUIRES}}} | |
83 | if $eumm_version < 6.55_01; | |
84 | delete $MM_ARGS{CONFIGURE_REQUIRES} | |
85 | if $eumm_version < 6.51_03; | |
86 | ||
87 | ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS); | |
88 | ## END BOILERPLATE ########################################################### | |
32 | require './inc/WriteMakefile.pl'; |
0 | use strict; use warnings; | |
1 | ||
2 | require ExtUtils::MakeMaker; | |
3 | ||
4 | defined(our $distlib) or ($distlib = -d 'lib' ? 'lib' : '.'); | |
5 | defined(our $manifest_cmd) or ($manifest_cmd = "git ls-files ':!README.pod'"); | |
6 | ||
7 | sub MY::postamble { -f 'META.yml' ? return : <<"" } | |
8 | create_distdir : MANIFEST | |
9 | distdir : MANIFEST | |
10 | MANIFEST : | |
11 | ( $manifest_cmd ; echo MANIFEST ) > MANIFEST | |
12 | distdir : boilerplate | |
13 | .PHONY : boilerplate | |
14 | boilerplate : distmeta | |
15 | \$(PERL) -I$distlib inc/boilerplate.pl \$(DISTVNAME) | |
16 | ||
17 | our (%META, %MM_ARGS); | |
18 | ||
19 | # have to do this since old EUMM dev releases miss the eval $VERSION line | |
20 | my $eumm_version = eval $ExtUtils::MakeMaker::VERSION; | |
21 | my $mymeta = $eumm_version >= 6.57_02; | |
22 | my $mymeta_broken = $mymeta && $eumm_version < 6.57_07; | |
23 | ||
24 | (my $basepath = "$distlib/$META{name}") =~ s{-}{/}g; | |
25 | ||
26 | ($MM_ARGS{NAME} = $META{name}) =~ s/-/::/g; | |
27 | $MM_ARGS{VERSION_FROM} = "$basepath.pm"; | |
28 | $MM_ARGS{ABSTRACT_FROM} = -f "$basepath.pod" ? "$basepath.pod" : "$basepath.pm"; | |
29 | $META{license} = [ $META{license} ] | |
30 | if $META{license} && !ref $META{license}; | |
31 | $MM_ARGS{LICENSE} = $META{license}[0] | |
32 | if $META{license} && $eumm_version >= 6.30; | |
33 | $MM_ARGS{NO_MYMETA} = 1 | |
34 | if $mymeta_broken; | |
35 | $MM_ARGS{META_ADD} = { 'meta-spec' => { version => 2 }, %META } | |
36 | unless -f 'META.yml'; | |
37 | $MM_ARGS{PL_FILES} ||= {}; | |
38 | $MM_ARGS{NORECURS} = 1 | |
39 | if not exists $MM_ARGS{NORECURS}; | |
40 | ||
41 | for (qw(configure build test runtime)) { | |
42 | my $key = $_ eq 'runtime' ? 'PREREQ_PM' : uc $_.'_REQUIRES'; | |
43 | my $r = $MM_ARGS{$key} = { | |
44 | %{$META{prereqs}{$_}{requires} || {}}, | |
45 | %{delete $MM_ARGS{$key} || {}}, | |
46 | }; | |
47 | defined $r->{$_} or delete $r->{$_} for keys %$r; | |
48 | } | |
49 | ||
50 | $MM_ARGS{MIN_PERL_VERSION} = eval delete $MM_ARGS{PREREQ_PM}{perl} || 0; | |
51 | ||
52 | delete $MM_ARGS{MIN_PERL_VERSION} | |
53 | if $eumm_version < 6.47_01; | |
54 | $MM_ARGS{BUILD_REQUIRES} = {%{$MM_ARGS{BUILD_REQUIRES}}, %{delete $MM_ARGS{TEST_REQUIRES}}} | |
55 | if $eumm_version < 6.63_03; | |
56 | $MM_ARGS{PREREQ_PM} = {%{$MM_ARGS{PREREQ_PM}}, %{delete $MM_ARGS{BUILD_REQUIRES}}} | |
57 | if $eumm_version < 6.55_01; | |
58 | delete $MM_ARGS{CONFIGURE_REQUIRES} | |
59 | if $eumm_version < 6.51_03; | |
60 | ||
61 | ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS); |
1 | 1 | |
2 | 2 | use CPAN::Meta; |
3 | 3 | use Software::LicenseUtils 0.103011; |
4 | use Pod::Readme::Brief 1.001; | |
4 | use Pod::Readme::Brief 1.003; | |
5 | 5 | |
6 | 6 | sub slurp { open my $fh, '<', $_[0] or die "Couldn't open $_[0] to read: $!\n"; local $/; readline $fh } |
7 | 7 | sub trimnl { s/\A\s*\n//, s/\s*\z/\n/ for @_; wantarray ? @_ : $_[-1] } |
34 | 34 | ) }me; |
35 | 35 | |
36 | 36 | die unless -e 'Makefile.PL'; |
37 | $file{'README'} = Pod::Readme::Brief->new( $file{ $main_module } )->render( installer => 'eumm' ); | |
37 | $file{'README'} = Pod::Readme::Brief->new( $file{ $main_module } )->render( installer => 'eumm', width => 72 ); | |
38 | 38 | |
39 | 39 | my @manifest = split /\n/, slurp 'MANIFEST'; |
40 | 40 | my %manifest = map /\A([^\s#]+)()/, @manifest; |
9 | 9 | |
10 | 10 | =cut |
11 | 11 | |
12 | our $VERSION = '1.07'; | |
12 | our $VERSION = '1.08'; | |
13 | 13 | |
14 | 14 | BEGIN { |
15 | 15 | |
46 | 46 | # Tags that are closed (<br /> versus <br></br>) |
47 | 47 | my @DEFAULT_CLOSED |
48 | 48 | # https://developer.mozilla.org/en-US/docs/Glossary/Empty_element |
49 | = qw( area base br col embed frame hr iframe img input keygen link meta param source track wbr ); | |
49 | = qw( area base br col embed hr img input keygen link meta param source track wbr ); | |
50 | 50 | |
51 | 51 | # Tags that get a trailing newline |
52 | 52 | my @DEFAULT_NEWLINE = qw( html head body div p tr table ); |
555 | 555 | }, |
556 | 556 | { |
557 | 557 | "args" => [], |
558 | "expect_scalar" => "<frame />", | |
558 | "expect_scalar" => "<frame></frame>", | |
559 | 559 | "method" => "frame" |
560 | 560 | }, |
561 | 561 | { |
562 | 562 | "args" => [], |
563 | "expect_scalar" => "<iframe />", | |
563 | "expect_scalar" => "<iframe></iframe>", | |
564 | 564 | "method" => "iframe" |
565 | 565 | }, |
566 | 566 | { |
628 | 628 | }, |
629 | 629 | { |
630 | 630 | "args" => [], |
631 | "expect_scalar" => "<frame>", | |
631 | "expect_scalar" => "<frame></frame>", | |
632 | 632 | "method" => "frame" |
633 | 633 | }, |
634 | 634 | { |
635 | 635 | "args" => [], |
636 | "expect_scalar" => "<iframe>", | |
636 | "expect_scalar" => "<iframe></iframe>", | |
637 | 637 | "method" => "iframe" |
638 | 638 | }, |
639 | 639 | { |