# preview.sty can be obtained from CTAN/macros/latex/contrib/supported/preview.
-# This script, lyxpreview2ppm.sh, takes two arguments, the name of the file
-# to be converted and a scale factor, used to ascertain the resolution of the
-# generated image which is then passed to gs.
+# This script, lyxpreview2ppm.sh, takes three arguments:
+# FILE: the name of the file to be converted.
+# SCALEFACTOR: scale factor, used to ascertain the resolution of the
+# generated imagewhich is then passed to gs.
+# NDIGITS: the number of digits in the filenames generated by gs,
+# ${BASE}%${NDIGITS}d.ppm
# If successful it will leave in dir ${DIR} a number of image files
-# ${BASE}[0-9]\{3\}.ppm and a file ${BASE}.metrics containing info needed by
-# LyX to position the images correctly on the screen. All other files ${BASE}*
-# will be deleted.
+# ${BASE}[0-9]\{${NDIGITS}\}.ppm and a file ${BASE}.metrics containing info
+# needed by LyX to position the images correctly on the screen.
+# All other files ${BASE}* will be deleted.
# Three helper functions.
FIND_IT () {
}
# Preliminary check
-if [ $# -ne 2 ]; then
+if [ $# -ne 3 ]; then
exit 1
fi
BASE=`basename $1 .tex`
SCALEFACTOR=$2
+NDIGITS=$3
TEXFILE=${BASE}.tex
LOGFILE=${BASE}.log
ALPHA=2
fi
-gs -q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pnmraw -sOutputFile=${BASE}%03d.ppm \
+gs -q -dNOPAUSE -dBATCH -dSAFER \
+ -sDEVICE=pnmraw -sOutputFile=${BASE}%0${NDIGITS}d.ppm \
-dGraphicsAlphaBit=${ALPHA} -dTextAlphaBits=${ALPHA} -r${RESOLUTION} \
${PSFILE}
# All has been successful, so remove everything except the bitmap files
# and the metrics file.
-FILES=`ls ${BASE}* | sed -e "/${BASE}.metrics/d" -e "/${BASE}[0-9]\{3\}.ppm/d"`
+FILES=`ls ${BASE}* | \
+ sed -e "/${BASE}.metrics/d" -e "/${BASE}[0-9]\{${NDIGITS}\}.ppm/d"`
rm -f ${FILES}
+2002-09-03 Angus Leeming <leeming@lyx.org>
+
+ * PreviewLoader.C: fix crash reported by Norbert Koksch when
+ generating more than 999 preview snippets. Use filenames with 5 digit
+ numbers, not 3, in the first instance, although more general code is
+ commented out. I don't suppose /anyone/ has 100000 formulae in one
+ document...
+
2002-09-03 Angus Leeming <leeming@lyx.org>
* PreviewLoader.C: activate #ifdef USING_NEW_PREVIEW_STY code.
};
+// Given a base-10 number return the number of digits needed to store it.
+// Eg 2 requires 1 digit, 22 requires 2 digits and 999 requires 3 digits.
+// Note that André suggests just returning '12' here...
+int ndigits(int num)
+{
+ //return 1 + int(std::log10(double(num)));
+ return 5;
+}
+
+
/// Store info on a currently executing, forked process.
struct InProgress {
///
struct IncrementedFileName {
IncrementedFileName(string const & to_format,
- string const & filename_base)
- : to_format_(to_format), base_(filename_base), counter_(1)
+ string const & filename_base, int nd)
+ : to_format_(to_format), base_(filename_base),
+ ndigits_(nd), counter_(1)
{}
StrPair const operator()(string const & snippet)
{
ostringstream os;
os << base_
- << setfill('0') << setw(3) << counter_++
+ << setfill('0') << setw(ndigits_) << counter_++
<< "." << to_format_;
string const file = os.str().c_str();
private:
string const & to_format_;
string const & base_;
+ int const ndigits_;
int counter_;
};
BitmapFile::iterator sit = snippets.begin();
std::transform(pit, pend, sit,
- IncrementedFileName(to_format, filename_base));
+ IncrementedFileName(to_format, filename_base,
+ ndigits(int(snippets.size()))));
}
// such processes if it starts correctly.
InProgress inprogress(filename_base, pending_, pconverter_->to);
- // clear pending_, so we're ready to start afresh.
- pending_.clear();
-
// Output the LaTeX file.
string const latexfile = filename_base + ".tex";
// The conversion command.
ostringstream cs;
cs << pconverter_->command << " " << latexfile << " "
- << int(font_scaling_factor_);
+ << int(font_scaling_factor_) << " "
+ << ndigits(int(pending_.size()));
string const command = LibScriptSearch(cs.str().c_str());
+ // clear pending_, so we're ready to start afresh.
+ pending_.clear();
+
// Initiate the conversion from LaTeX to bitmap images files.
Forkedcall::SignalTypePtr convert_ptr;
convert_ptr.reset(new Forkedcall::SignalType);