Browse Source

Merge branch 'zb/userdiff-fountain'

New userdiff pattern definition for fountain screenwriting markup
format.

* zb/userdiff-fountain:
  userdiff: add support for Fountain documents
maint
Junio C Hamano 10 years ago
parent
commit
c12401705c
  1. 2
      Documentation/gitattributes.txt
  2. 1
      t/t4018-diff-funcname.sh
  3. 4
      t/t4018/fountain-scene
  4. 2
      userdiff.c

2
Documentation/gitattributes.txt

@ -527,6 +527,8 @@ patterns are available: @@ -527,6 +527,8 @@ patterns are available:

- `fortran` suitable for source code in the Fortran language.

- `fountain` suitable for Fountain documents.

- `html` suitable for HTML/XHTML documents.

- `java` suitable for source code in the Java language.

1
t/t4018-diff-funcname.sh

@ -31,6 +31,7 @@ diffpatterns=" @@ -31,6 +31,7 @@ diffpatterns="
cpp
csharp
fortran
fountain
html
java
matlab

4
t/t4018/fountain-scene

@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
EXT. STREET RIGHT OUTSIDE - DAY

CHARACTER
You didn't say the magic phrase, "ChangeMe".

2
userdiff.c

@ -35,6 +35,8 @@ IPATTERN("fortran", @@ -35,6 +35,8 @@ IPATTERN("fortran",
* they would have been matched above as a variable anyway. */
"|[-+]?[0-9.]+([AaIiDdEeFfLlTtXx][Ss]?[-+]?[0-9.]*)?(_[a-zA-Z0-9][a-zA-Z0-9_]*)?"
"|//|\\*\\*|::|[/<>=]="),
IPATTERN("fountain", "^((\\.[^.]|(int|ext|est|int\\.?/ext|i/e)[. ]).*)$",
"[^ \t-]+"),
PATTERNS("html", "^[ \t]*(<[Hh][1-6][ \t].*>.*)$",
"[^<>= \t]+"),
PATTERNS("java",

Loading…
Cancel
Save