Changeset 4180
- Timestamp:
- 08/25/08 13:48:40 (5 months ago)
- Files:
-
- tracwikitopdfplugin/0.11/setup.py (modified) (1 diff)
- tracwikitopdfplugin/0.11/TracWikiToPdfPlugin-2.2-py2.4.egg (deleted)
- tracwikitopdfplugin/0.11/wikitopdf/formats.py (modified) (1 diff)
- tracwikitopdfplugin/0.11/wikitopdf/wikitopdf.py (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
tracwikitopdfplugin/0.11/setup.py
r4167 r4180 8 8 setup( 9 9 name = 'TracWikiToPdfPlugin', 10 version = '2.2 ',10 version = '2.2.1', 11 11 packages = ['wikitopdf'], 12 12 package_data={ 'wikitopdf' : [ 'templates/*.cs', 'htdocs/js/*.js' ] }, tracwikitopdfplugin/0.11/wikitopdf/formats.py
r4172 r4180 61 61 62 62 #render 63 out = html_to_pdf(self.env, htmldoc_args, files )63 out = html_to_pdf(self.env, htmldoc_args, files, codepage) 64 64 65 65 # Clean up tracwikitopdfplugin/0.11/wikitopdf/wikitopdf.py
r4173 r4180 21 21 def wiki_to_pdf(text, env, req, base_dir, codepage): 22 22 23 env.log.debug('WikiToPdf => Start function wiki_to_pdf') 24 23 25 #Remove exclude expressions 24 26 for r in EXCLUDE_RES: … … 27 29 env.log.debug('WikiToPdf => Wiki intput for WikiToPdf: %r' % text) 28 30 29 page = wiki_to_html(text, env, req) .encode(codepage, 'replace')31 page = wiki_to_html(text, env, req) 30 32 page = page.replace('raw-attachment', 'attachments') 31 33 page = page.replace('<img', '<img border="0"') … … 45 47 while imgpos != -1: 46 48 addrpos = page.find('src=',imgpos) 47 base_dir = base_dir.encode('ascii')49 #base_dir = base_dir.encode('ascii') 48 50 page = page[:addrpos+5] + base_dir + page[addrpos+5:] 49 51 imgpos = page.find('<img', addrpos) … … 53 55 page = '<html><head>' + meta + '</head><body>' + page + '</body></html>' 54 56 55 env.log.debug('WikiToPdf => HTML output for WikiToPdf in charset %s is: %r' % (codepage, page)) 56 57 return page 57 env.log.debug('WikiToPdf => HTML output for WikiToPdf in charset %s is: %r' % (codepage, page)) 58 env.log.debug('WikiToPdf => Finish function wiki_to_pdf') 58 59 59 def html_to_pdf(env, htmldoc_args, files): 60 return page.encode(codepage) 61 62 def html_to_pdf(env, htmldoc_args, files, codepage): 63 64 env.log.debug('WikiToPdf => Start function html_to_pdf') 65 60 66 os.environ["HTMLDOC_NOCGI"] = 'yes' 61 67 … … 68 74 cmd_string = 'htmldoc %s %s -f %s'%(args_string, ' '.join(files), pfilename) 69 75 env.log.debug('WikiToPdf => Htmldoc command line: %s' % cmd_string) 70 os.system(cmd_string.encode( env.config.get('trac', 'charset', 'iso-8859-1')))76 os.system(cmd_string.encode(codepage)) 71 77 72 infile = open(pfilename, 'rb') 78 infile = open(pfilename, 'rb') 73 79 out = infile.read() 74 80 infile.close() … … 76 82 os.unlink(pfilename) 77 83 84 env.log.debug('WikiToPdf => Finish function html_to_pdf') 85 78 86 return out 79 80 81 87 82 88 class WikiToPdfPage(Component): … … 104 110 htmldoc_args.update(dict(self.env.config.options('wikitopdf-page'))) 105 111 106 out = html_to_pdf(self.env, htmldoc_args, [hfilename] )112 out = html_to_pdf(self.env, htmldoc_args, [hfilename], codepage) 107 113 os.unlink(hfilename) 108 114
