anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

honor LYX_DIR_13x, fix #386, update IEEEtraan template

Browse Source 
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 2002-05-30 21:39:54 +00:00
parent ad9c1fa3aa
commit 8fd9e5de46
9 changed files with 207 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> 2002-05-29 Lars Gullik Bjønnes <larsbj@birdstep.com>
* Switch from SigC to boost::signals, SigC is now not used in any * Switch from SigC to boost::signals, SigC is now not used in any

7
lib/ChangeLog
View File

@ -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> 2002-05-29 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* configure.m4: fix handling of --with-version-suffix, so that * configure.m4: fix handling of --with-version-suffix, so that

4
lib/reLyX/reLyX.in
View File

@ -40,8 +40,8 @@ my $dir = &dirname($name);
push @maybe_dir, "$dir"; push @maybe_dir, "$dir";
# case 2: ran make but not make install. # case 2: ran make but not make install.
push @maybe_dir, "$dir/$srcdir"; push @maybe_dir, "$dir/$srcdir";
# case 3: environment variable LYX_DIR_11x has been set # case 3: environment variable LYX_DIR_13x has been set
if (exists $ENV{LYX_DIR_11x}) { push @maybe_dir, "$ENV{LYX_DIR_11x}/reLyX"}; 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 # case 4: e.g., reLyX in /opt/bin, $mainscript in /opt/share/lyx/reLyX
push @maybe_dir, "$dir/../share/$lyxname/reLyX"; # case 4 push @maybe_dir, "$dir/../share/$lyxname/reLyX"; # case 4
# case 5: configure figured out where $mainscript is # case 5: configure figured out where $mainscript is

211
lib/templates/IEEEtran.lyx
View File

