From 79db9fbd200b98edd1f72f93e085cae66ce38312 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sat, 2 Oct 1999 14:01:04 +0000 Subject: [PATCH] last updates from 1.0.4, no more updates expected from that branch now git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@161 a592a061-630c-0410-9148-cb99ea01b6c8 --- ANNOUNCE | 19 ++-- CHANGES | 10 +++ UPGRADING | 12 +-- WHATSNEW | 16 ++++ development/lyx.spec | 146 +++++++++++++++++++++---------- lib/doc/LaTeXConfig.lyx.in | 39 ++++++++- lib/examples/docbook_example.lyx | 6 +- lib/layouts/docbook.layout | 6 +- src/BufferView.C | 8 +- src/buffer.C | 28 +++--- src/insets/insetquotes.C | 12 +-- src/paragraph.C | 6 +- 12 files changed, 214 insertions(+), 94 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index a0ed602bb0..8a781337c2 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,10 +1,10 @@ -Public release of LyX version 1.0.1 +Public release of LyX version 1.0.4 =================================== What is LyX? ------------ -LyX is an advanced open-source "document processor". Unlike standard +LyX is an advanced open-source "document processor". Unlike standard word processors, LyX encourages writing based on the structure of your documents, not their appearance, It lets you concentrate on writing, leaving details of visual layout to the software. @@ -15,7 +15,7 @@ strength typesetting engine. No knowledge of LaTeX is required to use LyX; however, there is also a "TeX mode" which allows you to enter plain LaTeX commands. -All in all, LyX is a complete environment for writing documents. It has +All in all, LyX is a complete environment for writing documents. It has superior support for scientific writing, but works well for any kind of document. @@ -34,7 +34,7 @@ A very incomplete feature list: - automatic, multilevel outline support (enumerated or bullets) - tables and embedded postscript figures support - import LaTeX or ASCII -- export LaTeX, ASCII, DVI, PostScript, LinuxDoc-SGML +- export LaTeX, ASCII, DVI, PostScript, LinuxDoc-SGML, DocBook-SGML - fair support for non-English documents and/or menus - extensive documentation, including a tutorial - version control using RCS @@ -73,21 +73,22 @@ with mirrors at The source code package is available at: - ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.0.0.tar.gz - ftp://ftp.devel.lyx.org/pub/lyx/lyx-1.0.0.tar.gz + ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.0.4.tar.gz + ftp://ftp.devel.lyx.org/pub/lyx/lyx-1.0.4.tar.gz and at the mirrors listed above. You need to have XForms version 0.81, 0.86 or 0.88 to compile your own -version. Version 0.88 is highly recomended. +version. Version 0.88 is highly recomended. LyX should also compile +with 0.89. Ready-to-run precompiled binaries for various platforms are available at: - ftp://ftp.lyx.org/pub/lyx/bin/1.0.0/ + ftp://ftp.lyx.org/pub/lyx/bin/1.0.4/ Binaries for i386-Linux are also available at your local sunsite mirror: - ftp://sunsite.unc.edu/pub/Linux/apps/editors/lyx-1.0.0-bin.tar.gz + ftp://sunsite.unc.edu/pub/Linux/apps/editors/lyx-1.0.4-bin.tar.gz Credits ------- diff --git a/CHANGES b/CHANGES index b641997890..59abf348b9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,14 @@ since 1.0.4pre8 +- small fix to qoutes in DocBook. (Jose) +- blurb about DocBook in LaTeXConfig (Jose) +- small bug with linuxdoc in LaTeXConfig (Lgb) +- added it_Intro. (Giovanni Iachello) +- updated documention files from lyxdoc. (Lgb) +- added section about revtex4 in LaTeXConfig.lyx.in (JMarc) +- one line fix to docbook layout (Jose) +- switched the mousewheel to scroll in the same way as + gnome-terminal (Lgb) +- small DocBook fix (Jose) - Added revtex4 layout, template, and (skeleton) docs (Karger) - updated pl.po (Pawel) - updated makeDocBookFile (Jose) diff --git a/UPGRADING b/UPGRADING index 712bb366ec..1d9e81a158 100644 --- a/UPGRADING +++ b/UPGRADING @@ -1,7 +1,7 @@ -How do I upgrade my existing LyX system to version 1.0.2? +How do I upgrade my existing LyX system to version 1.0.4? --------------------------------------------------------- -If you upgrade from version 0.12.0 or 1.0.0, you shouldn't have +If you upgrade from version 0.12.0 or 1.0.x, you shouldn't have any problems. Just run "make install", and it will automatically update the necessary files, provided that you install LyX the same place as an existing version. @@ -10,9 +10,9 @@ Document transfer ----------------- In general, you don't need to convert any documents saved with LyX -v0.10, v0.12.0 or v1.0.0 to use them with LyX v1.0.2. +v0.10, v0.12.0 or v1.0.x to use them with LyX v1.0.4. -LyX v1.0.2 can read all documents saved with lyx-0.12.0 and later correctly. +LyX v1.0.x can read all documents saved with lyx-0.12.0 and later correctly. Documents saved with lyx-0.10.x are read correctly up to the old math mode, which is not supported anymore. If you have documents with such math formulas, you convert it using the program COLD, written by Preben @@ -23,5 +23,5 @@ Rhandol. COLD can be found at: or at one of LyX archive mirror sites listed in README. -Documents saved with LyX version 1.0.2 can be read correctly by -LyX v0.12.0 and v1.0.0 and v1.0.1, except for new features. +Documents saved with LyX version 1.0.4 can be read correctly by +LyX v0.12.0 and v1.0.x, except for new features. diff --git a/WHATSNEW b/WHATSNEW index ef84976461..52bab94614 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -1,3 +1,19 @@ +What's new in 1.0.4 compared to LyX version 1.0.3? +-------------------------------------------------- + +LyX 1.0.4 is mainly a bugfix update to 1.0.3, but some +new features has been included: + +- DocBook support. + +- RevTeX4. + +- Better printing with custom pagesizes. + +- Several language files updated. + +- And several bugfixes to math and table. + What's new in 1.0.3 compared to LyX version 1.0.2? -------------------------------------------------- diff --git a/development/lyx.spec b/development/lyx.spec index 28e2a81154..f42925cb59 100644 --- a/development/lyx.spec +++ b/development/lyx.spec @@ -1,71 +1,123 @@ -Summary: A WYSIWYG frontend to LaTeX -Name: lyx -Version: 1.0.2 -Release: 1 -Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%PACKAGE_VERSION.tar.gz -Copyright: GPL -Group: X11/Applications/Publishing -Requires: xforms >= 0.88, tetex-xdvi, tetex, tetex-latex -Packager: Mate Wierdl -URL: http://www.lyx.org -Buildroot: /tmp/lyx-root +Summary: A WYSYWIG frontend to LaTeX +Name: lyx +Version: 1.0.4 +Release: 1 +Copyright: see COPYING file +Group: X11/Editors +Url: http://www.lyx.org/ +Packager: Kayvan A. Sylvan +Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{PACKAGE_VERSION}.tar.gz +BuildRoot: /var/tmp/rpm/lyx-root +Icon: lyx.xpm +Prefix: /usr +Requires: xforms >= 0.88, tetex-xdvi, tetex, tetex-latex + %description -LyX is a wordprocessor frontend to LaTeX, which gives both the -ease-of-use of a wordprocessor, and the flexibility and power of LaTeX. +LyX is a modern approach of writing documents with a computer +which breaks with the tradition of the obsolete typewriter +concept. It is designed for people who want a professional +output with a minimum of time and effort, without becoming specia- +lists in typesetting. Compared to common word processors LyX +will increase the productivity a lot, since most of the type- +setting will be done by the computer, not the author. With LyX +the author can concentrate on the contents of his writing, +since the computer will take care of the look. -%prep +%package -n tetex-lyx +Summary: Files for LyX packaged for tetex +Requires: lyx +Group: Applications/Publishing + +%description -n tetex-lyx +This package contains the LaTeX files for LyX installed in the normal +place that the Redhat tetex package is installed and would see it. +%prep %setup %build - -CXXFLAGS="$RPM_OPT_FLAGS" ./configure --with-included-gettext - +CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr make %install -#rename the installation root more appropriately -INST_ROOT=$RPM_BUILD_ROOT -rm -rf $INST_ROOT +rm -rf ${RPM_BUILD_ROOT} +install -d -m 755 ${RPM_BUILD_ROOT} +make prefix=${RPM_BUILD_ROOT}/usr install +gzip -f9 ${RPM_BUILD_ROOT}/usr/man/man?/* -make install prefix=$INST_ROOT/usr/local - -cp -a images/lyx.xpm $INST_ROOT/usr/local/share/lyx/images +# +# Set up the lyx-specific class files where TeX can see then +# +TEXMF=/usr/share/texmf +mkdir -p ${RPM_BUILD_ROOT}${TEXMF}/tex/latex +cp -r ${RPM_BUILD_ROOT}/usr/share/lyx/tex \ + ${RPM_BUILD_ROOT}${TEXMF}/tex/latex/lyx -strip $INST_ROOT/usr/local/bin/lyx +# +# Miscellaneous files +# +cp -a images/lyx.xpm ${RPM_BUILD_ROOT}/usr/share/lyx/images/ +cp lib/reLyX/README README.reLyX + +%clean +rm -rf ${RPM_BUILD_ROOT} -# Have a copy of the reLyX README in the doc directory -cp lib/reLyX/README reLyX.README %post # Before configuring lyx for the local system # PATH needs to be imported -if [ -f /etc/profile ]; then +if [ -f /etc/profile ]; then . /etc/profile -fi - +fi +# # Now configure LyX +# echo "Configuring LyX for your system..." -cd /usr/local/share/lyx +cd $RPM_INSTALL_PREFIX/share/lyx ./configure --srcdir -# Take care of leftover lyxrc in /etc -if [ -f /etc/lyxrc ]; then - echo "Moving the old config file /etc/lyxrc to" - echo "/usr/local/share/lyx/lyxrc-from-etc" - echo "If you do not need it delete it." - mv /etc/lyxrc /usr/local/share/lyx/lyxrc-from-etc -fi +%post -n tetex-lyx +# Fix the TeX file hash +# +texhash -%clean -#rename the installation root more appropriately -INST_ROOT=$RPM_BUILD_ROOT -rm -rf $INST_ROOT +# Before configuring lyx for the local system +# PATH needs to be imported +if [ -f /etc/profile ]; then +. /etc/profile +fi +# +# Now configure LyX +# +echo "Re-configuring LyX for your system..." +cd $RPM_INSTALL_PREFIX/share/lyx +./configure --srcdir + +%postun -n tetex-lyx +# Fix the TeX file hash +# +texhash + +# Before configuring lyx for the local system +# PATH needs to be imported +if [ -f /etc/profile ]; then +. /etc/profile +fi +# +# Now configure LyX +# +echo "Reconfiguring LyX for your system..." +cd $RPM_INSTALL_PREFIX/share/lyx +./configure --srcdir %files -%doc ANNOUNCE BUGS CHANGES COPYING README -%doc ABOUT-NLS UPGRADING WHATSNEW reLyX.README -/usr/local/bin/* -/usr/local/man/*/* -/usr/local/share/lyx -/usr/local/share/locale/*/LC_MESSAGES/lyx.mo +%attr(-,root,root) %doc ABOUT-NLS ANNOUNCE CHANGES COPYING +%attr(-,root,root) %doc README UPGRADING WHATSNEW +%attr(-,root,root) %doc lib/CREDITS README.reLyX + +%attr(-,root,root) /usr/bin/* +%attr(-,root,root) /usr/man/* +%attr(-,root,root) /usr/share/locale/*/LC_MESSAGES/* +%attr(-,root,root) /usr/share/lyx +%files -n tetex-lyx +%attr(-,root,root) /usr/share/texmf/tex/latex/lyx diff --git a/lib/doc/LaTeXConfig.lyx.in b/lib/doc/LaTeXConfig.lyx.in index 04e9d1d7cc..06cb862301 100644 --- a/lib/doc/LaTeXConfig.lyx.in +++ b/lib/doc/LaTeXConfig.lyx.in @@ -1,4 +1,4 @@ -#This file was created by Wed Jun 9 15:30:54 1999 +#This file was created by Tue Sep 28 15:13:47 1999 #LyX 1.0 (C) 1995-1999 Matthias Ettrich and the LyX Team \lyxformat 2.15 \textclass article @@ -714,7 +714,7 @@ article linuxdoc \layout Description -Found: @chk_sgmltools@ +Found: @chk_linuxdoc@ \layout Description CTAN: N/A @@ -749,7 +749,22 @@ Found: @chk_docbook@ CTAN: N/A \layout Description -Notes: fill in here please. +WWW: +\begin_inset LatexCommand \url{http://www.sgmltools.org} + +\end_inset + + +\layout Description + +Notes: The class docbook is not a LaTeX document class. + It is designed to produce Docbook SGML documents, which, in turn, can be + exported as HTML, RTF, text, or dvi (through +\family typewriter +jadetex +\family default +). + You need the sgmltools v2.0 package installed to use this. \layout Subsection paper @@ -832,6 +847,24 @@ revtex.cls tex/ \family default subdirectory of LyX source distribution. +\layout Subsection + +REVTeX 4 +\layout Description + +Found: @chk_revtex4@ +\layout Description + +CTAN: +\family typewriter +macros/latex/contrib/supported/revtex4-beta/ +\layout Description + +Notes: RevTeX 4 is a class used for submitting manuscripts to journals including + APS (Physical Review A-E and Letters, Reviews in Modern Physics, Special + Topics---Accelerators and Beams), the American Institute of Physics, the + Optical Society of America, and the Society for Exploration Geophysicists. + [It is in BETA release as of September, 1999.] \layout Section Paper layout packages diff --git a/lib/examples/docbook_example.lyx b/lib/examples/docbook_example.lyx index 4089b07331..f3adc607d3 100644 --- a/lib/examples/docbook_example.lyx +++ b/lib/examples/docbook_example.lyx @@ -1,4 +1,4 @@ -#This file was created by Mon Sep 27 16:39:07 1999 +#This file was created by Wed Sep 29 16:07:48 1999 #LyX 1.0 (C) 1995-1999 Matthias Ettrich and the LyX Team \lyxformat 2.15 \textclass docbook @@ -215,7 +215,7 @@ Notice that when the docbook code is exported the filename extension is \begin_inset Figure size 56 85 -file platypus.eps +file ../doc/platypus.eps width 1 2 height 1 3 angle 45 @@ -239,7 +239,7 @@ Wide figures are treated as normal figures. \begin_inset Figure size 56 85 -file platypus.eps +file ../doc/platypus.eps width 1 2 height 1 3 angle 45 diff --git a/lib/layouts/docbook.layout b/lib/layouts/docbook.layout index 9d2be7f039..ba1315ad83 100644 --- a/lib/layouts/docbook.layout +++ b/lib/layouts/docbook.layout @@ -88,10 +88,10 @@ End # Verbatim style definition Style Literal LatexType Environment - LatexName literal + LatexName literallayout Font Latex Latex - EndFont + EndFont End # Code style definition @@ -103,7 +103,7 @@ Style Code EndPreamble Font Latex Latex - EndFont + EndFont End # Author style definition diff --git a/src/BufferView.C b/src/BufferView.C index ff27c73eb2..9222ed9141 100644 --- a/src/BufferView.C +++ b/src/BufferView.C @@ -38,10 +38,10 @@ #include "lyx_cb.h" #include "gettext.h" -// $Id: BufferView.C,v 1.1 1999/09/27 18:44:36 larsbj Exp $ +// $Id: BufferView.C,v 1.2 1999/10/02 14:01:03 larsbj Exp $ #if !defined(lint) && !defined(WITH_WARNINGS) -static char vcid[] = "$Id: BufferView.C,v 1.1 1999/09/27 18:44:36 larsbj Exp $"; +static char vcid[] = "$Id: BufferView.C,v 1.2 1999/10/02 14:01:03 larsbj Exp $"; #endif /* lint */ extern BufferList bufferlist; @@ -1006,10 +1006,10 @@ int BufferView::WorkAreaButtonPress(FL_OBJECT *ob, Window, int diff = ev->xbutton.time - lastTime; int scroll = int(1.0 + (4.0/(abs(diff)+1.0))*200.0); switch (button) { - case 5: + case 4: ScrollUp(scroll); break; - case 4: + case 5: ScrollDown(scroll); break; } diff --git a/src/buffer.C b/src/buffer.C index 2d9e0a19a5..c3dfc52567 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -77,10 +77,10 @@ #include "gettext.h" -// $Id: buffer.C,v 1.1 1999/09/27 18:44:37 larsbj Exp $ +// $Id: buffer.C,v 1.2 1999/10/02 14:01:03 larsbj Exp $ #if !defined(lint) && !defined(WITH_WARNINGS) -static char vcid[] = "$Id: buffer.C,v 1.1 1999/09/27 18:44:37 larsbj Exp $"; +static char vcid[] = "$Id: buffer.C,v 1.2 1999/10/02 14:01:03 larsbj Exp $"; #endif /* lint */ @@ -2934,14 +2934,22 @@ void Buffer::makeDocBookFile(LString const & filename, int column) } // Close open tags - for(;depth>0;depth--) - sgmlCloseTag(file,depth+command_depth, - environment_stack[depth]); - - if(!environment_stack[depth].empty()) - sgmlCloseTag(file,depth+command_depth, - environment_stack[depth]); - + for(;depth>=0;depth--) { + if(!environment_stack[depth].empty()) { + if(environment_inner[depth] != "!-- --") { + item_name="listitem"; + sgmlCloseTag(file,command_depth+depth, + item_name); + if( environment_inner[depth] == "varlistentry") + sgmlCloseTag(file,depth+command_depth, + environment_inner[depth]); + } + + sgmlCloseTag(file,depth+command_depth, + environment_stack[depth]); + } + } + for(int j=command_depth;j>=command_base;j--) if(!command_stack[j].empty()) sgmlCloseTag(file,j,command_stack[j]); diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C index 865f5294b1..f90175b16b 100644 --- a/src/insets/insetquotes.C +++ b/src/insets/insetquotes.C @@ -22,10 +22,10 @@ #include "buffer.h" #include "LaTeXFeatures.h" -// $Id: insetquotes.C,v 1.1 1999/09/27 18:44:39 larsbj Exp $ +// $Id: insetquotes.C,v 1.2 1999/10/02 14:01:04 larsbj Exp $ #if !defined(lint) && !defined(WITH_WARNINGS) -static char vcid[] = "$Id: insetquotes.C,v 1.1 1999/09/27 18:44:39 larsbj Exp $"; +static char vcid[] = "$Id: insetquotes.C,v 1.2 1999/10/02 14:01:04 larsbj Exp $"; #endif /* lint */ // Quotes. Used for the various quotes. German, English, French, @@ -285,14 +285,14 @@ int InsetQuotes::DocBook(LString &file) { if(times == InsetQuotes::DoubleQ) { if (side == InsetQuotes::LeftQ) - file += "„"; + file += "“"; else - file += "”"; + file += "”"; } else { if (side == InsetQuotes::LeftQ) - file += "‚"; + file += "‘"; else - file += "’"; + file += "’"; } return 0; } diff --git a/src/paragraph.C b/src/paragraph.C index 4ab9eac82f..f6cfa1a6ac 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -27,10 +27,10 @@ #include "lyx_gui_misc.h" #include "texrow.h" -// $Id: paragraph.C,v 1.1 1999/09/27 18:44:38 larsbj Exp $ +// $Id: paragraph.C,v 1.2 1999/10/02 14:01:03 larsbj Exp $ #if !defined(lint) && !defined(WITH_WARNINGS) -static char vcid[] = "$Id: paragraph.C,v 1.1 1999/09/27 18:44:38 larsbj Exp $"; +static char vcid[] = "$Id: paragraph.C,v 1.2 1999/10/02 14:01:03 larsbj Exp $"; #endif /* lint */ #define INITIAL_SIZE_PAR 10 /*Number of bytes in one paragraph*/ @@ -2579,7 +2579,7 @@ bool LyXParagraph::linuxDocConvertChar(char c, LString &sgml_string) sgml_string = "˜"; break; case '"': - sgml_string = "&dquot;"; + sgml_string = """; break; case '\\': sgml_string = "\"; -- 2.39.2