libfontembed: Renamed files to use "-", not "_", ¨-private.h" for non-API

Renamed all source files so that they do not use "_" but use "-"
instead.

Renamed header files which are not containing public API to
"*-private.h".

Let "make install" also install fontembed/embed-pdf.h as it is
included by the already installed fontembed/embed.h. This is also a
sign that no one has used libfontembed separate from cups-filters.

diff --git a/Makefile.am b/Makefile.am
index 42e223dd63fecb03ed186993e34f2831358a630d..10e9161c52ce0d8a82ba846efb10a816ab4f8281 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -333,6 +333,7 @@ pkgfontembedincludedir = $(includedir)/fontembed
 pkgfontembedinclude_DATA = \
        fontembed/bitset.h \
        fontembed/embed.h \
+       fontembed/embed-pdf.h \
        fontembed/fontfile.h \
        fontembed/iofn.h \
        fontembed/sfnt.h
@@ -340,47 +341,42 @@ pkgfontembedinclude_DATA = \
 lib_LTLIBRARIES += libfontembed.la
 
 check_PROGRAMS += \
-       test_analyze \
-       test_pdf \
-       test_ps
+       test-analyze \
+       test-pdf \
+       test-ps
 TESTS += \
-       test_analyze \
-       test_pdf \
-       test_ps
+       test-analyze \
+       test-pdf \
+       test-ps
 
 libfontembed_la_SOURCES = \
        fontembed/aglfn13.c \
-       fontembed/bitset.h \
        fontembed/dynstring.c \
-       fontembed/dynstring.h \
+       fontembed/dynstring-private.h \
        fontembed/embed.c \
-       fontembed/embed.h \
-       fontembed/embed_sfnt.c \
-       fontembed/embed_sfnt_int.h \
-       fontembed/embed_pdf.c \
-       fontembed/embed_pdf.h \
-       fontembed/embed_pdf_int.h \
+       fontembed/embed-sfnt.c \
+       fontembed/embed-sfnt-int-private.h \
+       fontembed/embed-pdf.c \
+       fontembed/embed-pdf-int-private.h \
        fontembed/fontfile.c \
-       fontembed/fontfile.h \
        fontembed/frequent.c \
-       fontembed/frequent.h \
-       fontembed/iofn.h \
-       fontembed/macroman.h \
+       fontembed/frequent-private.h \
+       fontembed/macroman-private.h \
        fontembed/sfnt.c \
-       fontembed/sfnt.h \
-       fontembed/sfnt_int.h \
-       fontembed/sfnt_subset.c
+       fontembed/sfnt-int-private.h \
+       fontembed/sfnt-subset.c \
+       $(pkgfontembedinclude_DATA)
 libfontembed_la_LDFLAGS = \
        -no-undefined \
        -version-info 1
 
-test_analyze_SOURCES = fontembed/test_analyze.c
+test_analyze_SOURCES = fontembed/test-analyze.c
 test_analyze_LDADD = libfontembed.la
 
-test_pdf_SOURCES = fontembed/test_pdf.c
+test_pdf_SOURCES = fontembed/test-pdf.c
 test_pdf_LDADD = libfontembed.la
 
-test_ps_SOURCES = fontembed/test_ps.c
+test_ps_SOURCES = fontembed/test-ps.c
 test_ps_LDADD = libfontembed.la
 
 EXTRA_DIST += \

diff --git a/fontembed/dynstring.h b/fontembed/dynstring-private.h
similarity index 100%
rename from fontembed/dynstring.h
rename to fontembed/dynstring-private.h

diff --git a/fontembed/dynstring.c b/fontembed/dynstring.c
index 0bdad157d2e81237e1d7ec3921e5640dad2a65c5..439bf698512f2dbaabd0f5d246aeb90f977b76af 100644 (file)
--- a/fontembed/dynstring.c
+++ b/fontembed/dynstring.c
@@ -1,4 +1,4 @@
-#include "dynstring.h"
+#include "dynstring-private.h"
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>

