Log: Eyesight: use mupdf 0.9 Author: caro Date: 2011-10-23 02:47:39 -0700 (Sun, 23 Oct 2011) New Revision: 64323 Trac: http://trac.enlightenment.org/e/changeset/64323 Added: trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/COPYING trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/Makefile trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/Makerules trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/Makethird trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/README trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/AndroidManifest.xml trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/ReadMe.txt trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/build.properties trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/build.sh trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/build.xml trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/default.properties trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/jni/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/jni/Android.mk trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/jni/Application.mk trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/jni/Core.mk trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/jni/ThirdParty.mk trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/jni/mupdf.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/local.properties trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/res/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/res/drawable-hdpi/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/res/drawable-hdpi/icon.png trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/res/drawable-ldpi/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/res/drawable-ldpi/icon.png trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/res/drawable-mdpi/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/res/drawable-mdpi/icon.png trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/res/layout/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/res/layout/main.xml trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/res/values/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/res/values/strings.xml trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/res/values/theme.xml trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/src/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/src/com/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/src/com/artifex/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/src/com/artifex/mupdf/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/src/com/artifex/mupdf/MuPDFActivity.java trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/src/com/artifex/mupdf/MuPDFCore.java trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/android/src/com/artifex/mupdf/PixmapView.java trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/man/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/man/mupdf.1 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/man/pdfclean.1 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/man/pdfdraw.1 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/man/pdfshow.1 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/mupdf_icon_antialias.ico trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/mupdf_icon_bitmap.ico trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/pdfapp.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/pdfapp.h trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/pdfclean.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/pdfdraw.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/pdfextract.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/pdfinfo.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/pdfshow.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/win_main.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/win_res.rc trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/x11_image.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/x11_main.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/apps/xpsdraw.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/README trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/Adobe-CNS1-0 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/Adobe-CNS1-1 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/Adobe-CNS1-2 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/Adobe-CNS1-3 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/Adobe-CNS1-4 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/Adobe-CNS1-5 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/Adobe-CNS1-6 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/Adobe-CNS1-UCS2 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/B5-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/B5-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/B5pc-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/B5pc-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/CNS-EUC-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/CNS-EUC-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/CNS1-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/CNS1-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/CNS2-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/CNS2-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/ETHK-B5-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/ETHK-B5-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/ETen-B5-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/ETen-B5-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/ETenms-B5-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/ETenms-B5-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/HKdla-B5-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/HKdla-B5-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/HKdlb-B5-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/HKdlb-B5-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/HKgccs-B5-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/HKgccs-B5-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/HKm314-B5-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/HKm314-B5-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/HKm471-B5-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/HKm471-B5-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/HKscs-B5-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/HKscs-B5-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/UniCNS-UCS2-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/UniCNS-UCS2-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/UniCNS-UTF16-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/cns/UniCNS-UTF16-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/Adobe-GB1-0 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/Adobe-GB1-1 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/Adobe-GB1-2 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/Adobe-GB1-3 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/Adobe-GB1-4 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/Adobe-GB1-5 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/Adobe-GB1-UCS2 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GB-EUC-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GB-EUC-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GB-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GB-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GBK-EUC-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GBK-EUC-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GBK2K-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GBK2K-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GBKp-EUC-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GBKp-EUC-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GBT-EUC-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GBT-EUC-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GBT-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GBT-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GBTpc-EUC-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GBTpc-EUC-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GBpc-EUC-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/GBpc-EUC-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/UniGB-UCS2-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/UniGB-UCS2-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/UniGB-UTF16-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/gb/UniGB-UTF16-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/78-EUC-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/78-EUC-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/78-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/78-RKSJ-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/78-RKSJ-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/78-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/78ms-RKSJ-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/78ms-RKSJ-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/83pv-RKSJ-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/90ms-RKSJ-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/90ms-RKSJ-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/90msp-RKSJ-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/90msp-RKSJ-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/90pv-RKSJ-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/90pv-RKSJ-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Add-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Add-RKSJ-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Add-RKSJ-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Add-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Adobe-Japan1-0 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Adobe-Japan1-1 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Adobe-Japan1-2 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Adobe-Japan1-3 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Adobe-Japan1-4 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Adobe-Japan1-5 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Adobe-Japan1-6 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Adobe-Japan1-UCS2 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Adobe-Japan2-0 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/EUC-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/EUC-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Ext-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Ext-RKSJ-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Ext-RKSJ-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Ext-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Hankaku trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Hiragana trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Hojo-EUC-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Hojo-EUC-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Hojo-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Hojo-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Katakana trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/NWP-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/NWP-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/RKSJ-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/RKSJ-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/Roman trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/UniHojo-UCS2-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/UniHojo-UCS2-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/UniHojo-UTF16-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/UniHojo-UTF16-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/UniJIS-UCS2-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/UniJIS-UCS2-HW-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/UniJIS-UCS2-HW-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/UniJIS-UCS2-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/UniJIS-UTF16-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/UniJIS-UTF16-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/UniJISPro-UCS2-HW-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/UniJISPro-UCS2-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/japan/WP-Symbol trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/Adobe-Korea1-0 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/Adobe-Korea1-1 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/Adobe-Korea1-2 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/Adobe-Korea1-UCS2 trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/KSC-EUC-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/KSC-EUC-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/KSC-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/KSC-Johab-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/KSC-Johab-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/KSC-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/KSCms-UHC-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/KSCms-UHC-HW-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/KSCms-UHC-HW-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/KSCms-UHC-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/KSCpc-EUC-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/KSCpc-EUC-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/UniKS-UCS2-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/UniKS-UCS2-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/UniKS-UTF16-H trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/cmaps/korea/UniKS-UTF16-V trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/changelog trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/compat trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/control trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/copyright trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/dirs trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/libmupdf-dev.install trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/mupdf-tools.docs trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/mupdf-tools.install trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/mupdf-tools.manpages trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/mupdf.applications trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/mupdf.desktop trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/mupdf.docs trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/mupdf.install trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/mupdf.manpages trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/mupdf.menu trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/mupdf.mime trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/mupdf.pc trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/mupdf.png trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/mupdf.xpm trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/debian/rules trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/draw/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/draw/arch_arm.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/draw/arch_port.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/draw/draw_affine.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/draw/draw_blend.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/draw/draw_device.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/draw/draw_edge.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/draw/draw_glyph.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/draw/draw_mesh.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/draw/draw_paint.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/draw/draw_path.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/draw/draw_scale.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/draw/draw_unpack.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/base_error.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/base_geometry.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/base_getopt.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/base_hash.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/base_memory.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/base_object.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/base_string.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/base_time.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/crypt_aes.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/crypt_arc4.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/crypt_md5.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/crypt_sha2.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/dev_bbox.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/dev_list.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/dev_null.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/dev_text.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/dev_trace.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/filt_basic.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/filt_dctd.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/filt_faxd.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/filt_flate.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/filt_jbig2d.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/filt_jpxd.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/filt_lzwd.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/filt_predict.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/fitz.h trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/obj_print.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/res_bitmap.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/res_colorspace.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/res_font.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/res_halftone.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/res_path.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/res_pixmap.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/res_shade.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/res_text.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/stm_buffer.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/stm_open.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fitz/stm_read.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/Dingbats.cff trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/NimbusMonL-Bold.cff trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/NimbusMonL-BoldObli.cff trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/NimbusMonL-Regu.cff trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/NimbusMonL-ReguObli.cff trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/NimbusRomNo9L-Medi.cff trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/NimbusRomNo9L-MediItal.cff trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/NimbusRomNo9L-Regu.cff trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/NimbusRomNo9L-ReguItal.cff trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/NimbusSanL-Bold.cff trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/NimbusSanL-BoldItal.cff trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/NimbusSanL-Regu.cff trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/NimbusSanL-ReguItal.cff trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/StandardSymL.cff trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/droid/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/droid/DroidSans.ttf trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/droid/DroidSansFallback.ttf trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/droid/DroidSansMono.ttf trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/fonts/droid/NOTICE trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/data_encodings.h trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/data_glyphlist.h trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/mupdf.h trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_annot.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_cmap.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_cmap_load.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_cmap_parse.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_cmap_table.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_colorspace.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_crypt.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_encoding.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_font.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_fontfile.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_function.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_image.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_interpret.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_lex.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_metrics.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_nametree.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_outline.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_page.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_parse.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_pattern.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_repair.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_shade.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_store.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_stream.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_type3.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_unicode.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_xobject.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/pdf/pdf_xref.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/scripts/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/scripts/cmapdump.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/scripts/fontdump.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/scripts/glyphdump.py trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/scripts/glyphlist.txt trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/scripts/jconfig.h trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/scripts/opj_config.h trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/scripts/rename.sed trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/scripts/slimftmodules.h trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/scripts/slimftoptions.h trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/win32/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/win32/README.txt trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/win32/generate.bat trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/win32/libmupdf.vcproj trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/win32/libthirdparty.vcproj trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/win32/mupdf.sln trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/win32/mupdf.vcproj trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/win32/pdfclean.vcproj trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/win32/pdfdraw.vcproj trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/win32/pdfextract.vcproj trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/win32/pdfshow.vcproj trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/win32/xpsdraw.vcproj trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/xps/ trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/xps/muxps.h trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/xps/xps_common.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/xps/xps_doc.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/xps/xps_glyphs.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/xps/xps_gradient.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/xps/xps_image.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/xps/xps_jpeg.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/xps/xps_path.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/xps/xps_png.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/xps/xps_resource.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/xps/xps_tiff.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/xps/xps_tile.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/xps/xps_util.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/xps/xps_xml.c trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.9/xps/xps_zip.c Removed: trunk/PROTO/eyesight/src/modules/pdf/mupdf-0.7/ Modified: trunk/PROTO/eyesight/src/bin/eyesight.c trunk/PROTO/eyesight/src/modules/pdf/Makefile.am trunk/PROTO/eyesight/src/modules/pdf/eyesight_pdf_mupdf.c trunk/PROTO/eyesight/src/modules/pdf/eyesight_pdf_mupdf.h Modified: trunk/PROTO/eyesight/src/bin/eyesight.c =================================================================== --- trunk/PROTO/eyesight/src/bin/eyesight.c 2011-10-23 09:21:14 UTC (rev 64322) +++ trunk/PROTO/eyesight/src/bin/eyesight.c 2011-10-23 09:47:39 UTC (rev 64323) @@ -43,10 +43,17 @@ ecore_main_loop_quit(); return; } - if (strcmp(ev->keyname, "Right") == 0) page_nbr++; - if (strcmp(ev->keyname, "Left") == 0) page_nbr--; - if (page_nbr < 0) page_nbr = 0; - if (page_nbr >= eyesight_object_page_count(obj)) page_nbr = eyesight_object_page_count(obj) - 1; + + if (strcmp(ev->keyname, "Right") == 0) + { + if (page_nbr < ( eyesight_object_page_count(obj) - 1)) + page_nbr++; + } + if (strcmp(ev->keyname, "Left") == 0) + { + if (page_nbr > 0) + page_nbr--; + } if (page_nbr != eyesight_object_page_get(obj)) { eyesight_object_page_set(obj, page_nbr); @@ -138,7 +145,7 @@ indent += 2; - EINA_LIST_FOREACH(items, l, data) + EINA_LIST_FOREACH((Eina_List *)items, l, data) { Eyesight_Index_Item *item = (Eyesight_Index_Item *)data; int i; @@ -203,9 +210,9 @@ Eyesight_Backend eb; void *doc; - if (argc < 2) + if (argc < 1) { - printf("argc < 2\n"); + printf("Usage: %s filename\n", argv[0]); return -1; } Modified: trunk/PROTO/eyesight/src/modules/pdf/Makefile.am =================================================================== --- trunk/PROTO/eyesight/src/modules/pdf/Makefile.am 2011-10-23 09:21:14 UTC (rev 64322) +++ trunk/PROTO/eyesight/src/modules/pdf/Makefile.am 2011-10-23 09:47:39 UTC (rev 64323) @@ -9,382 +9,379 @@ pkgdir = $(libdir)/eyesight + pkg_LTLIBRARIES = pdf.la if HAVE_PDF_BACKEND_MUPDF noinst_PROGRAMS = cmapdump fontdump -BUILT_SOURCES = cmapdump$(EXEEXT) fontdump$(EXEEXT) +BUILT_SOURCES = \ +cmapdump$(EXEEXT) \ +cmap_cns.h \ +cmap_gb.h \ +cmap_japan.h \ +cmap_korea.h \ +fontdump$(EXEEXT) \ +font_base14.h \ +font_droid.h \ +font_cjk.h -cmapdump_SOURCES = mupdf-0.7/mupdf/cmapdump.c +cmapdump_SOURCES = mupdf-0.9/scripts/cmapdump.c cmapdump_CPPFLAGS = \ --I$(top_srcdir)/src/modules/pdf/mupdf-0.7/fitz \ --I$(top_builddir)/src/modules/pdf/mupdf-0.7/fitz +-I$(top_srcdir)/src/modules/pdf/mupdf-0.9/fitz \ +-I$(top_builddir)/src/modules/pdf/mupdf-0.9/fitz \ +-I$(top_srcdir)/src/modules/pdf/mupdf-0.9/pdf \ +-I$(top_builddir)/src/modules/pdf/mupdf-0.9/pdf -fontdump_SOURCES = mupdf-0.7/mupdf/fontdump.c -fontdump_CPPFLAGS = \ --I$(top_srcdir)/src/modules/pdf/mupdf-0.7/fitz \ --I$(top_builddir)/src/modules/pdf/mupdf-0.7/fitz +fontdump_SOURCES = mupdf-0.9/scripts/fontdump.c -noinst_LTLIBRARIES = libfitz.la libdraw.la libcmaps.la libfonts.la libmupdf.la +noinst_LTLIBRARIES = libfitz.la libmupdf.la libmuxps.la libfitz_la_SOURCES = \ -mupdf-0.7/fitz/base_error.c \ -mupdf-0.7/fitz/base_geometry.c \ -mupdf-0.7/fitz/base_getopt.c \ -mupdf-0.7/fitz/base_hash.c \ -mupdf-0.7/fitz/base_memory.c \ -mupdf-0.7/fitz/base_string.c \ -mupdf-0.7/fitz/base_time.c \ -mupdf-0.7/fitz/crypt_aes.c \ -mupdf-0.7/fitz/crypt_arc4.c \ -mupdf-0.7/fitz/crypt_md5.c \ -mupdf-0.7/fitz/dev_bbox.c \ -mupdf-0.7/fitz/dev_draw.c \ -mupdf-0.7/fitz/dev_list.c \ -mupdf-0.7/fitz/dev_null.c \ -mupdf-0.7/fitz/dev_text.c \ -mupdf-0.7/fitz/dev_trace.c \ -mupdf-0.7/fitz/filt_basic.c \ -mupdf-0.7/fitz/filt_dctd.c \ -mupdf-0.7/fitz/filt_faxd.c \ -mupdf-0.7/fitz/filt_flate.c \ -mupdf-0.7/fitz/filt_jbig2d.c \ -mupdf-0.7/fitz/filt_jpxd.c \ -mupdf-0.7/fitz/filt_lzwd.c \ -mupdf-0.7/fitz/filt_predict.c \ -mupdf-0.7/fitz/obj_array.c \ -mupdf-0.7/fitz/obj_dict.c \ -mupdf-0.7/fitz/obj_print.c \ -mupdf-0.7/fitz/obj_simple.c \ -mupdf-0.7/fitz/res_colorspace.c \ -mupdf-0.7/fitz/res_font.c \ -mupdf-0.7/fitz/res_path.c \ -mupdf-0.7/fitz/res_pixmap.c \ -mupdf-0.7/fitz/res_shade.c \ -mupdf-0.7/fitz/res_text.c \ -mupdf-0.7/fitz/stm_buffer.c \ -mupdf-0.7/fitz/stm_open.c \ -mupdf-0.7/fitz/stm_read.c +mupdf-0.9/fitz/base_error.c \ +mupdf-0.9/fitz/base_geometry.c \ +mupdf-0.9/fitz/base_getopt.c \ +mupdf-0.9/fitz/base_hash.c \ +mupdf-0.9/fitz/base_memory.c \ +mupdf-0.9/fitz/base_object.c \ +mupdf-0.9/fitz/base_string.c \ +mupdf-0.9/fitz/base_time.c \ +mupdf-0.9/fitz/crypt_aes.c \ +mupdf-0.9/fitz/crypt_arc4.c \ +mupdf-0.9/fitz/crypt_md5.c \ +mupdf-0.9/fitz/crypt_sha2.c \ +mupdf-0.9/fitz/dev_bbox.c \ +mupdf-0.9/fitz/dev_list.c \ +mupdf-0.9/fitz/dev_null.c \ +mupdf-0.9/fitz/dev_text.c \ +mupdf-0.9/fitz/dev_trace.c \ +mupdf-0.9/fitz/filt_basic.c \ +mupdf-0.9/fitz/filt_dctd.c \ +mupdf-0.9/fitz/filt_faxd.c \ +mupdf-0.9/fitz/filt_flate.c \ +mupdf-0.9/fitz/filt_jbig2d.c \ +mupdf-0.9/fitz/filt_jpxd.c \ +mupdf-0.9/fitz/filt_lzwd.c \ +mupdf-0.9/fitz/filt_predict.c \ +mupdf-0.9/fitz/obj_print.c \ +mupdf-0.9/fitz/res_bitmap.c \ +mupdf-0.9/fitz/res_colorspace.c \ +mupdf-0.9/fitz/res_font.c \ +mupdf-0.9/fitz/res_halftone.c \ +mupdf-0.9/fitz/res_path.c \ +mupdf-0.9/fitz/res_pixmap.c \ +mupdf-0.9/fitz/res_shade.c \ +mupdf-0.9/fitz/res_text.c \ +mupdf-0.9/fitz/stm_buffer.c \ +mupdf-0.9/fitz/stm_open.c \ +mupdf-0.9/fitz/stm_read.c \ +mupdf-0.9/draw/arch_arm.c \ +mupdf-0.9/draw/arch_port.c \ +mupdf-0.9/draw/draw_affine.c \ +mupdf-0.9/draw/draw_blend.c \ +mupdf-0.9/draw/draw_device.c \ +mupdf-0.9/draw/draw_edge.c \ +mupdf-0.9/draw/draw_glyph.c \ +mupdf-0.9/draw/draw_mesh.c \ +mupdf-0.9/draw/draw_paint.c \ +mupdf-0.9/draw/draw_path.c \ +mupdf-0.9/draw/draw_scale.c \ +mupdf-0.9/draw/draw_unpack.c + libfitz_la_CPPFLAGS = \ --I$(top_srcdir)/src/modules/pdf/mupdf-0.7/fitz \ --I$(top_builddir)/src/modules/pdf/mupdf-0.7/fitz \ --I$(top_srcdir)/src/modules/pdf/mupdf-0.7/mupdf \ --I$(top_builddir)/src/modules/pdf/mupdf-0.7/mupdf \ +-I$(top_srcdir)/src/modules/pdf/mupdf-0.9/fitz \ +-I$(top_builddir)/src/modules/pdf/mupdf-0.9/fitz \ @MUPDF_CFLAGS@ libfitz_la_LIBADD = @MUPDF_LIBS@ -libdraw_la_SOURCES = \ -mupdf-0.7/draw/archport.c \ -mupdf-0.7/draw/blendmodes.c \ -mupdf-0.7/draw/glyphcache.c \ -mupdf-0.7/draw/imagedraw.c \ -mupdf-0.7/draw/imagescale.c \ -mupdf-0.7/draw/imagesmooth.c \ -mupdf-0.7/draw/imageunpack.c \ -mupdf-0.7/draw/meshdraw.c \ -mupdf-0.7/draw/pathfill.c \ -mupdf-0.7/draw/pathscan.c \ -mupdf-0.7/draw/pathstroke.c \ -mupdf-0.7/draw/porterduff.c - -libdraw_la_CPPFLAGS = \ --I$(top_srcdir)/src/modules/pdf/mupdf-0.7/fitz \ --I$(top_builddir)/src/modules/pdf/mupdf-0.7/fitz \ --I$(top_srcdir)/src/modules/pdf/mupdf-0.7/draw \ --I$(top_builddir)/src/modules/pdf/mupdf-0.7/draw -libdraw_la_LIBADD = - -libcmaps_la_SOURCES = \ -cmap_tounicode.c \ -cmap_cns.c \ -cmap_gb.c \ -cmap_japan.c \ -cmap_korea.c - -libcmaps_la_CPPFLAGS = \ --I$(top_srcdir)/src/modules/pdf/mupdf-0.7/fitz \ --I$(top_builddir)/src/modules/pdf/mupdf-0.7/fitz \ --I$(top_srcdir)/src/modules/pdf/mupdf-0.7/mupdf \ --I$(top_builddir)/src/modules/pdf/mupdf-0.7/mupdf - -cmap_tounicode_files = \ -mupdf-0.7/cmaps/Adobe-CNS1-UCS2 \ -mupdf-0.7/cmaps/Adobe-GB1-UCS2 \ -mupdf-0.7/cmaps/Adobe-Japan1-UCS2 \ -mupdf-0.7/cmaps/Adobe-Korea1-UCS2 - cmap_cns_files = \ -mupdf-0.7/cmaps/Adobe-CNS1-0 \ -mupdf-0.7/cmaps/Adobe-CNS1-1 \ -mupdf-0.7/cmaps/Adobe-CNS1-2 \ -mupdf-0.7/cmaps/Adobe-CNS1-3 \ -mupdf-0.7/cmaps/Adobe-CNS1-4 \ -mupdf-0.7/cmaps/Adobe-CNS1-5 \ -mupdf-0.7/cmaps/Adobe-CNS1-6 \ -mupdf-0.7/cmaps/B5-H \ -mupdf-0.7/cmaps/B5-V \ -mupdf-0.7/cmaps/B5pc-H \ -mupdf-0.7/cmaps/B5pc-V \ -mupdf-0.7/cmaps/CNS-EUC-H \ -mupdf-0.7/cmaps/CNS-EUC-V \ -mupdf-0.7/cmaps/CNS1-H \ -mupdf-0.7/cmaps/CNS1-V \ -mupdf-0.7/cmaps/CNS2-H \ -mupdf-0.7/cmaps/CNS2-V \ -mupdf-0.7/cmaps/ETen-B5-H \ -mupdf-0.7/cmaps/ETen-B5-V \ -mupdf-0.7/cmaps/ETenms-B5-H \ -mupdf-0.7/cmaps/ETenms-B5-V \ -mupdf-0.7/cmaps/ETHK-B5-H \ -mupdf-0.7/cmaps/ETHK-B5-V \ -mupdf-0.7/cmaps/HKdla-B5-H \ -mupdf-0.7/cmaps/HKdla-B5-V \ -mupdf-0.7/cmaps/HKdlb-B5-H \ -mupdf-0.7/cmaps/HKdlb-B5-V \ -mupdf-0.7/cmaps/HKgccs-B5-H \ -mupdf-0.7/cmaps/HKgccs-B5-V \ -mupdf-0.7/cmaps/HKm314-B5-H \ -mupdf-0.7/cmaps/HKm314-B5-V \ -mupdf-0.7/cmaps/HKm471-B5-H \ -mupdf-0.7/cmaps/HKm471-B5-V \ -mupdf-0.7/cmaps/HKscs-B5-H \ -mupdf-0.7/cmaps/HKscs-B5-V \ -mupdf-0.7/cmaps/UniCNS-UCS2-H \ -mupdf-0.7/cmaps/UniCNS-UCS2-V \ -mupdf-0.7/cmaps/UniCNS-UTF16-H \ -mupdf-0.7/cmaps/UniCNS-UTF16-V +mupdf-0.9/cmaps/cns/Adobe-CNS1-0 \ +mupdf-0.9/cmaps/cns/Adobe-CNS1-1 \ +mupdf-0.9/cmaps/cns/Adobe-CNS1-2 \ +mupdf-0.9/cmaps/cns/Adobe-CNS1-3 \ +mupdf-0.9/cmaps/cns/Adobe-CNS1-4 \ +mupdf-0.9/cmaps/cns/Adobe-CNS1-5 \ +mupdf-0.9/cmaps/cns/Adobe-CNS1-6 \ +mupdf-0.9/cmaps/cns/Adobe-CNS1-UCS2 \ +mupdf-0.9/cmaps/cns/B5-H \ +mupdf-0.9/cmaps/cns/B5pc-H \ +mupdf-0.9/cmaps/cns/B5pc-V \ +mupdf-0.9/cmaps/cns/B5-V \ +mupdf-0.9/cmaps/cns/CNS1-H \ +mupdf-0.9/cmaps/cns/CNS1-V \ +mupdf-0.9/cmaps/cns/CNS2-H \ +mupdf-0.9/cmaps/cns/CNS2-V \ +mupdf-0.9/cmaps/cns/CNS-EUC-H \ +mupdf-0.9/cmaps/cns/CNS-EUC-V \ +mupdf-0.9/cmaps/cns/ETen-B5-H \ +mupdf-0.9/cmaps/cns/ETen-B5-V \ +mupdf-0.9/cmaps/cns/ETenms-B5-H \ +mupdf-0.9/cmaps/cns/ETenms-B5-V \ +mupdf-0.9/cmaps/cns/ETHK-B5-H \ +mupdf-0.9/cmaps/cns/ETHK-B5-V \ +mupdf-0.9/cmaps/cns/HKdla-B5-H \ +mupdf-0.9/cmaps/cns/HKdla-B5-V \ +mupdf-0.9/cmaps/cns/HKdlb-B5-H \ +mupdf-0.9/cmaps/cns/HKdlb-B5-V \ +mupdf-0.9/cmaps/cns/HKgccs-B5-H \ +mupdf-0.9/cmaps/cns/HKgccs-B5-V \ +mupdf-0.9/cmaps/cns/HKm314-B5-H \ +mupdf-0.9/cmaps/cns/HKm314-B5-V \ +mupdf-0.9/cmaps/cns/HKm471-B5-H \ +mupdf-0.9/cmaps/cns/HKm471-B5-V \ +mupdf-0.9/cmaps/cns/HKscs-B5-H \ +mupdf-0.9/cmaps/cns/HKscs-B5-V \ +mupdf-0.9/cmaps/cns/UniCNS-UCS2-H \ +mupdf-0.9/cmaps/cns/UniCNS-UCS2-V \ +mupdf-0.9/cmaps/cns/UniCNS-UTF16-H \ +mupdf-0.9/cmaps/cns/UniCNS-UTF16-V cmap_gb_files = \ -mupdf-0.7/cmaps/Adobe-GB1-0 \ -mupdf-0.7/cmaps/Adobe-GB1-1 \ -mupdf-0.7/cmaps/Adobe-GB1-2 \ -mupdf-0.7/cmaps/Adobe-GB1-3 \ -mupdf-0.7/cmaps/Adobe-GB1-4 \ -mupdf-0.7/cmaps/Adobe-GB1-5 \ -mupdf-0.7/cmaps/GB-EUC-H \ -mupdf-0.7/cmaps/GB-EUC-V \ -mupdf-0.7/cmaps/GB-H \ -mupdf-0.7/cmaps/GB-V \ -mupdf-0.7/cmaps/GBK-EUC-H \ -mupdf-0.7/cmaps/GBK-EUC-V \ -mupdf-0.7/cmaps/GBK2K-H \ -mupdf-0.7/cmaps/GBK2K-V \ -mupdf-0.7/cmaps/GBKp-EUC-H \ -mupdf-0.7/cmaps/GBKp-EUC-V \ -mupdf-0.7/cmaps/GBpc-EUC-H \ -mupdf-0.7/cmaps/GBpc-EUC-V \ -mupdf-0.7/cmaps/GBT-EUC-H \ -mupdf-0.7/cmaps/GBT-EUC-V \ -mupdf-0.7/cmaps/GBT-H \ -mupdf-0.7/cmaps/GBT-V \ -mupdf-0.7/cmaps/GBTpc-EUC-H \ -mupdf-0.7/cmaps/GBTpc-EUC-V \ -mupdf-0.7/cmaps/UniGB-UCS2-H \ -mupdf-0.7/cmaps/UniGB-UCS2-V \ -mupdf-0.7/cmaps/UniGB-UTF16-H \ -mupdf-0.7/cmaps/UniGB-UTF16-V +mupdf-0.9/cmaps/gb/Adobe-GB1-0 \ +mupdf-0.9/cmaps/gb/Adobe-GB1-1 \ +mupdf-0.9/cmaps/gb/Adobe-GB1-2 \ +mupdf-0.9/cmaps/gb/Adobe-GB1-3 \ +mupdf-0.9/cmaps/gb/Adobe-GB1-4 \ +mupdf-0.9/cmaps/gb/Adobe-GB1-5 \ +mupdf-0.9/cmaps/gb/Adobe-GB1-UCS2 \ +mupdf-0.9/cmaps/gb/GB-EUC-H \ +mupdf-0.9/cmaps/gb/GB-EUC-V \ +mupdf-0.9/cmaps/gb/GB-H \ +mupdf-0.9/cmaps/gb/GBK2K-H \ +mupdf-0.9/cmaps/gb/GBK2K-V \ +mupdf-0.9/cmaps/gb/GBK-EUC-H \ +mupdf-0.9/cmaps/gb/GBK-EUC-V \ +mupdf-0.9/cmaps/gb/GBKp-EUC-H \ +mupdf-0.9/cmaps/gb/GBKp-EUC-V \ +mupdf-0.9/cmaps/gb/GBpc-EUC-H \ +mupdf-0.9/cmaps/gb/GBpc-EUC-V \ +mupdf-0.9/cmaps/gb/GBT-EUC-H \ +mupdf-0.9/cmaps/gb/GBT-EUC-V \ +mupdf-0.9/cmaps/gb/GBT-H \ +mupdf-0.9/cmaps/gb/GBTpc-EUC-H \ +mupdf-0.9/cmaps/gb/GBTpc-EUC-V \ +mupdf-0.9/cmaps/gb/GBT-V \ +mupdf-0.9/cmaps/gb/GB-V \ +mupdf-0.9/cmaps/gb/UniGB-UCS2-H \ +mupdf-0.9/cmaps/gb/UniGB-UCS2-V \ +mupdf-0.9/cmaps/gb/UniGB-UTF16-H \ +mupdf-0.9/cmaps/gb/UniGB-UTF16-V cmap_japan_files = \ -mupdf-0.7/cmaps/78-EUC-H \ -mupdf-0.7/cmaps/78-EUC-V \ -mupdf-0.7/cmaps/78-H \ -mupdf-0.7/cmaps/78-RKSJ-H \ -mupdf-0.7/cmaps/78-RKSJ-V \ -mupdf-0.7/cmaps/78-V \ -mupdf-0.7/cmaps/78ms-RKSJ-H \ -mupdf-0.7/cmaps/78ms-RKSJ-V \ -mupdf-0.7/cmaps/83pv-RKSJ-H \ -mupdf-0.7/cmaps/90ms-RKSJ-H \ -mupdf-0.7/cmaps/90ms-RKSJ-V \ -mupdf-0.7/cmaps/90msp-RKSJ-H \ -mupdf-0.7/cmaps/90msp-RKSJ-V \ -mupdf-0.7/cmaps/90pv-RKSJ-H \ -mupdf-0.7/cmaps/90pv-RKSJ-V \ -mupdf-0.7/cmaps/Add-H \ -mupdf-0.7/cmaps/Add-RKSJ-H \ -mupdf-0.7/cmaps/Add-RKSJ-V \ -mupdf-0.7/cmaps/Add-V \ -mupdf-0.7/cmaps/Adobe-Japan1-0 \ -mupdf-0.7/cmaps/Adobe-Japan1-1 \ -mupdf-0.7/cmaps/Adobe-Japan1-2 \ -mupdf-0.7/cmaps/Adobe-Japan1-3 \ -mupdf-0.7/cmaps/Adobe-Japan1-4 \ -mupdf-0.7/cmaps/Adobe-Japan1-5 \ -mupdf-0.7/cmaps/Adobe-Japan1-6 \ -mupdf-0.7/cmaps/EUC-H \ -mupdf-0.7/cmaps/EUC-V \ -mupdf-0.7/cmaps/Ext-H \ -mupdf-0.7/cmaps/Ext-RKSJ-H \ -mupdf-0.7/cmaps/Ext-RKSJ-V \ -mupdf-0.7/cmaps/Ext-V \ -mupdf-0.7/cmaps/H \ -mupdf-0.7/cmaps/Hankaku \ -mupdf-0.7/cmaps/Hiragana \ -mupdf-0.7/cmaps/Katakana \ -mupdf-0.7/cmaps/NWP-H \ -mupdf-0.7/cmaps/NWP-V \ -mupdf-0.7/cmaps/RKSJ-H \ -mupdf-0.7/cmaps/RKSJ-V \ -mupdf-0.7/cmaps/Roman \ -mupdf-0.7/cmaps/UniJIS-UCS2-H \ -mupdf-0.7/cmaps/UniJIS-UCS2-HW-H \ -mupdf-0.7/cmaps/UniJIS-UCS2-HW-V \ -mupdf-0.7/cmaps/UniJIS-UCS2-V \ -mupdf-0.7/cmaps/UniJISPro-UCS2-HW-V \ -mupdf-0.7/cmaps/UniJISPro-UCS2-V \ -mupdf-0.7/cmaps/V \ -mupdf-0.7/cmaps/WP-Symbol \ -mupdf-0.7/cmaps/Adobe-Japan2-0 \ -mupdf-0.7/cmaps/Hojo-EUC-H \ -mupdf-0.7/cmaps/Hojo-EUC-V \ -mupdf-0.7/cmaps/Hojo-H \ -mupdf-0.7/cmaps/Hojo-V \ -mupdf-0.7/cmaps/UniHojo-UCS2-H \ -mupdf-0.7/cmaps/UniHojo-UCS2-V \ -mupdf-0.7/cmaps/UniHojo-UTF16-H \ -mupdf-0.7/cmaps/UniHojo-UTF16-V \ -mupdf-0.7/cmaps/UniJIS-UTF16-H \ -mupdf-0.7/cmaps/UniJIS-UTF16-V +mupdf-0.9/cmaps/japan/78-EUC-H \ +mupdf-0.9/cmaps/japan/78-EUC-V \ +mupdf-0.9/cmaps/japan/78-H \ +mupdf-0.9/cmaps/japan/78ms-RKSJ-H \ +mupdf-0.9/cmaps/japan/78ms-RKSJ-V \ +mupdf-0.9/cmaps/japan/78-RKSJ-H \ +mupdf-0.9/cmaps/japan/78-RKSJ-V \ +mupdf-0.9/cmaps/japan/78-V \ +mupdf-0.9/cmaps/japan/83pv-RKSJ-H \ +mupdf-0.9/cmaps/japan/90msp-RKSJ-H \ +mupdf-0.9/cmaps/japan/90msp-RKSJ-V \ +mupdf-0.9/cmaps/japan/90ms-RKSJ-H \ +mupdf-0.9/cmaps/japan/90ms-RKSJ-V \ +mupdf-0.9/cmaps/japan/90pv-RKSJ-H \ +mupdf-0.9/cmaps/japan/90pv-RKSJ-V \ +mupdf-0.9/cmaps/japan/Add-H \ +mupdf-0.9/cmaps/japan/Add-RKSJ-H \ +mupdf-0.9/cmaps/japan/Add-RKSJ-V \ +mupdf-0.9/cmaps/japan/Add-V \ +mupdf-0.9/cmaps/japan/Adobe-Japan1-0 \ +mupdf-0.9/cmaps/japan/Adobe-Japan1-1 \ +mupdf-0.9/cmaps/japan/Adobe-Japan1-2 \ +mupdf-0.9/cmaps/japan/Adobe-Japan1-3 \ +mupdf-0.9/cmaps/japan/Adobe-Japan1-4 \ +mupdf-0.9/cmaps/japan/Adobe-Japan1-5 \ +mupdf-0.9/cmaps/japan/Adobe-Japan1-6 \ +mupdf-0.9/cmaps/japan/Adobe-Japan1-UCS2 \ +mupdf-0.9/cmaps/japan/Adobe-Japan2-0 \ +mupdf-0.9/cmaps/japan/EUC-H \ +mupdf-0.9/cmaps/japan/EUC-V \ +mupdf-0.9/cmaps/japan/Ext-H \ +mupdf-0.9/cmaps/japan/Ext-RKSJ-H \ +mupdf-0.9/cmaps/japan/Ext-RKSJ-V \ +mupdf-0.9/cmaps/japan/Ext-V \ +mupdf-0.9/cmaps/japan/H \ +mupdf-0.9/cmaps/japan/Hankaku \ +mupdf-0.9/cmaps/japan/Hiragana \ +mupdf-0.9/cmaps/japan/Hojo-EUC-H \ +mupdf-0.9/cmaps/japan/Hojo-EUC-V \ +mupdf-0.9/cmaps/japan/Hojo-H \ +mupdf-0.9/cmaps/japan/Hojo-V \ +mupdf-0.9/cmaps/japan/Katakana \ +mupdf-0.9/cmaps/japan/NWP-H \ +mupdf-0.9/cmaps/japan/NWP-V \ +mupdf-0.9/cmaps/japan/RKSJ-H \ +mupdf-0.9/cmaps/japan/RKSJ-V \ +mupdf-0.9/cmaps/japan/Roman \ +mupdf-0.9/cmaps/japan/UniHojo-UCS2-H \ +mupdf-0.9/cmaps/japan/UniHojo-UCS2-V \ +mupdf-0.9/cmaps/japan/UniHojo-UTF16-H \ +mupdf-0.9/cmaps/japan/UniHojo-UTF16-V \ +mupdf-0.9/cmaps/japan/UniJISPro-UCS2-HW-V \ +mupdf-0.9/cmaps/japan/UniJISPro-UCS2-V \ +mupdf-0.9/cmaps/japan/UniJIS-UCS2-H \ +mupdf-0.9/cmaps/japan/UniJIS-UCS2-HW-H \ +mupdf-0.9/cmaps/japan/UniJIS-UCS2-HW-V \ +mupdf-0.9/cmaps/japan/UniJIS-UCS2-V \ +mupdf-0.9/cmaps/japan/UniJIS-UTF16-H \ +mupdf-0.9/cmaps/japan/UniJIS-UTF16-V \ +mupdf-0.9/cmaps/japan/V \ +mupdf-0.9/cmaps/japan/WP-Symbol cmap_korea_files = \ -mupdf-0.7/cmaps/Adobe-Korea1-0 \ -mupdf-0.7/cmaps/Adobe-Korea1-1 \ -mupdf-0.7/cmaps/Adobe-Korea1-2 \ -mupdf-0.7/cmaps/KSC-EUC-H \ -mupdf-0.7/cmaps/KSC-EUC-V \ -mupdf-0.7/cmaps/KSC-H \ -mupdf-0.7/cmaps/KSC-Johab-H \ -mupdf-0.7/cmaps/KSC-Johab-V \ -mupdf-0.7/cmaps/KSC-V \ -mupdf-0.7/cmaps/KSCms-UHC-H \ -mupdf-0.7/cmaps/KSCms-UHC-HW-H \ -mupdf-0.7/cmaps/KSCms-UHC-HW-V \ -mupdf-0.7/cmaps/KSCms-UHC-V \ -mupdf-0.7/cmaps/KSCpc-EUC-H \ -mupdf-0.7/cmaps/KSCpc-EUC-V \ -mupdf-0.7/cmaps/UniKS-UCS2-H \ -mupdf-0.7/cmaps/UniKS-UCS2-V \ -mupdf-0.7/cmaps/UniKS-UTF16-H \ -mupdf-0.7/cmaps/UniKS-UTF16-V +mupdf-0.9/cmaps/korea/Adobe-Korea1-0 \ +mupdf-0.9/cmaps/korea/Adobe-Korea1-1 \ +mupdf-0.9/cmaps/korea/Adobe-Korea1-2 \ +mupdf-0.9/cmaps/korea/Adobe-Korea1-UCS2 \ +mupdf-0.9/cmaps/korea/KSC-EUC-H \ +mupdf-0.9/cmaps/korea/KSC-EUC-V \ +mupdf-0.9/cmaps/korea/KSC-H \ +mupdf-0.9/cmaps/korea/KSC-Johab-H \ +mupdf-0.9/cmaps/korea/KSC-Johab-V \ +mupdf-0.9/cmaps/korea/KSCms-UHC-H \ +mupdf-0.9/cmaps/korea/KSCms-UHC-HW-H \ +mupdf-0.9/cmaps/korea/KSCms-UHC-HW-V \ +mupdf-0.9/cmaps/korea/KSCms-UHC-V \ +mupdf-0.9/cmaps/korea/KSCpc-EUC-H \ +mupdf-0.9/cmaps/korea/KSCpc-EUC-V \ +mupdf-0.9/cmaps/korea/KSC-V \ +mupdf-0.9/cmaps/korea/UniKS-UCS2-H \ +mupdf-0.9/cmaps/korea/UniKS-UCS2-V \ +mupdf-0.9/cmaps/korea/UniKS-UTF16-H \ +mupdf-0.9/cmaps/korea/UniKS-UTF16-V -cmap_tounicode.c: cmapdump $(cmap_tounicode_files) - ./cmapdump $@ $(cmap_tounicode_files) +generated: + @echo " MKDIR mupdf-0.9/generated/" + @$(MKDIR_P) mupdf-0.9/generated/ -cmap_cns.c: cmapdump $(cmap_cns_files) - ./cmapdump $@ $(cmap_cns_files) +cmap_cns.h: cmapdump generated $(cmap_cns_files) + @echo " GEN $@" + @./cmapdump mupdf-0.9/generated/$@ $(cmap_cns_files) > /dev/null 2>&1 -cmap_gb.c: cmapdump $(cmap_gb_files) - ./cmapdump $@ $(cmap_gb_files) +cmap_gb.h: cmapdump generated $(cmap_gb_files) + @echo " GEN $@" + @./cmapdump mupdf-0.9/generated/$@ $(cmap_gb_files) > /dev/null 2>&1 -cmap_japan.c: cmapdump $(cmap_japan_files) - ./cmapdump $@ $(cmap_japan_files) +cmap_japan.h: cmapdump generated $(cmap_japan_files) + @echo " GEN $@" + @./cmapdump mupdf-0.9/generated/$@ $(cmap_japan_files) > /dev/null 2>&1 -cmap_korea.c: cmapdump $(cmap_korea_files) - ./cmapdump $@ $(cmap_korea_files) +cmap_korea.h: cmapdump generated $(cmap_korea_files) + @echo " GEN $@" + @./cmapdump mupdf-0.9/generated/$@ $(cmap_korea_files) > /dev/null 2>&1 -libfonts_la_SOURCES = \ -font_base.c - -libfonts_la_CPPFLAGS = \ --I$(top_srcdir)/src/modules/pdf/mupdf-0.7/fitz \ --I$(top_builddir)/src/modules/pdf/mupdf-0.7/fitz - -if BUILD_MUPDF_CJK_FONTS - -libfonts_la_SOURCES += font_cjk.c - -endif - font_base_files = \ -mupdf-0.7/fonts/Dingbats.cff \ -mupdf-0.7/fonts/NimbusMonL-Bold.cff \ -mupdf-0.7/fonts/NimbusMonL-BoldObli.cff \ -mupdf-0.7/fonts/NimbusMonL-Regu.cff \ -mupdf-0.7/fonts/NimbusMonL-ReguObli.cff \ -mupdf-0.7/fonts/NimbusRomNo9L-Medi.cff \ -mupdf-0.7/fonts/NimbusRomNo9L-MediItal.cff \ -mupdf-0.7/fonts/NimbusRomNo9L-Regu.cff \ -mupdf-0.7/fonts/NimbusRomNo9L-ReguItal.cff \ -mupdf-0.7/fonts/NimbusSanL-Bold.cff \ -mupdf-0.7/fonts/NimbusSanL-BoldItal.cff \ -mupdf-0.7/fonts/NimbusSanL-Regu.cff \ -mupdf-0.7/fonts/NimbusSanL-ReguItal.cff \ -mupdf-0.7/fonts/StandardSymL.cff \ -mupdf-0.7/fonts/URWChanceryL-MediItal.cff +mupdf-0.9/fonts/Dingbats.cff \ +mupdf-0.9/fonts/NimbusMonL-Bold.cff \ +mupdf-0.9/fonts/NimbusMonL-BoldObli.cff \ +mupdf-0.9/fonts/NimbusMonL-Regu.cff \ +mupdf-0.9/fonts/NimbusMonL-ReguObli.cff \ +mupdf-0.9/fonts/NimbusRomNo9L-Medi.cff \ +mupdf-0.9/fonts/NimbusRomNo9L-MediItal.cff \ +mupdf-0.9/fonts/NimbusRomNo9L-Regu.cff \ +mupdf-0.9/fonts/NimbusRomNo9L-ReguItal.cff \ +mupdf-0.9/fonts/NimbusSanL-Bold.cff \ +mupdf-0.9/fonts/NimbusSanL-BoldItal.cff \ +mupdf-0.9/fonts/NimbusSanL-Regu.cff \ +mupdf-0.9/fonts/NimbusSanL-ReguItal.cff \ +mupdf-0.9/fonts/StandardSymL.cff +font_droid_files = \ +mupdf-0.9/fonts/droid/DroidSans.ttf \ +mupdf-0.9/fonts/droid/DroidSansMono.ttf + font_cjk_files = \ -mupdf-0.7/fonts/droid/DroidSansFallback.ttf +mupdf-0.9/fonts/droid/DroidSansFallback.ttf -font_base.c: fontdump $(font_base_files) - ./fontdump $@ $(font_base_files) +font_base14.h: fontdump generated $(font_base_files) + @echo " GEN $@" + @./fontdump mupdf-0.9/generated/$@ $(font_base_files) > /dev/null 2>&1 -font_cjk.c: fontdump $(font_cjk_files) - ./fontdump $@ $(font_cjk_files) +font_droid.h: fontdump generated $(font_droid_files) + @echo " GEN $@" + @./fontdump mupdf-0.9/generated/$@ $(font_droid_files) > /dev/null 2>&1 +font_cjk.h: fontdump generated $(font_cjk_files) + @echo " GEN $@" + @./fontdump mupdf-0.9/generated/$@ $(font_cjk_files) > /dev/null 2>&1 + libmupdf_la_SOURCES = \ -mupdf-0.7/mupdf/pdf_annot.c \ -mupdf-0.7/mupdf/pdf_build.c \ -mupdf-0.7/mupdf/pdf_cmap.c \ -mupdf-0.7/mupdf/pdf_cmap_load.c \ -mupdf-0.7/mupdf/pdf_cmap_parse.c \ -mupdf-0.7/mupdf/pdf_cmap_table.c \ -mupdf-0.7/mupdf/pdf_colorspace.c \ -mupdf-0.7/mupdf/pdf_crypt.c \ -mupdf-0.7/mupdf/pdf_debug.c \ -mupdf-0.7/mupdf/pdf_font.c \ -mupdf-0.7/mupdf/pdf_fontagl.c \ -mupdf-0.7/mupdf/pdf_fontenc.c \ -mupdf-0.7/mupdf/pdf_fontfile.c \ -mupdf-0.7/mupdf/pdf_fontmtx.c \ -mupdf-0.7/mupdf/pdf_function.c \ -mupdf-0.7/mupdf/pdf_image.c \ -mupdf-0.7/mupdf/pdf_interpret.c \ -mupdf-0.7/mupdf/pdf_lex.c \ -mupdf-0.7/mupdf/pdf_nametree.c \ -mupdf-0.7/mupdf/pdf_outline.c \ -mupdf-0.7/mupdf/pdf_page.c \ -mupdf-0.7/mupdf/pdf_pagetree.c \ -mupdf-0.7/mupdf/pdf_parse.c \ -mupdf-0.7/mupdf/pdf_pattern.c \ -mupdf-0.7/mupdf/pdf_repair.c \ -mupdf-0.7/mupdf/pdf_shade.c \ -mupdf-0.7/mupdf/pdf_store.c \ -mupdf-0.7/mupdf/pdf_stream.c \ -mupdf-0.7/mupdf/pdf_type3.c \ -mupdf-0.7/mupdf/pdf_unicode.c \ -mupdf-0.7/mupdf/pdf_xobject.c \ -mupdf-0.7/mupdf/pdf_xref.c +mupdf-0.9/pdf/pdf_annot.c \ +mupdf-0.9/pdf/pdf_cmap.c \ +mupdf-0.9/pdf/pdf_cmap_load.c \ +mupdf-0.9/pdf/pdf_cmap_parse.c \ +mupdf-0.9/pdf/pdf_cmap_table.c \ +mupdf-0.9/pdf/pdf_colorspace.c \ +mupdf-0.9/pdf/pdf_crypt.c \ +mupdf-0.9/pdf/pdf_encoding.c \ +mupdf-0.9/pdf/pdf_font.c \ +mupdf-0.9/pdf/pdf_fontfile.c \ +mupdf-0.9/pdf/pdf_function.c \ +mupdf-0.9/pdf/pdf_image.c \ +mupdf-0.9/pdf/pdf_interpret.c \ +mupdf-0.9/pdf/pdf_lex.c \ +mupdf-0.9/pdf/pdf_metrics.c \ +mupdf-0.9/pdf/pdf_nametree.c \ +mupdf-0.9/pdf/pdf_outline.c \ +mupdf-0.9/pdf/pdf_page.c \ +mupdf-0.9/pdf/pdf_parse.c \ +mupdf-0.9/pdf/pdf_pattern.c \ +mupdf-0.9/pdf/pdf_repair.c \ +mupdf-0.9/pdf/pdf_shade.c \ +mupdf-0.9/pdf/pdf_store.c \ +mupdf-0.9/pdf/pdf_stream.c \ +mupdf-0.9/pdf/pdf_type3.c \ +mupdf-0.9/pdf/pdf_unicode.c \ +mupdf-0.9/pdf/pdf_xobject.c \ +mupdf-0.9/pdf/pdf_xref.c libmupdf_la_CPPFLAGS = \ --I$(top_srcdir)/src/modules/pdf/mupdf-0.7/fitz \ --I$(top_builddir)/src/modules/pdf/mupdf-0.7/fitz \ --I$(top_srcdir)/src/modules/pdf/mupdf-0.7/mupdf \ --I$(top_builddir)/src/modules/pdf/mupdf-0.7/mupdf \ -@BUILD_MUPDF_CJK_FONTS@ \ +-I$(top_srcdir)/src/modules/pdf/mupdf-0.9/fitz \ +-I$(top_builddir)/src/modules/pdf/mupdf-0.9/fitz \ @MUPDF_CFLAGS@ libmupdf_la_LIBADD = @MUPDF_LIBS@ +libmuxps_la_SOURCES = \ +mupdf-0.9/xps/xps_common.c \ +mupdf-0.9/xps/xps_doc.c \ +mupdf-0.9/xps/xps_glyphs.c \ +mupdf-0.9/xps/xps_gradient.c \ +mupdf-0.9/xps/xps_image.c \ +mupdf-0.9/xps/xps_jpeg.c \ +mupdf-0.9/xps/xps_path.c \ +mupdf-0.9/xps/xps_png.c \ +mupdf-0.9/xps/xps_resource.c \ +mupdf-0.9/xps/xps_tiff.c \ +mupdf-0.9/xps/xps_tile.c \ +mupdf-0.9/xps/xps_util.c \ +mupdf-0.9/xps/xps_xml.c \ +mupdf-0.9/xps/xps_zip.c + +libmuxps_la_CPPFLAGS = \ +-I$(top_srcdir)/src/modules/pdf/mupdf-0.9/fitz \ +-I$(top_builddir)/src/modules/pdf/mupdf-0.9/fitz \ +@MUPDF_CFLAGS@ +libmuxps_la_LIBADD = @MUPDF_LIBS@ + pdf_la_SOURCES = \ eyesight_pdf_mupdf.c \ eyesight_pdf_mupdf.h pdf_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/src/lib \ --I$(top_srcdir)/src/modules/pdf/mupdf-0.7/fitz \ --I$(top_builddir)/src/modules/pdf/mupdf-0.7/fitz \ --I$(top_srcdir)/src/modules/pdf/mupdf-0.7/mupdf \ --I$(top_builddir)/src/modules/pdf/mupdf-0.7/mupdf \ +-I$(top_srcdir)/src/modules/pdf/mupdf-0.9/fitz \ +-I$(top_builddir)/src/modules/pdf/mupdf-0.9/fitz \ +-I$(top_srcdir)/src/modules/pdf/mupdf-0.9/mupdf \ +-I$(top_builddir)/src/modules/pdf/mupdf-0.9/mupdf \ @EFL_EYESIGHT_BUILD@ \ @EYESIGHT_CFLAGS@ pdf_la_LIBADD = \ @EYESIGHT_LIBS@ \ $(top_builddir)/src/lib/libeyesight.la \ libfitz.la \ -libdraw.la \ -libcmaps.la \ -libfonts.la \ libmupdf.la \ -lm pdf_la_LINK = $(LINK) $(pdf_la_LDFLAGS) @@ -420,6 +417,6 @@ endif clean-local: - -rm -f cmap_*.c font_*.c + -rm -rf mupdf-0.9/generated -EXTRA_DIST = mupdf-0.7 \ No newline at end of file +EXTRA_DIST = mupdf-0.9 \ No newline at end of file Modified: trunk/PROTO/eyesight/src/modules/pdf/eyesight_pdf_mupdf.c =================================================================== --- trunk/PROTO/eyesight/src/modules/pdf/eyesight_pdf_mupdf.c 2011-10-23 09:21:14 UTC (rev 64322) +++ trunk/PROTO/eyesight/src/modules/pdf/eyesight_pdf_mupdf.c 2011-10-23 09:47:39 UTC (rev 64323) @@ -46,9 +46,9 @@ { fz_obj *obj; - obj = fz_dictgets(info, prop); + obj = fz_dict_gets(info, prop); if (obj) - return pdf_toutf8(obj); + return pdf_to_utf8(obj); else return NULL; } @@ -83,16 +83,8 @@ free(date); return fmt; } -} -static Eina_Bool -_eyesight_document_permission(pdf_crypt *crypt, int perm) -{ - if (!crypt) - return EINA_TRUE; - if (crypt->p & perm) - return EINA_TRUE; - return EINA_FALSE; + return fmt; } static Eina_List * @@ -114,10 +106,10 @@ /* if title is NULL, we still continue */ switch (outline->link->kind) { - case PDF_LGOTO: + case PDF_LINK_GOTO: item->action = EYESIGHT_LINK_ACTION_GOTO; break; - case PDF_LURI: + case PDF_LINK_URI: item->action = EYESIGHT_LINK_ACTION_URI; break; default: @@ -127,8 +119,8 @@ } /* FIXME: page outlines are allowed to have a /A key (action) which can be a URL */ - if (outline->link && (outline->link->kind == PDF_LGOTO)) - item->page = pdf_findpageobject(xref, outline->link->dest) - 1; + if (outline->link && (outline->link->kind == PDF_LINK_GOTO)) + item->page = pdf_find_page_number(xref, outline->link->dest) - 1; /* FIXME: not implemented in mupdf yet */ item->is_open = EINA_TRUE; @@ -147,8 +139,6 @@ static void _eyesight_index_unfill (Eina_List *items) { - Eyesight_Index_Item *item; - if (!items) return; @@ -171,11 +161,11 @@ } static Eyesight_Link_Action_Goto -_eyesight_link_action_goto_fill(pdf_xref *xref, pdf_link *link) +_eyesight_link_action_goto_fill(pdf_xref *xref, pdf_link *lnk) { Eyesight_Link_Action_Goto action_goto; - action_goto.page = pdf_findpageobject(xref, link->dest) - 1; + action_goto.page = pdf_find_page_number(xref, lnk->dest) - 1; /* FIXME: to complete */ @@ -183,19 +173,20 @@ } static Eyesight_Link_Action_Uri -_eyesight_link_action_uri_fill(pdf_link *link) +_eyesight_link_action_uri_fill(pdf_link *lnk) { Eyesight_Link_Action_Uri action_uri; -action_uri.uri = NULL; - action_uri.uri = strdup(fz_tostrbuf(link->dest)); + action_uri.uri = NULL; + + action_uri.uri = strdup(fz_to_str_buf(lnk->dest)); /* we don't need any check on the success of strdup() */ return action_uri; } static Eyesight_Link_Action_Unknown -_eyesight_link_action_unknown_fill(pdf_link *link) +_eyesight_link_action_unknown_fill(pdf_link *lnk) { Eyesight_Link_Action_Unknown action_unknown; @@ -208,14 +199,14 @@ _eyesight_page_links_get(Eyesight_Backend_Pdf *ebp) { Eina_List *links_list = NULL; - pdf_link *link; + pdf_link *lnk; if (!ebp->page.page) return NULL; /* FIXME: mupdf should provide the number of links */ - link = ebp->page.page->links; - while (link) + lnk = ebp->page.page->links; + while (lnk) { Eyesight_Link *link_item; @@ -223,20 +214,20 @@ if (!link_item) goto next_link; - switch (link->kind) + switch (lnk->kind) { - case PDF_LGOTO: + case PDF_LINK_GOTO: link_item->action = EYESIGHT_LINK_ACTION_GOTO; - link_item->dest.action_goto = _eyesight_link_action_goto_fill(ebp->doc.xref, link); + link_item->dest.action_goto = _eyesight_link_action_goto_fill(ebp->doc.xref, lnk); break; - case PDF_LURI: + case PDF_LINK_URI: link_item->action = EYESIGHT_LINK_ACTION_URI; - link_item->dest.action_uri = _eyesight_link_action_uri_fill(link); + link_item->dest.action_uri = _eyesight_link_action_uri_fill(lnk); break; default: /* this case should not be reached */ link_item->action = EYESIGHT_LINK_ACTION_UNKNOWN; - link_item->dest.action_unknown = _eyesight_link_action_unknown_fill(link); + link_item->dest.action_unknown = _eyesight_link_action_unknown_fill(lnk); break; } @@ -261,17 +252,17 @@ /* link_item->rect.h = (int)(x2 - x1); */ /* break; */ default: - link_item->rect.x = round(link->rect.x0); - link_item->rect.y = round(ebp->page.height - link->rect.y1); - link_item->rect.w = round(link->rect.x1 - link->rect.x0); - link_item->rect.h = round(link->rect.y1 - link->rect.y0); + link_item->rect.x = round(lnk->rect.x0); + link_item->rect.y = round(ebp->page.height - lnk->rect.y1); + link_item->rect.w = round(lnk->rect.x1 - lnk->rect.x0); + link_item->rect.h = round(lnk->rect.y1 - lnk->rect.y0); break; } links_list = eina_list_prepend(links_list, link_item); next_link: - link = link->next; + lnk = lnk->next; } return links_list; @@ -288,23 +279,23 @@ EINA_LIST_FOREACH(ebp->page.links, l, data) { - Eyesight_Link *link = (Eyesight_Link *)data; + Eyesight_Link *lnk = (Eyesight_Link *)data; - switch (link->action) + switch (lnk->action) { case EYESIGHT_LINK_ACTION_GOTO: /* nothing */ break; case EYESIGHT_LINK_ACTION_URI: - if (link->dest.action_uri.uri) - free(link->dest.action_uri.uri); + if (lnk->dest.action_uri.uri) + free(lnk->dest.action_uri.uri); break; case EYESIGHT_LINK_ACTION_UNKNOWN: - if (link->dest.action_unknown.action) - free(link->dest.action_unknown.action); + if (lnk->dest.action_unknown.action) + free(lnk->dest.action_unknown.action); break; } - free(link); + free(lnk); } } @@ -324,7 +315,7 @@ if (!ebp->obj) goto free_ebp; - ebp->doc.cache = fz_newglyphcache(); + ebp->doc.cache = fz_new_glyph_cache(); if (!ebp->doc.cache) { ERR("Could not create glyph cache"); @@ -353,7 +344,7 @@ return; ebp = (Eyesight_Backend_Pdf *)eb; - fz_freeglyphcache(ebp->doc.cache); + fz_free_glyph_cache(ebp->doc.cache); evas_object_del(ebp->obj); free(eb); } @@ -390,8 +381,8 @@ goto free_filename; } - file = fz_openfile(fd); - error = pdf_openxrefwithstream(&ebp->doc.xref, file, NULL); + file = fz_open_fd(fd); + error = pdf_open_xref_with_stream(&ebp->doc.xref, file, NULL); if (error) { ERR("PDF file %s illformed", filename); @@ -400,7 +391,7 @@ fz_close(file); - obj = fz_dictgets(ebp->doc.xref->trailer, "Info"); + obj = fz_dict_gets(ebp->doc.xref->trailer, "Info"); if (!obj) goto free_xref; @@ -408,7 +399,7 @@ if (!doc) goto free_xref; - error = pdf_loadpagetree(ebp->doc.xref); + error = pdf_load_page_tree(ebp->doc.xref); if (error) { ERR("Could not load page tree"); @@ -432,36 +423,36 @@ /* doc->layout = _eyesight_document_page_layout_get(ebp->doc.pdfdoc); */ /* doc->locked = (ebp->doc.pdfdoc->getErrorCode() == errEncrypted) ? EINA_TRUE : EINA_FALSE; */ - doc->encrypted = pdf_needspassword(ebp->doc.xref); + doc->encrypted = pdf_needs_password(ebp->doc.xref); /* doc->linearized = ebp->doc.pdfdoc->isLinearized(); */ - doc->printable = _eyesight_document_permission(ebp->doc.xref->crypt, PDF_PERM_PRINT); - doc->changeable = _eyesight_document_permission(ebp->doc.xref->crypt, PDF_PERM_CHANGE); - doc->copyable = _eyesight_document_permission(ebp->doc.xref->crypt, PDF_PERM_COPY); - doc->notable = _eyesight_document_permission(ebp->doc.xref->crypt, PDF_PERM_NOTES); + doc->printable = pdf_has_permission(ebp->doc.xref, PDF_PERM_PRINT) ? EINA_TRUE : EINA_FALSE; + doc->changeable = pdf_has_permission(ebp->doc.xref, PDF_PERM_CHANGE) ? EINA_TRUE : EINA_FALSE; + doc->copyable = pdf_has_permission(ebp->doc.xref, PDF_PERM_COPY) ? EINA_TRUE : EINA_FALSE; + doc->notable = pdf_has_permission(ebp->doc.xref, PDF_PERM_NOTES) ? EINA_TRUE : EINA_FALSE; ebp->document = doc; - obj = pdf_getpageobject(ebp->doc.xref, 1); - error = pdf_loadpage(&ebp->page.page, ebp->doc.xref, obj); + error = pdf_load_page(&ebp->page.page, ebp->doc.xref, 0); if (error) { ERR("Could not retrieve first page from the document"); goto free_xref; } - ebp->page.page->list = fz_newdisplaylist(); - dev = fz_newlistdevice(ebp->page.page->list); - error = pdf_runpage(ebp->doc.xref, ebp->page.page, dev, fz_identity); + /* FIXME: cache dev */ + ebp->page.display_list = fz_new_display_list(); + dev = fz_new_list_device(ebp->page.display_list); + error = pdf_run_page(ebp->doc.xref, ebp->page.page, dev, fz_identity); if (error) { ERR("Could not draw page"); } - fz_freedevice(dev); + fz_free_device(dev); zoom = resolution / 72.0f; ctm = fz_translate(0, -ebp->page.page->mediabox.y1); ctm = fz_concat(ctm, fz_scale(zoom, -zoom)); ctm = fz_concat(ctm, fz_rotate(ebp->page.orientation + ebp->page.page->rotate)); - bbox = fz_roundrect(fz_transformrect(ctm, ebp->page.page->mediabox)); + bbox = fz_round_rect(fz_transform_rect(ctm, ebp->page.page->mediabox)); ebp->page.width = bbox.x1 - bbox.x0; ebp->page.height = bbox.y1 - bbox.y0; @@ -475,7 +466,7 @@ return doc; free_xref: - pdf_freexref(ebp->doc.xref); + pdf_free_xref(ebp->doc.xref); close_fd: close(fd); free_filename: @@ -499,7 +490,7 @@ if (ebp->page.page) { - pdf_freepage(ebp->page.page); + pdf_free_page(ebp->page.page); ebp->page.page = NULL; } @@ -520,7 +511,7 @@ } if (ebp->doc.xref) { - pdf_freexref(ebp->doc.xref); + pdf_free_xref(ebp->doc.xref); ebp->doc.xref = NULL; } if (ebp->filename) @@ -541,11 +532,11 @@ ebp = (Eyesight_Backend_Pdf *)eb; - outline = pdf_loadoutline(ebp->doc.xref); + outline = pdf_load_outline(ebp->doc.xref); if (outline) { ebp->doc.toc = _eyesight_index_fill (ebp->doc.xref, outline, NULL); - pdf_freeoutline(outline); + pdf_free_outline(outline); } return ebp->doc.toc; @@ -561,7 +552,7 @@ ebp = (Eyesight_Backend_Pdf *)eb; - return pdf_getpagecount(ebp->doc.xref); + return pdf_count_pages(ebp->doc.xref); } static void @@ -569,7 +560,6 @@ { Eyesight_Backend_Pdf *ebp; pdf_page *p; - fz_obj *obj; fz_device *dev; fz_matrix ctm; fz_bbox bbox; @@ -582,35 +572,34 @@ ebp = (Eyesight_Backend_Pdf *)eb; - obj = pdf_getpageobject(ebp->doc.xref, page + 1); - error = pdf_loadpage(&p, ebp->doc.xref, obj); + error = pdf... [truncated message content] |