From c3b70e96636fe223766cdd1b3b8ff21df1e0c302 Mon Sep 17 00:00:00 2001 From: carson fire Date: Mon, 20 Feb 2012 00:00:00 +0100 Subject: More minor improvements. Notes fixed. --- fountain.vim | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/fountain.vim b/fountain.vim index 080612e..6732b54 100644 --- a/fountain.vim +++ b/fountain.vim @@ -3,8 +3,8 @@ " File: .fountain, .spmd, .txt " Reference: http://fountain.io/ " Maintainer: Carson Fire -" Last Change: February 19, 2012 -" Version: 2.01 +" Last Change: February 20, 2012 +" Version: 2.02 if exists("b:current_syntax") finish @@ -12,27 +12,27 @@ endif syn sync minlines=200 syn match fountainSection1 "^\s*# \(\_[^#]\)" fold transparent contains=ALL -syn region fountainTitlePage start="\%^\(.*\):" end="^$" contains=fountainBoneyard +syn region fountainTitlePage start="\%^\(.*\):" end="^$" contains=fountainBoneyard,fountainNotes syn match fountainCharacter "^\(\L\)*$" -syn region fountainDialogue matchgroup=fountainCharacter start="^\(\L\)*$" end="^\s*$" contains=fountainCharacter,fountainParenthetical,fountainBoneyard,fountainEmphasis -syn match fountainParenthetical "^\s*\((.*)\)$" contained contains=fountainBoneyard -syn match fountainTransition "^\(\L\)* TO:$" contains=fountainBoneyard -syn match fountainTransitionForced "^\s*>\(.*\)" contains=fountainBoneyard -syn match fountainCentered "^\s*>\(.*\)<" contains=fountainBoneyard +syn region fountainDialogue matchgroup=fountainCharacter start="^\(\L\)*$" end="^\s*$" contains=fountainCharacter,fountainParenthetical,fountainBoneyard,fountainNotes,fountainEmphasis +syn match fountainParenthetical "^\s*\((.*)\)$" contained contains=fountainBoneyard,fountainNotes +syn match fountainTransition "^\(\L\)* TO:$" contains=fountainBoneyard,fountainNotes +syn match fountainTransitionForced "^\s*>\(.*\)" contains=fountainBoneyard,fountainNotes +syn match fountainCentered "^\s*>\(.*\)<" contains=fountainBoneyard,fountainNotes syn match fountainUnderlined "_[^_]*_" syn match fountainItalic "\*[^\*]*\*" syn match fountainBold "\*\*[^\*]*\*\*" syn match fountainBoldItalic "\*\*\*[^\*]*\*\*\*" syn match fountainPagebreak "^===[=]*$" -syn region fountainNotes start="\[\[" end="\]\]" contains=fountainBoneyard -syn region fountainHeader1 start="^\s*# " end="$" contains=fountainBoneyard -syn region fountainHeader2 start="^\s*## " end="$" contains=fountainBoneyard -syn region fountainHeader3 start="^\s*### " end="$" contains=fountainBoneyard -syn region fountainHeader4 start="^\s*#### " end="$" contains=fountainBoneyard -syn region fountainHeader5 start="^\s*##### " end="$" contains=fountainBoneyard -syn region fountainHeader6 start="^\s*###### " end="$" contains=fountainBoneyard -syn region fountainSynopses start="^\s*= " end="$" contains=fountainBoneyard -syn region fountainSceneHeading start="^\s*\(\.\|INT\. \|EXT\. \|INT\./EXT\. \|INT/EXT\. \|INT \|EXT \|INT/EXT \|I/E \|int\. \|ext\. \|int\./ext\. \|int/ext\. \|int \|ext \|int/ext \|i/e \)" end="$" contains=fountainSceneNumber,fountainBoneyard +syn region fountainNotes start="\[\[" end="\]\]" contains=xLineContinue +syn region fountainHeader1 start="^\s*# " end="$" contains=fountainBoneyard,fountainNotes +syn region fountainHeader2 start="^\s*## " end="$" contains=fountainBoneyard,fountainNotes +syn region fountainHeader3 start="^\s*### " end="$" contains=fountainBoneyard,fountainNotes +syn region fountainHeader4 start="^\s*#### " end="$" contains=fountainBoneyard,fountainNotes +syn region fountainHeader5 start="^\s*##### " end="$" contains=fountainBoneyard,fountainNotes +syn region fountainHeader6 start="^\s*###### " end="$" contains=fountainBoneyard,fountainNotes +syn region fountainSynopses start="^\s*= " end="$" contains=fountainBoneyard,fountainNotes +syn region fountainSceneHeading start="^\s*\(\.\|INT\. \|EXT\. \|INT\./EXT\. \|INT/EXT\. \|INT \|EXT \|INT/EXT \|I/E \|int\. \|ext\. \|int\./ext\. \|int/ext\. \|int \|ext \|int/ext \|i/e \)" end="$" contains=fountainSceneNumber,fountainBoneyard,fountainNotes syn region fountainBoneyard start="/\*" end="\*\/" contains=xLineContinue syn match xLineContinue "\\$" contained syn region fountainSceneNumber start="#" end="#" contained -- cgit