mirror of
https://github.com/flynx/photobook.git
synced 2026-01-06 02:21:08 +00:00
Compare commits
2 Commits
035861ef77
...
643a656553
| Author | SHA1 | Date | |
|---|---|---|---|
| 643a656553 | |||
| 36a9c8d380 |
@ -93,7 +93,7 @@
|
||||
|
||||
%%% NOTE: \def\<module-name>@[A-Z]+ macros will be visible to both the
|
||||
%%% code and the generated docs...
|
||||
\edef\photobook@FILEVERSION{v0.1.22}
|
||||
\edef\photobook@FILEVERSION{v0.1.23}
|
||||
\edef\photobook@FILEDATE{2023-05-05}
|
||||
|
||||
|
||||
|
||||
@ -56,9 +56,11 @@ ANOTATE_IMAGE_PATHS=${ANOTATE_IMAGE_PATHS:=}
|
||||
# supported formats/extensions...
|
||||
TEXT_FORMATS=${TEXT_FORMATS:=$CFG_TEXT_FORMATS}
|
||||
TEXT_FORMATS=${TEXT_FORMATS:=txt}
|
||||
TEXT_FORMATS=${TEXT_FORMATS,,}
|
||||
|
||||
IMAGE_FORMATS=${IMAGE_FORMATS:=$CFG_IMAGE_FORMATS}
|
||||
IMAGE_FORMATS=${IMAGE_FORMATS:=jpeg|jpg|png|pdf|svg|eps}
|
||||
IMAGE_FORMATS=${IMAGE_FORMATS,,}
|
||||
|
||||
|
||||
SPREADS_DIR=${SPREADS_DIR:=$CFG_SPREADS_DIR}
|
||||
@ -366,9 +368,9 @@ populateTemplate(){
|
||||
local txt=()
|
||||
local elem
|
||||
for elem in "${items[@]}" ; do
|
||||
if [[ "$elem" =~ $IMAGE_FORMATS ]] ; then
|
||||
if [[ "${elem,,}" =~ $IMAGE_FORMATS ]] ; then
|
||||
img+=("$elem")
|
||||
elif [[ "$elem" =~ $TEXT_FORMATS ]] ; then
|
||||
elif [[ "${elem,,}" =~ $TEXT_FORMATS ]] ; then
|
||||
txt+=("$elem")
|
||||
fi
|
||||
done
|
||||
@ -491,10 +493,10 @@ handleSpread(){
|
||||
local txt=()
|
||||
local items=()
|
||||
for elem in "$spread"/* ; do
|
||||
if [[ "$elem" =~ $IMAGE_FORMATS ]] ; then
|
||||
if [[ "${elem,,}" =~ $IMAGE_FORMATS ]] ; then
|
||||
img+=("$elem")
|
||||
items+=("$elem")
|
||||
elif [[ "$elem" =~ $TEXT_FORMATS ]] ; then
|
||||
elif [[ "${elem,,}" =~ $TEXT_FORMATS ]] ; then
|
||||
txt+=("$elem")
|
||||
items+=("$elem")
|
||||
fi
|
||||
@ -574,7 +576,7 @@ handleSpread(){
|
||||
# slots/files from list...
|
||||
|
||||
# image...
|
||||
if [[ "$elem" =~ $IMAGE_FORMATS ]] ; then
|
||||
if [[ "${elem,,}" =~ $IMAGE_FORMATS ]] ; then
|
||||
echo %
|
||||
echo "% $P page (image)..."
|
||||
template=`getTemplate "$spread" "$IMAGE_PAGE"`
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user