Test clips

diff --git a/MANIFEST b/MANIFEST
index d765e1dd695c02aa7a58ec59603d47768c2fcffa..4d8c3472c4cafc61502009b6c6286ff6e73b0b0c 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -34,4 +34,5 @@ t/01-api.t
 t/10-set.t
 t/20-mod.t
 t/21-layer.t
+t/22-clip.t
 t/91-pod.t

diff --git a/lib/LaTeX/TikZ/Set.pm b/lib/LaTeX/TikZ/Set.pm
index da636a42633ed37bd37d04d1c9126060b7a8ac39..78b53ce2ee853c9ac17f738b939a29596d49e2d3 100644 (file)
--- a/lib/LaTeX/TikZ/Set.pm
+++ b/lib/LaTeX/TikZ/Set.pm
@@ -133,7 +133,7 @@ sub clip {
 
  $_[0]->mod(
   map {
-   $ltmc_tc->check($_) ? $_ : LaTeX::TikZ::Mod::Clip->new($_)
+   $ltmc_tc->check($_) ? $_ : LaTeX::TikZ::Mod::Clip->new(clip => $_)
   } @_[1 .. $#_]
  )
 }

diff --git a/t/22-clip.t b/t/22-clip.t
new file mode 100644 (file)
index 0000000..800be76
--- /dev/null
+++ b/t/22-clip.t
@@ -0,0 +1,156 @@
+#!perl -T
+
+use strict;
+use warnings;
+
+use Test::More tests => 2 + 2 * 9;
+
+use LaTeX::TikZ;
+
+my $tikz = Tikz->formatter(
+ format => '%d',
+);
+
+sub check {
+ my ($set, $desc, $exp) = @_;
+
+ local $Test::Builder::Level = $Test::Builder::Level + 1;
+
+ my ($head, $decl, $body) = eval {
+  $tikz->render(ref $set eq 'ARRAY' ? @$set : $set);
+ };
+ is $@, '', "$desc: no error";
+
+ unless (ref $exp eq 'ARRAY') {
+  $exp = [ split /\n/, $exp ];
+ }
+ unshift @$exp, '\begin{tikzpicture}';
+ push    @$exp, '\end{tikzpicture}';
+
+ is_deeply $body, $exp, $desc;
+}
+
+my $clip1 = Tikz->raw('clip1');
+my $clip2 = Tikz->raw('clip2');
+
+my $foo = eval {
+ Tikz->raw('foo')
+     ->clip($clip1);
+};
+is $@, '', 'creating a clipping a raw path with ->clip doesn\'t croak';
+
+check $foo, 'one clipped raw set', <<'RES';
+\begin{scope}
+\clip clip1 ;
+\draw foo ;
+\end{scope}
+RES
+
+my $bar = eval {
+ Tikz->raw('bar')
+     ->mod(Tikz->clip(Tikz->raw('clip1')));
+};
+is $@, '', 'creating a clipping a raw path with ->mod doesn\'t croak';
+
+check $bar, 'another clipped raw set', <<'RES';
+\begin{scope}
+\clip clip1 ;
+\draw bar ;
+\end{scope}
+RES
+
+my $seq = Tikz->seq($foo, $bar);
+
+check $seq, 'mods folding with clips 1', <<'RES';
+\begin{scope}
+\clip clip1 ;
+\draw foo ;
+\draw bar ;
+\end{scope}
+RES
+
+my $baz = Tikz->raw('baz')
+              ->clip($clip2);
+
+check Tikz->seq($seq, $baz), 'mods folding with clips 2', <<'RES';
+\begin{scope}
+\clip clip1 ;
+\draw foo ;
+\draw bar ;
+\end{scope}
+\begin{scope}
+\clip clip2 ;
+\draw baz ;
+\end{scope}
+RES
+
+check Tikz->seq($baz, $seq), 'mods folding with clips 3', <<'RES';
+\begin{scope}
+\clip clip2 ;
+\draw baz ;
+\end{scope}
+\begin{scope}
+\clip clip1 ;
+\draw foo ;
+\draw bar ;
+\end{scope}
+RES
+
+my $seq2 = Tikz->seq($seq, $baz)
+               ->clip($clip1);
+
+check $seq2, 'mods folding with clips 4', <<'RES';
+\begin{scope}
+\clip clip1 ;
+\draw foo ;
+\draw bar ;
+\begin{scope}
+\clip clip2 ;
+\draw baz ;
+\end{scope}
+\end{scope}
+RES
+
+$seq2 = Tikz->seq($seq, $baz)
+            ->clip($clip2);
+
+check $seq2, 'mods folding with clips 5', <<'RES';
+\begin{scope}
+\clip clip2 ;
+\begin{scope}
+\clip clip1 ;
+\draw foo ;
+\draw bar ;
+\end{scope}
+\draw baz ;
+\end{scope}
+RES
+
+$seq2->clip($clip1);
+
+check $seq2, 'mods folding with clips 6', <<'RES';
+\begin{scope}
+\clip clip2 ;
+\begin{scope}
+\clip clip1 ;
+\draw foo ;
+\draw bar ;
+\draw baz ;
+\end{scope}
+\end{scope}
+RES
+
+$seq2->mod(Tikz->color('red'));
+
+check $seq2, 'mods folding with clips 7', <<'RES';
+\begin{scope} [color=red]
+\clip clip2 ;
+\begin{scope}
+\clip clip1 ;
+\draw foo ;
+\draw bar ;
+\draw baz ;
+\end{scope}
+\end{scope}
+RES
+