Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed pdf static dir handling #720

Closed
wants to merge 2 commits into from
Closed

Fixed pdf static dir handling #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c391438
Fixed pdf static dir handling
fsundermeyer Nov 13, 2023
e656610
Alo support <STYLEROOT>/<STYLEHTML>/images
fsundermeyer Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions make/html.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ else
#
STYLEIMG := $(firstword $(wildcard \
$(addsuffix static, $(dir $(STYLEHTML)))\
$(addsuffix images, $(dir $(STYLEHTML)))\
$(addsuffix static,$(dir $(patsubst %/,%,$(dir $(STYLEHTML)))))\
$(addsuffix images,$(dir $(patsubst %/,%,$(dir $(STYLEHTML)))))))

Expand Down
94 changes: 27 additions & 67 deletions make/pdf.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,38 +34,6 @@ STYLEFO := $(firstword $(wildcard $(addsuffix \
STYLE_GENINDEX := $(DAPSROOT)/daps-xslt/index/xml2idx.xsl
STYLE_ISINDEX := $(DAPSROOT)/daps-xslt/common/search4index.xsl

# Issue #419
# The upstream stylesheets set paths for admon, callout, and navig graphics
# to "images/" by default. However, DAPS' HTML builds require to set these
# paths to static/images/ regardless what the stylesheets set
# To ensure the same path ("static/images/") can be used for HTML and PDF
# we need to create "static/images/" relative to the FO file
# This is done by the target $(TMP_STATIC_IMG_DIR): by setting a link to the
# stylesheet image or static directory
# In addition to that, we will also create a link $(TMP_DIR)/images to ensure
# building PDFs without explicitly setting a path for admon/callouts works
# as well.
#
# First, determine whether we have <STYLEROOT>/static or <STYLEROOT>/images
# (for a detailed explanation see html.mk)
#
# If we have a static directory, we can create a link to it in $(TMP_DIR)
# If we have an image directory, $(TMP_DIR)/static needs to be created and
# then a link to images in $(TMP_DIR)/static
#
ifdef STATIC_DIR
STYLEIMG := $(STATIC_DIR)
IS_STATIC := static
else
STYLEIMG := $(firstword $(wildcard \
$(addsuffix static, $(dir $(STYLEFO)))\
$(addsuffix static,$(dir $(patsubst %/,%,$(dir $(STYLEFO)))))\
$(addsuffix images,$(dir $(patsubst %/,%,$(dir $(STYLEFO)))))))
IS_STATIC := $(notdir $(STYLEIMG))
endif

TMP_STATIC_DIR := $(TMP_DIR)/static

# Draft mode can be enabled for PDFs, so we need to add the
# corresponding strings to the resulting filename
#
Expand Down Expand Up @@ -128,44 +96,37 @@ ifeq "$(FORMATTER)" "xep"
endif


# Issue #419 continued
# The links to image or static directories need to be removed once the PDF
# has been built, since we do not know which stylesheets (and therefore
# which image directories) will be used in the next build.
# Since $(TMP_DIR)/static/ can be a directory, INTERMEDIATE will not work
# (does not remove directories), therefor using an explicit
# rm in $(PDF_RESULT):

ifneq "$(IS_STATIC)" "static"
#
# we have <STYLEROOT>/image
# 1. create $(TMP_DIR)/static
# 2. create link to images in $(TMP_DIR)/static
# 3. create lilnk $(TMP_DIR)/images
#
TMP_IMG_DIR := $(TMP_DIR)/images
TMP_STATIC_IMG_DIR := $(TMP_STATIC_DIR)/images


$(TMP_STATIC_DIR): | $(TMP_DIR)
mkdir -p $@

$(TMP_STATIC_IMG_DIR): | $(TMP_STATIC_DIR)
(cd $(TMP_STATIC_DIR) && ln -sf $(STYLEIMG))

$(TMP_IMG_DIR): | $(TMP_DIR)
(cd $(TMP_DIR) && ln -sf $(STYLEIMG))
# Issue #419
# The upstream stylesheets set paths for admon, callout, and navig graphics
# to "images/" by default. However, it is easier to collect images, css, and Javascript
# files under a directory "<STYLEROOT>/static". DAPS supports this
#
# For fo it supports the following:
# 1. <STYLEROOT>/fo/static/images
# 2. <STYLEROOT>/fo/images
# 3. <STYLEROOT>/static/images
# 4. <STYLEROOT>/images
#
# In this order. First one wins
#

ifdef STATIC_DIR
_STYLEIMG := $(STATIC_DIR)
# IS_STATIC := static
else
#
# we have <STYLEROOT>/static
# create link to static in $(TMP_DIR)
#
$(TMP_STATIC_DIR): | $(TMP_DIR)
(cd $(TMP_DIR) && ln -sf $(STYLEIMG))

_STYLEIMG := $(firstword $(wildcard \
$(addsuffix static/images, $(dir $(STYLEFO)))\
$(addsuffix images, $(dir $(STYLEFO)))\
$(addsuffix static/images,$(dir $(patsubst %/,%,$(dir $(STYLEFO)))))\
$(addsuffix images,$(dir $(patsubst %/,%,$(dir $(STYLEFO)))))))
# IS_STATIC := $(notdir $(STYLEIMG))
endif

# Remove training slash if present
#
STYLEIMG=$(patsubst %/,%,$(_STYLEIMG))

FOSTRINGS += --stringparam "admon.graphics.path=$(STYLEIMG)/"

#--------------
# PDF
Expand Down Expand Up @@ -245,7 +206,6 @@ $(PDF_RESULT): $(FOFILE)
@ccecho "info" " Creating PDF from fo-file..."
endif
(cd $(dir $(FOFILE)) && $(FORMATTER_CMD) $< $@ $(DEVNULL) $(ERR_DEVNULL))
@rm -rf $(TMP_STATIC_DIR) $(TMP_IMG_DIR)
ifeq "$(VERBOSITY)" "2"
ifneq "$(HAVE_PDFFONTS)" ""
@pdffonts $@ | tail -n +3 | awk '{print $5}' | grep -v "yes" \
Expand Down
Loading