From 9a3451a8d6d203e954606ef8d02da78cd1ccfe39 Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: May 25 2019 16:39:45 +0000 Subject: Update rnotes/Makefile to support Chinese images - PNG files rendered from SVG template files that use Chinese PO files don't look as expected, when the font-family used is Overpass. This update changes the Makefile to render Chinese images using the Google "Noto Sans" typography. --- diff --git a/rnotes/Makefile b/rnotes/Makefile index 10e5f5f..f8d9212 100644 --- a/rnotes/Makefile +++ b/rnotes/Makefile @@ -75,80 +75,224 @@ $(datarootdir): $(datarootdir)/01-centos-welcome.png: $(datarootdir) $(localedir)/$(lang).po $(srcdir)/01-centos-welcome.svg xmllint -noout $(srcdir)/01-centos-welcome.svg xml2po -p $(localedir)/$(lang).po -o /tmp/01-centos-welcome.svg $(srcdir)/01-centos-welcome.svg +ifeq ($(lang),zh-CN) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK SC/g' /tmp/01-centos-welcome.svg +endif +ifeq ($(lang),zh-HK) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK HK/g' /tmp/01-centos-welcome.svg +endif +ifeq ($(lang),zh-TW) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK TC/g' /tmp/01-centos-welcome.svg +endif inkscape --export-png=$(datarootdir)/01-centos-welcome.png /tmp/01-centos-welcome.svg rm /tmp/01-centos-welcome.svg $(datarootdir)/02-centos-sig-core.png: $(datarootdir) $(localedir)/$(lang).po $(srcdir)/02-centos-sig-core.svg xmllint -noout $(srcdir)/02-centos-sig-core.svg xml2po -p $(localedir)/$(lang).po -o /tmp/02-centos-sig-core.svg $(srcdir)/02-centos-sig-core.svg +ifeq ($(lang),zh-CN) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK SC/g' /tmp/02-centos-sig-core.svg +endif +ifeq ($(lang),zh-HK) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK HK/g' /tmp/02-centos-sig-core.svg +endif +ifeq ($(lang),zh-TW) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK TC/g' /tmp/02-centos-sig-core.svg +endif inkscape --export-png=$(datarootdir)/02-centos-sig-core.png /tmp/02-centos-sig-core.svg rm /tmp/02-centos-sig-core.svg $(datarootdir)/03-centos-sig-altarch.png: $(datarootdir) $(localedir)/$(lang).po $(srcdir)/03-centos-sig-altarch.svg xmllint -noout $(srcdir)/03-centos-sig-altarch.svg xml2po -p $(localedir)/$(lang).po -o /tmp/03-centos-sig-altarch.svg $(srcdir)/03-centos-sig-altarch.svg +ifeq ($(lang),zh-CN) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK SC/g' /tmp/03-centos-sig-altarch.svg +endif +ifeq ($(lang),zh-HK) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK HK/g' /tmp/03-centos-sig-altarch.svg +endif +ifeq ($(lang),zh-TW) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK TC/g' /tmp/03-centos-sig-altarch.svg +endif inkscape --export-png=$(datarootdir)/03-centos-sig-altarch.png /tmp/03-centos-sig-altarch.svg rm /tmp/03-centos-sig-altarch.svg $(datarootdir)/04-centos-sig-artwork.png: $(datarootdir) $(localedir)/$(lang).po $(srcdir)/04-centos-sig-artwork.svg xmllint -noout $(srcdir)/04-centos-sig-artwork.svg xml2po -p $(localedir)/$(lang).po -o /tmp/04-centos-sig-artwork.svg $(srcdir)/04-centos-sig-artwork.svg +ifeq ($(lang),zh-CN) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK SC/g' /tmp/04-centos-sig-artwork.svg +endif +ifeq ($(lang),zh-HK) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK HK/g' /tmp/04-centos-sig-artwork.svg +endif +ifeq ($(lang),zh-TW) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK TC/g' /tmp/04-centos-sig-artwork.svg +endif inkscape --export-png=$(datarootdir)/04-centos-sig-artwork.png /tmp/04-centos-sig-artwork.svg rm /tmp/04-centos-sig-artwork.svg $(datarootdir)/05-centos-sig-atomic.png: $(datarootdir) $(localedir)/$(lang).po $(srcdir)/05-centos-sig-atomic.svg xmllint -noout $(srcdir)/05-centos-sig-atomic.svg xml2po -p $(localedir)/$(lang).po -o /tmp/05-centos-sig-atomic.svg $(srcdir)/05-centos-sig-atomic.svg +ifeq ($(lang),zh-CN) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK SC/g' /tmp/05-centos-sig-atomic.svg +endif +ifeq ($(lang),zh-HK) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK HK/g' /tmp/05-centos-sig-atomic.svg +endif +ifeq ($(lang),zh-TW) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK TC/g' /tmp/05-centos-sig-atomic.svg +endif inkscape --export-png=$(datarootdir)/05-centos-sig-atomic.png /tmp/05-centos-sig-atomic.svg rm /tmp/05-centos-sig-atomic.svg $(datarootdir)/06-centos-sig-cloud.png: $(datarootdir) $(localedir)/$(lang).po $(srcdir)/06-centos-sig-cloud.svg xmllint -noout $(srcdir)/06-centos-sig-cloud.svg xml2po -p $(localedir)/$(lang).po -o /tmp/06-centos-sig-cloud.svg $(srcdir)/06-centos-sig-cloud.svg +ifeq ($(lang),zh-CN) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK SC/g' /tmp/06-centos-sig-cloud.svg +endif +ifeq ($(lang),zh-HK) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK HK/g' /tmp/06-centos-sig-cloud.svg +endif +ifeq ($(lang),zh-TW) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK TC/g' /tmp/06-centos-sig-cloud.svg +endif inkscape --export-png=$(datarootdir)/06-centos-sig-cloud.png /tmp/06-centos-sig-cloud.svg rm /tmp/06-centos-sig-cloud.svg $(datarootdir)/07-centos-sig-cloudinstance.png: $(datarootdir) $(localedir)/$(lang).po $(srcdir)/07-centos-sig-cloudinstance.svg xmllint -noout $(srcdir)/07-centos-sig-cloudinstance.svg xml2po -p $(localedir)/$(lang).po -o /tmp/07-centos-sig-cloudinstance.svg $(srcdir)/07-centos-sig-cloudinstance.svg +ifeq ($(lang),zh-CN) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK SC/g' /tmp/07-centos-sig-cloudinstance.svg +endif +ifeq ($(lang),zh-HK) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK HK/g' /tmp/07-centos-sig-cloudinstance.svg +endif +ifeq ($(lang),zh-TW) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK TC/g' /tmp/07-centos-sig-cloudinstance.svg +endif inkscape --export-png=$(datarootdir)/07-centos-sig-cloudinstance.png /tmp/07-centos-sig-cloudinstance.svg rm /tmp/07-centos-sig-cloudinstance.svg $(datarootdir)/08-centos-sig-cm.png: $(datarootdir) $(localedir)/$(lang).po $(srcdir)/08-centos-sig-cm.svg xmllint -noout $(srcdir)/08-centos-sig-cm.svg xml2po -p $(localedir)/$(lang).po -o /tmp/08-centos-sig-cm.svg $(srcdir)/08-centos-sig-cm.svg +ifeq ($(lang),zh-CN) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK SC/g' /tmp/08-centos-sig-cm.svg +endif +ifeq ($(lang),zh-HK) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK HK/g' /tmp/08-centos-sig-cm.svg +endif +ifeq ($(lang),zh-TW) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK TC/g' /tmp/08-centos-sig-cm.svg +endif inkscape --export-png=$(datarootdir)/08-centos-sig-cm.png /tmp/08-centos-sig-cm.svg rm /tmp/08-centos-sig-cm.svg $(datarootdir)/09-centos-sig-nfv.png: $(datarootdir) $(localedir)/$(lang).po $(srcdir)/09-centos-sig-nfv.svg xmllint -noout $(srcdir)/09-centos-sig-nfv.svg xml2po -p $(localedir)/$(lang).po -o /tmp/09-centos-sig-nfv.svg $(srcdir)/09-centos-sig-nfv.svg +ifeq ($(lang),zh-CN) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK SC/g' /tmp/09-centos-sig-nfv.svg +endif +ifeq ($(lang),zh-HK) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK HK/g' /tmp/09-centos-sig-nfv.svg +endif +ifeq ($(lang),zh-TW) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK TC/g' /tmp/09-centos-sig-nfv.svg +endif inkscape --export-png=$(datarootdir)/09-centos-sig-nfv.png /tmp/09-centos-sig-nfv.svg rm /tmp/09-centos-sig-nfv.svg $(datarootdir)/10-centos-sig-optools.png: $(datarootdir) $(localedir)/$(lang).po $(srcdir)/10-centos-sig-optools.svg xmllint -noout $(srcdir)/10-centos-sig-optools.svg xml2po -p $(localedir)/$(lang).po -o /tmp/10-centos-sig-optools.svg $(srcdir)/10-centos-sig-optools.svg +ifeq ($(lang),zh-CN) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK SC/g' /tmp/10-centos-sig-optools.svg +endif +ifeq ($(lang),zh-HK) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK HK/g' /tmp/10-centos-sig-optools.svg +endif +ifeq ($(lang),zh-TW) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK TC/g' /tmp/10-centos-sig-optools.svg +endif inkscape --export-png=$(datarootdir)/10-centos-sig-optools.png /tmp/10-centos-sig-optools.svg rm /tmp/10-centos-sig-optools.svg $(datarootdir)/11-centos-sig-paas.png: $(datarootdir) $(localedir)/$(lang).po $(srcdir)/11-centos-sig-paas.svg xmllint -noout $(srcdir)/11-centos-sig-paas.svg xml2po -p $(localedir)/$(lang).po -o /tmp/11-centos-sig-paas.svg $(srcdir)/11-centos-sig-paas.svg +ifeq ($(lang),zh-CN) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK SC/g' /tmp/11-centos-sig-paas.svg +endif +ifeq ($(lang),zh-HK) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK HK/g' /tmp/11-centos-sig-paas.svg +endif +ifeq ($(lang),zh-TW) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK TC/g' /tmp/11-centos-sig-paas.svg +endif inkscape --export-png=$(datarootdir)/11-centos-sig-paas.png /tmp/11-centos-sig-paas.svg rm /tmp/11-centos-sig-paas.svg $(datarootdir)/12-centos-sig-promo.png: $(datarootdir) $(localedir)/$(lang).po $(srcdir)/12-centos-sig-promo.svg xmllint -noout $(srcdir)/12-centos-sig-promo.svg xml2po -p $(localedir)/$(lang).po -o /tmp/12-centos-sig-promo.svg $(srcdir)/12-centos-sig-promo.svg +ifeq ($(lang),zh-CN) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK SC/g' /tmp/12-centos-sig-promo.svg +endif +ifeq ($(lang),zh-HK) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK HK/g' /tmp/12-centos-sig-promo.svg +endif +ifeq ($(lang),zh-TW) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK TC/g' /tmp/12-centos-sig-promo.svg +endif inkscape --export-png=$(datarootdir)/12-centos-sig-promo.png /tmp/12-centos-sig-promo.svg rm /tmp/12-centos-sig-promo.svg $(datarootdir)/13-centos-sig-publicci.png: $(datarootdir) $(localedir)/$(lang).po $(srcdir)/13-centos-sig-publicci.svg xmllint -noout $(srcdir)/13-centos-sig-publicci.svg xml2po -p $(localedir)/$(lang).po -o /tmp/13-centos-sig-publicci.svg $(srcdir)/13-centos-sig-publicci.svg +ifeq ($(lang),zh-CN) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK SC/g' /tmp/13-centos-sig-publicci.svg +endif +ifeq ($(lang),zh-HK) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK HK/g' /tmp/13-centos-sig-publicci.svg +endif +ifeq ($(lang),zh-TW) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK TC/g' /tmp/13-centos-sig-publicci.svg +endif inkscape --export-png=$(datarootdir)/13-centos-sig-publicci.png /tmp/13-centos-sig-publicci.svg rm /tmp/13-centos-sig-publicci.svg $(datarootdir)/14-centos-sig-sc.png: $(datarootdir) $(localedir)/$(lang).po $(srcdir)/14-centos-sig-sc.svg xmllint -noout $(srcdir)/14-centos-sig-sc.svg xml2po -p $(localedir)/$(lang).po -o /tmp/14-centos-sig-sc.svg $(srcdir)/14-centos-sig-sc.svg +ifeq ($(lang),zh-CN) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK SC/g' /tmp/14-centos-sig-sc.svg +endif +ifeq ($(lang),zh-HK) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK HK/g' /tmp/14-centos-sig-sc.svg +endif +ifeq ($(lang),zh-TW) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK TC/g' /tmp/14-centos-sig-sc.svg +endif inkscape --export-png=$(datarootdir)/14-centos-sig-sc.png /tmp/14-centos-sig-sc.svg rm /tmp/14-centos-sig-sc.svg $(datarootdir)/15-centos-sig-storage.png: $(datarootdir) $(localedir)/$(lang).po $(srcdir)/15-centos-sig-storage.svg xmllint -noout $(srcdir)/15-centos-sig-storage.svg xml2po -p $(localedir)/$(lang).po -o /tmp/15-centos-sig-storage.svg $(srcdir)/15-centos-sig-storage.svg +ifeq ($(lang),zh-CN) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK SC/g' /tmp/15-centos-sig-storage.svg +endif +ifeq ($(lang),zh-HK) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK HK/g' /tmp/15-centos-sig-storage.svg +endif +ifeq ($(lang),zh-TW) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK TC/g' /tmp/15-centos-sig-storage.svg +endif inkscape --export-png=$(datarootdir)/15-centos-sig-storage.png /tmp/15-centos-sig-storage.svg rm /tmp/15-centos-sig-storage.svg $(datarootdir)/16-centos-sig-virt.png: $(datarootdir) $(localedir)/$(lang).po $(srcdir)/16-centos-sig-virt.svg xmllint -noout $(srcdir)/16-centos-sig-virt.svg xml2po -p $(localedir)/$(lang).po -o /tmp/16-centos-sig-virt.svg $(srcdir)/16-centos-sig-virt.svg +ifeq ($(lang),zh-CN) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK SC/g' /tmp/16-centos-sig-virt.svg +endif +ifeq ($(lang),zh-HK) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK HK/g' /tmp/16-centos-sig-virt.svg +endif +ifeq ($(lang),zh-TW) + sed -i 's/font-family:Overpass/font-family:Noto Sans CJK TC/g' /tmp/16-centos-sig-virt.svg +endif inkscape --export-png=$(datarootdir)/16-centos-sig-virt.png /tmp/16-centos-sig-virt.svg rm /tmp/16-centos-sig-virt.svg