@ -1,5 +1,5 @@
#LyX 1.1 created this file. For more info see http://www.lyx.org/ #LyX 1.2 created this file. For more info see http://www.lyx.org/
\lyxformat 2.16 \lyxformat 220
\textclass IEEEtran \textclass IEEEtran
\language english \language english
\inputencoding default \inputencoding default
@ -12,6 +12,8 @@
\paperpackage a4 \paperpackage a4
\use_geometry 0 \use_geometry 0
\use_amsmath 0 \use_amsmath 0
\use_natbib 0
\use_numerical_citations 0
\paperorientation portrait \paperorientation portrait
\secnumdepth 3 \secnumdepth 3
\tocdepth 3 \tocdepth 3
@ -29,17 +31,28 @@ Your Title: And maybe a bit extra
\layout Author \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'. names so you'll need to make this a 'Comment'.
\end_inset \end_inset
Your Name, Your Co-Author Your Name, Your Co-Author
\begin_float footnote \begin_inset Foot
collapsed true
\layout Standard \layout Standard
Your name is with xyz Department\SpecialChar \ldots{} Your name is with xyz Department\SpecialChar \ldots{}
\end_float \end_inset
\layout Abstract \layout Abstract
This paper presents a simple template for IEEEtran documents. This paper presents a simple template for IEEEtran documents.
@ -50,18 +63,34 @@ simplicity, beauty, elegance
\layout MarkBoth \layout MarkBoth
This is for left pages This is for left pages
\latex latex \begin_inset ERT
status Collapsed
\layout Standard
}{ }{
\latex default \end_inset
and this is for right pages and this is for right pages
\layout Section \layout Section
Introduction 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 LyX but LaTeX uses the correct Roman numerals and
\layout Standard
Alpha for section counters. Alpha for section counters.
\layout Standard
It's just that LyX doesn't handle counters other than arabic It's just that LyX doesn't handle counters other than arabic
\layout Standard
numerals. numerals.
\end_inset \end_inset
@ -69,11 +98,15 @@ numerals.
\layout Standard \layout Standard
\latex latex \begin_inset ERT
status Collapsed
\layout Standard
\backslash \backslash
PARstart{T}{here} PARstart{T}{here}
\latex default \end_inset
is a need for a little Evil Red Text in the first paragraph. is a need for a little Evil Red Text in the first paragraph.
Refer to the IEEEtran documentation (sample document) for more details. Refer to the IEEEtran documentation (sample document) for more details.
\layout Section \layout Section
@ -88,13 +121,21 @@ Methodology
\layout Theorem \layout Theorem
\latex latex \begin_inset ERT
status Collapsed
\layout Standard
[ [
\latex default \end_inset
Theorem name 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 For a named theorem or theorem-like environment you need to use a little
evil red text (LaTeX mode) around the name. evil red text (LaTeX mode) around the name.
\layout Lemma \layout Lemma
@ -108,7 +149,12 @@ And here's the proof!
Results Results
\layout Standard \layout Standard
\begin_float fig
\begin_inset Float figure
placement htbp
wide false
collapsed false
\layout Standard \layout Standard
\align center \align center
@ -121,8 +167,14 @@ Captions go
under under
\emph default \emph default
the figure the figure
\end_float \end_inset
\begin_float tab
\begin_inset Float table
placement htbp
wide false
collapsed false
\layout Caption \layout Caption
Table captions go Table captions go
@ -131,38 +183,84 @@ above
\emph default \emph default
the table the table
\layout Standard \layout Standard
\align center \LyXTable \align center
multicol5
2 2 0 0 -1 -1 -1 -1 \begin_inset Tabular
1 1 0 0 <lyxtabular version="3" rows="2" columns="2">
1 1 0 0 <features>
8 1 0 "" "" <column alignment="center" valignment="top" leftline="true" width="0pt">
8 1 1 "" "" <column alignment="center" valignment="top" leftline="true" rightline="true" width="0pt">
0 8 1 0 0 0 0 "" "" <row topline="true" bottomline="true">
0 8 1 0 0 0 0 "" "" <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
0 8 1 0 0 0 0 "" "" \begin_inset Text
0 8 1 0 0 0 0 "" ""
\layout Standard
delete delete
\newline \end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\layout Standard
this 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 example
\newline \end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\layout Standard
table table
\end_float \end_inset
</cell>
</row>
</lyxtabular>
\end_inset
\end_inset
\layout Section \layout Section
Conclusions Conclusions
\layout Comment \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. BibTeX bibliography generation.
\layout Standard
Remember though that your final submission is supposed to have 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 you eventually have to copy the .bbl file into the latex file and
\layout Standard
remove the bibtex lines. remove the bibtex lines.
\end_inset \end_inset
@ -175,31 +273,54 @@ remove the bibtex lines.
\layout Biography \layout Biography
\latex latex \begin_inset ERT
status Collapsed
\layout Standard
{ {
\latex default \end_inset
Your Name Your Name
\latex latex \begin_inset ERT
status Collapsed
\layout Standard
} }
\latex default \end_inset
All about you and the what your interests are. 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 Don't forget to put your name in between a pair of {}'s that are set as
raw TeX. 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 \newline
\end_inset
\layout Biography \layout Biography
\latex latex \begin_inset ERT
status Collapsed
\layout Standard
{ {
\latex default \end_inset
Coauthor Coauthor
\latex latex \begin_inset ERT
status Collapsed
\layout Standard
} }
\latex default \end_inset
Same again for the co-author. Same again for the co-author.
\the_end \the_end

10
lyx.man
View File

@ -3,7 +3,7 @@
.\" .\"
.\" tbl lyx.1 | nroff -man | less .\" 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 .SH NAME
lyx \- A Document Processor 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. obtained, rather than the default executable file name.
.SH ENVIRONMENT .SH ENVIRONMENT
.TP .TP
.B LYX_DIR_12x .B LYX_DIR_13x
can be used to specify which system directory to use. can be used to specify which system directory to use.
.PP .PP
The system directory is determined by searching for the file 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 .br
1) -sysdir command line parameter 1) -sysdir command line parameter
.br .br
2) LYX_DIR_12x environment variable 2) LYX_DIR_13x environment variable
.br .br
3) Maybe <path of binary>/TOP_SRCDIR/lib 3) Maybe <path of binary>/TOP_SRCDIR/lib
.br .br
@ -140,14 +140,14 @@ The system directory is determined by searching for the file
.br .br
5) hardcoded lyx_dir (usually /usr/local/share/lyx on UNIX and %X11ROOT%\\XFree86\\lib\\X11\\lyx on OS/2 with XFree) 5) hardcoded lyx_dir (usually /usr/local/share/lyx on UNIX and %X11ROOT%\\XFree86\\lib\\X11\\lyx on OS/2 with XFree)
.TP .TP
.B LYX_USERDIR_12x .B LYX_USERDIR_13x
can be used to specify which user directory to use. can be used to specify which user directory to use.
.PP .PP
The user directory is, in order of precedence: The user directory is, in order of precedence:
.br .br
1) -userdir command line parameter 1) -userdir command line parameter
.br .br
2) LYX_USERDIR_12x environment variable 2) LYX_USERDIR_13x environment variable
.br .br
3) $HOME/.<name of binary> if no explicit setting is made 3) $HOME/.<name of binary> if no explicit setting is made

5
src/ChangeLog
View File

@ -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> 2002-05-30 John Levon <moz@compsoc.man.ac.uk>
* buffer.h: * buffer.h:

5
src/frontends/xforms/ChangeLog
View File

@ -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> 2002-05-30 Lars Gullik Bjønnes <larsbj@birdstep.com>
* FileDialog.C (FileDialog): fix () bug when using new * FileDialog.C (FileDialog): fix () bug when using new

4
src/frontends/xforms/FormInclude.C
View File

