fix font info

[lyx.git] / lib / scripts / lyxpreview2ppm.sh

diff --git a/lib/scripts/lyxpreview2ppm.sh b/lib/scripts/lyxpreview2ppm.sh
index 076a8807b87405dd043f1bceafcc34d2d6060237..2720b9bbb6c94f38d8af1cf98f02a4fff4d20621 100644 (file)
--- a/lib/scripts/lyxpreview2ppm.sh
+++ b/lib/scripts/lyxpreview2ppm.sh
@@ -50,7 +50,7 @@ DIR=`dirname $1`
 BASE=`basename $1 .tex`
 DVIFILE=${BASE}.dvi
 PSFILE=${BASE}.ps
-METRICS=${BASE}.metrics
+METRICSFILE=${BASE}.metrics
 
 # LaTeX -> DVI.
 cd ${DIR}
@@ -60,7 +60,8 @@ if [ ${STATUS} -ne 0 ]; then
        # LaTeX failed.
        # preview.sty has known problems with the showlabels option,
        # so remove it and try again.
-       sed -e "/^[\]usepackage\(.*\){preview}/s/,showlabels//" \
+       # This "fix" should be removed once preview-latex 0.73 is released.
+       sed -e '/^\\usepackage/,/{preview}$/s/,showlabels//' \
                < ${TEXFILE} > .${TEXFILE}
        cmp -s ${TEXFILE} .${TEXFILE}
        STATUS=$?
@@ -105,12 +106,12 @@ if [ ${STATUS} -ne 0 ]; then
        BAIL_OUT
 fi
 
-# Attempt to generate a file ${METRICS} that contains only the tightpage
+# Attempt to generate a file ${METRICSFILE} that contains only the tightpage
 # bounding box info, extract from ${PSFILE}
 
 # 1. Create a file containing the sed instructions
-SEDSCRIPT=bbox.sed
-cat - > ${SEDSCRIPT} <<EOF
+SEDFILE=${BASE}.sed
+cat - > ${SEDFILE} <<EOF
 # Delete everything that's enclosed between %%BeginDocument and %%EndDocument
 /^\%\%BeginDocument/,/^\%\%EndDocument/d
 
@@ -133,8 +134,8 @@ d
 EOF
 
 # 2. Run sed!
-sed -f ${SEDSCRIPT} < ${PSFILE} > ${METRICS}
-rm -f ${SEDSCRIPT}
+sed -f ${SEDFILE} < ${PSFILE} > ${METRICSFILE}
+rm -f ${SEDFILE}
 
 # The ppm files have spurious (?! say some !) white space on the left and right
 # sides. If you want this removed set REMOVE_WS=1.