Remove magic LaTeX::TikZ::Interface->import

One should use ->register now. It has been made into a class method.

diff --git a/lib/LaTeX/TikZ/Formatter.pm b/lib/LaTeX/TikZ/Formatter.pm
index 0838e46d0262176dc216efe45ba9dbf99ebf048f..aa26ebc91766ba511e8fc9ac1ea1d9b766107b0b 100644 (file)
--- a/lib/LaTeX/TikZ/Formatter.pm
+++ b/lib/LaTeX/TikZ/Formatter.pm
@@ -17,6 +17,8 @@ our $VERSION = '0.01';
 
 use Sub::Name ();
 
+use LaTeX::TikZ::Interface;
+
 use LaTeX::TikZ::Tools;
 
 use Any::Moose;
@@ -182,11 +184,13 @@ sub thickness {
  0.8 * $width * ($tikz->scale / 5);
 }
 
-use LaTeX::TikZ::Interface formatter => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ formatter => sub {
+  shift;
 
- __PACKAGE__->new(@_);
-};
+  __PACKAGE__->new(@_);
+ },
+);
 
 __PACKAGE__->meta->make_immutable;
 

diff --git a/lib/LaTeX/TikZ/Functor.pm b/lib/LaTeX/TikZ/Functor.pm
index e302d3fbf591e31f9417555aa463f7367c5162ab..8c97432f2c57e1f7df9712b6cced21c4ffff30ef 100644 (file)
--- a/lib/LaTeX/TikZ/Functor.pm
+++ b/lib/LaTeX/TikZ/Functor.pm
@@ -19,6 +19,8 @@ use Carp ();
 
 use Sub::Name ();
 
+use LaTeX::TikZ::Interface;
+
 use LaTeX::TikZ::Tools;
 
 use Any::Moose 'Util' => [ 'does_role' ];
@@ -134,11 +136,13 @@ MOD:
  }, $class;
 }
 
-use LaTeX::TikZ::Interface functor => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ functor => sub {
+  shift;
 
- __PACKAGE__->new(rules => \@_);
-};
+  __PACKAGE__->new(rules => \@_);
+ },
+);
 
 =head1 AUTHOR
 

diff --git a/lib/LaTeX/TikZ/Interface.pm b/lib/LaTeX/TikZ/Interface.pm
index fa5da48c0bd7b3e825fdcb5dfcdc6d6989789149..adf63f90802f2a2d5ee44fbe5d1779ed4cf0b207 100644 (file)
--- a/lib/LaTeX/TikZ/Interface.pm
+++ b/lib/LaTeX/TikZ/Interface.pm
@@ -17,13 +17,9 @@ our $VERSION = '0.01';
 
 use Sub::Name ();
 
-sub import {
+sub register {
  shift;
 
- register(@_);
-}
-
-sub register {
  while (@_ >= 2) {
   my ($name, $code) = splice @_, 0, 2;
 

diff --git a/lib/LaTeX/TikZ/Mod/Clip.pm b/lib/LaTeX/TikZ/Mod/Clip.pm
index 3f5454e301c0883f44c4888e2365fd44ec3bed36..69c401edf70b84a4ca7a10bff2d343f24e2d78e5 100644 (file)
--- a/lib/LaTeX/TikZ/Mod/Clip.pm
+++ b/lib/LaTeX/TikZ/Mod/Clip.pm
@@ -20,6 +20,7 @@ use Sub::Name ();
 use LaTeX::TikZ::Formatter;
 use LaTeX::TikZ::Mod::Formatted;
 
+use LaTeX::TikZ::Interface;
 use LaTeX::TikZ::Functor;
 
 use LaTeX::TikZ::Tools;
@@ -138,11 +139,13 @@ sub apply {
  )
 }
 
-use LaTeX::TikZ::Interface clip => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ clip => sub {
+  shift;
 
- __PACKAGE__->new(clip => $_[0]);
-};
+  __PACKAGE__->new(clip => $_[0]);
+ },
+);
 
 LaTeX::TikZ::Functor->default_rule(
  (__PACKAGE__) => sub {

diff --git a/lib/LaTeX/TikZ/Mod/Color.pm b/lib/LaTeX/TikZ/Mod/Color.pm
index 47cc8a2e529788aa8c7cf39d32864b982cc1d66c..99cfe5f8585012988c9095fa76d28e0b1adc29af 100644 (file)
--- a/lib/LaTeX/TikZ/Mod/Color.pm
+++ b/lib/LaTeX/TikZ/Mod/Color.pm
@@ -15,6 +15,8 @@ Version 0.01
 
 our $VERSION = '0.01';
 
+use LaTeX::TikZ::Interface;
+
 use Any::Moose;
 
 with 'LaTeX::TikZ::Mod';
@@ -33,11 +35,13 @@ sub declare { }
 
 sub apply { 'color=' . $_[0]->color }
 
-use LaTeX::TikZ::Interface color => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ color => sub {
+  shift;
 
- __PACKAGE__->new(color => $_[0]);
-};
+  __PACKAGE__->new(color => $_[0]);
+ },
+);
 
 __PACKAGE__->meta->make_immutable;
 

diff --git a/lib/LaTeX/TikZ/Mod/Fill.pm b/lib/LaTeX/TikZ/Mod/Fill.pm
index f729dea4d0d488e748c269d9e7abfefa8a9e790a..daee6273b49dba248961f40b0892959fd78043ab 100644 (file)
--- a/lib/LaTeX/TikZ/Mod/Fill.pm
+++ b/lib/LaTeX/TikZ/Mod/Fill.pm
@@ -15,6 +15,8 @@ Version 0.01
 
 our $VERSION = '0.01';
 
+use LaTeX::TikZ::Interface;
+
 use Any::Moose;
 
 with 'LaTeX::TikZ::Mod';
@@ -33,11 +35,13 @@ sub declare { }
 
 sub apply { 'fill=' . $_[0]->color }
 
-use LaTeX::TikZ::Interface fill => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ fill => sub {
+  shift;
 
- __PACKAGE__->new(color => $_[0]);
-};
+  __PACKAGE__->new(color => $_[0]);
+ },
+);
 
 __PACKAGE__->meta->make_immutable;
 

diff --git a/lib/LaTeX/TikZ/Mod/Layer.pm b/lib/LaTeX/TikZ/Mod/Layer.pm
index bfab947ddfbaa4e291eeab1a198a47ed4a688e2a..0dd0a84a76dec2a4b0f06a9c470d9ca253a31de3 100644 (file)
--- a/lib/LaTeX/TikZ/Mod/Layer.pm
+++ b/lib/LaTeX/TikZ/Mod/Layer.pm
@@ -20,6 +20,8 @@ use List::Util   ();
 
 use LaTeX::TikZ::Mod::Formatted;
 
+use LaTeX::TikZ::Interface;
+
 use Any::Moose;
 use Any::Moose 'Util::TypeConstraints';
 
@@ -193,12 +195,14 @@ sub apply {
  )
 }
 
