The Ultimate Entity Solution (tm)

5 files changed, 37 insertions, 2 deletions

diff --git a/sample/src/CIAF_1/index.xml b/sample/src/CIAF_1/index.xml
index 5d40936..8f4abb7 100644
--- a/sample/src/CIAF_1/index.xml
+++ b/sample/src/CIAF_1/index.xml
@@ -46,7 +46,7 @@
       <title_description>This photo doesn't contain link to original image, but src parameter is specified.</title_description>
     </item>
 
-    <separator><![CDATA[This is a separator inside a single album. We <u>can</u> <small>have</small> <strong>CDATA</strong> entries here!]]></separator>
+    <separator><![CDATA[This is a separator inside a single album. We <span style="text-decoration: underline;">can</span> <small>have</small> <strong>CDATA</strong> entries here!]]></separator>
 
     <item preview="preview/img_6802d.jpg">
       <title>Photo title</title>
@@ -69,7 +69,7 @@
     </item>
 
     <item src="img_7270.jpg">
-      <title><![CDATA[Photo containing <em>CDATA</em> <u>structures</u>]]></title>
+      <title><![CDATA[Photo containing <em>CDATA</em> <span style="text-decoration: underline;">structures</span>]]></title>
       <title_description><![CDATA[Can contain <a href="http://cgg.bzatek.net/" title="Cataract Gallery Generator" class="footermail">links</a> etc...]]></title_description>
     </item>
 
diff --git a/sample/src/entities/index.xml b/sample/src/entities/index.xml
new file mode 100644
index 0000000..54bdb2f
--- /dev/null
+++ b/sample/src/entities/index.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gallery type="album">
+  <general>
+    <ID>Entities &#8594; '&amp;' "&amp;copy;"</ID>
+    <title>Entities &#8594; '&amp;' "&amp;copy;"</title>
+    <description><![CDATA[Entities &#8594; '&amp;' "&copy;" &lt; <b>ahoj!</b> <!-- comment <b>neco</b> -->]]></description>
+    <footnote>  <![CDATA[Entities &#8594; '&amp;' "&copy;" &lt; <b>ahoj!</b> <!-- comment <b>neco</b> -->]]>
+    </footnote>
+
+    <meta>
+      <author>META Author &#8594; '&amp;' "&amp;copy;"</author>
+      <description><![CDATA[META Description &#8594; '&amp;' "&copy;" &lt; <b>ahoj!</b> <!-- comment <b>neco</b> -->]]></description>
+    </meta>  
+  </general>
+  
+  <items>
+    <item preview="preview/img_6802.jpg">
+      <title>Entities &#8594; '&amp;' "&amp;copy;"</title>
+      <title_description>Entities &#8594; '&amp;' "&amp;copy;"</title_description>
+    </item>
+
+    <item preview="preview/img_6802b.jpg">
+      <title><![CDATA[Entities &#8594; '&amp;' "&copy;" &lt; <b>ahoj!</b> <!-- comment <b>neco</b> -->]]></title>
+      <title_description><![CDATA[Entities &#8594; '&amp;' "&copy;" &lt; <b>ahoj!</b> <!-- comment <b>neco</b> -->]]></title_description>
+    </item>
+
+  </items>
+</gallery>
diff --git a/sample/src/entities/preview/img_6802.jpg b/sample/src/entities/preview/img_6802.jpg
new file mode 120000
index 0000000..a13dc2a
--- /dev/null
+++ b/sample/src/entities/preview/img_6802.jpg
@@ -0,0 +1 @@
+../../CIAF_1/preview/img_6802.jpg
\ No newline at end of file
diff --git a/sample/src/entities/preview/img_6802b.jpg b/sample/src/entities/preview/img_6802b.jpg
new file mode 120000
index 0000000..a13dc2a
--- /dev/null
+++ b/sample/src/entities/preview/img_6802b.jpg
@@ -0,0 +1 @@
+../../CIAF_1/preview/img_6802.jpg
\ No newline at end of file
diff --git a/sample/src/index.xml b/sample/src/index.xml
index 79a90c1..80f6145 100644
--- a/sample/src/index.xml
+++ b/sample/src/index.xml
@@ -40,5 +40,10 @@
 
     <item path="inheritance"></item>
 
+    <item path="entities">
+      <title>Entities &#8594; '&amp;' "&amp;copy;"</title>
+      <title_description><![CDATA[Entities &nbsp; '&amp;' "&copy;" &lt; <br /><b>ahoj!</b> <!-- comment <b>neco</b> -->xx]]></title_description>
+    </item>
+
   </items>
 </gallery>