--- a/configure.ac Sun Mar 02 00:57:58 2008 -0600
+++ b/configure.ac Mon Mar 17 01:21:26 2008 -0500
@@ -3,7 +3,7 @@
dnl ################################################################
dnl # Initialize autoconf
dnl ################################################################
-AC_INIT(gplate, 0.0.1mtn, guifications-devel@lists.guifications.org)
+AC_INIT(gplate, 0.0.2mtn, guifications-devel@lists.guifications.org) AC_CONFIG_SRCDIR(config.h.in)
--- a/gplate/gplate-template.c Sun Mar 02 00:57:58 2008 -0600
+++ b/gplate/gplate-template.c Mon Mar 17 01:21:26 2008 -0500
@@ -895,27 +895,43 @@
GType tag, GError **error)
GPlateFunction *function = NULL;
- gchar *name = NULL, *leftovers = NULL, *ret = NULL;
+ GType deftag = G_TYPE_INVALID; gboolean deffunc = FALSE;
+ deftag = gplate_library_get_default_tag(); - name = gplate_util_get_first_word(contents, &leftovers);
+ GType f = gplate_library_get_default_function_for_tag(tag, NULL);
- gplate_template_render_find_function(name, tag, &deffunc, error);
+ function = g_object_new(f, NULL);
- ret = gplate_function_evaluate(function, tplate, contents);
- ret = gplate_function_evaluate(function, tplate, leftovers);
+ ret = gplate_function_evaluate(function, tplate, contents); + gchar *name = NULL, *leftovers = NULL; + name = gplate_util_get_first_word(contents, &leftovers); + gplate_template_render_find_function(name, tag, &deffunc, error); - g_object_unref(G_OBJECT(function));
+ ret = gplate_function_evaluate(function, tplate, contents); + ret = gplate_function_evaluate(function, tplate, leftovers);
+ g_object_unref(G_OBJECT(function)); return (ret) ? ret : g_strdup("");
--- a/tests/Makefile.am Sun Mar 02 00:57:58 2008 -0600
+++ b/tests/Makefile.am Mon Mar 17 01:21:26 2008 -0500
@@ -7,6 +7,7 @@
--- a/tests/test-syntax.c Sun Mar 02 00:57:58 2008 -0600
+++ b/tests/test-syntax.c Mon Mar 17 01:21:26 2008 -0500
@@ -96,6 +96,16 @@
OUTPUT_TEST(tplate, "abc \"{{ quoted }}\" xyz", "abc \"in quotes\" xyz");
+START_TEST(test_syntax_var_in_anchor_tag) + GPlateTemplate *tplate = gplate_template_new(); + gplate_collection_add_string(tplate, "href", "http://guifications.org"); + "<a href=\"{{ href }}\">{{ href }}</a>", + "<a href=\"http://guifications.org\">http://guifications.org</a>"); START_TEST(test_syntax_two_vars_one_block)
GPlateTemplate *tplate = gplate_template_new();
@@ -182,6 +192,7 @@
tcase_add_test(tc, test_variable_newline_wrapped);
tcase_add_test(tc, test_syntax_var_in_single_quotes);
tcase_add_test(tc, test_syntax_var_in_double_quotes);
+ tcase_add_test(tc, test_syntax_var_in_anchor_tag); tcase_add_test(tc, test_syntax_two_vars_one_block);
tcase_add_test(tc, test_syntax_one_var_nested);
tcase_add_test(tc, test_syntax_one_var_double_nested);