diff options
Diffstat (limited to 'Build/source/texk/web2c/xetexdir/XeTeX_mac.c')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeX_mac.c | 76 |
1 files changed, 22 insertions, 54 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_mac.c b/Build/source/texk/web2c/xetexdir/XeTeX_mac.c index 4f0f186bdf4..df72c4e969c 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeX_mac.c +++ b/Build/source/texk/web2c/xetexdir/XeTeX_mac.c @@ -36,12 +36,6 @@ authorization from the copyright holders. * additional plain C extensions for XeTeX - MacOS-specific routines */ -#ifdef __POWERPC__ -#define MAC_OS_X_VERSION_MIN_REQUIRED 1030 -#else -#define MAC_OS_X_VERSION_MIN_REQUIRED 1040 -#endif - #define EXTERN extern #include "xetexd.h" @@ -186,9 +180,8 @@ void getGlyphBBoxFromCTFont(CTFontRef font, UInt16 gid, GlyphBBox* bbox) bbox->xMin = bbox->yMin = bbox->xMax = bbox->yMax = 0; else { // convert PS to TeX points and flip y-axis - // TODO: do we need to flip for bounding rect returned by Core Text? - bbox->yMin = -PStoTeXPoints(rect.origin.y + rect.size.height); - bbox->yMax = -PStoTeXPoints(rect.origin.y); + bbox->yMin = PStoTeXPoints(rect.origin.y); + bbox->yMax = PStoTeXPoints(rect.origin.y + rect.size.height); bbox->xMin = PStoTeXPoints(rect.origin.x); bbox->xMax = PStoTeXPoints(rect.origin.x + rect.size.width); } @@ -761,52 +754,27 @@ find_pic_file(char** path, realrect* bounds, int pdfBoxType, int page) page = nPages; CGRect r; -#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_3 - if (&CGPDFDocumentGetPage == NULL) { - switch (pdfBoxType) { - case pdfbox_crop: - default: - r = CGPDFDocumentGetCropBox(document, page); - break; - case pdfbox_media: - r = CGPDFDocumentGetMediaBox(document, page); - break; - case pdfbox_bleed: - r = CGPDFDocumentGetBleedBox(document, page); - break; - case pdfbox_trim: - r = CGPDFDocumentGetTrimBox(document, page); - break; - case pdfbox_art: - r = CGPDFDocumentGetArtBox(document, page); - break; - } - } - else -#endif - { - CGPDFPageRef pageRef = CGPDFDocumentGetPage(document, page); - CGPDFBox boxType; - switch (pdfBoxType) { - case pdfbox_crop: - default: - boxType = kCGPDFCropBox; - break; - case pdfbox_media: - boxType = kCGPDFMediaBox; - break; - case pdfbox_bleed: - boxType = kCGPDFBleedBox; - break; - case pdfbox_trim: - boxType = kCGPDFTrimBox; - break; - case pdfbox_art: - boxType = kCGPDFArtBox; - break; - } - r = CGPDFPageGetBoxRect(pageRef, boxType); + CGPDFPageRef pageRef = CGPDFDocumentGetPage(document, page); + CGPDFBox boxType; + switch (pdfBoxType) { + case pdfbox_crop: + default: + boxType = kCGPDFCropBox; + break; + case pdfbox_media: + boxType = kCGPDFMediaBox; + break; + case pdfbox_bleed: + boxType = kCGPDFBleedBox; + break; + case pdfbox_trim: + boxType = kCGPDFTrimBox; + break; + case pdfbox_art: + boxType = kCGPDFArtBox; + break; } + r = CGPDFPageGetBoxRect(pageRef, boxType); bounds->x = r.origin.x * 72.27 / 72.0; bounds->y = r.origin.y * 72.27 / 72.0; |