mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
Whitespace, only whitespace. Part II.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9138 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming
parent
24b6402897
commit
46ee486bda
@ -2,7 +2,7 @@ dnl
|
||||
dnl GNOME_INIT_HOOK (script-if-gnome-enabled, [failflag], [additional-inits])
|
||||
dnl
|
||||
dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh
|
||||
dnl is not found.
|
||||
dnl is not found.
|
||||
dnl
|
||||
|
||||
AC_DEFUN([GNOME_INIT_HOOK],[
|
||||
@ -18,7 +18,7 @@ AC_DEFUN([GNOME_INIT_HOOK],[
|
||||
[ --with-gnome-includes Specify location of GNOME headers],[
|
||||
CFLAGS="$CFLAGS -I$withval"
|
||||
])
|
||||
|
||||
|
||||
AC_ARG_WITH(gnome-libs,
|
||||
[ --with-gnome-libs Specify location of GNOME libs],[
|
||||
LDFLAGS="$LDFLAGS -L$withval"
|
||||
@ -77,7 +77,7 @@ AC_DEFUN([GNOME_INIT_HOOK],[
|
||||
else
|
||||
gnome_prefix=`eval echo \`echo $libdir\``
|
||||
fi
|
||||
|
||||
|
||||
if test "$no_gnome_config" = "yes"; then
|
||||
AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix)
|
||||
if test -f $gnome_prefix/gnomeConf.sh; then
|
||||
@ -99,7 +99,7 @@ AC_DEFUN([GNOME_INIT_HOOK],[
|
||||
n="$3"
|
||||
for i in $n; do
|
||||
AC_MSG_CHECKING(extra library \"$i\")
|
||||
case $i in
|
||||
case $i in
|
||||
applets)
|
||||
AC_SUBST(GNOME_APPLETS_LIBS)
|
||||
GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets`
|
||||
|
||||
@ -110,7 +110,7 @@ if test "${LANG+set}" = set; then
|
||||
fi
|
||||
|
||||
# Make sure IFS has a sensible default
|
||||
: ${IFS="
|
||||
: ${IFS="
|
||||
"}
|
||||
|
||||
if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
scriptversion=2003-09-02.23
|
||||
|
||||
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
|
||||
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
|
||||
# Free Software Foundation, Inc.
|
||||
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
2003-12-29 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
|
||||
|
||||
* FORMAT: document change to format 229.
|
||||
|
||||
|
||||
2003-12-15 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* FORMAT: document change to format 228.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
These are some rules for effective C++ programming. These are taken from
|
||||
Scott Meyers, and are presented in their short form. These are not all the
|
||||
rules Meyers presents, only the most important of them. LyX does not yet
|
||||
These are some rules for effective C++ programming. These are taken from
|
||||
Scott Meyers, and are presented in their short form. These are not all the
|
||||
rules Meyers presents, only the most important of them. LyX does not yet
|
||||
follow these rules, but they should be the goal.
|
||||
|
||||
- Use const and inline instead of #define
|
||||
@ -54,7 +54,7 @@ follow these rules, but they should be the goal.
|
||||
|
||||
--------
|
||||
|
||||
S. Meyers. Effective C++, 50 Specific Ways to Improve Your Programs and
|
||||
S. Meyers. Effective C++, 50 Specific Ways to Improve Your Programs and
|
||||
Design. Addison-Wesley, 1992
|
||||
|
||||
==================================
|
||||
|
||||
@ -15,18 +15,18 @@ some guidelines and rules for the developers.
|
||||
General
|
||||
-------
|
||||
|
||||
These guidelines should save us a lot of work while cleaning up the code and
|
||||
help us to have quality code. LyX has been haunted by problems coming from
|
||||
unfinished projects by people who have left the team. Those problems will
|
||||
These guidelines should save us a lot of work while cleaning up the code and
|
||||
help us to have quality code. LyX has been haunted by problems coming from
|
||||
unfinished projects by people who have left the team. Those problems will
|
||||
hopefully disappear if the code is easy to hand over to somebody else.
|
||||
|
||||
In general, if you want to contribute to the main source, we expect at least
|
||||
In general, if you want to contribute to the main source, we expect at least
|
||||
that you:
|
||||
|
||||
- the most important rule first: kiss (keep it simple stupid), always
|
||||
use a simple implementation in favor of a more complicated one.
|
||||
This eases maintenance a lot.
|
||||
- write good C++ code: Readable, well commented and taking advantage of the
|
||||
- write good C++ code: Readable, well commented and taking advantage of the
|
||||
OO model. Follow the formatting guidelines. See Formatting.
|
||||
- adapt the code to the structures already existing in LyX, or in the case
|
||||
that you have better ideas, discuss them on the developer's list before
|
||||
@ -49,7 +49,7 @@ Submitting Code
|
||||
---------------
|
||||
|
||||
It is implicitly understood that all patches contributed to The LyX
|
||||
Project is under the Gnu General Public License, version 2 or later.
|
||||
Project is under the Gnu General Public License, version 2 or later.
|
||||
If you have a problem with that, don't contribute code.
|
||||
|
||||
Also please don't just pop up out of the blue with a huge patch (or
|
||||
@ -79,7 +79,7 @@ We have several guidelines on code constructs, some of these exist to
|
||||
make the code faster, others to make the code clearer. Yet others
|
||||
exist to allow us to take advantage of the strong type checking
|
||||
in C++.
|
||||
|
||||
|
||||
- Declaration of variables should wait as long as possible. The rule
|
||||
is: "Don't declare it until you need it." In C++ there are a lot of
|
||||
user defined types, and these can very often be expensive to
|
||||
@ -127,7 +127,7 @@ in C++.
|
||||
|
||||
- Avoid using the default cases in switch statements unless you have
|
||||
too. Use the correct type for the switch expression and let the
|
||||
compiler ensure that all cases are exhausted.
|
||||
compiler ensure that all cases are exhausted.
|
||||
|
||||
enum Foo {
|
||||
foo,
|
||||
@ -183,7 +183,7 @@ Sutter's book[ExC++]
|
||||
|
||||
In addition to these two guarantees, there is one more
|
||||
guarantee that certain functions must provide in order to make
|
||||
overall exception safety possible:
|
||||
overall exception safety possible:
|
||||
|
||||
3. Nothrow guarantee: The function will not emit an exception under any
|
||||
circumstances.
|
||||
@ -191,7 +191,7 @@ Sutter's book[ExC++]
|
||||
functions are guaranteed not to throw. In particular, we've
|
||||
seen that this is true for destructors; later in this
|
||||
miniseries, we'll see that it's also needed in certain helper
|
||||
functions, such as Swap().
|
||||
functions, such as Swap().
|
||||
"
|
||||
|
||||
For all cases where we might be able to write exception safe functions
|
||||
@ -261,7 +261,7 @@ Formatting
|
||||
TWO = 2,
|
||||
THREE = 3
|
||||
};
|
||||
|
||||
|
||||
* Naming rules for classes
|
||||
|
||||
- Use descriptive but simple and short names. For stuff specific to LyX
|
||||
@ -300,18 +300,18 @@ Formatting
|
||||
|
||||
|
||||
* Declarations
|
||||
|
||||
|
||||
- Use this order for the access sections of your class: public,
|
||||
protected, private. The public section is interesting for every
|
||||
user of the class. The private section is only of interest for the
|
||||
implementors of the class (you). [Obviously not true since this is
|
||||
for developers, and we do not want one developer only to be able to
|
||||
read and understand the implementation of class internals. Lgb]
|
||||
|
||||
- Avoid declaring global objects in the declaration file of the class.
|
||||
|
||||
- Avoid declaring global objects in the declaration file of the class.
|
||||
If the same variable is used for all objects, use a static member.
|
||||
|
||||
- Avoid global or static variables. An exception to this rule is
|
||||
- Avoid global or static variables. An exception to this rule is
|
||||
very private stuff like the math stack.
|
||||
|
||||
|
||||
@ -341,10 +341,10 @@ Formatting
|
||||
|
||||
|
||||
* NAMING RULES FOR USER-COMMANDS
|
||||
|
||||
|
||||
Here's the set of rules to apply when a new command name is introduced:
|
||||
|
||||
1) Use the object.event order. That is, use `word-forward' instead of
|
||||
|
||||
1) Use the object.event order. That is, use `word-forward' instead of
|
||||
`forward-word'.
|
||||
2) Don't introduce an alias for an already named object. Same for events.
|
||||
3) Forward movement or focus is called `forward' (not `right').
|
||||
@ -383,7 +383,7 @@ deciding what kind of function to add to a class interface:
|
||||
make f a non-member function;
|
||||
else
|
||||
make f a member function of C;
|
||||
|
||||
|
||||
(I'll fill in more from Scott Meyers article when time allows.)
|
||||
|
||||
References
|
||||
|
||||
@ -31,7 +31,7 @@ LyX file-format changes
|
||||
* format incremented to 235.
|
||||
* \paperpackage had an off-by-one error. Translation table:
|
||||
|
||||
234: a4 a4wide widemarginsa4
|
||||
234: a4 a4wide widemarginsa4
|
||||
235: none a4 a4wide widemarginsa4
|
||||
|
||||
The "widemarginsa4" setting of 235 has no equivalent in 234.
|
||||
@ -58,7 +58,7 @@ LyX file-format changes
|
||||
2004-03-29 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
|
||||
|
||||
* format incremented to 232.
|
||||
|
||||
|
||||
* Support for bibtopic (sectioned bibliographies).
|
||||
- bufferparam \use_bibtopic [1|0]
|
||||
- the bibtex inset has a second argument for bibtopic's
|
||||
@ -78,11 +78,11 @@ LyX file-format changes
|
||||
2004-03-29 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
|
||||
|
||||
* format incremented to 231.
|
||||
|
||||
|
||||
* Support for sidewaysfigure/sidewaystable (rotating package).
|
||||
insetfloat has now a param \sideways [true|false] (default is false).
|
||||
The param should be erased on downwards conversion, if it was true,
|
||||
the inset should be replaced by
|
||||
The param should be erased on downwards conversion, if it was true,
|
||||
the inset should be replaced by
|
||||
\begin{sidewaysfigure} <content> \end{sidewaysfigure}
|
||||
resp.
|
||||
\begin{sidewaystable} <content> \end{sidewaystable}
|
||||
@ -91,13 +91,13 @@ LyX file-format changes
|
||||
2004-02-23 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
|
||||
|
||||
* format incremented to 230.
|
||||
|
||||
|
||||
* Support for a second optional argument in insetcommand.
|
||||
currently, citation uses this to support natbibs second
|
||||
optional argument \cite[before][after]{key}.
|
||||
I think there's nothing to convert upwards. Downwards, the
|
||||
I think there's nothing to convert upwards. Downwards, the
|
||||
commands with 2 optional args need to be converted to ERT.
|
||||
|
||||
|
||||
* Support for jurabib (param \use_jurabib [1|0], default is 0).
|
||||
When converting downwards, \usepackage{jurabib} has to be added
|
||||
to the preamble and, if babel is used, \usepackage{babel} before
|
||||
@ -148,7 +148,7 @@ LyX file-format changes
|
||||
|
||||
2003-11-28 André Pönitz
|
||||
|
||||
* Remove space_above/space_below from Paragraph.
|
||||
* Remove space_above/space_below from Paragraph.
|
||||
This is now handled by InsetVSpace.
|
||||
|
||||
2003-10-07 Angus Leeming <leeming@lyx.org>
|
||||
@ -170,11 +170,11 @@ LyX file-format changes
|
||||
rotateOrigin bottomleft Rotation origin.
|
||||
Output for non-zero rotation and
|
||||
non-default origin (center) only.
|
||||
scale 50
|
||||
scale 50
|
||||
width 2cm Output only if the image is resized.
|
||||
height 2cm
|
||||
keepAspectRatio
|
||||
|
||||
|
||||
2003-10-07 Martin Vermeer <martin.vermeer@hut.fi>
|
||||
|
||||
* Added box inset. File format:
|
||||
@ -201,7 +201,7 @@ LyX file-format changes
|
||||
|
||||
\end_inset
|
||||
|
||||
This box (Frameless, has_inner_box=1, use_parbox=0) replaces
|
||||
This box (Frameless, has_inner_box=1, use_parbox=0) replaces
|
||||
the pre-existing Minipage inset. Parameters translate as follows:
|
||||
position 0/1/2 -> t/c/b
|
||||
inner_position 0/1/2/3 -> inner_pos c/t/b/s
|
||||
@ -246,7 +246,7 @@ LyX file-format changes
|
||||
display <display_type>
|
||||
lyxscale <scale>
|
||||
|
||||
\end_inset
|
||||
\end_inset
|
||||
|
||||
throwing away the final arg (here "", more generally "<string>") that holds
|
||||
the parameters variable.
|
||||
@ -373,7 +373,7 @@ The LyX file now contains:
|
||||
\begin_inset Include \input{snapshot_t=40.tex}
|
||||
+preview true
|
||||
|
||||
\end_inset
|
||||
\end_inset
|
||||
|
||||
Earlier versions of LyX just swallow this extra token silently.
|
||||
|
||||
@ -393,5 +393,5 @@ renamed as "size_kind" and "lyxsize_kind" respectively.
|
||||
+ lyxsize_type original
|
||||
lyxwidth 4cm
|
||||
|
||||
\end_inset
|
||||
\end_inset
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
nice and clear slides. It can work together with pstricks and
|
||||
the color package, and can procduce fance slides indeed.
|
||||
|
||||
The seminar class has some important class options:
|
||||
The seminar class has some important class options:
|
||||
- article Produce the whole seminar document as a regular
|
||||
latex article with the slides as floating
|
||||
bodies and the notes as running text.
|
||||
|
||||
@ -66,7 +66,7 @@
|
||||
this is 16 * 10 * 50 = 8000 bytes, we have however some
|
||||
additional overhead: the RowPars one for each paragraph if we
|
||||
assume 5 lines per paragraph and 20 bytes for each RowPar we get:
|
||||
10 * 50 / 5 * 20 = 2000. This is a sum of 10000 on the new scheme.
|
||||
10 * 50 / 5 * 20 = 2000. This is a sum of 10000 on the new scheme.
|
||||
|
||||
Speed: some operations will most likely be somewhat faster since
|
||||
they now can operate on the number of paragraph instead of the
|
||||
@ -80,8 +80,8 @@
|
||||
If we want to operate on rows only it is easy to create iterators
|
||||
that can handle this. (This means that a way to force the
|
||||
evaluation of the rows might be something like:
|
||||
|
||||
// traverse all the rows and generate the missing ones.
|
||||
|
||||
// traverse all the rows and generate the missing ones.
|
||||
for_each(rowlist.begin(), rowlist.end(), dummy_func);
|
||||
|
||||
Note about the buffer structure in the lyx repository: LyXText
|
||||
@ -119,4 +119,3 @@ from the middle.
|
||||
² Number of CPUs f.ex.
|
||||
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ tetex, tetex-latex) from your RH distribution.
|
||||
|
||||
4) Copy lyx-1.0.0.tar.gz to /usr/src/redhat/SOURCES
|
||||
|
||||
5) Issue the command
|
||||
5) Issue the command
|
||||
|
||||
rpm -bb /usr/src/redhat/SPECS/lyx.spec
|
||||
|
||||
@ -32,6 +32,6 @@ rpm form):
|
||||
rpm -Uvh --nodeps /usr/src/redhat/RPMS/i386/lyx-1.0.0-1.i386.rpm
|
||||
|
||||
You should not get any more errors.
|
||||
|
||||
|
||||
mw@moni.msci.memphis.edu
|
||||
|
||||
|
||||
@ -75,10 +75,10 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
texhash
|
||||
|
||||
# Before configuring lyx for the local system
|
||||
# PATH needs to be imported
|
||||
if [ -f /etc/profile ]; then
|
||||
# PATH needs to be imported
|
||||
if [ -f /etc/profile ]; then
|
||||
. /etc/profile
|
||||
fi
|
||||
fi
|
||||
#
|
||||
# Now configure LyX
|
||||
#
|
||||
@ -99,7 +99,7 @@ texhash
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc ABOUT-NLS ANNOUNCE COPYING
|
||||
%doc ABOUT-NLS ANNOUNCE COPYING
|
||||
%doc README UPGRADING ChangeLog NEWS
|
||||
%doc lib/CREDITS README.reLyX
|
||||
%{_bindir}/*
|
||||
|
||||
@ -14,7 +14,7 @@ there are three major tasks to be done:
|
||||
bigger.
|
||||
The LyXText class does not necessarily need to change
|
||||
a lot, it could be per-view. However all the special
|
||||
code in it needs to be (re)moved. Also a lot of the
|
||||
code in it needs to be (re)moved. Also a lot of the
|
||||
functionality needs to be relocated.
|
||||
o GUI independence.
|
||||
Should be a compile time switch what gui (toolkit)
|
||||
@ -26,7 +26,7 @@ there are three major tasks to be done:
|
||||
no view being able to coexist with other views or alone)
|
||||
We will do this by providing an interface all the
|
||||
toolkits will need to follow. Functions that the LyX
|
||||
core will expect to be there.
|
||||
core will expect to be there.
|
||||
|
||||
When these three is finished, we will probably declare a code freeze
|
||||
and try to release a new version. Hopefully other features has also
|
||||
@ -45,7 +45,7 @@ towards code quality:
|
||||
should make it easier to move to threads later. Albeit
|
||||
this is not a huge goal we have some parts of the code
|
||||
that would benefit from threads. (forking is not that
|
||||
nice...)
|
||||
nice...)
|
||||
o signal slot mechanism
|
||||
We are going to use the signal/slot implementation
|
||||
found in libsigc++. This will hopefully give us better
|
||||
@ -56,7 +56,7 @@ towards code quality:
|
||||
possible, without too much hassle.
|
||||
- get rid of most of the global variables. In
|
||||
perticular current_view is a problem.
|
||||
- non shared variables in shared structures
|
||||
- non shared variables in shared structures
|
||||
o make source documentation better. Remember that the better
|
||||
we document LyX internals the easier is it for new
|
||||
developers to begin working on LyX.
|
||||
@ -70,7 +70,7 @@ Some other things related to structure and services in the code:
|
||||
- ensure that not too many commands are executed at
|
||||
the same time.
|
||||
- ensure that non-compatible commands are running at
|
||||
the same time.
|
||||
the same time.
|
||||
- to setup file descriptors where communicating with
|
||||
the processes can take place.
|
||||
o pass an inforeceiver around in the object structure.
|
||||
@ -96,7 +96,7 @@ to make it into 0.14:
|
||||
o better version control (both document and file wise)
|
||||
- version.sty
|
||||
- cvs
|
||||
- sccs
|
||||
- sccs
|
||||
o character styles (similar to emph and noun)
|
||||
Will make a lot of small things conceptual instead of
|
||||
specific. Will be alot easier to change the
|
||||
@ -112,7 +112,7 @@ to make it into 0.14:
|
||||
- replace & find next
|
||||
- replace & find previous
|
||||
We should perhaps try to make the interface a bit
|
||||
emacs like, that should at least give us the
|
||||
emacs like, that should at least give us the
|
||||
features we want.
|
||||
o improved template support.
|
||||
o collapse "New" and "New from Template" into one item.
|
||||
@ -130,7 +130,7 @@ to make it into 0.14:
|
||||
|
||||
o picture support
|
||||
A special insets with some basic drawing
|
||||
capabilities.
|
||||
capabilities.
|
||||
|
||||
o better graphics support
|
||||
I have begun doing something about this. There are
|
||||
@ -143,7 +143,7 @@ to make it into 0.14:
|
||||
parameters set and get a handle to the finished
|
||||
transformation of the graphics. Hopefully this should make
|
||||
it quite easy for LyX to support several/many graphics
|
||||
formats, both on screen and on hard copy.
|
||||
formats, both on screen and on hard copy.
|
||||
|
||||
o rotating and scaling of text
|
||||
o PSTricks (we should be able to support some of this package)
|
||||
@ -167,7 +167,7 @@ to make it into 0.14:
|
||||
T1-lib font renderer.
|
||||
o better latex code quality
|
||||
This means reading LaTeX books to get an better idea
|
||||
on how things are done in the latex world.
|
||||
on how things are done in the latex world.
|
||||
o perhaps find better names for the paragraph styles
|
||||
"paragraph" and "subparagraph"
|
||||
o support for filecontents
|
||||
@ -186,7 +186,7 @@ to make it into 0.14:
|
||||
o better babel support
|
||||
- make it possible to tune the language strings
|
||||
- the possibility for several languages in the same
|
||||
document.
|
||||
document.
|
||||
o title page support
|
||||
o draft copy
|
||||
- draftcopy.sty
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
Project: LyX File format 3.0 (subset of LaTeX)
|
||||
Project: LyX File format 3.0 (subset of LaTeX)
|
||||
============================
|
||||
|
||||
Initial coordinator: Alejandro Aguilar Sierra
|
||||
@ -15,11 +15,11 @@ LyX format compatible with LaTeX. Some of the advantages we would have are:
|
||||
|
||||
- There are many anything->LaTeX and LaTeX->anything converters around.
|
||||
The exchange of documents would be better.
|
||||
|
||||
- We could have better control on the preamble of a document (options,
|
||||
|
||||
- We could have better control on the preamble of a document (options,
|
||||
packages included, macros). Only include those that are needed
|
||||
for the document.
|
||||
|
||||
|
||||
- We could save disk space using only one format.
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
This is part of a private discussion I had with John Collins, the author
|
||||
This is part of a private discussion I had with John Collins, the author
|
||||
of the first LaTeX2LyX conversor. Attached is also a document describing his
|
||||
ideas about the subject. Such ideas could be useful for our project.
|
||||
|
||||
@ -12,7 +12,7 @@ Subject: Re: TeX2LyX document
|
||||
|
||||
[Removed non-related stuff, AAS]
|
||||
|
||||
I am not convinced devising a lyx format as a subset of latex is ideal.
|
||||
I am not convinced devising a lyx format as a subset of latex is ideal.
|
||||
It would take some time to explain my thoughts. But the problem I see
|
||||
with latex is that its syntax is not pleasant, so that it is relatively
|
||||
time-consuming and/or memory intensive to parse it. Most importantly from
|
||||
@ -23,10 +23,10 @@ with a suitably rational subset of latex. Is your format supposed to be
|
||||
just a file format, or will it also be used for the representation of a
|
||||
document in memory? If the latter is true, then I would particularly stay
|
||||
away from a directly latex based format. A file format could be closer to
|
||||
latex, since it might need to read by humans.
|
||||
latex, since it might need to read by humans.
|
||||
|
||||
But you have obviously thought about the issue and have come to different
|
||||
conclusions.
|
||||
conclusions.
|
||||
|
||||
My experience in writing ET convinced me that a good internal format is
|
||||
important to speed and to robustness. ET will run with good speed on an
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
/*
|
||||
* LyXServer monitor. To send command to a running instance of LyX
|
||||
* and receive information from LyX.
|
||||
*
|
||||
*
|
||||
* To build it type:
|
||||
* > gcc -g server_monitor.c -o monitor -lforms -L/usr/X11/lib -lX11 -lm
|
||||
* > ./monitor
|
||||
* Before you run lyx uncomment the line "\serverpipe" from your
|
||||
* ~/.lyx/lyxrc file, according with your home path.
|
||||
*
|
||||
*
|
||||
* Created: 970531
|
||||
* Copyright (C) 1997 Alejandro Aguilar Sierra (asierra@servidor.unam.mx)
|
||||
* Updated: 980104
|
||||
@ -23,11 +23,11 @@
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <stdio.h>
|
||||
|
||||
int lyx_listen = 0;
|
||||
int pipein=-1, pipeout=-1;
|
||||
char pipename[100];
|
||||
char pipename[100];
|
||||
char const *clientname = "monitor";
|
||||
|
||||
/**** Forms and Objects ****/
|
||||
@ -140,12 +140,12 @@ void io_cb(int fd, void *data)
|
||||
fprintf(stderr, "monitor: LyX is listening!\n");
|
||||
fl_set_object_lcol(fd_server->submit,FL_BLACK);
|
||||
fl_activate_object(fd_server->submit);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (s[0]=='I')
|
||||
fl_set_object_label(fd_server->info, s);
|
||||
else
|
||||
fl_set_object_label(fd_server->notify, s);
|
||||
fl_set_object_label(fd_server->notify, s);
|
||||
}
|
||||
|
||||
void openpipe()
|
||||
@ -173,25 +173,25 @@ void openpipe()
|
||||
return;
|
||||
}
|
||||
fl_add_io_callback(pipeout, FL_READ, io_cb, 0);
|
||||
|
||||
|
||||
// greet LyX
|
||||
sprintf(buf, "LYXSRV:%s:hello\n", clientname);
|
||||
write(pipein, buf, strlen(buf));
|
||||
free(pipename);
|
||||
} else
|
||||
} else
|
||||
fprintf(stderr, "monitor: Pipes already opened, close them first\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void closepipe()
|
||||
{
|
||||
char buf[100];
|
||||
|
||||
|
||||
if (pipein==-1 && pipeout==-1) {
|
||||
fprintf(stderr, "monitor: Pipes are not opened\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (pipein>=0) {
|
||||
if (lyx_listen) {
|
||||
lyx_listen = 0;
|
||||
@ -201,28 +201,28 @@ void closepipe()
|
||||
}
|
||||
close(pipein);
|
||||
}
|
||||
|
||||
|
||||
if (pipeout>=0) {
|
||||
close(pipeout);
|
||||
fl_remove_io_callback(pipeout, FL_READ, io_cb);
|
||||
}
|
||||
}
|
||||
pipein = pipeout = -1;
|
||||
fl_set_object_lcol(fd_server->submit,FL_INACTIVE);
|
||||
fl_deactivate_object(fd_server->submit);
|
||||
fl_deactivate_object(fd_server->submit);
|
||||
}
|
||||
|
||||
|
||||
void submit()
|
||||
{
|
||||
char s[255];
|
||||
|
||||
|
||||
const char *clientname = fl_get_input(fd_server->client);
|
||||
const char *argument = fl_get_input(fd_server->arg);
|
||||
const char *command = fl_get_input(fd_server->command);
|
||||
|
||||
|
||||
sprintf(s, "LYXCMD:%s:%s:%s\n", clientname, command, argument);
|
||||
fprintf(stderr, "monitor: command: %s\n", s);
|
||||
if (pipein>=0)
|
||||
if (pipein>=0)
|
||||
write(pipein, s, strlen(s));
|
||||
else
|
||||
fprintf(stderr, "monitor: Pipe is not opened\n");
|
||||
@ -257,13 +257,13 @@ int main(int argc, char *argv[])
|
||||
|
||||
strcpy(pipename, getenv("HOME"));
|
||||
strcat(pipename, "/.lyxpipe"),
|
||||
|
||||
|
||||
/* fill-in form initialization code */
|
||||
fl_set_input(fd_server->pipename, pipename);
|
||||
fl_set_input(fd_server->client, clientname);
|
||||
fl_deactivate_object(fd_server->submit);
|
||||
fl_set_object_lcol(fd_server->submit,FL_INACTIVE);
|
||||
|
||||
|
||||
/* show the first form */
|
||||
fl_show_form(fd_server->server,FL_PLACE_MOUSE,FL_FULLBORDER,"LyX Server Monitor");
|
||||
fl_do_forms();
|
||||
|
||||
@ -70,7 +70,7 @@ bool prefixIs(string const & a, string const & pre)
|
||||
++p_a;
|
||||
++p_pre;
|
||||
}
|
||||
if (*p_pre == '\0') return true;
|
||||
if (*p_pre == '\0') return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -150,7 +150,7 @@ int connect(string const & name)
|
||||
|
||||
|
||||
// Class IOWatch ------------------------------------------------------------
|
||||
class IOWatch
|
||||
class IOWatch
|
||||
{
|
||||
public:
|
||||
IOWatch();
|
||||
@ -159,7 +159,7 @@ public:
|
||||
bool wait(double);
|
||||
bool wait();
|
||||
bool isset(int fd);
|
||||
|
||||
|
||||
private:
|
||||
fd_set des;
|
||||
fd_set act;
|
||||
@ -204,7 +204,7 @@ public:
|
||||
int fd() const;
|
||||
// Connection status
|
||||
bool connected() const;
|
||||
// Line buffered input from the socket
|
||||
// Line buffered input from the socket
|
||||
bool readln(string &);
|
||||
// Write the string + '\n' to the socket
|
||||
void writeln(string const &);
|
||||
@ -354,7 +354,7 @@ bool CmdLineParser::parse(int argc, char * argv[])
|
||||
|
||||
namespace cmdline
|
||||
{
|
||||
void usage()
|
||||
void usage()
|
||||
{
|
||||
cerr << "Usage: lyxclient [options]" << endl
|
||||
<< "Options are:" << endl
|
||||
@ -505,9 +505,9 @@ int main(int argc, char * argv[])
|
||||
}
|
||||
cerr << "lyxclient: " << "Connected to " << *addr << endl;
|
||||
}
|
||||
|
||||
|
||||
int const serverfd = server->fd();
|
||||
|
||||
|
||||
IOWatch iowatch;
|
||||
iowatch.addfd(serverfd);
|
||||
|
||||
@ -541,7 +541,7 @@ int main(int argc, char * argv[])
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Take commands from stdin
|
||||
iowatch.addfd(0); // stdin
|
||||
bool saidbye = false;
|
||||
|
||||
@ -28,7 +28,7 @@ commands are to be sent. The following options are used to specify the server.
|
||||
.TP 6
|
||||
.TP
|
||||
.BI \-p " pid"
|
||||
specify the \fIpid\fR of the running LyX process to which \fBlyxclient\fR
|
||||
specify the \fIpid\fR of the running LyX process to which \fBlyxclient\fR
|
||||
should send commands.
|
||||
.TP
|
||||
.BI \-a " socket_address"
|
||||
@ -40,13 +40,13 @@ directory. There is one per running LyX process.
|
||||
if LyX is configured to use a temporary directory other than /tmp, you must
|
||||
inform \fBlyxclient\fR of this.
|
||||
.PP
|
||||
If neither \fB-a\fR nor \fB-p\fR are invoked, \fBlyxclient\fR will search for
|
||||
If neither \fB-a\fR nor \fB-p\fR are invoked, \fBlyxclient\fR will search for
|
||||
sockets in /tmp (or \fItmp_dir\fR if the \fB-t\fR option is used) and use
|
||||
the first socket to which it can connect.
|
||||
This is safe if you are running only one LyX process at any one time.
|
||||
.SH COMMAND MODE OPTIONS
|
||||
\fBlyxclient\fR can send commands to LyX from both the command-line
|
||||
and from standard input.
|
||||
and from standard input.
|
||||
LyX commands are documented in <fixme>.
|
||||
.TP 6
|
||||
.BI \-c " command"
|
||||
@ -55,7 +55,7 @@ send a single \fIcommand\fR, print LyX information to standard output and exit.
|
||||
.BI \-g " file line"
|
||||
this is simply a wrapper for the command 'server-goto-file-row \fIfile\fR \fIline\fR'. It is used by the DVI previewer to elicit inverse DVI search.
|
||||
.PP
|
||||
If neither \fB-c\fR nor \fB-g\fR are used, \fBlyxclient\fR will regard any
|
||||
If neither \fB-c\fR nor \fB-g\fR are used, \fBlyxclient\fR will regard any
|
||||
standard input as commands to be sent to LyX, printing LyX's responses to
|
||||
standard output. Commands are
|
||||
separated by newlines (the '\\n' character). To finish communication
|
||||
@ -64,8 +64,8 @@ and terminate the \fBlyxclient\fR process, send the command 'BYE:'.
|
||||
.TP 6
|
||||
.BI \-n " name"
|
||||
when starting communication, \fBlyxclient\fR sends an idenfifier
|
||||
string to LyX. By default, this string is "PPID>PID", where PPID is
|
||||
\fBlyxclient\fR's parent pid and pid is \fBlyxclient\fR's pid.
|
||||
string to LyX. By default, this string is "PPID>PID", where PPID is
|
||||
\fBlyxclient\fR's parent pid and pid is \fBlyxclient\fR's pid.
|
||||
Use this option to override this default.
|
||||
.TP
|
||||
.BI \-h
|
||||
|
||||
@ -18,7 +18,7 @@ To use this binary distribution of LyX, please follow these steps:
|
||||
4) If you want to use reLyX, the LaTeX-to-LyX translator, you will
|
||||
have to edit the first line of the script, which should read
|
||||
#!/usr/local/bin/perl
|
||||
if you have perl installed as /usr/local/bin/perl.
|
||||
if you have perl installed as /usr/local/bin/perl.
|
||||
Note that reLyX requires at least perl version 5.002.
|
||||
|
||||
That's it. Happy LyXing !
|
||||
|
||||
@ -28,7 +28,7 @@ def process(file):
|
||||
if i+1 < n:
|
||||
next_line = lines[i+1]
|
||||
|
||||
# some entries are spread over two lines so we join the next line
|
||||
# some entries are spread over two lines so we join the next line
|
||||
# to the current one, (if current line contains a comment, we remove it)
|
||||
line = string.split(line,'%')[0]+next_line
|
||||
|
||||
@ -49,7 +49,7 @@ def process(file):
|
||||
type = "mathord"
|
||||
font = mo.group(2)
|
||||
code = mo.group(3)
|
||||
|
||||
|
||||
if mo != None and symbol not in ignore_list:
|
||||
mo2 = re.match(r'\s*\\def\\(.*?)\{', next_line)
|
||||
if mo2 != None and symbol == mo2.group(1)+"op":
|
||||
@ -109,7 +109,7 @@ for x in exceptions:
|
||||
|
||||
print """
|
||||
lyxbar cmsy 161 0 mathord
|
||||
lyxeq cmr 61 0 mathord
|
||||
lyxeq cmr 61 0 mathord
|
||||
lyxdabar msa 57 0 mathord
|
||||
lyxright msa 75 0 mathord
|
||||
lyxleft msa 76 0 mathord
|
||||
|
||||
@ -68,7 +68,7 @@ autoheader
|
||||
automake --add-missing --foreign
|
||||
autoconf
|
||||
EOF
|
||||
chmod a+x autogen.sh
|
||||
chmod a+x autogen.sh
|
||||
)
|
||||
|
||||
|
||||
@ -122,7 +122,7 @@ echo "Creating custom sigc++/configure.in"
|
||||
## Note that you have to be very careful about quoting. Look at the second
|
||||
## script for example: '\'', \\\ and \$
|
||||
##
|
||||
## Now for some explanation of what each script is supposed to change:
|
||||
## Now for some explanation of what each script is supposed to change:
|
||||
##
|
||||
# -e 's/\(Nelson\)/\1\
|
||||
### Modified by makeLyXsigc.sh (Allan Rae)/'
|
||||
@ -151,7 +151,7 @@ echo "Creating custom sigc++/configure.in"
|
||||
#
|
||||
# -e 's%\(AUX_DIR(\)scripts%\1../config%'
|
||||
#
|
||||
# Use the applications auxilliary directory. Assumed to be ../config.
|
||||
# Use the applications auxilliary directory. Assumed to be ../config.
|
||||
#
|
||||
# -e 's%config/\(sigc++config\.h\)%\1%'
|
||||
#
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
% together.
|
||||
%
|
||||
% The labels are supposed to be entered at "LABELS" below,
|
||||
% and you get one solution (hopefully) with "go.".
|
||||
% and you get one solution (hopefully) with "go.".
|
||||
% If there are no solutions, the Prolog-interpretator will reply with a
|
||||
% "No."
|
||||
%
|
||||
@ -78,7 +78,7 @@ uppercase(L,U):-
|
||||
possible_char(_/Label,Char):-
|
||||
member(Char,Label). % the character is part of the label
|
||||
|
||||
% prepare_labels/2: Prepares all labels. Constructs a new list of pairs
|
||||
% prepare_labels/2: Prepares all labels. Constructs a new list of pairs
|
||||
% where the original string is coupled with the prepared string.
|
||||
prepare_labels([], []).
|
||||
prepare_labels([H1|T1], [H1/H2|T2]):-
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Textclass definition file for agu-dtd.
|
||||
# Author : José Abílio Oliveira Matos <jamatos@lyx.org>
|
||||
# Modified Martin Vermeer <martin.vermeer@hut.fi>
|
||||
# Modified Martin Vermeer <martin.vermeer@hut.fi>
|
||||
#
|
||||
# This file is the counterpart of stdstyle.inc
|
||||
# It is desirable, as far as possible, to have the same look and feel for
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Textclass definition file for docbook.
|
||||
# Author : José Abílio Oliveira Matos <jamatos@lyx.org>
|
||||
# Modified Martin Vermeer <martin.vermeer@hut.fi>
|
||||
# Modified Martin Vermeer <martin.vermeer@hut.fi>
|
||||
#
|
||||
# This file is the counterpart of stdstyle.inc
|
||||
# It is desirable, as far as possible, to have the same look and feel for
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# \DeclareLaTeXClass[g-brief2]{letter (g-brief2)}
|
||||
# Letter textclass definition file.
|
||||
|
||||
# Author : Felix Kurth <lyx@fkurth.de> based on work from
|
||||
# Author : Felix Kurth <lyx@fkurth.de> based on work from
|
||||
# Thomas Hartkens <thomas@hartkens.de>
|
||||
|
||||
# Input general definitions
|
||||
@ -793,7 +793,7 @@ Style PostalComment
|
||||
EndFont
|
||||
End
|
||||
|
||||
|
||||
|
||||
# Adresse
|
||||
Style Address
|
||||
Margin Static
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#% Do not delete the line below; configure depends on this
|
||||
# \DeclareLaTeXClass[svjour,svglobal.clo]{article (Springer - svjour/global)}
|
||||
# svjour/global (article) textclass definition file.
|
||||
# svjour/global (article) textclass definition file.
|
||||
# for various Springer Verlag Journals for which no specific file exists (Global).
|
||||
# --------
|
||||
#
|
||||
@ -25,7 +25,7 @@ ClassOptions
|
||||
End
|
||||
|
||||
# Abstract style definition
|
||||
Style Abstract
|
||||
Style Abstract
|
||||
Margin First_Dynamic
|
||||
LatexType Command
|
||||
LatexName abstract
|
||||
@ -40,10 +40,10 @@ Style Abstract
|
||||
Align Block
|
||||
AlignPossible Block, Left
|
||||
LabelType Top_Environment
|
||||
LabelString Abstract.
|
||||
LabelString Abstract.
|
||||
|
||||
# label font definition
|
||||
LabelFont
|
||||
LabelFont
|
||||
Series Bold
|
||||
EndFont
|
||||
End
|
||||
End
|
||||
|
||||
@ -241,7 +241,7 @@ sub isNatbibCitation {
|
||||
$name =~ s/\*$//;
|
||||
# Is this doctored string found in the list of valid commands?
|
||||
return foundIn($name, @NatbibCommands);
|
||||
|
||||
|
||||
}
|
||||
|
||||
##################### PARSER INVOCATION ##################################
|
||||
@ -264,7 +264,7 @@ sub call_parser {
|
||||
# Type=>report_args and count=>1
|
||||
# Note that we don't have to bother putting in tokens which will be simply
|
||||
# translated (e.g., from %TextTokenTransTable).
|
||||
my %MyTokens = (
|
||||
my %MyTokens = (
|
||||
'{' => $Text::TeX::Tokens{'{'},
|
||||
'}' => $Text::TeX::Tokens{'}'},
|
||||
'\begin' => $Text::TeX::Tokens{'\begin'},
|
||||
@ -290,7 +290,7 @@ sub call_parser {
|
||||
# Just pretend they actually ARE new paragraph markers!
|
||||
'\maketitle' => {'class' => 'Text::TeX::Paragraph'},
|
||||
);
|
||||
|
||||
|
||||
# Now add to MyTokens all of the commands that were read from the
|
||||
# commands file by package ReadCommands
|
||||
&ReadCommands::Merge(\%MyTokens);
|
||||
@ -380,7 +380,7 @@ sub regularizeLatexLength {
|
||||
$LatexLength = $val . $unit;
|
||||
return $LatexLength;
|
||||
}
|
||||
|
||||
|
||||
|
||||
sub getAsLyXLength {
|
||||
# Straight translation of LaTeX lengths to LyX ones.
|
||||
@ -463,7 +463,7 @@ sub basic_lyx {
|
||||
# If, e.g., there's just a comment in this token, don't do anything
|
||||
# This actually shouldn't happen if CleanTeX has already removed them
|
||||
last TYPESW if !defined $eaten->print;
|
||||
|
||||
|
||||
# Handle LaTeX tokens
|
||||
if (/^Token$/o) {
|
||||
|
||||
@ -523,7 +523,7 @@ sub basic_lyx {
|
||||
|
||||
# Items in list environments
|
||||
} elsif ($name eq '\item') {
|
||||
|
||||
|
||||
# What if we had a nested "Standard" paragraph?
|
||||
# Then write \end_deeper to finish the standard layout
|
||||
# before we write the new \layout ListEnv command
|
||||
@ -534,7 +534,7 @@ sub basic_lyx {
|
||||
if $debug_on;
|
||||
} # end deeper if
|
||||
|
||||
# Upcoming text (the item) will be a new paragraph,
|
||||
# Upcoming text (the item) will be a new paragraph,
|
||||
# requiring a new layout command based on whichever
|
||||
# kind of list environment we're in
|
||||
$IsNewParagraph = 1;
|
||||
@ -625,7 +625,7 @@ sub basic_lyx {
|
||||
$length =~ s/\s*$//; # may have \n at end
|
||||
|
||||
# If we can't parse the command, print it in tex mode
|
||||
&RelyxFigure::parse_epsfsize($name, $length) or
|
||||
&RelyxFigure::parse_epsfsize($name, $length) or
|
||||
&print_tex_mode("$name=$length");
|
||||
|
||||
# Miscellaneous...
|
||||
@ -647,7 +647,7 @@ sub basic_lyx {
|
||||
|
||||
last TYPESW;
|
||||
}
|
||||
|
||||
|
||||
# Handle tokens that take arguments, like \section{},\section*{}
|
||||
if (/^BegArgsToken$/) {
|
||||
my $name = $eaten->token_name;
|
||||
@ -714,7 +714,7 @@ sub basic_lyx {
|
||||
($dummy, $dum2) = ($command =~ /(\S+)\s+(\w+)/);
|
||||
|
||||
# HACK so that "\emph{hi \emph{bye}}" yields unemph'ed "bye"
|
||||
if ( ($dummy eq "\\emph") &&
|
||||
if ( ($dummy eq "\\emph") &&
|
||||
($CurrentFontStatus->{$dummy}->[-1] eq "on")) {
|
||||
$dum2 = "default"; # "on" instead of default?
|
||||
$command =~ s/on/default/;
|
||||
@ -732,7 +732,7 @@ sub basic_lyx {
|
||||
|
||||
|
||||
# Handle footnotes and margin notes
|
||||
# Make a new font table & layout stack which will be local to the
|
||||
# Make a new font table & layout stack which will be local to the
|
||||
# footnote or marginpar
|
||||
} elsif (exists $FloatTransTable{$name}) {
|
||||
my $command = $FloatTransTable{$name};
|
||||
@ -755,7 +755,7 @@ sub basic_lyx {
|
||||
$CurrentLayoutStack = ["Standard"];
|
||||
|
||||
# Store whether we're at the end of a paragraph or not
|
||||
# for when we get to end of footnote AND
|
||||
# for when we get to end of footnote AND
|
||||
# Note that the footnote text will be starting a new paragraph
|
||||
# Also store the current alignment (justification)
|
||||
$OldINP = $IsNewParagraph; $OldMBD = $MayBeDeeper;
|
||||
@ -769,7 +769,7 @@ sub basic_lyx {
|
||||
&CheckForNewParagraph; # may be at the beginning of a par
|
||||
|
||||
print OUTFILE "$pre_space\n",'\i ',$name,'{'
|
||||
|
||||
|
||||
# Included Postscript Figures
|
||||
# Currently, all postscript including commands take one
|
||||
# required argument and 0 to 2 optional args, so we can
|
||||
@ -872,7 +872,7 @@ sub basic_lyx {
|
||||
if ($eaten->base_token == $tok) {
|
||||
©_latex_known($eaten,$fileobject);
|
||||
}
|
||||
|
||||
|
||||
last TYPESW;
|
||||
}
|
||||
|
||||
@ -929,7 +929,7 @@ sub basic_lyx {
|
||||
|
||||
} elsif ($name =~ m/^$AccentTokens$/) {
|
||||
print OUTFILE "}\n";
|
||||
|
||||
|
||||
} elsif ($name eq "\\bibitem") {
|
||||
print OUTFILE "}\n";
|
||||
} # End if on $name
|
||||
@ -981,7 +981,7 @@ sub basic_lyx {
|
||||
if (/^Begin::Group::Args$/) {
|
||||
print $eaten->print," " if $debug_on; # the string "\begin{foo}"
|
||||
my $env = $eaten->environment;
|
||||
|
||||
|
||||
# Any environment found in the layouts files
|
||||
if (exists $ReadCommands::ToLayout->{$env}) {
|
||||
&ConvertToLayout($env);
|
||||
@ -1138,14 +1138,14 @@ sub basic_lyx {
|
||||
$tex_mode_string = "";
|
||||
# print "\begin{env}
|
||||
# For reLyXskip env, don't print the \begin & \end commands!
|
||||
$tex_mode_string .= $eaten->exact_print
|
||||
$tex_mode_string .= $eaten->exact_print
|
||||
unless $env eq "reLyXskip";
|
||||
$tex_mode_string .=&Verbatim::copy_verbatim($fileobject,$eaten);
|
||||
}
|
||||
|
||||
last TYPESW;
|
||||
}
|
||||
|
||||
|
||||
# Handle \end{foo}
|
||||
if (/^End::Group::Args$/) {
|
||||
print $eaten->print," " if $debug_on; # the string "\end{foo}"
|
||||
@ -1518,7 +1518,7 @@ sub CheckForNewParagraph {
|
||||
# If $CurrentAlignment is set, it prints the alignment command for this par.
|
||||
# If $MayBeDeeper==1 and we're currently within a list environment,
|
||||
# it starts a "deeper" Standard paragraph
|
||||
my $dummy;
|
||||
my $dummy;
|
||||
my $layout = $$CurrentLayoutStack[-1];
|
||||
|
||||
return if &RelyxTable::in_table;
|
||||
@ -1673,7 +1673,7 @@ sub fixmath {
|
||||
( ([^A-Za-z] \*?) | # non-letter (and *) ($4) OR
|
||||
([A-Za-z]+ \*?) ) # letters (and *) ($5)
|
||||
)//xs) # /x to allow whitespace/comments, /s to copy \n's
|
||||
{
|
||||
{
|
||||
$output .= $1;
|
||||
my $tok = $2;
|
||||
if (exists $ReadCommands::math_trans{$tok}) {
|
||||
|
||||
@ -55,7 +55,7 @@ sub call_parser {
|
||||
my @LocalTokens = qw (em rm bf tt sf sc sl it
|
||||
rmfamily ttfamily sffamily mdseries bfseries
|
||||
upshape itshape slshape scshape cal
|
||||
);
|
||||
);
|
||||
foreach (@LocalTokens) {
|
||||
$MyTokens{"\\$_"} = $Text::TeX::Tokens{'\em'}
|
||||
}
|
||||
@ -63,7 +63,7 @@ sub call_parser {
|
||||
&ReadCommands::Merge(\%MyTokens);
|
||||
|
||||
# Create the fileobject
|
||||
my $file = new Text::TeX::OpenFile
|
||||
my $file = new Text::TeX::OpenFile
|
||||
$InFileName,
|
||||
'defaultact' => \&clean_tex,
|
||||
'tokens' => \%MyTokens;
|
||||
@ -124,14 +124,14 @@ sub clean_tex {
|
||||
$printstr = '}';
|
||||
last SWITCH;
|
||||
}
|
||||
|
||||
|
||||
# $eaten->exact_print is undefined for previous environments
|
||||
$outstr = $eaten->exact_print;
|
||||
if (! defined $outstr) { # comment at end of paragraph
|
||||
warn "Weird undefined token $eaten!" unless $eaten->comment;
|
||||
last SWITCH;
|
||||
}
|
||||
|
||||
|
||||
# Handle LaTeX tokens
|
||||
if (/^Token$/) {
|
||||
my $realtok = $eaten->print; # w/out whitespace
|
||||
@ -193,7 +193,7 @@ sub clean_tex {
|
||||
}
|
||||
|
||||
# End of tokens taking arguments, like '^'
|
||||
# ADD '}' if there isn't one after the last argument, i.e.,
|
||||
# ADD '}' if there isn't one after the last argument, i.e.,
|
||||
# if the previous token *wasn't* a '}'
|
||||
# Kludge: for TeX style \input command ("\input foo" with no
|
||||
# braces) we need to read the whole filename, but parser will have
|
||||
@ -224,13 +224,13 @@ sub clean_tex {
|
||||
# required arg: they'll just be copied as text
|
||||
last SWITCH;
|
||||
}
|
||||
|
||||
|
||||
# Handle opening groups, like '{' and '$'.
|
||||
if (/Begin::Group$/) {
|
||||
$printstr = $outstr;
|
||||
last SWITCH;
|
||||
}
|
||||
|
||||
|
||||
# Handle closing groups, like '}' and '$'.
|
||||
if (/End::Group$/) {
|
||||
$printstr = $outstr;
|
||||
@ -246,7 +246,7 @@ sub clean_tex {
|
||||
}
|
||||
last SWITCH;
|
||||
}
|
||||
|
||||
|
||||
if (/End::Group::Args/) {
|
||||
$printstr = $outstr;
|
||||
last SWITCH;
|
||||
@ -260,9 +260,9 @@ sub clean_tex {
|
||||
# The default action - print the string.
|
||||
$printstr = $outstr;
|
||||
} # end SWITCH:for ($type)
|
||||
|
||||
|
||||
# Actually print the string
|
||||
if (defined $printstr) {
|
||||
if (defined $printstr) {
|
||||
print OUTFILE $printstr;
|
||||
$last_eaten = $eaten; #save for next time
|
||||
} else {warn "Undefined printstr";}
|
||||
|
||||
@ -53,7 +53,7 @@ sub last_lyx {
|
||||
|
||||
} elsif (/$BasicLyX::bibstyle_insert_string/o) {
|
||||
# Replace the "insert bibstyle file here" with the actual file name
|
||||
|
||||
|
||||
my $ins = $BasicLyX::bibstyle_insert_string;
|
||||
my $fil = $BasicLyX::bibstyle_file;
|
||||
if ($fil) {
|
||||
@ -114,7 +114,7 @@ sub print_table {
|
||||
# know while reading the table that the last row was empty, so we
|
||||
# couldn't pop the last row then. So do it now. Yuck.
|
||||
if ($thistable->numcols==1) {
|
||||
$to_print =~ s/\\newline(?=\s*$)// && pop @{$thistable->{"rows"}}
|
||||
$to_print =~ s/\\newline(?=\s*$)// && pop @{$thistable->{"rows"}}
|
||||
} elsif ($thistable->{"rows"}[$thistable->numrows -1]->{"bottom_line"}) {
|
||||
$to_print =~ s/\\newline(?=\s*$)//;
|
||||
}
|
||||
|
||||
@ -33,7 +33,7 @@ RelyxTable.pm - classes & methods for handling LaTeX tables
|
||||
Verbatim.pm - subs to copy stuff exactly (e.g, \verb or unknown commands)
|
||||
|
||||
Text/TeX.pm - Text::TeX package which contains the TeX parser
|
||||
./Text/TeX.pm was originally copied from
|
||||
./Text/TeX.pm was originally copied from
|
||||
Text-TeX-0.01/Text/TeX.pm, but has been changed.
|
||||
Text/manpage.3pm original manpage for Text::TeX
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# This file is part of reLyX.
|
||||
# This file is part of reLyX.
|
||||
# Copyright (c) 1998-9 Amir Karger karger@post.harvard.edu
|
||||
# You are free to use and modify this code under the terms of
|
||||
# the GNU General Public Licence version 2 or later.
|
||||
@ -26,8 +26,8 @@ sub split_preamble {
|
||||
$debug_on = (defined($main::opt_d) && $main::opt_d);
|
||||
# -c option?
|
||||
$true_class = defined($main::opt_c) ? $main::opt_c : "";
|
||||
my $zzz = $debug_on
|
||||
? " from LaTeX file $InFileName into $PreambleName and $OutFileName"
|
||||
my $zzz = $debug_on
|
||||
? " from LaTeX file $InFileName into $PreambleName and $OutFileName"
|
||||
: "";
|
||||
warn "Splitting Preamble$zzz\n";
|
||||
|
||||
@ -165,7 +165,7 @@ sub translate_preamble {
|
||||
warn "Uncommented text before \\documentclass command ignored!\n"if $ignore;
|
||||
print "Ignored text was\n------\n$ignore------\n" if $debug_on && $ignore;
|
||||
|
||||
# concatenate all the extra options until the required argument to
|
||||
# concatenate all the extra options until the required argument to
|
||||
# \documentclass, which will be in braces
|
||||
until (eof(PREAMBLE) || /\{/) {
|
||||
my $instr = <PREAMBLE>;
|
||||
@ -351,7 +351,7 @@ sub translate_preamble {
|
||||
}
|
||||
|
||||
## Paragraph skip or indentation
|
||||
if ( $Latex_Preamble =~
|
||||
if ( $Latex_Preamble =~
|
||||
s/\\setlength\\parskip\{\\(.*)amount\}\s*\\setlength\\parindent\{0pt\}//) {
|
||||
$LyX_Preamble .= "\\paragraph_separation skip\n";
|
||||
$LyX_Preamble .= "\\defskip $1\n";
|
||||
|
||||
@ -7,7 +7,7 @@ package ReadCommands;
|
||||
# Read a file containing LaTeX commands and their syntax
|
||||
# Also, read a file containing LyX layouts and their LaTeX equivalents
|
||||
|
||||
use strict;
|
||||
use strict;
|
||||
|
||||
# Variables needed by other modules
|
||||
# ToLayout is a ref to a hash which contains LyX layouts & LaTeX equivalents
|
||||
@ -59,7 +59,7 @@ sub read_syntax_files {
|
||||
'\begin' => $Text::TeX::Tokens{'\begin'},
|
||||
'\end' => $Text::TeX::Tokens{'\end'},
|
||||
);
|
||||
|
||||
|
||||
my $InFileName;
|
||||
foreach $InFileName (@syntaxfiles) {
|
||||
die "could not find syntax file $InFileName" unless -e $InFileName;
|
||||
@ -129,7 +129,7 @@ sub read_commands {
|
||||
my @vals = $fileobject->eatBalanced->contents;
|
||||
my $val = join ("", map {$_->exact_print} @vals);
|
||||
$math_trans{$key} = $val;
|
||||
|
||||
|
||||
} else { # regular portion of syntax file
|
||||
my ($dum2);
|
||||
my $args = "";
|
||||
@ -243,7 +243,7 @@ sub read_layout_files {
|
||||
# TODO: We need to store ToLayout s.t. we can have > 1 layout per command.
|
||||
# Maybe by default just have one layout, but if (ref(layout)) then read
|
||||
# more args & thereby figure out which layout?
|
||||
#
|
||||
#
|
||||
# Arg0 is the name of the documentclass
|
||||
use FileHandle;
|
||||
use File::Basename;
|
||||
@ -382,7 +382,7 @@ sub read_layout_files {
|
||||
} elsif (/^Paragraph$/) {
|
||||
$skip = 1;
|
||||
} else {
|
||||
warn "unknown LatexType $latextype" .
|
||||
warn "unknown LatexType $latextype" .
|
||||
"for $latexname (layout $lyxname)!\n";
|
||||
}
|
||||
# Handle latexparam, if any
|
||||
@ -410,7 +410,7 @@ sub read_layout_files {
|
||||
$lyxname = "";
|
||||
} # end if ($latextype and $latexname)
|
||||
} # end if on $line
|
||||
|
||||
|
||||
} #end while
|
||||
|
||||
## Print every known layout
|
||||
|
||||
@ -62,7 +62,7 @@ sub convert_length {
|
||||
# Return empty list on error
|
||||
my $size = shift;
|
||||
|
||||
# A length can be (optional plus followed by) (num)(unit) where
|
||||
# A length can be (optional plus followed by) (num)(unit) where
|
||||
# num is a float number (possibly with European command) and unit
|
||||
# is a size unit, either in,cm,pt etc. or \textwidth etc.
|
||||
my %unit_convert = ( # 1 inch = 25.4 mm
|
||||
@ -177,7 +177,7 @@ sub parse_keyval {
|
||||
return 0 if $optarg1->print; # bounding box was given. Panic!
|
||||
$filename = &recursive_print($reqarg);
|
||||
# fighash key shouldn't exist if no size was given
|
||||
$fighash{'height'} = $RelyxFigure::EpsfYsize
|
||||
$fighash{'height'} = $RelyxFigure::EpsfYsize
|
||||
if $RelyxFigure::EpsfYsize;
|
||||
$fighash{'width'} = $RelyxFigure::EpsfXsize
|
||||
if $RelyxFigure::EpsfXsize;
|
||||
@ -189,7 +189,7 @@ sub parse_keyval {
|
||||
# "silent" key doesn't do anything
|
||||
@known_keys = qw(file figure rotate angle height width silent);
|
||||
$keyval_string = &recursive_print($reqarg);
|
||||
my $fighashref =
|
||||
my $fighashref =
|
||||
&RelyxFigure::parse_keyval($keyval_string, @known_keys);
|
||||
return 0 unless defined $fighashref; # found unknown key...
|
||||
%fighash = %$fighashref;
|
||||
@ -272,18 +272,18 @@ sub parse_keyval {
|
||||
|
||||
$to_print .= "file $self->{'file'}\n";
|
||||
my ($size, $type) = ("","");
|
||||
($size, $type) = ($self->{'width'},
|
||||
($size, $type) = ($self->{'width'},
|
||||
$RelyxFigure::HW_types{$self->{'width_type'}});
|
||||
$to_print .= "width $type $size\n" if $size;
|
||||
($size, $type) = ("","");
|
||||
($size, $type) = ($self->{'height'},
|
||||
($size, $type) = ($self->{'height'},
|
||||
$RelyxFigure::HW_types{$self->{'height_type'}});
|
||||
$to_print .= "height $type $size\n" if $size;
|
||||
$to_print .= "angle $self->{'angle'}\n" if $self->{'angle'};
|
||||
$to_print .= "flags $self->{'flags'}\n";
|
||||
|
||||
$to_print .= "\n\\end_inset \n\n";
|
||||
|
||||
|
||||
} # end sub RelyxFigure::Figure::print
|
||||
|
||||
} # end of package RelyxFigure::Figure
|
||||
|
||||
@ -176,7 +176,7 @@ sub parse_cols {
|
||||
push @RelyxTable::table_array, $thistable;
|
||||
|
||||
|
||||
# Now that it's blessed, put the 0th row into the table
|
||||
# Now that it's blessed, put the 0th row into the table
|
||||
$thistable->addrow;
|
||||
|
||||
return $thistable;
|
||||
@ -313,7 +313,7 @@ sub parse_cols {
|
||||
foreach $col (@{$thistable->{"columns"}}) {
|
||||
$to_print .= $col->print_info;
|
||||
}
|
||||
|
||||
|
||||
# Print cell info
|
||||
my $cell;
|
||||
foreach $row (@{$thistable->{"rows"}}) {
|
||||
@ -369,7 +369,7 @@ package RelyxTable::Column;
|
||||
my $description = shift;
|
||||
my $col;
|
||||
|
||||
# Initially zero everything, since we set different
|
||||
# Initially zero everything, since we set different
|
||||
# fields for @ and non-@ columns
|
||||
$col->{"alignment"} = "c"; # default
|
||||
$col->{"left_line"} = 0;
|
||||
@ -424,7 +424,7 @@ package RelyxTable::Column;
|
||||
);
|
||||
$to_print .= join(" ",@arr);
|
||||
$to_print .= "\n";
|
||||
|
||||
|
||||
return $to_print;
|
||||
}
|
||||
} # end package RelyxTable::Column
|
||||
@ -519,7 +519,7 @@ package RelyxTable::Row;
|
||||
);
|
||||
$to_print .= join(" ",@arr);
|
||||
$to_print .= "\n";
|
||||
|
||||
|
||||
return $to_print;
|
||||
} # end sub print_info
|
||||
|
||||
@ -534,7 +534,7 @@ package RelyxTable::Cell;
|
||||
# alignment - alignment of this cell
|
||||
# top_line - does the cell have a line on the top?
|
||||
# bottom_line - does the cell have a line on the bottom?
|
||||
# has_cont_row-
|
||||
# has_cont_row-
|
||||
# rotate - rotate cell?
|
||||
# line_breaks - cell has line breaks in it (???)
|
||||
# special - does this multicol have a special description (@ commands?)
|
||||
@ -595,7 +595,7 @@ package RelyxTable::Cell;
|
||||
);
|
||||
$to_print .= join(" ",@arr);
|
||||
$to_print .= "\n";
|
||||
|
||||
|
||||
return $to_print;
|
||||
}
|
||||
} # end package RelyxTable::Cell
|
||||
|
||||
@ -18,7 +18,7 @@ package Text::TeX;
|
||||
# names by default without a very good reason. Use EXPORT_OK instead.
|
||||
# Do not simply export all your public functions/methods/constants.
|
||||
@EXPORT = qw(
|
||||
|
||||
|
||||
);
|
||||
$VERSION = '0.01';
|
||||
|
||||
@ -50,7 +50,7 @@ $VERSION = '0.01';
|
||||
# SelfMatch - e.g., '$'. Matches itself, but otherwise like a Begin::Group
|
||||
# Separator - e.g., '&' (not used in reLyX)
|
||||
# Comment - (not used in reLyX)
|
||||
#
|
||||
#
|
||||
# The main package is TT::OpenFile. It contains the subroutines that do
|
||||
# most of the parsing work. TT::GetParagraph does some stuff too, but
|
||||
# it's not a token you'd expect the code to return
|
||||
@ -172,7 +172,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
return undef unless defined $self->[0];
|
||||
my $txt = shift;
|
||||
my $type;
|
||||
if (defined ($tok = $txt->{tokens}->{$self->[0]})
|
||||
if (defined ($tok = $txt->{tokens}->{$self->[0]})
|
||||
and defined $tok->{class}) {
|
||||
bless $self, $tok->{class};
|
||||
}
|
||||
@ -217,7 +217,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
|
||||
sub next_args {
|
||||
# Return the next argument(s) expected by this token.
|
||||
# For regular Tokens: /^o*$/.
|
||||
# For regular Tokens: /^o*$/.
|
||||
# For BegArgsTokens and ArgTokens: /^o*[rR]$/
|
||||
# For EndArgsTokens: /^o*/. (in case opt args come after last required arg)
|
||||
my ($eaten,$fileobject) = (shift,shift);
|
||||
@ -258,7 +258,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
my $tok = shift->base_token;
|
||||
return $tok->exact_print;
|
||||
}
|
||||
|
||||
|
||||
# How many arguments we've read already.
|
||||
# Obviously zero before we've begun to read the arguments
|
||||
sub args_done {return 0}
|
||||
@ -364,7 +364,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
return if $_[1]->check_presynthetic($_[0]); # May change $_[0]
|
||||
my $wa = $_[1]->curwaitforaction;
|
||||
my $w = $_[1]->popwait;
|
||||
warn "Expecting `$w', got `$_[0][0]'=`$_[0][0][0]' in `$ {$_[1]->{paragraph}}'"
|
||||
warn "Expecting `$w', got `$_[0][0]'=`$_[0][0][0]' in `$ {$_[1]->{paragraph}}'"
|
||||
if $w ne $_[0]->[0];
|
||||
&$wa if defined $wa; # i.e., do $txt->{waitforactions}[-1] if it exists
|
||||
}
|
||||
@ -403,7 +403,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
my $wa = $_[1]->curwaitforaction;
|
||||
my $w = $_[1]->popwait;
|
||||
# If you got '}' when you wanted '\end'
|
||||
warn "Expecting `$w', got $_[0]->[0] in `$ {$_[1]->{paragraph}}'"
|
||||
warn "Expecting `$w', got $_[0]->[0] in `$ {$_[1]->{paragraph}}'"
|
||||
if $w ne $_[0]->[0];
|
||||
# If you got \end{foo} when you wanted \end{bar}
|
||||
if ($Token->{selfmatch} and $s->environment ne $_[0]->environment) {
|
||||
@ -521,7 +521,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
# it to SelfMatch, but then SelfMatch::refine is never called! -Ak
|
||||
sub digest { # XXXX Should not be needed?
|
||||
# curwait returns undefined if not waiting for anything
|
||||
if (defined ($cwt = $_[1]->curwait) && $cwt eq $_[0]->[0]) {
|
||||
if (defined ($cwt = $_[1]->curwait) && $cwt eq $_[0]->[0]) {
|
||||
bless $_[0], Text::TeX::End::Group;
|
||||
$_[0]->Text::TeX::End::Group::digest($_[1]);
|
||||
} else {
|
||||
@ -543,7 +543,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
# Get a new paragraph from the LaTeX file
|
||||
# Get stuff until a non-empty line which follows an empty line
|
||||
sub new {
|
||||
shift;
|
||||
shift;
|
||||
my $file = shift;
|
||||
my $fh;
|
||||
$fh = $ {$file->{fhs}}[-1] if @{$file->{fhs}};
|
||||
@ -583,7 +583,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
|
||||
sub new {
|
||||
# Description of OpenFile object:
|
||||
# readahead - every time we read a paragraph we read one extra token. This
|
||||
# readahead - every time we read a paragraph we read one extra token. This
|
||||
# token goes into 'readahead' and is prepended to the next paragraph
|
||||
# we read
|
||||
# paragraph - stores the paragraph we're currently parsing
|
||||
@ -611,10 +611,10 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
die "End of file `$file' during opening" if eof("::$refgen");
|
||||
}
|
||||
my $fhs = defined $file ? ["::$refgen"] : [];
|
||||
bless { fhs => $fhs,
|
||||
readahead => ($opt{string} || ""),
|
||||
bless { fhs => $fhs,
|
||||
readahead => ($opt{string} || ""),
|
||||
files => [$file],
|
||||
"paragraph" => undef,
|
||||
"paragraph" => undef,
|
||||
"tokens" => ($opt{tokens} || \%Text::TeX::Tokens),
|
||||
waitfors => [], options => \%opt,
|
||||
waitforactions => [],
|
||||
@ -622,8 +622,8 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
# the default action
|
||||
# for next deeper
|
||||
# level
|
||||
actions => [defined $opt{action} ?
|
||||
$opt{action} :
|
||||
actions => [defined $opt{action} ?
|
||||
$opt{action} :
|
||||
$opt{defaultact}],
|
||||
waitargcounts => [0],
|
||||
pending_out => [],
|
||||
@ -675,7 +675,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
sub pushwait { # 0: text object, 1: token, 2: ????
|
||||
push(@{ $_[0]->{starttoken} }, $_[1]);
|
||||
push(@{ $_[0]->{waitfors} }, $_[0]->{tokens}{$_[1]->[0]}{waitfor});
|
||||
push(@{ $_[0]->{actions} },
|
||||
push(@{ $_[0]->{actions} },
|
||||
defined $_[2] ? $_[2] : $_[0]->{defaultacts}[-1]);
|
||||
push(@{ $_[0]->{waitforactions} }, $_[3]);
|
||||
push(@{ $_[0]->{synthetic} }, []);
|
||||
@ -703,7 +703,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
my $rest = $ { $_[0]->{synthetic} }[-1];
|
||||
if (@$rest) {
|
||||
push @{ $_[0]->{pending_out} }, reverse @{ pop @$rest };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sub pushsynthetic { # Add new list of events to do *after* the
|
||||
@ -739,7 +739,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
sub curwait {
|
||||
# return what we're currently waiting for. Returns undef if not waiting
|
||||
@ -769,7 +769,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
warn "No optional argument found";
|
||||
if ($comment) {new Text::TeX::Token undef, $comment}
|
||||
else {undef}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# eat {blah} when it's an argument to a BegArgsToken.
|
||||
@ -795,7 +795,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
warn "String `$str' expected, not found";
|
||||
if ($comment) {new Text::TeX::Token undef, $comment}
|
||||
else {undef}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Eat '{blah}'. Braces aren't returned. Stuff is returned as a Group,
|
||||
@ -814,7 +814,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
my ($count,$in,@in) = (1);
|
||||
EAT:
|
||||
{
|
||||
warn "Unfinished balanced next", last EAT
|
||||
warn "Unfinished balanced next", last EAT
|
||||
unless defined ($in = $txt->eatMultiToken) && defined $in->[0];
|
||||
push(@in,$in);
|
||||
$count++,redo if $in->[0] eq '{';
|
||||
@ -854,7 +854,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
}
|
||||
|
||||
sub eatUntil { # We suppose that the text to match
|
||||
# fits in a paragraph
|
||||
# fits in a paragraph
|
||||
my $txt = shift;
|
||||
my $m = shift;
|
||||
my ($in,@in);
|
||||
@ -873,7 +873,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
my $in = $txt->paragraph;
|
||||
return '' unless $in; # To be able to match without warnings
|
||||
my $comment = undef;
|
||||
if ($$in =~
|
||||
if ($$in =~
|
||||
/^(?:\s*)(?:$Text::TeX::commentpattern)?($Text::TeX::tokenpattern)/o) {
|
||||
if (defined $2) {return $1} #if 1 usualtokenclass char, return it ($1==$2)
|
||||
elsif (defined $3) {return "\\$3"} # Multiletter (\[a-zA-Z]+)
|
||||
@ -881,7 +881,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
|
||||
# This is the main subroutine for eating a token.
|
||||
# It returns a token as either TT::Text or TT::Token.
|
||||
# Or it returns TT::Paragraph if it had to read a new paragraph in the TeX file.
|
||||
@ -934,7 +934,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
my $out = pop @{ $txt->{pending_out} };
|
||||
# E.g., if you have x^\sqrt2 -- when you pop and return the \sqrt
|
||||
# EndArgsToken, you need to make sure the ^ EndArgsToken falls out next.
|
||||
# But if pending_out is an ArgToken, *don't* pop the next thing
|
||||
# But if pending_out is an ArgToken, *don't* pop the next thing
|
||||
# (next ArgToken or EndArgsToken) out of synthetic yet
|
||||
# Most often, synthetic will be empty, so popsynthetic will do nothing
|
||||
$txt->popsynthetic if ref($out) eq 'Text::TeX::EndArgsToken';
|
||||
@ -947,7 +947,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
# token needs to be eaten in
|
||||
# the style `multi', like \left.
|
||||
# Put it at beginning of pending_in so we do E.g., EndLocals first
|
||||
splice @{ $txt->{pending_in} },
|
||||
splice @{ $txt->{pending_in} },
|
||||
0, 0, (bless \$in, 'Text::TeX::LookedAhead');
|
||||
return $out;
|
||||
} else {
|
||||
@ -965,7 +965,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
if (defined $in) {
|
||||
# after_lookahead is true if we got a LookedAhead token from pending_out
|
||||
# because we looked ahead when there was a LookAhead token
|
||||
$in = $$in, $after_lookahead = 1
|
||||
$in = $$in, $after_lookahead = 1
|
||||
if ref $in eq 'Text::TeX::LookedAhead';
|
||||
} else {
|
||||
my $one;
|
||||
@ -982,7 +982,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
$in->digest($txt);
|
||||
my ($Token, $type, @arr);
|
||||
unless (defined $in
|
||||
&& defined $in->[0]
|
||||
&& defined $in->[0]
|
||||
&& $in->[0] =~ /$Text::TeX::active/o
|
||||
&& defined ( $Token = $txt->{tokens}->{$in->[0]} )
|
||||
&& exists ($Token->{"Type"})
|
||||
@ -1012,7 +1012,7 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
$txt->pushsynthetic(new Text::TeX::LookAhead [$in, $count, $res]);
|
||||
} else {
|
||||
# This will fall out after we read all the args this token needs
|
||||
$txt->pushsynthetic(new Text::TeX::EndArgsToken [$in, $count]);
|
||||
$txt->pushsynthetic(new Text::TeX::EndArgsToken [$in, $count]);
|
||||
}
|
||||
# One of these tokens will fall out after we finish each arg (except last)
|
||||
# Push on 3,2,1, so that when we *popsynthetic*, 1 will come off first
|
||||
@ -1028,11 +1028,11 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
$out = new Text::TeX::BegArgsToken [$in, $count];
|
||||
}
|
||||
} else {
|
||||
warn "Format of token data unknown for `", $in->[0], "'";
|
||||
warn "Format of token data unknown for `", $in->[0], "'";
|
||||
}
|
||||
return $out;
|
||||
}
|
||||
|
||||
|
||||
sub report_arg {
|
||||
my $n = shift;
|
||||
my $max = shift;
|
||||
@ -1048,15 +1048,15 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
sub eatDefine {
|
||||
my $txt = shift;
|
||||
my ($args, $body);
|
||||
warn "No `{' found after defin", return undef
|
||||
warn "No `{' found after defin", return undef
|
||||
unless $args = $txt->eatUntil('{');
|
||||
warn "Argument list @$args too complicated", return undef
|
||||
warn "Argument list @$args too complicated", return undef
|
||||
unless @$args == 1 && $$args[0] =~ /^(\ \#\d)*$/;
|
||||
warn "No `}' found after defin", return undef
|
||||
warn "No `}' found after defin", return undef
|
||||
unless $body = $txt->eatBalancedRest;
|
||||
#my @args=split(/(\#[\d\#])/,$$); # lipa
|
||||
}
|
||||
|
||||
|
||||
# This is the main subroutine called by parsing programs. Basically, it
|
||||
# keeps eating tokens, then calling $txt->actions on that token
|
||||
sub process {
|
||||
@ -1080,10 +1080,10 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
'}' => {'class' => 'Text::TeX::End::Group'},
|
||||
"\$" => {'class' => 'Text::TeX::SelfMatch', waitfor => "\$"},
|
||||
'$$' => {'class' => 'Text::TeX::SelfMatch', waitfor => '$$'},
|
||||
'\begin' => {class => 'Text::TeX::Begin::Group::Args',
|
||||
'\begin' => {class => 'Text::TeX::Begin::Group::Args',
|
||||
eatargs => 1, 'waitfor' => '\end', selfmatch => 1},
|
||||
'\end' => {class => 'Text::TeX::End::Group::Args', eatargs => 1, selfmatch => 1},
|
||||
'\left' => {class => 'Text::TeX::Begin::Group::Args',
|
||||
'\left' => {class => 'Text::TeX::Begin::Group::Args',
|
||||
eatargs => 1, 'waitfor' => '\right'},
|
||||
'\right' => {class => 'Text::TeX::End::Group::Args', eatargs => 1},
|
||||
'\frac' => {Type => 'report_args', count => 2},
|
||||
@ -1091,9 +1091,9 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
'\text' => {Type => 'report_args', count => 1},
|
||||
'\operatorname' => {Type => 'report_args', count => 1},
|
||||
'\operatornamewithlimits' => {Type => 'report_args', count => 1},
|
||||
'^' => {Type => 'report_args', count => 1,
|
||||
'^' => {Type => 'report_args', count => 1,
|
||||
lookahead => \%super_sub_lookahead },
|
||||
'_' => {Type => 'report_args', count => 1,
|
||||
'_' => {Type => 'report_args', count => 1,
|
||||
lookahead => \%super_sub_lookahead },
|
||||
'\em' => {Type => 'local'},
|
||||
'\bold' => {Type => 'local'},
|
||||
@ -1118,12 +1118,12 @@ for (qw(Text::TeX::ArgToken Text::TeX::BegArgsToken Text::TeX::EndArgsToken )) {
|
||||
(undef) x 8,
|
||||
(undef) x 8, # 4th: numbers and symbols
|
||||
(undef) x 8,
|
||||
'\???', ( map {"\\$_"}
|
||||
qw(Alpha Beta Chi Delta Epsilon Phi Gamma
|
||||
Eta Iota vartheta Kappa Lambda Mu Nu Omicron
|
||||
'\???', ( map {"\\$_"}
|
||||
qw(Alpha Beta Chi Delta Epsilon Phi Gamma
|
||||
Eta Iota vartheta Kappa Lambda Mu Nu Omicron
|
||||
Pi Theta Rho Sigma Tau Ypsilon varsigma Omega
|
||||
Xi Psi Zeta)), undef, '\therefore', undef, '\perp', undef,
|
||||
undef, ( map {"\\$_"}
|
||||
undef, ( map {"\\$_"}
|
||||
qw(alpha beta chi delta varepsilon phi gamma
|
||||
eta iota varphi kappa lambda mu nu omicron
|
||||
pi theta rho sigma tau ypsilon varpi omega
|
||||
@ -1409,7 +1409,7 @@ undone at the end of enclosing block. At the end of the block an
|
||||
output event C<Text::TeX::EndLocal> is delivered, with C<$token->[0]>
|
||||
being the output token for the I<local> event starting.
|
||||
|
||||
Useful for font switching.
|
||||
Useful for font switching.
|
||||
|
||||
=back
|
||||
|
||||
|
||||
@ -1,9 +1,14 @@
|
||||
.rn '' }`
|
||||
''' $RCSfile: manpage.3pm,v $$Revision: 1.1 $$Date: 1999/09/27 18:44:35 $
|
||||
''' $RCSfile: manpage.3pm,v $$Revision: 1.2 $$Date: 2004/10/28 14:35:19 $
|
||||
'''
|
||||
''' $Log: manpage.3pm,v $
|
||||
''' Revision 1.1 1999/09/27 18:44:35 larsbj
|
||||
''' Initial revision
|
||||
''' Revision 1.2 2004/10/28 14:35:19 leeming
|
||||
''' Whitespace, only whitespace. Part II.
|
||||
'''
|
||||
''' Revision 1.1.1.1 1999/09/27 18:44:35 larsbj
|
||||
''' This is the new LyX development branch, it is based upon version
|
||||
''' 1.0.4pre8 and will from now on be used for both development and stable branches.
|
||||
'''
|
||||
'''
|
||||
''' Revision 1.1.1.1 1998/04/20 21:14:36 larsbj
|
||||
''' repository moved due to corrupted repository on other machine
|
||||
@ -77,9 +82,9 @@
|
||||
'br\}
|
||||
.\" If the F register is turned on, we'll generate
|
||||
.\" index entries out stderr for the following things:
|
||||
.\" TH Title
|
||||
.\" TH Title
|
||||
.\" SH Header
|
||||
.\" Sh Subsection
|
||||
.\" Sh Subsection
|
||||
.\" Ip Item
|
||||
.\" X<> Xref (embedded
|
||||
.\" Of course, you have to process the output yourself
|
||||
@ -297,7 +302,7 @@ undone at the end of enclosing block. At the end of the block an
|
||||
output event \f(CWText::TeX::EndLocal\fR is delivered, with \f(CW$token-\fR[0]>
|
||||
being the output token for the \fIlocal\fR event starting.
|
||||
.Sp
|
||||
Useful for font switching.
|
||||
Useful for font switching.
|
||||
.PP
|
||||
Some additional keys may be recognized by the code for the particular
|
||||
\f(CWclass\fR.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
####################### VERBATIM COPYING SUBROUTINES ########################
|
||||
# This file is part of reLyX.
|
||||
# This file is part of reLyX.
|
||||
# Copyright (c) 1998-9 Amir Karger karger@post.harvard.edu
|
||||
# You are free to use and modify this code under the terms of
|
||||
# the GNU General Public Licence version 2 or later.
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
scriptversion=2003-09-02.23
|
||||
|
||||
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
|
||||
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
|
||||
# Free Software Foundation, Inc.
|
||||
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
||||
|
||||
|
||||
@ -1,7 +1,10 @@
|
||||
.rn '' }`
|
||||
''' $RCSfile: reLyX.man,v $$Revision: 1.3 $$Date: 2002/10/28 09:52:39 $
|
||||
''' $RCSfile: reLyX.man,v $$Revision: 1.4 $$Date: 2004/10/28 14:35:19 $
|
||||
'''
|
||||
''' $Log: reLyX.man,v $
|
||||
''' Revision 1.4 2004/10/28 14:35:19 leeming
|
||||
''' Whitespace, only whitespace. Part II.
|
||||
'''
|
||||
''' Revision 1.3 2002/10/28 09:52:39 poenitz
|
||||
''' the relyx changes
|
||||
'''
|
||||
@ -85,9 +88,9 @@
|
||||
'br\}
|
||||
.\" If the F register is turned on, we'll generate
|
||||
.\" index entries out stderr for the following things:
|
||||
.\" TH Title
|
||||
.\" TH Title
|
||||
.\" SH Header
|
||||
.\" Sh Subsection
|
||||
.\" Sh Subsection
|
||||
.\" Ip Item
|
||||
.\" X<> Xref (embedded
|
||||
.\" Of course, you have to process the output yourself
|
||||
@ -290,14 +293,14 @@ Run \fBreLyX\fR.
|
||||
.Sp
|
||||
\fBreLyX\fR will inform you of its progress and give any warnings to stderr, so if
|
||||
you don't want any output at all, try (in csh) \*(L'reLyX foo.tex >& /dev/null\*(R'.
|
||||
You should \s-1NOT\s0 redirect standard output to \fIfoo.lyx\fR.
|
||||
You should \s-1NOT\s0 redirect standard output to \fIfoo.lyx\fR.
|
||||
.Ip "\(bu" 4
|
||||
Run LyX (version 0.12 or 1.0 or later) on the resulting .lyx file.
|
||||
.Sp
|
||||
In theory, most of the file will have been translated, and anything that's
|
||||
untranslatable will be highlighted in red (TeX mode). In theory, LyX will be
|
||||
able to read in the file, and to create printed documents from it, because all
|
||||
that untranslated red stuff will be passed directly back to LaTeX, which LyX
|
||||
that untranslated red stuff will be passed directly back to LaTeX, which LyX
|
||||
uses as a backend. Unfortunately, reality doesn't always reflect theory. If
|
||||
\fBreLyX\fR crashes, or LyX cannot read the generated LyX file, see the \f(CWBUGS\fR entry elsewhere in this document or the \fI\s-1BUGS\s0\fR file.
|
||||
.Ip "\(bu" 4
|
||||
@ -363,14 +366,14 @@ thebibliography environment and \f(CW\ebibitem\fR command, as well as BibTeX's
|
||||
.Ip "\(bu" 4
|
||||
miscellaneous commands: \f(CW\ehfill\fR, \f(CW\e\fR\f(CW\e\fR, \f(CW\enoindent\fR, \f(CW\eldots\fR...
|
||||
.Ip "\(bu" 4
|
||||
documentclass-specific environments (and some commands) which can be
|
||||
documentclass-specific environments (and some commands) which can be
|
||||
translated to LyX layouts
|
||||
.Ip "\(bu" 4
|
||||
arguments to certain untranslatable commands (e.g. \f(CW\embox\fR)
|
||||
.PP
|
||||
Some of this support may not be 100% yet. See below for details
|
||||
.PP
|
||||
\fBreLyX\fR copies math (almost) verbatim from your LaTeX file. Luckily, LyX reads
|
||||
\fBreLyX\fR copies math (almost) verbatim from your LaTeX file. Luckily, LyX reads
|
||||
in LaTeX math, so (almost) any math which is supported by LyX should work just
|
||||
fine. A few math commands which are not supported by LyX will be replaced with
|
||||
their equivalents, e.g., \f(CW\eto\fR is converted to \f(CW\erightarrow\fR. See
|
||||
@ -426,7 +429,7 @@ skip blocks.
|
||||
[one|two]side, landscape, and [one|two]column.) Other options are placed in
|
||||
the \*(L"options\*(R" field in the Layout->Document popup.
|
||||
.Sp
|
||||
More importantly, \fBreLyX\fR doesn't translate \f(CW\eusepackage\fR commands, margin
|
||||
More importantly, \fBreLyX\fR doesn't translate \f(CW\eusepackage\fR commands, margin
|
||||
commands, \f(CW\enewcommands\fR, or, in fact, anything else from the preamble. It
|
||||
simply copies them into the LaTeX preamble. If you have margin commands in
|
||||
your preamble, then the LyX file will generate the right margins. However,
|
||||
|
||||
@ -140,7 +140,7 @@ Run B<reLyX>.
|
||||
|
||||
B<reLyX> will inform you of its progress and give any warnings to stderr, so if
|
||||
you don't want any output at all, try (in csh) 'reLyX foo.tex >& /dev/null'.
|
||||
You should NOT redirect standard output to F<foo.lyx>.
|
||||
You should NOT redirect standard output to F<foo.lyx>.
|
||||
|
||||
=item *
|
||||
|
||||
@ -149,7 +149,7 @@ Run LyX (version 0.12 or 1.0 or later) on the resulting .lyx file.
|
||||
In theory, most of the file will have been translated, and anything that's
|
||||
untranslatable will be highlighted in red (TeX mode). In theory, LyX will be
|
||||
able to read in the file, and to create printed documents from it, because all
|
||||
that untranslated red stuff will be passed directly back to LaTeX, which LyX
|
||||
that untranslated red stuff will be passed directly back to LaTeX, which LyX
|
||||
uses as a backend. Unfortunately, reality doesn't always reflect theory. If
|
||||
B<reLyX> crashes, or LyX cannot read the generated LyX file, see L</BUGS>,
|
||||
or the F<BUGS> file.
|
||||
@ -222,7 +222,7 @@ C<\footnote> and C<\margin>
|
||||
font-changing commands including C<\em>, C<\emph>, C<\textit>, and
|
||||
corresponding commands to change family, size, series, and shape
|
||||
|
||||
=item *
|
||||
=item *
|
||||
|
||||
C<\input{foo}> (or C<\input{foo.blah}>) and C<\include{foo}>. Plain TeX
|
||||
C<\input> command "C<\input foo.tex>" is also supported.
|
||||
@ -256,7 +256,7 @@ miscellaneous commands: C<\hfill>, C<\>C<\>, C<\noindent>, C<\ldots>...
|
||||
|
||||
=item *
|
||||
|
||||
documentclass-specific environments (and some commands) which can be
|
||||
documentclass-specific environments (and some commands) which can be
|
||||
translated to LyX layouts
|
||||
|
||||
=item *
|
||||
@ -267,7 +267,7 @@ arguments to certain untranslatable commands (e.g. C<\mbox>)
|
||||
|
||||
Some of this support may not be 100% yet. See below for details
|
||||
|
||||
B<reLyX> copies math (almost) verbatim from your LaTeX file. Luckily, LyX reads
|
||||
B<reLyX> copies math (almost) verbatim from your LaTeX file. Luckily, LyX reads
|
||||
in LaTeX math, so (almost) any math which is supported by LyX should work just
|
||||
fine. A few math commands which are not supported by LyX will be replaced with
|
||||
their equivalents, e.g., C<\to> is converted to C<\rightarrow>. See
|
||||
@ -348,7 +348,7 @@ B<reLyX> translates only a few options to the C<\documentclass> command.
|
||||
[one|two]side, landscape, and [one|two]column.) Other options are placed in
|
||||
the "options" field in the Layout->Document popup.
|
||||
|
||||
More importantly, B<reLyX> doesn't translate C<\usepackage> commands, margin
|
||||
More importantly, B<reLyX> doesn't translate C<\usepackage> commands, margin
|
||||
commands, C<\newcommands>, or, in fact, anything else from the preamble. It
|
||||
simply copies them into the LaTeX preamble. If you have margin commands in
|
||||
your preamble, then the LyX file will generate the right margins. However,
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
#
|
||||
# This code usually gets called by the reLyX wrapper executable
|
||||
#
|
||||
# $Id: reLyXmain.pl,v 1.5 2003/01/20 19:38:50 jamatos Exp $
|
||||
# $Id: reLyXmain.pl,v 1.6 2004/10/28 14:35:19 leeming Exp $
|
||||
#
|
||||
|
||||
require 5.002; # Perl 5.001 doesn't work. Perl 4 REALLY doesn't work.
|
||||
@ -50,7 +50,7 @@ if (!defined($lyxdir)) {$lyxdir = "/usr/local/share/lyx"}
|
||||
if (!defined($lyxname)) {$lyxname = "lyx"}
|
||||
# there's a use vars in the wrapper, so we only need these if running w/out it
|
||||
use vars qw($lyxdir $lyxname);
|
||||
|
||||
|
||||
# variables that a user might want to change
|
||||
@Suffix_List = '\.(ltx|latex|tex)'; # allowed suffixes for LaTeX file
|
||||
$LyXFormat = "2.15"; #What to print in \lyxformat command in .lyx file
|
||||
@ -65,7 +65,7 @@ BEGIN{$Success = 0}
|
||||
#
|
||||
|
||||
# Print welcome message including version info
|
||||
my $version_info = '$Date: 2003/01/20 19:38:50 $'; # RCS puts checkin date here
|
||||
my $version_info = '$Date: 2004/10/28 14:35:19 $'; # RCS puts checkin date here
|
||||
$version_info =~ s&.*?(\d+/\d+/\d+).*&$1&; # take out just the date info
|
||||
warn "reLyX, the LaTeX to LyX translator. Revision date $version_info\n\n";
|
||||
|
||||
@ -342,7 +342,7 @@ sub abs_file_name {
|
||||
my ($basename, $path, $suffix) = fileparse($File, @Suffix_List);
|
||||
my $realpath = &my_fast_abs_path($path);
|
||||
# add / at end
|
||||
$realpath .= '/' unless $realpath =~ /\/$/;
|
||||
$realpath .= '/' unless $realpath =~ /\/$/;
|
||||
my $name = "$realpath$basename$suffix";
|
||||
return $name;
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
% The first thing listed here is commands that are hard-coded into reLyX.
|
||||
% Redefining these commands in a new syntax file will probably not help%
|
||||
% and may break things.
|
||||
% and may break things.
|
||||
\#
|
||||
\$
|
||||
\%
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
%% This is file `broadway.cls', which provides a format for writing
|
||||
%% plays.
|
||||
%% Derived from report.cls. There is probably still a lot of stuff
|
||||
%% that could be deleted.
|
||||
%% that could be deleted.
|
||||
\NeedsTeXFormat{LaTeX2e}
|
||||
\ProvidesClass{broadway} [1999/02/09 v1.0 uses broadway.layout]
|
||||
\renewcommand{\ref}[1]{#1}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
%%%% This is the cv document class, intended to provide a simple way
|
||||
%%%% to write your curriculum vitaes (resume)
|
||||
%%%% Author: Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr)
|
||||
%%%% Author: Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr)
|
||||
%%%% (with lot of help from Amir Karger <karger@bead.aecom.yu.edu>,
|
||||
%%%% Reuben Thomas <rrt@dcs.gla.ac.uk>
|
||||
%%%% and Dekel Tsur <dekelts@tau.ac.il>)
|
||||
@ -14,33 +14,33 @@
|
||||
%% the first page
|
||||
%% \title{text} : defines a title, will will appear centered below the
|
||||
%% headers (or above, if the `titleabove' option is used)
|
||||
%% \maketitle: actually typesets the header.
|
||||
%% \maketitle: actually typesets the header.
|
||||
%%
|
||||
%% \section{text} : gives a title for a new topic of the CV.
|
||||
%% \section{text} : gives a title for a new topic of the CV.
|
||||
%%
|
||||
%% `topic' environment: begins an itemize-like environment where the
|
||||
%% argument of \item[] is typeset in font \itemfont. A line break is
|
||||
%% automatically inserted if the label is too long to fit in the
|
||||
%% margin (this can be controlled by option `notopicbreak').
|
||||
%% margin (this can be controlled by option `notopicbreak').
|
||||
%%
|
||||
%% The cv document class also has some support for bibliography.
|
||||
%% The cv document class also has some support for bibliography.
|
||||
%% You can use the `thebibliography' environment as usual, in
|
||||
%% particular wih BibTeX . The output is similar to the `topic'
|
||||
%% particular wih BibTeX . The output is similar to the `topic'
|
||||
%% environment. If you separate your bibliography into several
|
||||
%% sections, you may want to use the `contbibnum' document class
|
||||
%% option.
|
||||
%% option.
|
||||
%%
|
||||
%% Note that this class also has support for right-to-left languages,
|
||||
%% such as hebrew (courtesy Dekel Tsur).
|
||||
%%
|
||||
%% The document class accepts some options (along with the usual
|
||||
%% article.cls options):
|
||||
%% article.cls options):
|
||||
%% sf (default) produce title and headers in sans serif fonts
|
||||
%% plain produce all output in roman fonts.
|
||||
%% plain produce all output in roman fonts.
|
||||
%% notopicbreak do not add a line break after longtopic labels.
|
||||
%% contbibnum let the numbering of bibliography items be
|
||||
%% continuous when there are several thebibliography
|
||||
%% environments
|
||||
%% environments
|
||||
%% titleabove output the title above the left and right headers,
|
||||
%% not below
|
||||
%%
|
||||
@ -54,7 +54,7 @@
|
||||
%% \sectionfont: the font used by \section when beginning a new topic.
|
||||
%% Defaults to sans-serif semi bold condensed.
|
||||
%% \subsectionfont: the font used by \subsection when beginning a new
|
||||
%% topic.
|
||||
%% topic.
|
||||
%% Defaults to sans-serif semi bold condensed.
|
||||
%% \itemfont: the font used in descriptions of items.
|
||||
%% Defaults to sans-serif slanted.
|
||||
@ -68,11 +68,11 @@
|
||||
%% - 1.1 1998/11/06: Better documentation, in order to release it for
|
||||
%% LyX ,added \refname, disabled all sectionning commands other that
|
||||
%% \section, disabled numbering of sections.
|
||||
%% - 1.2 1998/12/01:
|
||||
%% - 1.2 1998/12/01:
|
||||
%% * Refined the algorithm to display the headers. In
|
||||
%% particular, \leftheader and \rightheader do not exist
|
||||
%% anymore.
|
||||
%% * Changed the justification of items labels
|
||||
%% anymore.
|
||||
%% * Changed the justification of items labels
|
||||
%% [Thanks to Amir Karger <karger@bead.aecom.yu.edu> for the two
|
||||
%% changes above]
|
||||
%% * Added command \title
|
||||
@ -86,7 +86,7 @@
|
||||
%% [Thanks to Reuben Thomas for the idea]
|
||||
%% * Added support for subsections (with associated font command
|
||||
%% \subsectionfont).
|
||||
%% * Added class options `sf' and `plain'.
|
||||
%% * Added class options `sf' and `plain'.
|
||||
%% - 1.4 2001/05/04
|
||||
%% * Added `notopicbreak' class option.
|
||||
%% - 1.5 2001/06/18
|
||||
@ -98,8 +98,8 @@
|
||||
|
||||
|
||||
%% Basic definition to have a real LaTeX document class
|
||||
\NeedsTeXFormat{LaTeX2e}
|
||||
\ProvidesClass{cv}[2001/06/18 Curriculum vitae version 1.5]
|
||||
\NeedsTeXFormat{LaTeX2e}
|
||||
\ProvidesClass{cv}[2001/06/18 Curriculum vitae version 1.5]
|
||||
|
||||
%% The fonts used in the layout
|
||||
\newcommand{\sectionfont}[1]{\def\cv@sec@fnt{#1}}
|
||||
@ -182,7 +182,7 @@
|
||||
{-3.5ex \@plus -1ex \@minus -.2ex}
|
||||
{2.3ex \@plus .2ex}{\cv@ssec@fnt}}
|
||||
% the other ones do not exist.
|
||||
\let\subsubsection=\relax
|
||||
\let\subsubsection=\relax
|
||||
\let\paragraph=\relax \let\subparagraph=\relax
|
||||
% we do not want any numbering
|
||||
\setcounter{secnumdepth}{0}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
%% preferred format for submission of "spec" scripts
|
||||
%% It is a pretty dull and uninteresting format, but it sells
|
||||
%% Derived from report.cls. There is probably still a lot of stuff
|
||||
%% that could be deleted.
|
||||
%% that could be deleted.
|
||||
\NeedsTeXFormat{LaTeX2e}
|
||||
\ProvidesClass{hollywood} [2001/9/10 v1.2 uses hollywood.layout]
|
||||
\usepackage{fancyhdr}
|
||||
@ -177,7 +177,7 @@
|
||||
\newlength{\bmargin}%
|
||||
\setlength{\bmargin}{.75in}%
|
||||
\setlength{\textheight}%
|
||||
{\paperheight -\bmargin -\topmargin -\headheight -\headsep }%
|
||||
{\paperheight -\bmargin -\topmargin -\headheight -\headsep }%
|
||||
|
||||
|
||||
%%\pagestyle{fancy}
|
||||
@ -208,7 +208,7 @@
|
||||
{\filbreak
|
||||
\vspace{\lnspace}
|
||||
\raggedright
|
||||
\par INT.
|
||||
\par INT.
|
||||
\uppercase{#1}
|
||||
}%
|
||||
|
||||
@ -216,7 +216,7 @@
|
||||
{\filbreak
|
||||
\vspace{\lnspace}
|
||||
\raggedright
|
||||
\par EXT.
|
||||
\par EXT.
|
||||
\uppercase{#1}
|
||||
\vspace{\lnspace}
|
||||
}%
|
||||
@ -225,7 +225,7 @@
|
||||
{\filbreak
|
||||
\vspace{4bp}
|
||||
\raggedright
|
||||
\par
|
||||
\par
|
||||
\uppercase{#1}
|
||||
}%
|
||||
\newlength{\dialogLength}
|
||||
|
||||
@ -25,14 +25,14 @@
|
||||
% Version: 1.1 (17 Nov 1990)
|
||||
% Improvements over version 1.0:
|
||||
% -TeX code cleaned up (thanks to TeX-wizzard Victor Eijkhout)
|
||||
% -moving a King does not generate a castling move when this
|
||||
% -moving a King does not generate a castling move when this
|
||||
% King already moved
|
||||
% -renamed internal macro `\\' because LaTeX uses that
|
||||
% -better hooks for foreign languages (look for lines marked with
|
||||
% %%FOREIGN%%)
|
||||
% Torture test:
|
||||
% If you change something in the chess.sty style check if everything
|
||||
% else is still working with torture-test.ltx (LaTeX) or
|
||||
% If you change something in the chess.sty style check if everything
|
||||
% else is still working with torture-test.ltx (LaTeX) or
|
||||
% torture-test.tex (plain TeX).
|
||||
% Known problems:
|
||||
% -The analysis mode can not be used within arguments of macros
|
||||
@ -163,7 +163,7 @@
|
||||
}
|
||||
|
||||
%
|
||||
% The next part defines a user friendly notation for chess moves.
|
||||
% The next part defines a user friendly notation for chess moves.
|
||||
% Some examples: |21. Nf3-e5, Ke8*f8 22. 0-0-0+, Bh8*a1|
|
||||
% : |21.: Ke8*f8 22. Bh8*a1, 0-0|
|
||||
% : |21 Nfe5 K*f8 22 0-0-0! B*a1|
|
||||
@ -221,7 +221,7 @@
|
||||
\define@Black@pieces{r}{d}{t}{f}{c}{p}}
|
||||
% Define here your language and choose an unique set of uppercase letters
|
||||
% for the White pieces (KING, QUEEN, etc.) and the corresponding lowercase
|
||||
% letters for the Black pieces (king, queen, etc.).
|
||||
% letters for the Black pieces (king, queen, etc.).
|
||||
% \ifcurrentlanguage{FOREIGN}{%
|
||||
% \define@White@pieces{KING}{QUEEN}{ROOK}{BISHOP}{KNIGHT}{PAWN}
|
||||
% \define@Black@pieces{king}{queen}{rook}{bishop}{knight}{pawn}}
|
||||
@ -248,7 +248,7 @@
|
||||
\gdef\@notation{\begingroup\let|=\endgroup\trigger@pieces}%
|
||||
%
|
||||
% Provide a `nochess' environment in which the `|' character becomes
|
||||
% inactive for situations where the `|' is already in use (like in
|
||||
% inactive for situations where the `|' is already in use (like in
|
||||
% the LaTeX `tabular' environment for example).
|
||||
%
|
||||
\gdef\nochess{\begingroup\let|=\relax\catcode`\|=12\relax
|
||||
@ -365,9 +365,9 @@
|
||||
\fi}
|
||||
|
||||
%
|
||||
% Promovendus: treat first char of argument as promotion piece if queen,
|
||||
% Promovendus: treat first char of argument as promotion piece if queen,
|
||||
% rook, knight or bishop; otherwise consider it as comment and take queen
|
||||
% as default promotion. Leave in \PROM White promoting piece (Q|R|B|N)
|
||||
% as default promotion. Leave in \PROM White promoting piece (Q|R|B|N)
|
||||
% and in \prom Black's version (q|r|b|n).
|
||||
%
|
||||
|
||||
@ -487,7 +487,7 @@
|
||||
% If you add symbols realize that the macros should be usable by plain TeX
|
||||
% and LaTeX and that the (La)TeX names should be suggestive and clear!
|
||||
% But don't use uppercase letters or existing names (center)!
|
||||
% Thanks go to John Saba (saba@ccit.arizona.edu) and Henry Thomas
|
||||
% Thanks go to John Saba (saba@ccit.arizona.edu) and Henry Thomas
|
||||
% (hthomas@irisa.fr) for their help in defining next symbols.
|
||||
\font\symbolten=cmsy10 \font\smrm=cmr6 \font\symbolsix=cmsy6
|
||||
\def\wbetter{\mbox{\baselineskip0pt$\vcenter{\vbox{\hbox{+}\hbox{=}}}$}}
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
\def\MemberA#1#2#3#4%
|
||||
{#1{#2}{#3}%
|
||||
{\True}%
|
||||
{\Member{#1}{#2}{#4}}}
|
||||
{\Member{#1}{#2}{#4}}}
|
||||
|
||||
% Explode: string -> char list
|
||||
\def\Explode#1{\EqStr{Z}{#1}{\Nil}{\ExplodeA#1Z}}
|
||||
@ -53,7 +53,7 @@
|
||||
#1{True}{False}}
|
||||
|
||||
% the basic manipulation of the board
|
||||
\def\Set#1#2{% square -> piece -> unit
|
||||
\def\Set#1#2{% square -> piece -> unit
|
||||
\expandafter\xdef\csname#1\endcsname{#2}}
|
||||
\def\Get#1{% square -> piece
|
||||
\csname#1\endcsname}
|
||||
@ -197,19 +197,19 @@
|
||||
\edef\pst@arrowtable{\pst@arrowtable,<|-|>}
|
||||
\def\tx@ArrowTriangleA{ArrowTriangleA }
|
||||
\def\tx@ArrowTriangleB{ArrowTriangleB }
|
||||
\@namedef{psas@|>}{%
|
||||
/ArrowTriangleA { CLW dup 3.5 div SLW mul add dup 2 div /w ED mul dup
|
||||
/h ED mul /a ED
|
||||
0 h a sub moveto w h L 0 0 L w neg h L 0 h a sub L
|
||||
\@namedef{psas@|>}{%
|
||||
/ArrowTriangleA { CLW dup 3.5 div SLW mul add dup 2 div /w ED mul dup
|
||||
/h ED mul /a ED
|
||||
0 h a sub moveto w h L 0 0 L w neg h L 0 h a sub L
|
||||
gsave 1 setgray fill grestore gsave
|
||||
stroke grestore } def
|
||||
stroke grestore } def
|
||||
\psk@arrowinset \psk@arrowlength \psk@arrowsize
|
||||
\tx@ArrowTriangleA}
|
||||
\@namedef{psas@<|}{%
|
||||
/ArrowTriangle { CLW dup 2 div SLW mul add dup 2 div
|
||||
/w ED mul dup /h ED mul /a ED
|
||||
/ArrowTriangle { CLW dup 2 div SLW mul add dup 2 div
|
||||
/w ED mul dup /h ED mul /a ED
|
||||
{ 0 h T 1 -1 scale } if w neg h moveto 0 0 L w h L w neg a neg
|
||||
rlineto w neg a rlineto w 0 rmoveto gsave stroke grestore } def
|
||||
rlineto w neg a rlineto w 0 rmoveto gsave stroke grestore } def
|
||||
true \psk@arrowinset \psk@arrowlength \psk@arrowsize
|
||||
\tx@ArrowTriangleB}
|
||||
% end of PSTricks addon
|
||||
@ -217,11 +217,11 @@
|
||||
{}
|
||||
|
||||
\newcounter{ps@knightangle} \newcounter{ps@inverse}
|
||||
\def\printknightmove#1#2{%
|
||||
\def\printknightmove#1#2{%
|
||||
\setcounter{ps@knightangle}{\get@fileangle{\First#1}{\First#2}+%
|
||||
\get@rankangle{\Second#1}{\Second#2} + \value{ps@inverse}}%
|
||||
\ncdiagg[style=psskak,angleA=\arabic{ps@knightangle}]{-|>}{#1}{#2}}
|
||||
|
||||
|
||||
\def\printarrow#1#2{\ncline[style=psskak]{-|>}{#1}{#2}}
|
||||
|
||||
\def\ps@highlightsquare#1{%
|
||||
@ -281,7 +281,7 @@
|
||||
\def\PieceNames{%
|
||||
\Listize[\uc@king,\uc@queen,\uc@rook,\uc@bishop,\uc@knight]}}}
|
||||
|
||||
|
||||
|
||||
\def\showskaklanguage{%
|
||||
(\uc@king)(\uc@queen)(\uc@rook)(\uc@bishop)(\uc@knight)(\uc@pawn)}
|
||||
|
||||
@ -306,7 +306,7 @@
|
||||
{\EqStr{#1}{O}}
|
||||
|
||||
\def\File#1% file -> square list, eg. a -> [a1,a2,...,a8]
|
||||
{\Map{\Glue{#1}}{\RankNames}}
|
||||
{\Map{\Glue{#1}}{\RankNames}}
|
||||
\def\Rank#1% rank -> square list, eg. 1 -> [a1,b1,...,h1]
|
||||
{\Map{\Twiddle\Glue{#1}}{\FileNames}}
|
||||
|
||||
@ -314,7 +314,7 @@
|
||||
% Compose: ('b -> 'c) -> ('a -> 'b) -> ('a -> c')
|
||||
% Second: 'a -> 'b -> 'b
|
||||
% f: 'a -> unit
|
||||
% Compose Second f: 'a -> ('a -> 'b -> unit)
|
||||
% Compose Second f: 'a -> ('a -> 'b -> unit)
|
||||
% \def\Apply#1#2% ('a -> unit) -> ('a list -> unit)
|
||||
% {\Force{\Map{#1}{#2}}}
|
||||
% \def\Force#1{#1\ForceA{}}
|
||||
@ -357,7 +357,7 @@
|
||||
{\EqStr{1}{#1}%
|
||||
{E}%
|
||||
{#1}}}}}}}}}
|
||||
|
||||
|
||||
|
||||
\def\ParseFenRank#1{\ParseFenRankA(#1Z)}
|
||||
\def\ParseFenRankA(#1#2){%
|
||||
@ -386,7 +386,7 @@
|
||||
\def\SetRank#1#2{% rank -> fenrank -> unit
|
||||
\edef\pap{\ParseFenRank{#2}}%
|
||||
\expandafter\InitRank\pap#1}
|
||||
|
||||
|
||||
|
||||
\def\InitBoard(#1/#2/#3/#4/#5/#6/#7/#8){%
|
||||
\SetRank{8}{#1}%
|
||||
@ -742,7 +742,7 @@
|
||||
\def\StringToTokens#1%
|
||||
{\skak@ifthenelse{\equal{#1}{}}{\Nil}{\StrToTokens(#1 )}}
|
||||
\def\StrToTokens (#1 #2){%
|
||||
\EqStr{#1}{}%
|
||||
\EqStr{#1}{}%
|
||||
{\Nil}%
|
||||
\Cons{#1}{\EqStr{#2}{} {\Nil} {\StrToTokens(#2)}}}
|
||||
|
||||
@ -774,7 +774,7 @@
|
||||
\def\ParseMove#1{% string -> unit
|
||||
\ParseMoveA(#1)}
|
||||
|
||||
\def\ParseMoveA(#1#2){% char -> string -> unit
|
||||
\def\ParseMoveA(#1#2){% char -> string -> unit
|
||||
\IsPieceName{#1}%
|
||||
{\gdef\PieceNameToMove{\skak@pieceToEnglish{#1}}%
|
||||
\gdef\PieceToMove{\PieceNameToPiece{\PieceNameToMove}{\WhiteToMove}}%
|
||||
@ -809,7 +809,7 @@
|
||||
{\IsPromotion{#1}%
|
||||
{\def\Promotion{\True}%
|
||||
\gdef\PromotionPieceName{\skak@pieceToEnglish{\FirstChar(#2)}}}}%
|
||||
{}% no more information is of interest
|
||||
{}% no more information is of interest
|
||||
}}}}
|
||||
|
||||
% help for \ParseCastling
|
||||
@ -897,7 +897,7 @@
|
||||
|
||||
|
||||
% relies on the info gathered by ParseMove
|
||||
\def\FindPieceSquares#1#2{% bool -> square -> square list
|
||||
\def\FindPieceSquares#1#2{% bool -> square -> square list
|
||||
\EqPiece{\PieceNameToMove}{R}%
|
||||
{\ScanDirections%
|
||||
{\EqPiece{\PieceToMove}}{#2}{\Listize[up,down,left,right]}}%
|
||||
@ -1162,7 +1162,7 @@
|
||||
{\WhiteToMove%
|
||||
{\errmessage{mainline: white, not black, to move}}%
|
||||
{\MakeMove{#1}\gdef\NumberNext{\True}}}}}
|
||||
|
||||
|
||||
|
||||
\def\Mainline(#1 #2){%
|
||||
\EqStr{Z}{#1}%
|
||||
@ -1171,7 +1171,7 @@
|
||||
{\typeset@eatcomment#1#2WXWX}%
|
||||
{\NumberNext%
|
||||
{\EatNumber{#1}% sets \NumberOK, \ExpectedColour
|
||||
% executes a move not separated from the
|
||||
% executes a move not separated from the
|
||||
% number with a space, eg, 1.e4
|
||||
\NumberOK%
|
||||
{\gdef\NumberNext{\False}%
|
||||
@ -1264,7 +1264,7 @@
|
||||
|
||||
|
||||
\def\mainlinestyle{\bfseries}%\let\Fig=\Figb}% could also contain
|
||||
% definitions of the
|
||||
% definitions of the
|
||||
% various style options
|
||||
\def\variationstyle{}%\let\Fig=\Fign} % as with mainlinestyle
|
||||
|
||||
@ -1286,7 +1286,7 @@
|
||||
{\typeset@numberStripMove(#1)}}
|
||||
\def\typeset@numberStripMove(#1W){%
|
||||
\typeset@A@move{#1}}
|
||||
|
||||
|
||||
\def\typeset@A@move#1{%
|
||||
\TypeSetColour%
|
||||
{\beforewhite\mbox{\typeset@A@moveA(#1Z)}\gdef\TypeSetColour{\False}}%
|
||||
@ -1381,7 +1381,7 @@
|
||||
{\EqPiece{Q}{#1}{L}%
|
||||
{\EqPiece{q}{#1}{l}%
|
||||
{\EqPiece{K}{#1}{J}{j}}}}}}}}}}}}}
|
||||
|
||||
|
||||
\def\FilterShowOnly#1{% piece -> piece, shows only the pieces in
|
||||
% ShowOnlyList
|
||||
\Member{\EqStr}{#1}{\ShowOnlyList}%
|
||||
@ -1395,7 +1395,7 @@
|
||||
\ToggleWhiteSquare%
|
||||
% ps stuff
|
||||
\ps@on{\expandafter\pnode\ps@squarecenter{#1}}{}}
|
||||
|
||||
|
||||
\def\Showrank#1{% rank -> drawn rank
|
||||
\Skak\Apply{\Showchar}{\Rank{#1}}}
|
||||
|
||||
@ -1426,7 +1426,7 @@
|
||||
\def\show@board{%
|
||||
\def\WhiteSquare{\True}
|
||||
\vbox{\offinterlineskip
|
||||
\hrule height1pt
|
||||
\hrule height1pt
|
||||
\hbox{\vrule width1pt
|
||||
\vbox{\hbox{\Showrank{8}}\ToggleWhiteSquare
|
||||
\hbox{\Showrank{7}}\ToggleWhiteSquare
|
||||
@ -1490,7 +1490,7 @@
|
||||
\def\show@board@notation{%
|
||||
\def\WhiteSquare{\True}%
|
||||
\vbox{\offinterlineskip%
|
||||
\hrule height1pt
|
||||
\hrule height1pt
|
||||
\hbox{\ShowrankWithNumber{8}}\ToggleWhiteSquare
|
||||
\hbox{\ShowrankWithNumber{7}}\ToggleWhiteSquare
|
||||
\hbox{\ShowrankWithNumber{6}}\ToggleWhiteSquare
|
||||
@ -1513,7 +1513,7 @@
|
||||
\def\show@board@notation@inverse{%
|
||||
\def\WhiteSquare{\True}%
|
||||
\vbox{\offinterlineskip%
|
||||
\hrule height1pt
|
||||
\hrule height1pt
|
||||
\hbox{\ShowrankInverseWithNumber{1}}\ToggleWhiteSquare
|
||||
\hbox{\ShowrankInverseWithNumber{2}}\ToggleWhiteSquare
|
||||
\hbox{\ShowrankInverseWithNumber{3}}\ToggleWhiteSquare
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
%% revtex.sty is. Continue to use \documentstyle{revtex}
|
||||
%% (with the correct options) and REVTeX will run normally
|
||||
%% in compatibility mode. Thanks to David Carlisle for
|
||||
%% pointing out this fix.
|
||||
|
||||
\ifx\every@math@size\undefined\else
|
||||
%% pointing out this fix.
|
||||
|
||||
\ifx\every@math@size\undefined\else
|
||||
\let\old@expast\@expast
|
||||
\def\@expast#1{\old@expast{#1}\let\@tempa\reserved@a}
|
||||
\fi
|
||||
|
||||
@ -16,7 +16,7 @@ AC_DEFUN([gt_TYPE_INTMAX_T],
|
||||
AC_REQUIRE([jm_AC_HEADER_STDINT_H])
|
||||
AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
|
||||
[AC_TRY_COMPILE([
|
||||
#include <stddef.h>
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
#if HAVE_STDINT_H_WITH_UINTMAX
|
||||
#include <stdint.h>
|
||||
|
||||
@ -11,11 +11,11 @@ the procedure should be relatively easy:
|
||||
1) Getting ready
|
||||
|
||||
Get and install gettext (available from ftp://alpha.gnu.org). Read the
|
||||
documentation for gettext. Then get the latest LyX distribution including
|
||||
documentation for gettext. Then get the latest LyX distribution including
|
||||
patches, and unpack it in your home directory. It is yet better if you checkout
|
||||
the CVS version of LyX.
|
||||
Read the README in the LyX distribution.
|
||||
Check the mailing list archives to learn what is going on at the moment.
|
||||
Check the mailing list archives to learn what is going on at the moment.
|
||||
Consider subscribing to the developer's mailing list, lyx-devel@lists.lyx.org.
|
||||
|
||||
2) Preparing a patch
|
||||
@ -23,13 +23,13 @@ Consider subscribing to the developer's mailing list, lyx-devel@lists.lyx.org.
|
||||
Now do (where XX stands for the code of your language):
|
||||
|
||||
cp -R lyx-*.*.* lyx.new
|
||||
(Which makes a copy of the source distribution for
|
||||
(Which makes a copy of the source distribution for
|
||||
you to change, but you should work in a CVS workarea)
|
||||
cd lyx.new/po/
|
||||
|
||||
make XX.pox
|
||||
(It merges the po file into the temporary file XX.pox)
|
||||
emacs XX.pox
|
||||
emacs XX.pox
|
||||
(Using po-mode. Emacs is convenient for po editing, but not
|
||||
mandatory.)
|
||||
(Make all necessary changes in XX.pox, and save.)
|
||||
|
||||
4
po/de.po
4
po/de.po
@ -17,7 +17,7 @@
|
||||
# border -> Rahmen
|
||||
# branch -> Zweig
|
||||
# browse -> durchsuchen
|
||||
# button -> Knopf
|
||||
# button -> Knopf
|
||||
# caption -> Beschriftung (Jürgen S.)
|
||||
# command -> Befehl
|
||||
# convert(er) -> konvertieren / Konverter
|
||||
@ -62,7 +62,7 @@
|
||||
# toggle -> umschalten
|
||||
# tooltip -> Kurzinfo
|
||||
# type -> Art
|
||||
# view(er) -> ansehen / Ansicht / Betrachter
|
||||
# view(er) -> ansehen / Ansicht / Betrachter
|
||||
# wrap -> umflossenes Gleitobjekt
|
||||
#
|
||||
msgid ""
|
||||
|
||||
24
po/fr.po
24
po/fr.po
@ -5,25 +5,25 @@
|
||||
# Faucheux Olivier <olivier.faucheux@depinfo.enseeiht.fr> 2000
|
||||
#
|
||||
# Création initiale par Emmanuel GUREGHIAN
|
||||
# point en suspens et choix effectués:
|
||||
# point en suspens et choix effectués:
|
||||
# - utilisation du mot impossible pour unable et cannot : cela peut
|
||||
# induire en erreur entre ce que lyx ne PEUT pas faire et ce que lyx ne
|
||||
# VEUT pas faire.
|
||||
# - toggle traduit par (Dés)Activer ?
|
||||
# - quotes = guillemet
|
||||
# - quotes = guillemet
|
||||
# - emphasis=mise en évidence
|
||||
# - quelle différence entre noun et small caps ?
|
||||
# - quelle différence entre noun et small caps ?
|
||||
# -----------------------------------------------------------------------
|
||||
# Modifs :
|
||||
# - Sauver -> Enregistrer (à la Word)
|
||||
# car sauver c'est la sauvergarde d'urgence
|
||||
# - unification keymap = réaffectation clavier
|
||||
# - unification keymap = réaffectation clavier
|
||||
# - des espaces ont été ajoutés pour la taille de caractères
|
||||
# - Diminuer et augmenter ont de + été munis de <>
|
||||
# - noun = majuscules
|
||||
# - Small caps = petites capitales
|
||||
# ------------------------------------------------------------------------
|
||||
# revue de la messagerie par J.P. Chrétien (chretien@cert.fr) 8/12/99
|
||||
# revue de la messagerie par J.P. Chrétien (chretien@cert.fr) 8/12/99
|
||||
# fr.po cvs du 1/12/99, lyx.pot de lyx-1.1.3
|
||||
# - unable et cannot : remplacement des impossibilités par des interdictions
|
||||
# quand c'est l'utilisateur qui ne peut pas faire ce que LyX ne veut pas
|
||||
@ -32,9 +32,9 @@
|
||||
# espace avant :, ?, !
|
||||
# pas de majuscules dans le corps des messages
|
||||
# - modifications
|
||||
# Nouveau Fichier -> NouveauFichier
|
||||
# Nouveau Fichier -> NouveauFichier
|
||||
# Mise en garde -> Avertissement
|
||||
# Noun -> nom propre
|
||||
# Noun -> nom propre
|
||||
# Sans sérif -> sans empattement
|
||||
# Machine à écrire -> à chasse fixe
|
||||
# Roman(e) -> Romain(e)
|
||||
@ -57,7 +57,7 @@
|
||||
# lisible/illisible éditable/en lecture seule exécutable/non exécutable
|
||||
# pour un fichier
|
||||
# idem modifiable/non modifiable consultable/non
|
||||
# pour un répertoire
|
||||
# pour un répertoire
|
||||
#
|
||||
# marquer en fuzzzy pour transmettre un doute sur la traduction
|
||||
# n'est pas possible, les messages marqués de la sorte sont ignorés
|
||||
@ -91,9 +91,9 @@
|
||||
# -------------------------------------------------------------------------
|
||||
# EG 14 Juin 2000
|
||||
# Quelques corrections + que mineures
|
||||
# J'ai traduit Include par inclure et input par incorporer, en espérant
|
||||
# J'ai traduit Include par inclure et input par incorporer, en espérant
|
||||
# que la différence sémantique entre les 2 soit + forte que les 2 termes
|
||||
# anglais. Mais après réflexion je suis d'un avis mitigé.
|
||||
# anglais. Mais après réflexion je suis d'un avis mitigé.
|
||||
# -------------------------------------------------------------------------
|
||||
# JPC 20 Juin 2000
|
||||
# correction confusion entre One/Two de Pagination et One/Two de Colonnes
|
||||
@ -102,7 +102,7 @@
|
||||
# raccourcissement titre "Base de données" tronqué dans la fenêtre
|
||||
# -------------------------------------------------------------------------
|
||||
# JPC 3 dec 2000 version 1.1.6pre2
|
||||
# - patch de Angus Leeming
|
||||
# - patch de Angus Leeming
|
||||
# (corrigeant un certain nombre d'erreurs de raccourcis)
|
||||
# - correction des «fuzzzy» crées pas msgmerge -> ligne 1178
|
||||
# (les raccourcis menus sont totalement découplés des bindings, ce qui
|
||||
@ -122,7 +122,7 @@
|
||||
# Vus les fichiers ext_l10n.h et MenuBackend.C
|
||||
# ---------------------------------------------------------------------------
|
||||
# JPC + AR 17 avr 2001 version 1.1.6fix1
|
||||
# JPC : Revue des « fuzzzy » restants sur 42% du fichier
|
||||
# JPC : Revue des « fuzzzy » restants sur 42% du fichier
|
||||
# (traité 200 fuzzzy sur 513 + quelques traductions non encore faites
|
||||
# vues en passant)
|
||||
# Quelques interrogations:
|
||||
|
||||
4
po/he.po
4
po/he.po
@ -3,9 +3,9 @@
|
||||
# tzafrir Cohen <tzafrir@technion.ac.il>, 2000.
|
||||
#
|
||||
# I used visual hebrew. This means it is not done properly:
|
||||
# visual hebrew is fine for menus, but even in the forms it is
|
||||
# visual hebrew is fine for menus, but even in the forms it is
|
||||
# problematic. It is not a substitiute for real bidi support.
|
||||
# this one is not finished: the menus are done. The messages and forms
|
||||
# this one is not finished: the menus are done. The messages and forms
|
||||
# are partially done.
|
||||
#
|
||||
msgid ""
|
||||
|
||||
2
po/hu.po
2
po/hu.po
@ -1,5 +1,5 @@
|
||||
# legutolso átnézett sor:
|
||||
#
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: LyX 1.1.6fix1\n"
|
||||
|
||||
4
po/nl.po
4
po/nl.po
@ -1,8 +1,8 @@
|
||||
# Nederlandse meldingen voor LyX / Dutch LyX-localization
|
||||
# Copyright (C) 1997-2000 The LyX Team
|
||||
# Hacked by
|
||||
# Hacked by
|
||||
# Martin.Vermeer@fgi.fi first try
|
||||
# Bert Haverkamp (TU Delft) extensive vocabulary
|
||||
# Bert Haverkamp (TU Delft) extensive vocabulary
|
||||
# and style fixes
|
||||
# MV updates for 1.0
|
||||
# Ivo Timmermans <itimmermans@bigfoot.com>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#! /usr/bin/perl -w
|
||||
#! /usr/bin/perl -w
|
||||
|
||||
# file pocheck.pl
|
||||
#
|
||||
@ -11,8 +11,8 @@
|
||||
#
|
||||
# 1. Uniform translation of messages that are identical except
|
||||
# for capitalization, shortcuts, and shortcut notation.
|
||||
# 2. Usage of the following elements in both the original and
|
||||
# the translated message (or no usage at all):
|
||||
# 2. Usage of the following elements in both the original and
|
||||
# the translated message (or no usage at all):
|
||||
# shortcuts ("&" and "|..."), trailing space, trailing colon
|
||||
#
|
||||
# Invocation:
|
||||
@ -22,7 +22,7 @@ foreach $pofilename ( @ARGV )
|
||||
{
|
||||
print "Processing po file '$pofilename'...\n";
|
||||
|
||||
open( INPUT, "<$pofilename" )
|
||||
open( INPUT, "<$pofilename" )
|
||||
|| die "Cannot read po file '$pofilename'";
|
||||
@pofile = <INPUT>;
|
||||
close( INPUT );
|
||||
@ -31,9 +31,9 @@ foreach $pofilename ( @ARGV )
|
||||
keys( %trans ) = 10000;
|
||||
|
||||
$noOfLines = $#pofile;
|
||||
|
||||
|
||||
$warn = 0;
|
||||
|
||||
|
||||
$i = 0;
|
||||
while ($i <= $noOfLines) {
|
||||
if ( ( $msgid ) = ( $pofile[$i] =~ m/^msgid "(.*)"/ ) ) {
|
||||
@ -45,7 +45,7 @@ foreach $pofilename ( @ARGV )
|
||||
|
||||
until ( ( $msgstr ) = ( $pofile[$i] =~ m/^msgstr "(.*)"/ ) ) { $i++; };
|
||||
$i++;
|
||||
while ( ( $i <= $noOfLines ) &&
|
||||
while ( ( $i <= $noOfLines ) &&
|
||||
( ( $more ) = $pofile[$i] =~ m/^"(.*)"/ ) ) {
|
||||
$msgstr = $msgstr . $more;
|
||||
$i++;
|
||||
@ -87,14 +87,14 @@ foreach $pofilename ( @ARGV )
|
||||
print( " '$msgid' => '$msgstr'\n" );
|
||||
$warn++;
|
||||
}
|
||||
|
||||
|
||||
$msgid_clean = lc($msgid);
|
||||
$msgstr_clean = lc($msgstr);
|
||||
|
||||
$msgid_clean =~ s/(.*)\|.*?$/$1/; # strip xforms shortcuts
|
||||
$msgstr_clean =~ s/(.*)\|.*?$/$1/;
|
||||
$msgid_clean =~ s/&([^ ])/$1/; # strip Qt shortcuts
|
||||
$msgstr_clean =~ s/&([^ ])/$1/;
|
||||
$msgstr_clean =~ s/&([^ ])/$1/;
|
||||
|
||||
$trans{$msgid_clean}{$msgstr_clean} = [ $msgid, $msgstr ];
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@ error () {
|
||||
# $1 is a string like
|
||||
# '588 translated messages, 1248 fuzzy translations, 2 untranslated messages.'
|
||||
# Any one of these substrings may not appear if the associated number is 0.
|
||||
#
|
||||
#
|
||||
# $2 is the word following the number to be extracted,
|
||||
# ie, 'translated', 'fuzzy', or 'untranslated'.
|
||||
#
|
||||
@ -64,7 +64,7 @@ run_msgfmt () {
|
||||
|
||||
output=
|
||||
test -f $1 || {
|
||||
warning "File $1 does not exist"
|
||||
warning "File $1 does not exist"
|
||||
return
|
||||
}
|
||||
|
||||
@ -73,7 +73,7 @@ run_msgfmt () {
|
||||
pofile=`basename $1`
|
||||
gmofile=`echo $pofile | sed 's/po$/gmo/'`
|
||||
test $pofile != '' -a $pofile != $gmofile || {
|
||||
warning "File $1 is not a po file"
|
||||
warning "File $1 is not a po file"
|
||||
unset origdir dir pofile gmofile
|
||||
return
|
||||
}
|
||||
@ -282,7 +282,7 @@ EOF
|
||||
|
||||
# The main body of the script
|
||||
msgfmt=`which msgfmt`
|
||||
test $msgfmt != '' || error "Unable to find 'msgfmt'. Cannot proceed."
|
||||
test $msgfmt != '' || error "Unable to find 'msgfmt'. Cannot proceed."
|
||||
|
||||
dump_head
|
||||
|
||||
|
||||
2
po/wa.po
2
po/wa.po
@ -1,7 +1,7 @@
|
||||
# Ratoûrnaedje è walon po LyX
|
||||
#
|
||||
# Si vos voloz donner on côp di spale pol ratoûrnaedje di Gnome (ou des
|
||||
# ôtes libes programes) sicrijhoz a l' adresse emile
|
||||
# ôtes libes programes) sicrijhoz a l' adresse emile
|
||||
# <linux-wa@chanae.alphanet.ch>; nos avans co bråmint di l' ovraedje a fé.
|
||||
#
|
||||
# Copyright (C) 1998 Free Software Foundation, Inc.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user