Update to hollywood; tweak to lyxlex debug messages

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1017 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 241e1a5fb55118fdac61903c78d417787e95062b..66ada6d24ed9f66e137fead3a79462ec78bfa2f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2000-09-14  Garst Reese    <reese@isn.net>
+
+       * lib/tex/hollywood.cls changed length of parenthicals to 1.5in
+       moved usepackage{xxx}'s to beginning of file. Changed left margin
+       to 1.5in, right margin to 1in. Forced headrulewidth to 0, removed
+       underlining from title. Thanks to John Culleton for useful suggestions.
+
+2000-09-13  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * src/lyxlex_pimpl.C (setFile): change error message to debug
+       message. 
+
 2000-09-13  Juergen Vigna  <jug@sad.it>
 
        * src/frontends/xforms/FormDocument.C: implemented choice_class

diff --git a/lib/tex/hollywood.cls b/lib/tex/hollywood.cls
index 8421dd868c93c2ef9795237be0522dc61bba955a..37fe8d111f48c8f23e9fb66ba1c742107b152b3d 100644 (file)
--- a/lib/tex/hollywood.cls
+++ b/lib/tex/hollywood.cls
@@ -6,6 +6,11 @@
 %% that could be deleted. 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{hollywood} [1998/10/27 v1.0 uses hollywood.layout]
+\usepackage{fancyhdr}
+\usepackage{extramarks}
+\usepackage{ifthen}
+\usepackage{lastpage}
+\pagestyle{fancy}
 \renewcommand{\ref}[1]{#1}
 \newcommand\@ptsize{}
 \newif\if@restonecol
@@ -42,7 +47,7 @@
 \@medpenalty  151
 \@highpenalty 301
 \setcounter{topnumber}{2}
-% \renewcommand{\headrulewidth}{0pt}
+\renewcommand{\headrulewidth}{0pt}
 \renewcommand\topfraction{.7}
 \setcounter{bottomnumber}{1}
 \renewcommand\bottomfraction{.3}
@@ -73,7 +78,8 @@
   \null\vfil
   \vskip 60\p@
   \begin{center}%
-    { \underline{\@title} \par}%
+%%    { \underline{\@title} \par}%
+    { \@title \par}%
     \vskip 3em%
     {\lineskip .75em%
       \begin{tabular}[t]{c}%
@@ -155,11 +161,6 @@
 \else
   \onecolumn
 \fi
-\usepackage{fancyhdr}
-\usepackage{extramarks}
-\usepackage{ifthen}
-\usepackage{lastpage}
-\pagestyle{fancy}
 % This stuff is for a shooting script
 % \lhead{\ifthenelse{ \not \value{page} = 1}{CONTINUED:}{}}
 % \rfoot{\ifthenelse{ \not \value{page}=\pageref{LastPage}}{(CONT'D)}
@@ -169,7 +170,6 @@
 % This is what we want for a spec script
 \rhead{\thepage.}
 \cfoot{}
-% \renewcommand{\headrulewitdh}{0pt}
   % This one is needed to get real adobe courier, but you can use
   % cmtt which is also correct
   \renewcommand{\familydefault}{pcr}
@@ -210,7 +210,7 @@
 \newcommand{\parenthetical}[1]%
 {\raggedright
 \hspace{1.75in}
-\parbox{3in}{(#1)}
+\parbox{1.5in}{(#1)}
 \vspace{6pt}}
 
 \endinput

diff --git a/po/POTFILES.in b/po/POTFILES.in
index f4fe983d119d8d9c6788b4328c904f241fe3970e..a70f1b39b2df2e1025e53d75b8a5cfecd45a685d 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -36,6 +36,8 @@ src/frontends/kde/formcitationdialog.C
 src/frontends/kde/FormCopyright.C
 src/frontends/kde/FormIndex.C
 src/frontends/kde/formindexdialog.C
+src/frontends/kde/FormRef.C
+src/frontends/kde/formrefdialog.C
 src/frontends/kde/FormToc.C
 src/frontends/kde/formtocdialog.C
 src/frontends/kde/FormUrl.C

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index cc0c0d537ea538db7b1f61e29cabd8a45b889a83..ba0d7d2aab5c92027611d6c02f0b7b9128e17a5c 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -107,8 +107,11 @@ void LyXLex::Pimpl::popTable()
 
 bool LyXLex::Pimpl::setFile(string const & filename)
 {
+       // The check only outputs a debug message, because it triggers
+       // a bug in compaq cxx 6.2, where is_open() returns 'true' for a
+       // fresh new filebuf.  (JMarc)
        if (fb__.is_open() || is.tellg() > 0)
-               lyxerr << "Error in LyXLex::setFile: "
+               lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
                        "file or stream already set." << endl;
        fb__.open(filename.c_str(), ios::in);
        is.rdbuf(&fb__);
@@ -121,7 +124,7 @@ bool LyXLex::Pimpl::setFile(string const & filename)
 void LyXLex::Pimpl::setStream(istream & i)
 {
        if (fb__.is_open() || is.tellg() > 0)
-               lyxerr << "Error in LyXLex::setStream: "
+               lyxerr[Debug::LYXLEX]  << "Error in LyXLex::setStream: "
                        "file or stream already set." << endl;
        is.rdbuf(i.rdbuf());
        lineno = 0;