X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FLaTeX%2FTikZ%2FFormatter.pm;h=0838e46d0262176dc216efe45ba9dbf99ebf048f;hb=c09a50b51230b49b80114d2bd5a3c0a7250c6bf9;hp=da0656c288fbe4bf358bc4e6066d6b4ca8cc98eb;hpb=cb3b916e0590c6a0b70b60f30304921385462faa;p=perl%2Fmodules%2FLaTeX-TikZ.git

diff --git a/lib/LaTeX/TikZ/Formatter.pm b/lib/LaTeX/TikZ/Formatter.pm
index da0656c..0838e46 100644
--- a/lib/LaTeX/TikZ/Formatter.pm
+++ b/lib/LaTeX/TikZ/Formatter.pm
@@ -51,33 +51,56 @@ has 'height' => (
 );
 
 has 'origin' => (
- is   => 'ro',
- does => 'Maybe[LaTeX::TikZ::Point]',
+ is     => 'ro',
+ isa    => 'Maybe[LaTeX::TikZ::Point::Autocoerce]',
+ coerce => 1,
 );
 
-my $find_mods;
-$find_mods = do {
- no warnings 'recursion';
+sub id {
+ my $tikz = shift;
 
- Sub::Name::subname('find_mods' => sub {
-  my ($set, $layers, $others) = @_;
+ join $;, map {
+  my $val = $tikz->$_;
+  defined($val) ? "$val" : '(undef)';
+ } qw/unit format scale width height origin/;
+}
+
+my $find_mods = do {
+ our %seen;
+
+ my $find_mods_rec;
+ $find_mods_rec = do {
+  no warnings 'recursion';
+
+  Sub::Name::subname('find_mods_rec' => sub {
+   my ($set, $layers, $others) = @_;
+
+   for ($set->mods) {
+    my $tag = $_->tag;
+    next if $seen{$tag}++;
 
-  for ($set->mods) {
-   if ($_->isa('LaTeX::TikZ::Mod::Layer')) {
-    push @$layers, $_;
-   } else {
-    push @$others, $_;
+    if ($_->isa('LaTeX::TikZ::Mod::Layer')) {
+     push @$layers, $_;
+    } else {
+     push @$others, $_;
+    }
    }
-  }
 
-  my @subsets = $set->isa('LaTeX::TikZ::Set::Sequence')
-                ? $set->kids
-                : $set->isa('LaTeX::TikZ::Set::Path')
-                  ? $set->ops
-                  : ();
+   my @subsets = $set->isa('LaTeX::TikZ::Set::Sequence')
+                 ? $set->kids
+                 : $set->isa('LaTeX::TikZ::Set::Path')
+                   ? $set->ops
+                   : ();
 
-  $find_mods->($_, $layers, $others) for @subsets;
- })
+   $find_mods_rec->($_, $layers, $others) for @subsets;
+  });
+ };
+
+ Sub::Name::subname('find_mods' => sub {
+  local %seen = ();
+
+  $find_mods_rec->(@_);
+ });
 };
 
 sub render {
@@ -97,7 +120,12 @@ sub render {
  my $h = $tikz->height;
  my $canvas = '';
  if (defined $w and defined $h) {
-  $seq->clip(Tikz->rectangle(Tikz->point(0) => [ $w, $h ]));
+  require LaTeX::TikZ::Set::Rectangle;
+  $seq->clip(LaTeX::TikZ::Set::Rectangle->new(
+   from   => 0,
+   width  => $w,
+   height => $h,
+  ));
   $_ = $tikz->len($_) for $w, $h;
   $canvas = ",papersize={$w,$h},body={$w,$h}";
  }
@@ -154,6 +182,12 @@ sub thickness {
  0.8 * $width * ($tikz->scale / 5);
 }
 
+use LaTeX::TikZ::Interface formatter => sub {
+ shift;
+
+ __PACKAGE__->new(@_);
+};
+
 __PACKAGE__->meta->make_immutable;
 
 =head1 AUTHOR