Hollyway updates; hopefully fix bugs with insetbib searching of bib file.

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

ChangeLog

@@ -1,3 +1,20 @@
+2000-05-17  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* src/debug.C (showTags): enlarge the first column, now that we
+	have 6-digits debug codes.
+
+	* lib/layouts/hollywood.layout:
+	* lib/tex/hollywood.cls: 	
+	* lib/tex/brodway.cls: 
+	* lib/layouts/brodway.layout: more commands and fewer
+	environments. Preambles moved in the .cls files. Broadway now has 
+	more options on scene numbering and less whitespace (from Garst)
+
+	* src/insets/insetbib.C (getKeys): make sure that we are in the
+	document directory, in case the bib file is there.
+
+	* src/insets/insetbib.C (Latex): revert bogus change.
+
 2000-05-16  Juergen Vigna  <jug@sad.it>
 
 	* src/insets/insettabular.C (UnlockInsetInInset): Changes to update

lib/layouts/broadway.layout

@@ -22,25 +22,6 @@ DefaultFont
   Color                 None
 EndFont
 
-Preamble
-\usepackage{fancyhdr}
-\usepackage{extramarks}
-\usepackage{ifthen}
-\usepackage{lastpage}
-\pagestyle{fancy}
-\newcommand{\TheAuthor}{}
-\newcommand{\Author}[1]{\renewcommand{\TheAuthor}{#1}}
-\newcommand{\TheTitle}{}
-\newcommand{\Title}[1]{\renewcommand{\TheTitle}{#1}}
-
-
-\rhead{\thepage}
-\lhead{\TheTitle}
-\chead{\TheAuthor}
-\cfoot{}
-% We do not want any hyphenation
-  \sloppy
-EndPreamble
 
 # Standard style definition (I kept this one to provide a general case)
 Style Standard
@@ -75,48 +56,51 @@ EndFont
 End
 
 Style ACT
-  Margin                Dynamic
+  Margin                Static
-  LatexType             Environment
+  LatexType             Command
   LatexName             act
   ParIndent             ""
   ParSkip               0.8
   TopSep		1.0
-  KeepEmpty		1
+#  KeepEmpty		1
   Align                 Center
   AlignPossible         Center
   LabelType             Counter_Chapter
   LabelString		"ACT "
 End
 
-Style ACT*
+
-  Margin                Dynamic
+Style SCENE
-  LatexType             Paragraph
+  Margin                Static
-  LatexName             dummy
+  LatexType             Command
+  LatexName             scene
   ParIndent             ""
   ParSkip               0.8
   TopSep		1.0
+#  KeepEmpty		1
   Align                 Center
   AlignPossible         Center
-  LabelType		No_Label
+  LabelType             Counter_Section
+  LabelString		"SCENE "
 End
 
-Style SCENE
+Style SCENE*
   Margin                Dynamic
-  LatexType             Environment
+  LatexType             Command
-  LatexName             scene
+  LatexName             scenestar
   ParIndent             ""
   ParSkip               0.8
   TopSep		1.0
   KeepEmpty		1
   Align                 Center
   AlignPossible         Center
-  LabelType             Static       # Counter_EnumI
+  LabelType             Static
   LabelString		"SCENE "
 End
 
 Style AT_RISE:
   Margin                Dynamic
-  LatexType             Environment
+  LatexType             Command
   LatexName             atrise
   ParIndent             ""
   ParSkip               0.8
@@ -187,9 +171,9 @@ Style Dialogue
 End
 
 Style CURTAIN
-  Margin                Dynamic
+  Margin                Static
-  LatexType             Paragraph
+  LatexType             Command
-  LatexName             dummy
+  LatexName             curtain
   ParIndent             ""
   ParSkip               0.8
   TopSep		1.0

lib/layouts/hollywood.layout

@@ -34,33 +34,6 @@ DefaultFont
   Color                 None
 EndFont
 
-Preamble
-\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)}
-%  {\ifthenelse{\value{page}=\pageref{LastPage}}{(END)}{}}}
-
-
-% 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}
-  % This is to negate the effect of the ~ that LyX adds everywhere
- \let~=\space
-  % this protects you against the fact that TeX does not want to
-  % hyphenate in typewriter font. It is possible to enable
-  % hyphenation, but I do not remember how.
-  % That's good because we -do not- want any hyphenation.
-  \sloppy
-EndPreamble
 
 # Standard style definition (I kept this one to provide a general case)
 Style Standard
