Added meson build files. Updated readme. Minor fixes.

Author: dov

.gitignore

@@ -1,15 +1,50 @@
-Makefile
-Makefile.in
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.dirstamp
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_libs
 /aclocal.m4
+/autom4te.cache
+/config
+/config.cache
+/config.h
 /config.log
+/config.lt
 /config.status
-src/.deps
-/src/.sconsign.dblite
-*.o
-/src/paps
+/config.status.lineno
 /configure
-config/
-autom4te.cache
-*.pdf
-*.ps
-*.svg
+/configure.lineno
+/intltool-extract.in
+/intltool-merge.in
+/intltool-update.in
+/libtool
+/po/*.gmo
+/po/*.mo
+/po/.intltool-merge-cache
+/po/Makefile
+/po/Makefile.in
+/po/Makefile.in.in
+/po/POTFILES
+/po/paps.pot
+/po/stamp-it
+/so_locations
+/stamp-h1
+/tags
+build/
+*.tar.gz

INSTALL

@@ -1,3 +1,14 @@
+Overview of changes between 0.7.0 and 0.7.1
+=============================================
+
+* Added initial meson compilation support.
+
+* Minor accumulated bug fixes since 0.7.0 
+
+
+Older news
+=============================================
+
 * 2015-08-16 Sun
 
 Ported paps to cairo

NEWS

@@ -3,6 +3,25 @@
 paps is a command line program for converting Unicode text encoded in UTF-8
 to postscript and pdf by using pango.
 
+# Example
+
+Here is the output from processing the file misc/small-hello.utf8:
+
+![Example image](misc/small-hello.png)
+
+## History
+
+paps was written around 2005 to enable printing of plain text unicode UTF-8 files. It is named by the use of the excellent Pango library (from which it took its first two characters) and outputed postscript (ps, the last two characters). When the initial version was written, there was no simple way of translating the output of pango to postscript outlines, and therefore Ι wrote my own font encoding library, by making use of the fact that postscript is a full programming language. This worked well when sending the resulting postscript to the printer, but it had some serious disadvantages:
+
+- When converting to pdf you got huge files (two orders of magnitude larger!) since in contrast to postscript, pdf is not a programming language, and thus it encoded a path for each glyph.
+- You couldn't select and copy and paste from the resulting postscript file, since there was no underlying text, only graphic paths.
+
+In the early 2010's the library cairo and its accompanying pangocairo library finally created an easy way of converting pango output to postscript in an idiomatic way. But it took me several years until I finally rewrote paps to make use of them. 
+
+But I finally did so and released the resulting version on github in 2015 as version 0.7.0 . 
+
+But even so the new cairo based version was not picked up! E.g. Fedora still supplies the old 0.6.8 version without cairo. Perhaps because I did not update the old SourceForge page.
+
 # Usage
 
 Run `paps --help` for getting help.

README.md

@@ -0,0 +1,54 @@
+project('paps', 'c',
+        version: '0.7.0',
+        default_options : ['c_std=c99'],
+        meson_version : '>= 0.44')
+
+# C compiler. This is the cross compiler if we're cross-compiling
+cc = meson.get_compiler('c')
+
+cdata = configuration_data()
+
+# Checks for library functions
+foreach f : ['memmove', 'memset', 'strdup']
+  cdata.set('HAVE_' + f.to_upper(), cc.has_function(f))
+endforeach
+
+# Checks for header files
+# Some HAVE_FOO defines need to be defined to either 1 or 0, others need to
+# be defined or undefined. The code base is a bit inconsistent there.
+foreach h : ['stdlib.h', 'string.h', 'memory.h']
+  cdata.set10('HAVE_' + h.underscorify().to_upper(), cc.has_header(h))
+endforeach
+foreach h : ['strings.h', 'sys/times.h']
+  cdata.set('HAVE_' + h.underscorify().to_upper(), cc.has_header(h))
+endforeach
+
+# Not entirely correct, but sufficient for us. Should move away from this
+# ancient define and just include individual headers based on individual defs
+if cc.has_header('strings.h')
+  # define to 1 or leave undefined otherwise, don't simplify
+  cdata.set('STDC_HEADERS', 1)
+endif
+
+# This is available pretty much everywhere
+cdata.set('HAVE_STRINGIZE', 1)
+
+# Assume we have nls, since paps doesn't compile without it
+cdata.set('ENABLE_NLS',1)
+
+# Not really sure what this is used for, but paps doesn't compile without it.
+cdata.set_quoted('DATADIR','.')
+
+buildtype = get_option('buildtype')
+if buildtype == 'debug' or buildtype == 'debugoptimized'
+  cdata.set('DEBUG', 1)
+endif
+
+cdata.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+
+# write config.h
+config_h = configure_file(output: 'config.h', configuration: cdata)
+
+incs = include_directories('.', 'src')
+
+subdir('src')

meson.build

@@ -1,6 +1,9 @@
 env = Environment()
 env.ParseConfig('pkg-config --cflags --libs pangocairo pangoft2')
 env.Append(CFLAGS=['-Wall','-g'],
+           CPPDEFINES=['ENABLE_NLS',
+                       'GETTEXT_PACKAGE=\\"paps\\"',
+                       'DATADIR=\\".\\"'],
            LINKFLAGS=[#'-fsanitize=address',  # Use for fsanitize
                       ]
            )

misc/small-hello.png

@@ -0,0 +1,35 @@
+pkg = import('pkgconfig')
+pango_dep = dependency('pangoft2')
+cairo_dep = dependency('pangocairo')
+
+paps_config = configuration_data()
+
+paps_config.set('configure_input', 'paps-config.h file generated by Meson')
+paps_config.set('PACKAGE', meson.project_name())
+paps_config.set('PACKAGE_NAME', 'paps')
+paps_config.set('PACKAGE_BUGREPORT', 'https://github.com/paps/paps/issues/new')
+paps_config.set('PAPS_VERSION', meson.project_version())
+version_arr = meson.project_version().split('.')
+paps_config.set('PAPS_MAJOR_VERSION', version_arr[0].to_int())
+paps_config.set('PAPS_MINOR_VERSION', version_arr[1].to_int())
+paps_config.set('PAPS_MICRO_VERSION', version_arr[2].to_int())
+
+paps_config.set('SIZEOF_INT', cc.sizeof('int'))
+
+if cc.get_id() == 'msvc'
+  paps_config.set('PAPS_MSVC_BUILD_PLACEHOLDER', '#define PAPS_BUILT_WITH_MSVC')
+else
+  paps_config.set('PAPS_MSVC_BUILD_PLACEHOLDER', '#undef PAPS_BUILT_WITH_MSVC')
+endif
+
+#paps_config_h = configure_file(input: files('paps-config.h.in'),
+#  output: 'paps-config.h',
+#  configuration: paps_config,
+#  install_dir: join_paths(get_option('includedir'), 'paps'))
+
+paps = executable('paps',
+                  ['paps.c'],
+                  c_args: ['-DHAVE_CONFIG_H'],
+                  include_directories: incs,
+                  dependencies : [pango_dep, cairo_dep],
+                  install: true)

src/SConstruct

@@ -37,6 +37,7 @@
 #include <math.h>
 #include <wchar.h>
 #include <libgen.h>
+#include <config.h>
 
 #if ENABLE_NLS
 #include <libintl.h>
@@ -420,7 +421,7 @@ _paps_arg_cpi_cb(const gchar *option_name,
 
 
 /*
- * Return codeset name of the environment's locale.
+ * Return codeset name of the environment's locale. Use UTF8 by default
  */
 static char*
 get_encoding()
@@ -500,7 +501,7 @@ int main(int argc, char *argv[])
     {"markup", 0, 0, G_OPTION_ARG_NONE, &do_use_markup,
      N_("Interpret input text as pango markup."), NULL},
     {"encoding", 0, 0, G_OPTION_ARG_STRING, &encoding,
-     N_("Assume encoding of input text. (Default: encoding of current locale)"), "ENCODING"},
+     N_("Assume encoding of input text. (Default: UTF-8)"), "ENCODING"},
     {"lpi", 0, 0, G_OPTION_ARG_CALLBACK, _paps_arg_lpi_cb,
      N_("Set the amount of lines per inch."), "REAL"},
     {"cpi", 0, 0, G_OPTION_ARG_CALLBACK, _paps_arg_cpi_cb,