[dasher: 153/217] Added settings.dtd
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher: 153/217] Added settings.dtd
- Date: Sat, 27 Feb 2016 12:13:11 +0000 (UTC)
commit 4c1126a3df479feb2738684f5e41cbadfecfd7fd
Author: Ada Majorek <amajorek google com>
Date: Sat Dec 26 14:43:12 2015 -0800
Added settings.dtd
fixes https://github.com/ipomoena/dasher/issues/64
Data/alphabets/alphabet.dtd | 2 +-
Data/control/control.xml | 2 ++
Data/settings/settings.dtd | 15 +++++++++++++++
Src/DasherCore/XmlSettingsStore.cpp | 2 ++
Src/Win32/Dasher_vc2013.VC.db | Bin 0 -> 88014848 bytes
5 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index 174d4fc..05bf480 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -4,7 +4,7 @@ how those symbols may be used. -->
<!ELEMENT alphabets (alphabet*)>
-<!ELEMENT alphabet (orientation, encoding, palette, train, paragraph,
+<!ELEMENT alphabet (orientation, encoding, palette, train, langcode?, paragraph,
space, control, conversionmode?, group*)>
<!ATTLIST alphabet name CDATA #REQUIRED>
diff --git a/Data/control/control.xml b/Data/control/control.xml
index 93844b2..982fab4 100644
--- a/Data/control/control.xml
+++ b/Data/control/control.xml
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE control SYSTEM "control.dtd">
+
<nodes>
<alph/>
diff --git a/Data/settings/settings.dtd b/Data/settings/settings.dtd
new file mode 100644
index 0000000..d13f71e
--- /dev/null
+++ b/Data/settings/settings.dtd
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!ELEMENT settings ((long|bool|string)*)>
+
+<!ELEMENT long EMPTY>
+<!ATTLIST long name CDATA #REQUIRED>
+<!ATTLIST long value CDATA #REQUIRED>
+
+
+<!ELEMENT bool EMPTY>
+<!ATTLIST bool name CDATA #REQUIRED>
+<!ATTLIST bool value CDATA #REQUIRED>
+
+<!ELEMENT string EMPTY>
+<!ATTLIST string name CDATA #REQUIRED>
+<!ATTLIST string value CDATA #REQUIRED>
diff --git a/Src/DasherCore/XmlSettingsStore.cpp b/Src/DasherCore/XmlSettingsStore.cpp
index f47ef0c..713a286 100644
--- a/Src/DasherCore/XmlSettingsStore.cpp
+++ b/Src/DasherCore/XmlSettingsStore.cpp
@@ -79,6 +79,8 @@ bool XmlSettingsStore::Save() {
modified_ = false;
std::stringstream out;
out << "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+ out << "<!DOCTYPE settings SYSTEM \"settings.dtd\">\n";
+
out << "<settings>\n";
for (const auto& p : long_settings_) {
out << "<long name=\"" << p.first << "\" value=\"" << p.second
diff --git a/Src/Win32/Dasher_vc2013.VC.db b/Src/Win32/Dasher_vc2013.VC.db
new file mode 100644
index 0000000..3deaf8e
Binary files /dev/null and b/Src/Win32/Dasher_vc2013.VC.db differ
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]