Update project some more

.gitattributes

@@ -1,38 +1,52 @@
-# .gitattributes template for an open font design workflow 
-# Designed to tell git how to best deal with certain file formats 
-# To tweak to your particular needs, see http://git-scm.com/book/en/Customizing-Git-Git-Attributes
+# .gitattributes template for an open font design workflow
+# Designed to tell git how to best deal with certain file formats
+# The goal for eols is to have LF in the repo and
+# LF in the working copy on all platforms.
+# To tweak to your particular needs,
+# see http://git-scm.com/book/en/Customizing-Git-Git-Attributes
 
-# Set the default behavior, in case people don't have core.autocrlf set.
+# Windows users should use consider setting "core.autocrlf" to "input" and
+# "core.eol" to "lf"
+# to catch files that are not explicitly declared below.
+# See http://git-scm.com/docs/git-config
+
+# This causes git to auto detect text files
+# which will have eol conversion applied according to core.autocrlf and core.eol
 * text=auto
 
-# Set the default behavior, we expect Windows users to use a VM for now 
-[attr]text eol=lf
-
-# Explicitly declare text files to always be normalized and converted
-# to native line endings on checkout.
-*.cfg text
-*.ftml text
-*.gdl text
-*.gdh text
-*.htxt text
-*.md text
-*.sile text
-*.srctext text 
-*.tex text
-*.txt text
-*.TXT text
-*.vtp text
-*.xdvtxt text
-*.xsl text
-*.xml text
-
-wscript text
+# Explicitly declare the below matches to be text files, to keep LF eols when
+# writing to the working copy, and to convert CRLF to LF eols when adding to the repo.
+# TODO: consider uncommenting the below line starting with [attr] and
+# removing "eol=lf" from the below lines
+#[attr]text text eol=lf
+
+*.cfg text eol=lf
+*.css text eol=lf
+*.fea text eol=lf
+*.ftml text eol=lf
+*.gdl text eol=lf
+*.gdh text eol=lf
+*.html text eol=lf
+*.htxt text eol=lf
+*.md text eol=lf
+*.sil text eol=lf
+*.srctext text eol=lf
+*.tex text eol=lf
+*.txt text eol=lf
+*.TXT text eol=lf
+*.vtp text eol=lf
+*.xdvtxt text eol=lf
+*.xsl text eol=lf
+*.xml text eol=lf
+
+preflight text eol=lf
+wscript text eol=lf
 
 # Declare text files that will stay in LF (i.e. not expected to be used on Windows)
-*.sh eol=lf
+*.sh text eol=lf
 *.sfd text eol=lf
 
-# Keep these as Linux because vfb2ufo generates Linux line-endings, even on Windows:
+# Keep these as LF because vfb2ufo generates LF, even on Windows:
 *.glif text eol=lf
 *.plist text eol=lf
 
@@ -45,7 +59,7 @@ wscript text
 *.PDF binary
 
 # other document formats
-*.pdf  diff=astextplain
+*.pdf diff=astextplain
 *.PDF diff=astextplain
 *.doc diff=astextplain
 *.DOC diff=astextplain

.gitignore

@@ -64,7 +64,6 @@ $RECYCLE.BIN/
 *.sfd-*
 
 # Opaque formats to keep out of git
-*.vfb
 *.fog
 *.vfc
 
@@ -98,4 +97,3 @@ $RECYCLE.BIN/
 *.py[co]
 *$py.class
 __pycache__/
-