anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 03:03:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove spurious insetexternal warning

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9132 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2004-10-27 11:36:15 +00:00
parent eb00187fea
commit ec75d960c5
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/insets/ChangeLog
View File

@ -1,3 +1,8 @@
2004-10-27 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* ExternalTransforms.C (sanitizeLatexOption): fix regex to handle
"[,,,]" without warning message
2004-10-26 Angus Leeming <leeming@lyx.org> 2004-10-26 Angus Leeming <leeming@lyx.org>
* ExternalSupport.C (updateExternal): * ExternalSupport.C (updateExternal):
@ -76,7 +81,7 @@
2004-09-24 Andreas Vox <vox@isp.uni-luebeck.de> 2004-09-24 Andreas Vox <vox@isp.uni-luebeck.de>
* insetref.C (docbook): fixing problem where Docbook XML output * insetref.C (docbook): fixing problem where Docbook XML output
had unclosed <xref ... > had unclosed <xref ... >
2004-08-16 José Matos <jamatos@lyx.org> 2004-08-16 José Matos <jamatos@lyx.org>

8
src/insets/ExternalTransforms.C
View File

@ -273,7 +273,7 @@ string const sanitizeLatexOption(string const & input)
string::const_iterator it = begin; string::const_iterator it = begin;
// Strip any leading commas // Strip any leading commas
// "[,,,,foo..." -> "foo..." // "[,,,,foo..." -> "foo..." ("foo..." may be empty)
string output; string output;
boost::smatch what; boost::smatch what;
static boost::regex const front("^( *[[],*)(.*)$"); static boost::regex const front("^( *[[],*)(.*)$");
@ -281,7 +281,7 @@ string const sanitizeLatexOption(string const & input)
regex_match(it, end, what, front, boost::match_partial); regex_match(it, end, what, front, boost::match_partial);
if (!what[0].matched) { if (!what[0].matched) {
lyxerr << "Unable to sanitize LaTeX \"Option\": " lyxerr << "Unable to sanitize LaTeX \"Option\": "
<< output << '\n'; << input << '\n';
return string(); return string();
} }
it = what[1].second; it = what[1].second;
@ -301,8 +301,8 @@ string const sanitizeLatexOption(string const & input)
} }
// Strip any trailing commas // Strip any trailing commas
// "...foo,,,]" -> "...foo" // "...foo,,,]" -> "...foo" ("...foo,,," may be empty)
static boost::regex const back("^(.*[^,])(,*[]] *)$"); static boost::regex const back("^(.*[^,])?(,*)([]] *)$");
regex_match(output, what, back); regex_match(output, what, back);
if (!what[0].matched) { if (!what[0].matched) {
lyxerr << "Unable to sanitize LaTeX \"Option\": " lyxerr << "Unable to sanitize LaTeX \"Option\": "