@@ -91,9 +64,9 @@ End
 # FADE_IN: and FADE_OUT: usually stand alone. If you want a more complicated
 # FADE_IN e.g. FADE_IN on STELLA:, use the Narrative Style.
 Style FADE_IN:
-  Margin                Dynamic
+  Margin                Static
   LatexType             Environment
-  LatexName             fadein
+  LatexName             flushleft
   ParIndent             ""
   ParSkip               0.8
   TopSep		1.0
@@ -111,8 +84,8 @@ End
 # - DAY, or - NIGHT or similar to define lighting.
 Style INT.
   Margin                Dynamic
-  LatexType             Environment
+  LatexType             Command
-  LatexName             interior
+  LatexName             interiorshot
   ParIndent             ""
   ParSkip               0.8
   TopSep		1.0
@@ -124,8 +97,8 @@ End
 
 Style EXT.
   Margin                Dynamic
-  LatexType             Environment
+  LatexType             Command
-  LatexName             exterior
+  LatexName             exteriorshot
   ParIndent             ""
   ParSkip               0.8
   TopSep		1.0
@@ -135,20 +108,6 @@ Style EXT.
   LabelString		"EXT. "
 End
 
-# Dialogue style definition. Actor dialog
-Style Dialogue
-  Margin                Static
-  LatexType             Environment
-  LatexName             dialogue
-  LeftMargin            MMMMMMMMMMMM
-  RightMargin		MMMMMMMMMMMM
-  ParSkip               0.0
-  TopSep		0.0
-  BottomSep		0.0
-  Align                 Left
-  AlignPossible         Left
-  LabelType             No_Label
-End
 # Speaker style definition, identifies speaker  ALL CAPS
 Style Speaker
   Margin                Static
@@ -190,6 +149,21 @@ EndFont
 
 End
 
+# Dialogue style definition. Actor dialog
+Style Dialogue
+  Margin                Static
+  LatexType             Environment
+  LatexName             dialogue
+  LeftMargin            MMMMMMMMMMMM
+  RightMargin		MMMMMMMMMMMM
+  ParSkip               0.0
+  TopSep		0.0
+  BottomSep		0.0
+  Align                 Left
+  AlignPossible         Left
+  LabelType             No_Label
+End
+
 # Transition style definition ALL CAPS
 Style Transition
   Margin                Static
@@ -205,7 +179,7 @@ End
 
 Style FADE_OUT:
   Margin                Dynamic
-  LatexType             Environment
+  LatexType             Command
   LatexName             fadeout
   ParIndent             ""
   ParSkip               0.8

lib/tex/broadway.cls

@@ -1,16 +1,11 @@
 %% Author: Garst R. Reese  reese@isn.net
-%% This is file `broadway.cls', which provides the current
+%% This is file `broadway.cls', which provides a format for writing
-%% preferred format for submission of "spec" scripts
+%% plays.
-%% It is a pretty dull and uninteresting format, but it sells
 %% Derived from report.cls. There is probably still a lot of stuff
 %% that could be deleted. 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{broadway} [1999/02/09 v1.0 uses broadway.layout]
