diff -urN -x'*~' ghostscript-8.71/base/gdevpdfm.c ghostscript-8.71-1/base/gdevpdfm.c --- ghostscript-8.71/base/gdevpdfm.c 2009-10-06 00:33:33.000000000 -0700 +++ ghostscript-8.71-1/base/gdevpdfm.c 2010-08-23 21:24:00.000000000 -0700 @@ -125,7 +125,7 @@ static int pdfmark_make_dest(char dstr[MAX_DEST_STRING], gx_device_pdf * pdev, const char *Page_key, const char *View_key, - const gs_param_string * pairs, uint count) + const gs_param_string * pairs, uint count, uint RequirePage) { gs_param_string page_string, view_string; int present = @@ -135,7 +135,7 @@ gs_param_string action; int len; - if (present) + if (present || RequirePage) page = pdfmark_page_number(pdev, &page_string); if (view_string.size == 0) param_string_from_string(view_string, "[/XYZ null null null]"); @@ -485,7 +485,7 @@ /* Make a destination even if this is for an outline. */ if (Dest.data == 0) { code = pdfmark_make_dest(dest, params->pdev, "/Page", "/View", - pairs, count); + pairs, count, 0); if (code < 0) return code; param_string_from_string(Dest, dest); @@ -1100,7 +1100,7 @@ if (!pdfmark_find_key("/Dest", pairs, count, &key) || (present = - pdfmark_make_dest(dest, pdev, "/Page", "/View", pairs, count)) < 0 + pdfmark_make_dest(dest, pdev, "/Page", "/View", pairs, count, 1)) < 0 ) return_error(gs_error_rangecheck); cos_string_value(&value, (byte *)dest, strlen(dest)); @@ -1523,7 +1523,7 @@ if (count & 1) return_error(gs_error_rangecheck); - if (pdfmark_make_dest(dest, pdev, "/Page", "/View", pairs, count)) { + if (pdfmark_make_dest(dest, pdev, "/Page", "/View", pairs, count, 0)) { int i; code = cos_dict_put_c_key_string(pdev->Catalog, "/OpenAction", diff -urN -x'*~' ghostscript-8.71/Resource/Init/cidfmap.mac ghostscript-8.71-1/Resource/Init/cidfmap.mac --- ghostscript-8.71/Resource/Init/cidfmap.mac 2009-10-06 00:33:33.000000000 -0700 +++ ghostscript-8.71-1/Resource/Init/cidfmap.mac 2010-08-23 21:24:00.000000000 -0700 @@ -0,0 +1,80 @@ +%! +%%% aliases +/Ryumin-Light /HiraMinPro-W3 ; +/Ryumin-Medium /HiraMinPro-W3 ; +/FutoMinA101-Bold /HiraMinPro-W6 ; +/MidashiMin-MA31 /HiraMinPro-W6 ; +/GothicBBB-Medium /HiraKakuPro-W3 ; +/FutoGoB101-Bold /HiraKakuPro-W6 ; +/MidashiGo-MB31 /HiraKakuStd-W8 ; +/Jun101-Light /HiraMaruPro-W4 ; +/HeiseiMin-W3 /Ryumin-Light ; +/HeiseiKakuGo-W5 /GothicBBB-Medium ; +/HiraMinStdN-W2 /MS-Mincho ; +/KozMinPr6N-Regular /Ryumin-Light ; +/KozMinPro-Regular /KozMinPr6N-Regular ; +/KozMinPro-Regular-Acro /KozMinPro-Regular ; +/HeiseiMin-W3-Acro /KozMinPro-Regular-Acro ; +/KozGoPr6N-Medium /GothicBBB-Medium ; +/KozGoPro-Medium /KozGoPr6N-Medium ; +/KozGoPro-Medium-Acro /KozGoPro-Medium ; +/HeiseiKakuGo-W5-Acro /KozGoPro-Medium-Acro ; +/STSong-Light /STSong ; +/STSong-Regular /STSong ; +/STHeiti-Regular /STHeiti ; +/STHeiti-Light /STXihei ; +/STKaiti-Regular /STKaiti ; +/STFangsong-Regular /STFangsong ; +/STFangsong-Light /STFangsong ; +/AdobeSongStd-Light /STSong-Light ; +/AdobeSongStd-Light-Acro /AdobeSongStd-Light ; +/STSongStd-Light-Acro /AdobeSongStd-Light-Acro ; +/STSongStd-Light /STSongStd-Light-Acro ; +/STSong-Light-Acro /STSongStd-Light-Acro ; +/AdobeHeitiStd-Regular /STHeiti-Regular ; +/MSung-Light /LiSongPro ; +/MSung-Medium /LiSongPro ; +/MHei-Medium /LiHeiPro ; +/MKai-Medium /STKaiti-Adobe-CNS1 ; +/AdobeMingStd-Light /MSung-Light ; +/AdobeMingStd-Light-Acro /AdobeMingStd-Light ; +/MSungStd-Light-Acro /AdobeMingStd-Light-Acro ; +/MSungStd-Light /MSungStd-Light-Acro ; +/MSung-Light-Acro /MSungStd-Light-Acro ; +/MHei-Medium-Acro /MHei-Medium ; +/HYSMyeongJo-Medium /Batang ; +/HYGoThic-Medium /Baekmuk-Dotum ; +/HYKHeadLine-Bold /Baekmuk-Headline ; +/HYKHeadLine-Medium /Baekmuk-Headline ; +/HYRGoThic-Medium /Gulim ; +/HYGungSo-Bold /UnGungseo ; +/AdobeMyungjoStd-Medium /HYSMyeongJo-Medium ; +/AdobeMyungjoStd-Medium-Acro /AdobeMyungjoStd-Medium ; +/HYSMyeongJoStd-Medium-Acro /AdobeMyungjoStd-Medium-Acro ; +/HYSMyeongJoStd-Medium /HYSMyeongJoStd-Medium-Acro ; +/HYSMyeongJo-Medium-Acro /HYSMyeongJoStd-Medium-Acro ; +/HYGoThic-Medium-Acro /HYGoThic-Medium ; + +%%% TrueType outline fonts in Mac OS X +%%% See /System/Library/Fonts/ +%%% /Library/Fonts/ +/STSong << /FileType /TrueType /CSI [(GB1) 5] /Path (@XFONTPATH@/applettf/STSong.ttf) >> ; +/STHeiti << /FileType /TrueType /CSI [(GB1) 5] /Path (@XFONTPATH@/applettf/STHeiti.ttf) >> ; +/STXihei << /FileType /TrueType /CSI [(GB1) 5] /Path (@XFONTPATH@/applettf/STXihei.ttf) >> ; +/STKaiti << /FileType /TrueType /CSI [(GB1) 5] /Path (@XFONTPATH@/applettf/STKaiti.ttf) >> ; +/STKaiti-Adobe-CNS1 << /FileType /TrueType /CSI [(CNS1) 5] /Path (@XFONTPATH@/applettf/STKaiti.ttf) >> ; +/STFangsong << /FileType /TrueType /CSI [(GB1) 5] /Path (@XFONTPATH@/applettf/STFangsong.ttf) >> ; +/LiSongPro << /FileType /TrueType /CSI [(CNS1) 5] /Path (@XFONTPATH@/applettf/LiSongPro.ttf) >> ; +/LiHeiPro << /FileType /TrueType /CSI [(CNS1) 5] /Path (@XFONTPATH@/applettf/LiHeiPro.ttf) >> ; + +%%% TrueType outline fonts in Microsoft Office 2004 for Mac +%%% See http://www.microsoft.com/japan/mac/products/office2004/default.mspx +%%% /Applications/"Microsoft Office 2004"/Office/Fonts/ +/MS-Mincho << /FileType /TrueType /CSI [(Japan1) 6] /Path (@XFONTPATH@/applettf/MS_Mincho.ttf) >> ; +/MS-PMincho << /FileType /TrueType /CSI [(Japan1) 6] /Path (@XFONTPATH@/applettf/MS_PMincho.ttf) >> ; +/MS-Gothic << /FileType /TrueType /CSI [(Japan1) 6] /Path (@XFONTPATH@/applettf/MS_Gothic.ttf) >> ; +/MS-PGothic << /FileType /TrueType /CSI [(Japan1) 6] /Path (@XFONTPATH@/applettf/MS_PGothic.ttf) >> ; +/SimSun << /FileType /TrueType /CSI [(GB1) 5] /Path (@XFONTPATH@/applettf/SimSun.ttf) >> ; +/PMingLiU << /FileType /TrueType /CSI [(CNS1) 5] /Path (@XFONTPATH@/applettf/PMingLiU.ttf) >> ; +/Batang << /FileType /TrueType /CSI [(Korea1) 2] /Path (@XFONTPATH@/applettf/Batang.ttf) >> ; +/Gulim << /FileType /TrueType /CSI [(Korea1) 2] /Path (@XFONTPATH@/applettf/Gulim.ttf) >> ; diff -ruN espgs-7.07.1-orig/src/finkcups espgs-7.07.1/src/finkcups --- espgs-7.07.1-orig/finkcups 1970-01-01 09:00:00.000000000 +0900 +++ espgs-7.07.1/finkcups 2007-10-02 09:51:41.000000000 +0900 @@ -0,0 +1,111 @@ +#!/bin/bash + +show="/bin/echo" +run= +function show_and_run () { + + ${show} "$@" + ${run} "$@" +} + +function get_cups_location () { + + if type cups-config >/dev/null 2>&1 + then + CUPSSERVER=`cups-config --serverbin` + CUPSCONFIG=`cups-config --serverroot` + CUPSDATA=`cups-config --datadir` + else + ${show} " * ${0##*/}: Cannot find the command \"cups-config\" in your PATH!" + exit 1 + fi +} + +function backup () { + + if [ -f ${1} ] + then + show_and_run /bin/mv ${1} ${1}.finksave + fi +} + +function restore () { + + if [ -f ${1}.finksave ] + then + show_and_run /bin/mv ${1}.finksave ${1} + fi +} + +function unlink () { + + if [ -L ${1} ] + then + show_and_run /bin/rm ${1} + fi +} + +function make_links () { + + get_cups_location + + /bin/mkdir -p ${CUPSSERVER}/filter + for file in /lib/cups/filter/* + do + backup ${CUPSSERVER}/filter/${file##*/} + show_and_run /bin/ln -s ${file} ${CUPSSERVER}/filter + done + + /bin/mkdir -p ${CUPSCONFIG} + for file in /etc/cups/* + do + backup ${CUPSCONFIG}/${file##*/} + show_and_run /bin/ln -s ${file} ${CUPSCONFIG} + done + + /bin/mkdir -p ${CUPSDATA}/model + /bin/mkdir -p /Library/Printers/PPDs/Contents/Resources + for file in /share/cups/model/* + do + backup ${CUPSDATA}/model/${file##*/} + show_and_run /bin/ln -s ${file} ${CUPSDATA}/model + + backup /Library/Printers/PPDs/Contents/Resources/${file##*/} + show_and_run /bin/ln -s ${file} /Library/Printers/PPDs/Contents/Resources + done +} + +function remove_links () { + + get_cups_location + + for file in /lib/cups/filter/* + do + unlink ${CUPSSERVER}/filter/${file##*/} + restore ${CUPSSERVER}/filter/${file##*/} + done + + for file in /etc/cups/* + do + unlink ${CUPSCONFIG}/${file##*/} + restore ${CUPSCONFIG}/${file##*/} + done + + for file in /share/cups/model/* + do + unlink ${CUPSDATA}/model/${file##*/} + restore ${CUPSDATA}/model/${file##*/} + + unlink /Library/Printers/PPDs/Contents/Resources/${file##*/} + restore /Library/Printers/PPDs/Contents/Resources/${file##*/} + done +} + +case "$1" in + add) + make_links ;; + remove) + remove_links ;; + *) + ${show} "usage: ${0##*/} {add|remove}" ;; +esac