anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-12 22:14:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to hollywood; tweak to lyxlex debug messages

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1017 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-09-14 13:50:47 +00:00
parent 5cbcb0eddd
commit 43b9673492
4 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -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> 2000-09-13 Juergen Vigna <jug@sad.it>
* src/frontends/xforms/FormDocument.C: implemented choice_class * src/frontends/xforms/FormDocument.C: implemented choice_class

18
lib/tex/hollywood.cls
View File

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

2
po/POTFILES.in
View File

@ -36,6 +36,8 @@ src/frontends/kde/formcitationdialog.C
src/frontends/kde/FormCopyright.C src/frontends/kde/FormCopyright.C
src/frontends/kde/FormIndex.C src/frontends/kde/FormIndex.C
src/frontends/kde/formindexdialog.C src/frontends/kde/formindexdialog.C
src/frontends/kde/FormRef.C
src/frontends/kde/formrefdialog.C
src/frontends/kde/FormToc.C src/frontends/kde/FormToc.C
src/frontends/kde/formtocdialog.C src/frontends/kde/formtocdialog.C
src/frontends/kde/FormUrl.C src/frontends/kde/FormUrl.C

7
src/lyxlex_pimpl.C
View File

@ -107,8 +107,11 @@ void LyXLex::Pimpl::popTable()
bool LyXLex::Pimpl::setFile(string const & filename) 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) 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; "file or stream already set." << endl;
fb__.open(filename.c_str(), ios::in); fb__.open(filename.c_str(), ios::in);
is.rdbuf(&fb__); is.rdbuf(&fb__);
@ -121,7 +124,7 @@ bool LyXLex::Pimpl::setFile(string const & filename)
void LyXLex::Pimpl::setStream(istream & i) void LyXLex::Pimpl::setStream(istream & i)
{ {
if (fb__.is_open() || is.tellg() > 0) 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; "file or stream already set." << endl;
is.rdbuf(i.rdbuf()); is.rdbuf(i.rdbuf());
lineno = 0; lineno = 0;