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

Enable lyx2lyx to work with "file names with spaces".

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@9953 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-05-19 08:42:41 +00:00
parent 3ab899225b
commit c47e013abf
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2005-05-18 Angus Leeming <leeming@lyx.org>
* buffer.C (readFile): Quote all file names passed to lyx2lyx.
2005-05-09 Angus Leeming <leeming@lyx.org> 2005-05-09 Angus Leeming <leeming@lyx.org>
* Makefile.am: make compilation of pspell.[Ch] and ispell.[Ch] dependent * Makefile.am: make compilation of pspell.[Ch] and ispell.[Ch] dependent

27
src/buffer.C
View File

@ -1221,22 +1221,25 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, Paragraph * par)
"Use LyX 0.10.x to read this!")); "Use LyX 0.10.x to read this!"));
return false; return false;
} else if (!filename.empty()) { } else if (!filename.empty()) {
string command = "python " + string const lyx2lyx = LibFileSearch("lyx2lyx", "lyx2lyx");
LibFileSearch("lyx2lyx", "lyx2lyx"); if (lyx2lyx.empty()) {
if (command.empty()) {
Alert::alert(_("ERROR!"), Alert::alert(_("ERROR!"),
_("Can't find conversion script.")); _("Can't find conversion script."));
return false; return false;
} }
string const tmpfile = lyx::tempName(); string const tmpfile = lyx::tempName();
command += " -t" ostringstream command;
+ tostr(LYX_FORMAT) command << "python " << QuoteName(lyx2lyx)
+ " -o " + tmpfile + ' ' << " -t " << tostr(LYX_FORMAT)
+ QuoteName(filename); << " -o " << QuoteName(tmpfile) << ' '
<< QuoteName(filename);
string const command_str = STRCONV(command.str());
lyxerr[Debug::INFO] << "Running '" lyxerr[Debug::INFO] << "Running '"
<< command << '\'' << command_str << '\''
<< endl; << endl;
cmd_ret const ret = RunCommand(command);
cmd_ret const ret = RunCommand(command_str);
if (ret.first) { if (ret.first) {
Alert::alert(_("ERROR!"), Alert::alert(_("ERROR!"),
_("An error occured while " _("An error occured while "
@ -2141,7 +2144,7 @@ void Buffer::makeLaTeXFile(ostream & os,
<< endl; << endl;
texrow.newline(); texrow.newline();
} }
// if we are doing a real file with body, even if this is the // if we are doing a real file with body, even if this is the
// child of some other buffer, let's cut the link here. // child of some other buffer, let's cut the link here.
string save_parentname; string save_parentname;
@ -2157,7 +2160,7 @@ void Buffer::makeLaTeXFile(ostream & os,
if (!only_body) { if (!only_body) {
params.parentname = save_parentname; params.parentname = save_parentname;
} }
// add this just in case after all the paragraphs // add this just in case after all the paragraphs
os << endl; os << endl;
texrow.newline(); texrow.newline();
@ -3085,7 +3088,7 @@ void Buffer::simpleDocBookOnePar(ostream & os,
if (style->latexparam() == "CDATA") if (style->latexparam() == "CDATA")
os << "<![CDATA["; os << "<![CDATA[";
} }
break; break;
} }
case Paragraph::META_NEWLINE: case Paragraph::META_NEWLINE: