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

By default, overwrite the main file on export, but allow changing default

Browse Source 
behavior through the environment variable LYX_FORCE_OVERWRITE.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34946 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2010-07-17 17:55:46 +00:00
parent be06af987f
commit 161af56f4e
3 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lyx.1in
View File

@ -75,11 +75,13 @@ Note that the order of -e and -x switches matters.
where fmt is the import format of choice and file.xxx is the file to be imported.
.TP
\fB \-f [\-\-force\-overwrite]\fP \fIwhat
where what is is either "\fBall\fR" or "\fBmain\fR".
Using "\fBall\fR", all files are overwritten during a batch export, otherwise
only the main file will be. When this switch is followed by anything else other
than "\fBall\fR" or "\fBmain\fR", the behavior is as if "\fBall\fR" was
specified, but what follows is left on the command line for further processing.
where what is is either "\fBall\fR", "\fBmain\fR" or "\fBnone\fR".
Specify "\fBall\fR" to allow overwriting all files during a batch export,
"\fBmain\fR" to allow overwriting the main file only, or "\fBnone\fR"
to disallow overwriting any file. When this switch is followed by anything
else other than "\fBall\fR", "\fBmain\fR" or "\fBnone\fR", the behavior is as
if "\fBall\fR" was specified, but what follows is left on the command line for
further processing.
.TP
.BI -batch
causes LyX to run the given commands without opening a GUI window.
@ -124,6 +126,17 @@ The user directory is, in order of precedence:
.B LYX_LOCALEDIR
can be used to tell LyX where to look for the translations of its GUI
strings in other languages.
.TP
.B LYX_FORCE_OVERWRITE
can be used to change the default behavior when exporting from command
line.
.PP
By default, LyX overwrites the main file when exporting from command
line but not the ancillary files. This behavior can be changed by setting
this environment variable, which relieves the need of using the \-f switch.
Allowed values are either "\fBall\fR", "\fBmain\fR" or "\fBnone\fR", with
same meaning as for the \-f switch.
.SH FILES
.nf
.ta \w'\fILIBDIR\fR/lyxrc.in 'u

28
src/LyX.cpp
View File

@ -91,9 +91,11 @@ bool use_gui = true;
// Tell what files can be silently overwritten during batch export.
// Possible values are: NO_FILES, MAIN_FILE, ALL_FILES.
// Possible values are: NO_FILES, MAIN_FILE, ALL_FILES, UNSPECIFIED.
// Unless specified on command line (through the -f switch) or through the
// environment variable LYX_FORCE_OVERWRITE, the default will be MAIN_FILE.
OverwriteFiles force_overwrite = NO_FILES;
OverwriteFiles force_overwrite = UNSPECIFIED;
namespace {
@ -736,9 +738,20 @@ bool LyX::init()
if (queryUserLyXDir(package().explicit_user_support()))
reconfigureUserLyXDir();
// no need for a splash when there is no GUI
if (!use_gui) {
// No need for a splash when there is no GUI
first_start = false;
// Default is to overwrite the main file during export, unless
// the -f switch was specified or LYX_FORCE_OVERWRITE was set
if (force_overwrite == UNSPECIFIED) {
string const what = getEnv("LYX_FORCE_OVERWRITE");
if (what == "all")
force_overwrite = ALL_FILES;
else if (what == "none")
force_overwrite = NO_FILES;
else
force_overwrite = MAIN_FILE;
}
}
// This one is generated in user_support directory by lib/configure.py.
@ -1012,9 +1025,9 @@ int parse_help(string const &, string const &, string &)
" where fmt is the import format of choice\n"
" and file.xxx is the file to be imported.\n"
"\t-f [--force-overwrite] what\n"
" where what is either `all' or `main'.\n"
" Using `all', all files are overwritten during\n"
" a batch export, otherwise only the main file will be.\n"
" where what is either `all', `main' or `none',\n"
" specifying whether all files, main file only, or no files,\n"
" respectively, are to be overwritten during a batch export.\n"
" Anything else is equivalent to `all', but is not consumed.\n"
"\t-batch execute commands without launching GUI and exit.\n"
"\t-version summarize version and build info\n"
@ -1126,6 +1139,9 @@ int parse_force(string const & arg, string const &, string &)
} else if (arg == "main") {
force_overwrite = MAIN_FILE;
return 1;
} else if (arg == "none") {
force_overwrite = NO_FILES;
return 1;
}
force_overwrite = ALL_FILES;
return 0;

3
src/LyX.h
View File

@ -37,7 +37,8 @@ class SpellChecker;
enum OverwriteFiles {
NO_FILES,
MAIN_FILE,
ALL_FILES
ALL_FILES,
UNSPECIFIED
};
extern bool use_gui;