--- a/Resources/CMake/PlustacheConfiguration.cmake	Wed May 28 16:21:48 2014 +0200
+++ b/Resources/CMake/PlustacheConfiguration.cmake	Wed May 28 17:54:59 2014 +0200
@@ -13,4 +13,9 @@
   ${PLUSTACHE_SOURCES_DIR}
   )
 
+execute_process(
+  COMMAND patch -p0 -i ${CMAKE_SOURCE_DIR}/Resources/CMake/PlustacheConfiguration.patch
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+  )
+
 source_group(ThirdParty\\Plustache REGULAR_EXPRESSION ${PLUSTACHE_SOURCES_DIR}/.*)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/CMake/PlustacheConfiguration.patch	Wed May 28 17:54:59 2014 +0200
@@ -0,0 +1,42 @@
+diff -r -u plustache-0.3.0.orig/include/template.hpp plustache-0.3.0/include/template.hpp
+--- plustache-0.3.0.orig/include/template.hpp	2014-01-29 13:26:52.000000000 +0100
++++ plustache-0.3.0/include/template.hpp	2014-05-28 17:51:51.623305914 +0200
+@@ -21,7 +21,7 @@
+     public:
+         template_t ();
+         template_t (std::string& tmpl_path);
+-        ~template_t ();
++        virtual ~template_t ();
+         std::string render(const std::string& tmplate, const Context& ctx);
+         std::string render(const std::string& tmplate, const ObjectType& ctx);
+ 
+@@ -42,11 +42,13 @@
+         std::string render_sections(const std::string& tmplate,
+                                     const Context& ctx);
+         std::string html_escape(const std::string& s);
+-        std::string get_partial(const std::string& partial) const;
+         void change_delimiter(const std::string& opentag,
+                               const std::string& closetag);
+         void compile_data();
+-        std::string get_template(const std::string& tmpl);
++
++    protected:
++        virtual std::string get_partial(const std::string& partial) const;
++        virtual std::string get_template(const std::string& tmpl);
+     };
+ } // namespace Plustache
+ #endif
+Only in plustache-0.3.0/include: template.hpp~
+diff -r -u plustache-0.3.0.orig/src/template.cpp plustache-0.3.0/src/template.cpp
+--- plustache-0.3.0.orig/src/template.cpp	2014-01-29 13:26:52.000000000 +0100
++++ plustache-0.3.0/src/template.cpp	2014-05-28 17:51:32.599306393 +0200
+@@ -126,7 +126,7 @@
+         // found a partial
+         else if (modifier == ">")
+         {
+-            std::string partial = template_t::get_partial(key);
++            std::string partial = get_partial(key);
+             repl.assign(template_t::render(partial, ctx));
+         }
+         // normal tag
+Only in plustache-0.3.0/src: template.cpp~

--- a/UnitTestsSources/Plustache.cpp	Wed May 28 16:21:48 2014 +0200
+++ b/UnitTestsSources/Plustache.cpp	Wed May 28 17:54:59 2014 +0200
@@ -2,12 +2,85 @@
 
 #include <include/template.hpp>
 
-TEST(Plustache, Basic)
+
+class OrthancPlustache : public Plustache::template_t
 {
-  std::map<std::string, std::string> ctx;
+public:
+protected:
+  virtual std::string get_template(const std::string& tmpl)
+  {
+    //printf("OK [%s]\n", tmpl.c_str());
+    return Plustache::template_t::get_template(tmpl);
+  }
+
+  virtual std::string get_partial(const std::string& partial) const
+  {
+    //printf("OK2 [%s]\n", partial.c_str());
+    //return Plustache::template_t::get_partial(partial);
+    return "<li>{{name}}</li>";
+  }
+};
+
+
+TEST(Plustache, Basic1)
+{
+  PlustacheTypes::ObjectType ctx;
   ctx["title"] = "About";
 
-  Plustache::template_t t;
+  OrthancPlustache t;
+  ASSERT_EQ("<h1>About</h1>", t.render("<h1>{{title}}</h1>", ctx));
+}
+
+
+TEST(Plustache, Basic2)
+{
+  Plustache::Context ctx;
+  ctx.add("title", "About");
+
+  OrthancPlustache t;
   ASSERT_EQ("<h1>About</h1>", t.render("<h1>{{title}}</h1>", ctx));
 }
 
+
+TEST(Plustache, Context)
+{
+  PlustacheTypes::ObjectType a;
+  a["name"] = "Orthanc";
+
+  PlustacheTypes::ObjectType b;
+  b["name"] = "Jodogne";
+
+  PlustacheTypes::CollectionType c;
+  c.push_back(a);
+  c.push_back(b);
+
+  Plustache::Context ctx;
+  ctx.add("items", c);
+
+  OrthancPlustache t;
+  ASSERT_EQ("<ul><li>Orthanc</li><li>Jodogne</li></ul>",
+            t.render("<ul>{{#items}}<li>{{name}}</li>{{/items}}</ul>", ctx));
+}
+
+
+TEST(Plustache, Partials)
+{
+  PlustacheTypes::ObjectType a;
+  a["name"] = "Orthanc";
+
+  PlustacheTypes::ObjectType b;
+  b["name"] = "Jodogne";
+
+  PlustacheTypes::CollectionType c;
+  c.push_back(a);
+  c.push_back(b);
+
+  Plustache::Context ctx;
+  ctx.add("items", c);
+
+  OrthancPlustache t;
+  ASSERT_EQ("<ul><li>Orthanc</li><li>Jodogne</li></ul>",
+            t.render("<ul>{{#items}}{{>partial}}{{/items}}</ul>", ctx));
+}
+
+