>From 66fa50f1b811d1b2abb632ac60925bb0ae1e83c5 Mon Sep 17 00:00:00 2001 From: Akira Yokosawa <akiyks@xxxxxxxxx> Date: Sat, 12 May 2018 00:58:41 +0900 Subject: [PATCH 8/9] Makefile: Move check of 'Steel City Comic' font from runlatex.sh This check can be done in Makefile before invoking inkscape. Signed-off-by: Akira Yokosawa <akiyks@xxxxxxxxx> --- Makefile | 4 ++++ utilities/runlatex.sh | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 42296fa..6a704d2 100644 --- a/Makefile +++ b/Makefile @@ -58,6 +58,7 @@ FIG2EPS := $(shell which fig2eps 2>/dev/null) A2PING := $(shell which a2ping 2>/dev/null) INKSCAPE := $(shell which inkscape 2>/dev/null) LATEXPAND := $(shell which latexpand 2>/dev/null) +STEELFONT := $(shell fc-list | grep -c -i steel) URWPS := $(shell fc-list | grep "Nimbus Mono PS" | wc -l) ifeq ($(URWPS),0) @@ -220,6 +221,9 @@ endif $(PDFTARGETS_OF_SVG): %.pdf: %.svg @echo "$< --> $@" +ifeq ($(STEELFONT),0) + $(error "Steel City Comic" font not found. See #1 in FAQ.txt) +endif ifndef INKSCAPE $(error $< --> $@ inkscape not found. Please install it) endif diff --git a/utilities/runlatex.sh b/utilities/runlatex.sh index 81800db..289364d 100644 --- a/utilities/runlatex.sh +++ b/utilities/runlatex.sh @@ -129,13 +129,5 @@ echo "'$basename.pdf' is ready." # to avoid redundant run of bibtex and pdflatex touch $basename.bbl touch $basename.pdf -if ! strings cartoons/r-2014-Old-man-and-Brat.pdf | grep -q -i -e "Steel City Comic" -e "Test" -then - echo "#######################################################################" - echo "## Steel City Comic font is not found in the resulting PDF! ##" - echo "## Some speech balloons in the cartoons have been rendered awkwardly.##" - echo "## See item 1 in FAQ.txt and FAQ-BUILD.txt to fix the font issue. ##" - echo "#######################################################################" -fi sh utilities/mpostcheck.sh exit 0 -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe perfbook" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
