anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

buffer-export * synonymous to buffer-export

Browse Source
This commit is contained in:
Guillaume Munch 2017-02-28 22:15:53 +01:00
parent 79241febf6
commit 494ce6647a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Buffer.cpp
View File

@ -2534,8 +2534,8 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
enable = true; enable = true;
break; break;
} }
string format = string format = (arg.empty() || arg == "*") ?
arg.empty() ? params().getDefaultOutputFormat() : to_utf8(arg); params().getDefaultOutputFormat() : to_utf8(arg);
size_t pos = format.find(' '); size_t pos = format.find(' ');
if (pos != string::npos) if (pos != string::npos)
format = format.substr(0, pos); format = format.substr(0, pos);
@ -2643,8 +2643,8 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
break; break;
case LFUN_BUFFER_EXPORT: { case LFUN_BUFFER_EXPORT: {
string const format = string const format = (argument.empty() || argument == "*") ?
argument.empty() ? params().getDefaultOutputFormat() : argument; params().getDefaultOutputFormat() : argument;
ExportStatus const status = doExport(format, false); ExportStatus const status = doExport(format, false);
dr.setError(status != ExportSuccess); dr.setError(status != ExportSuccess);
if (status != ExportSuccess) if (status != ExportSuccess)

4
src/LyXAction.cpp
View File

@ -583,8 +583,8 @@ void LyXAction::init()
want to start from and for the command that you want to want to start from and for the command that you want to
apply to this format. Internally the control is then passed apply to this format. Internally the control is then passed
to #LFUN_BUFFER_EXPORT_CUSTOM.\n to #LFUN_BUFFER_EXPORT_CUSTOM.\n
If absent, the default output format of the document is If absent or *, then the default output format of the
used. document is used.
<DEST> If present, this argument provides the export destination <DEST> If present, this argument provides the export destination
filename. Its containing folder will also be the destination filename. Its containing folder will also be the destination
folder, where all the needed external files will be copied. folder, where all the needed external files will be copied.

2
src/frontends/qt4/GuiView.cpp
View File

@ -3548,7 +3548,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
else else
target_dir = doc_buffer->fileName().onlyPath(); target_dir = doc_buffer->fileName().onlyPath();
string const format = argument.empty() ? string const format = (argument.empty() || argument == "*") ?
doc_buffer->params().getDefaultOutputFormat() : argument; doc_buffer->params().getDefaultOutputFormat() : argument;
if ((dest.empty() && doc_buffer->isUnnamed()) if ((dest.empty() && doc_buffer->isUnnamed())