From c41829e1b87eb19d80776d422938f7fff25f3c76 Mon Sep 17 00:00:00 2001
From: Jason <jason@socialflow.com>
Date: Tue, 27 Aug 2013 14:01:50 +0000
Subject: documentation for merge helper function and added a test
 demonstrating functionality

---
 lib/Spreadsheet/Template/Helpers/Xslate.pm   | 1 +
 lib/Spreadsheet/Template/Processor/Xslate.pm | 7 +++++++
 2 files changed, 8 insertions(+)

(limited to 'lib')

diff --git a/lib/Spreadsheet/Template/Helpers/Xslate.pm b/lib/Spreadsheet/Template/Helpers/Xslate.pm
index df99a85..d4238e9 100644
--- a/lib/Spreadsheet/Template/Helpers/Xslate.pm
+++ b/lib/Spreadsheet/Template/Helpers/Xslate.pm
@@ -76,6 +76,7 @@ sub _curry_package {
 
  format
  c
+ merge
  true
  false
 
diff --git a/lib/Spreadsheet/Template/Processor/Xslate.pm b/lib/Spreadsheet/Template/Processor/Xslate.pm
index f0a7cf9..1454e30 100644
--- a/lib/Spreadsheet/Template/Processor/Xslate.pm
+++ b/lib/Spreadsheet/Template/Processor/Xslate.pm
@@ -39,6 +39,13 @@ C<"date_time">, and C<%args> contains any other parameters (such as C<formula>,
 for instance) to declare for the cell. C<$type> is optional, and if not passed,
 defaults to C<"string">.
 
+=item merge($range, $content, $format)
+
+Returns representation of a range of cells to be merged. C<$range> is the
+Excel representation of a range of cells, ex: "A1:B10". C<$content> is the
+content to be placed in the merged cell. C<$format> is the name of a format
+declared with the C<format> helper or a hashref of format options.
+
 =item true
 
 Returns C<JSON::true>.
-- 
cgit v1.2.3-54-g00ecf