commit 494ce6647a94c6fa6b8ae65dd45a5ab8c1742817
Author: Guillaume Munch <g...@lyx.org>
Date: Tue Feb 28 22:15:53 2017 +0100
buffer-export * synonymous to buffer-export
---
src/Buffer.cpp | 8 ++++----
src/LyXAction.cpp | 4 ++--
src/frontends/qt4/GuiView.cpp | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 86da237..60dcc51 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2534,8 +2534,8 @@ bool Buffer::getStatus(FuncRequest const & cmd,
FuncStatus & flag)
enable = true;
break;
}
- string format =
- arg.empty() ? params().getDefaultOutputFormat() :
to_utf8(arg);
+ string format = (arg.empty() || arg == "*") ?
+ params().getDefaultOutputFormat() : to_utf8(arg);
size_t pos = format.find(' ');
if (pos != string::npos)
format = format.substr(0, pos);
@@ -2643,8 +2643,8 @@ void Buffer::dispatch(FuncRequest const & func,
DispatchResult & dr)
break;
case LFUN_BUFFER_EXPORT: {
- string const format =
- argument.empty() ? params().getDefaultOutputFormat() :
argument;
+ string const format = (argument.empty() || argument == "*") ?
+ params().getDefaultOutputFormat() : argument;
ExportStatus const status = doExport(format, false);
dr.setError(status != ExportSuccess);
if (status != ExportSuccess)
diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index dba6e64..1ac74db 100644
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -583,8 +583,8 @@ void LyXAction::init()
want to start from and for the command that you want to
apply to this format. Internally the control is then
passed
to #LFUN_BUFFER_EXPORT_CUSTOM.\n
- If absent, the default output format of the document is
- used.
+ If absent or *, then the default output format of the
+ document is used.
<DEST> If present, this argument provides the export
destination
filename. Its containing folder will also be the
destination
folder, where all the needed external files will be
copied.
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index c4f6b57..63bd4c6 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -3548,7 +3548,7 @@ void GuiView::dispatch(FuncRequest const & cmd,
DispatchResult & dr)
else
target_dir = doc_buffer->fileName().onlyPath();
- string const format = argument.empty() ?
+ string const format = (argument.empty() || argument ==
"*") ?
doc_buffer->params().getDefaultOutputFormat() :
argument;
if ((dest.empty() && doc_buffer->isUnnamed())
