removed initial cmap/ directory

pull/1/head
Yusuke Shinyama 2011-07-31 18:05:07 +10:00
parent cdef0d7883
commit cbb8d869c7
4 changed files with 13 additions and 17 deletions

View File

@ -7,6 +7,7 @@ PYTHON=python2
GIT=git GIT=git
RM=rm -f RM=rm -f
CP=cp -f CP=cp -f
MKDIR=mkdir
all: all:
@ -36,14 +37,16 @@ CMAPDST=pdfminer/cmap
cmap: $(CMAPDST)/to-unicode-Adobe-CNS1.pickle.gz $(CMAPDST)/to-unicode-Adobe-GB1.pickle.gz \ cmap: $(CMAPDST)/to-unicode-Adobe-CNS1.pickle.gz $(CMAPDST)/to-unicode-Adobe-GB1.pickle.gz \
$(CMAPDST)/to-unicode-Adobe-Japan1.pickle.gz $(CMAPDST)/to-unicode-Adobe-Korea1.pickle.gz $(CMAPDST)/to-unicode-Adobe-Japan1.pickle.gz $(CMAPDST)/to-unicode-Adobe-Korea1.pickle.gz
cmap_clean: cmap_clean:
cd $(CMAPDST) && make cmap_clean -$(RM) -r $(CMAPDST)
$(CMAPDST)/to-unicode-Adobe-CNS1.pickle.gz: $(CMAPDST):
$(MKDIR) $(CMAPDST)
$(CMAPDST)/to-unicode-Adobe-CNS1.pickle.gz: $(CMAPDST)
$(CONV_CMAP) $(CMAPDST) Adobe-CNS1 $(CMAPSRC)/cid2code_Adobe_CNS1.txt cp950 big5 $(CONV_CMAP) $(CMAPDST) Adobe-CNS1 $(CMAPSRC)/cid2code_Adobe_CNS1.txt cp950 big5
$(CMAPDST)/to-unicode-Adobe-GB1.pickle.gz: $(CMAPDST)/to-unicode-Adobe-GB1.pickle.gz: $(CMAPDST)
$(CONV_CMAP) $(CMAPDST) Adobe-GB1 $(CMAPSRC)/cid2code_Adobe_GB1.txt cp936 gb2312 $(CONV_CMAP) $(CMAPDST) Adobe-GB1 $(CMAPSRC)/cid2code_Adobe_GB1.txt cp936 gb2312
$(CMAPDST)/to-unicode-Adobe-Japan1.pickle.gz: $(CMAPDST)/to-unicode-Adobe-Japan1.pickle.gz: $(CMAPDST)
$(CONV_CMAP) $(CMAPDST) Adobe-Japan1 $(CMAPSRC)/cid2code_Adobe_Japan1.txt cp932 euc-jp $(CONV_CMAP) $(CMAPDST) Adobe-Japan1 $(CMAPSRC)/cid2code_Adobe_Japan1.txt cp932 euc-jp
$(CMAPDST)/to-unicode-Adobe-Korea1.pickle.gz: $(CMAPDST)/to-unicode-Adobe-Korea1.pickle.gz: $(CMAPDST)
$(CONV_CMAP) $(CMAPDST) Adobe-Korea1 $(CMAPSRC)/cid2code_Adobe_Korea1.txt cp949 euc-kr $(CONV_CMAP) $(CMAPDST) Adobe-Korea1 $(CMAPSRC)/cid2code_Adobe_Korea1.txt cp949 euc-kr
test: cmap test: cmap

View File

@ -1,9 +0,0 @@
# Makefile for pdfminer.cmap
all:
clean:
-rm *.pyc *.pyo
cmap_clean:
rm -f *.pickle.gz

View File

@ -17,7 +17,6 @@ import os
import os.path import os.path
import gzip import gzip
import cPickle as pickle import cPickle as pickle
import cmap
import struct import struct
from psparser import PSStackParser from psparser import PSStackParser
from psparser import PSException, PSSyntaxError, PSTypeError, PSEOF from psparser import PSException, PSSyntaxError, PSTypeError, PSEOF
@ -240,8 +239,11 @@ class CMapDB(object):
filename = '%s.pickle.gz' % name filename = '%s.pickle.gz' % name
if klass.debug: if klass.debug:
print >>sys.stderr, 'loading:', name print >>sys.stderr, 'loading:', name
default_path = os.environ.get('CMAP_PATH', '/usr/share/pdfminer/') cmap_paths = (
for directory in (os.path.dirname(cmap.__file__), default_path): os.environ.get('CMAP_PATH', '/usr/share/pdfminer/'),
os.path.join(os.path.dirname(__file__), 'cmap'),
)
for directory in cmap_paths:
path = os.path.join(directory, filename) path = os.path.join(directory, filename)
if os.path.exists(path): if os.path.exists(path):
gzfile = gzip.open(path) gzfile = gzip.open(path)