Move to scripting.h all the prototypes of non-static scripting.c func…

…tions

fontforge/baseviews.h

@@ -438,7 +438,6 @@ extern void _CVMenuMakeLine(CharViewBase *cv,int do_arc,int ellipse_to_back);
 extern void MVCopyChar(FontViewBase *fv, BDFFont *bdf, SplineChar *sc, enum fvcopy_type fullcopy);
 extern void PasteIntoMV(FontViewBase *fv, BDFFont *bdf,SplineChar *sc, int doclear);
 
-extern void ExecuteScriptFile(FontViewBase *fv, SplineChar *sc, char *filename);
 
 enum search_flags { sv_reverse = 0x1, sv_flips = 0x2, sv_rotate = 0x4,
 	sv_scale = 0x8, sv_endpoints=0x10 };

fontforge/fontforge.h

@@ -41,9 +41,6 @@ static const unsigned unicode4_size = 17*65536;
     /* Unicode goes up to 0x10ffff */
 
 
-extern void ProcessNativeScript(int argc, char *argv[], FILE *script);
-extern void CheckIsScript(int argc, char *argv[]);
-
 extern int32 unicode_from_adobestd[256];
 
 /* unicode_nameannot - Deprecated, but kept for older programs to access. */

fontforge/scripting.c

@@ -28,6 +28,8 @@
 
 #include <fontforge-config.h>
 
+#include "scripting.h"
+
 #include "autohint.h"
 #include "autotrace.h"
 #include "autowidth.h"
@@ -80,7 +82,6 @@
 #endif
 #include "ttf.h"
 #include "plugins.h"
-#include "scripting.h"
 #include "scriptfuncs.h"
 #include "flaglist.h"
 #include "gutils/prefs.h"

fontforge/scripting.h

@@ -25,14 +25,17 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _SCRIPTING_H
-#define _SCRIPTING_H
+#ifndef FONTFORGE_SCRIPTING_H
+#define FONTFORGE_SCRIPTING_H
 
 #include "fontforge-config.h"
 
+#include "baseviews.h"
 #include "fontforgevw.h"
+
 #include <setjmp.h>
 #include <stdarg.h>
+#include <stdio.h>
 
 /* If users want to write user defined scripting built-in functions they will */
 /*  need this file. The most relevant structure is the Context */
@@ -157,4 +160,9 @@ extern void ff_statement(Context*);
 extern void DictionaryFree(struct dictionary *dica);
 #endif
 
-#endif	/* _SCRIPTING_H */
+extern char **GetFontNames(char *filename, int do_slow);
+extern void ProcessNativeScript(int argc, char *argv[], FILE *script);
+extern void CheckIsScript(int argc, char *argv[]);
+extern void ExecuteScriptFile(FontViewBase *fv, SplineChar *sc, char *filename);
+
+#endif /* FONTFORGE_SCRIPTING_H */

fontforge/splinefont.h

@@ -2740,7 +2740,6 @@ extern void ArchiveCleanup(char *archivedir);
 extern char *Unarchive(char *name, char **_archivedir);
 extern char *Decompress(char *name, int compression);
 extern uint16 MacStyleCode( SplineFont *sf, uint16 *psstyle );
-extern char **GetFontNames(char *filename, int do_slow);
 extern char **NamesReadSFD(char *filename);
 extern char **NamesReadSVG(char *filename);
 extern char **NamesReadUFO(char *filename);

fontforgeexe/openfontdlg.c

@@ -27,6 +27,8 @@
  */
 #include "fontforgeui.h"
 #include "namelist.h"
+#include "scripting.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <ustring.h>

fontforgeexe/startnoui.c

@@ -25,6 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "fontforgevw.h"
+#include "scripting.h"
+
 #ifndef _NO_LIBUNICODENAMES
 #include <libunicodenames.h>	/* need to open a database when we start */
 extern uninm_names_db names_db; /* Unicode character names and annotations database */

fontforgeexe/startui.c

@@ -34,6 +34,7 @@
 #include "encoding.h"
 #include "fontforgeui.h"
 #include "lookups.h"
+
 #ifndef _NO_LIBUNICODENAMES
 #include <libunicodenames.h>	/* need to open a database when we start */
 extern uninm_names_db names_db; /* Unicode character names and annotations database */
@@ -102,6 +103,7 @@ extern void setup_cocoa_app();
 #endif
 
 #include "collabclientui.h"
+#include "scripting.h"
 
 extern int AutoSaveFrequency;
 int splash = 1;

fontforgeexe/windowmenu.c

@@ -30,6 +30,7 @@
 #include "basics.h"
 #include <gfile.h>
 #include "splinefont.h"
+#include "scripting.h"
 #include "ustring.h"
 
 static void WindowSelect(GWindow base,struct gmenuitem *mi,GEvent *e) {