{"thread":{"id":"39869","subject":"[PATCH] userdiff: add support for Fountain documents","startedAt":"2015-07-17T11:59:11Z","lastAt":"2015-07-17T16:20:01Z","messageCount":4,"participants":["Zoë Blade","Johannes Schindelin","Zoë Blade"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"266230","messageId":"1437134351-15392-1-git-send-email-zoe@bytenoise.co.uk","threadId":"39869","inReplyTo":null,"subject":"[PATCH] userdiff: add support for Fountain documents","fromName":"Zoë Blade","fromEmail":"zoe@bytenoise.co.uk","sentAt":"2015-07-17T11:59:11Z","receivedAt":"2015-07-17T11:59:11Z","isPatch":true,"sender":{"key":"zoe@bytenoise.co.uk","avatar":"https://avatars.githubusercontent.com/u/502434?v=4"},"body":"Add support for Fountain, a plain text screenplay format. In the\nstructure of a screenplay, scenes are roughly analogous to functions,\nin the sense that it makes your job slightly easier if you can see\nwhich ones were changed in a given range of patches.\n---\n Documentation/gitattributes.txt | 2 ++\n t/t4018-diff-funcname.sh | 1 +\n t/t4018/fountain-scene | 4 ++++\n userdiff.c | 2 ++\n 4 files changed, 9 insertions(+)\n create mode 100644 t/t4018/fountain-scene\n\ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex 81fe586..e3b1de8 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -527,6 +527,8 @@ patterns are available:\n \n - `fortran` suitable for source code in the Fortran language.\n \n+- `fountain` suitable for Fountain documents.\n+\n - `html` suitable for HTML/XHTML documents.\n \n - `java` suitable for source code in the Java language.\ndiff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh\nindex 1dbaa38..67373dc 100755\n--- a/t/t4018-diff-funcname.sh\n+++ b/t/t4018-diff-funcname.sh\n@@ -31,6 +31,7 @@ diffpatterns=\"\n \tcpp\n \tcsharp\n \tfortran\n+\tfountain\n \thtml\n \tjava\n \tmatlab\ndiff --git a/t/t4018/fountain-scene b/t/t4018/fountain-scene\nnew file mode 100644\nindex 0000000..6b3257d\n--- /dev/null\n+++ b/t/t4018/fountain-scene\n@@ -0,0 +1,4 @@\n+EXT. STREET RIGHT OUTSIDE - DAY\n+\n+CHARACTER\n+You didn't say the magic phrase, \"ChangeMe\".\ndiff --git a/userdiff.c b/userdiff.c\nindex 2ccbee5..5316b48 100644\n--- a/userdiff.c\n+++ b/userdiff.c\n@@ -35,6 +35,8 @@ IPATTERN(\"fortran\",\n \t * they would have been matched above as a variable anyway. */\n \t \"|[-+]?[0-9.]+([AaIiDdEeFfLlTtXx][Ss]?[-+]?[0-9.]*)?(_[a-zA-Z0-9][a-zA-Z0-9_]*)?\"\n \t \"|//|\\\\*\\\\*|::|[/<>=]=\"),\n+PATTERNS(\"fountain\", \"^((INT|EST|EXT)?\\\\.[A-Z0-9' -]+)$\",\n+\t \"[^ \\t-]+\"),\n PATTERNS(\"html\", \"^[ \\t]*(<[Hh][1-6][ \\t].*>.*)$\",\n \t \"[^<>= \\t]+\"),\n PATTERNS(\"java\",\n-- \n2.5.0.rc2.28.g6003e7f.dirty\n"},{"id":"266234","messageId":"e2ddebd5451a9331e03b24c719f68530@www.dscho.org","threadId":"39869","inReplyTo":"1437134351-15392-1-git-send-email-zoe@bytenoise.co.uk","subject":"Re: [PATCH] userdiff: add support for Fountain documents","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2015-07-17T13:03:46Z","receivedAt":"2015-07-17T13:03:46Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Zoë,\n\nOn 2015-07-17 13:59, Zoë Blade wrote:\n> Add support for Fountain, a plain text screenplay format. In the\n> structure of a screenplay, scenes are roughly analogous to functions,\n> in the sense that it makes your job slightly easier if you can see\n> which ones were changed in a given range of patches.\n\nInteresting!\n\nMaybe you want to add a paragraph explaining a bit more about Fountain, or at least link to http://fountain.io/?\n\nIn any case, you will need to sign off on your patch:\n\n https://github.com/git/git/blob/v2.4.6/Documentation/SubmittingPatches#L234-L286\n\nCiao,\nJohannes\n"},{"id":"266237","messageId":"9078E9B2-7EB5-4FC9-BE1B-93D67B4D7D2A@bytenoise.co.uk","threadId":"39869","inReplyTo":"e2ddebd5451a9331e03b24c719f68530@www.dscho.org","subject":"Re: [PATCH] userdiff: add support for Fountain documents","fromName":"Zoë Blade","fromEmail":"zoe@bytenoise.co.uk","sentAt":"2015-07-17T14:03:37Z","receivedAt":"2015-07-17T14:03:37Z","isPatch":true,"sender":{"key":"zoe@bytenoise.co.uk","avatar":"https://avatars.githubusercontent.com/u/502434?v=4"},"body":"On 17 Jul 2015, at 14:03, Johannes Schindelin wrote:\n\n> Maybe you want to add a paragraph explaining a bit more about Fountain, or at least link to http://fountain.io/?\n> \n> In any case, you will need to sign off on your patch:\n> \n> https://github.com/git/git/blob/v2.4.6/Documentation/SubmittingPatches#L234-L286\n\nThanks, I'll amend it accordingly. I originally mentioned the Fountain site in my rough draft of the commit message, but then removed it again after reading more of the patch submitting documentation and not spotting the nuance about when is and isn't a good time to include URLs. No bother, I managed the commit message in another repo... :D I'll bring it back and tidy it up a bit, then sign it off.\n\nThanks,\nZoë."},{"id":"266245","messageId":"18517252c6c90729777105d4029a1649@www.dscho.org","threadId":"39869","inReplyTo":"9078E9B2-7EB5-4FC9-BE1B-93D67B4D7D2A@bytenoise.co.uk","subject":"Re: [PATCH] userdiff: add support for Fountain documents","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2015-07-17T16:20:01Z","receivedAt":"2015-07-17T16:20:01Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Zoë,\n\nOn 2015-07-17 16:03, Zoë Blade wrote:\n> On 17 Jul 2015, at 14:03, Johannes Schindelin\n> wrote:\n> \n>> Maybe you want to add a paragraph explaining a bit more about Fountain, or at least link to http://fountain.io/?\n>>\n>> In any case, you will need to sign off on your patch:\n>>\n>> https://github.com/git/git/blob/v2.4.6/Documentation/SubmittingPatches#L234-L286\n> \n> Thanks, I'll amend it accordingly. I originally mentioned the\n> Fountain site in my rough draft of the commit message, but then\n> removed it again after reading more of the patch submitting\n> documentation and not spotting the nuance about when is and isn't a\n> good time to include URLs. No bother, I managed the commit message in\n> another repo... :D I'll bring it back and tidy it up a bit, then sign\n> it off.\n\nThank you!\nDscho\n"}]}