From e96fc497ec3df22eba641ba85c662f56152c746f Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 15 May 2000 15:28:33 +0000 Subject: [PATCH] Hollywood/broadway fixes; update configure check for xforms version. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@733 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 13 +++++++++++++ acinclude.m4 | 19 +++++++------------ config/lyxinclude.m4 | 19 +++++++------------ lib/layouts/broadway.layout | 8 ++++++-- lib/tex/broadway.cls | 13 ++++++++----- lib/tex/hollywood.cls | 15 ++++++++++----- po/POTFILES.in | 1 + 7 files changed, 52 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed54c8e7cf..ed6ba4cbe6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2000-05-15 Jean-Marc Lasgouttes + + * lib/tex/hollywood.cls: better algorithm for page breaks (Garst) + * lib/tex/brodway.cls: ditto + + * lib/layouts/brodway.layout: change alignment of parenthical + layout (Garst) + +2000-05-12 Jean-Marc Lasgouttes + + * config/lyxinclude.m4 (LYX_PATH_XFORMS): make it clear that only + versions 0.88 and 0.89 are supported. + 2000-05-15 Juergen Vigna * src/insets/insetcollapsable.C (draw): enhancements in drawing and diff --git a/acinclude.m4 b/acinclude.m4 index ad3c06fe08..611315ae9b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -547,23 +547,18 @@ lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \ sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'` rm -f conftest*]) case "$lyx_cv_xfversion" in - "(unknown)"|0.82|0.83|0.84|0.85) - LYX_ERROR(dnl + "(unknown)"|0.8[1-7]) + LYX_ERROR(dnl Version $lyx_cv_xfversion of xforms is not compatible with LyX. - This version of LyX works best with version 0.88[,] although it - supports also versions 0.81[,] 0.86 and 0.87.) ;; - 0.81|0.86|0.87) - LYX_WARNING(dnl -While LyX is compatible with version $lyx_cv_xfversion of xforms[,] - it is recommended that you upgrade to version 0.88.) ;; - 0.88) ;; - 0.89) LYX_WARNING(dnl + This version of LyX works best with versions 0.88 (recommended) and later.) ;; + 0.88) ;; + 0.89) LYX_WARNING(dnl LyX should work ok with version $lyx_cv_xfversion of xforms[,] but it is an unproven version and might still have some bugs. If you have problems[,] please use version 0.88 instead.) ;; - *) LYX_WARNING(dnl + *) LYX_WARNING(dnl Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,] - since it is newer than 0.88. You might have slight problems with it.);; + since it is newer than 0.88. You might have slight problems with it.);; esac fi]) diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index cbd9564ce7..53c6b05d96 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -547,23 +547,18 @@ lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \ sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'` rm -f conftest*]) case "$lyx_cv_xfversion" in - "(unknown)"|0.82|0.83|0.84|0.85) - LYX_ERROR(dnl + "(unknown)"|0.8[1-7]) + LYX_ERROR(dnl Version $lyx_cv_xfversion of xforms is not compatible with LyX. - This version of LyX works best with version 0.88[,] although it - supports also versions 0.81[,] 0.86 and 0.87.) ;; - 0.81|0.86|0.87) - LYX_WARNING(dnl -While LyX is compatible with version $lyx_cv_xfversion of xforms[,] - it is recommended that you upgrade to version 0.88.) ;; - 0.88) ;; - 0.89) LYX_WARNING(dnl + This version of LyX works best with versions 0.88 (recommended) and later.) ;; + 0.88) ;; + 0.89) LYX_WARNING(dnl LyX should work ok with version $lyx_cv_xfversion of xforms[,] but it is an unproven version and might still have some bugs. If you have problems[,] please use version 0.88 instead.) ;; - *) LYX_WARNING(dnl + *) LYX_WARNING(dnl Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,] - since it is newer than 0.88. You might have slight problems with it.);; + since it is newer than 0.88. You might have slight problems with it.);; esac fi]) diff --git a/lib/layouts/broadway.layout b/lib/layouts/broadway.layout index aa4ce16f0e..a244d8c834 100644 --- a/lib/layouts/broadway.layout +++ b/lib/layouts/broadway.layout @@ -146,8 +146,12 @@ Style Parenthetical Margin Static LatexType Environment LatexName parenthetical - Align Center - AlignPossible Center + LeftMargin MMMMMMMMMMMMMMMMM + TopSep 0.0 + BottomSep 0.0 + ParSkip 0.0 + Align Left + AlignPossible Left LabelType Static LabelString ( EndLabelType Static diff --git a/lib/tex/broadway.cls b/lib/tex/broadway.cls index bd223a88de..32a25c876a 100644 --- a/lib/tex/broadway.cls +++ b/lib/tex/broadway.cls @@ -168,21 +168,22 @@ \fi \newenvironment{atrise}% -{\begin{list}{}{% +{\filbreak +\begin{list}{}{% \leftmargin \rightmargin} \item[]AT RISE:\ignorespaces} {\unskip \end{list}} \newenvironment{scene}% -{ -%\stepcounter{scene} +{\filbreak +\stepcounter{scene} \begin{center}{}{% \center} \item[]SCENE \ignorespaces} {\unskip \end{center}} \newenvironment{act}% -{ +{\filbreak \stepcounter{act} %\setcounter{scene}{0} \begin{center}{}{% @@ -202,6 +203,7 @@ \newenvironment{narrative}% {\raggedright +\filbreak \fontshape{it}\selectfont{} \begin{list}{}{% \setlength{\leftmargin}{0in} @@ -212,7 +214,8 @@ {\unskip \end{list}} \newenvironment{speaker}% -{\begin{center}{}{% +{\filbreak +\begin{center}{}{% \center \setlength{\parsep}{0mm} \setlength{\topsep}{2mm}} diff --git a/lib/tex/hollywood.cls b/lib/tex/hollywood.cls index a907349f0a..c78bc8a0cc 100644 --- a/lib/tex/hollywood.cls +++ b/lib/tex/hollywood.cls @@ -158,13 +158,15 @@ {\unskip \end{list}} \newenvironment{interior}% -{\begin{list}{}{% +{\filbreak +\begin{list}{}{% \leftmargin \rightmargin} \item[]INT. \ignorespaces} {\unskip \end{list}} \newenvironment{exterior}% -{\begin{list}{}{% +{filbreak +\begin{list}{}{% \leftmargin \rightmargin} \item[]EXT. \ignorespaces} {\unskip \end{list}} @@ -180,7 +182,8 @@ {\unskip \end{list}} \newenvironment{narrative}% -{\raggedright +{\filbreak +\raggedright \begin{list}{}{% \leftmargin \rightmargin \setlength{\parsep}{2mm} @@ -189,7 +192,8 @@ {\unskip \end{list}} \newenvironment{speaker}% -{\begin{list}{}{% +{\filbreak +\begin{list}{}{% \setlength{\leftmargin}{2.5in} \setlength{\partopsep}{4mm} \setlength{\parsep}{0mm} @@ -206,7 +210,8 @@ {\unskip)\end{list}} \newenvironment{fadeout}% -{\begin{list}{}{% +{\filbreak +\begin{list}{}{% \leftmargin \rightmargin} \item[]FADE OUT: \ignorespaces} {\unskip \end{list}} diff --git a/po/POTFILES.in b/po/POTFILES.in index 291f3f4a16..4196d65117 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -91,5 +91,6 @@ src/support/path.h src/table.C src/TableLayout.C src/tabular.C +src/TabularLayout.C src/text2.C src/text.C -- 2.39.2