-use LaTeX::TikZ::Interface layer => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ layer => sub {
+  shift;
 
- my $name = shift;
- __PACKAGE__->new(name => $name, @_);
-};
+  my $name = shift;
+  __PACKAGE__->new(name => $name, @_);
+ },
+);
 
 __PACKAGE__->meta->make_immutable(
  inline_constructor => 0,

diff --git a/lib/LaTeX/TikZ/Mod/Pattern.pm b/lib/LaTeX/TikZ/Mod/Pattern.pm
index 426098224b321a1670d5adb08a7f18e2e3fbc725..ddae7e2b00f8b0b0ecc2f72526be2985927d7655 100644 (file)
--- a/lib/LaTeX/TikZ/Mod/Pattern.pm
+++ b/lib/LaTeX/TikZ/Mod/Pattern.pm
@@ -15,6 +15,8 @@ Version 0.01
 
 our $VERSION = '0.01';
 
+use LaTeX::TikZ::Interface;
+
 use Any::Moose;
 
 with 'LaTeX::TikZ::Mod';
@@ -75,20 +77,22 @@ sub declare {
 
 sub apply { 'fill', 'pattern=' . $_[0]->name($_[1]) }
 
-use LaTeX::TikZ::Interface pattern => sub {
- my $class = shift;
-
- my %args = @_;
- if (exists $args{class}) {
-  $class = delete $args{class};
-  $class = __PACKAGE__ . '::' . $class unless $class =~ /::/;
-  (my $pm = $class) =~ s{::}{/}g;
-  $pm .= '.pm';
-  require $pm;
- }
-
- $class->new(%args);
-};
+LaTeX::TikZ::Interface->register(
+ pattern => sub {
+  my $class = shift;
+
+  my %args = @_;
+  if (exists $args{class}) {
+   $class = delete $args{class};
+   $class = __PACKAGE__ . '::' . $class unless $class =~ /::/;
+   (my $pm = $class) =~ s{::}{/}g;
+   $pm .= '.pm';
+   require $pm;
+  }
+
+  $class->new(%args);
+ },
+);
 
 __PACKAGE__->meta->make_immutable;
 

diff --git a/lib/LaTeX/TikZ/Mod/Raw.pm b/lib/LaTeX/TikZ/Mod/Raw.pm
index 1d0572086adacf3e7f80c4f1588f099c339ba6a9..28b1d1dc69c420e41fc85efd81a506f686c648b8 100644 (file)
--- a/lib/LaTeX/TikZ/Mod/Raw.pm
+++ b/lib/LaTeX/TikZ/Mod/Raw.pm
@@ -15,6 +15,8 @@ Version 0.01
 
 our $VERSION = '0.01';
 
+use LaTeX::TikZ::Interface;
+
 use Any::Moose;
 
 with 'LaTeX::TikZ::Mod';
@@ -37,11 +39,13 @@ sub declare { }
 
 sub apply { $_[0]->content }
 
-use LaTeX::TikZ::Interface raw_mod => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ raw_mod => sub {
+  shift;
 
- __PACKAGE__->new(content => $_[0]);
-};
+  __PACKAGE__->new(content => $_[0]);
+ },
+);
 
 __PACKAGE__->meta->make_immutable;
 

diff --git a/lib/LaTeX/TikZ/Mod/Width.pm b/lib/LaTeX/TikZ/Mod/Width.pm
index 345b3575d41ef3ce4f69d2123b9aa9996e0fb200..41c5e076bfd69750fd9b508905e2d22772452291 100644 (file)
--- a/lib/LaTeX/TikZ/Mod/Width.pm
+++ b/lib/LaTeX/TikZ/Mod/Width.pm
@@ -15,6 +15,8 @@ Version 0.01
 
 our $VERSION = '0.01';
 
+use LaTeX::TikZ::Interface;
+
 use LaTeX::TikZ::Tools;
 
 use Any::Moose;
@@ -35,11 +37,13 @@ sub declare { }
 
 sub apply { sprintf 'line width=%0.1fpt', $_[1]->thickness($_[0]->width) }
 
-use LaTeX::TikZ::Interface width => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ width => sub {
+  shift;
 
- __PACKAGE__->new(width => $_[0]);
-};
+  __PACKAGE__->new(width => $_[0]);
+ },
+);
 
 __PACKAGE__->meta->make_immutable;
 

diff --git a/lib/LaTeX/TikZ/Set/Arc.pm b/lib/LaTeX/TikZ/Set/Arc.pm
index 3bbe83d83074b8d3fc8d7009b1f9da7a8b624927..9039cf02232b72144468a8352af48c7b619d12d0 100644 (file)
--- a/lib/LaTeX/TikZ/Set/Arc.pm
+++ b/lib/LaTeX/TikZ/Set/Arc.pm
@@ -24,55 +24,59 @@ use LaTeX::TikZ::Point;
 use LaTeX::TikZ::Set::Circle;
 use LaTeX::TikZ::Set::Polyline;
 
+use LaTeX::TikZ::Interface;
+
 use LaTeX::TikZ::Tools;
 
 use Any::Moose 'Util::TypeConstraints' => [ 'find_type_constraint' ];
 
 my $ltp_tc = find_type_constraint('LaTeX::TikZ::Point::Autocoerce');
 