-\newcounter{act}
-%\newcounter{scene}[act]
 \renewcommand{\ref}[1]{#1}
-\renewcommand{\theact}{\Roman{act}}
-%\renewcommand{\thescene}{SCENE\arabic{scene}}
 \newcommand\@ptsize{}
 \newif\if@restonecol
 \newif\if@titlepage
@@ -112,10 +107,6 @@
 \@beginparpenalty -\@lowpenalty
 \@endparpenalty   -\@lowpenalty
 \@itempenalty     -\@lowpenalty
-%\renewcommand\theenumi{\@arabic\c@enumi}
-%\newcommand\labelenumi{SCENE\theenumi.}
-%\renewcommand\p@enumii{\theenumi}
-%\newcommand\labelitemi{\textbullet}
 \newenvironment{titlepage}
     {%
       \if@twocolumn
@@ -166,30 +157,21 @@
 \else
   \onecolumn
 \fi
-
+\usepackage{fancyhdr}
-\newenvironment{atrise}%
+\usepackage{extramarks}
-{\filbreak
+\usepackage{ifthen}
-\begin{list}{}{%
+\usepackage{lastpage}
-\leftmargin \rightmargin}
+\pagestyle{fancy}
-\item[]AT RISE:\ignorespaces}
+\lhead{\TheTitle}
-{\unskip \end{list}}
+\chead{\TheAuthor}
-
+\cfoot{}
-\newenvironment{scene}%
+\rhead{\thepage}
-{\filbreak
+% We do not want any hyphenation
-\stepcounter{scene}
+  \sloppy
-\begin{center}{}{%
+\newcommand{\TheAuthor}{}
-\center}
+\newcommand{\Author}[1]{\renewcommand{\TheAuthor}{#1}}
-\item[]SCENE \ignorespaces}
+\newcommand{\TheTitle}{}
-{\unskip \end{center}}
+\newcommand{\Title}[1]{\renewcommand{\TheTitle}{#1}}
-
-\newenvironment{act}%
-{\filbreak
-\stepcounter{act}
-%\setcounter{scene}{0}
-\begin{center}{}{%
-\center}
-\item[]ACT \theact \ignorespaces}
-{\unskip \end{center}}
 
 \newenvironment{dialogue}%
 {\raggedright
@@ -199,7 +181,7 @@
 \setlength{\parsep}{0mm}
 \setlength{\topsep}{0mm}}
 \item[] \ignorespaces}
-{\unskip \end{list}}
+{\unskip \end{list}}%
 
 \newenvironment{narrative}%
 {\raggedright
@@ -219,6 +201,7 @@
 \center
 \setlength{\parsep}{0mm}
 \setlength{\topsep}{2mm}}
+\vspace{-24bp}
 \item[] \ignorespaces}
 {\unskip \end{center}}
 
@@ -226,10 +209,22 @@
 {\fontshape{it}\selectfont{}
 \begin{center}{}{%
 \center
+\vspace{-30bp}
 \setlength{\parsep}{0mm}
 \setlength{\topsep}{0mm}}
 	\item[](\ignorespaces}
-{\unskip)\end{center}}
+{\unskip )\end{center}}
+\newcounter{actctr}
+\newcounter{scenectr}[actctr]
+\renewcommand{\theactctr}{\Roman{actctr}}
+\renewcommand{\thescenectr}{\arabic{scenectr}}
+\providecommand{\atrise}{\par\raggedright AT RISE: }%
+\providecommand{\scenestar}{\filbreak\par\centering SCENE }%
+\providecommand{\scene}{%
+\filbreak\par\stepcounter{scenectr}\centering SCENE \thescenectr}%
+\providecommand{\act}{%
+\stepcounter{actctr}\filbreak\setcounter{scenectr}{0}\par\centering ACT \theactctr\par}%
+\providecommand{\curtain}{\filbreak\par\centering CURTAIN \par}%
 
 \endinput
 %%

lib/tex/hollywood.cls

@@ -151,26 +151,35 @@
 \else
   \onecolumn
 \fi
-\newenvironment{fadein}%
+\usepackage{fancyhdr}
-{\begin{list}{}{%
+\usepackage{extramarks}
-\leftmargin \rightmargin}
+\usepackage{ifthen}
-\item[]FADE IN:\ignorespaces}
+\usepackage{lastpage}
-{\unskip \end{list}}
+\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)}
+%  {\ifthenelse{\value{page}=\pageref{LastPage}}{(END)}{}}}
 
-\newenvironment{interior}%
-{\filbreak
-\begin{list}{}{%
-\leftmargin \rightmargin}
-\item[]INT. \ignorespaces}
-{\unskip \end{list}}
-
-\newenvironment{exterior}%
-{filbreak
-\begin{list}{}{%
-\leftmargin \rightmargin}
-\item[]EXT. \ignorespaces}
-{\unskip \end{list}}
 
