summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorJonathan Kew <jfkthame@googlemail.com>2012-02-11 15:54:27 +0000
committerJonathan Kew <jfkthame@googlemail.com>2012-02-11 15:54:27 +0000
commitde6f89ac0e9e5a42bf7f01939734768adbc69687 (patch)
tree5687d24b4c8794b011e0e3a93957654ab723bde9 /Build
parent5e1f8b6fda07c93de8266162134f6b4553da5b8a (diff)
[xetex] make xetex pass font file paths to xdvipdfmx, to avoid fontconfig search mismatch
git-svn-id: svn://tug.org/texlive/trunk@25367 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeX_ext.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
index cf7a6f672fd..fa0c0a7b693 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
@@ -1765,12 +1765,12 @@ makefontdef(integer f)
engine = (XeTeXLayoutEngine)fontlayoutengine[f];
fontRef = getFontRef(engine);
- if (fontRef != 0)
- getNames(fontRef, &psName, &famName, &styName);
- else {
- psName = getFontFilename(engine);
+ psName = getFontFilename(engine);
+ if (psName) {
famName = "";
styName = "";
+ } else {
+ getNames(getFontRef(engine), &psName, &famName, &styName);
}
rgba = getRgbValue(engine);