@ -77,9 +77,11 @@ void FormInclude::update()
fl_set_button(dialog_->radio_verbatim, 1); fl_set_button(dialog_->radio_verbatim, 1);
fl_set_button(dialog_->check_visiblespace, cmdname == "verbatiminput*"); fl_set_button(dialog_->check_visiblespace, cmdname == "verbatiminput*");
setEnabled(dialog_->check_visiblespace, true); setEnabled(dialog_->check_visiblespace, true);
setEnabled(dialog_->button_load, false);
} else { } else {
fl_set_button(dialog_->check_visiblespace, 0); fl_set_button(dialog_->check_visiblespace, 0);
setEnabled(dialog_->check_visiblespace, false); setEnabled(dialog_->check_visiblespace, false);
setEnabled(dialog_->button_load, true);
} }
if (cmdname.empty()) if (cmdname.empty())
@ -140,11 +142,13 @@ ButtonPolicy::SMInput FormInclude::input(FL_OBJECT * ob, long)
} else if (ob == dialog_->radio_verbatim) { } else if (ob == dialog_->radio_verbatim) {
setEnabled(dialog_->check_visiblespace, true); setEnabled(dialog_->check_visiblespace, true);
setEnabled(dialog_->button_load, false);
} else if (ob == dialog_->radio_useinclude || } else if (ob == dialog_->radio_useinclude ||
ob == dialog_->radio_useinput) { ob == dialog_->radio_useinput) {
fl_set_button(dialog_->check_visiblespace, 0); fl_set_button(dialog_->check_visiblespace, 0);
setEnabled(dialog_->check_visiblespace, false); setEnabled(dialog_->check_visiblespace, false);
setEnabled(dialog_->button_load, true);
} else if (ob == dialog_->input_filename) { } else if (ob == dialog_->input_filename) {
string const in_name = fl_get_input(dialog_->input_filename); string const in_name = fl_get_input(dialog_->input_filename);

18
src/lyx_main.C
View File

@ -263,7 +263,7 @@ void LyX::init(bool gui)
// Directories are searched in this order: // Directories are searched in this order:
// 1) -sysdir command line parameter // 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 // 3) Maybe <path of binary>/TOP_SRCDIR/lib
// 4) <path of binary>/../share/<name of binary>/ // 4) <path of binary>/../share/<name of binary>/
// 4a) repeat 4 after following the Symlink if <path of // 4a) repeat 4 after following the Symlink if <path of
@ -280,11 +280,11 @@ void LyX::init(bool gui)
if (!system_lyxdir.empty()) if (!system_lyxdir.empty())
searchpath= MakeAbsPath(system_lyxdir) + ';'; searchpath= MakeAbsPath(system_lyxdir) + ';';
// LYX_DIR_12x environment variable // LYX_DIR_13x environment variable
string const lyxdir = GetEnvPath("LYX_DIR_12x"); string const lyxdir = GetEnvPath("LYX_DIR_13x");
if (!lyxdir.empty()) { if (!lyxdir.empty()) {
lyxerr[Debug::INIT] << "LYX_DIR_12x: " << lyxdir << endl; lyxerr[Debug::INIT] << "LYX_DIR_13x: " << lyxdir << endl;
searchpath += lyxdir + ';'; searchpath += lyxdir + ';';
} }
@ -360,7 +360,7 @@ void LyX::init(bool gui)
// Warn if environment variable is set, but unusable // Warn if environment variable is set, but unusable
if (!lyxdir.empty()) { if (!lyxdir.empty()) {
if (system_lyxdir != NormalizePath(lyxdir)) { if (system_lyxdir != NormalizePath(lyxdir)) {
lyxerr <<_("LYX_DIR_12x environment variable no good.") lyxerr <<_("LYX_DIR_13x environment variable no good.")
<< '\n' << '\n'
<< _("System directory set to: ") << _("System directory set to: ")
<< system_lyxdir << endl; << system_lyxdir << endl;
@ -372,7 +372,7 @@ void LyX::init(bool gui)
if (system_lyxdir == "./") { if (system_lyxdir == "./") {
lyxerr <<_("LyX Warning! Couldn't determine system directory. ") lyxerr <<_("LyX Warning! Couldn't determine system directory. ")
<<_("Try the '-sysdir' command line parameter or ") <<_("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 ") "LyX system directory ")
<< _("containing the file `chkconfig.ltx'.") << endl; << _("containing the file `chkconfig.ltx'.") << endl;
if (!path_shown) { if (!path_shown) {
@ -402,15 +402,15 @@ void LyX::init(bool gui)
// Directories are searched in this order: // Directories are searched in this order:
// 1) -userdir command line parameter // 1) -userdir command line parameter
// 2) LYX_USERDIR_12x environment variable // 2) LYX_USERDIR_13x environment variable
// 3) $HOME/.<name of binary> // 3) $HOME/.<name of binary>
// If we had a command line switch, user_lyxdir is already set // If we had a command line switch, user_lyxdir is already set
bool explicit_userdir = true; bool explicit_userdir = true;
if (user_lyxdir.empty()) { if (user_lyxdir.empty()) {
// LYX_USERDIR_12x environment variable // LYX_USERDIR_13x environment variable
user_lyxdir = GetEnvPath("LYX_USERDIR_12x"); user_lyxdir = GetEnvPath("LYX_USERDIR_13x");
// default behaviour // default behaviour
if (user_lyxdir.empty()) if (user_lyxdir.empty())