-use LaTeX::TikZ::Interface arc => sub {
- shift;
- Carp::confess('Tikz->arc($first_point, $second_point, $center)') if @_ < 3;
- my ($a, $b, $c) = @_;
+LaTeX::TikZ::Interface->register(
+ arc => sub {
+  shift;
+  Carp::confess('Tikz->arc($first_point, $second_point, $center)') if @_ < 3;
+  my ($a, $b, $c) = @_;
 
- for ($a, $b, $c) {
-  my $p = $ltp_tc->coerce($_);
-  $ltp_tc->assert_valid($p);
-  $_ = Math::Complex->make($p->x, $p->y);
- }
+  for ($a, $b, $c) {
+   my $p = $ltp_tc->coerce($_);
+   $ltp_tc->assert_valid($p);
+   $_ = Math::Complex->make($p->x, $p->y);
+  }
 
- my $r = abs($a - $c);
- Carp::confess("The two first points aren't on a circle of center the last")
+  my $r = abs($a - $c);
+  Carp::confess("The two first points aren't on a circle of center the last")
                              unless LaTeX::TikZ::Tools::numeq(abs($b - $c), $r);
 
- my $set = LaTeX::TikZ::Set::Circle->new(
-  center => $c,
-  radius => $r,
- );
-
- my $factor = 1/32;
-
- my $theta  = (($b - $c) / ($a - $c))->arg;
- my $points = int(abs($theta) / abs(Math::Trig::acos(0.95)));
- $theta    /= $points + 1;
- my $rho    = (1 / cos($theta)) / (1 - $factor);
-
- my $ua = ($a - $c) * (1 - $factor) + $c;
- my $ub = ($b - $c) * (1 - $factor) + $c;
-
- my @outside = map { $_ * $rho + $c } (
-  $a - $c,
-  (map { ($a - $c) * Math::Complex->emake(1, $_ * $theta) } 1 .. $points),
-  $b - $c,
- );
-
- $set->clip(
-  LaTeX::TikZ::Set::Polyline->new(
-   points => [ $ua, @outside, $ub ],
-   closed => 1,
-  ),
- );
-};
+  my $set = LaTeX::TikZ::Set::Circle->new(
+   center => $c,
+   radius => $r,
+  );
+
+  my $factor = 1/32;
+
+  my $theta  = (($b - $c) / ($a - $c))->arg;
+  my $points = int(abs($theta) / abs(Math::Trig::acos(0.95)));
+  $theta    /= $points + 1;
+  my $rho    = (1 / cos($theta)) / (1 - $factor);
+
+  my $ua = ($a - $c) * (1 - $factor) + $c;
+  my $ub = ($b - $c) * (1 - $factor) + $c;
+
+  my @outside = map { $_ * $rho + $c } (
+   $a - $c,
+   (map { ($a - $c) * Math::Complex->emake(1, $_ * $theta) } 1 .. $points),
+   $b - $c,
+  );
+
+  $set->clip(
+   LaTeX::TikZ::Set::Polyline->new(
+    points => [ $ua, @outside, $ub ],
+    closed => 1,
+   ),
+  );
+ },
+);
 
 =head1 AUTHOR
 

diff --git a/lib/LaTeX/TikZ/Set/Arrow.pm b/lib/LaTeX/TikZ/Set/Arrow.pm
index cc10eab2bd35bb85aed5b513a402f758854d1f4c..415adff5655ad2edda05c3610c127dec6366da9b 100644 (file)
--- a/lib/LaTeX/TikZ/Set/Arrow.pm
+++ b/lib/LaTeX/TikZ/Set/Arrow.pm
@@ -21,33 +21,37 @@ use LaTeX::TikZ::Point;
 
 use LaTeX::TikZ::Set::Line;
 
+use LaTeX::TikZ::Interface;
+
 use Any::Moose 'Util::TypeConstraints' => [ 'find_type_constraint' ];
 
 my $ltp_tc = find_type_constraint('LaTeX::TikZ::Point::Autocoerce');
 
-use LaTeX::TikZ::Interface arrow => sub {
- shift;
-
- Carp::confess('Not enough arguments') unless @_ >= 2;
-
- my $from = $ltp_tc->coerce(shift);
-
- my $to;
- if ($_[0] eq 'dir') {
-  my $dir = $ltp_tc->coerce($_[1]);
-  $to = LaTeX::TikZ::Point->new(
-   x => $from->x + $dir->x,
-   y => $from->y + $dir->y,
-  );
- } else {
-  $to = $_[0];
- }
-
- LaTeX::TikZ::Set::Line->new(
-  from => $from,
-  to   => $to,
- )->mod('->');
-};
+LaTeX::TikZ::Interface->register(
+ arrow => sub {
+  shift;
+
+  Carp::confess('Not enough arguments') unless @_ >= 2;
+
+  my $from = $ltp_tc->coerce(shift);
+
+  my $to;
+  if ($_[0] eq 'dir') {
+   my $dir = $ltp_tc->coerce($_[1]);
+   $to = LaTeX::TikZ::Point->new(
+    x => $from->x + $dir->x,
+    y => $from->y + $dir->y,
+   );
+  } else {
+   $to = $_[0];
+  }
+
+  LaTeX::TikZ::Set::Line->new(
+   from => $from,
+   to   => $to,
+  )->mod('->');
+ },
+);
 
 =head1 AUTHOR
 

diff --git a/lib/LaTeX/TikZ/Set/Circle.pm b/lib/LaTeX/TikZ/Set/Circle.pm
index a4bc64cf7dc11472cf50ccdaa42134ab1b28510a..06a692aec4f8149a2ac3475b104083b406eb6889 100644 (file)
--- a/lib/LaTeX/TikZ/Set/Circle.pm
+++ b/lib/LaTeX/TikZ/Set/Circle.pm
@@ -17,6 +17,7 @@ our $VERSION = '0.01';
 
 use LaTeX::TikZ::Set::Point;
 
+use LaTeX::TikZ::Interface;
 use LaTeX::TikZ::Functor;
 
 use LaTeX::TikZ::Tools;
@@ -51,11 +52,13 @@ sub path {
  $set->center->path(@_) . ' circle (' . $tikz->len($set->radius) . ')';
 }
 
-use LaTeX::TikZ::Interface circle => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ circle => sub {
+  shift;
 
- __PACKAGE__->new(center => $_[0], radius => $_[1]);
-};
+  __PACKAGE__->new(center => $_[0], radius => $_[1]);
+ },
+);
 
 LaTeX::TikZ::Functor->default_rule(
  (__PACKAGE__) => sub {

diff --git a/lib/LaTeX/TikZ/Set/Line.pm b/lib/LaTeX/TikZ/Set/Line.pm
index 819ccb9972c5ed3d9483f326ce0a718a18819786..ffe5975c89a27be0db00f3ec03860b0903fb1829 100644 (file)
--- a/lib/LaTeX/TikZ/Set/Line.pm
+++ b/lib/LaTeX/TikZ/Set/Line.pm
@@ -17,6 +17,7 @@ our $VERSION = '0.01';
 
 use LaTeX::TikZ::Set::Point;
 
+use LaTeX::TikZ::Interface;
 use LaTeX::TikZ::Functor;
 
 use Any::Moose;
@@ -43,11 +44,13 @@ sub path {
  $set->from->path(@_) . ' -- ' . $set->to->path(@_);
 }
 
-use LaTeX::TikZ::Interface line => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ line => sub {
+  shift;
 
- __PACKAGE__->new(from => $_[0], to => $_[1]);
-};
+  __PACKAGE__->new(from => $_[0], to => $_[1]);
+ },
+);
 
 LaTeX::TikZ::Functor->default_rule(
  (__PACKAGE__) => sub {

diff --git a/lib/LaTeX/TikZ/Set/Path.pm b/lib/LaTeX/TikZ/Set/Path.pm
index 11ea1064e11b2b118c8a4f0caf989fc1db7a03b9..5a9e59c283432bd5b814cb52fc4b28fd15ba22a9 100644 (file)
--- a/lib/LaTeX/TikZ/Set/Path.pm
+++ b/lib/LaTeX/TikZ/Set/Path.pm
@@ -15,6 +15,7 @@ Version 0.01
 
 our $VERSION = '0.01';
 
+use LaTeX::TikZ::Interface;
 use LaTeX::TikZ::Functor;
 
 use Any::Moose;
@@ -57,11 +58,13 @@ sub path {
  join ' ', map $_->path(@_), $set->ops;
 }
 
-use LaTeX::TikZ::Interface path => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ path => sub {
+  shift;
 
- __PACKAGE__->new(ops => \@_);
-};
+  __PACKAGE__->new(ops => \@_);
+ },
+);
 
 LaTeX::TikZ::Functor->default_rule(
  (__PACKAGE__) => sub {

diff --git a/lib/LaTeX/TikZ/Set/Point.pm b/lib/LaTeX/TikZ/Set/Point.pm
index 3b43c99d455e4fd5b8bd07ac44e367fbe1be4e18..5bf292b10ca11bffccb4c1b26c90af74f803a5e2 100644 (file)
--- a/lib/LaTeX/TikZ/Set/Point.pm
+++ b/lib/LaTeX/TikZ/Set/Point.pm
@@ -17,6 +17,7 @@ our $VERSION = '0.01';
 
 use LaTeX::TikZ::Point;
 
+use LaTeX::TikZ::Interface;
 use LaTeX::TikZ::Functor;
 
 use Any::Moose;
@@ -48,14 +49,16 @@ sub path {
  '(' . $tikz->len($p->x) . ',' . $tikz->len($p->y) . ')';
 }
 
-use LaTeX::TikZ::Interface point => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ point => sub {
+  shift;
 
- my $point = @_ == 0 ? 0
-                     : @_ == 1 ? $_[0]
-                               : \@_;
- __PACKAGE__->new(point => $point);
-};
+  my $point = @_ == 0 ? 0
+                      : @_ == 1 ? $_[0]
+                                : \@_;
+  __PACKAGE__->new(point => $point);
+ },
+);
 
 LaTeX::TikZ::Functor->default_rule(
  (__PACKAGE__) => sub {

diff --git a/lib/LaTeX/TikZ/Set/Polyline.pm b/lib/LaTeX/TikZ/Set/Polyline.pm
index 76656afc88c4c89ac4e0234f458b63b49f2f86b6..705cac313083fdb4e13a9a86fb2e4a7230910204 100644 (file)
--- a/lib/LaTeX/TikZ/Set/Polyline.pm
+++ b/lib/LaTeX/TikZ/Set/Polyline.pm
@@ -17,6 +17,7 @@ our $VERSION = '0.01';
 
 use LaTeX::TikZ::Set::Point;
 
+use LaTeX::TikZ::Interface;
 use LaTeX::TikZ::Functor;
 
 use Any::Moose;
@@ -56,17 +57,18 @@ sub path {
               ($set->closed ? 'cycle' : ());
 }
 
-use LaTeX::TikZ::Interface polyline => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ polyline => sub {
+  shift;
 
- __PACKAGE__->new(points => \@_);
-};
+  __PACKAGE__->new(points => \@_);
+ },
+ closed_polyline => sub {
+  shift;
 
-use LaTeX::TikZ::Interface closed_polyline => sub {
- shift;
-
- __PACKAGE__->new(points => \@_, closed => 1);
-};
+  __PACKAGE__->new(points => \@_, closed => 1);
+ },
+);
 
 LaTeX::TikZ::Functor->default_rule(
  (__PACKAGE__) => sub {

diff --git a/lib/LaTeX/TikZ/Set/Raw.pm b/lib/LaTeX/TikZ/Set/Raw.pm
index d96fc3b4eeb0bef5807d01aedf6b6f04fcedd873..46d8da165906ce1c86840677c679941537e3587b 100644 (file)
--- a/lib/LaTeX/TikZ/Set/Raw.pm
+++ b/lib/LaTeX/TikZ/Set/Raw.pm
@@ -15,6 +15,7 @@ Version 0.01
 
 our $VERSION = '0.01';
 
+use LaTeX::TikZ::Interface;
 use LaTeX::TikZ::Functor;
 
 use Any::Moose;
@@ -29,11 +30,13 @@ has 'content' => (
 
 sub path { $_[0]->content }
 
-use LaTeX::TikZ::Interface raw => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ raw => sub {
+  shift;
 
- __PACKAGE__->new(content => join ' ', @_);
-};
+  __PACKAGE__->new(content => join ' ', @_);
+ },
+);
 
 LaTeX::TikZ::Functor->default_rule(
  (__PACKAGE__) => sub {

diff --git a/lib/LaTeX/TikZ/Set/Rectangle.pm b/lib/LaTeX/TikZ/Set/Rectangle.pm
index f70595d6d075670edb7b2fbc59c6c4dd78c7ddb2..79dda06e264f662f83eb6c26bf916f300c250cac 100644 (file)
--- a/lib/LaTeX/TikZ/Set/Rectangle.pm
+++ b/lib/LaTeX/TikZ/Set/Rectangle.pm
@@ -17,6 +17,7 @@ our $VERSION = '0.01';
 
 use LaTeX::TikZ::Set::Point;
 
+use LaTeX::TikZ::Interface;
 use LaTeX::TikZ::Functor;
 
 use Any::Moose;
@@ -87,17 +88,19 @@ Attributes 'width' and 'height' are required when 'to' was not given
  $class->$orig(@_);
 };
 
-use LaTeX::TikZ::Interface rectangle => sub {
- shift;
- my ($p, $q) = @_;
+LaTeX::TikZ::Interface->register(
+ rectangle => sub {
+  shift;
+  my ($p, $q) = @_;
 
- my $is_relative = !blessed($q) && ref($q) eq 'HASH';
+  my $is_relative = !blessed($q) && ref($q) eq 'HASH';
 
- __PACKAGE__->new(
-  from => $p,
-  ($is_relative ? (map +($_ => $q->{$_}), qw/width height/) : (to => $q)),
- );
-};
+  __PACKAGE__->new(
+   from => $p,
+   ($is_relative ? (map +($_ => $q->{$_}), qw/width height/) : (to => $q)),
+  );
+ },
+);
 
 LaTeX::TikZ::Functor->default_rule(
  (__PACKAGE__) => sub {

diff --git a/lib/LaTeX/TikZ/Set/Sequence.pm b/lib/LaTeX/TikZ/Set/Sequence.pm
index a92ad89d7dd93e267870cefa4a046047575688c9..0bf9222d28e1e0f38a30b45959aeb0ee219e6b68 100644 (file)
--- a/lib/LaTeX/TikZ/Set/Sequence.pm
+++ b/lib/LaTeX/TikZ/Set/Sequence.pm
@@ -19,6 +19,7 @@ use List::Util ();
 
 use LaTeX::TikZ::Scope;
 
+use LaTeX::TikZ::Interface;
 use LaTeX::TikZ::Functor;
 
 use Any::Moose;
@@ -66,11 +67,13 @@ sub draw {
    $set->kids;
 }
 
-use LaTeX::TikZ::Interface seq => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ seq => sub {
+  shift;
 
- __PACKAGE__->new(kids => \@_);
-};
+  __PACKAGE__->new(kids => \@_);
+ },
+);
 
 LaTeX::TikZ::Functor->default_rule(
  (__PACKAGE__) => sub {

diff --git a/t/01-api.t b/t/01-api.t
index 3eea9d9b1123f2bbed752381bb9a621fbd2b3b65..9f00401b3c6283a0727d879a317ac8a92b0d7341 100644 (file)
--- a/t/01-api.t
+++ b/t/01-api.t
@@ -46,7 +46,7 @@ require LaTeX::TikZ::Interface;
 
 for my $name (undef, ':)') {
  eval {
-  LaTeX::TikZ::Interface->import(
+  LaTeX::TikZ::Interface->register(
    $name => sub { },
   );
  };
@@ -54,7 +54,7 @@ for my $name (undef, ':)') {
 }
 
 eval {
- LaTeX::TikZ::Interface->import(
+ LaTeX::TikZ::Interface->register(
   'raw' => sub { },
  );
 };
@@ -62,7 +62,7 @@ like $@, qr/^'raw' is already defined/, 'already defined';
 
 for my $code (undef, [ ]) {
  eval {
-  LaTeX::TikZ::Interface->import(
+  LaTeX::TikZ::Interface->register(
    'foo' => $code,
   );
  };
@@ -70,7 +70,7 @@ for my $code (undef, [ ]) {
 }
 
 eval {
- LaTeX::TikZ::Interface->import(
+ LaTeX::TikZ::Interface->register(
   'foo' => sub { @_ },
  );
 };
@@ -79,7 +79,7 @@ ok(Tikz->can('foo'), 'Tikz evaluates to something that ->can(foo)');
 is_deeply [ Tikz->foo('hello') ], [ Tikz, 'hello' ], 'Tikz->foo works';
 
 eval {
- LaTeX::TikZ::Interface->import(
+ LaTeX::TikZ::Interface->register(
   'bar' => sub { @_ },
   'baz' => undef,
  );