[gnumeric] AutoFormat: use SaX parser.
- From: Morten Welinder <mortenw src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnumeric] AutoFormat: use SaX parser.
- Date: Thu, 24 Sep 2009 14:29:08 +0000 (UTC)
commit de81d01aa57312b057302c01aee5c7d13fee07cd
Author: Morten Welinder <terra gnome org>
Date: Thu Sep 24 10:28:52 2009 -0400
AutoFormat: use SaX parser.
ChangeLog | 9 +
NEWS | 1 +
src/Makefile.am | 2 -
src/format-template.c | 311 ++++++++++++--------
src/libgnumeric.c | 2 -
src/xml-sax-read.c | 127 +++++++--
src/xml-sax.h | 10 +-
templates/autoformat/autoformat.3D.button.xml.in | 200 +++++++-------
templates/autoformat/autoformat.3D.list.xml.in | 156 +++++-----
.../autoformat/autoformat.Classical.cool.xml.in | 200 +++++++-------
.../autoformat/autoformat.Classical.simple.xml.in | 134 +++++-----
.../autoformat/autoformat.Classical.trendy.xml.in | 112 ++++----
.../autoformat/autoformat.Colourful.banana.xml.in | 68 +++---
.../autoformat/autoformat.Colourful.black.xml.in | 134 +++++-----
.../autoformat/autoformat.Colourful.blue.xml.in | 200 +++++++-------
.../autoformat/autoformat.Colourful.orange.xml.in | 68 +++---
.../autoformat/autoformat.Colourful.vanilla.xml.in | 156 +++++-----
.../autoformat/autoformat.Financial.basic.xml.in | 68 +++---
.../autoformat/autoformat.Financial.desert.xml.in | 134 +++++-----
.../autoformat/autoformat.Financial.ice.xml.in | 156 +++++-----
.../autoformat/autoformat.Financial.modern.xml.in | 134 +++++-----
.../autoformat/autoformat.Financial.purple.xml.in | 90 +++---
.../autoformat/autoformat.General.advanced.xml.in | 178 ++++++------
.../autoformat/autoformat.General.basic.xml.in | 68 +++---
.../autoformat/autoformat.General.empty.xml.in | 2 +-
.../autoformat/autoformat.General.table.xml.in | 24 +-
templates/autoformat/autoformat.List.basic.xml.in | 244 ++++++++--------
templates/autoformat/autoformat.List.green.xml.in | 90 +++---
templates/autoformat/autoformat.List.lila.xml.in | 68 +++---
templates/autoformat/autoformat.List.simple.xml.in | 112 ++++----
30 files changed, 1702 insertions(+), 1556 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 35a2ca7..402b5a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-24 Morten Welinder <terra gnome org>
+
+ * src/xml-sax-read.c (gnm_xml_prep_style_parser): New function.
+
+ * src/format-template.c (format_template_new_from_file): New
+ implementation using SaX parser.
+
+ * src/Makefile.am: Drop xml-io.[ch]
+
2009-09-24 Jean Brefort <jean brefort normalesup org>
* src/gnm-pane.c (set_acetate_coords): set the acetate item really
diff --git a/NEWS b/NEWS
index 5621afe..dbc84fd 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Jean:
Morten:
* Fix inter-process pasting of merged regions.
* Make inter-process pasting use the sax parser.
+ * Make auto-format templates use the sax parser.
--------------------------------------------------------------------------
Gnumeric 1.9.13
diff --git a/src/Makefile.am b/src/Makefile.am
index 3543f3c..bceef5d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -183,7 +183,6 @@ libspreadsheet_la_SOURCES = \
wbc-gtk.c \
wbc-gtk-actions.c \
wbc-gtk-edit.c \
- xml-io.c \
xml-sax-read.c \
xml-sax-write.c \
gnumeric-gconf.c \
@@ -314,7 +313,6 @@ libspreadsheet_include_HEADERS = \
workbook-control-priv.h \
wbc-gtk.h \
wbc-gtk-impl.h \
- xml-io.h \
xml-io-version.h \
xml-sax.h \
gnumeric-gconf.h \
diff --git a/src/format-template.c b/src/format-template.c
index 5d19753..01ffbbc 100644
--- a/src/format-template.c
+++ b/src/format-template.c
@@ -31,10 +31,11 @@
#include "style-border.h"
#include "command-context.h"
#include "ranges.h"
-#include "xml-io.h"
+#include "xml-sax.h"
#include <goffice/goffice.h>
#include <string.h>
#include <libxml/parser.h>
+#include <gsf/gsf-input-stdio.h>
#define CC2XML(s) ((xmlChar const *)(s))
#define CXML2C(s) ((char const *)(s))
@@ -245,7 +246,7 @@ format_template_new (void)
ft = g_new0 (GnmFormatTemplate, 1);
- ft->filename = g_strdup ("");
+ ft->filename = NULL;
ft->author = g_strdup (go_get_real_name ());
ft->name = g_strdup (N_("Name"));
ft->description = g_strdup ("");
@@ -332,12 +333,7 @@ format_template_clone (GnmFormatTemplate const *ft)
clone->font = ft->font;
clone->patterns = ft->patterns;
clone->alignment = ft->alignment;
-
- clone->edges.left = ft->edges.left;
- clone->edges.right = ft->edges.right;
- clone->edges.top = ft->edges.top;
- clone->edges.bottom = ft->edges.bottom;
-
+ clone->edges = ft->edges;
clone->dimension = ft->dimension;
clone->invalidate_hash = TRUE;
@@ -345,107 +341,167 @@ format_template_clone (GnmFormatTemplate const *ft)
return clone;
}
+#define GNM 100
+#define GMR 200
+
+static GsfXMLInNS const template_ns[] = {
+ GSF_XML_IN_NS (GMR, "http://www.gnome.org/gnumeric/format-template/v1";),
+ GSF_XML_IN_NS (GNM, "http://www.gnumeric.org/v10.dtd";),
+ GSF_XML_IN_NS_END
+};
+
static void
-xml_read_format_col_row_info (FormatColRowInfo *info, xmlNodePtr parent)
+sax_information (GsfXMLIn *xin, xmlChar const **attrs)
{
- xmlNode *child;
- int found = 0;
+ GnmFormatTemplate *ft = (GnmFormatTemplate *)xin->user_state;
+
+ for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2) {
+ if (attr_eq (attrs[0], "author"))
+ format_template_set_author (ft, CXML2C (attrs[1]));
+ else if (attr_eq (attrs[0], "name"))
+ format_template_set_name (ft, CXML2C (attrs[1]));
+ else if (attr_eq (attrs[0], "description"))
+ format_template_set_description (ft, CXML2C (attrs[1]));
+ }
+}
- for (child = parent->xmlChildrenNode; child != NULL ; child = child->next) {
- if (xmlIsBlankNode (child) || child->name == NULL)
- continue;
- if (attr_eq (child->name, "Placement")) {
- g_return_if_fail (!(found & 1));
- go_xml_node_get_int (child, "offset", &info->offset);
- go_xml_node_get_int (child, "offset_gravity", &info->offset_gravity);
- found |= 1;
- } else if (attr_eq (child->name, "Dimensions")) {
- g_return_if_fail (!(found & 2));
- go_xml_node_get_int (child, "size", &info->size);
- found |= 2;
- }
+static void
+sax_members_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
+{
+ GnmFormatTemplate *ft = (GnmFormatTemplate *)xin->user_state;
+ ft->members = g_slist_reverse (ft->members);
+}
+
+static void
+sax_member (GsfXMLIn *xin, xmlChar const **attrs)
+{
+ GnmFormatTemplate *ft = (GnmFormatTemplate *)xin->user_state;
+ TemplateMember *member = format_template_member_new ();
+
+ /* Order reversed in sax_members_end. */
+ ft->members = g_slist_prepend (ft->members, member);
+}
+
+static void
+sax_placement (FormatColRowInfo *info, xmlChar const **attrs)
+{
+ for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2) {
+ if (gnm_xml_attr_int (attrs, "offset", &info->offset) ||
+ gnm_xml_attr_int (attrs, "offset_gravity", &info->offset_gravity))
+ ; /* Nothing */
}
- g_return_if_fail (found == 3);
}
-static gboolean
-xml_read_format_template_member (XmlParseContext *ctxt, GnmFormatTemplate *ft, xmlNodePtr tree)
+static void
+sax_row_placement (GsfXMLIn *xin, xmlChar const **attrs)
{
- xmlNodePtr child;
- TemplateMember *member;
- int tmp, found = 0;
+ GnmFormatTemplate *ft = (GnmFormatTemplate *)xin->user_state;
+ TemplateMember *member = ft->members->data;
+ sax_placement (&member->row, attrs);
+}
- g_return_val_if_fail (attr_eq (tree->name, "Member"), FALSE);
- member = format_template_member_new ();
+static void
+sax_col_placement (GsfXMLIn *xin, xmlChar const **attrs)
+{
+ GnmFormatTemplate *ft = (GnmFormatTemplate *)xin->user_state;
+ TemplateMember *member = ft->members->data;
+ sax_placement (&member->col, attrs);
+}
- for (child = tree->xmlChildrenNode; child != NULL ; child = child->next) {
- if (xmlIsBlankNode (child) || child->name == NULL)
- continue;
- if (attr_eq (child->name, "Col"))
- xml_read_format_col_row_info (&member->col, child);
- else if (attr_eq (child->name, "Row"))
- xml_read_format_col_row_info (&member->row, child);
- else if (attr_eq (child->name, "Frequency")) {
- if (found & 1) { g_warning ("Multiple Frequency specs"); }
- if (go_xml_node_get_int (child, "direction", &tmp))
- format_template_member_set_direction (member, tmp);
- if (go_xml_node_get_int (child, "repeat", &tmp))
- format_template_member_set_repeat (member, tmp);
- if (go_xml_node_get_int (child, "skip", &tmp))
- format_template_member_set_skip (member, tmp);
- if (go_xml_node_get_int (child, "edge", &tmp))
- format_template_member_set_edge (member, tmp);
- found |= 1;
- } else if (attr_eq (child->name, "Style")) {
- if (found & 2) { g_warning ("Multiple Styles"); }
- member->mstyle = xml_read_style (ctxt, child, FALSE);
- found |= 2;
- }
+static void
+sax_dimensions (FormatColRowInfo *info, xmlChar const **attrs)
+{
+ for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2) {
+ if (gnm_xml_attr_int (attrs, "size", &info->size))
+ ; /* Nothing */
}
- if (found != 3) {
- g_warning ("Invalid Member, missing %s", (found & 1) ? "Style" : "Frequency");
- format_template_member_free (member);
- return FALSE;
+}
+
+static void
+sax_row_dimensions (GsfXMLIn *xin, xmlChar const **attrs)
+{
+ GnmFormatTemplate *ft = (GnmFormatTemplate *)xin->user_state;
+ TemplateMember *member = ft->members->data;
+ sax_dimensions (&member->row, attrs);
+}
+
+static void
+sax_col_dimensions (GsfXMLIn *xin, xmlChar const **attrs)
+{
+ GnmFormatTemplate *ft = (GnmFormatTemplate *)xin->user_state;
+ TemplateMember *member = ft->members->data;
+ sax_dimensions (&member->col, attrs);
+}
+
+static void
+sax_frequency (GsfXMLIn *xin, xmlChar const **attrs)
+{
+ GnmFormatTemplate *ft = (GnmFormatTemplate *)xin->user_state;
+ TemplateMember *member = ft->members->data;
+
+ for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2) {
+ int i;
+
+ if (gnm_xml_attr_int (attrs, "direction", &i))
+ format_template_member_set_direction (member, i);
+ else if (gnm_xml_attr_int (attrs, "repeat", &i))
+ format_template_member_set_repeat (member, i);
+ else if (gnm_xml_attr_int (attrs, "skip", &i))
+ format_template_member_set_skip (member, i);
+ else if (gnm_xml_attr_int (attrs, "edge", &i))
+ format_template_member_set_edge (member, i);
}
+}
- format_template_attach_member (ft, member);
- return TRUE;
+static void
+sax_style_handler (GsfXMLIn *xin, GnmStyle *style, gpointer user)
+{
+ GnmFormatTemplate *ft = (GnmFormatTemplate *)xin->user_state;
+ TemplateMember *member = ft->members->data;
+ gnm_style_ref (style);
+ member->mstyle = style;
}
static gboolean
-xml_read_format_template_members (XmlParseContext *ctxt, GnmFormatTemplate *ft, xmlNodePtr tree)
+template_sax_unknown (GsfXMLIn *xin, xmlChar const *elem, xmlChar const **attrs)
{
- xmlNode *child;
-
- g_return_val_if_fail (attr_eq (tree->name, "FormatTemplate"), FALSE);
-
- child = go_xml_get_child_by_name_by_lang (tree, "Information");
- if (child) {
- xmlChar *author = go_xml_node_get_cstr (child, "author");
- xmlChar *name = go_xml_node_get_cstr (child, "name");
- xmlChar *descr = go_xml_node_get_cstr (child, "description");
-
- format_template_set_author (ft, _(CXML2C (author)));
- format_template_set_name (ft, _(CXML2C (name)));
- format_template_set_description (ft, _(CXML2C (descr)));
-
- xmlFree (author);
- xmlFree (name);
- xmlFree (descr);
- } else
- return FALSE;
-
- child = go_xml_get_child_by_name (tree, "Members");
- if (child == NULL)
- return FALSE;
- for (child = child->xmlChildrenNode; child != NULL ; child = child->next)
- if (!xmlIsBlankNode (child) &&
- !xml_read_format_template_member (ctxt, ft, child))
- return FALSE;
-
- return TRUE;
+ g_return_val_if_fail (xin != NULL, FALSE);
+ g_return_val_if_fail (xin->doc != NULL, FALSE);
+ g_return_val_if_fail (xin->node != NULL, FALSE);
+
+#if 0
+ g_printerr ("YYY: %s %d\n", elem, xin->node->ns_id);
+#endif
+
+ if (GMR == xin->node->ns_id &&
+ 0 == strcmp (xin->node->id, "MEMBERS_MEMBER")) {
+ char const *type_name = gsf_xml_in_check_ns (xin, CXML2C (elem), GNM);
+ if (type_name && strcmp (type_name, "Style") == 0) {
+ gnm_xml_prep_style_parser (xin, attrs,
+ sax_style_handler,
+ NULL);
+ return TRUE;
+ }
+ }
+ return FALSE;
}
+static GsfXMLInNode template_dtd[] = {
+GSF_XML_IN_NODE_FULL (START, START, -1, NULL, GSF_XML_NO_CONTENT, FALSE, TRUE, NULL, NULL, 0),
+GSF_XML_IN_NODE (START, TEMPLATE, GMR, "FormatTemplate", GSF_XML_NO_CONTENT, NULL, NULL),
+ GSF_XML_IN_NODE (TEMPLATE, TEMPLATE_INFORMATION, GMR, "Information", GSF_XML_NO_CONTENT, sax_information, NULL),
+ GSF_XML_IN_NODE (TEMPLATE, TEMPLATE_MEMBERS, GMR, "Members", GSF_XML_NO_CONTENT, NULL, sax_members_end),
+ GSF_XML_IN_NODE (TEMPLATE_MEMBERS, MEMBERS_MEMBER, GMR, "Member", GSF_XML_NO_CONTENT, sax_member, NULL),
+ GSF_XML_IN_NODE (MEMBERS_MEMBER, MEMBER_ROW, GMR, "Row", GSF_XML_NO_CONTENT, NULL, NULL),
+ GSF_XML_IN_NODE (MEMBER_ROW, ROW_PLACEMENT, GMR, "Placement", GSF_XML_NO_CONTENT, sax_row_placement, NULL),
+ GSF_XML_IN_NODE (MEMBER_ROW, ROW_DIMENSIONS, GMR, "Dimensions", GSF_XML_NO_CONTENT, sax_row_dimensions, NULL),
+ GSF_XML_IN_NODE (MEMBERS_MEMBER, MEMBER_COL, GMR, "Col", GSF_XML_NO_CONTENT, NULL, NULL),
+ GSF_XML_IN_NODE (MEMBER_COL, COL_PLACEMENT, GMR, "Placement", GSF_XML_NO_CONTENT, sax_col_placement, NULL),
+ GSF_XML_IN_NODE (MEMBER_COL, COL_DIMENSIONS, GMR, "Dimensions", GSF_XML_NO_CONTENT, sax_col_dimensions, NULL),
+ GSF_XML_IN_NODE (MEMBERS_MEMBER, MEMBER_FREQUENCY, GMR, "Frequency", GSF_XML_NO_CONTENT, sax_frequency, NULL),
+ GSF_XML_IN_NODE_END
+};
+
/**
* format_template_new_from_file:
* @context:
@@ -459,46 +515,43 @@ xml_read_format_template_members (XmlParseContext *ctxt, GnmFormatTemplate *ft,
GnmFormatTemplate *
format_template_new_from_file (char const *filename, GOCmdContext *cc)
{
- GnmFormatTemplate *ft = NULL;
- xmlDoc *doc;
+ GnmFormatTemplate *ft = NULL;
+ GsfXMLInDoc *doc = NULL;
+ GnmLocale *locale;
+ gboolean ok = FALSE;
+ GsfInput *input = NULL;
g_return_val_if_fail (filename != NULL, NULL);
- if (!g_file_test (filename, G_FILE_TEST_EXISTS))
- return NULL;
-
- doc = xmlParseFile (filename);
- if (doc == NULL) {
- go_cmd_context_error_import (cc,
- _("Error while trying to load autoformat template"));
- return NULL;
+ input = gsf_input_stdio_new (filename, NULL);
+ if (!input) {
+ go_cmd_context_error_import
+ (cc,
+ _("Error while opening autoformat template"));
+ goto done;
}
- if (doc->xmlRootNode != NULL) {
- xmlNs *ns = xmlSearchNsByHref (doc, doc->xmlRootNode,
- CC2XML ("http://www.gnome.org/gnumeric/format-template/v1";));
- if (ns != NULL && attr_eq (doc->xmlRootNode->name, "FormatTemplate")) {
- XmlParseContext *ctxt = xml_parse_ctx_new (doc, ns, NULL);
-
- ft = format_template_new ();
- if (xml_read_format_template_members (ctxt, ft, doc->xmlRootNode)) {
- g_free (ft->filename);
- ft->filename = g_strdup (filename);
- } else {
- format_template_free (ft);
- ft = NULL;
- go_cmd_context_error_import (cc,
- _("Error while trying to build tree from autoformat template file"));
- }
- xml_parse_ctx_destroy (ctxt);
- } else
- go_cmd_context_error_import (cc,
- _("Is not an autoformat template file"));
- } else
- go_cmd_context_error_import (cc,
- _("Invalid xml file. Tree is empty?"));
+ doc = gsf_xml_in_doc_new (template_dtd, template_ns);
+ if (doc == NULL)
+ goto done;
+ gsf_xml_in_doc_set_unknown_handler (doc, &template_sax_unknown);
+
+ ft = format_template_new ();
+ ft->filename = g_strdup (filename);
+
+ locale = gnm_push_C_locale ();
+ ok = gsf_xml_in_doc_parse (doc, input, ft);
+ gnm_pop_C_locale (locale);
+
+ done:
+ if (input) g_object_unref (input);
+ if (doc) gsf_xml_in_doc_free (doc);
+
+ if (ft && !ok) {
+ format_template_free (ft);
+ ft = NULL;
+ }
- xmlFreeDoc (doc);
return ft;
}
diff --git a/src/libgnumeric.c b/src/libgnumeric.c
index eb1d394..1a85e2c 100644
--- a/src/libgnumeric.c
+++ b/src/libgnumeric.c
@@ -44,7 +44,6 @@
#include "dependent.h"
#include "sheet-autofill.h"
#include "sheet-private.h"
-#include "xml-io.h"
#include "xml-sax.h"
#include "clipboard.h"
#include "value.h"
@@ -287,7 +286,6 @@ gnm_init (void)
gnm_xml_sax_read_init ();
gnm_xml_sax_write_init ();
stf_init ();
- xml_dom_init ();
glade_init ();
}
diff --git a/src/xml-sax-read.c b/src/xml-sax-read.c
index ced880d..dae3e94 100644
--- a/src/xml-sax-read.c
+++ b/src/xml-sax-read.c
@@ -347,6 +347,10 @@ typedef struct {
GnmPageBreaks *page_breaks;
GnmCellRegion *clipboard;
+
+ GnmXmlStyleHandler style_handler;
+ gpointer style_handler_user;
+ GsfXMLInDoc *style_handler_doc;
} XMLSaxParseState;
static void
@@ -2718,28 +2722,16 @@ xml_sax_unknown (GsfXMLIn *xin, xmlChar const *elem, xmlChar const **attrs)
return FALSE;
}
-typedef enum {
- READ_FULL_FILE,
- READ_CLIPBOARD
-} ReadFileWhat;
-
-static gboolean
-read_file_common (ReadFileWhat what, XMLSaxParseState *state,
- GOIOContext *io_context,
- WorkbookView *wb_view, Sheet *sheet,
- GsfInput *input)
+static void
+read_file_init_state (XMLSaxParseState *state,
+ GOIOContext *io_context,
+ WorkbookView *wb_view, Sheet *sheet)
{
- GsfXMLInDoc *doc;
- GnmLocale *locale;
- gboolean ok;
-
- g_return_val_if_fail (IS_WORKBOOK_VIEW (wb_view), FALSE);
- g_return_val_if_fail (GSF_IS_INPUT (input), FALSE);
-
- /* init */
state->context = io_context;
state->wb_view = wb_view;
- state->wb = sheet ? sheet->workbook : wb_view_get_workbook (wb_view);
+ state->wb = sheet
+ ? sheet->workbook
+ : (wb_view ? wb_view_get_workbook (wb_view) : NULL);
state->sheet = sheet;
state->version = GNM_XML_UNKNOWN;
state->last_progress_update = 0;
@@ -2766,6 +2758,47 @@ read_file_common (ReadFileWhat what, XMLSaxParseState *state,
state->so = NULL;
state->page_breaks = NULL;
state->clipboard = NULL;
+ state->style_handler = NULL;
+ state->style_handler_user = NULL;
+ state->style_handler_doc = NULL;
+}
+
+static void
+read_file_free_state (XMLSaxParseState *state, gboolean self)
+{
+ g_hash_table_destroy (state->expr_map);
+
+ gnm_conventions_free (state->convs);
+
+ if (state->style)
+ gnm_style_unref (state->style);
+
+ if (state->style_handler_doc)
+ gsf_xml_in_doc_free (state->style_handler_doc);
+
+ if (self)
+ g_free (state);
+}
+
+typedef enum {
+ READ_FULL_FILE,
+ READ_CLIPBOARD
+} ReadFileWhat;
+
+static gboolean
+read_file_common (ReadFileWhat what, XMLSaxParseState *state,
+ GOIOContext *io_context,
+ WorkbookView *wb_view, Sheet *sheet,
+ GsfInput *input)
+{
+ GsfXMLInDoc *doc;
+ GnmLocale *locale;
+ gboolean ok;
+
+ g_return_val_if_fail (IS_WORKBOOK_VIEW (wb_view), FALSE);
+ g_return_val_if_fail (GSF_IS_INPUT (input), FALSE);
+
+ read_file_init_state (state, io_context, wb_view, sheet);
switch (what) {
case READ_FULL_FILE:
@@ -2825,10 +2858,6 @@ read_file_common (ReadFileWhat what, XMLSaxParseState *state,
_("XML document not well formed!"));
}
- /* cleanup */
- g_hash_table_destroy (state->expr_map);
- gnm_conventions_free (state->convs);
-
gsf_xml_in_doc_free (doc);
return ok;
@@ -2956,6 +2985,8 @@ gnm_xml_file_open (GOFileOpener const *fo, GOIOContext *io_context,
GO_FILE_FL_AUTO,
go_file_saver_for_id ("Gnumeric_XmlIO:sax"));
}
+
+ read_file_free_state (&state, FALSE);
}
/* ------------------------------------------------------------------------- */
@@ -2969,6 +3000,7 @@ xml_cellregion_read (WorkbookControl *wbc, GOIOContext *io_context,
GsfInput *input;
XMLSaxParseState state;
gboolean ok;
+ GnmCellRegion *result;
wb_view = wb_control_view (wbc);
input = gsf_input_memory_new (buffer, length, FALSE);
@@ -2977,7 +3009,54 @@ xml_cellregion_read (WorkbookControl *wbc, GOIOContext *io_context,
input);
g_object_unref (input);
- return state.clipboard;
+ result = state.clipboard;
+ state.clipboard = NULL;
+
+ read_file_free_state (&state, FALSE);
+
+ return result;
+}
+
+/* ------------------------------------------------------------------------- */
+
+static void
+style_parser_done (GsfXMLIn *xin, XMLSaxParseState *old_state)
+{
+ GnmStyle *style = old_state->style;
+ old_state->style_handler (xin, style, old_state->style_handler_user);
+ read_file_free_state (old_state, TRUE);
+}
+
+void
+gnm_xml_prep_style_parser (GsfXMLIn *xin,
+ xmlChar const **attrs,
+ GnmXmlStyleHandler handler,
+ gpointer user)
+{
+ static GsfXMLInNode dtd[] = {
+ GSF_XML_IN_NODE (STYLE_STYLE, STYLE_STYLE, GNM, "Style", GSF_XML_NO_CONTENT, &xml_sax_style_start, NULL),
+ /* Nodes added below. */
+ GSF_XML_IN_NODE_END
+ };
+ GsfXMLInDoc *doc = gsf_xml_in_doc_new (dtd, NULL);
+ XMLSaxParseState *state = g_new0 (XMLSaxParseState, 1);
+
+ read_file_init_state (state, NULL, NULL, NULL);
+ state->style_handler = handler;
+ state->style_handler_user = user;
+ state->style_handler_doc = doc;
+ state->style = gnm_style_new_default ();
+
+ /* Not a full style, just those parts that do not require a sheet. */
+ gnm_xml_in_doc_add_subset (doc, gnumeric_1_0_dtd,
+ "STYLE_FONT",
+ "STYLE_STYLE");
+ gnm_xml_in_doc_add_subset (doc, gnumeric_1_0_dtd,
+ "STYLE_BORDER",
+ "STYLE_STYLE");
+
+ gsf_xml_in_push_state (xin, doc, state,
+ (GsfXMLInExtDtor)style_parser_done, attrs);
}
/* ------------------------------------------------------------------------- */
diff --git a/src/xml-sax.h b/src/xml-sax.h
index 67955e5..e083dbb 100644
--- a/src/xml-sax.h
+++ b/src/xml-sax.h
@@ -21,13 +21,21 @@ SheetObject *gnm_xml_in_cur_obj (GsfXMLIn const *xin);
Sheet *gnm_xml_in_cur_sheet (GsfXMLIn const *xin);
-GsfOutputMemory *gnm_cellregion_to_xml (GnmCellRegion const *cr);
+GsfOutputMemory *gnm_cellregion_to_xml (GnmCellRegion const *cr);
GnmCellRegion *xml_cellregion_read (WorkbookControl *wbc,
GOIOContext *io_context,
Sheet *sheet,
const char *buffer, int length);
+typedef void (*GnmXmlStyleHandler) (GsfXMLIn *xin,
+ GnmStyle *style,
+ gpointer user);
+void gnm_xml_prep_style_parser (GsfXMLIn *xin,
+ xmlChar const **attrs,
+ GnmXmlStyleHandler handler,
+ gpointer user);
+
void gnm_xml_sax_read_init (void);
void gnm_xml_sax_write_init (void);
diff --git a/templates/autoformat/autoformat.3D.button.xml.in b/templates/autoformat/autoformat.3D.button.xml.in
index eb3f8e2..4fb2de9 100644
--- a/templates/autoformat/autoformat.3D.button.xml.in
+++ b/templates/autoformat/autoformat.3D.button.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Button" _description="A button like template" category="3D"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="FFFF:FFFF:FFFF"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="1" Color="FFFF:FFFF:FFFF"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="FFFF:FFFF:FFFF"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="1" Color="FFFF:FFFF:FFFF"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="87C1:0:650D" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="8" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="FFFF:FFFF:FFFF"/>
- <gmr:Bottom Style="1" Color="7070:7070:7070"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="87C1:0:650D" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="8" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="FFFF:FFFF:FFFF"/>
+ <gnm:Bottom Style="1" Color="7070:7070:7070"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="1" Color="FFFF:FFFF:FFFF"/>
- <gmr:Right Style="1" Color="7E7E:7E7E:7E7E"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="1" Color="FFFF:FFFF:FFFF"/>
+ <gnm:Right Style="1" Color="7E7E:7E7E:7E7E"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -78,17 +78,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="1" Color="FFFF:FFFF:FFFF"/>
- <gmr:Right Style="1" Color="7E7E:7E7E:7E7E"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="1" Color="FFFF:FFFF:FFFF"/>
+ <gnm:Right Style="1" Color="7E7E:7E7E:7E7E"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -100,17 +100,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="87C1:0:650D" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="8" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="FFFF:FFFF:FFFF"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="1" Color="7E7E:7E7E:7E7E"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="87C1:0:650D" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="8" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="FFFF:FFFF:FFFF"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="1" Color="7E7E:7E7E:7E7E"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -122,17 +122,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -144,17 +144,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FF5:55:A6C9" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="1" Color="7E7E:7E7E:7E7E"/>
- <gmr:Left Style="1" Color="FFFF:FFFF:FFFF"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FF5:55:A6C9" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="1" Color="7E7E:7E7E:7E7E"/>
+ <gnm:Left Style="1" Color="FFFF:FFFF:FFFF"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -166,17 +166,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="FFFF:FFFF:FFFF"/>
- <gmr:Bottom Style="1" Color="7E7E:7E7E:7E7E"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="FFFF:FFFF:FFFF"/>
+ <gnm:Bottom Style="1" Color="7E7E:7E7E:7E7E"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -188,17 +188,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="1" Color="7E7E:7E7E:7E7E"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="1" Color="7E7E:7E7E:7E7E"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="BC1E:BC1E:BC1E" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="1" Color="7E7E:7E7E:7E7E"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="1" Color="7E7E:7E7E:7E7E"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.3D.list.xml.in b/templates/autoformat/autoformat.3D.list.xml.in
index 34d52a8..64bcbbf 100644
--- a/templates/autoformat/autoformat.3D.list.xml.in
+++ b/templates/autoformat/autoformat.3D.list.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="List" _description="A 3D list template" category="3D"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B07B:B07B:B07B" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B07B:B07B:B07B" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="2" repeat="-1" skip="1" edge="1"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B07B:B07B:B07B" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="1" Color="8989:8989:8989"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B07B:B07B:B07B" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="1" Color="8989:8989:8989"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="2" repeat="-1" skip="1" edge="1"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B07B:B07B:B07B" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="8989:8989:8989"/>
- <gmr:Bottom Style="1" Color="FFFF:FFFF:FFFF"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B07B:B07B:B07B" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="8989:8989:8989"/>
+ <gnm:Bottom Style="1" Color="FFFF:FFFF:FFFF"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -78,17 +78,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="2" repeat="-1" skip="1" edge="1"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B07B:B07B:B07B" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B07B:B07B:B07B" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -100,17 +100,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="2" repeat="-1" skip="1" edge="1"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B07B:B07B:B07B" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B07B:B07B:B07B" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -122,17 +122,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B07B:B07B:B07B" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B07B:B07B:B07B" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -144,17 +144,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B07B:B07B:B07B" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B07B:B07B:B07B" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.Classical.cool.xml.in b/templates/autoformat/autoformat.Classical.cool.xml.in
index 8ae2f4f..11935b1 100644
--- a/templates/autoformat/autoformat.Classical.cool.xml.in
+++ b/templates/autoformat/autoformat.Classical.cool.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Cool" _description="Template with a 'cool' look" category="Classical"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="769:2F4:7E0F" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="0:0:0"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="2" Color="0:0:0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="769:2F4:7E0F" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="0:0:0"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="2" Color="0:0:0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="769:2F4:7E0F" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="8" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="0:0:0"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="769:2F4:7E0F" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="8" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="0:0:0"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="769:2F4:7E0F" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="8" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="0:0:0"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="2" Color="0:0:0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="769:2F4:7E0F" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="8" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="0:0:0"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="2" Color="0:0:0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -78,17 +78,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B83D:B83D:B83D" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="2" Color="0:0:0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B83D:B83D:B83D" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="2" Color="0:0:0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -100,17 +100,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:916:A2E8" Back="B83D:B83D:B83D" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:916:A2E8" Back="B83D:B83D:B83D" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -122,17 +122,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="1C7:75B:8BA2" Back="B83D:B83D:B83D" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="2" Color="0:0:0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="1C7:75B:8BA2" Back="B83D:B83D:B83D" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="2" Color="0:0:0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -144,17 +144,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="2" Color="0:0:0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="2" Color="0:0:0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -166,17 +166,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:73D:7A2E" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:73D:7A2E" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -188,17 +188,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:89B:9936" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="2" Color="0:0:0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:89B:9936" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="2" Color="0:0:0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.Classical.simple.xml.in b/templates/autoformat/autoformat.Classical.simple.xml.in
index 72a9217..0ece676 100644
--- a/templates/autoformat/autoformat.Classical.simple.xml.in
+++ b/templates/autoformat/autoformat.Classical.simple.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Simple" _description="A simple template with classical look and feel" category="Classical"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="0:0:0"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="1" Color="0:0:0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="0:0:0"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="1" Color="0:0:0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="0:0:0"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="0:0:0"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="0:0:0"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="0:0:0"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -78,17 +78,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="1" Color="0:0:0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="1" Color="0:0:0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -100,17 +100,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="1" Color="0:0:0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="1" Color="0:0:0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -122,17 +122,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.Classical.trendy.xml.in b/templates/autoformat/autoformat.Classical.trendy.xml.in
index fddc6f6..ae589d5 100644
--- a/templates/autoformat/autoformat.Classical.trendy.xml.in
+++ b/templates/autoformat/autoformat.Classical.trendy.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Trendy" _description="A classical yet colorful template" category="Classical"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="8EF0:FC2:9745" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="0:0:0"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="8EF0:FC2:9745" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="0:0:0"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="8EF0:FC2:9745" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="0:0:0"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="8EF0:FC2:9745" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="0:0:0"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B83D:B83D:B83D" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="B83D:B83D:B83D" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -78,17 +78,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="51C:0:9B26" Back="B83D:B83D:B83D" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="51C:0:9B26" Back="B83D:B83D:B83D" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -100,17 +100,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.Colourful.banana.xml.in b/templates/autoformat/autoformat.Colourful.banana.xml.in
index 6f49c8c..6a4cb03 100644
--- a/templates/autoformat/autoformat.Colourful.banana.xml.in
+++ b/templates/autoformat/autoformat.Colourful.banana.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Banana" _description="A banana coloured template" category="Colourful"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="3" Fore="0:A67:83E0" Back="F8EB:FA2E:5D5D" PatternColor="FFFF:FFFF:FFFF" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="6" Color="ACAC:ACAC:ACAC"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="3" Fore="0:A67:83E0" Back="F8EB:FA2E:5D5D" PatternColor="FFFF:FFFF:FFFF" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="6" Color="ACAC:ACAC:ACAC"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="4" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="E7D5:FFFF:2D1D" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="4" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="E7D5:FFFF:2D1D" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="2" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="FFFF:FC7B:8DD8" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="5" Color="8F8F:8F8F:8F8F"/>
- <gmr:Bottom Style="1" Color="8F8F:8F8F:8F8F"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="2" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="FFFF:FC7B:8DD8" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="5" Color="8F8F:8F8F:8F8F"/>
+ <gnm:Bottom Style="1" Color="8F8F:8F8F:8F8F"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.Colourful.black.xml.in b/templates/autoformat/autoformat.Colourful.black.xml.in
index 04d24ed..d02cd8a 100644
--- a/templates/autoformat/autoformat.Colourful.black.xml.in
+++ b/templates/autoformat/autoformat.Colourful.black.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Black" _description="Template with a black background" category="Colourful"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="C5D1:C5D1:C5D1" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="C5D1:C5D1:C5D1" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:F26C:F26C" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:F26C:F26C" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -78,17 +78,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:342:F5C5" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:342:F5C5" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -100,17 +100,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="BC1E:BC1E:BC1E" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="BC1E:BC1E:BC1E" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -122,17 +122,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.Colourful.blue.xml.in b/templates/autoformat/autoformat.Colourful.blue.xml.in
index 36a9a1c..2f2b539 100644
--- a/templates/autoformat/autoformat.Colourful.blue.xml.in
+++ b/templates/autoformat/autoformat.Colourful.blue.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Blue" _description="A colourful template with mainly blue and teal colours" category="Colourful"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="5" Color="707:6666:7474"/>
- <gmr:Bottom Style="1" Color="2E2E:D4D4:E4E4"/>
- <gmr:Left Style="5" Color="707:6666:7474"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="5" Color="707:6666:7474"/>
+ <gnm:Bottom Style="1" Color="2E2E:D4D4:E4E4"/>
+ <gnm:Left Style="5" Color="707:6666:7474"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="8" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="5" Color="707:6666:7474"/>
- <gmr:Bottom Style="1" Color="2E2E:D4D4:E4E4"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="8" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="5" Color="707:6666:7474"/>
+ <gnm:Bottom Style="1" Color="2E2E:D4D4:E4E4"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="8" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="5" Color="707:6666:7474"/>
- <gmr:Bottom Style="1" Color="2E2E:D4D4:E4E4"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="5" Color="707:6666:7474"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="1F0:1F0:1F0" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="8" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="5" Color="707:6666:7474"/>
+ <gnm:Bottom Style="1" Color="2E2E:D4D4:E4E4"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="5" Color="707:6666:7474"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -78,17 +78,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="0:C9:87C1" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="2E2E:D4D4:E4E4"/>
- <gmr:Bottom Style="1" Color="2E2E:D4D4:E4E4"/>
- <gmr:Left Style="5" Color="707:6666:7474"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="0:C9:87C1" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="2E2E:D4D4:E4E4"/>
+ <gnm:Bottom Style="1" Color="2E2E:D4D4:E4E4"/>
+ <gnm:Left Style="5" Color="707:6666:7474"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -100,17 +100,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="0:C9:87C1" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="5" Color="707:6666:7474"/>
- <gmr:Left Style="5" Color="707:6666:7474"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="0:C9:87C1" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="5" Color="707:6666:7474"/>
+ <gnm:Left Style="5" Color="707:6666:7474"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -122,17 +122,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="77D:6D24:7C1F" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="2E2E:D4D4:E4E4"/>
- <gmr:Bottom Style="1" Color="2E2E:D4D4:E4E4"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="77D:6D24:7C1F" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="2E2E:D4D4:E4E4"/>
+ <gnm:Bottom Style="1" Color="2E2E:D4D4:E4E4"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -144,17 +144,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="77D:6D24:7C1F" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="2E2E:D4D4:E4E4"/>
- <gmr:Bottom Style="1" Color="2E2E:D4D4:E4E4"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="5" Color="707:6666:7474"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="77D:6D24:7C1F" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="2E2E:D4D4:E4E4"/>
+ <gnm:Bottom Style="1" Color="2E2E:D4D4:E4E4"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="5" Color="707:6666:7474"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -166,17 +166,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="77D:6D24:7C1F" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="5" Color="707:6666:7474"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="77D:6D24:7C1F" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="5" Color="707:6666:7474"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -188,17 +188,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="77D:6D24:7C1F" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="5" Color="707:6666:7474"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="5" Color="707:6666:7474"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="77D:6D24:7C1F" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="5" Color="707:6666:7474"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="5" Color="707:6666:7474"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.Colourful.orange.xml.in b/templates/autoformat/autoformat.Colourful.orange.xml.in
index 7a5ce4f..8832da2 100644
--- a/templates/autoformat/autoformat.Colourful.orange.xml.in
+++ b/templates/autoformat/autoformat.Colourful.orange.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Orange" _description="Orange template" category="Colourful"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="DF07:94A5:CA5" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="2" Color="E0E0:A3A3:9292"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="DF07:94A5:CA5" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="2" Color="E0E0:A3A3:9292"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="4" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="FFFF:E2DD:BB7D" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="4" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="FFFF:E2DD:BB7D" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="4" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="E4D8:E4D8:E4D8" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="E0E0:A3A3:9292"/>
- <gmr:Bottom Style="6" Color="E0E0:A3A3:9292"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="4" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="E4D8:E4D8:E4D8" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="E0E0:A3A3:9292"/>
+ <gnm:Bottom Style="6" Color="E0E0:A3A3:9292"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.Colourful.vanilla.xml.in b/templates/autoformat/autoformat.Colourful.vanilla.xml.in
index a4fc005..cea8174 100644
--- a/templates/autoformat/autoformat.Colourful.vanilla.xml.in
+++ b/templates/autoformat/autoformat.Colourful.vanilla.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Vanilla" _description="Template with vanilla colour" category="Colourful"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="89B2:0:3C3" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="89B2:0:3C3" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="4" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="FFFF:F84B:DD5" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="4" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="FFFF:F84B:DD5" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="4" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="FFFF:F84B:DD5" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="4" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="FFFF:F84B:DD5" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -78,17 +78,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="4" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="FFFF:F84B:DD5" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="4" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="FFFF:F84B:DD5" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -100,17 +100,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="4" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="FFFF:F84B:DD5" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="4" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="FFFF:F84B:DD5" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -122,17 +122,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="BA2E:BA2E:BA2E" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="BA2E:BA2E:BA2E" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -144,17 +144,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="BA2E:BA2E:BA2E" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="BA2E:BA2E:BA2E" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.Financial.basic.xml.in b/templates/autoformat/autoformat.Financial.basic.xml.in
index 43e8423..e8683e9 100644
--- a/templates/autoformat/autoformat.Financial.basic.xml.in
+++ b/templates/autoformat/autoformat.Financial.basic.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Simple" _description="Simple financial template" category="Financial"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="6" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="6" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.Financial.desert.xml.in b/templates/autoformat/autoformat.Financial.desert.xml.in
index 40495c7..f0ea1d1 100644
--- a/templates/autoformat/autoformat.Financial.desert.xml.in
+++ b/templates/autoformat/autoformat.Financial.desert.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Desert" _description="Desert colored financial template" category="Financial"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="E4D8:E2C2:6F74" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="E4D8:E2C2:6F74" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="FA7E:FFFF:39B2" PatternColor="0:0:0" Format="$0.00;[Red]$0.00">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="FA7E:FFFF:39B2" PatternColor="0:0:0" Format="$0.00;[Red]$0.00">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -78,17 +78,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="F9A8:FFFF:7459" PatternColor="0:0:0" Format="$0.00;[Red]$0.00">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="F9A8:FFFF:7459" PatternColor="0:0:0" Format="$0.00;[Red]$0.00">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -100,17 +100,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="6" Color="0:0:0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="6" Color="0:0:0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -122,17 +122,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00;[Red]$0.00">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="6" Color="0:0:0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00;[Red]$0.00">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="6" Color="0:0:0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.Financial.ice.xml.in b/templates/autoformat/autoformat.Financial.ice.xml.in
index d80883a..fed9893 100644
--- a/templates/autoformat/autoformat.Financial.ice.xml.in
+++ b/templates/autoformat/autoformat.Financial.ice.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Ice" _description="Financial style with cold border color" category="Financial"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="2" Color="808:0:8383"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="2" Color="808:0:8383"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="8" Bold="0" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="2" Color="808:0:8383"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="8" Bold="0" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="2" Color="808:0:8383"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="8" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="2" Color="808:0:8383"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="8" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="2" Color="808:0:8383"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -78,17 +78,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -100,17 +100,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -122,17 +122,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="6" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="6" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -144,17 +144,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.Financial.modern.xml.in b/templates/autoformat/autoformat.Financial.modern.xml.in
index e902017..30b0268 100644
--- a/templates/autoformat/autoformat.Financial.modern.xml.in
+++ b/templates/autoformat/autoformat.Financial.modern.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Modern" _description="Modern style with financial formatting" category="Financial"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="745D:745D:745D" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="8" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="745D:745D:745D" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="8" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="8" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="8" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -78,17 +78,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -100,17 +100,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="6" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="6" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -122,17 +122,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="6" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="6" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.Financial.purple.xml.in b/templates/autoformat/autoformat.Financial.purple.xml.in
index c9ce5a1..f504b00 100644
--- a/templates/autoformat/autoformat.Financial.purple.xml.in
+++ b/templates/autoformat/autoformat.Financial.purple.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Purple" _description="Financial template with purple borders" category="Financial"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="5" Color="8686:0:8787"/>
- <gmr:Bottom Style="1" Color="8686:0:8787"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="5" Color="8686:0:8787"/>
+ <gnm:Bottom Style="1" Color="8686:0:8787"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="8686:0:8787"/>
- <gmr:Bottom Style="5" Color="8686:0:8787"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="8686:0:8787"/>
+ <gnm:Bottom Style="5" Color="8686:0:8787"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -78,17 +78,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="8686:0:8787"/>
- <gmr:Bottom Style="5" Color="8686:0:8787"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="$0.00">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="8686:0:8787"/>
+ <gnm:Bottom Style="5" Color="8686:0:8787"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.General.advanced.xml.in b/templates/autoformat/autoformat.General.advanced.xml.in
index ebe514e..e4f219b 100644
--- a/templates/autoformat/autoformat.General.advanced.xml.in
+++ b/templates/autoformat/autoformat.General.advanced.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Advanced" _description="An advanced colorless template" category="General"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="2" Color="0:0:0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="2" Color="0:0:0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="2" Color="0:0:0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="4" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="2" Color="0:0:0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -78,17 +78,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="2" Color="0:0:0"/>
- <gmr:Right Style="1" Color="0:0:0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="2" Color="0:0:0"/>
+ <gnm:Right Style="1" Color="0:0:0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -100,17 +100,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="2" Color="0:0:0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="2" Color="0:0:0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -122,17 +122,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="6" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="2" Color="0:0:0"/>
- <gmr:Right Style="1" Color="0:0:0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="6" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="2" Color="0:0:0"/>
+ <gnm:Right Style="1" Color="0:0:0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -144,17 +144,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="6" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="6" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -166,17 +166,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="6" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="2" Color="0:0:0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="6" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="2" Color="0:0:0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.General.basic.xml.in b/templates/autoformat/autoformat.General.basic.xml.in
index bd31826..afaf9ab 100644
--- a/templates/autoformat/autoformat.General.basic.xml.in
+++ b/templates/autoformat/autoformat.General.basic.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Basic" _description="A basic formal style" category="General"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="0:0:0"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="0:0:0"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="2" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="2" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.General.empty.xml.in b/templates/autoformat/autoformat.General.empty.xml.in
index 3266143..f5389b7 100644
--- a/templates/autoformat/autoformat.General.empty.xml.in
+++ b/templates/autoformat/autoformat.General.empty.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Empty" _description="A fully empty template" category="General"/>
<gmr:Members/>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.General.table.xml.in b/templates/autoformat/autoformat.General.table.xml.in
index 3b9579e..d6c164a 100644
--- a/templates/autoformat/autoformat.General.table.xml.in
+++ b/templates/autoformat/autoformat.General.table.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Table" _description="Very simple table template with the same border everywhere " category="General"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="1" Color="0:0:0"/>
- <gmr:Right Style="1" Color="0:0:0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="1" Color="0:0:0"/>
+ <gnm:Right Style="1" Color="0:0:0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.List.basic.xml.in b/templates/autoformat/autoformat.List.basic.xml.in
index 056ee37..8f31c58 100644
--- a/templates/autoformat/autoformat.List.basic.xml.in
+++ b/templates/autoformat/autoformat.List.basic.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Basic" _description="A basic list" category="List"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="AE8B:AE8B:AE8B" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="5" Color="0:8383:7C7C"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="1" Color="0:8383:7C7C"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="AE8B:AE8B:AE8B" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="5" Color="0:8383:7C7C"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="1" Color="0:8383:7C7C"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="A0F8:706:BAF" Back="AE8B:AE8B:AE8B" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="5" Color="0:8383:7C7C"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="A0F8:706:BAF" Back="AE8B:AE8B:AE8B" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="5" Color="0:8383:7C7C"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="A0F8:706:BAF" Back="AE8B:AE8B:AE8B" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="5" Color="0:8383:7C7C"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="1" Color="0:8383:7C7C"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="A0F8:706:BAF" Back="AE8B:AE8B:AE8B" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="5" Color="0:8383:7C7C"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="1" Color="0:8383:7C7C"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -78,17 +78,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="2" repeat="-1" skip="1" edge="1"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="AE8B:AE8B:AE8B" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="1" Color="0:8383:7C7C"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="AE8B:AE8B:AE8B" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="1" Color="0:8383:7C7C"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -100,17 +100,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="2" repeat="-1" skip="1" edge="1"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="1" Color="0:8383:7C7C"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="1" Color="0:8383:7C7C"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -122,17 +122,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="2" repeat="-1" skip="1" edge="1"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="AE8B:AE8B:AE8B" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="AE8B:AE8B:AE8B" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -144,17 +144,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="2" repeat="-1" skip="1" edge="1"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="AE8B:AE8B:AE8B" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="1" Color="0:8383:7C7C"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="0:0:0" Back="AE8B:AE8B:AE8B" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="1" Color="0:8383:7C7C"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -166,17 +166,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="2" repeat="-1" skip="1" edge="1"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="1" Color="0:8383:7C7C"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="1" Color="0:8383:7C7C"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -188,17 +188,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="5" Color="0:8383:7C7C"/>
- <gmr:Left Style="1" Color="0:8383:7C7C"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="5" Color="0:8383:7C7C"/>
+ <gnm:Left Style="1" Color="0:8383:7C7C"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -210,17 +210,17 @@
<gmr:Dimensions size="-1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="5" Color="0:8383:7C7C"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="5" Color="0:8383:7C7C"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -232,17 +232,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="0:0:0"/>
- <gmr:Bottom Style="5" Color="0:8383:7C7C"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="1" Color="0:8383:7C7C"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="0:0:0"/>
+ <gnm:Bottom Style="5" Color="0:8383:7C7C"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="1" Color="0:8383:7C7C"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.List.green.xml.in b/templates/autoformat/autoformat.List.green.xml.in
index c81c645..68635c7 100644
--- a/templates/autoformat/autoformat.List.green.xml.in
+++ b/templates/autoformat/autoformat.List.green.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Green" _description="A green list template" category="List"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="32BB:83E0:6269" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="1" Fore="FFFF:FFFF:FFFF" Back="32BB:83E0:6269" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="2" repeat="-1" skip="2" edge="1"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="3" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="9868:FFFF:A67E" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="3" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="9868:FFFF:A67E" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="8181:8181:8181"/>
- <gmr:Bottom Style="5" Color="8181:8181:8181"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="8181:8181:8181"/>
+ <gnm:Bottom Style="5" Color="8181:8181:8181"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -78,17 +78,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="1" Color="8181:8181:8181"/>
- <gmr:Bottom Style="5" Color="8181:8181:8181"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="1" Color="8181:8181:8181"/>
+ <gnm:Bottom Style="5" Color="8181:8181:8181"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.List.lila.xml.in b/templates/autoformat/autoformat.List.lila.xml.in
index 409c018..346242a 100644
--- a/templates/autoformat/autoformat.List.lila.xml.in
+++ b/templates/autoformat/autoformat.List.lila.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Lila" _description="Lila list template" category="List"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="6" Color="0:0:0"/>
- <gmr:Bottom Style="1" Color="0:0:0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="8" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="6" Color="0:0:0"/>
+ <gnm:Bottom Style="1" Color="0:0:0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="2" repeat="-1" skip="1" edge="1"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="19" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="EC75:E789:FFFF" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="10" Color="DEDE:E1E1:FFFF"/>
- <gmr:Bottom Style="10" Color="DEDE:E1E1:FFFF"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="19" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="EC75:E789:FFFF" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="10" Color="DEDE:E1E1:FFFF"/>
+ <gnm:Bottom Style="10" Color="DEDE:E1E1:FFFF"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="6" Color="0:0:0"/>
- <gmr:Bottom Style="0"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="6" Color="0:0:0"/>
+ <gnm:Bottom Style="0"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
diff --git a/templates/autoformat/autoformat.List.simple.xml.in b/templates/autoformat/autoformat.List.simple.xml.in
index 177fd48..6ff7750 100644
--- a/templates/autoformat/autoformat.List.simple.xml.in
+++ b/templates/autoformat/autoformat.List.simple.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1";>
+<gmr:FormatTemplate xmlns:gmr="http://www.gnome.org/gnumeric/format-template/v1"; xmlns:gnm="http://www.gnumeric.org/v10.dtd";>
<gmr:Information _author="Gnumeric Team" _name="Simple" _description="A simple list template" category="List"/>
<gmr:Members>
<gmr:Member>
@@ -12,17 +12,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="8585:8585:8585"/>
- <gmr:Bottom Style="2" Color="8585:8585:8585"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="8585:8585:8585"/>
+ <gnm:Bottom Style="2" Color="8585:8585:8585"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -34,17 +34,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:19C5:A2E8" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="8585:8585:8585"/>
- <gmr:Bottom Style="2" Color="8585:8585:8585"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:19C5:A2E8" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="1" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="8585:8585:8585"/>
+ <gnm:Bottom Style="2" Color="8585:8585:8585"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -56,17 +56,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="0"/>
- <gmr:Bottom Style="1" Color="8585:8585:8585"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="0"/>
+ <gnm:Bottom Style="1" Color="8585:8585:8585"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -78,17 +78,17 @@
<gmr:Dimensions size="1"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:19C5:A2E8" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="1" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="8585:8585:8585"/>
- <gmr:Bottom Style="2" Color="8585:8585:8585"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:19C5:A2E8" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="1" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="8585:8585:8585"/>
+ <gnm:Bottom Style="2" Color="8585:8585:8585"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
<gmr:Member>
<gmr:Row>
@@ -100,17 +100,17 @@
<gmr:Dimensions size="0"/>
</gmr:Col>
<gmr:Frequency direction="0" repeat="0" skip="0" edge="0"/>
- <gmr:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
- <gmr:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gmr:Font>
- <gmr:StyleBorder>
- <gmr:Top Style="2" Color="8585:8585:8585"/>
- <gmr:Bottom Style="2" Color="8585:8585:8585"/>
- <gmr:Left Style="0"/>
- <gmr:Right Style="0"/>
- <gmr:Diagonal Style="0"/>
- <gmr:Rev-Diagonal Style="0"/>
- </gmr:StyleBorder>
- </gmr:Style>
+ <gnm:Style HAlign="1" VAlign="2" Fit="0" Rotation="0" Shade="0" Fore="0:0:0" Back="FFFF:FFFF:FFFF" PatternColor="0:0:0" Format="General">
+ <gnm:Font Unit="9" Bold="0" Italic="0" Underline="0" StrikeThrough="0">Arial</gnm:Font>
+ <gnm:StyleBorder>
+ <gnm:Top Style="2" Color="8585:8585:8585"/>
+ <gnm:Bottom Style="2" Color="8585:8585:8585"/>
+ <gnm:Left Style="0"/>
+ <gnm:Right Style="0"/>
+ <gnm:Diagonal Style="0"/>
+ <gnm:Rev-Diagonal Style="0"/>
+ </gnm:StyleBorder>
+ </gnm:Style>
</gmr:Member>
</gmr:Members>
</gmr:FormatTemplate>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
