Fix bug #8114: LyX does not retrieve negative bbox parameters

LyX fails to read the bounding box from an EPS file if it has
negative values. Adjusting the regex will overcome this problem.
Negative values do not pose big problems later on, but the GUI
doesn't handle it correctly yet (see bug #5718).

(cherry picked from commit f0754582b8af481dc636c6d31eb3a52c853d7db0)

diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp
index bf6198332521c24f70405c421ab9fba757733199..f7c48cade88cdf7c815f173fc7e1d127aa0e1d59 100644 (file)
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -1033,7 +1033,7 @@ string const readBB_from_PSFile(FileName const & file)
        }
 
        static lyx::regex bbox_re(
-               "^%%BoundingBox:\\s*([[:digit:]]+)\\s+([[:digit:]]+)\\s+([[:digit:]]+)\\s+([[:digit:]]+)");
+               "^%%BoundingBox:\\s*([-]*[[:digit:]]+)\\s+([-]*[[:digit:]]+)\\s+([-]*[[:digit:]]+)\\s+([-]*[[:digit:]]+)");
        ifstream is(file_.toFilesystemEncoding().c_str());
        while (is) {
                string s;

diff --git a/status.20x b/status.20x
index 081d44e28cb4fb178316399375c9fe8386d7406d..577627a041160ac130fe5d6f848e84b90e9305c9 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -82,6 +82,9 @@ What's new
 
 - Fixed some probelms XHTML output had with empty paragraphs.
 
+- Fixed reading the bounding box from EPS figures with negative
+  values (bug 8114).
+
 
 * USER INTERFACE