From 923c421b3cbb2d6b55f40595034a12c19fef7c1b Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@users.sourceforge.net>
Date: Sat, 17 Sep 2016 12:07:40 +0200
Subject: Drop legacy nofullsize and album width/height/quality tags

This drops the legacy functionality that doesn't really fit into the
new flexible design concept and makes code unnecessarily complicated.

Most of these overrides affected only the "preview" image size anyway.

This also makes the <item src> attribute mandatory as it's being the only
source of metadata (unless overriden or supplied externally).

This unfortunately breaks the so-far 100% album XML files compatibility.
---
 sample/src/CIAF_1/index.xml   | 9 +--------
 sample/src/entities/index.xml | 4 ++--
 sample/src/setup.xml          | 6 ------
 3 files changed, 3 insertions(+), 16 deletions(-)

(limited to 'sample/src')

diff --git a/sample/src/CIAF_1/index.xml b/sample/src/CIAF_1/index.xml
index cf53d61..1172b33 100644
--- a/sample/src/CIAF_1/index.xml
+++ b/sample/src/CIAF_1/index.xml
@@ -14,8 +14,6 @@
       ]]>
     </footnote>
 
-    <!--  legacy behaviour: you can override global settings in each album (applies only to the "preview" image size):  -->
-    <images quality="60" landscape_w="640" landscape_h="480" portrait_w="480" portrait_h="640" />
     <!--  override global preview image border style -->
     <border style="border_none" />
 
@@ -55,11 +53,6 @@
     
     <interspace><![CDATA[This is so-called intespace - simple paragraph or a block with an additional information to the section. This may be used with &lt;separator&gt; but not necessarily, interspace can stand alone between items in the album. Useful for links or few senteces to separated topic.]]></interspace>
     
-    <item preview="preview/img_6802d.jpg">
-      <title>Photo title</title>
-      <title_description>This photo doesn't contain link to original image nor the src parameter, EXIF data are extracted from the preview image.</title_description>
-    </item>
-
     <item>
       <title>Invalid item</title>
       <title_description>Invalid item (no src specified), will be skipped.</title_description>
@@ -96,7 +89,7 @@
 
     <separator>Misc.</separator>
 
-    <item preview="preview/img_6802g.jpg" thumbnail="thumbnails/gallery_thumbnails.gif">
+    <item src="preview/img_6802g.jpg" thumbnail="thumbnails/gallery_thumbnails.gif">
       <title>Custom thumbnail</title>
       <title_description>This item uses supplied thumbnail</title_description>
     </item>
diff --git a/sample/src/entities/index.xml b/sample/src/entities/index.xml
index 44776ca..6761015 100644
--- a/sample/src/entities/index.xml
+++ b/sample/src/entities/index.xml
@@ -20,12 +20,12 @@
   </general>
   
   <items>
-    <item preview="preview/img_6802.jpg">
+    <item src="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">
+    <item src="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>
diff --git a/sample/src/setup.xml b/sample/src/setup.xml
index a67923d..54bfb5b 100644
--- a/sample/src/setup.xml
+++ b/sample/src/setup.xml
@@ -36,12 +36,6 @@
     <!--           (think of source RAW file vs. processed JPEG image differences)              -->
     <write_supplied_exif value="no" />
 
-    <!--  don't copy full size (original) images                         -->
-    <!--    <nofullsize/> can be used globally for whole gallery,        -->
-    <!--    for full album or selectively for each image                 -->
-    <!--    - override with <fullsize/> for album or for separate image  -->
-<!--    <nofullsize />  -->
-
     <!--  autorotate input images according to EXIF information, unless   -->
     <!--  provided in the album source file (copy mode)  (default = yes)  -->
     <autorotate value="yes" />
-- 
cgit v1.2.3