X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fhollywood.layout;h=9881864e68187754b3fc51b99faad22663db8dcd;hb=d0af587ab4b93533955f40bf2ac099e71d60b4f4;hp=ca294d0f80f5eb0c54897d15f8b74f05d2a11324;hpb=a60b5c0b722b5c69bdf4504f37eb1ec2f927d8cc;p=lyx.git

diff --git a/lib/layouts/hollywood.layout b/lib/layouts/hollywood.layout
index ca294d0f80..9881864e68 100644
--- a/lib/layouts/hollywood.layout
+++ b/lib/layouts/hollywood.layout
@@ -1,5 +1,6 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[hollywood]{hollywood}
+#  \DeclareLaTeXClass[hollywood,calc.sty,fancyhdr.sty,ulem.sty]{Hollywood}
+#  \DeclareCategory{Scripts}
 # This layout follows the current Hollywood standard for movie scripts
 #
 # Font Courier 12 pts
@@ -15,6 +16,7 @@
 # Based on course given by Lars Davidson
 
 
+Format 48
 Columns                 1
 Sides                   1
 SecNumDepth             2
@@ -46,7 +48,6 @@ Style Dialogue
 	TopSep                0.0
 	BottomSep             0.0
 	Align                 Left
-	AlignPossible         Left
 	LabelType             No_Label
 End
 
@@ -62,7 +63,6 @@ Style More
 	BottomSep             0.0
 	KeepEmpty             1
 	Align                 Left
-	AlignPossible         Left
 	LabelType             Static
 	LabelString           "(MORE)"
 	Font
@@ -85,10 +85,10 @@ Style FADE_IN:
 	ParSkip               0.25
 	TopSep                0.25
 	Align                 Left
-	AlignPossible         Left
 	KeepEmpty             1
 	LabelType             Static
-	LabelString           "FADE IN: "
+	LabelSep              M
+	LabelString           "FADE IN:"
 End
 
 
@@ -105,9 +105,9 @@ Style INT.
 	ParSkip               0.25
 	TopSep                0.25
 	Align                 Left
-	AlignPossible         Left
 	LabelType             Static
-	LabelString           "INT. "
+	LabelSep              M
+	LabelString           "INT."
 End
 
 
@@ -119,9 +119,9 @@ Style EXT.
 	ParSkip               0.25
 	TopSep                0.25
 	Align                 Left
-	AlignPossible         Left
 	LabelType             Static
-	LabelString           "EXT. "
+	LabelSep              M
+	LabelString           "EXT."
 End
 
 
@@ -136,7 +136,6 @@ Style Description
 	TopSep                0.25
 	RightMargin           MMMMM
 	Align                 Left
-	AlignPossible         Left
 	LabelType             No_Label
 End
 
@@ -152,7 +151,6 @@ Style Speaker
 	TopSep                0.25
 	BottomSep             0.0
 	Align                 Left
-	AlignPossible         Left
 	LabelType             No_Label
 End
 
@@ -169,11 +167,10 @@ Style Parenthetical
 	BottomSep             0.0
 	ParSkip               0.0
 	Align                 Left
-	AlignPossible         Left
 	LabelType             Static
-	LabelString           (
+	LabelString           "("
 	EndLabelType          Static
-	EndLabelString        )
+	EndLabelString        ")"
 	Font
 	  Family              Typewriter
 	  Series              Medium
@@ -196,7 +193,6 @@ Style Continuing
 	ParSkip               0.0
 	KeepEmpty             1
 	Align                 Left
-	AlignPossible         Left
 	LabelType             Static
 	LabelString           "(continuing)"
 	Font
@@ -219,7 +215,6 @@ Style Narrative
 	TopSep                0.25
 	RightMargin           MMMMM
 	Align                 Left
-	AlignPossible         Left
 	LabelType             No_Label
 End
 
@@ -233,7 +228,6 @@ Style Transition
 	TopSep                0.5
 	ParSkip               0.4
 	Align                 Right
-	AlignPossible         Right
 	LabelType             No_Label
 End
 
@@ -246,10 +240,10 @@ Style TITLE_OVER:
 	ParSkip               0.5
 	TopSep                0.5
 	Align                 Left
-	AlignPossible         Left
 	KeepEmpty             1
 	LabelType             Static
-	LabelString           "TITLE OVER: "
+	LabelSep              M
+	LabelString           "TITLE OVER:"
 End
 
 
@@ -261,10 +255,10 @@ Style INTERCUT
 	ParSkip               0.25
 	TopSep                0.5
 	Align                 Left
-	AlignPossible         Left
 	KeepEmpty             1
 	LabelType             Static
-	LabelString           "INTERCUT WITH: "
+	LabelSep              M
+	LabelString           "INTERCUT WITH:"
 End
 
 
@@ -276,15 +270,16 @@ Style FADE_OUT
 	ParSkip               0.8
 	TopSep                1.0
 	Align                 Left
-	AlignPossible         Left
 	KeepEmpty             1
 	LabelType             Static
-	LabelString           "FADE OUT "
+	LabelSep              M
+	LabelString           "FADE OUT"
 End
 
 
 # Same as Standard, Standard deprecated
 Style General
+	Category              MainText
 	Margin                Static
 	LatexType             Paragraph
 	LatexName             dummy
@@ -305,7 +300,6 @@ Style Scene
 	ParSkip               0.25
 	TopSep                0.25
 	Align                 Left
-	AlignPossible         Left
 	LabelType             No_Label
 End
 
@@ -370,6 +364,7 @@ End
 #  LatexName            endcontinued
 #End
 
+Input stdinsets.inc
 Input stdtitle.inc
 Input stdstruct.inc
 Input stdfloats.inc