mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
honor LYX_DIR_13x, fix #386, update IEEEtraan template
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4306 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes
parent
ad9c1fa3aa
commit
8fd9e5de46
@ -1,3 +1,7 @@
|
||||
2002-05-30 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
|
||||
|
||||
* lyx.man: lyx honors variable LYX_DIR_13x
|
||||
|
||||
2002-05-29 Lars Gullik Bjønnes <larsbj@birdstep.com>
|
||||
|
||||
* Switch from SigC to boost::signals, SigC is now not used in any
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
2002-05-30 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
|
||||
|
||||
* templates/IEEEtran.lyx: update to 1.2.0 format from Michael
|
||||
Schmitt
|
||||
|
||||
* reLyX/reLyX.in: honor variable LYX_DIR_13x
|
||||
|
||||
2002-05-29 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
|
||||
|
||||
* configure.m4: fix handling of --with-version-suffix, so that
|
||||
|
||||
@ -40,8 +40,8 @@ my $dir = &dirname($name);
|
||||
push @maybe_dir, "$dir";
|
||||
# case 2: ran make but not make install.
|
||||
push @maybe_dir, "$dir/$srcdir";
|
||||
# case 3: environment variable LYX_DIR_11x has been set
|
||||
if (exists $ENV{LYX_DIR_11x}) { push @maybe_dir, "$ENV{LYX_DIR_11x}/reLyX"};
|
||||
# case 3: environment variable LYX_DIR_13x has been set
|
||||
if (exists $ENV{LYX_DIR_13x}) { push @maybe_dir, "$ENV{LYX_DIR_13x}/reLyX"};
|
||||
# case 4: e.g., reLyX in /opt/bin, $mainscript in /opt/share/lyx/reLyX
|
||||
push @maybe_dir, "$dir/../share/$lyxname/reLyX"; # case 4
|
||||
# case 5: configure figured out where $mainscript is
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#LyX 1.1 created this file. For more info see http://www.lyx.org/
|
||||
\lyxformat 2.16
|
||||
#LyX 1.2 created this file. For more info see http://www.lyx.org/
|
||||
\lyxformat 220
|
||||
\textclass IEEEtran
|
||||
\language english
|
||||
\inputencoding default
|
||||
@ -12,6 +12,8 @@
|
||||
\paperpackage a4
|
||||
\use_geometry 0
|
||||
\use_amsmath 0
|
||||
\use_natbib 0
|
||||
\use_numerical_citations 0
|
||||
\paperorientation portrait
|
||||
\secnumdepth 3
|
||||
\tocdepth 3
|
||||
@ -29,17 +31,28 @@ Your Title: And maybe a bit extra
|
||||
\layout Author
|
||||
|
||||
|
||||
\begin_inset Info Remember that initial submissions don't show the authors
|
||||
\begin_inset Note
|
||||
collapsed true
|
||||
|
||||
\layout Standard
|
||||
|
||||
Remember that initial submissions don't show the authors
|
||||
\layout Standard
|
||||
|
||||
names so you'll need to make this a 'Comment'.
|
||||
\end_inset
|
||||
|
||||
Your Name, Your Co-Author
|
||||
\begin_float footnote
|
||||
\begin_inset Foot
|
||||
collapsed true
|
||||
|
||||
\layout Standard
|
||||
|
||||
Your name is with xyz Department\SpecialChar \ldots{}
|
||||
|
||||
\end_float
|
||||
\end_inset
|
||||
|
||||
|
||||
\layout Abstract
|
||||
|
||||
This paper presents a simple template for IEEEtran documents.
|
||||
@ -50,18 +63,34 @@ simplicity, beauty, elegance
|
||||
\layout MarkBoth
|
||||
|
||||
This is for left pages
|
||||
\latex latex
|
||||
\begin_inset ERT
|
||||
status Collapsed
|
||||
|
||||
\layout Standard
|
||||
}{
|
||||
\latex default
|
||||
\end_inset
|
||||
|
||||
and this is for right pages
|
||||
\layout Section
|
||||
|
||||
Introduction
|
||||
\begin_inset Info Don't panic the section numbering may look different in
|
||||
\begin_inset Note
|
||||
collapsed true
|
||||
|
||||
\layout Standard
|
||||
|
||||
Don't panic the section numbering may look different in
|
||||
\layout Standard
|
||||
|
||||
LyX but LaTeX uses the correct Roman numerals and
|
||||
\layout Standard
|
||||
|
||||
Alpha for section counters.
|
||||
\layout Standard
|
||||
|
||||
It's just that LyX doesn't handle counters other than arabic
|
||||
\layout Standard
|
||||
|
||||
numerals.
|
||||
\end_inset
|
||||
|
||||
@ -69,11 +98,15 @@ numerals.
|
||||
\layout Standard
|
||||
|
||||
|
||||
\latex latex
|
||||
\begin_inset ERT
|
||||
status Collapsed
|
||||
|
||||
\layout Standard
|
||||
|
||||
\backslash
|
||||
PARstart{T}{here}
|
||||
\latex default
|
||||
\end_inset
|
||||
|
||||
is a need for a little Evil Red Text in the first paragraph.
|
||||
Refer to the IEEEtran documentation (sample document) for more details.
|
||||
\layout Section
|
||||
@ -88,13 +121,21 @@ Methodology
|
||||
\layout Theorem
|
||||
|
||||
|
||||
\latex latex
|
||||
\begin_inset ERT
|
||||
status Collapsed
|
||||
|
||||
\layout Standard
|
||||
[
|
||||
\latex default
|
||||
\end_inset
|
||||
|
||||
Theorem name
|
||||
\latex latex
|
||||
\begin_inset ERT
|
||||
status Collapsed
|
||||
|
||||
\layout Standard
|
||||
]
|
||||
\latex default
|
||||
\end_inset
|
||||
|
||||
For a named theorem or theorem-like environment you need to use a little
|
||||
evil red text (LaTeX mode) around the name.
|
||||
\layout Lemma
|
||||
@ -108,7 +149,12 @@ And here's the proof!
|
||||
Results
|
||||
\layout Standard
|
||||
|
||||
\begin_float fig
|
||||
|
||||
\begin_inset Float figure
|
||||
placement htbp
|
||||
wide false
|
||||
collapsed false
|
||||
|
||||
\layout Standard
|
||||
\align center
|
||||
|
||||
@ -121,8 +167,14 @@ Captions go
|
||||
under
|
||||
\emph default
|
||||
the figure
|
||||
\end_float
|
||||
\begin_float tab
|
||||
\end_inset
|
||||
|
||||
|
||||
\begin_inset Float table
|
||||
placement htbp
|
||||
wide false
|
||||
collapsed false
|
||||
|
||||
\layout Caption
|
||||
|
||||
Table captions go
|
||||
@ -131,38 +183,84 @@ above
|
||||
\emph default
|
||||
the table
|
||||
\layout Standard
|
||||
\align center \LyXTable
|
||||
multicol5
|
||||
2 2 0 0 -1 -1 -1 -1
|
||||
1 1 0 0
|
||||
1 1 0 0
|
||||
8 1 0 "" ""
|
||||
8 1 1 "" ""
|
||||
0 8 1 0 0 0 0 "" ""
|
||||
0 8 1 0 0 0 0 "" ""
|
||||
0 8 1 0 0 0 0 "" ""
|
||||
0 8 1 0 0 0 0 "" ""
|
||||
\align center
|
||||
|
||||
\begin_inset Tabular
|
||||
<lyxtabular version="3" rows="2" columns="2">
|
||||
<features>
|
||||
<column alignment="center" valignment="top" leftline="true" width="0pt">
|
||||
<column alignment="center" valignment="top" leftline="true" rightline="true" width="0pt">
|
||||
<row topline="true" bottomline="true">
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
delete
|
||||
\newline
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
this
|
||||
\newline
|
||||
\end_inset
|
||||
</cell>
|
||||
</row>
|
||||
<row topline="true" bottomline="true">
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
example
|
||||
\newline
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
table
|
||||
\end_float
|
||||
\end_inset
|
||||
</cell>
|
||||
</row>
|
||||
</lyxtabular>
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
\layout Section
|
||||
|
||||
Conclusions
|
||||
\layout Comment
|
||||
|
||||
|
||||
\begin_inset Info Change this paragraphs style to 'Standard' to enable
|
||||
\begin_inset Note
|
||||
collapsed true
|
||||
|
||||
\layout Standard
|
||||
|
||||
Change this paragraphs style to 'Standard' to enable
|
||||
\layout Standard
|
||||
|
||||
BibTeX bibliography generation.
|
||||
\layout Standard
|
||||
|
||||
Remember though that your final submission is supposed to have
|
||||
all the bibliography entries embedded in the latex file. This means
|
||||
\layout Standard
|
||||
|
||||
all the bibliography entries embedded in the latex file.
|
||||
This means
|
||||
\layout Standard
|
||||
|
||||
you eventually have to copy the .bbl file into the latex file and
|
||||
\layout Standard
|
||||
|
||||
remove the bibtex lines.
|
||||
\end_inset
|
||||
|
||||
@ -175,31 +273,54 @@ remove the bibtex lines.
|
||||
\layout Biography
|
||||
|
||||
|
||||
\latex latex
|
||||
\begin_inset ERT
|
||||
status Collapsed
|
||||
|
||||
\layout Standard
|
||||
{
|
||||
\latex default
|
||||
\end_inset
|
||||
|
||||
Your Name
|
||||
\latex latex
|
||||
\begin_inset ERT
|
||||
status Collapsed
|
||||
|
||||
\layout Standard
|
||||
}
|
||||
\latex default
|
||||
\end_inset
|
||||
|
||||
All about you and the what your interests are.
|
||||
Don't forget to put your name in between a pair of {}'s that are set as
|
||||
raw TeX.
|
||||
\layout LaTeX
|
||||
\layout Standard
|
||||
|
||||
% This LaTeX comment is needed to force LyX to generate two separate environment
|
||||
s
|
||||
|
||||
\begin_inset ERT
|
||||
status Collapsed
|
||||
|
||||
\layout Standard
|
||||
% This LaTeX comment is needed to force LyX to generate two separate environments
|
||||
\newline
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
\layout Biography
|
||||
|
||||
|
||||
\latex latex
|
||||
\begin_inset ERT
|
||||
status Collapsed
|
||||
|
||||
\layout Standard
|
||||
{
|
||||
\latex default
|
||||
\end_inset
|
||||
|
||||
Coauthor
|
||||
\latex latex
|
||||
\begin_inset ERT
|
||||
status Collapsed
|
||||
|
||||
\layout Standard
|
||||
}
|
||||
\latex default
|
||||
\end_inset
|
||||
|
||||
Same again for the co-author.
|
||||
\the_end
|
||||
|
||||
10
lyx.man
10
lyx.man
@ -3,7 +3,7 @@
|
||||
.\"
|
||||
.\" tbl lyx.1 | nroff -man | less
|
||||
.\"
|
||||
.TH LYX 1 "April 2002" "Version 1.2" "LyX 1.2"
|
||||
.TH LYX 1 "May 2002" "Version 1.3" "LyX 1.3"
|
||||
.SH NAME
|
||||
lyx \- A Document Processor
|
||||
.\"
|
||||
@ -124,7 +124,7 @@ specifies the application name under which resources are to be
|
||||
obtained, rather than the default executable file name.
|
||||
.SH ENVIRONMENT
|
||||
.TP
|
||||
.B LYX_DIR_12x
|
||||
.B LYX_DIR_13x
|
||||
can be used to specify which system directory to use.
|
||||
.PP
|
||||
The system directory is determined by searching for the file
|
||||
@ -132,7 +132,7 @@ The system directory is determined by searching for the file
|
||||
.br
|
||||
1) -sysdir command line parameter
|
||||
.br
|
||||
2) LYX_DIR_12x environment variable
|
||||
2) LYX_DIR_13x environment variable
|
||||
.br
|
||||
3) Maybe <path of binary>/TOP_SRCDIR/lib
|
||||
.br
|
||||
@ -140,14 +140,14 @@ The system directory is determined by searching for the file
|
||||
.br
|
||||
5) hardcoded lyx_dir (usually /usr/local/share/lyx on UNIX and %X11ROOT%\\XFree86\\lib\\X11\\lyx on OS/2 with XFree)
|
||||
.TP
|
||||
.B LYX_USERDIR_12x
|
||||
.B LYX_USERDIR_13x
|
||||
can be used to specify which user directory to use.
|
||||
.PP
|
||||
The user directory is, in order of precedence:
|
||||
.br
|
||||
1) -userdir command line parameter
|
||||
.br
|
||||
2) LYX_USERDIR_12x environment variable
|
||||
2) LYX_USERDIR_13x environment variable
|
||||
.br
|
||||
3) $HOME/.<name of binary> if no explicit setting is made
|
||||
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
2002-05-30 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
|
||||
|
||||
* lyx_main.C (init): honor variables LYX_DIR_13x and
|
||||
LYX_USERDIR_13x
|
||||
|
||||
2002-05-30 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* buffer.h:
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
2002-05-10 Herbert Voss <voss@perce.de>
|
||||
|
||||
* FormInclude.C (input, update): disable load-button when
|
||||
"use verbatim" is enabled
|
||||
|
||||
2002-05-30 Lars Gullik Bjønnes <larsbj@birdstep.com>
|
||||
|
||||
* FileDialog.C (FileDialog): fix () bug when using new
|
||||
|
||||
@ -77,9 +77,11 @@ void FormInclude::update()
|
||||
fl_set_button(dialog_->radio_verbatim, 1);
|
||||
fl_set_button(dialog_->check_visiblespace, cmdname == "verbatiminput*");
|
||||
setEnabled(dialog_->check_visiblespace, true);
|
||||
setEnabled(dialog_->button_load, false);
|
||||
} else {
|
||||
fl_set_button(dialog_->check_visiblespace, 0);
|
||||
setEnabled(dialog_->check_visiblespace, false);
|
||||
setEnabled(dialog_->button_load, true);
|
||||
}
|
||||
|
||||
if (cmdname.empty())
|
||||
@ -140,11 +142,13 @@ ButtonPolicy::SMInput FormInclude::input(FL_OBJECT * ob, long)
|
||||
|
||||
} else if (ob == dialog_->radio_verbatim) {
|
||||
setEnabled(dialog_->check_visiblespace, true);
|
||||
setEnabled(dialog_->button_load, false);
|
||||
|
||||
} else if (ob == dialog_->radio_useinclude ||
|
||||
ob == dialog_->radio_useinput) {
|
||||
fl_set_button(dialog_->check_visiblespace, 0);
|
||||
setEnabled(dialog_->check_visiblespace, false);
|
||||
setEnabled(dialog_->button_load, true);
|
||||
|
||||
} else if (ob == dialog_->input_filename) {
|
||||
string const in_name = fl_get_input(dialog_->input_filename);
|
||||
|
||||
@ -263,7 +263,7 @@ void LyX::init(bool gui)
|
||||
|
||||
// Directories are searched in this order:
|
||||
// 1) -sysdir command line parameter
|
||||
// 2) LYX_DIR_12x environment variable
|
||||
// 2) LYX_DIR_13x environment variable
|
||||
// 3) Maybe <path of binary>/TOP_SRCDIR/lib
|
||||
// 4) <path of binary>/../share/<name of binary>/
|
||||
// 4a) repeat 4 after following the Symlink if <path of
|
||||
@ -280,11 +280,11 @@ void LyX::init(bool gui)
|
||||
if (!system_lyxdir.empty())
|
||||
searchpath= MakeAbsPath(system_lyxdir) + ';';
|
||||
|
||||
// LYX_DIR_12x environment variable
|
||||
string const lyxdir = GetEnvPath("LYX_DIR_12x");
|
||||
// LYX_DIR_13x environment variable
|
||||
string const lyxdir = GetEnvPath("LYX_DIR_13x");
|
||||
|
||||
if (!lyxdir.empty()) {
|
||||
lyxerr[Debug::INIT] << "LYX_DIR_12x: " << lyxdir << endl;
|
||||
lyxerr[Debug::INIT] << "LYX_DIR_13x: " << lyxdir << endl;
|
||||
searchpath += lyxdir + ';';
|
||||
}
|
||||
|
||||
@ -360,7 +360,7 @@ void LyX::init(bool gui)
|
||||
// Warn if environment variable is set, but unusable
|
||||
if (!lyxdir.empty()) {
|
||||
if (system_lyxdir != NormalizePath(lyxdir)) {
|
||||
lyxerr <<_("LYX_DIR_12x environment variable no good.")
|
||||
lyxerr <<_("LYX_DIR_13x environment variable no good.")
|
||||
<< '\n'
|
||||
<< _("System directory set to: ")
|
||||
<< system_lyxdir << endl;
|
||||
@ -372,7 +372,7 @@ void LyX::init(bool gui)
|
||||
if (system_lyxdir == "./") {
|
||||
lyxerr <<_("LyX Warning! Couldn't determine system directory. ")
|
||||
<<_("Try the '-sysdir' command line parameter or ")
|
||||
<<_("set the environment variable LYX_DIR_12x to the "
|
||||
<<_("set the environment variable LYX_DIR_13x to the "
|
||||
"LyX system directory ")
|
||||
<< _("containing the file `chkconfig.ltx'.") << endl;
|
||||
if (!path_shown) {
|
||||
@ -402,15 +402,15 @@ void LyX::init(bool gui)
|
||||
|
||||
// Directories are searched in this order:
|
||||
// 1) -userdir command line parameter
|
||||
// 2) LYX_USERDIR_12x environment variable
|
||||
// 2) LYX_USERDIR_13x environment variable
|
||||
// 3) $HOME/.<name of binary>
|
||||
|
||||
// If we had a command line switch, user_lyxdir is already set
|
||||
bool explicit_userdir = true;
|
||||
if (user_lyxdir.empty()) {
|
||||
|
||||
// LYX_USERDIR_12x environment variable
|
||||
user_lyxdir = GetEnvPath("LYX_USERDIR_12x");
|
||||
// LYX_USERDIR_13x environment variable
|
||||
user_lyxdir = GetEnvPath("LYX_USERDIR_13x");
|
||||
|
||||
// default behaviour
|
||||
if (user_lyxdir.empty())
|
||||
|
||||
Loading…
Reference in New Issue
Block a user