From a3904b9973cd7e3068e512a8859522e3dae71e44 Mon Sep 17 00:00:00 2001
From: Zsolt Foldvari <zfoldvar@users.sourceforge.net>
Date: Tue, 29 Apr 2008 10:08:05 +0000
Subject: [PATCH] Change StyledText tag name from 'text' to 'choice'.

svn: r10652
---
 data/grampsxml.dtd |  3 ++-
 data/grampsxml.rng | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/data/grampsxml.dtd b/data/grampsxml.dtd
index 35846bfbe..9b30e818a 100644
--- a/data/grampsxml.dtd
+++ b/data/grampsxml.dtd
@@ -328,7 +328,8 @@ NOTES
 
 <!ELEMENT tag (range+)>
 <!ATTLIST tag
-	name	CDATA #REQUIRED
+	name	(bold|italic|underline|fontface|fontsize|
+		fontcolor|highlight|superscript) #REQUIRED
 	value	CDATA #IMPLIED
 >
 
diff --git a/data/grampsxml.rng b/data/grampsxml.rng
index 2b4de3f1e..79044cb17 100644
--- a/data/grampsxml.rng
+++ b/data/grampsxml.rng
@@ -493,7 +493,16 @@
   <define name="styledtext">
     <element name="text"><text/></element>
     <zeroOrMore><element name="tag">
-      <attribute name="name"><text/></attribute>
+      <attribute name="name"><choice>
+          <value>bold</value>
+          <value>italic</value>
+          <value>underline</value>
+          <value>fontface</value>
+          <value>fontsize</value>
+          <value>fontcolor</value>
+          <value>highlight</value>
+          <value>superscript</value>
+      </choice></attribute>
       <optional><attribute name="value"><text/></attribute></optional>
       <oneOrMore><element name="range">
         <attribute name="start"><data type="int"/></attribute>