From a47a48277a7a3113201fdb68d65b29b14f748ce1 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Thu, 11 Sep 2014 20:34:41 +0200
Subject: [PATCH] Open delta exceptions file in text mode.

This also slightly simplifies the lexer code.
---
 frontend/main.cpp    | 9 +++++----
 frontend/maingui.cpp | 4 +---
 lib/tadeltas.flex    | 8 ++------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/frontend/main.cpp b/frontend/main.cpp
index 70fa3ea..71f292b 100644
--- a/frontend/main.cpp
+++ b/frontend/main.cpp
@@ -183,10 +183,13 @@ err(TA_Error error,
                         " while autohinting fonts",
                       error);
     else if (error >= 0x100 && error < 0x200)
+    {
       fprintf(stderr, "An error with code 0x%03x occurred"
                         " while parsing the argument of option `-X'",
                       error);
-    fprintf(stderr, (error_string || line) ? ":\n" : ".\n");
+      fprintf(stderr, (error_string || line) ? ":\n" : ".\n");
+    }
+
     if (error_string)
       fprintf(stderr, "  %s\n", error_string);
     if (line)
@@ -857,9 +860,7 @@ main(int argc,
   FILE* deltas = NULL;
   if (deltas_name)
   {
-    /* inspite of being a text file we open it in binary mode */
-    /* to make `TTF_autohint' handle different EOL conventions gracefully */
-    deltas = fopen(deltas_name, "rb");
+    deltas = fopen(deltas_name, "r");
     if (!deltas)
     {
       fprintf(stderr,
diff --git a/frontend/maingui.cpp b/frontend/maingui.cpp
index 48c8be4..a05d4ec 100644
--- a/frontend/maingui.cpp
+++ b/frontend/maingui.cpp
@@ -658,11 +658,9 @@ Main_GUI::open_files(const QString& input_name,
     return 0;
   }
 
-  // inspite of being a text file we open it in binary mode
-  // to make `TTF_autohint' handle different EOL conventions gracefully
   if (!deltas_name.isEmpty())
   {
-    *deltas = fopen(qPrintable(deltas_name), "rb");
+    *deltas = fopen(qPrintable(deltas_name), "r");
     if (!*deltas)
     {
       strerror_r(errno, buf, buf_len);
diff --git a/lib/tadeltas.flex b/lib/tadeltas.flex
index 76bf18d..629c45f 100644
--- a/lib/tadeltas.flex
+++ b/lib/tadeltas.flex
@@ -96,9 +96,7 @@ TA_deltas_scanner_fatal_error(const char* msg,
   /* skip whitespace */
 }
 
-(?x: ( "\r\n"
-     | "\n"
-     | "\r"
+(?x: ( "\n"
      | ";"
      )+
 ) {
@@ -117,9 +115,7 @@ TA_deltas_scanner_fatal_error(const char* msg,
     yyterminate();
 }
 
-(?x: ( "\\\r\n"
-     | "\\\n"
-     | "\\\r"
+(?x: ( "\\\n"
      )+
 ) {
   /* skip escaped newline */
-- 
2.11.4.GIT