* [PATCH 1/9] Makefile: Add sed pattern to accommodate fontconfig 2.13.0
2018-05-12 4:12 [PATCH 0/9] Update Makefile for Fedora 28 Akira Yokosawa
@ 2018-05-12 4:14 ` Akira Yokosawa
2018-05-12 4:15 ` [PATCH 2/9] fixsvgfonts: Fix typo Akira Yokosawa
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Akira Yokosawa @ 2018-05-12 4:14 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: perfbook, Akira Yokosawa
From 9817247baeaab6781acda56214fc4c1d31aa676d Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@gmail.com>
Date: Sat, 12 May 2018 00:24:38 +0900
Subject: [PATCH 1/9] Makefile: Add sed pattern to accommodate fontconfig 2.13.0
It is observed that fontconfig 2.13.0 recognizes "Steel City Comic"
font just as "Test". Add sed patterns to convert the fontfamily
specifier in .svg files on-the-fly in such cases.
This issue is observed on Fedora 28.
Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
---
Makefile | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Makefile b/Makefile
index a208920..2b2ce2e 100644
--- a/Makefile
+++ b/Makefile
@@ -71,6 +71,8 @@ FIXSVGFONTS = utilities/fixsvgfonts-urwps.sh
FIXANEPSFONTS = utilities/fixanepsfonts-urwps.sh
endif
+STEELFONTID := $(shell fc-list | grep -i steel | grep -c Steel)
+
default = $(PERFBOOK_DEFAULT)
ifeq ($(default),)
@@ -204,7 +206,11 @@ $(PDFTARGETS_OF_SVG): %.pdf: %.svg
ifndef INKSCAPE
$(error "$< --> $@: inkscape not found. Please install it.")
endif
+ifeq ($(STEELFONTID),0)
+ @sh $(FIXSVGFONTS) < $< | sed -e 's/Steel City Comic/Test/g' > $<i
+else
@sh $(FIXSVGFONTS) < $< > $<i
+endif
@inkscape --export-pdf=$@ $<i > /dev/null 2>&1
@rm -f $<i
@@ -213,7 +219,11 @@ $(PNGTARGETS_OF_SVG): %.png: %.svg
ifndef INKSCAPE
$(error "$< --> $@: inkscape not found. Please install it.")
endif
+ifeq ($(STEELFONTID),0)
+ @sh $(FIXSVGFONTS) < $< | sed -e 's/Steel City Comic/Test/g' > $<i
+else
@sh $(FIXSVGFONTS) < $< > $<i
+endif
@inkscape --export-dpi=200 --export-png=$@ $<i > /dev/null 2>&1
@rm -f $<i
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/9] fixsvgfonts: Fix typo
2018-05-12 4:12 [PATCH 0/9] Update Makefile for Fedora 28 Akira Yokosawa
2018-05-12 4:14 ` [PATCH 1/9] Makefile: Add sed pattern to accommodate fontconfig 2.13.0 Akira Yokosawa
@ 2018-05-12 4:15 ` Akira Yokosawa
2018-05-12 4:16 ` [PATCH 3/9] FAQ-BUILD: Add note on Fedora 28, 27, and other Linux distros Akira Yokosawa
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Akira Yokosawa @ 2018-05-12 4:15 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: perfbook, Akira Yokosawa
From ef1811c7c57cd685222732c5cb53d4f579e56a81 Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@gmail.com>
Date: Sat, 12 May 2018 00:36:59 +0900
Subject: [PATCH 2/9] fixsvgfonts: Fix typo
There was a typo in sed pattern as well as in header comment.
Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
---
utilities/fixsvgfonts-urwps.sh | 4 ++--
utilities/fixsvgfonts.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/utilities/fixsvgfonts-urwps.sh b/utilities/fixsvgfonts-urwps.sh
index ac55b4a..a917fea 100644
--- a/utilities/fixsvgfonts-urwps.sh
+++ b/utilities/fixsvgfonts-urwps.sh
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
#
# fixsvgfonts-urwps.sh: Convert an .svg file to use embeddable fonts,
-# taking from standard input and putting on standar output.
+# taking from standard input and putting on standard output.
#
# Copyright (c) 2018 Akira Yokosawa
@@ -20,4 +20,4 @@ sed -e 's+family:Helvetica+family:Nimbus Sans+g' \
-e 's+family="Nimbus Mono L+family="Nimbus Mono PS+g' \
-e 's+cation:Nimbus Mono L+cation:Nimbus Mono PS+g' \
-e 's+family:Standard Symbols L+family:Standard Symbols PS+g' \
- -e 's+cation:Standard Symbosl L+cation:Standard Symbols PS+g'
+ -e 's+cation:Standard Symbols L+cation:Standard Symbols PS+g'
diff --git a/utilities/fixsvgfonts.sh b/utilities/fixsvgfonts.sh
index 812cbc2..287d3e2 100644
--- a/utilities/fixsvgfonts.sh
+++ b/utilities/fixsvgfonts.sh
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
#
# fixsvgfonts.sh: Convert an .svg file to use embeddable fonts, taking from
-# standard input and putting on standar output.
+# standard input and putting on standard output.
#
# Copyright (c) 2018 Akira Yokosawa
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 3/9] FAQ-BUILD: Add note on Fedora 28, 27, and other Linux distros
2018-05-12 4:12 [PATCH 0/9] Update Makefile for Fedora 28 Akira Yokosawa
2018-05-12 4:14 ` [PATCH 1/9] Makefile: Add sed pattern to accommodate fontconfig 2.13.0 Akira Yokosawa
2018-05-12 4:15 ` [PATCH 2/9] fixsvgfonts: Fix typo Akira Yokosawa
@ 2018-05-12 4:16 ` Akira Yokosawa
2018-05-12 4:18 ` [PATCH 4/9] Makefile: Add 'latexpand' existence check Akira Yokosawa
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Akira Yokosawa @ 2018-05-12 4:16 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: perfbook, Akira Yokosawa
From 093da12a7fea59ddddf2c1cac6a4ad878aed14af Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@gmail.com>
Date: Sat, 12 May 2018 00:40:03 +0900
Subject: [PATCH 3/9] FAQ-BUILD: Add note on Fedora 28, 27, and other Linux distros
Also remove out-of-date info on RHEL and Fedora.
Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
---
FAQ-BUILD.txt | 41 ++++++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 19 deletions(-)
diff --git a/FAQ-BUILD.txt b/FAQ-BUILD.txt
index bf81a85..6faa705 100644
--- a/FAQ-BUILD.txt
+++ b/FAQ-BUILD.txt
@@ -56,27 +56,30 @@
You might need to fetch a version of a2ping which is
compatible with Ghostscript 9.22. See #7 below.
- On Fedora 26, installing the following set of packages
- suffices:
- texlive-a2ping fig2ps graphviz inkscape
+ On Fedora 28 and 27, installing the following set of
+ packages suffices:
+ texlive-collection-binextra
texlive-collection-latexextra
+ texlive-collection-fontsextra
+ fig2ps graphviz inkscape
- Other systems might provide similarly named packages.
- For example, Doug Miller noted that the following list
- of teTeX components worked for him on RHEL5:
+ You need to install a version of a2ping compatible
+ with Ghostscript 9.22 or later. See #7 below.
- tetex tetex-afm tetex-dvips tetex-latex latex2html
- texinfo tetex-fonts tetex-doc tetex-xdvi
+ On other Linux distributions such as RHEL/CentOS and
+ Scientific Linux, where support of TeX Live packages
+ is insufficient, manually installing TeX Live should
+ be a reasonable choice.
+ See: https://www.tug.org/texlive/quickinstall.html
- For another example, Frederic Weisbecker reports that
- the following packages allows perfbook to be built on
- Fedora 19:
+ NOTE: In doing so, you might end up in having
+ redundant texlive packages of your choise
+ of distribution to satisfy dependency
+ of other packages.
- texlive-latex texlive-collection-latexextra
- psutils texlive-math* texlive-bibtex latex2html
- xfig (and maybe also gnuplot-latex
- texlive-publishers-doc texlive-fonts-extra
- texlive-science).
+ Besides TeX Live, you need the following list of
+ packages:
+ fig2ps graphviz inkscape
6. I cannot build perfbook, and the perfbook.log file complains
about some obscure package being missing. What do I do?
@@ -111,9 +114,9 @@
install those packages?
A. The simplest approach is to upgrade to a recent TeX
- distribution such as TeX Live 2016. Upgrading your Linux
- distribution (e.g. to Ubuntu Xenial) is one way to
- upgrade TeX Live (to 2015 on Xenial), and might have many
+ distribution such as TeX Live 2018. Upgrading your Linux
+ distribution (e.g. to Ubuntu Bionic) is one way to
+ upgrade TeX Live (to 2017 on Bionic), and might have many
other benefits as well.
However, if you prefer to manually install individual
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 4/9] Makefile: Add 'latexpand' existence check
2018-05-12 4:12 [PATCH 0/9] Update Makefile for Fedora 28 Akira Yokosawa
` (2 preceding siblings ...)
2018-05-12 4:16 ` [PATCH 3/9] FAQ-BUILD: Add note on Fedora 28, 27, and other Linux distros Akira Yokosawa
@ 2018-05-12 4:18 ` Akira Yokosawa
2018-05-12 4:19 ` [PATCH 5/9] .gitignore: Add intermediate file suffix Akira Yokosawa
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Akira Yokosawa @ 2018-05-12 4:18 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: perfbook, Akira Yokosawa
From 2888aa1bc01c4d87150c7f8cf5dcc9eb7ab47ac4 Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@gmail.com>
Date: Sat, 12 May 2018 00:48:35 +0900
Subject: [PATCH 4/9] Makefile: Add 'latexpand' existence check
On distributions like Fedora, where texlive packages are
finely fragmented, 'latexpand' can be missing.
Also remove blank lines in this part of Makefile.
Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
---
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 2b2ce2e..336da79 100644
--- a/Makefile
+++ b/Makefile
@@ -54,13 +54,10 @@ PNGTARGETS_OF_SVG := $(SVG_LARGE_BITMAP:%.svg=%.png)
TARGETS_OF_SVG := $(PDFTARGETS_OF_SVG) $(PNGTARGETS_OF_SVG)
DOT := $(shell which dot 2>/dev/null)
-
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)
URWPS := $(shell fc-list | grep "Nimbus Mono PS" | wc -l)
ifeq ($(URWPS),0)
@@ -107,6 +104,9 @@ autodate.tex: perfbook.tex $(LATEXSOURCES) $(BIBSOURCES) $(SVGSOURCES) $(FIGSOUR
sh utilities/autodate.sh >autodate.tex
perfbook_flat.tex: autodate.tex $(PDFTARGETS_OF_EPS) $(TARGETS_OF_SVG)
+ifndef LATEXPAND
+ $(error "--> $@: latexpand not found. Please install it.")
+endif
echo > qqz.tex
echo > contrib.tex
echo > origpub.tex
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 5/9] .gitignore: Add intermediate file suffix
2018-05-12 4:12 [PATCH 0/9] Update Makefile for Fedora 28 Akira Yokosawa
` (3 preceding siblings ...)
2018-05-12 4:18 ` [PATCH 4/9] Makefile: Add 'latexpand' existence check Akira Yokosawa
@ 2018-05-12 4:19 ` Akira Yokosawa
2018-05-12 4:20 ` [PATCH 6/9] Makefile: Add check of version conflict of a2ping Akira Yokosawa
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Akira Yokosawa @ 2018-05-12 4:19 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: perfbook, Akira Yokosawa
From d38e7159e5db13c36d78ccf4d1e21d1a83cecaf0 Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@gmail.com>
Date: Sat, 12 May 2018 00:49:24 +0900
Subject: [PATCH 5/9] .gitignore: Add intermediate file suffix
This change prevents autodate.sh from detecting intermediate files
as untracked files in parallel make.
Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
---
.gitignore | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitignore b/.gitignore
index f0b8339..e8e42fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,8 @@
*.tgz
*.bz2
*.swp
+*.epsi
+*.svgi
perfbook_flat.tex
qqz.tex
contrib.tex
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 6/9] Makefile: Add check of version conflict of a2ping
2018-05-12 4:12 [PATCH 0/9] Update Makefile for Fedora 28 Akira Yokosawa
` (4 preceding siblings ...)
2018-05-12 4:19 ` [PATCH 5/9] .gitignore: Add intermediate file suffix Akira Yokosawa
@ 2018-05-12 4:20 ` Akira Yokosawa
2018-05-12 4:22 ` [PATCH 7/9] Makefile: Remove redundant quotation marks in error functions Akira Yokosawa
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Akira Yokosawa @ 2018-05-12 4:20 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: perfbook, Akira Yokosawa
From f68d749640b962e128548454de229b18f195b4b9 Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@gmail.com>
Date: Sat, 12 May 2018 00:51:18 +0900
Subject: [PATCH 6/9] Makefile: Add check of version conflict of a2ping
This conflict is likely to be encountered by new readers.
Checking it in Makefile and output reference to FAQ-BUILD.txt
should be of help.
Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
---
Makefile | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/Makefile b/Makefile
index 336da79..a4875e2 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,17 @@ endif
STEELFONTID := $(shell fc-list | grep -i steel | grep -c Steel)
+ifdef A2PING
+A2PING_277P := $(shell a2ping --help 2>&1 | grep -c "2.77p,")
+ifeq ($(A2PING_277P),1)
+GS_VER := $(shell gs --version)
+A2PING_GSCNFL := $(shell env printf "%05.2f\n%05.2f\n" $(GS_VER) 9.22 | \
+ sort | head -1 | grep -c "09.22")
+else
+A2PING_GSCNFL := 0
+endif
+endif
+
default = $(PERFBOOK_DEFAULT)
ifeq ($(default),)
@@ -191,6 +202,9 @@ $(PDFTARGETS_OF_EPSORIG): %.pdf: %.eps
ifndef A2PING
$(error "$< --> $@: a2ping not found. Please install it.")
endif
+ifeq ($(A2PING_GSCNFL),1)
+ $(error "a2ping conflict detected. See #7 in FAQ-BUILD.txt.")
+endif
@a2ping --below --hires --bboxfrom=compute-gs $<i $@ > /dev/null 2>&1
@rm -f $<i
@@ -199,6 +213,9 @@ $(PDFTARGETS_OF_EPSOTHER): %.pdf: %.eps
ifndef A2PING
$(error "$< --> $@: a2ping not found. Please install it.")
endif
+ifeq ($(A2PING_GSCNFL),1)
+ $(error "a2ping conflict detected. See #7 in FAQ-BUILD.txt.")
+endif
@a2ping --below --hires --bboxfrom=compute-gs $< $@ > /dev/null 2>&1
$(PDFTARGETS_OF_SVG): %.pdf: %.svg
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 7/9] Makefile: Remove redundant quotation marks in error functions
2018-05-12 4:12 [PATCH 0/9] Update Makefile for Fedora 28 Akira Yokosawa
` (5 preceding siblings ...)
2018-05-12 4:20 ` [PATCH 6/9] Makefile: Add check of version conflict of a2ping Akira Yokosawa
@ 2018-05-12 4:22 ` Akira Yokosawa
2018-05-12 4:23 ` [PATCH 8/9] Makefile: Move check of 'Steel City Comic' font from runlatex.sh Akira Yokosawa
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Akira Yokosawa @ 2018-05-12 4:22 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: perfbook, Akira Yokosawa
From 8a3e3ba5003346f1506dbb07b2704643d710add2 Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@gmail.com>
Date: Sat, 12 May 2018 00:56:13 +0900
Subject: [PATCH 7/9] Makefile: Remove redundant quotation marks in error functions
Also adjust the position of an error function to avoid leaving
an intermediate file.
Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
---
Makefile | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index a4875e2..42296fa 100644
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ autodate.tex: perfbook.tex $(LATEXSOURCES) $(BIBSOURCES) $(SVGSOURCES) $(FIGSOUR
perfbook_flat.tex: autodate.tex $(PDFTARGETS_OF_EPS) $(TARGETS_OF_SVG)
ifndef LATEXPAND
- $(error "--> $@: latexpand not found. Please install it.")
+ $(error --> $@: latexpand not found. Please install it)
endif
echo > qqz.tex
echo > contrib.tex
@@ -182,7 +182,7 @@ $(EPSSOURCES_FROM_TEX): %.eps: %.tex
$(EPSSOURCES_FROM_DOT): %.eps: %.dot
@echo "$< --> $@"
ifndef DOT
- $(error "$< --> $@: dot not found. Please install graphviz")
+ $(error $< --> $@: dot not found. Please install graphviz)
endif
@dot -Tps -o $@ $<
@sh $(FIXANEPSFONTS) $@
@@ -190,38 +190,38 @@ endif
$(EPSSOURCES_FROM_FIG): %.eps: %.fig
@echo "$< --> $@"
ifndef FIG2EPS
- $(error "$< --> $@: fig2eps not found. Please install fig2ps")
+ $(error $< --> $@: fig2eps not found. Please install fig2ps)
endif
@fig2eps --nogv $< > /dev/null 2>&1
@sh $(FIXANEPSFONTS) $@
$(PDFTARGETS_OF_EPSORIG): %.pdf: %.eps
@echo "$< --> $@"
- @cp $< $<i
- @sh $(FIXANEPSFONTS) $<i
ifndef A2PING
- $(error "$< --> $@: a2ping not found. Please install it.")
+ $(error $< --> $@: a2ping not found. Please install it)
endif
ifeq ($(A2PING_GSCNFL),1)
- $(error "a2ping conflict detected. See #7 in FAQ-BUILD.txt.")
+ $(error a2ping version conflict. See #7 in FAQ-BUILD.txt)
endif
+ @cp $< $<i
+ @sh $(FIXANEPSFONTS) $<i
@a2ping --below --hires --bboxfrom=compute-gs $<i $@ > /dev/null 2>&1
@rm -f $<i
$(PDFTARGETS_OF_EPSOTHER): %.pdf: %.eps
@echo "$< --> $@"
ifndef A2PING
- $(error "$< --> $@: a2ping not found. Please install it.")
+ $(error $< --> $@: a2ping not found. Please install it)
endif
ifeq ($(A2PING_GSCNFL),1)
- $(error "a2ping conflict detected. See #7 in FAQ-BUILD.txt.")
+ $(error a2ping version conflict. See #7 in FAQ-BUILD.txt)
endif
@a2ping --below --hires --bboxfrom=compute-gs $< $@ > /dev/null 2>&1
$(PDFTARGETS_OF_SVG): %.pdf: %.svg
@echo "$< --> $@"
ifndef INKSCAPE
- $(error "$< --> $@: inkscape not found. Please install it.")
+ $(error $< --> $@ inkscape not found. Please install it)
endif
ifeq ($(STEELFONTID),0)
@sh $(FIXSVGFONTS) < $< | sed -e 's/Steel City Comic/Test/g' > $<i
@@ -234,7 +234,7 @@ endif
$(PNGTARGETS_OF_SVG): %.png: %.svg
@echo "$< --> $@"
ifndef INKSCAPE
- $(error "$< --> $@: inkscape not found. Please install it.")
+ $(error $< --> $@: inkscape not found. Please install it)
endif
ifeq ($(STEELFONTID),0)
@sh $(FIXSVGFONTS) < $< | sed -e 's/Steel City Comic/Test/g' > $<i
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 8/9] Makefile: Move check of 'Steel City Comic' font from runlatex.sh
2018-05-12 4:12 [PATCH 0/9] Update Makefile for Fedora 28 Akira Yokosawa
` (6 preceding siblings ...)
2018-05-12 4:22 ` [PATCH 7/9] Makefile: Remove redundant quotation marks in error functions Akira Yokosawa
@ 2018-05-12 4:23 ` Akira Yokosawa
2018-05-12 4:24 ` [PATCH 9/9] FAQ-BUILD: Rephrase #7 to reflect Makefile update Akira Yokosawa
2018-05-14 2:29 ` [PATCH 0/9] Update Makefile for Fedora 28 Paul E. McKenney
9 siblings, 0 replies; 11+ messages in thread
From: Akira Yokosawa @ 2018-05-12 4:23 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: perfbook, Akira Yokosawa
From 66fa50f1b811d1b2abb632ac60925bb0ae1e83c5 Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@gmail.com>
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@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 9/9] FAQ-BUILD: Rephrase #7 to reflect Makefile update
2018-05-12 4:12 [PATCH 0/9] Update Makefile for Fedora 28 Akira Yokosawa
` (7 preceding siblings ...)
2018-05-12 4:23 ` [PATCH 8/9] Makefile: Move check of 'Steel City Comic' font from runlatex.sh Akira Yokosawa
@ 2018-05-12 4:24 ` Akira Yokosawa
2018-05-14 2:29 ` [PATCH 0/9] Update Makefile for Fedora 28 Paul E. McKenney
9 siblings, 0 replies; 11+ messages in thread
From: Akira Yokosawa @ 2018-05-12 4:24 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: perfbook, Akira Yokosawa
From 0c02a970a352e72cf6e29bf2707c6404b1939ec7 Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@gmail.com>
Date: Sat, 12 May 2018 08:58:55 +0900
Subject: [PATCH 9/9] FAQ-BUILD: Rephrase #7 to reflect Makefile update
Version conflict of a2ping is checked in Makefile now.
Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
---
FAQ-BUILD.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/FAQ-BUILD.txt b/FAQ-BUILD.txt
index 6faa705..9fb3b68 100644
--- a/FAQ-BUILD.txt
+++ b/FAQ-BUILD.txt
@@ -86,8 +86,8 @@
A. Please see #5 above.
-7. I cannot build perfbook, neither can I find perfbook.log.
- What am I missing?
+7. Building perfbook aborts with error "a2ping version conflict".
+ What can I do?
A. Updating a2ping can resolve the build error if you
have Ghostscript 9.22 or later. Compatible a2ping
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 0/9] Update Makefile for Fedora 28
2018-05-12 4:12 [PATCH 0/9] Update Makefile for Fedora 28 Akira Yokosawa
` (8 preceding siblings ...)
2018-05-12 4:24 ` [PATCH 9/9] FAQ-BUILD: Rephrase #7 to reflect Makefile update Akira Yokosawa
@ 2018-05-14 2:29 ` Paul E. McKenney
9 siblings, 0 replies; 11+ messages in thread
From: Paul E. McKenney @ 2018-05-14 2:29 UTC (permalink / raw)
To: Akira Yokosawa; +Cc: perfbook
On Sat, May 12, 2018 at 01:12:28PM +0900, Akira Yokosawa wrote:
> >From 0c02a970a352e72cf6e29bf2707c6404b1939ec7 Mon Sep 17 00:00:00 2001
> From: Akira Yokosawa <akiyks@gmail.com>
> Date: Sat, 12 May 2018 13:05:53 +0900
> Subject: [PATCH 0/9] Update Makefile for Fedora 28
>
> Hi Paul,
>
> I tested building perfbook on Fedora 28 and encountered an
> issue around "Steel City Comic" font.
Applied and pushed, thank you very much!
Thanx, Paul
> On Ubuntu Zenial,
> $ fc-list -v "Steel City Comic"
> says:
> ---
> Pattern has 22 elts (size 32)
> family: "Steel City Comic"(s) "Test"(s)
> familylang: "en"(s) "en"(s)
> style: "Regular"(s) "Normal"(s) "obyčejné"(s) "Standard"(s) "Κανονικά"(s) "Normaali"(s) "Normál"(s) "Normale"(s) "Standaard"(s) "Normalny"(s) "Обычный"(s) "Normálne"(s) "Navadno"(s) "Arrunta"(s)
> stylelang: "en"(s) "ca"(s) "cs"(s) "de"(s) "el"(s) "fi"(s) "hu"(s) "it"(s) "nl"(s) "pl"(s) "ru"(s) "sk"(s) "sl"(s) "eu"(s)
> fullname: "Steel City Comic"(s) "Test"(s)
> fullnamelang: "en"(s) "en"(s)
> slant: 0(i)(s)
> weight: 80(i)(s)
> width: 100(i)(s)
> foundry: "HL "(s)
> file: "Path_of_fonts/steel-city-comic.regular.ttf"(s)
> index: 0(i)(s)
> outline: True(s)
> scalable: True(s)
> charset:
> 0000: 00000000 ffffffff ffffffff 7fffffff 00000000 70002001 00800000 00800000
> 0003: 00000000 00000000 00000000 40000000 00000000 00000000 00000000 00000000
> 0020: 33000000 00000040 00000000 00000000 00000000 00000000 00000000 00000000
> 0022: 00040000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
> (s)
> lang: fj|ho|ia|ie|io|nr|om|so|ss|st|sw|ts|uz|xh|zu|kj|kwm|ms|ng|rn|rw|sn|za(s)
> fontversion: 65536(i)(s)
> fontformat: "TrueType"(s)
> decorative: False(s)
> postscriptname: "steelcitycomic"(s)
> color: False(s)
> symbol: False(s)
> ---
>
> On Fedora 28, the same command returns nothing. Instead,
> $ fc-list -v "Test"
> returns the following:
>
> ---
> Pattern has 23 elts (size 32)
> family: "Test"(s)
> familylang: "en"(s)
> style: "Regular"(s) "normal"(s)
> stylelang: "en"(s) "da"(s)
> fullname: "Steel City Comic"(s) "Test"(s)
> fullnamelang: "en"(s) "en"(s)
> slant: 0(i)(s)
> weight: 80(f)(s)
> width: 100(f)(s)
> foundry: "HL "(s)
> file: "/Path_of_fonts/steel-city-comic.regular.ttf"(s)
> index: 0(i)(s)
> outline: True(s)
> scalable: True(s)
> charset:
> 0000: 00000000 ffffffff ffffffff 7fffffff 00000000 ffffffef ffffffff ffffffff
> 0001: ffffffff ffffffff ffffffff ffffffff 00040000 00000000 00000000 fc000000
> 0002: 00000000 00000000 00000000 00000000 00000000 00000000 3f0002c0 00000000
> 0003: 00000000 00000000 00000000 40000000 ffffd7f0 fffffffb 00007fff 00000000
> 0004: ffffdffe ffffffff dffeffff 00000000 00030000 00000000 00000000 00000000
> 001e: 00000000 00000000 00000000 00000000 0000003f 00000000 00000000 000c0000
> 0020: 7fb80000 560d0047 00000010 80000000 00000000 00001098 00000000 00000000
> 0021: 00480020 00004044 78000000 00000000 003f0000 00000100 00000000 00000000
> 0022: c6268044 00000a00 00000100 00000033 00000000 00000000 00000000 00000000
> 0023: 00010004 00000003 00000000 00000000 00000000 00000000 00000000 00000000
> 0025: 11111005 10101010 ffff0000 00001fff 000f1111 14041c03 03008c10 00000040
> 0026: 00000000 1c000000 00000005 00000c69 00000000 00000000 00000000 00000000
> 00f0: 00000036 00000000 00000000 00000000 00000000 00000000 00000000 00000000
> 00fb: 00000006 00000000 00000000 00000000 00000000 00000000 00000000 00000000
> (s)
> lang: aa|af|av|ay|be|bg|bi|br|bs|ca|ce|ch|co|cs|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|fur|fy|gd|gl|gv|ho|hr|hu|ia|id|ie|ik|io|is|it|ki|kl|kum|la|lb|lez|lt|lv|mg|mh|mt|nb|nds|nl|nn|no|nr|nso|ny|oc|om|os|pl|pt|rm|ru|se|sel|sk|sl|sma|smj|smn|so|sq|sr|ss|st|sv|sw|tk|tl|tn|tr|ts|uk|uz|vo|vot|wa|wen|wo|xh|yap|zu|an|crh|csb|fil|hsb|ht|jv|kj|ku-tr|kwm|lg|li|ms|na|ng|pap-an|pap-aw|rn|rw|sc|sg|sn|su|za(s)
> fontversion: 65536(i)(s)
> fontformat: "TrueType"(s)
> decorative: False(s)
> postscriptname: "steelcitycomic"(s)
> color: False(s)
> symbol: False(s)
> variable: False(s)
> ---
>
> As you can see above, the "family" entry has "Test" alone.
>
> So we need to substitute "Test" for "Steel City Comic" in .svg files
> in such a case.
>
> Patch #1 adds such a sed pattern in ".svg -> .pdf/.png" recipes.
>
> Patch #2 fixes typo I found while testing Patch #1.
>
> Patch #3 updates FAQ-BUILD.txt to cover Fedora and other Linux
> distros.
>
> The other patches add environment checks in Makefile and update
> FAQ-BUILD.txt accordingly. Patch #5 is a kind of regression fix
> caused by commit cb71c8ebba3c ("Makefile: Use latexpand instead of
> texexpand").
>
> I don't think you have the time to test this on Fedora 28.
> Hopefully someone on the list could volunteer.
>
> Thanks, Akira
> --
> Akira Yokosawa (9):
> Makefile: Add sed pattern to accommodate fontconfig 2.13.0
> fixsvgfonts: Fix typo
> FAQ-BUILD: Add note on Fedora 28, 27, and other Linux distros
> Makefile: Add 'latexpand' existence check
> .gitignore: Add intermediate file suffix
> Makefile: Add check of version conflict of a2ping
> Makefile: Remove redundant quotation marks in error functions
> Makefile: Move check of 'Steel City Comic' font from runlatex.sh
> FAQ-BUILD: Rephrase #7 to reflect Makefile update
>
> .gitignore | 2 ++
> FAQ-BUILD.txt | 45 ++++++++++++++++++----------------
> Makefile | 55 +++++++++++++++++++++++++++++++++---------
> utilities/fixsvgfonts-urwps.sh | 4 +--
> utilities/fixsvgfonts.sh | 2 +-
> utilities/runlatex.sh | 8 ------
> 6 files changed, 72 insertions(+), 44 deletions(-)
>
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 11+ messages in thread