mirror of
https://github.com/flynx/photobook.git
synced 2026-06-09 20:53:12 +00:00
Compare commits
No commits in common. "643a656553f819dd6f5f75d8bd9f99508743fe99" and "035861ef7729f9a892dde87747eceaa561c1d0b9" have entirely different histories.
643a656553
...
035861ef77
@ -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.23}
|
||||
\edef\photobook@FILEVERSION{v0.1.22}
|
||||
\edef\photobook@FILEDATE{2023-05-05}
|
||||
|
||||
|
||||
|
||||
@ -56,11 +56,9 @@ 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}
|
||||
@ -368,9 +366,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
|
||||
@ -493,10 +491,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
|
||||
@ -576,7 +574,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