X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FLaTeX-TikZ.git;a=blobdiff_plain;f=lib%2FLaTeX%2FTikZ%2FFormatter.pm;h=64266072622b8dac002b407a7c57fa534e13e358;hp=88bda48942b098a085c825d8370758a0ae3c800d;hb=93bfe14caec156fc11587863a486220b986b6b2e;hpb=22f1a59ec62500605cf907a4117faf25160ad92c diff --git a/lib/LaTeX/TikZ/Formatter.pm b/lib/LaTeX/TikZ/Formatter.pm index 88bda48..6426607 100644 --- a/lib/LaTeX/TikZ/Formatter.pm +++ b/lib/LaTeX/TikZ/Formatter.pm @@ -55,8 +55,6 @@ has 'origin' => ( does => 'Maybe[LaTeX::TikZ::Point]', ); -my $lts_tc = LaTeX::TikZ::Tools::type_constraint('LaTeX::TikZ::Set'); - my $find_mods; $find_mods = do { no warnings 'recursion'; @@ -87,8 +85,6 @@ $find_mods = do { sub render { my $tikz = shift; - $lts_tc->assert_valid($_) for @_; - my $seq = LaTeX::TikZ::Set::Sequence->new( kids => \@_, ); @@ -116,23 +112,15 @@ sub render { my @decls; if (@layers) { - my $layers_decl = LaTeX::TikZ::Mod::Layer->declare(@layers); - if (defined $layers_decl) { - chomp $layers_decl; - push @decls, $layers_decl; - } + push @decls, LaTeX::TikZ::Mod::Layer->declare(@layers); } for (@other_mods) { - my $decl = $_->declare($tikz); - if (defined $decl) { - chomp $decl; - push @decls, $decl; - } + push @decls, $_->declare($tikz); } my @content = ( "\\begin{tikzpicture}", - do { my $s = $seq->draw($tikz); chomp $s; $s }, + $seq->draw($tikz)->instantiate, "\\end{tikzpicture}", );