+% 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}
+  % This is to negate the effect of the ~ that LyX adds everywhere
+ \let~=\space
+  % this protects you against the fact that TeX does not want to
+  % hyphenate in typewriter font. It is possible to enable
+  % hyphenation, but I do not remember how.
+  % That's good because we -do not- want any hyphenation.
+  \sloppy
+\newcommand{\fadein}{\filbreak\raggedright\par FADE IN: }%
+\newcommand{\fadeout}{\filbreak\raggedright\par FADE OUT }%
+\newcommand{\interiorshot}{\filbreak\raggedright\par INT. }%
+\newcommand{\exteriorshot}{\filbreak\raggedright\par EXT. }%
 \newenvironment{dialogue}%
 {\raggedright
 \begin{list}{}{%
@@ -209,12 +218,7 @@
 	\item[](\ignorespaces}
 {\unskip)\end{list}}
 
-\newenvironment{fadeout}%
+
-{\filbreak
-\begin{list}{}{%
-\leftmargin \rightmargin}
-\item[]FADE OUT: \ignorespaces}
-{\unskip \end{list}}
 
 
 \endinput

src/debug.C

@@ -27,6 +27,7 @@ struct error_item {
 };
 
 static error_item errorTags[] = {
+	{ Debug::NONE,		"none",		"No debugging message"},
 	{ Debug::INFO,		"info",		"General information"},
 	{ Debug::INIT,		"init",		"Program initialisation"},
 	{ Debug::KEY,		"key",		"Keyboard events handling"},
@@ -35,7 +36,6 @@ static error_item errorTags[] = {
 	{ Debug::LYXRC,		"lyxrc",	"Configuration files reading"},
 	{ Debug::KBMAP,		"kbmap",	"Custom keyboard definition"},
 	{ Debug::LATEX,		"latex",	"LaTeX generation/execution"},
-	{ Debug::DEPEND,        "depend",       "Dependency information"},
 	{ Debug::MATHED,	"mathed",	"Math editor"},
 	{ Debug::FONT,		"font",		"Font handling"},
 	{ Debug::TCLASS,	"tclass",	"Textclass files reading"},
@@ -44,8 +44,8 @@ static error_item errorTags[] = {
 	{ Debug::ROFF,		"roff",		"Keep *roff temporary files"},
 	{ Debug::ACTION,	"action",	"User commands"},
 	{ Debug::LYXLEX,        "lyxlex",       "The LyX Lexxer"},
+	{ Debug::DEPEND,        "depend",       "Dependency information"},
 	{ Debug::INSETS,	"insets",	"LyX Insets"},
-	{ Debug::NONE,		"none",		"No debugging message"},
         { Debug::ANY,		"any",          "All debugging messages"}
 };
 
@@ -94,7 +94,7 @@ void Debug::showLevel(ostream & o, Debug::type level)
 void Debug::showTags(ostream & os) 
 {
 	for (int i = 0 ; i < numErrorTags ; ++i)
-		os << setw(5) << errorTags[i].level
+		os << setw(7) << errorTags[i].level
 		   << setw(10) << errorTags[i].name
 		   << "  " << errorTags[i].desc << '\n';
 	os.flush();

src/insets/insetbib.C

@@ -18,6 +18,7 @@
 #include "bibforms.h"
 #include "lyxtext.h"
 #include "support/filetools.h"
+#include "support/path.h"
 
 using std::ostream;
 using std::ifstream;
@@ -339,13 +340,10 @@ int InsetBibtex::Latex(ostream & os,
 	string db_in = getContents();
 	db_in = split(db_in, adb, ',');
 	while(!adb.empty()) {
-		if (!owner->niceFile) {
+		if (!owner->niceFile &&
-			string fname 
+		    IsFileReadable(MakeAbsPath(adb, owner->filepath)+".bib")) 
-				= findtexfile(ChangeExtension(adb, "bib"),
+                         adb = MakeAbsPath(adb, owner->filepath);
-					      "bib");
+
-			if (!fname.empty())
-				adb = ChangeExtension(fname, string());
-		}
 		db_out += adb;
 		db_out += ',';
 		db_in= split(db_in, adb,',');
@@ -379,6 +377,8 @@ string InsetBibtex::getKeys(char delim)
 	//	owner = current_view->buffer();
 	//}
 	
+	Path p(owner->filepath);
+
 	string tmp, keys;
 	string bibfiles = getContents();
 	bibfiles = split(bibfiles, tmp, ',');