|
Sergio Pascual |
8125af9 |
diff -ur rst2pdf-0.16/rst2pdf/createpdf.py rst2pdf-0.16.new/rst2pdf/createpdf.py
|
|
Sergio Pascual |
8125af9 |
--- rst2pdf-0.16/rst2pdf/createpdf.py 2010-10-06 23:21:41.000000000 +0200
|
|
Sergio Pascual |
8125af9 |
+++ rst2pdf-0.16.new/rst2pdf/createpdf.py 2011-05-31 13:07:00.078550074 +0200
|
|
Sergio Pascual |
8125af9 |
@@ -166,11 +166,11 @@
|
|
Sergio Pascual |
8125af9 |
self.basedir=basedir
|
|
Sergio Pascual |
8125af9 |
self.language = language
|
|
Sergio Pascual |
8125af9 |
try:
|
|
Sergio Pascual |
8125af9 |
- get_language (self.language)
|
|
Sergio Pascual |
8125af9 |
+ get_language (self.language, None)
|
|
Sergio Pascual |
8125af9 |
except ImportError:
|
|
Sergio Pascual |
8125af9 |
try:
|
|
Sergio Pascual |
8125af9 |
language = self.language.split('_', 1)[0]
|
|
Sergio Pascual |
8125af9 |
- get_language (language)
|
|
Sergio Pascual |
8125af9 |
+ get_language (language, None)
|
|
Sergio Pascual |
8125af9 |
self.language = language
|
|
Sergio Pascual |
8125af9 |
except ImportError:
|
|
Sergio Pascual |
8125af9 |
log.warning("Can't load Docutils module "\
|
|
Sergio Pascual |
8125af9 |
@@ -246,11 +246,11 @@
|
|
Sergio Pascual |
8125af9 |
# Load the docutils language modules for all required languages
|
|
Sergio Pascual |
8125af9 |
for lang in self.styles.languages:
|
|
Sergio Pascual |
8125af9 |
try:
|
|
Sergio Pascual |
8125af9 |
- self.docutils_languages[lang] = get_language(lang)
|
|
Sergio Pascual |
8125af9 |
+ self.docutils_languages[lang] = get_language(lang, None)
|
|
Sergio Pascual |
8125af9 |
except ImportError:
|
|
Sergio Pascual |
8125af9 |
try:
|
|
Sergio Pascual |
8125af9 |
self.docutils_languages[lang] = \
|
|
Sergio Pascual |
8125af9 |
- get_language(lang.split('_', 1)[0])
|
|
Sergio Pascual |
8125af9 |
+ get_language(lang.split('_', 1)[0], None)
|
|
Sergio Pascual |
8125af9 |
except ImportError:
|
|
Sergio Pascual |
8125af9 |
log.warning("Can't load Docutils module \
|
|
Sergio Pascual |
8125af9 |
for language %s", lang)
|
|
Sergio Pascual |
0259a0a |
diff -ur rst2pdf-0.16/rst2pdf/pdfbuilder.py rst2pdf-0.16.new/rst2pdf/pdfbuilder.py
|
|
Sergio Pascual |
0259a0a |
--- rst2pdf-0.16/rst2pdf/pdfbuilder.py 2010-10-06 22:17:48.000000000 +0200
|
|
Sergio Pascual |
0259a0a |
+++ rst2pdf-0.16.new/rst2pdf/pdfbuilder.py 2011-06-08 11:23:11.548136067 +0200
|
|
Sergio Pascual |
0259a0a |
@@ -185,15 +185,15 @@
|
|
Sergio Pascual |
0259a0a |
if self.config.language:
|
|
Sergio Pascual |
0259a0a |
lang = self.config.language
|
|
Sergio Pascual |
0259a0a |
try:
|
|
Sergio Pascual |
0259a0a |
- self.docutils_languages[lang] = get_language(lang)
|
|
Sergio Pascual |
0259a0a |
+ self.docutils_languages[lang] = get_language(lang, None)
|
|
Sergio Pascual |
0259a0a |
except ImportError:
|
|
Sergio Pascual |
0259a0a |
try:
|
|
Sergio Pascual |
0259a0a |
self.docutils_languages[lang] = \
|
|
Sergio Pascual |
0259a0a |
- get_language(lang.split('_', 1)[0])
|
|
Sergio Pascual |
0259a0a |
+ get_language(lang.split('_', 1)[0], None)
|
|
Sergio Pascual |
0259a0a |
except ImportError:
|
|
Sergio Pascual |
0259a0a |
log.warning("Can't load Docutils module \
|
|
Sergio Pascual |
0259a0a |
for language %s", lang)
|
|
Sergio Pascual |
0259a0a |
- langmod = languages.get_language('en')
|
|
Sergio Pascual |
0259a0a |
+ langmod = languages.get_language('en', None)
|
|
Sergio Pascual |
0259a0a |
|
|
Sergio Pascual |
0259a0a |
if self.opts.get('pdf_use_index',self.config.pdf_use_index):
|
|
Sergio Pascual |
0259a0a |
# Add index at the end of the document
|
|
Sergio Pascual |
0259a0a |
@@ -530,17 +530,17 @@
|
|
Sergio Pascual |
0259a0a |
self.document.walkabout(visitor)
|
|
Sergio Pascual |
0259a0a |
self.docutils_languages = {}
|
|
Sergio Pascual |
0259a0a |
lang = self.config.language or 'en'
|
|
Sergio Pascual |
0259a0a |
- langmod = languages.get_language('en')
|
|
Sergio Pascual |
0259a0a |
+ langmod = languages.get_language('en', None)
|
|
Sergio Pascual |
0259a0a |
try:
|
|
Sergio Pascual |
0259a0a |
- langmod = get_language(lang)
|
|
Sergio Pascual |
0259a0a |
+ langmod = get_language(lang, None)
|
|
Sergio Pascual |
0259a0a |
except ImportError:
|
|
Sergio Pascual |
0259a0a |
try:
|
|
Sergio Pascual |
0259a0a |
self.docutils_languages[lang] = \
|
|
Sergio Pascual |
0259a0a |
- get_language(lang.split('_', 1)[0])
|
|
Sergio Pascual |
0259a0a |
+ get_language(lang.split('_', 1)[0], None)
|
|
Sergio Pascual |
0259a0a |
except ImportError:
|
|
Sergio Pascual |
0259a0a |
log.warning("Can't load Docutils module "\
|
|
Sergio Pascual |
0259a0a |
"for language %s", lang)
|
|
Sergio Pascual |
0259a0a |
- langmod = languages.get_language('en')
|
|
Sergio Pascual |
0259a0a |
+ langmod = languages.get_language('en', None)
|
|
Sergio Pascual |
0259a0a |
|
|
Sergio Pascual |
0259a0a |
# Generate Contents topic manually
|
|
Sergio Pascual |
0259a0a |
if self.use_toc:
|