[osm-gps-map] 80/153: Imported Upstream version 0.7.3
Ross Gammon
ross-guest at moszumanska.debian.org
Tue May 13 19:59:02 UTC 2014
This is an automated email from the git hooks/post-receive script.
ross-guest pushed a commit to branch master
in repository osm-gps-map.
commit 42e63bae1e1708250a407a9e14dd9dda4255294b
Author: David Paleino <dapal at debian.org>
Date: Fri Mar 25 19:46:39 2011 +0100
Imported Upstream version 0.7.3
---
.gitignore | 4 +
Makefile.am | 5 +-
NEWS | 12 +
autogen.sh | 5 +-
configure.ac | 29 +-
docs/reference/Makefile.am | 9 +-
examples/Makefile.am | 22 +-
examples/README | 14 +
examples/mapviewer.c | 9 +
examples/mapviewer.py | 30 +-
examples/mapviewer.ui | 10 +-
python/README | 9 +
python/configure.ac | 4 +-
python/osmgpsmap.defs | 9 +
python/setup.py | 2 +-
src/osm-gps-map-image.c | 27 +-
src/osm-gps-map-layer.c | 14 +-
src/osm-gps-map-point.c | 28 +-
src/osm-gps-map-source.c | 6 +-
src/osm-gps-map-track.c | 28 +-
src/osm-gps-map-widget.c | 177 +++++--
src/osm-gps-map-widget.h | 1 +
src/private.h | 3 +
uncrustify.cfg | 1174 ++++++++++++++++++++++++++++++++++++++++++++
24 files changed, 1552 insertions(+), 79 deletions(-)
diff --git a/.gitignore b/.gitignore
index be4196d..22744d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,7 @@ src/Makefile
src/mapviewer
stamp-h1
ChangeLog
+.project
+.cproject
+.autotools
+.pydevproject
diff --git a/Makefile.am b/Makefile.am
index 02e15c8..6d30eb6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,7 @@
SUBDIRS = src examples docs
DISTCHECK_CONFIGURE_FLAGS = \
--enable-gtk-doc \
- --enable-maintainer-flags \
- --enable-introspection
+ --enable-maintainer-flags
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@@ -37,7 +36,7 @@ distclean-local:
ChangeLog:
@echo Creating $@
@if test -d "$(srcdir)/.git"; then \
- (GIT_DIR=$(top_srcdir)/.git ./missing --run git log 0.7.1.. --stat -M -C --name-status --date=short --no-color) | fmt --split-only > $@.tmp \
+ (GIT_DIR=$(top_srcdir)/.git ./missing --run git log 0.7.2.. --stat -M -C --name-status --date=short --no-color) | fmt --split-only > $@.tmp \
&& mv -f $@.tmp $@ \
|| ($(RM) $@.tmp; \
echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
diff --git a/NEWS b/NEWS
index 492fc30..e6a6dba 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Changes in 0.7.3
+======================
+ * When using the mouse scroll wheel to zoom in, centre on the mouse pointer
+ (as recommended by the HIG)
+ * Doc updates
+ * Bug fixes
+ * Treat 403 errors as missing tiles
+ * Bail if user queues too many tiles to download (DOS)
+ * Limit retries of tile download on unspecified errors
+ * Enforce gtk+-2.14 minimum
+ * Fix Google
+
Changes in 0.7.2
======================
* Make osm_gps_map_point_{copy,free} public
diff --git a/autogen.sh b/autogen.sh
index cd268fb..d9c2d7b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,7 +5,7 @@ srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
PKG_NAME="osm-gps-map"
-# REQUIRED_M4MACROS=introspection.m4
+#REQUIRED_M4MACROS=introspection.m4
(test -f $srcdir/configure.ac) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
@@ -18,5 +18,6 @@ which gnome-autogen.sh || {
exit 1
}
-. gnome-autogen.sh --enable-gtk-doc "$@"
+REQUIRED_AUTOMAKE_VERSION=1.11 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh --enable-gtk-doc "$@"
+
diff --git a/configure.ac b/configure.ac
index 7a93c89..a0968a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,30 +1,37 @@
-AC_PREREQ([2.62])
+AC_PREREQ([2.63])
AC_INIT([osm-gps-map],
- [0.7.2],
+ [0.7.3],
[http://github.com/nzjrs/osm-gps-map/issues],
[osm-gps-map])
-AM_INIT_AUTOMAKE([1.10])
+AM_INIT_AUTOMAKE([1.11])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_SRCDIR([src/osm-gps-map.h])
AC_CONFIG_MACRO_DIR([m4])
-AM_MAINTAINER_MODE
-
AM_PROG_CC_C_O
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+AM_SILENT_RULES([yes])
+# Library dependencies
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.16])
-PKG_CHECK_MODULES(GTK, [gtk+-2.0])
+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.14])
PKG_CHECK_MODULES(CAIRO, [cairo >= 1.6])
-PKG_CHECK_MODULES(SOUP24, libsoup-2.4,
- soup_ver=2.4, [
- PKG_CHECK_MODULES(SOUP22, libsoup-2.2, [
+# The mapviewer demo also calls g_thread_init, so it needs to link against
+# libgthread-2.0.
+PKG_CHECK_MODULES(GTHREAD, [gthread-2.0], [
+ have_gthread="yes" ], [
+ have_gthread="no"
+ AC_MSG_RESULT([mapviewer demo disabled])])
+AM_CONDITIONAL([HAVE_GTHREAD], [ test "x$have_gthread" = "xyes" ])
+
+PKG_CHECK_MODULES(SOUP24, [libsoup-2.4], [
+ soup_ver=2.4], [
+ PKG_CHECK_MODULES(SOUP22, [libsoup-2.2], [
soup_ver=2.2
AC_DEFINE(USE_LIBSOUP22, 1, Use libsoup 2.2 instead of libsoup-2.4 to download tiles)],
AC_ERROR([libsoup-2.4 (preferred) or libsoup-2.2 not found]))])
@@ -52,7 +59,9 @@ LT_VERSION_INFO=2:1:0
AC_SUBST(LT_VERSION_INFO)
GTK_DOC_CHECK([1.12])
+
GOBJECT_INTROSPECTION_CHECK([0.6.7])
+
GNOME_COMPILE_WARNINGS([maximum])
GNOME_MAINTAINER_MODE_DEFINES
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index d90ab09..0213eb0 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -89,7 +89,8 @@ include $(top_srcdir)/gtk-doc.make
# e.g. EXTRA_DIST += version.xml.in
EXTRA_DIST += version.xml.in
-if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = cd $(srcdir) &&
-TESTS = $(GTKDOC_CHECK)
-endif
+# disable gtkdoc-check, I hate it
+#if ENABLE_GTK_DOC
+#TESTS_ENVIRONMENT = cd $(srcdir) &&
+#TESTS = $(GTKDOC_CHECK)
+#endif
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 919c25f..9d6a496 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,10 +1,10 @@
## Process this file with automake to produce Makefile.in
OSMGPSMAP_CFLAGS = \
- $(GLIB_CFLAGS) \
- $(GTK_CFLAGS) \
- $(CAIRO_CFLAGS) \
- $(SOUP22_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(CAIRO_CFLAGS) \
+ $(SOUP22_CFLAGS) \
$(SOUP24_CFLAGS)
OSMGPSMAP_LIBS = \
@@ -15,21 +15,27 @@ OSMGPSMAP_LIBS = \
$(SOUP24_LIBS)
## Demo Application
+if HAVE_GTHREAD
noinst_PROGRAMS = mapviewer
+else
+noinst_PROGRAMS =
+endif
mapviewer_SOURCES = \
- mapviewer.c
+ mapviewer.c
mapviewer_CFLAGS = \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
- $(OSMGPSMAP_CFLAGS)
+ $(OSMGPSMAP_CFLAGS) \
+ $(GTHREAD_CFLAGS)
mapviewer_LDADD = \
$(OSMGPSMAP_LIBS) \
- $(top_builddir)/src/libosmgpsmap.la
+ $(GTHREAD_LIBS) \
+ $(top_builddir)/src/libosmgpsmap.la
## Misc
-EXTRA_DIST = poi.png mapviewer.ui mapviewer.js
+EXTRA_DIST = poi.png mapviewer.ui mapviewer.js README
diff --git a/examples/README b/examples/README
new file mode 100644
index 0000000..4009b04
--- /dev/null
+++ b/examples/README
@@ -0,0 +1,14 @@
+osm-gps-map example applications
+ * ./mapviewer
+ C based demo app with many options. See '--help' for a list. Note, this
+ must be executed from the examples directory so it can find the mapviewer.ui
+ file.
+ * ./mapviewer.py
+ Python version of the C demo app, with examples showing how to do custom
+ layers.
+ * ./mapviewer.js
+ Javascript example using seed + gobject-introspection. If running uninstalled,
+ you probbably need to tell GObject introspection where to find the
+ bindings. Do the following from the example directory
+ # export LD_LIBRARY_PATH=../src/.libs/
+ # export GI_TYPELIB_PATH=../src/
diff --git a/examples/mapviewer.c b/examples/mapviewer.c
index f615eaa..18f4ba0 100644
--- a/examples/mapviewer.c
+++ b/examples/mapviewer.c
@@ -224,6 +224,7 @@ main (int argc, char **argv)
{
GtkBuilder *builder;
GtkWidget *widget;
+ GtkAccelGroup *ag;
OsmGpsMap *map;
OsmGpsMapLayer *osd;
OsmGpsMapTrack *rightclicktrack;
@@ -379,6 +380,14 @@ main (int argc, char **argv)
widget = GTK_WIDGET(gtk_builder_get_object(builder, "window1"));
g_signal_connect (widget, "destroy",
G_CALLBACK (on_close), (gpointer) map);
+ //Setup accelerators.
+ ag = gtk_accel_group_new();
+ gtk_accel_group_connect(ag, GDK_w, GDK_CONTROL_MASK, GTK_ACCEL_MASK,
+ g_cclosure_new(gtk_main_quit, NULL, NULL));
+ gtk_accel_group_connect(ag, GDK_q, GDK_CONTROL_MASK, GTK_ACCEL_MASK,
+ g_cclosure_new(gtk_main_quit, NULL, NULL));
+ gtk_window_add_accel_group(GTK_WINDOW(widget), ag);
+
gtk_widget_show_all (widget);
g_log_set_handler ("OsmGpsMap", G_LOG_LEVEL_MASK, g_log_default_handler, NULL);
diff --git a/examples/mapviewer.py b/examples/mapviewer.py
index 24110b6..ae23493 100755
--- a/examples/mapviewer.py
+++ b/examples/mapviewer.py
@@ -33,6 +33,8 @@ sys.path.insert(0, libdir)
import osmgpsmap
print "using library: %s (version %s)" % (osmgpsmap.__file__, osmgpsmap.__version__)
+assert osmgpsmap.__version__ == "0.7.3"
+
class DummyMapNoGpsPoint(osmgpsmap.GpsMap):
def do_draw_gps_point(self, drawable):
pass
@@ -86,6 +88,10 @@ class UI(gtk.Window):
self.osm.set_keyboard_shortcut(osmgpsmap.KEY_LEFT, gtk.gdk.keyval_from_name("Left"))
self.osm.set_keyboard_shortcut(osmgpsmap.KEY_RIGHT, gtk.gdk.keyval_from_name("Right"))
+ #connect to tooltip
+ self.osm.props.has_tooltip = True
+ self.osm.connect("query-tooltip", self.on_query_tooltip)
+
self.latlon_entry = gtk.Entry()
zoom_in_button = gtk.Button(stock=gtk.STOCK_ZOOM_IN)
@@ -147,11 +153,17 @@ Enter an repository URL to fetch map tiles from in the box below. Special metach
gobtn.connect("clicked", self.load_map_clicked)
vb.pack_start(gobtn, False)
+ self.show_tooltips = False
+ cb = gtk.CheckButton("Show Location in Tooltips")
+ cb.props.active = self.show_tooltips
+ cb.connect("toggled", self.on_show_tooltips_toggled)
+ self.vbox.pack_end(cb, False)
+
cb = gtk.CheckButton("Disable Cache")
cb.props.active = False
cb.connect("toggled", self.disable_cache_toggled)
-
self.vbox.pack_end(cb, False)
+
self.vbox.pack_end(ex, False)
self.vbox.pack_end(self.latlon_entry, False)
self.vbox.pack_end(hbox, False)
@@ -164,6 +176,9 @@ Enter an repository URL to fetch map tiles from in the box below. Special metach
else:
self.osm.props.tile_cache = osmgpsmap.CACHE_AUTO
+ def on_show_tooltips_toggled(self, btn):
+ self.show_tooltips = btn.props.active
+
def load_map_clicked(self, button):
uri = self.repouri_entry.get_text()
format = self.image_format_entry.get_text()
@@ -197,6 +212,19 @@ Enter an repository URL to fetch map tiles from in the box below. Special metach
def home_clicked(self, button):
self.osm.set_center_and_zoom(-44.39, 171.25, 12)
+
+ def on_query_tooltip(self, widget, x, y, keyboard_tip, tooltip, data=None):
+ if keyboard_tip:
+ return False
+
+ if self.show_tooltips:
+ p = osmgpsmap.point_new_degrees(0.0, 0.0)
+ self.osm.convert_screen_to_geographic(x, y, p)
+ lat,lon = p.get_degrees()
+ tooltip.set_markup("%+.4f, %+.4f" % p.get_degrees())
+ return True
+
+ return False
def cache_clicked(self, button):
bbox = self.osm.get_bbox()
diff --git a/examples/mapviewer.ui b/examples/mapviewer.ui
index b4d095d..2942104 100644
--- a/examples/mapviewer.ui
+++ b/examples/mapviewer.ui
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.14"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkWindow" id="window1">
<property name="default_width">400</property>
@@ -356,11 +356,11 @@
</object>
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
- <widget name="label7"/>
- <widget name="label6"/>
- <widget name="label4"/>
- <widget name="label3"/>
<widget name="label2"/>
+ <widget name="label3"/>
+ <widget name="label4"/>
+ <widget name="label6"/>
+ <widget name="label7"/>
</widgets>
</object>
<object class="GtkAdjustment" id="star_xalign_adjustment">
diff --git a/python/README b/python/README
index 38c1c20..0a6fee7 100644
--- a/python/README
+++ b/python/README
@@ -1 +1,10 @@
Python bindings for osm-gps-map
+
+To Build
+* Install the dependencies
+ * osm-gps-map
+ * pygobject and pygtk dev packages
+* Linux
+ * ./configure ; make ; make install
+* Windows
+ * python setup.py build --compiler=mingw32 bdist_wininst
diff --git a/python/configure.ac b/python/configure.ac
index 0ece516..e51d70d 100644
--- a/python/configure.ac
+++ b/python/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.62])
AC_INIT([python-osmgpsmap],
- [0.7.2],
+ [0.7.3],
[http://github.com/nzjrs/osm-gps-map/issues],
[python-osmgpsmap])
AM_INIT_AUTOMAKE([1.10])
@@ -59,7 +59,7 @@ if test -f ../src/libosmgpsmap.la; then
OSMGPSMAP_CFLAGS="-I\$(top_srcdir)/../src/"
OSMGPSMAP_LIBS="\$(top_builddir)/../src/libosmgpsmap.la"
else
- PKG_CHECK_MODULES(OSMGPSMAP, osmgpsmap = 0.7.2)
+ PKG_CHECK_MODULES(OSMGPSMAP, osmgpsmap = 0.7.3)
fi
AC_OUTPUT([Makefile])
diff --git a/python/osmgpsmap.defs b/python/osmgpsmap.defs
index 4ffc4a2..276ce35 100644
--- a/python/osmgpsmap.defs
+++ b/python/osmgpsmap.defs
@@ -195,6 +195,15 @@
)
)
+(define-method set_zoom_offset
+ (of-object "OsmGpsMap")
+ (c-name "osm_gps_map_set_zoom_offset")
+ (return-type "none")
+ (parameters
+ '("int" "zoom_offset")
+ )
+)
+
(define-method zoom_in
(of-object "OsmGpsMap")
(c-name "osm_gps_map_zoom_in")
diff --git a/python/setup.py b/python/setup.py
index 848b93b..dc04a21 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -17,7 +17,7 @@ def get_lib_dirs(pkg):
def get_libs(pkg):
return pkg_config_parse(pkg,'--libs-only-l')
-VERSION = "0.7.2"
+VERSION = "0.7.3"
_osmgpsmap = Extension(name = 'osmgpsmap',
sources= ['osmgpsmapmodule.c','osmgpsmap.c'],
diff --git a/src/osm-gps-map-image.c b/src/osm-gps-map-image.c
index 5f5fb8f..285c0b7 100644
--- a/src/osm-gps-map-image.c
+++ b/src/osm-gps-map-image.c
@@ -1,4 +1,29 @@
-/* osm-gps-map-image.c */
+/* vim:set et sw=4 ts=4 */
+/*
+ * Copyright (C) 2010 John Stowers <john.stowers at gmail.com>
+ *
+ * This 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.
+ *
+ * This program 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/>.
+ */
+
+/**
+ * SECTION:osm-gps-map-image
+ * @short_description: An image shown on the map
+ * @stability: Stable
+ * @include: osm-gps-map.h
+ *
+ * #OsmGpsMapImage represents an image (a #GdkPixbuf) shown on the map
+ * (osm_gps_map_image_add()) at a specific location (a #OsmGpsMapPoint).
+ **/
#include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/src/osm-gps-map-layer.c b/src/osm-gps-map-layer.c
index 67b9f84..28d30d1 100644
--- a/src/osm-gps-map-layer.c
+++ b/src/osm-gps-map-layer.c
@@ -1,3 +1,4 @@
+/* vim:set et sw=4 ts=4 */
/*
* Copyright (C) 2010 John Stowers <john.stowers at gmail.com>
*
@@ -9,11 +10,22 @@
* 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/>.
*/
+/**
+ * SECTION:osm-gps-map-layer
+ * @short_description: An interface for layers to be drawn on the map
+ * @stability: Stable
+ * @include: osm-gps-map.h
+ *
+ * #OsmGpsMapLayer is an interface implemented by objects that wish
+ * to draw on top of the map respond to button press events. The most
+ * common implementation of this interface is #OsmGpsMapOsd
+ **/
+
#include "osm-gps-map-layer.h"
GType osm_gps_map_layer_get_type()
diff --git a/src/osm-gps-map-point.c b/src/osm-gps-map-point.c
index 3c5d66c..fd171bf 100644
--- a/src/osm-gps-map-point.c
+++ b/src/osm-gps-map-point.c
@@ -1,4 +1,30 @@
-/* osm-gps-map-point.c */
+/* vim:set et sw=4 ts=4 */
+/*
+ * Copyright (C) 2010 John Stowers <john.stowers at gmail.com>
+ *
+ * This 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.
+ *
+ * This program 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/>.
+ */
+
+/**
+ * SECTION:osm-gps-map-point
+ * @short_description: A geographic location (latitude, longitude)
+ * @stability: Stable
+ * @include: osm-gps-map.h
+ *
+ * #OsmGpsMapPoint describes a geographic location (latitude, longitude).
+ * Helper functions exist to create such a point from either radian co-ordinates
+ * (osm_gps_map_point_new_radians()) or degrees (osm_gps_map_new_degrees()).
+ **/
#include "converter.h"
#include "osm-gps-map-point.h"
diff --git a/src/osm-gps-map-source.c b/src/osm-gps-map-source.c
index 40ed3b4..6c0e56b 100644
--- a/src/osm-gps-map-source.c
+++ b/src/osm-gps-map-source.c
@@ -75,11 +75,11 @@ osm_gps_map_source_get_repo_uri(OsmGpsMapSource_t source)
case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";
case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
- return "http://mt#R.google.com/vt/lyrs=m@126&hl=en&x=#X&s=&y=#Y&z=#Z";
+ return "http://mt#R.google.com/vt/lyrs=m@146&hl=en&x=#X&s=&y=#Y&z=#Z";
case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
- return "http://mt#R.google.com/vt/lyrs=h@126&hl=en&x=#X&s=&y=#Y&z=#Z";
+ return "http://mt#R.google.com/vt/lyrs=h@146&hl=en&x=#X&s=&y=#Y&z=#Z";
case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
- return "http://khm#R.google.com/kh/v=65&x=#X&y=#Y&z=#Z";
+ return "http://khm#R.google.com/kh/v=80&x=#X&y=#Y&z=#Z";
case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
return "http://a#R.ortho.tiles.virtualearth.net/tiles/r#W.jpeg?g=50";
case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
diff --git a/src/osm-gps-map-track.c b/src/osm-gps-map-track.c
index 24de92c..d72d11c 100644
--- a/src/osm-gps-map-track.c
+++ b/src/osm-gps-map-track.c
@@ -1,4 +1,30 @@
-/* osm-gps-map-track.c */
+/* vim:set et sw=4 ts=4 */
+/*
+ * Copyright (C) 2010 John Stowers <john.stowers at gmail.com>
+ *
+ * This 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.
+ *
+ * This program 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/>.
+ */
+
+/**
+ * SECTION:osm-gps-map-track
+ * @short_description: A list of GPS points
+ * @stability: Stable
+ * @include: osm-gps-map.h
+ *
+ * #OsmGpsMapTrack stores multiple #OsmGpsMapPoint objects, i.e. a track, and
+ * describes how such a track should be drawn on the map
+ * (see osm_gps_map_track_add()), including its colour, width, etc.
+ **/
#include <gdk/gdk.h>
diff --git a/src/osm-gps-map-widget.c b/src/osm-gps-map-widget.c
index 1791711..deac8f0 100644
--- a/src/osm-gps-map-widget.c
+++ b/src/osm-gps-map-widget.c
@@ -1,5 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 4 -*- */
-/* vim:set et sw=4 ts=4 cino=t0,(0: */
+/* vim:set et sw=4 ts=4 */
/*
* osm-gps-map.c
* Copyright (C) Marcus Bauer 2008 <marcus.bauer at gmail.com>
@@ -17,14 +16,14 @@
* 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/>.
*/
/**
* SECTION:osm-gps-map
- * @short_description: map display widget
+ * @short_description: The map display widget
* @stability: Stable
* @include: osm-gps-map.h
*
@@ -145,6 +144,8 @@
#define EXTRA_BORDER (TILESIZE / 2)
#define OSM_GPS_MAP_SCROLL_STEP (10)
#define USER_AGENT "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11"
+#define DOWNLOAD_RETRIES 3
+#define MAX_DOWNLOAD_TILES 10000
struct _OsmGpsMapPrivate
{
@@ -155,6 +156,9 @@ struct _OsmGpsMapPrivate
int map_zoom;
int max_zoom;
int min_zoom;
+
+ int tile_zoom_offset;
+
int map_x;
int map_y;
@@ -264,6 +268,7 @@ typedef struct {
OsmGpsMap *map;
/* whether to redraw the map when the tile arrives */
gboolean redraw;
+ int ttl;
#if USE_LIBSOUP22
SoupSession *session;
#endif
@@ -281,6 +286,7 @@ enum
PROP_TILE_CACHE_DIR,
PROP_TILE_CACHE_BASE_DIR,
PROP_TILE_CACHE_DIR_IS_FULL_PATH,
+ PROP_TILE_ZOOM_OFFSET,
PROP_ZOOM,
PROP_MAX_ZOOM,
PROP_MIN_ZOOM,
@@ -306,7 +312,7 @@ G_DEFINE_TYPE (OsmGpsMap, osm_gps_map, GTK_TYPE_DRAWING_AREA);
*/
static gchar *replace_string(const gchar *src, const gchar *from, const gchar *to);
static gchar *replace_map_uri(OsmGpsMap *map, const gchar *uri, int zoom, int x, int y);
-static void osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y);
+static void osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y, int tile_zoom, int target_x, int target_y);
#if USE_LIBSOUP22
static void osm_gps_map_tile_download_complete (SoupMessage *msg, gpointer user_data);
#else
@@ -317,6 +323,7 @@ static void osm_gps_map_load_tile (OsmGpsMap *map, int zoom, int x, int y, i
static void osm_gps_map_fill_tiles_pixel (OsmGpsMap *map);
static gboolean osm_gps_map_map_redraw (OsmGpsMap *map);
static void osm_gps_map_map_redraw_idle (OsmGpsMap *map);
+static GdkPixbuf* osm_gps_map_render_tile_upscaled (OsmGpsMap *map, GdkPixbuf *tile, int tile_zoom, int zoom, int x, int y);
static void
cached_tile_free (OsmCachedTile *tile)
@@ -705,20 +712,33 @@ osm_gps_map_draw_gps_point (OsmGpsMap *map, GdkDrawable *drawable)
}
static void
-osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)
+osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y,
+ int tile_zoom, int target_x, int target_y)
{
OsmGpsMapPrivate *priv = map->priv;
+ int target_zoom = priv->map_zoom;
g_debug("Queing redraw @ %d,%d (w:%d h:%d)", offset_x,offset_y, TILESIZE,TILESIZE);
- /* draw pixbuf onto pixmap */
- gdk_draw_pixbuf (priv->pixmap,
- priv->gc_map,
- pixbuf,
- 0,0,
- offset_x,offset_y,
- TILESIZE,TILESIZE,
- GDK_RGB_DITHER_NONE, 0, 0);
+ if (tile_zoom == target_zoom) {
+ /* draw pixbuf onto pixmap */
+ gdk_draw_pixbuf (priv->pixmap,
+ priv->gc_map,
+ pixbuf,
+ 0,0,
+ offset_x,offset_y,
+ TILESIZE,TILESIZE,
+ GDK_RGB_DITHER_NONE, 0, 0);
+ } else {
+ /* get an upscaled version of the pixbuf, and then draw it */
+ GdkPixbuf *pixmap_scaled = osm_gps_map_render_tile_upscaled
+ (map, pixbuf, tile_zoom, target_zoom, target_x, target_y);
+
+ osm_gps_map_blit_tile (map, pixmap_scaled, offset_x, offset_y,
+ target_zoom, target_x, target_y);
+
+ g_object_unref (pixmap_scaled);
+ }
}
/* libsoup-2.2 and libsoup-2.4 use different ways to store the body data */
@@ -761,7 +781,6 @@ osm_gps_map_tile_download_complete (SoupSession *session, SoupMessage *msg, gpoi
}
} else {
g_warning("Error creating tile download directory: %s", dl->folder);
- perror("perror:");
}
}
@@ -819,7 +838,7 @@ osm_gps_map_tile_download_complete (SoupSession *session, SoupMessage *msg, gpoi
g_free(dl->filename);
g_free(dl);
} else {
- if (msg->status_code == SOUP_STATUS_NOT_FOUND) {
+ if ((msg->status_code == SOUP_STATUS_NOT_FOUND) || (msg->status_code == SOUP_STATUS_FORBIDDEN)) {
g_hash_table_insert(priv->missing_tiles, dl->uri, NULL);
g_hash_table_remove(priv->tile_queue, dl->uri);
g_object_notify(G_OBJECT(map), "tiles-queued");
@@ -829,12 +848,18 @@ osm_gps_map_tile_download_complete (SoupSession *session, SoupMessage *msg, gpoi
g_object_notify(G_OBJECT(map), "tiles-queued");
} else {
g_warning("Error downloading tile: %d - %s", msg->status_code, msg->reason_phrase);
+ dl->ttl--;
+ if (dl->ttl) {
#if USE_LIBSOUP22
- soup_session_requeue_message(dl->session, msg);
+ soup_session_requeue_message(dl->session, msg);
#else
- soup_session_requeue_message(session, msg);
+ soup_session_requeue_message(session, msg);
#endif
- return;
+ return;
+ }
+
+ g_hash_table_remove(priv->tile_queue, dl->uri);
+ g_object_notify(G_OBJECT(map), "tiles-queued");
}
}
@@ -848,6 +873,9 @@ osm_gps_map_download_tile (OsmGpsMap *map, int zoom, int x, int y, gboolean redr
OsmGpsMapPrivate *priv = map->priv;
OsmTileDownload *dl = g_new0(OsmTileDownload,1);
+ // set retries
+ dl->ttl = DOWNLOAD_RETRIES;
+
//calculate the uri to download
dl->uri = replace_map_uri(map, priv->repo_uri, zoom, x, y);
@@ -983,24 +1011,40 @@ static GdkPixbuf *
osm_gps_map_render_missing_tile_upscaled (OsmGpsMap *map, int zoom,
int x, int y)
{
- GdkPixbuf *pixbuf, *big, *area;
- int zoom_big, zoom_diff, area_size, area_x, area_y;
- int modulo;
+ GdkPixbuf *pixbuf, *big;
+ int zoom_big;
big = osm_gps_map_find_bigger_tile (map, zoom, x, y, &zoom_big);
if (!big) return NULL;
g_debug ("Found bigger tile (zoom = %d, wanted = %d)", zoom_big, zoom);
+ pixbuf = osm_gps_map_render_tile_upscaled (map, big, zoom_big,
+ zoom, x, y);
+ g_object_unref (big);
+
+ return pixbuf;
+}
+static GdkPixbuf*
+osm_gps_map_render_tile_upscaled (OsmGpsMap *map, GdkPixbuf *big, int zoom_big,
+ int zoom, int x, int y)
+{
+ GdkPixbuf *pixbuf, *area;
+ int area_size, area_x, area_y;
+ int modulo;
+ int zoom_diff;
+
/* get a Pixbuf for the area to magnify */
zoom_diff = zoom - zoom_big;
+
+ g_debug ("Upscaling by %d levels into tile %d,%d", zoom_diff, x, y);
+
area_size = TILESIZE >> zoom_diff;
modulo = 1 << zoom_diff;
area_x = (x % modulo) * area_size;
area_y = (y % modulo) * area_size;
area = gdk_pixbuf_new_subpixbuf (big, area_x, area_y,
area_size, area_size);
- g_object_unref (big);
pixbuf = gdk_pixbuf_scale_simple (area, TILESIZE, TILESIZE,
GDK_INTERP_NEAREST);
g_object_unref (area);
@@ -1020,11 +1064,22 @@ osm_gps_map_load_tile (OsmGpsMap *map, int zoom, int x, int y, int offset_x, int
OsmGpsMapPrivate *priv = map->priv;
gchar *filename;
GdkPixbuf *pixbuf;
+ int zoom_offset = priv->tile_zoom_offset;
+ int target_x, target_y;
+
+ g_debug("Load virtual tile %d,%d (%d,%d) z:%d", x, y, offset_x, offset_y, zoom);
+
+ if (zoom > MIN_ZOOM) {
+ zoom -= zoom_offset;
+ target_x = x; x >>= zoom_offset;
+ target_y = y; y >>= zoom_offset;
+ }
- g_debug("Load tile %d,%d (%d,%d) z:%d", x, y, offset_x, offset_y, zoom);
+ g_debug("Load actual tile %d,%d (%d,%d) z:%d", x, y, offset_x, offset_y, zoom);
if (priv->map_source == OSM_GPS_MAP_SOURCE_NULL) {
- osm_gps_map_blit_tile(map, priv->null_tile, offset_x,offset_y);
+ osm_gps_map_blit_tile(map, priv->null_tile, offset_x, offset_y,
+ priv->map_zoom, target_x, target_y);
return;
}
@@ -1041,7 +1096,8 @@ osm_gps_map_load_tile (OsmGpsMap *map, int zoom, int x, int y, int offset_x, int
if(pixbuf) {
g_debug("Found tile %s", filename);
- osm_gps_map_blit_tile(map, pixbuf, offset_x,offset_y);
+ osm_gps_map_blit_tile(map, pixbuf, offset_x, offset_y,
+ zoom, target_x, target_y);
g_object_unref (pixbuf);
} else {
if (priv->map_auto_download_enabled) {
@@ -1052,13 +1108,8 @@ osm_gps_map_load_tile (OsmGpsMap *map, int zoom, int x, int y, int offset_x, int
* levels */
pixbuf = osm_gps_map_render_missing_tile (map, zoom, x, y);
if (pixbuf) {
- gdk_draw_pixbuf (priv->pixmap,
- priv->gc_map,
- pixbuf,
- 0,0,
- offset_x,offset_y,
- TILESIZE,TILESIZE,
- GDK_RGB_DITHER_NONE, 0, 0);
+ osm_gps_map_blit_tile(map, pixbuf, offset_x, offset_y,
+ zoom, target_x, target_y);
g_object_unref (pixbuf);
} else {
/* prevent some artifacts when drawing not yet loaded areas. */
@@ -1763,6 +1814,9 @@ osm_gps_map_set_property (GObject *object, guint prop_id, const GValue *value, G
break;
case PROP_TILE_CACHE_DIR_IS_FULL_PATH:
break;
+ case PROP_TILE_ZOOM_OFFSET:
+ priv->tile_zoom_offset = g_value_get_int (value);
+ break;
case PROP_ZOOM:
priv->map_zoom = g_value_get_int (value);
break;
@@ -1860,6 +1914,9 @@ osm_gps_map_get_property (GObject *object, guint prop_id, GValue *value, GParamS
case PROP_TILE_CACHE_DIR_IS_FULL_PATH:
g_value_set_boolean(value, FALSE);
break;
+ case PROP_TILE_ZOOM_OFFSET:
+ g_value_set_int(value, priv->tile_zoom_offset);
+ break;
case PROP_ZOOM:
g_value_set_int(value, priv->map_zoom);
break;
@@ -1919,12 +1976,23 @@ osm_gps_map_get_property (GObject *object, guint prop_id, GValue *value, GParamS
static gboolean
osm_gps_map_scroll_event (GtkWidget *widget, GdkEventScroll *event)
{
- OsmGpsMap *map = OSM_GPS_MAP(widget);
+ OsmGpsMap *map;
+ OsmGpsMapPoint *pt;
+ float lat, lon;
+
+ map = OSM_GPS_MAP(widget);
+ pt = osm_gps_map_point_new_degrees(0.0,0.0);
+ /* arguably we could use get_event_location here, but I'm not convinced it
+ is forward compatible to cast between GdkEventScroll and GtkEventButton */
+ osm_gps_map_convert_screen_to_geographic(map, event->x, event->y, pt);
+ osm_gps_map_point_get_degrees (pt, &lat, &lon);
if (event->direction == GDK_SCROLL_UP)
- osm_gps_map_zoom_in(map);
+ osm_gps_map_set_center_and_zoom(map, lat, lon, map->priv->map_zoom+1);
else if (event->direction == GDK_SCROLL_DOWN)
- osm_gps_map_zoom_out(map);
+ osm_gps_map_set_center_and_zoom(map, lat, lon, map->priv->map_zoom-1);
+
+ osm_gps_map_point_free (pt);
return FALSE;
}
@@ -2437,6 +2505,16 @@ osm_gps_map_class_init (OsmGpsMapClass *klass)
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class,
+ PROP_TILE_ZOOM_OFFSET,
+ g_param_spec_int ("tile-zoom-offset",
+ "tile zoom-offset",
+ "Number of zoom-levels to upsample tiles",
+ MIN_TILE_ZOOM_OFFSET, /* minimum propery value */
+ MAX_TILE_ZOOM_OFFSET, /* maximum propery value */
+ 0,
+ G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+
+ g_object_class_install_property (object_class,
PROP_MAX_ZOOM,
g_param_spec_int ("max-zoom",
"max zoom",
@@ -2618,6 +2696,7 @@ osm_gps_map_download_maps (OsmGpsMap *map, OsmGpsMapPoint *pt1, OsmGpsMapPoint *
int i,j,zoom;
int num_tiles = 0;
zoom_end = CLAMP(zoom_end, priv->min_zoom, priv->max_zoom);
+ zoom_start = CLAMP(zoom_start, priv->min_zoom, priv->max_zoom);
for(zoom=zoom_start; zoom<=zoom_end; zoom++) {
int x1,y1,x2,y2;
@@ -2628,6 +2707,13 @@ osm_gps_map_download_maps (OsmGpsMap *map, OsmGpsMapPoint *pt1, OsmGpsMapPoint *
x2 = (int)floor((float)lon2pixel(zoom, pt2->rlon) / (float)TILESIZE);
y2 = (int)floor((float)lat2pixel(zoom, pt2->rlat) / (float)TILESIZE);
+ /* check for insane ranges */
+ if ( (x2-x1) * (y2-y1) > MAX_DOWNLOAD_TILES ) {
+ g_warning("Aborting download of zoom level %d and up, because "
+ "number of tiles would exceed %d", zoom, MAX_DOWNLOAD_TILES);
+ break;
+ }
+
/* loop x1-x2 */
for(i=x1; i<=x2; i++) {
/* loop y1 - y2 */
@@ -2738,6 +2824,25 @@ osm_gps_map_set_center (OsmGpsMap *map, float latitude, float longitude)
}
/**
+ * osm_gps_map_set_zoom_offset:
+ *
+ **/
+void
+osm_gps_map_set_zoom_offset (OsmGpsMap *map, int zoom_offset)
+{
+ OsmGpsMapPrivate *priv;
+
+ g_return_if_fail (OSM_GPS_MAP (map));
+ priv = map->priv;
+
+ if (zoom_offset != priv->tile_zoom_offset)
+ {
+ priv->tile_zoom_offset = zoom_offset;
+ osm_gps_map_map_redraw_idle (map);
+ }
+}
+
+/**
* osm_gps_map_set_zoom:
*
**/
diff --git a/src/osm-gps-map-widget.h b/src/osm-gps-map-widget.h
index da76529..29be13b 100644
--- a/src/osm-gps-map-widget.h
+++ b/src/osm-gps-map-widget.h
@@ -89,6 +89,7 @@ void osm_gps_map_get_bbox (OsmGpsMap *map, OsmGpsM
void osm_gps_map_set_center_and_zoom (OsmGpsMap *map, float latitude, float longitude, int zoom);
void osm_gps_map_set_center (OsmGpsMap *map, float latitude, float longitude);
int osm_gps_map_set_zoom (OsmGpsMap *map, int zoom);
+void osm_gps_map_set_zoom_offset (OsmGpsMap *map, int zoom_offset);
int osm_gps_map_zoom_in (OsmGpsMap *map);
int osm_gps_map_zoom_out (OsmGpsMap *map);
void osm_gps_map_scroll (OsmGpsMap *map, gint dx, gint dy);
diff --git a/src/private.h b/src/private.h
index 637338f..33c89f9 100644
--- a/src/private.h
+++ b/src/private.h
@@ -34,6 +34,9 @@
#define MAX_ZOOM 20
#define MIN_ZOOM 0
+#define MAX_TILE_ZOOM_OFFSET 10
+#define MIN_TILE_ZOOM_OFFSET 0
+
#define OSM_REPO_URI "http://tile.openstreetmap.org/#Z/#X/#Y.png"
#define OSM_MIN_ZOOM 1
#define OSM_MAX_ZOOM 18
diff --git a/uncrustify.cfg b/uncrustify.cfg
new file mode 100644
index 0000000..2c00b03
--- /dev/null
+++ b/uncrustify.cfg
@@ -0,0 +1,1174 @@
+# Uncrustify 0.52
+
+#
+# General options
+#
+
+# The type of line endings
+newlines = lf # auto/lf/crlf/cr
+
+# The original size of tabs in the input
+input_tab_size = 4 # number
+
+# The size of tabs in the output (only used if align_with_tabs=true)
+output_tab_size = 4 # number
+
+# The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn)
+string_escape_char = 92 # number
+
+# Alternate string escape char for Pawn. Only works right before the quote char.
+string_escape_char2 = 0 # number
+
+#
+# Indenting
+#
+
+# The number of columns to indent per level.
+# Usually 2, 3, 4, or 8.
+indent_columns = 4 # number
+
+# How to use tabs when indenting code
+# 0=spaces only
+# 1=indent with tabs, align with spaces
+# 2=indent and align with tabs
+indent_with_tabs = 0 # number
+
+# Whether to indent strings broken by '\' so that they line up
+indent_align_string = false # false/true
+
+# The number of spaces to indent multi-line XML strings.
+# Requires indent_align_string=True
+indent_xml_string = 0 # number
+
+# Spaces to indent '{' from level
+indent_brace = 0 # number
+
+# Whether braces are indented to the body level
+indent_braces = false # false/true
+
+# Disabled indenting function braces if indent_braces is true
+indent_braces_no_func = false # false/true
+
+# Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc.
+indent_brace_parent = false # false/true
+
+# Whether the 'namespace' body is indented
+indent_namespace = false # false/true
+
+# Whether the 'extern "C"' body is indented
+indent_extern = false # false/true
+
+# Whether the 'class' body is indented
+indent_class = false # false/true
+
+# Whether to indent the stuff after a leading class colon
+indent_class_colon = false # false/true
+
+# False=treat 'else\nif' as 'else if' for indenting purposes
+# True=indent the 'if' one level
+indent_else_if = false # false/true
+
+# Amount to indent variable declarations after a open brace. neg=relative, pos=absolute
+indent_var_def_blk = 0 # number
+
+# True: indent continued function call parameters one indent level
+# False: align parameters under the open paren
+indent_func_call_param = false # false/true
+
+# Same as indent_func_call_param, but for function defs
+indent_func_def_param = false # false/true
+
+# Same as indent_func_call_param, but for function protos
+indent_func_proto_param = false # false/true
+
+# Same as indent_func_call_param, but for class declarations
+indent_func_class_param = false # false/true
+
+# Same as indent_func_call_param, but for class variable constructors
+indent_func_ctor_var_param = false # false/true
+
+# Same as indent_func_call_param, but for templates
+indent_template_param = false # false/true
+
+# Double the indent for indent_func_xxx_param options
+indent_func_param_double = false # false/true
+
+# Indentation column for standalone 'const' function decl/proto qualifier
+indent_func_const = 0 # number
+
+# Indentation column for standalone 'throw' function decl/proto qualifier
+indent_func_throw = 0 # number
+
+# The number of spaces to indent a continued '->' or '.'
+# Usually set to 0, 1, or indent_columns.
+indent_member = 0 # number
+
+# Spaces to indent single line ('//') comments on lines before code
+indent_sing_line_comments = 0 # number
+
+# If set, will indent trailing single line ('//') comments relative
+# to the code instead of trying to keep the same absolute column
+indent_relative_single_line_comments = false # false/true
+
+# Spaces to indent 'case' from 'switch'
+# Usually 0 or indent_columns.
+indent_switch_case = 4 # number
+
+# Spaces to shift the 'case' line, without affecting any other lines
+# Usually 0.
+indent_case_shift = 0 # number
+
+# Spaces to indent '{' from 'case'.
+# By default, the brace will appear under the 'c' in case.
+# Usually set to 0 or indent_columns.
+indent_case_brace = 0 # number
+
+# Whether to indent comments found in first column
+indent_col1_comment = false # false/true
+
+# How to indent goto labels
+# >0 : absolute column where 1 is the leftmost column
+# <=0 : subtract from brace indent
+indent_label = 1 # number
+
+# Same as indent_label, but for access specifiers that are followed by a colon
+indent_access_spec = 1 # number
+
+# Indent the code after an access specifier by one level.
+# If set, this option forces 'indent_access_spec=0'
+indent_access_spec_body = false # false/true
+
+# If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended)
+indent_paren_nl = false # false/true
+
+# Controls the indent of a close paren after a newline.
+# 0: Indent to body level
+# 1: Align under the open paren
+# 2: Indent to the brace level
+indent_paren_close = 0 # number
+
+# Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren
+indent_comma_paren = false # false/true
+
+# Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren
+indent_bool_paren = false # false/true
+
+# If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended)
+indent_square_nl = false # false/true
+
+# Don't change the relative indent of ESQL/C 'EXEC SQL' bodies
+indent_preserve_sql = false # false/true
+
+# Align continued statements at the '='. Default=True
+# If FALSE or the '=' is followed by a newline, the next line is indent one tab.
+indent_align_assign = true # false/true
+
+#
+# Spacing options
+#
+
+# Add or remove space around arithmetic operator '+', '-', '/', '*', etc
+sp_arith = ignore # ignore/add/remove/force
+
+# Add or remove space around assignment operator '=', '+=', etc
+sp_assign = ignore # ignore/add/remove/force
+
+# Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign.
+sp_before_assign = ignore # ignore/add/remove/force
+
+# Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign.
+sp_after_assign = ignore # ignore/add/remove/force
+
+# Add or remove space around assignment '=' in enum
+sp_enum_assign = ignore # ignore/add/remove/force
+
+# Add or remove space before assignment '=' in enum. Overrides sp_enum_assign.
+sp_enum_before_assign = ignore # ignore/add/remove/force
+
+# Add or remove space after assignment '=' in enum. Overrides sp_enum_assign.
+sp_enum_after_assign = ignore # ignore/add/remove/force
+
+# Add or remove space around boolean operators '&&' and '||'
+sp_bool = ignore # ignore/add/remove/force
+
+# Add or remove space around compare operator '<', '>', '==', etc
+sp_compare = ignore # ignore/add/remove/force
+
+# Add or remove space inside '(' and ')'
+sp_inside_paren = ignore # ignore/add/remove/force
+
+# Add or remove space between nested parens
+sp_paren_paren = ignore # ignore/add/remove/force
+
+# Whether to balance spaces inside nested parens
+sp_balance_nested_parens = false # false/true
+
+# Add or remove space between ')' and '{'
+sp_paren_brace = ignore # ignore/add/remove/force
+
+# Add or remove space before pointer star '*'
+sp_before_ptr_star = ignore # ignore/add/remove/force
+
+# Add or remove space before pointer star '*' that isn't followed by a variable name
+# If set to 'ignore', sp_before_ptr_star is used instead.
+sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force
+
+# Add or remove space between pointer stars '*'
+sp_between_ptr_star = ignore # ignore/add/remove/force
+
+# Add or remove space after pointer star '*', if followed by a word.
+sp_after_ptr_star = ignore # ignore/add/remove/force
+
+# Add or remove space after a pointer star '*', if followed by a func proto/def.
+sp_after_ptr_star_func = ignore # ignore/add/remove/force
+
+# Add or remove space before a pointer star '*', if followed by a func proto/def.
+sp_before_ptr_star_func = ignore # ignore/add/remove/force
+
+# Add or remove space before a reference sign '&'
+sp_before_byref = ignore # ignore/add/remove/force
+
+# Add or remove space before a reference sign '&' that isn't followed by a variable name
+# If set to 'ignore', sp_before_byref is used instead.
+sp_before_unnamed_byref = ignore # ignore/add/remove/force
+
+# Add or remove space after reference sign '&', if followed by a word.
+sp_after_byref = ignore # ignore/add/remove/force
+
+# Add or remove space after a reference sign '&', if followed by a func proto/def.
+sp_after_byref_func = ignore # ignore/add/remove/force
+
+# Add or remove space before a reference sign '&', if followed by a func proto/def.
+sp_before_byref_func = ignore # ignore/add/remove/force
+
+# Add or remove space between type and word
+sp_after_type = force # ignore/add/remove/force
+
+# Add or remove space in 'template <' vs 'template<'.
+# If set to ignore, sp_before_angle is used.
+sp_template_angle = ignore # ignore/add/remove/force
+
+# Add or remove space before '<>'
+sp_before_angle = ignore # ignore/add/remove/force
+
+# Add or remove space inside '<' and '>'
+sp_inside_angle = ignore # ignore/add/remove/force
+
+# Add or remove space after '<>'
+sp_after_angle = ignore # ignore/add/remove/force
+
+# Add or remove space between '<>' and '(' as found in 'new List<byte>();'
+sp_angle_paren = ignore # ignore/add/remove/force
+
+# Add or remove space between '<>' and a word as in 'List<byte> m;'
+sp_angle_word = ignore # ignore/add/remove/force
+
+# Add or remove space before '(' of 'if', 'for', 'switch', and 'while'
+sp_before_sparen = force # ignore/add/remove/force
+
+# Add or remove space inside if-condition '(' and ')'
+sp_inside_sparen = ignore # ignore/add/remove/force
+
+# Add or remove space before if-condition ')'. Overrides sp_inside_sparen.
+sp_inside_sparen_close = ignore # ignore/add/remove/force
+
+# Add or remove space after ')' of 'if', 'for', 'switch', and 'while'
+sp_after_sparen = ignore # ignore/add/remove/force
+
+# Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while'
+sp_sparen_brace = ignore # ignore/add/remove/force
+
+# Add or remove space between 'invariant' and '(' in the D language.
+sp_invariant_paren = ignore # ignore/add/remove/force
+
+# Add or remove space after the ')' in 'invariant (C) c' in the D language.
+sp_after_invariant_paren = ignore # ignore/add/remove/force
+
+# Add or remove space before empty statement ';' on 'if', 'for' and 'while'
+sp_special_semi = ignore # ignore/add/remove/force
+
+# Add or remove space before ';'
+sp_before_semi = ignore # ignore/add/remove/force
+
+# Add or remove space before ';' in non-empty 'for' statements
+sp_before_semi_for = ignore # ignore/add/remove/force
+
+# Add or remove space before a semicolon of an empty part of a for statment.
+sp_before_semi_for_empty = ignore # ignore/add/remove/force
+
+# Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; <here> ).
+sp_after_semi_for_empty = ignore # ignore/add/remove/force
+
+# Add or remove space before '[' (except '[]')
+sp_before_square = ignore # ignore/add/remove/force
+
+# Add or remove space before '[]'
+sp_before_squares = ignore # ignore/add/remove/force
+
+# Add or remove space inside '[' and ']'
+sp_inside_square = ignore # ignore/add/remove/force
+
+# Add or remove space after ','
+sp_after_comma = ignore # ignore/add/remove/force
+
+# Add or remove space before ','
+sp_before_comma = remove # ignore/add/remove/force
+
+# Add or remove space after class ':'
+sp_after_class_colon = ignore # ignore/add/remove/force
+
+# Add or remove space before class ':'
+sp_before_class_colon = ignore # ignore/add/remove/force
+
+# Add or remove space before case ':'
+sp_before_case_colon = remove # ignore/add/remove/force
+
+# Add or remove space between 'operator' and operator sign
+sp_after_operator = ignore # ignore/add/remove/force
+
+# Add or remove space between the operator symbol and the open paren, as in 'operator ++('
+sp_after_operator_sym = ignore # ignore/add/remove/force
+
+# Add or remove space after C/D cast, ie 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'
+sp_after_cast = ignore # ignore/add/remove/force
+
+# Add or remove spaces inside cast parens
+sp_inside_paren_cast = ignore # ignore/add/remove/force
+
+# Add or remove space between the type and open paren in a C++ cast, ie 'int(exp)' vs 'int (exp)'
+sp_cpp_cast_paren = ignore # ignore/add/remove/force
+
+# Add or remove space between 'sizeof' and '('
+sp_sizeof_paren = ignore # ignore/add/remove/force
+
+# Add or remove space after the tag keyword (Pawn)
+sp_after_tag = ignore # ignore/add/remove/force
+
+# Add or remove space inside enum '{' and '}'
+sp_inside_braces_enum = ignore # ignore/add/remove/force
+
+# Add or remove space inside struct/union '{' and '}'
+sp_inside_braces_struct = ignore # ignore/add/remove/force
+
+# Add or remove space inside '{' and '}'
+sp_inside_braces = ignore # ignore/add/remove/force
+
+# Add or remove space inside '{}'
+sp_inside_braces_empty = ignore # ignore/add/remove/force
+
+# Add or remove space between return type and function name
+# A minimum of 1 is forced except for pointer return types.
+sp_type_func = ignore # ignore/add/remove/force
+
+# Add or remove space between function name and '(' on function declaration
+sp_func_proto_paren = ignore # ignore/add/remove/force
+
+# Add or remove space between function name and '(' on function definition
+sp_func_def_paren = ignore # ignore/add/remove/force
+
+# Add or remove space inside empty function '()'
+sp_inside_fparens = ignore # ignore/add/remove/force
+
+# Add or remove space inside function '(' and ')'
+sp_inside_fparen = ignore # ignore/add/remove/force
+
+# Add or remove space between ']' and '(' when part of a function call.
+sp_square_fparen = ignore # ignore/add/remove/force
+
+# Add or remove space between ')' and '{' of function
+sp_fparen_brace = ignore # ignore/add/remove/force
+
+# Add or remove space between function name and '(' on function calls
+sp_func_call_paren = ignore # ignore/add/remove/force
+
+# Add or remove space between the user function name and '(' on function calls
+# You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.
+sp_func_call_user_paren = ignore # ignore/add/remove/force
+
+# Add or remove space between a constructor/destructor and the open paren
+sp_func_class_paren = ignore # ignore/add/remove/force
+
+# Add or remove space between 'return' and '('
+sp_return_paren = ignore # ignore/add/remove/force
+
+# Add or remove space between '__attribute__' and '('
+sp_attribute_paren = ignore # ignore/add/remove/force
+
+# Add or remove space between 'defined' and '(' in '#if defined (FOO)'
+sp_defined_paren = ignore # ignore/add/remove/force
+
+# Add or remove space between 'throw' and '(' in 'throw (something)'
+sp_throw_paren = ignore # ignore/add/remove/force
+
+# Add or remove space between macro and value
+sp_macro = ignore # ignore/add/remove/force
+
+# Add or remove space between macro function ')' and value
+sp_macro_func = ignore # ignore/add/remove/force
+
+# Add or remove space between 'else' and '{' if on the same line
+sp_else_brace = force # ignore/add/remove/force
+
+# Add or remove space between '}' and 'else' if on the same line
+sp_brace_else = force # ignore/add/remove/force
+
+# Add or remove space between '}' and the name of a typedef on the same line
+sp_brace_typedef = ignore # ignore/add/remove/force
+
+# Add or remove space between 'catch' and '{' if on the same line
+sp_catch_brace = ignore # ignore/add/remove/force
+
+# Add or remove space between '}' and 'catch' if on the same line
+sp_brace_catch = ignore # ignore/add/remove/force
+
+# Add or remove space between 'finally' and '{' if on the same line
+sp_finally_brace = ignore # ignore/add/remove/force
+
+# Add or remove space between '}' and 'finally' if on the same line
+sp_brace_finally = ignore # ignore/add/remove/force
+
+# Add or remove space between 'try' and '{' if on the same line
+sp_try_brace = ignore # ignore/add/remove/force
+
+# Add or remove space between get/set and '{' if on the same line
+sp_getset_brace = ignore # ignore/add/remove/force
+
+# Add or remove space before the '::' operator
+sp_before_dc = ignore # ignore/add/remove/force
+
+# Add or remove space after the '::' operator
+sp_after_dc = ignore # ignore/add/remove/force
+
+# Add or remove around the D named array initializer ':' operator
+sp_d_array_colon = ignore # ignore/add/remove/force
+
+# Add or remove space after the '!' (not) operator.
+sp_not = remove # ignore/add/remove/force
+
+# Add or remove space after the '~' (invert) operator.
+sp_inv = remove # ignore/add/remove/force
+
+# Add or remove space after the '&' (address-of) operator.
+# This does not affect the spacing after a '&' that is part of a type.
+sp_addr = remove # ignore/add/remove/force
+
+# Add or remove space around the '.' or '->' operators
+sp_member = remove # ignore/add/remove/force
+
+# Add or remove space after the '*' (dereference) operator.
+# This does not affect the spacing after a '*' that is part of a type.
+sp_deref = remove # ignore/add/remove/force
+
+# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'
+sp_sign = remove # ignore/add/remove/force
+
+# Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'
+sp_incdec = remove # ignore/add/remove/force
+
+# Add or remove space before a backslash-newline at the end of a line
+sp_before_nl_cont = add # ignore/add/remove/force
+
+# Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;'
+sp_after_oc_scope = ignore # ignore/add/remove/force
+
+# Add or remove space after the colon in message specs
+# '-(int) f:(int) x;' vs '-(int) f: (int) x;'
+sp_after_oc_colon = ignore # ignore/add/remove/force
+
+# Add or remove space before the colon in message specs
+# '-(int) f: (int) x;' vs '-(int) f : (int) x;'
+sp_before_oc_colon = ignore # ignore/add/remove/force
+
+# Add or remove space after the colon in message specs
+# '[object setValue:1];' vs '[object setValue: 1];'
+sp_after_send_oc_colon = ignore # ignore/add/remove/force
+
+# Add or remove space before the colon in message specs
+# '[object setValue:1];' vs '[object setValue :1];'
+sp_before_send_oc_colon = ignore # ignore/add/remove/force
+
+# Add or remove space after the (type) in message specs
+# '-(int) f: (int) x;' vs '-(int) f: (int)x;'
+sp_after_oc_type = ignore # ignore/add/remove/force
+
+# Add or remove space around the ':' in 'b ? t : f'
+sp_cond_colon = ignore # ignore/add/remove/force
+
+# Add or remove space around the '?' in 'b ? t : f'
+sp_cond_question = ignore # ignore/add/remove/force
+
+# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here.
+sp_case_label = ignore # ignore/add/remove/force
+
+# Control the space around the D '..' operator.
+sp_range = ignore # ignore/add/remove/force
+
+# Control the space after the opening of a C++ comment '// A' vs '//A'
+sp_cmt_cpp_start = ignore # ignore/add/remove/force
+
+#
+# Code alignment (not left column spaces/tabs)
+#
+
+# Whether to keep non-indenting tabs
+align_keep_tabs = false # false/true
+
+# Whether to use tabs for alinging
+align_with_tabs = false # false/true
+
+# Whether to bump out to the next tab when aligning
+align_on_tabstop = false # false/true
+
+# Whether to left-align numbers
+align_number_left = false # false/true
+
+# Align variable definitions in prototypes and functions
+align_func_params = false # false/true
+
+# Align parameters in single-line functions that have the same name.
+# The function names must already be aligned with each other.
+align_same_func_call_params = false # false/true
+
+# The span for aligning variable definitions (0=don't align)
+align_var_def_span = 0 # number
+
+# How to align the star in variable definitions.
+# 0=Part of the type 'void * foo;'
+# 1=Part of the variable 'void *foo;'
+# 2=Dangling 'void *foo;'
+align_var_def_star_style = 0 # number
+
+# How to align the '&' in variable definitions.
+# 0=Part of the type
+# 1=Part of the variable
+# 2=Dangling
+align_var_def_amp_style = 0 # number
+
+# The threshold for aligning variable definitions (0=no limit)
+align_var_def_thresh = 0 # number
+
+# The gap for aligning variable definitions
+align_var_def_gap = 0 # number
+
+# Whether to align the colon in struct bit fields
+align_var_def_colon = false # false/true
+
+# Whether to align inline struct/enum/union variable definitions
+align_var_def_inline = false # false/true
+
+# The span for aligning on '=' in assignments (0=don't align)
+align_assign_span = 0 # number
+
+# The threshold for aligning on '=' in assignments (0=no limit)
+align_assign_thresh = 0 # number
+
+# The span for aligning on '=' in enums (0=don't align)
+align_enum_equ_span = 0 # number
+
+# The threshold for aligning on '=' in enums (0=no limit)
+align_enum_equ_thresh = 0 # number
+
+# The span for aligning struct/union (0=don't align)
+align_var_struct_span = 0 # number
+
+# The threshold for aligning struct/union member definitions (0=no limit)
+align_var_struct_thresh = 0 # number
+
+# The gap for aligning struct/union member definitions
+align_var_struct_gap = 0 # number
+
+# The span for aligning struct initializer values (0=don't align)
+align_struct_init_span = 0 # number
+
+# The minimum space between the type and the synonym of a typedef
+align_typedef_gap = 0 # number
+
+# The span for aligning single-line typedefs (0=don't align)
+align_typedef_span = 0 # number
+
+# How to align typedef'd functions with other typedefs
+# 0: Don't mix them at all
+# 1: align the open paren with the types
+# 2: align the function type name with the other type names
+align_typedef_func = 0 # number
+
+# Controls the positioning of the '*' in typedefs. Just try it.
+# 0: Align on typdef type, ignore '*'
+# 1: The '*' is part of type name: typedef int *pint;
+# 2: The '*' is part of the type, but dangling: typedef int *pint;
+align_typedef_star_style = 0 # number
+
+# Controls the positioning of the '&' in typedefs. Just try it.
+# 0: Align on typdef type, ignore '&'
+# 1: The '&' is part of type name: typedef int &pint;
+# 2: The '&' is part of the type, but dangling: typedef int &pint;
+align_typedef_amp_style = 0 # number
+
+# The span for aligning comments that end lines (0=don't align)
+align_right_cmt_span = 0 # number
+
+# If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment
+align_right_cmt_mix = false # false/true
+
+# If a trailing comment is more than this number of columns away from the text it follows,
+# it will qualify for being aligned.
+align_right_cmt_gap = 0 # number
+
+# The span for aligning function prototypes (0=don't align)
+align_func_proto_span = 0 # number
+
+# Minimum gap between the return type and the function name.
+align_func_proto_gap = 0 # number
+
+# Align function protos on the 'operator' keyword instead of what follows
+align_on_operator = false # false/true
+
+# Whether to mix aligning prototype and variable declarations.
+# If true, align_var_def_XXX options are used instead of align_func_proto_XXX options.
+align_mix_var_proto = false # false/true
+
+# Align single-line functions with function prototypes, uses align_func_proto_span
+align_single_line_func = false # false/true
+
+# Aligning the open brace of single-line functions.
+# Requires align_single_line_func=true, uses align_func_proto_span
+align_single_line_brace = false # false/true
+
+# Gap for align_single_line_brace.
+align_single_line_brace_gap = 0 # number
+
+# The span for aligning ObjC msg spec (0=don't align)
+align_oc_msg_spec_span = 0 # number
+
+# Whether to align macros wrapped with a backslash and a newline.
+# This will not work right if the macro contains a multi-line comment.
+align_nl_cont = false # false/true
+
+# The minimum space between label and value of a preprocessor define
+align_pp_define_gap = 0 # number
+
+# The span for aligning on '#define' bodies (0=don't align)
+align_pp_define_span = 0 # number
+
+# Align lines that start with '<<' with previous '<<'. Default=true
+align_left_shift = true # false/true
+
+#
+# Newline adding and removing options
+#
+
+# Whether to collapse empty blocks between '{' and '}'
+nl_collapse_empty_body = false # false/true
+
+# Don't split one-line braced assignments - 'foo_t f = { 1, 2 };'
+nl_assign_leave_one_liners = false # false/true
+
+# Don't split one-line braced statements inside a class xx { } body
+nl_class_leave_one_liners = false # false/true
+
+# Don't split one-line enums: 'enum foo { BAR = 15 };'
+nl_enum_leave_one_liners = false # false/true
+
+# Don't split one-line get or set functions
+nl_getset_leave_one_liners = false # false/true
+
+# Don't split one-line function definitions - 'int foo() { return 0; }'
+nl_func_leave_one_liners = false # false/true
+
+# Don't split one-line if/else statements - 'if(a) b++;'
+nl_if_leave_one_liners = false # false/true
+
+# Add or remove newlines at the start of the file
+nl_start_of_file = ignore # ignore/add/remove/force
+
+# The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force'
+nl_start_of_file_min = 0 # number
+
+# Add or remove newline at the end of the file
+nl_end_of_file = ignore # ignore/add/remove/force
+
+# The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force')
+nl_end_of_file_min = 0 # number
+
+# Add or remove newline between '=' and '{'
+nl_assign_brace = ignore # ignore/add/remove/force
+
+# Add or remove newline between '=' and '[' (D only)
+nl_assign_square = ignore # ignore/add/remove/force
+
+# Add or remove newline after '= [' (D only). Will also affect the newline before the ']'
+nl_after_square_assign = ignore # ignore/add/remove/force
+
+# The number of newlines after a block of variable definitions
+nl_func_var_def_blk = 0 # number
+
+# Add or remove newline between a function call's ')' and '{', as in:
+# list_for_each(item, &list) { }
+nl_fcall_brace = ignore # ignore/add/remove/force
+
+# Add or remove newline between 'enum' and '{'
+nl_enum_brace = ignore # ignore/add/remove/force
+
+# Add or remove newline between 'struct and '{'
+nl_struct_brace = ignore # ignore/add/remove/force
+
+# Add or remove newline between 'union' and '{'
+nl_union_brace = ignore # ignore/add/remove/force
+
+# Add or remove newline between 'if' and '{'
+nl_if_brace = remove # ignore/add/remove/force
+
+# Add or remove newline between '}' and 'else'
+nl_brace_else = remove # ignore/add/remove/force
+
+# Add or remove newline between 'else if' and '{'
+# If set to ignore, nl_if_brace is used instead
+nl_elseif_brace = remove # ignore/add/remove/force
+
+# Add or remove newline between 'else' and '{'
+nl_else_brace = remove # ignore/add/remove/force
+
+# Add or remove newline between 'else' and 'if'
+nl_else_if = ignore # ignore/add/remove/force
+
+# Add or remove newline between '}' and 'finally'
+nl_brace_finally = ignore # ignore/add/remove/force
+
+# Add or remove newline between 'finally' and '{'
+nl_finally_brace = ignore # ignore/add/remove/force
+
+# Add or remove newline between 'try' and '{'
+nl_try_brace = ignore # ignore/add/remove/force
+
+# Add or remove newline between get/set and '{'
+nl_getset_brace = ignore # ignore/add/remove/force
+
+# Add or remove newline between 'for' and '{'
+nl_for_brace = add # ignore/add/remove/force
+
+# Add or remove newline between 'catch' and '{'
+nl_catch_brace = ignore # ignore/add/remove/force
+
+# Add or remove newline between '}' and 'catch'
+nl_brace_catch = ignore # ignore/add/remove/force
+
+# Add or remove newline between 'while' and '{'
+nl_while_brace = ignore # ignore/add/remove/force
+
+# Add or remove newline between 'do' and '{'
+nl_do_brace = ignore # ignore/add/remove/force
+
+# Add or remove newline between '}' and 'while' of 'do' statement
+nl_brace_while = ignore # ignore/add/remove/force
+
+# Add or remove newline between 'switch' and '{'
+nl_switch_brace = add # ignore/add/remove/force
+
+# Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc.
+# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch, and nl_catch_brace.
+nl_multi_line_cond = false # false/true
+
+# Force a newline in a define after the macro name for multi-line defines.
+nl_multi_line_define = false # false/true
+
+# Whether to put a newline before 'case' statement
+nl_before_case = false # false/true
+
+# Add or remove newline between ')' and 'throw'
+nl_before_throw = ignore # ignore/add/remove/force
+
+# Whether to put a newline after 'case' statement
+nl_after_case = false # false/true
+
+# Newline between namespace and {
+nl_namespace_brace = ignore # ignore/add/remove/force
+
+# Add or remove newline between 'template<>' and whatever follows.
+nl_template_class = ignore # ignore/add/remove/force
+
+# Add or remove newline between 'class' and '{'
+nl_class_brace = ignore # ignore/add/remove/force
+
+# Add or remove newline after each ',' in the constructor member initialization
+nl_class_init_args = ignore # ignore/add/remove/force
+
+# Add or remove newline between return type and function name in definition
+nl_func_type_name = ignore # ignore/add/remove/force
+
+# Add or remove newline between function scope and name in a definition
+# Controls the newline after '::' in 'void A::f() { }'
+nl_func_scope_name = ignore # ignore/add/remove/force
+
+# Add or remove newline between return type and function name in a prototype
+nl_func_proto_type_name = ignore # ignore/add/remove/force
+
+# Add or remove newline between a function name and the opening '('
+nl_func_paren = ignore # ignore/add/remove/force
+
+# Add or remove newline after '(' in a function declaration
+nl_func_decl_start = ignore # ignore/add/remove/force
+
+# Add or remove newline after each ',' in a function declaration
+nl_func_decl_args = ignore # ignore/add/remove/force
+
+# Add or remove newline before the ')' in a function declaration
+nl_func_decl_end = ignore # ignore/add/remove/force
+
+# Add or remove newline between function signature and '{'
+nl_fdef_brace = ignore # ignore/add/remove/force
+
+# Whether to put a newline after 'return' statement
+nl_after_return = false # false/true
+
+# Add or remove a newline between the return keyword and return expression.
+nl_return_expr = ignore # ignore/add/remove/force
+
+# Whether to put a newline after semicolons, except in 'for' statements
+nl_after_semicolon = false # false/true
+
+# Whether to put a newline after brace open.
+# This also adds a newline before the matching brace close.
+nl_after_brace_open = false # false/true
+
+# If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is
+# placed between the open brace and a trailing single-line comment.
+nl_after_brace_open_cmt = false # false/true
+
+# Whether to put a newline after a virtual brace open.
+# These occur in un-braced if/while/do/for statement bodies.
+nl_after_vbrace_open = false # false/true
+
+# Whether to put a newline after a brace close.
+# Does not apply if followed by a necessary ';'.
+nl_after_brace_close = false # false/true
+
+# Whether to alter newlines in '#define' macros
+nl_define_macro = false # false/true
+
+# Whether to not put blanks after '#ifxx', '#elxx', or before '#endif'
+nl_squeeze_ifdef = false # false/true
+
+# Add or remove newline before 'if'
+nl_before_if = ignore # ignore/add/remove/force
+
+# Add or remove newline after 'if'
+nl_after_if = ignore # ignore/add/remove/force
+
+# Add or remove newline before 'for'
+nl_before_for = ignore # ignore/add/remove/force
+
+# Add or remove newline after 'for'
+nl_after_for = ignore # ignore/add/remove/force
+
+# Add or remove newline before 'while'
+nl_before_while = ignore # ignore/add/remove/force
+
+# Add or remove newline after 'while'
+nl_after_while = ignore # ignore/add/remove/force
+
+# Add or remove newline before 'switch'
+nl_before_switch = ignore # ignore/add/remove/force
+
+# Add or remove newline after 'switch'
+nl_after_switch = ignore # ignore/add/remove/force
+
+# Add or remove newline before 'do'
+nl_before_do = ignore # ignore/add/remove/force
+
+# Add or remove newline after 'do'
+nl_after_do = ignore # ignore/add/remove/force
+
+# Whether to double-space commented-entries in struct/enum
+nl_ds_struct_enum_cmt = false # false/true
+
+# Whether to double-space before the close brace of a struct/union/enum
+nl_ds_struct_enum_close_brace = false # false/true
+
+# Add or remove a newline around a class colon.
+# Related to pos_class_colon, nl_class_init_args, and pos_comma.
+nl_class_colon = ignore # ignore/add/remove/force
+
+# Change simple unbraced if statements into a one-liner
+# 'if(b)\n i++;' => 'if(b) i++;'
+nl_create_if_one_liner = false # false/true
+
+# Change simple unbraced for statements into a one-liner
+# 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);'
+nl_create_for_one_liner = false # false/true
+
+# Change simple unbraced while statements into a one-liner
+# 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);'
+nl_create_while_one_liner = false # false/true
+
+#
+# Positioning options
+#
+
+# The position of arithmetic operators in wrapped expressions
+pos_arith = ignore # ignore/lead/trail
+
+# The position of assignment in wrapped expressions
+pos_assign = ignore # ignore/lead/trail
+
+# The position of boolean operators in wrapped expressions
+pos_bool = ignore # ignore/lead/trail
+
+# The position of the comma in wrapped expressions
+pos_comma = ignore # ignore/lead/trail
+
+# The position of the comma in the constructor initialization list
+pos_class_comma = ignore # ignore/lead/trail
+
+# The position of colons between constructor and member initialization
+pos_class_colon = ignore # ignore/lead/trail
+
+#
+# Line Splitting options
+#
+
+# Try to limit code width to N number of columns
+code_width = 0 # number
+
+# Whether to fully split long 'for' statements at semi-colons
+ls_for_split_full = false # false/true
+
+# Whether to fully split long function protos/calls at commas
+ls_func_split_full = false # false/true
+
+#
+# Blank line options
+#
+
+# The maximum consecutive newlines
+nl_max = 0 # number
+
+# The number of newlines after a function prototype, if followed by another function prototype
+nl_after_func_proto = 0 # number
+
+# The number of newlines after a function prototype, if not followed by another function prototype
+nl_after_func_proto_group = 0 # number
+
+# The number of newlines after '}' of a multi-line function body
+nl_after_func_body = 0 # number
+
+# The number of newlines after '}' of a single line function body
+nl_after_func_body_one_liner = 0 # number
+
+# The minimum number of newlines before a multi-line comment.
+# Doesn't apply if after a brace open or another multi-line comment.
+nl_before_block_comment = 0 # number
+
+# The minimum number of newlines before a single-line C comment.
+# Doesn't apply if after a brace open or other single-line C comments.
+nl_before_c_comment = 0 # number
+
+# The minimum number of newlines before a CPP comment.
+# Doesn't apply if after a brace open or other CPP comments.
+nl_before_cpp_comment = 0 # number
+
+# Whether to force a newline after a mulit-line comment.
+nl_after_multiline_comment = false # false/true
+
+# The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label.
+# Will not change the newline count if after a brace open.
+# 0 = No change.
+nl_before_access_spec = 0 # number
+
+# The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label.
+# 0 = No change.
+nl_after_access_spec = 0 # number
+
+# The number of newlines between a function def and the function comment.
+# 0 = No change.
+nl_comment_func_def = 0 # number
+
+# The number of newlines after a try-catch-finally block that isn't followed by a brace close.
+# 0 = No change.
+nl_after_try_catch_finally = 0 # number
+
+# The number of newlines before and after a property, indexer or event decl.
+# 0 = No change.
+nl_around_cs_property = 0 # number
+
+# The number of newlines between the get/set/add/remove handlers in C#.
+# 0 = No change.
+nl_between_get_set = 0 # number
+
+# Whether to remove blank lines after '{'
+eat_blanks_after_open_brace = false # false/true
+
+# Whether to remove blank lines before '}'
+eat_blanks_before_close_brace = false # false/true
+
+#
+# Code modifying options (non-whitespace)
+#
+
+# Add or remove braces on single-line 'do' statement
+mod_full_brace_do = ignore # ignore/add/remove/force
+
+# Add or remove braces on single-line 'for' statement
+mod_full_brace_for = ignore # ignore/add/remove/force
+
+# Add or remove braces on single-line function defintions. (Pawn)
+mod_full_brace_function = ignore # ignore/add/remove/force
+
+# Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'.
+mod_full_brace_if = ignore # ignore/add/remove/force
+
+# Don't remove braces around statements that span N newlines
+mod_full_brace_nl = 0 # number
+
+# Add or remove braces on single-line 'while' statement
+mod_full_brace_while = ignore # ignore/add/remove/force
+
+# Add or remove unnecessary paren on 'return' statement
+mod_paren_on_return = ignore # ignore/add/remove/force
+
+# Whether to change optional semicolons to real semicolons
+mod_pawn_semicolon = false # false/true
+
+# Add parens on 'while' and 'if' statement around bools
+mod_full_paren_if_bool = false # false/true
+
+# Whether to remove superfluous semicolons
+mod_remove_extra_semicolon = false # false/true
+
+# If a function body exceeds the specified number of newlines and doesn't have a comment after
+# the close brace, a comment will be added.
+mod_add_long_function_closebrace_comment = 0 # number
+
+# If a switch body exceeds the specified number of newlines and doesn't have a comment after
+# the close brace, a comment will be added.
+mod_add_long_switch_closebrace_comment = 0 # number
+
+# If TRUE, will sort consecutive single-line 'import' statements [Java, D]
+mod_sort_import = false # false/true
+
+# If TRUE, will sort consecutive single-line 'using' statements [C#]
+mod_sort_using = false # false/true
+
+# If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C]
+# This is generally a bad idea, as it may break your code.
+mod_sort_include = false # false/true
+
+# If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace.
+mod_move_case_break = false # false/true
+
+# If TRUE, it will remove a void 'return;' that appears as the last statement in a function.
+mod_remove_empty_return = false # false/true
+
+#
+# Comment modifications
+#
+
+# Try to wrap comments at cmt_width columns
+cmt_width = 0 # number
+
+# If false, disable all multi-line comment changes, including cmt_width and leading chars.
+# Default is true.
+cmt_indent_multi = true # false/true
+
+# Whether to group c-comments that look like they are in a block
+cmt_c_group = true # false/true
+
+# Whether to put an empty '/*' on the first line of the combined c-comment
+cmt_c_nl_start = false # false/true
+
+# Whether to put a newline before the closing '*/' of the combined c-comment
+cmt_c_nl_end = false # false/true
+
+# Whether to group cpp-comments that look like they are in a block
+cmt_cpp_group = true # false/true
+
+# Whether to put an empty '/*' on the first line of the combined cpp-comment
+cmt_cpp_nl_start = false # false/true
+
+# Whether to put a newline before the closing '*/' of the combined cpp-comment
+cmt_cpp_nl_end = false # false/true
+
+# Whether to change cpp-comments into c-comments
+cmt_cpp_to_c = true # false/true
+
+# Whether to put a star on subsequent comment lines
+cmt_star_cont = true # false/true
+
+# The number of spaces to insert at the start of subsequent comment lines
+cmt_sp_before_star_cont = 0 # number
+
+# The number of spaces to insert after the star on subsequent comment lines
+cmt_sp_after_star_cont = 0 # number
+
+# For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of
+# the comment are the same length. Default=True
+cmt_multi_check_last = true # false/true
+
+# The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment.
+# Will substitue $(filename) with the current file's name.
+cmt_insert_file_header = "" # string
+
+# The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment.
+# Will substitue $(filename) with the current file's name.
+cmt_insert_file_footer = "" # string
+
+# The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment.
+# Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff.
+# Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }
+cmt_insert_func_header = "" # string
+
+# The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment.
+# Will substitue $(class) with the class name.
+cmt_insert_class_header = "" # string
+
+# If a preprocessor is encountered when stepping backwards from a function name, then
+# this option decides whether the comment should be inserted.
+# Affects cmt_insert_func_header and cmt_insert_class_header.
+cmt_insert_before_preproc = false # false/true
+
+#
+# Preprocessor options
+#
+
+# Control indent of preprocessors inside #if blocks at brace level 0
+pp_indent = ignore # ignore/add/remove/force
+
+# Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false)
+pp_indent_at_level = false # false/true
+
+# If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1.
+pp_indent_count = 1 # number
+
+# Add or remove space after # based on pp_level of #if blocks
+pp_space = ignore # ignore/add/remove/force
+
+# Sets the number of spaces added with pp_space
+pp_space_count = 0 # number
+
+# The indent for #region and #endregion in C# and '#pragma region' in C/C++
+pp_indent_region = 0 # number
+
+# Whether to indent the code between #region and #endregion
+pp_region_indent_code = false # false/true
+
+# If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level
+pp_indent_if = 0 # number
+
+# Control whether to indent the code between #if, #else and #endif when not at file-level
+pp_if_indent_code = false # false/true
+
+# Whether to indent '#define' at the brace level (true) or from column 1 (false)
+pp_define_at_level = false # false/true
+
+# You can force a token to be a type with the 'type' option.
+# Example:
+# type myfoo1 myfoo2
+#
+# You can create custom macro-based indentation using macro-open,
+# macro-else and macro-close.
+# Example:
+# macro-open BEGIN_TEMPLATE_MESSAGE_MAP
+# macro-open BEGIN_MESSAGE_MAP
+# macro-close END_MESSAGE_MAP
+#
+# You can assign any keyword to any type with the set option.
+# set func_call_user _ N_
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-gps-map.git
More information about the Pkg-grass-devel
mailing list