OUTPUTIMAGE: r'''@noindent
@ifinfo
-@image{%(info_image_path)s,,,%(alt)s,%(ext)s}
+@image{%(info_image_path)s,,,%(alt)s,}
@end ifinfo
@html
<p>
tmp_handle.close ()
# Work around a texi2pdf bug: if LANG=C is not given, a broken regexp is
- # used to detect relative/absolute pathes, so the absolute path is not
+ # used to detect relative/absolute paths, so the absolute path is not
# detected as such and this command fails:
progress (_ ("Running texi2pdf on file %s to detect default page settings.\n") % tmpfile);
cmd = '%s -c -o %s %s' % (global_options.texinfo_program, outfile, tmpfile);
ly.debug_output ("Executing: %s\n" % cmd);
run_env = os.environ.copy()
- run_env['LC_ALL:'] = 'C'
+ run_env['LC_ALL'] = 'C'
### unknown why this is necessary
universal_newlines = True
def output_info (self, basename, snippet):
str = ''
rep = snippet.get_replacements ();
+ rep['base'] = basename
+ rep['filename'] = os.path.basename (snippet.filename)
+ rep['ext'] = snippet.ext
for image in snippet.get_images ():
rep1 = copy.copy (rep)
- (rep1['base'], rep1['ext']) = os.path.splitext (image)
+ rep1['base'] = os.path.splitext (image)[0]
rep1['image'] = image
-
- # URG, makeinfo implicitly prepends dot to extension.
- # Specifying no extension is most robust.
- rep1['ext'] = ''
rep1['alt'] = snippet.option_dict[ALT]
rep1['info_image_path'] = os.path.join (self.global_options.info_images_dir, rep1['base'])
str += self.output[OUTPUTIMAGE] % rep1
- rep['base'] = basename
str += self.output[OUTPUT] % rep
return str
def snippet_output (self, basename, snippet):
- str = self.output_print_filename (basename, snippet)
+ str = ''
base = basename
if DOCTITLE in snippet.option_dict:
doctitle = base + '.doctitle'
translated_doctitle = doctitle + self.document_language
if os.path.exists (translated_doctitle):
- str += '@lydoctitle %s\n\n' % open (translated_doctitle).read ()
+ str += '\n@lydoctitle %s\n\n' % open (translated_doctitle).read ()
elif os.path.exists (doctitle):
- str += '@lydoctitle %s\n\n' % open (doctitle).read ()
+ str += '\n@lydoctitle %s\n\n' % open (doctitle).read ()
if TEXIDOC in snippet.option_dict:
texidoc = base + '.texidoc'
translated_texidoc = texidoc + self.document_language
str += '@include %(translated_texidoc)s\n\n' % vars ()
elif os.path.exists (texidoc):
str += '@include %(texidoc)s\n\n' % vars ()
+ str += self.output_print_filename (basename, snippet)
substr = ''
rep = snippet.get_replacements ();