Add rudimentary captions

Very simple caption addition code, using a file called "captions.txt" in the photos directory.

git-archimport-id: arch@sommitrealweird.co.uk--2005-desktop/bpgallery--mainline--0.9.2--patch-9

diff --git a/bpgallery.sh b/bpgallery.sh
index 07b0d228b7b0fb4aa8c4246ba65d28a41950b5cd..96cd77f97350dc4f271cc86bd83c4e3290b68192 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -36,7 +36,7 @@ END
 
 function bpgallery_default_thumbsline() {
 cat << 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
 }
 
 END
 }
 


@@ -53,7 +53,7 @@ body {
         background: white;
         color: black;
         font-family: sans-serif;
         background: white;
         color: black;
         font-family: sans-serif;

-        font-size: 12pt;
+        font-size: 10pt;

 }
 
 div.thumbnail {
 }
 
 div.thumbnail {


@@ -64,6 +64,12 @@ div.thumbnail {
         height: ${MAXHEIGHT}px;
 }
 
         height: ${MAXHEIGHT}px;
 }
 

+div.caption {
+       width: 100%;
+       text-align: center;
+       font-weight: bold;
+}
+

 a {
         border: 0px;
 }
 a {
         border: 0px;
 }


@@ -130,6 +136,10 @@ if [[ -z $HEADCOMMAND ]]; then
        HEADCOMMAND=head
 fi
 
        HEADCOMMAND=head
 fi
 

+if [[ -z $GREPCOMMAND ]]; then
+       GREPCOMMAND=grep
+fi
+

 if [[ -z $WIDTH ]]; then
        WIDTH=100
 fi
 if [[ -z $WIDTH ]]; then
        WIDTH=100
 fi


@@ -238,7 +248,7 @@ echo done: $totalimages/$totalimages images
 
 $BPGALLERY_HEAD_FUNCTION > index.html
 
 
 $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#./}; caption=$($GREPCOMMAND -E "^$filename       " captions.txt); caption=${caption#*    }; $BPGALLERY_THUMBSLINE_FUNCTION; done >> index.html

 
 $BPGALLERY_TAIL_FUNCTION >> index.html
 
 
 $BPGALLERY_TAIL_FUNCTION >> index.html