anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Detect hyperref when generating previews

Browse Source 
If use of hyperref is detected, the postscript route is not attempted
(because we know it will fail) and the PDF route is directly chosen.
Also account for all upper case extensions for pdflatex image files.
This commit is contained in:
Enrico Forestieri 2015-04-29 17:29:27 +02:00
parent ca921fd650
commit 2bbf775c74
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/scripts/lyxpreview2bitmap.py
View File

@ -220,12 +220,14 @@ def find_ps_pages(dvi_file):
# The output from dv2dt goes to stdout # The output from dv2dt goes to stdout
dv2dt_status, dv2dt_output = run_command(dv2dt_call) dv2dt_status, dv2dt_output = run_command(dv2dt_call)
psliteral_re = re.compile("^special[1-4] [0-9]+ '(\"|ps:)") psliteral_re = re.compile("^special[1-4] [0-9]+ '(\"|ps:)")
pdffile_re = re.compile("^special[1-4] [0-9]+ 'PSfile=.*.(pdf|png|jpg)") hyperref_re = re.compile("^special[1-4] [0-9]+ 'ps:.*/DEST pdfmark")
pdffile_re = re.compile("^special[1-4] [0-9]+ 'PSfile=.*.(pdf|png|jpg|jpeg|PDF|PNG|JPG|JPEG)")
# Parse the dtl file looking for PostScript specials and pdflatex files. # Parse the dtl file looking for PostScript specials and pdflatex files.
# Pages using PostScript specials or pdflatex files are recorded in # Pages using PostScript specials or pdflatex files are recorded in
# ps_pages or pdf_pages, respectively, and then used to create a # ps_pages or pdf_pages, respectively, and then used to create a
# different LaTeX file for processing in legacy mode. # different LaTeX file for processing in legacy mode.
# If hyperref is detected, the corresponding page is recorded in pdf_pages.
page_has_ps = False page_has_ps = False
page_has_pdf = False page_has_pdf = False
page_index = 0 page_index = 0
@ -251,9 +253,13 @@ def find_ps_pages(dvi_file):
if psliteral_re.match(line) != None: if psliteral_re.match(line) != None:
# Literal PostScript special detected! # Literal PostScript special detected!
page_has_ps = True # If hyperref is detected, put this page on the pdf pages list
if hyperref_re.match(line) != None:
if pdffile_re.match(line) != None: page_has_ps = False
page_has_pdf = True
else:
page_has_ps = True
elif pdffile_re.match(line) != None:
# Inclusion of pdflatex image file detected! # Inclusion of pdflatex image file detected!
page_has_pdf = True page_has_pdf = True