diff options
Diffstat (limited to 'lib/Spreadsheet/Template/Helpers/Xslate.pm')
-rw-r--r-- | lib/Spreadsheet/Template/Helpers/Xslate.pm | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lib/Spreadsheet/Template/Helpers/Xslate.pm b/lib/Spreadsheet/Template/Helpers/Xslate.pm index d4238e9..bf9b435 100644 --- a/lib/Spreadsheet/Template/Helpers/Xslate.pm +++ b/lib/Spreadsheet/Template/Helpers/Xslate.pm @@ -32,13 +32,21 @@ sub format { } sub merge { - my ($package, $range, $contents, $format) = @_; - - return $JSON->encode({ - range => "$range", - contents => "$contents", - format => _formats($package, $format) - }); + my ($package, $contents, $format, $type, $range, %args) = @_; + + return $JSON->encode( + { + contents => "$contents", + format => _formats( $package, $format ), + type => $type, + range => "$range", + ( + defined $args{formula} + ? ( formula => $args{formula} ) + : () + ), + } + ); } sub c { |