Inline LaTeX::TikZ::Set->mods_unique

[perl/modules/LaTeX-TikZ.git] / lib / LaTeX / TikZ / Set.pm

diff --git a/lib/LaTeX/TikZ/Set.pm b/lib/LaTeX/TikZ/Set.pm
index e719643a3a7fea5d64c81efd4cd873da5ee2fd4e..e0886cb1bdd04560ea125857d5e774c20acde08b 100644 (file)
--- a/lib/LaTeX/TikZ/Set.pm
+++ b/lib/LaTeX/TikZ/Set.pm
@@ -44,9 +44,10 @@ my $ltmc_tc = LaTeX::TikZ::Tools::type_constraint('LaTeX::TikZ::Mod::Clip');
 sub mod {
  my $set = shift;
 
- push @{$set->_mods},
-  map { $ltm_tc->check($_) ? $_ : $ltm_tc->coerce($_) }
-   @_;
+ my @mods = map $ltm_tc->coerce($_), @_;
+ $ltm_tc->assert_valid($_) for @mods;
+
+ push @{$set->_mods}, @mods;
 
  $set;
 }
@@ -55,31 +56,6 @@ sub mod {
  our %mods;
  our $last_mod = 0;
 
- sub mods_unique {
-  my ($set) = @_;
-
-  my (@mods, $has_layer);
-MOD:
-  for my $mod ($set->mods) {
-   $has_layer = 1 if $ltml_tc->check($mod);
-   my $tag = $mod->tag;
-   my $old = $mods{$tag} || [];
-   for (@$old) {
-    next MOD if $_->[0]->cover($mod);
-   }
-   push @{$mods{$tag}}, [ $mod, $last_mod++ ];
-   push @mods,          $mod;
-  }
-
-  if ($has_layer) {
-   # Clips and mods don't propagate through layers. Hence if a layer is set,
-   # force their reuse.
-   @mods = map $_->[0], sort { $a->[1] <=> $b->[1] } map @$_, values %mods;
-  }
-
-  return @mods;
- }
-
  around 'draw' => sub {
   my ($orig, $set, $tikz) = @_;
 
@@ -97,7 +73,30 @@ MOD:
    }
   });
 
-  my @mods = $set->mods_unique;
+  my (@mods, $last_layer);
+MOD:
+  for my $mod ($set->mods) {
+   my $is_layer = $ltml_tc->check($mod);
+   $last_layer  = $mod if $is_layer;
+   my $tag = $mod->tag;
+   my $old = $mods{$tag} || [];
+   for (@$old) {
+    next MOD if $_->[0]->cover($mod);
+   }
+   push @{$mods{$tag}}, [ $mod, $last_mod++, $is_layer ];
+   push @mods,          $mod;
+  }
+
+  if ($last_layer) {
+   # Clips and mods don't propagate through layers. Hence if a layer is set,
+   # force their reuse.
+   @mods = $last_layer;
+   push @mods, map $_->[0],
+                sort { $a->[1] <=> $b->[1] }
+                 grep !$_->[2],
+                  map @$_,
+                   values %mods;
+  }
 
   my $body = $set->$orig($tikz);
 
@@ -127,7 +126,7 @@ sub clip {
 
  $_[0]->mod(
   map {
-   $ltmc_tc->check($_) ? $_ : LaTeX::TikZ::Mod::Clip->new($_)
+   $ltmc_tc->check($_) ? $_ : LaTeX::TikZ::Mod::Clip->new(clip => $_)
   } @_[1 .. $#_]
  )
 }