mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
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
This commit is contained in:
parent
5cbcb0eddd
commit
43b9673492
12
ChangeLog
12
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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user