1 files changed, 62 insertions, 81 deletions
diff --git a/atari/font.c b/atari/font.c
index 6b3cc6f77..729986ca6 100755..100644
--- a/atari/font.c
+++ b/atari/font.c
@@ -1,60 +1,42 @@
-/*
- * Copyright 2010 Ole Loots <ole@monochrom.net>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <inttypes.h>
-#include <assert.h>
-/*
- * Copyright 2012 Ole Loots <ole@monochrom.net>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * Copyright 2010 Ole Loots <ole@monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdbool.h>
-
-#include "desktop/font.h"
-#include "utils/utf8.h"
-#include "utils/log.h"
-#include "utils/nsoption.h"
-#include "desktop/mouse.h"
-#include "desktop/plotters.h"
-
-#include "atari/gui.h"
-#include "atari/plot/fontplot.h"
-#include "atari/plot/plot.h"
-#include "atari/findfile.h"
-#include "atari/font.h"
-
-extern FONT_PLOTTER fplotter;
-
-static bool atari_font_position_in_string(const plot_font_style_t * fstyle,const char *string,
-						size_t length,int x, size_t *char_offset, int *actual_x )
+#include <inttypes.h>
+#include <assert.h>
+#include <stdbool.h>
+
+#include "desktop/font.h"
+#include "utils/utf8.h"
+#include "utils/log.h"
+#include "utils/nsoption.h"
+#include "desktop/mouse.h"
+#include "desktop/plotters.h"
+
+#include "atari/gui.h"
+#include "atari/plot/fontplot.h"
+#include "atari/plot/plot.h"
+#include "atari/findfile.h"
+#include "atari/font.h"
+
+extern FONT_PLOTTER fplotter;
+
+static bool atari_font_position_in_string(const plot_font_style_t * fstyle,const char *string,
+						size_t length,int x, size_t *char_offset, int *actual_x )
 {
     float scale = plot_get_scale();
 
@@ -64,13 +46,13 @@ static bool atari_font_position_in_string(const plot_font_style_t * fstyle,const
         fplotter->pixel_pos(fplotter, &newstyle, string, length, x, char_offset, actual_x);
     } else {
         fplotter->pixel_pos(fplotter, fstyle, string, length, x, char_offset, actual_x);
-    }
-
-	return( true );
-}
-
-static bool atari_font_split( const plot_font_style_t * fstyle, const char *string,
-					  size_t length,int x, size_t *char_offset, int *actual_x )
+    }
+
+	return( true );
+}
+
+static bool atari_font_split( const plot_font_style_t * fstyle, const char *string,
+					  size_t length,int x, size_t *char_offset, int *actual_x )
 {
     float scale = plot_get_scale();
 
@@ -83,13 +65,13 @@ static bool atari_font_split( const plot_font_style_t * fstyle, const char *stri
         fplotter->str_split(fplotter, fstyle, string, length, x, char_offset,
                             actual_x);
     }
-
-
-	return( true );
-}
-
-static bool atari_font_width( const plot_font_style_t *fstyle, const char * str,
-					  size_t length, int * width  )
+
+
+	return( true );
+}
+
+static bool atari_font_width( const plot_font_style_t *fstyle, const char * str,
+					  size_t length, int * width  )
 {
     float scale = plot_get_scale();
 
@@ -100,15 +82,14 @@ static bool atari_font_width( const plot_font_style_t *fstyle, const char * str,
     } else {
         fplotter->str_width(fplotter, fstyle, str, length, width);
     }
-
-
-	return( true );
-}
-
-const struct font_functions nsfont = {
-	atari_font_width,
-	atari_font_position_in_string,
-	atari_font_split
-};
-
-
+
+
+	return( true );
+}
+
+const struct font_functions nsfont = {
+	atari_font_width,
+	atari_font_position_in_string,
+	atari_font_split
+};
+