X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FLaTeX%2FTikZ%2FFormatter.pm;h=718c3eb8788f39c8c89dc0f063987393561e50bf;hb=e9f5b8b4bfbd4f60f4041a954fa35a802b5e8d80;hp=64266072622b8dac002b407a7c57fa534e13e358;hpb=93bfe14caec156fc11587863a486220b986b6b2e;p=perl%2Fmodules%2FLaTeX-TikZ.git

diff --git a/lib/LaTeX/TikZ/Formatter.pm b/lib/LaTeX/TikZ/Formatter.pm
index 6426607..718c3eb 100644
--- a/lib/LaTeX/TikZ/Formatter.pm
+++ b/lib/LaTeX/TikZ/Formatter.pm
@@ -17,6 +17,10 @@ our $VERSION = '0.01';
 
 use Sub::Name ();
 
+use LaTeX::TikZ::Point;
+
+use LaTeX::TikZ::Interface;
+
 use LaTeX::TikZ::Tools;
 
 use Any::Moose;
@@ -35,53 +39,83 @@ has 'format' => (
 );
 
 has 'scale' => (
- is      => 'ro',
+ is      => 'rw',
  isa     => 'Num',
  default => 1,
 );
 
 has 'width' => (
- is  => 'ro',
+ is  => 'rw',
  isa => 'Maybe[Num]',
 );
 
 has 'height' => (
- is  => 'ro',
+ is  => 'rw',
  isa => 'Maybe[Num]',
 );
 
 has 'origin' => (
- is   => 'ro',
- does => 'Maybe[LaTeX::TikZ::Point]',
+ is     => 'rw',
+ isa    => '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) = @_;
+ my $origin = $tikz->origin;
+ if (defined $origin) {
+  my ($x, $y) = map $origin->$_, qw/x y/;
+  $origin = "($x;$y)";
+ } else {
+  $origin = "(0;0)";
+ }
+
+ join $;, map {
+  defined() ? "$_" : '(undef)';
+ } map($tikz->$_, 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) = @_;
 
-  if ($set->isa('LaTeX::TikZ::Set::Mod')) {
    for ($set->mods) {
+    my $tag = $_->tag;
+    next if $seen{$tag}++;
+
     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_rec->($_, $layers, $others) for @subsets;
+  });
+ };
 
-  $find_mods->($_, $layers, $others) for @subsets;
- })
+ Sub::Name::subname('find_mods' => sub {
+  local %seen = ();
+
+  $find_mods_rec->(@_);
+ });
 };
 
+my $translate;
+
 sub render {
  my $tikz = shift;
 
@@ -89,17 +123,42 @@ sub render {
   kids => \@_,
  );
 
+ unless ($translate) {
+  require LaTeX::TikZ::Functor;
+  $translate = LaTeX::TikZ::Functor->new(
+   rules => [
+    'LaTeX::TikZ::Set::Point' => sub {
+     my ($functor, $set, $v) = @_;
+
+     $set->new(
+      point => [
+       $set->x + $v->x,
+       $set->y + $v->y,
+      ],
+      label => $set->label,
+      pos   => $set->pos,
+     );
+    },
+   ],
+  );
+ }
+
+ my $origin = $tikz->origin;
+ $seq = $seq->$translate($origin) if defined $origin;
+
  my (@layers, @other_mods);
  $find_mods->($seq, \@layers, \@other_mods);
 
- my $o = $tikz->origin;
- $seq  = $seq->translate($o) if defined $o;
-
  my $w = $tikz->width;
  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}";
  }
@@ -111,16 +170,12 @@ sub render {
  );
 
  my @decls;
- if (@layers) {
-  push @decls, LaTeX::TikZ::Mod::Layer->declare(@layers);
- }
- for (@other_mods) {
-  push @decls, $_->declare($tikz);
- }
+ push @decls, LaTeX::TikZ::Mod::Layer->declare(@layers) if  @layers;
+ push @decls, $_->declare($tikz)                        for @other_mods;
 
  my @content = (
   "\\begin{tikzpicture}",
-  $seq->draw($tikz)->instantiate,
+  @{ $seq->draw($tikz) },
   "\\end{tikzpicture}",
  );
 
@@ -150,7 +205,7 @@ sub label {
 
  my $scale = sprintf '%0.2f', $tikz->scale / 5;
 
- "node[scale=$scale,$pos] {\$$name\$}";
+ "node[scale=$scale,$pos] {$name}";
 }
 
 sub thickness {
@@ -160,6 +215,14 @@ sub thickness {
  0.8 * $width * ($tikz->scale / 5);
 }
 
+LaTeX::TikZ::Interface->register(
+ formatter => sub {
+  shift;
+
+  __PACKAGE__->new(@_);
+ },
+);
+
 __PACKAGE__->meta->make_immutable;
 
 =head1 AUTHOR