Up version number for release

[bpgallery.git] / bpgallery.sh

diff --git a/bpgallery.sh b/bpgallery.sh
index 3191eed9db26a7a89f810c00d652aaff0f8e3136..c2a38700d543e06dba49e8e252807426641d4bc6 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -1,25 +1,25 @@
 #!/usr/bin/env bash
 
 # bpgallery.sh - builds a simple 'gallery' from a collection of images
 #!/usr/bin/env bash
 
 # bpgallery.sh - builds a simple 'gallery' from a collection of images

-# Copyright (C) 2004 Brett Parker <iDunno@sommitrealweird.co.uk>
+# Copyright (C) 2004-2008 Brett Parker <iDunno@sommitrealweird.co.uk>

 #
 #

-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This program is free software; you can redistribute it and/or modify 
+# it under the terms of the GNU General Public License as published by 
+# the Free Software Foundation; either version 2 of the License, or 

 # (at your option) any later version.
 # 
 # (at your option) any later version.
 # 

-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 

 # GNU General Public License for more details.
 # 
 # GNU General Public License for more details.
 # 

-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 
 set -f
 
 
 set -f
 

-VERSION="1.1.2"
+VERSION="1.1.4"

 
 function bpgallery_default_head() {
 cat <<END
 
 function bpgallery_default_head() {
 cat <<END


@@ -499,9 +499,16 @@ set.
         WIDTH
             the width to make the icons
 
         WIDTH
             the width to make the icons
 

+        HEIGHT
+            the height to make the icons (sets up a bounding box with WIDTH)
+

         MEDIUMWIDTH
             set the width of images in the medium size pages
 
         MEDIUMWIDTH
             set the width of images in the medium size pages
 

+        MEDIUMHEIGHT
+            the height to make images in the medium size pages (sets up a
+            bounding box with MEDIUMWIDTH)
+

         BPGALLERY_THEME
             set the theme to use (described below)
 
         BPGALLERY_THEME
             set the theme to use (described below)
 


@@ -536,6 +543,10 @@ function check_dimensions() {
        wantedheight=$2
        dir=$3
        filename=$4
        wantedheight=$2
        dir=$3
        filename=$4

+       if [ ! -e "$dir/$filename" ]; then
+               echo 0
+               return
+       fi

        iconwidth=$($IDENTIFYCOMMAND -format "%wx%h" "$dir/$filename")
        iconheight=${iconwidth//*x}
        iconwidth=${iconwidth//x*}
        iconwidth=$($IDENTIFYCOMMAND -format "%wx%h" "$dir/$filename")
        iconheight=${iconwidth//*x}
        iconwidth=${iconwidth//x*}