From 7b2fb4cba22f1247514cd6d1cbad3ea7a22166c2 Mon Sep 17 00:00:00 2001
From: Boris Faure <billiob@gmail.com>
Date: Mon, 21 Mar 2011 15:55:06 +0000
Subject: [PATCH] epp: fix line numbering

SVN revision: 57936
---
 legacy/edje/src/bin/epp/cpplib.c  | 17 ++++++++++++++++-
 legacy/edje/src/bin/epp/cppmain.c |  2 --
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/legacy/edje/src/bin/epp/cpplib.c b/legacy/edje/src/bin/epp/cpplib.c
index f741e2767d..d5db4505a0 100644
--- a/legacy/edje/src/bin/epp/cpplib.c
+++ b/legacy/edje/src/bin/epp/cpplib.c
@@ -4606,7 +4606,22 @@ cpp_get_token(cpp_reader * pfile)
 	       }
 	     else if (CPP_TRADITIONAL(pfile))
 	       {
-		  return CPP_COMMENT;
+		  if (newlines > 0)
+		     {
+			output_line_command(pfile, 0, same_file);
+			return CPP_VSPACE;
+		     }
+		  else
+		    {
+			return CPP_COMMENT;
+		    }
+	       }
+	     else if (newlines > 0)
+	       {
+		 output_line_command(pfile, 0, same_file);
+		 CPP_RESERVE(pfile, 1);
+		 CPP_PUTC_Q(pfile, ' ');
+		 return CPP_VSPACE;
 	       }
 	     else
 	       {
diff --git a/legacy/edje/src/bin/epp/cppmain.c b/legacy/edje/src/bin/epp/cppmain.c
index 0cf2d94dff..543d4187bc 100644
--- a/legacy/edje/src/bin/epp/cppmain.c
+++ b/legacy/edje/src/bin/epp/cppmain.c
@@ -90,8 +90,6 @@ main(int argc, char **argv)
 	     continue;
 
 	  case CPP_VSPACE:
-	     if (!got_text)
-		goto next;
 	     break;
 
 	  default: