=head1 VERSION
-Version 0.01
+Version 0.02
=cut
-our $VERSION = '0.01';
-
-use Scope::Guard ();
+our $VERSION = '0.02';
+use LaTeX::TikZ::Context;
use LaTeX::TikZ::Scope;
use LaTeX::TikZ::Tools;
=item *
-C<draw $formatter>
+C<draw $formatter, $context>
Returns an array reference of TikZ code lines required to effectively draw the current set object, formatted by the L<LaTeX::TikZ::Formatter> object C<$formatter>.
+The current evaluation context is passed as the L<LaTeX::TikZ::Context> object C<$context>.
=back
=cut
-requires qw(
+requires qw<
draw
-);
+>;
=head2 C<mod @mods>
$set;
}
-{
- our %mods;
- our $last_mod = 0;
-
- around 'draw' => sub {
- my ($orig, $set, $tikz) = @_;
-
- local $last_mod = $last_mod;
-
- # Save a deep copy
- my %saved_idx = map { $_ => $#{$mods{$_}} } keys %mods;
- my $guard = Scope::Guard->new(sub {
- for (keys %mods) {
- if (exists $saved_idx{$_}) {
- $#{$mods{$_}} = $saved_idx{$_};
- } else {
- delete $mods{$_};
- }
- }
- });
-
- 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]->covers($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);
-
- if (@mods) {
- $body = LaTeX::TikZ::Scope->new
- ->mod(map $_->apply($tikz), @mods)
- ->body($body);
- }
-
- $body;
- };
-}
+around 'draw' => sub {
+ my ($orig, $set, $tikz, $pcxt) = @_;
+
+ my $cxt = LaTeX::TikZ::Context->new(
+ parent => $pcxt,
+ mods => [ $set->mods ],
+ );
+
+ my $body = $set->$orig($tikz, $cxt);
+
+ my @mods = $cxt->effective_mods;
+ if (@mods) {
+ $body = LaTeX::TikZ::Scope->new(
+ mods => [ map $_->apply($tikz), @mods ],
+ body => $body,
+ );
+ }
+
+ $body;
+};
=head2 C<layer $layer>
=cut
sub layer {
- return $_[0] unless @_ > 1;
+ my $set = shift;
- my $layer = $_[1];
+ return $set unless @_;
- $_[0]->mod(
+ my $layer = $_[0];
+ $set->mod(
$ltml_tc->check($layer) ? $layer
: LaTeX::TikZ::Mod::Layer->new(name => $layer)
)
=cut
sub clip {
- return $_[0] unless @_ > 1;
+ my $set = shift;
+
+ return $set unless @_;
- $_[0]->mod(
+ $set->mod(
map {
$ltmc_tc->check($_) ? $_ : LaTeX::TikZ::Mod::Clip->new(clip => $_)
- } @_[1 .. $#_]
+ } @_
)
}