X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/blobdiff_plain/520898d410c484066e680a2a88ff033e0e3153b6..657a5a1384747ed03979162ea282e5653a790acc:/bpgallery.sh

diff --git a/bpgallery.sh b/bpgallery.sh
index 07b0d22..0d2009e 100755
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -19,7 +19,7 @@
 
 set -f
 
-VERSION="0.9.2+arch"
+VERSION="0.9.3+arch"
 
 function bpgallery_default_head() {
 cat <<END
@@ -36,7 +36,7 @@ END
 
 function bpgallery_default_thumbsline() {
 cat << END
-<div class="thumbnail"><a href="$filename"><img src="icons/$filename" /></a></div>
+<div class="thumbnail"><a href="$filename"><img src="icons/$filename" /></a><div class="caption">$caption</div></div>
 END
 }
 
@@ -53,7 +53,7 @@ body {
         background: white;
         color: black;
         font-family: sans-serif;
-        font-size: 12pt;
+        font-size: 10pt;
 }
 
 div.thumbnail {
@@ -64,6 +64,12 @@ div.thumbnail {
         height: ${MAXHEIGHT}px;
 }
 
+div.caption {
+	width: 100%;
+	text-align: center;
+	font-weight: bold;
+}
+
 a {
         border: 0px;
 }
@@ -130,6 +136,10 @@ if [[ -z $HEADCOMMAND ]]; then
 	HEADCOMMAND=head
 fi
 
+if [[ -z $GREPCOMMAND ]]; then
+	GREPCOMMAND=grep
+fi
+
 if [[ -z $WIDTH ]]; then
 	WIDTH=100
 fi
@@ -142,6 +152,10 @@ if [[ -z $WCCOMMAND ]]; then
 	WCCOMMAND="wc -l"
 fi
 
+if [[ -z $CAPTIONHEIGHT ]]; then
+	CAPTIONHEIGHT=75
+fi
+
 if declare -F "bpgallery_${BPGALLERY_THEME}_head" > /dev/null ; then
 	BPGALLERY_HEAD_FUNCTION="bpgallery_${BPGALLERY_THEME}_head"
 else
@@ -238,23 +252,18 @@ echo done: $totalimages/$totalimages images
 
 $BPGALLERY_HEAD_FUNCTION > index.html
 
-$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} |$SORTCOMMAND -g | while read filename; do filename=${filename#./}; $BPGALLERY_THUMBSLINE_FUNCTION; done >> index.html
+$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} |$SORTCOMMAND -g | while read filename; do filename=${filename#./}; if [ -r captions.txt ]; then caption=$($GREPCOMMAND -E "^$filename	" captions.txt); caption=${caption#*	}; else caption=""; fi; $BPGALLERY_THUMBSLINE_FUNCTION; done >> index.html
 
 $BPGALLERY_TAIL_FUNCTION >> index.html
 
 cd icons
 
-for imageext in $IMAGEEXTENSIONS; do
-	if ( ls "*.$imageext" > /dev/null 2>/dev/null ); then
-		TEMPMAX=$($IDENTIFYCOMMAND *.$imageext | grep "Geometry:" | sed -r 's#^.*Geometry:.*?[0-9]+x([0-9]+)\+.*$#\1#' | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1)
-		if [[ $TEMPMAX -gt $MAXHEIGHT ]]; then
-			MAXHEIGHT=$TEMPMAX
-		fi
-	fi
-done
+MAXHEIGHT=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 $IDENTIFYCOMMAND -format "%h\n" | $GREPCOMMAND -v "^$" | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1)
 
 cd ..
 
+# add a bit to the maxheight for the size of the caption
+MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT))
 
 $BPGALLERY_STYLESHEET_FUNCTION > style.css