diff --git a/fontembed/embed_pdf_int.h b/fontembed/embed-pdf-int-private.h
similarity index 100%
rename from fontembed/embed_pdf_int.h
rename to fontembed/embed-pdf-int-private.h

diff --git a/fontembed/embed_pdf.c b/fontembed/embed-pdf.c
similarity index 98%
rename from fontembed/embed_pdf.c
rename to fontembed/embed-pdf.c
index 6317bd6b3b729207e5a5817de9a1c1ff0be1eada..0b242839af3e4e5cb3daa63caaab327862a3fd21 100644 (file)
--- a/fontembed/embed_pdf.c
+++ b/fontembed/embed-pdf.c
@@ -1,12 +1,12 @@
 #include "embed.h"
-#include "embed_pdf.h" // already included fron embed.h ...
-#include "embed_pdf_int.h"
-#include "embed_sfnt_int.h"
+#include "embed-pdf.h" // already included fron embed.h ...
+#include "embed-pdf-int-private.h"
+#include "embed-sfnt-int-private.h"
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <time.h>
-#include "frequent.h"
+#include "frequent-private.h"
 
 // NOTE: these must be in sync with the EMB_FORMAT enum
 static const char *emb_pdf_font_subtype[][2]={ // {{{ (output_format,multibyte)
@@ -352,7 +352,7 @@ EMB_PDF_FONTWIDTHS *emb_pdf_fontwidths(EMB_PARAMS *emb) // {{{
 // }}}
 
 /*** PDF out stuff ***/
-#include "dynstring.h"
+#include "dynstring-private.h"
 
 #define NEXT /* {{{ */ \
   if ( (len<0)||(len>=size) ) { \

diff --git a/fontembed/embed_pdf.h b/fontembed/embed-pdf.h
similarity index 100%
rename from fontembed/embed_pdf.h
rename to fontembed/embed-pdf.h

diff --git a/fontembed/embed_sfnt_int.h b/fontembed/embed-sfnt-int-private.h
similarity index 96%
rename from fontembed/embed_sfnt_int.h
rename to fontembed/embed-sfnt-int-private.h
index 9edc3e517e0730869b6d04442c6fe954b6a9e9c7..31ee3a50b14f07be2e3f5f5875bea695bf800634 100644 (file)
--- a/fontembed/embed_sfnt_int.h
+++ b/fontembed/embed-sfnt-int-private.h
@@ -2,7 +2,7 @@
 #define EMBED_SFNT_INT_H
 
 #include "sfnt.h"
-#include "embed_pdf.h"
+#include "embed-pdf.h"
 
 EMB_RIGHT_TYPE emb_otf_get_rights(OTF_FILE *otf);
 

diff --git a/fontembed/embed_sfnt.c b/fontembed/embed-sfnt.c
similarity index 99%
rename from fontembed/embed_sfnt.c
rename to fontembed/embed-sfnt.c
index b69502b08205f259f101de4a36a2417f24d37b98..ec49a6749cfdf6f906152c4bc2ed8cefe7a53481 100644 (file)
--- a/fontembed/embed_sfnt.c
+++ b/fontembed/embed-sfnt.c
@@ -1,8 +1,8 @@
 #include "embed.h"
-#include "embed_pdf_int.h"
-#include "embed_sfnt_int.h"
+#include "embed-pdf-int-private.h"
+#include "embed-sfnt-int-private.h"
 #include "sfnt.h"
-#include "sfnt_int.h"
+#include "sfnt-int-private.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -312,10 +312,10 @@ EMB_PDF_FONTWIDTHS *emb_otf_get_pdf_cidwidths(OTF_FILE *otf,const BITSET glyphs)
 
 /*** PS stuff ***/
 
-#include "dynstring.h"
+#include "dynstring-private.h"
 
 const char *aglfn13(unsigned short uni); // aglfn13.c
-#include "macroman.h"
+#include "macroman-private.h"
 
 // TODO? optimize pascal string skipping? (create index)
 // NOTE: might return a statically allocated string

diff --git a/fontembed/embed.c b/fontembed/embed.c
index cdf8054cfba3f1d98f1a7e689f12c526dd850ddd..26607d6d73e9e08df50040b394ee80c5ed0d2c6a 100644 (file)
--- a/fontembed/embed.c
+++ b/fontembed/embed.c
@@ -1,5 +1,5 @@
 #include "embed.h"
-#include "embed_sfnt_int.h"
+#include "embed-sfnt-int-private.h"
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>

diff --git a/fontembed/embed.h b/fontembed/embed.h
index 682471f4542433a821d9664a4beb1d35b6c354ce..6442918d6f95cb29fbd6c6a5e79f0c0177806ef2 100644 (file)
--- a/fontembed/embed.h
+++ b/fontembed/embed.h
@@ -87,6 +87,6 @@ static inline unsigned short emb_get(EMB_PARAMS *emb,int unicode) // {{{ gid
 }
 // }}}
 
-#include "embed_pdf.h"
+#include "embed-pdf.h"
 
 #endif

diff --git a/fontembed/frequent.h b/fontembed/frequent-private.h
similarity index 100%
rename from fontembed/frequent.h
rename to fontembed/frequent-private.h

diff --git a/fontembed/frequent.c b/fontembed/frequent.c
index eb8edbdf2053cc77c041714113473ec16389db9a..7a06b4e4b65ceb4194b9c5f1c02c35118959bfc2 100644 (file)
--- a/fontembed/frequent.c
+++ b/fontembed/frequent.c
@@ -1,4 +1,4 @@
-#include "frequent.h"
+#include "frequent-private.h"
 #include <assert.h>
 #include <stdlib.h>
 

diff --git a/fontembed/macroman.h b/fontembed/macroman-private.h
similarity index 100%
rename from fontembed/macroman.h
rename to fontembed/macroman-private.h

diff --git a/fontembed/sfnt_int.h b/fontembed/sfnt-int-private.h
similarity index 100%
rename from fontembed/sfnt_int.h
rename to fontembed/sfnt-int-private.h

diff --git a/fontembed/sfnt_subset.c b/fontembed/sfnt-subset.c
similarity index 99%
rename from fontembed/sfnt_subset.c
rename to fontembed/sfnt-subset.c
index dee34c5d3d11321958be9a3680396a9924cb9faa..93785ccd20c1e50abf2a79b3b5bfa1fb0e1e184d 100644 (file)
--- a/fontembed/sfnt_subset.c
+++ b/fontembed/sfnt-subset.c
@@ -1,5 +1,5 @@
 #include "sfnt.h"
-#include "sfnt_int.h"
+#include "sfnt-int-private.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/fontembed/sfnt.c b/fontembed/sfnt.c
index 40f1c9892fe73747e30374a92ecdc3a821173bc0..00d3f56e6fdf02a1020b287e18e8a13941b82eb2 100644 (file)
--- a/fontembed/sfnt.c
+++ b/fontembed/sfnt.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include "sfnt_int.h"
+#include "sfnt-int-private.h"
 
 // TODO?
 // get_SHORT(head+48) // fontDirectionHint

diff --git a/fontembed/test_analyze.c b/fontembed/test-analyze.c
similarity index 98%
rename from fontembed/test_analyze.c
rename to fontembed/test-analyze.c
index 967a75169a9f227649c8051b3e976c8817483abd..ffb4510026ce4e30b4ac9124495aac612c88f2e6 100644 (file)
--- a/fontembed/test_analyze.c
+++ b/fontembed/test-analyze.c
@@ -1,8 +1,8 @@
 #include "sfnt.h"
-#include "sfnt_int.h"
+#include "sfnt-int-private.h"
 #include "embed.h"
 #include "config.h"
-#include "embed_sfnt_int.h"
+#include "embed-sfnt-int-private.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/fontembed/test_pdf.c b/fontembed/test-pdf.c
similarity index 100%
rename from fontembed/test_pdf.c
rename to fontembed/test-pdf.c

diff --git a/fontembed/test_ps.c b/fontembed/test-ps.c
similarity index 100%
rename from fontembed/test_ps.c
rename to fontembed/test-ps.c