Fix #39 : Checking of pure library entry in cell selector was broken

2020-11-26 23:15:36 +01:00
41 changed files with 265 additions and 18977 deletions
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@ -1,40 +0,0 @@
 name: CMake
 on:
  push:
    branches: [ master ]
  pull_request:
    branches: [ master ]
 env:
  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
  BUILD_TYPE: Release
 jobs:
  build:
    # The CMake configure and build commands are platform agnostic and should work equally
    # well on Windows or Mac.  You can convert this to a matrix build if you need
    # cross-platform coverage.
    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
    runs-on: ubuntu-latest
    steps:
    - name: Checkout Repository
      uses: actions/checkout@v2
      with:
        submodules: recursive
    - name: Install system dependencies
      if: runner.os == 'Linux'
      run: |
        sudo apt-get update
        sudo apt-get -y install libgtk-3-dev gettext
    - name: Configure CMake
      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
    - name: Build
      # Build your program with the given configuration
      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
--- a/.gitmodules
+++ b/.gitmodules
@ -2,7 +2,3 @@
 	path = c-style-checker
 	url = https://git.shimatta.de/mhu/c-style-checker
 	branch = master
 [submodule "3rdparty/libfort"]
 	path = 3rdparty/libfort
 	url = https://git.shimatta.de/3rd-party/libfort
 	branch = develop
--- a/3rdparty/libfort
+++ b/3rdparty/libfort
@ -1 +0,0 @@
 Subproject commit 41237162a9bd34a30a88069ee4e230584ae8d674
--- a/AUR/PKGBUILD
+++ b/AUR/PKGBUILD
@ -1,7 +1,7 @@
 # Maintainer: Mario Hüttel <mario (dot) huettel (!) gmx (dot) net>
 pkgname=gds-render
-pkgver=v1.2_10_g00d02b8
+pkgver=20191020.403.448de30
 pkgrel=1
 pkgdesc="Conversion tool for converting GDS layout files into TikZ Code and PDF"
 arch=('i686' 'x86_64')
@ -10,13 +10,13 @@ licence=('GPLv2')
 depends=('glib2' 'gtk3' 'cairo')
 makedepends=('cmake' 'git')
 privides=('gds-render')
-source=("${pkgname}-git"::"git+https://git.shimatta.de/mhu/gds-render.git" "https://git.shimatta.de/3rd-party/libfort.git")
+source=("${pkgname}-git"::"git+https://git.shimatta.de/mhu/gds-render.git")
-sha1sums=('SKIP' 'SKIP')
+sha1sums=('SKIP')
 pkgver () {
 	_date=`date +"%Y%m%d"`
-	cd "${srcdir}/${pkgname}-git/version"
+	cd "${srcdir}/${pkgname}-git"
-	echo "$(echo "$(sh ./generate-version-string.sh)" | sed 's/-/_/g')"
+	echo "$_date.$(git rev-list --count master).$(git rev-parse --short master)"
 }
 build () {
@ -26,13 +26,6 @@ build () {
 	make
 }
 prepare () {
 	cd "${pkgname}-git"
 	git submodule init
 	git config submodule.libfort.url "$srcdir/libfort"
 	git submodule update
 }
 package () {
 	cd "$srcdir/$pkgname-git/build"
 	make DESTDIR="${pkgdir}" install 
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,4 +1,4 @@
-project(gds-render LANGUAGES C)
+project(gds-render)
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
  set(CMAKE_INSTALL_PREFIX "/usr/" CACHE PATH "..." FORCE)
@ -33,6 +33,8 @@ pkg_check_modules(CAIRO REQUIRED cairo)
 include_directories(${GLIB_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/include)
 add_subdirectory(plugins)
 add_compile_options(-Wall -Wextra -Wold-style-declaration -Wuninitialized -Wmaybe-uninitialized -Wunused-parameter)
 IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
        message("${Yellow}Debug mode for translations used!${ColorReset}")
 	add_definitions(-DGETTEXT_PACKAGE=\"gds-render\" -DLOCALEDATADIR=\"${CMAKE_CURRENT_BINARY_DIR}/translations/output\")
@ -42,7 +44,13 @@ else(CMAKE_BUILD_TYPE STREQUAL "Debug")
 	add_definitions(-DGETTEXT_PACKAGE=\"gds-render\" -DLOCALEDATADIR=\"/usr/share\")
 ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
 add_subdirectory(resources)
 add_subdirectory(doxygen)
 add_subdirectory(translations)
 add_subdirectory(version)
 link_directories(${GLIB_LINK_DIRS} ${GTK3_LINK_DIRS} ${CAIRO_LINK_DIRS})
 add_definitions(${GLIB2_CFLAGS_OTHER})
 aux_source_directory("widgets" LAYER_SOURCES)
 aux_source_directory("cell-selector" CELL_SELECTOR_SOURCES)
@ -66,32 +74,15 @@ set(SOURCE_GENERATED
  ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.c
 )
 link_directories(${GLIB_LINK_DIRS} ${GTK3_LINK_DIRS} ${CAIRO_LINK_DIRS})
 SET_SOURCE_FILES_PROPERTIES(${SOURCE_GENERATED} PROPERTIES GENERATED 1)
 add_subdirectory(test)
 add_compile_options(-Wall -Wextra -Wold-style-declaration -Wuninitialized -Wmaybe-uninitialized -Wunused-parameter)
 add_subdirectory(resources)
 add_subdirectory(doxygen)
 add_subdirectory(translations)
 add_subdirectory(version)
 set(FORT_ENABLE_TESTING OFF CACHE INTERNAL "")
 add_subdirectory(3rdparty/libfort)
 link_directories(${GLIB_LINK_DIRS} ${GTK3_LINK_DIRS} ${CAIRO_LINK_DIRS})
 add_definitions(${GLIB2_CFLAGS_OTHER})
 add_executable(${PROJECT_NAME} ${SOURCE} ${SOURCE_GENERATED})
 add_dependencies(${PROJECT_NAME} glib-resources)
 add_dependencies(${PROJECT_NAME} version)
 add_dependencies(${PROJECT_NAME} translations)
 target_link_libraries(${PROJECT_NAME} ${GLIB_LDFLAGS} ${GTK3_LDFLAGS} ${CAIRO_LDFLAGS} m version ${CMAKE_DL_LIBS})
 install (TARGETS ${PROJECT_NAME} 
 	RUNTIME	
 		DESTINATION bin
 	)
 target_link_libraries(${PROJECT_NAME} ${GLIB_LDFLAGS} ${GTK3_LDFLAGS} ${CAIRO_LDFLAGS} m version ${CMAKE_DL_LIBS} fort)
--- a/README.MD
+++ b/README.MD
@ -1,7 +1,5 @@
 # GDS-Render Readme
 [![CMake](https://github.com/0mhu/gds-render/actions/workflows/cmake.yml/badge.svg?branch=master)](https://github.com/0mhu/gds-render/actions/workflows/cmake.yml)
 This software is a rendering programm for GDS2 layout files.
 The GDS2 format is mainly used in integrated circuit development.
 This program allows the conversion of a GDS file to a vector graphics file.
--- a/cell-selector/cell-statistics-renderer.c
+++ b/cell-selector/cell-statistics-renderer.c
@ -1,106 +0,0 @@
 /*
 * GDSII-Converter
 * Copyright (C) 2022  Mario Hüttel <mario.huettel@gmx.net>
 *
 * This file is part of GDSII-Converter.
 *
 * GDSII-Converter is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 *
 * GDSII-Converter 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 GDSII-Converter.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * @file cell-statistics-renderer.c
 * @brief CellStatisticsRenderer GObject Class
 * @author Mario Hüttel <mario.huettel@gmx.net>
 */
 /**
 * @addtogroup CellStatisticsRenderer
 * @{
 */
 #include <gds-render/cell-selector/cell-statistics-renderer.h>
 G_DEFINE_TYPE(CellStatisticsRenderer, cell_statistics_renderer, GTK_TYPE_CELL_RENDERER_TEXT)
 enum {
 	PROP_CELL_STAT = 1,
 	PROP_COUNT
 };
 static void cell_statistics_renderer_set_property(GObject      *object,
 					   guint        param_id,
 					   const GValue *value,
 					   GParamSpec   *pspec)
 {
 	GValue val = G_VALUE_INIT;
 	GString *string;
 	const struct gds_cell_statistics *cell_stat;
 	switch (param_id) {
 	case PROP_CELL_STAT:
 		cell_stat = (const struct gds_cell_statistics *)g_value_get_pointer(value);
 		g_value_init(&val, G_TYPE_STRING);
 		string = g_string_new_len("", 5);
 		if (cell_stat)
 			g_string_printf(string, "%zu (%zu) | %zu (%zu)", cell_stat->total_vertex_count,
 					cell_stat->vertex_count, cell_stat->total_gfx_count, cell_stat->gfx_count);
 		g_value_set_string(&val, string->str);
 		g_object_set_property(object, "text", &val);
 		g_value_unset(&val);
 		g_string_free(string, TRUE);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
 		break;
 	}
 }
 static void cell_statistics_renderer_get_property(GObject      *object,
 					   guint        param_id,
 					   GValue	*value,
 					   GParamSpec   *pspec)
 {
 	(void)value;
 	switch (param_id) {
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
 		break;
 	}
 }
 static GParamSpec *properties[PROP_COUNT];
 void cell_statistics_renderer_class_init(CellStatisticsRendererClass *klass)
 {
 	GObjectClass *oclass = G_OBJECT_CLASS(klass);
 	oclass->set_property = cell_statistics_renderer_set_property;
 	oclass->get_property = cell_statistics_renderer_get_property;
 	properties[PROP_CELL_STAT] = g_param_spec_pointer("cell-stat", "cell-stat",
 							  "Cell statistics", G_PARAM_WRITABLE);
 	g_object_class_install_properties(oclass, PROP_COUNT, properties);
 }
 void cell_statistics_renderer_init(CellStatisticsRenderer *self)
 {
 	(void)self;
 }
 GtkCellRenderer *cell_statistics_renderer_new(void)
 {
 	return GTK_CELL_RENDERER(g_object_new(TYPE_GDS_RENDER_CELL_STAT_RENDERER, NULL));
 }
 /** @} */
--- a/cell-selector/lib-cell-renderer.c
+++ b/cell-selector/lib-cell-renderer.c
@ -88,13 +88,11 @@ static void lib_cell_renderer_set_property(GObject      *object,
 		g_value_init(&val, G_TYPE_STRING);
 		g_value_set_string(&val, ((struct gds_library *)g_value_get_pointer(value))->name);
 		g_object_set_property(object, "text", &val);
 		g_value_unset(&val);
 		break;
 	case PROP_CELL:
 		g_value_init(&val, G_TYPE_STRING);
 		g_value_set_string(&val, ((struct gds_cell *)g_value_get_pointer(value))->name);
 		g_object_set_property(object, "text", &val);
 		g_value_unset(&val);
 		break;
 	case PROP_ERROR_LEVEL:
 		/* Set cell color according to error level */
@ -102,7 +100,6 @@ static void lib_cell_renderer_set_property(GObject      *object,
 		convert_error_level_to_color(&color, g_value_get_uint(value));
 		g_value_set_boxed(&val, &color);
 		g_object_set_property(object, "foreground-rgba", &val);
 		g_value_unset(&val);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
--- a/command-line.c
+++ b/command-line.c
@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <glib/gi18n.h>
 #include <string.h>
 #include <gds-render/command-line.h>
 #include <gds-render/gds-utils/gds-parser.h>
@ -39,41 +38,6 @@
 #include <gds-render/output-renderers/latex-renderer.h>
 #include <gds-render/output-renderers/external-renderer.h>
 #include <gds-render/gds-utils/gds-tree-checker.h>
 #include <gds-render/gds-utils/gds-statistics.h>
 #include <fort.h>
 #ifndef COUNT_OF
 #define COUNT_OF(x) (sizeof((x))/sizeof(0[(x)]))
 #endif
 enum analysis_format {
 	ANA_FORMAT_SIMPLE = 0,
 	ANA_FORMAT_CELLS_ONLY,
 	ANA_FORMAT_PRETTY,
 };
 struct analysis_format_cmdarg {
 	enum analysis_format format;
 	const char *argument;
 };
 static const struct analysis_format_cmdarg analysis_format_lookup[] = {
 {
 	.format = ANA_FORMAT_SIMPLE,
 	.argument = "simple",
 },
 {
 	.format = ANA_FORMAT_PRETTY,
 	.argument = "pretty",
 },
 {
 	.format = ANA_FORMAT_CELLS_ONLY,
 	.argument = "cellsonly"
 }
 };
 static int string_array_count(char **string_array)
 {
@ -172,14 +136,14 @@ static struct gds_cell *find_gds_cell_in_lib(struct gds_library *lib, const char
 }
 int command_line_convert_gds(const char *gds_name,
-			     const char *cell_name,
+			      const char *cell_name,
-			     char **renderers,
+			      char **renderers,
-			     char **output_file_names,
+			      char **output_file_names,
-			     const char *layer_file,
+			      const char *layer_file,
-			     struct external_renderer_params *ext_param,
+			      struct external_renderer_params *ext_param,
-			     gboolean tex_standalone,
+			      gboolean tex_standalone,
-			     gboolean tex_layers,
+			      gboolean tex_layers,
-			     double scale)
+			      double scale)
 {
 	int ret = -1;
 	GList *libs = NULL;
@ -191,10 +155,6 @@ int command_line_convert_gds(const char *gds_name,
 	LayerSettings *layer_sett;
 	GdsOutputRenderer *current_renderer;
 	const struct gds_library_parsing_opts gds_parsing_options = {
 		.simplified_polygons = 1,
 	};
 	/* Check if parameters are valid */
 	if (!gds_name || !cell_name || !output_file_names || !layer_file || !renderers) {
 		printf(_("Probably missing argument. Check --help option\n"));
@ -213,7 +173,7 @@ int command_line_convert_gds(const char *gds_name,
 	/* Load GDS */
 	clear_lib_list(&libs);
-	res = parse_gds_from_file(gds_name, &libs, &gds_parsing_options);
+	res = parse_gds_from_file(gds_name, &libs);
 	if (res)
 		goto ret_destroy_library_list;
@ -264,8 +224,6 @@ int command_line_convert_gds(const char *gds_name,
 		gds_output_renderer_render_output(current_renderer, toplevel_cell, scale);
 	}
 	ret = 0;
 ret_destroy_library_list:
 	clear_lib_list(&libs);
 ret_clear_renderers:
@ -276,192 +234,4 @@ ret_destroy_layer_mapping:
 	return ret;
 }
 static void indent_line(int level)
 {
 	while (level--)
 		printf("\t");
 }
 static int printf_indented(int level, const char *format, ...)
 {
 	int ret;
 	va_list a_list;
 	va_start(a_list, format);
 	indent_line(level);
 	ret = vprintf(format, a_list);
 	va_end(a_list);
 	return ret;
 }
 static void print_simple_stat(GList *lib_stat_list)
 {
 	int indentation_level = 0;
 	GList *lib_iter;
 	GList *cell_iter;
 	const struct gds_library *lib;
 	const struct gds_cell *cell;
 	const struct gds_lib_statistics *lib_stat;
 	const struct gds_cell_statistics *cell_stat;
 	for (lib_iter = lib_stat_list; lib_iter; lib_iter = g_list_next(lib_iter)) {
 		lib = (const struct gds_library *)lib_iter->data;
 		lib_stat = &lib->stats;
 		printf_indented(indentation_level, "Library %s\n", lib->name);
 		indentation_level++;
 		for (cell_iter = lib->cells; cell_iter; cell_iter = g_list_next(cell_iter)) {
 			cell = (const struct gds_cell *)cell_iter->data;
 			cell_stat = &cell->stats;
 			printf_indented(indentation_level, "Cell %s\n", cell->name);
 			indentation_level++;
 			printf_indented(indentation_level, "Reference count: %zu\n", cell_stat->reference_count);
 			printf_indented(indentation_level, "Graphics count: %zu\n", cell_stat->gfx_count);
 			printf_indented(indentation_level, "Total Graphics count: %zu\n", cell_stat->total_gfx_count);
 			printf_indented(indentation_level, "Vertex count: %zu\n", cell_stat->vertex_count);
 			printf_indented(indentation_level, "Total Vertex count: %zu\n", cell_stat->total_vertex_count);
 			printf_indented(indentation_level, "Unresolved children: %d\n",
 					cell->checks.unresolved_child_count);
 			printf_indented(indentation_level, "Reference loop: %s\n",
 					cell->checks.affected_by_reference_loop ? "yes" : "no");
 			indentation_level--;
 		}
 		printf_indented(indentation_level, "Cell count: %zu\n", lib_stat->cell_count);
 		printf_indented(indentation_level, "Reference count: %zu\n", lib_stat->reference_count);
 		printf_indented(indentation_level, "Graphics count: %zu\n", lib_stat->gfx_count);
 		printf_indented(indentation_level, "Vertex count: %zu\n", lib_stat->vertex_count);
 	}
 }
 static void table_stat_create_cell_row(struct gds_cell *cell, ft_table_t *tab)
 {
 	ft_printf_ln(tab, "%s|%s|%zu|%zu|%zu|%zu|%zu|%d|%s",
 		     cell->parent_library->name,
 		     cell->name,
 		     cell->stats.gfx_count,
 		     cell->stats.total_gfx_count,
 		     cell->stats.vertex_count,
 		     cell->stats.total_vertex_count,
 		     cell->stats.reference_count,
 		     cell->checks.unresolved_child_count,
 		     cell->checks.affected_by_reference_loop ? "yes" : "no");
 }
 static void table_stat_table_for_lib(struct gds_library *lib, ft_table_t *tab)
 {
 	ft_printf_ln(tab, "%s|%zu|%zu|-|%zu|-|%zu|-|-",
 		     lib->name,
 		     lib->stats.cell_count,
 		     lib->stats.gfx_count,
 		     lib->stats.vertex_count,
 		     lib->stats.reference_count);
 	g_list_foreach(lib->cells, (GFunc)table_stat_create_cell_row, tab);
 }
 static void print_table_stat(GList *lib_list)
 {
 	ft_table_t *table;
 	table = ft_create_table();
 	ft_set_cell_prop(table, 0, FT_ANY_COLUMN, FT_CPROP_ROW_TYPE, FT_ROW_HEADER);
 	ft_write_ln(table, "Library", "Cell", "GFX", "GFX+", "Vertices", "Vertices+", "Refs", "Unresolved Refs", "Loops");
 	g_list_foreach(lib_list, (GFunc)table_stat_table_for_lib, table);
 	printf("%s\n", ft_to_string(table));
 	ft_destroy_table(table);
 }
 static void print_statistics(enum analysis_format format, GList *lib_list)
 {
 	switch (format) {
 	case ANA_FORMAT_PRETTY:
 		print_table_stat(lib_list);
 		break;
 	default:
 		print_simple_stat(lib_list);
 		break;
 	}
 }
 static void print_cell_names(GList *lib_list)
 {
 	GList *lib_iter;
 	GList *name_iter;
 	struct gds_library *lib;
 	for (lib_iter = lib_list; lib_iter; lib_iter = g_list_next(lib_iter)) {
 		lib = (struct gds_library *)lib_iter->data;
 		for (name_iter = lib->cell_names; name_iter; name_iter = name_iter->next) {
 			printf("%s\n", (const char *)name_iter->data);
 		}
 	}
 }
 int command_line_analyze_lib(const char *format, const char *gds_name)
 {
 	enum analysis_format fmt = ANA_FORMAT_SIMPLE;
 	size_t idx;
 	int found = 0;
 	GList *lib_list = NULL;
 	const struct gds_library_parsing_opts parsing_opts = {
 		.simplified_polygons = 0,
 	};
 	int res;
 	int ret = 0;
 	GList *lib_iter;
 	g_return_val_if_fail(gds_name, -1002);
 	if (format && *format) {
 		/* Check format if it is not empty */
 		for (idx = 0; idx < COUNT_OF(analysis_format_lookup); idx++) {
 			if (!strcmp(analysis_format_lookup[idx].argument, format)) {
 				/* Format specifier matches */
 				fmt = analysis_format_lookup[idx].format;
 				found = 1;
 			}
 		}
 		if (!found) {
 			fprintf(stderr, "No format matches %s. Using default.\n", format);
 		}
 	}
 	/* Load the GDS file */
 	res = parse_gds_from_file(gds_name, &lib_list, &parsing_opts);
 	if (res) {
 		fprintf(stderr, "Error parsing GDS file\n");
 		(void)clear_lib_list(&lib_list);
 		ret = res;
 		goto return_val;
 	}
 	for (lib_iter = lib_list; lib_iter; lib_iter = g_list_next(lib_iter)) {
 		res = gds_tree_check_cell_references((struct gds_library *)lib_iter->data);
 		if (res < 0) {
 			fprintf(stderr, "Error checking cell references. Will continue...\n");
 		}
 		res = gds_tree_check_reference_loops((struct gds_library *)lib_iter->data);
 		if (res < 0) {
 			fprintf(stderr, "Error checking cell reference loops. Will continue...\n");
 		}
 	}
 	if (fmt == ANA_FORMAT_CELLS_ONLY) {
 		print_cell_names(lib_list);
 		goto return_clear_libs;
 	}
 	print_statistics(fmt, lib_list);
 return_clear_libs:
 	clear_lib_list(&lib_list);
 return_val:
 	return ret;
 }
 /** @} */
--- a/doxygen/Doxyconfig
+++ b/doxygen/Doxyconfig
@ -1,4 +1,4 @@
-# Doxyfile 1.8.17
+# Doxyfile 1.8.16
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@ -309,7 +309,7 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
 # Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
 # Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
@ -535,8 +535,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# declarations. If set to NO, these declarations will be included in the
+# (class|struct|union) declarations. If set to NO, these declarations will be
-# documentation.
+# included in the documentation.
 # The default value is: NO.
 HIDE_FRIEND_COMPOUNDS  = NO
@ -851,10 +851,8 @@ INPUT_ENCODING         = UTF-8
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
 # *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
 # C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f, *.for, *.tcl, *.vhd,
 # *.vhdl, *.ucf, *.qsf and *.ice.
 FILE_PATTERNS          = *.c \
                         *.cc \
@ -930,7 +928,7 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
-EXCLUDE_PATTERNS       = */test/*
+EXCLUDE_PATTERNS       =
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@ -1267,9 +1265,9 @@ HTML_TIMESTAMP         = NO
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via JavaScript. If disabled, the navigation index will
+# are dynamically created via Javascript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have JavaScript,
+# page. Disable this option to support browsers that do not have Javascript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@ -1557,14 +1555,8 @@ FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
 # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
 # to create new LaTeX commands to be used in formulas as building blocks. See
 # the section "Including formulas" for details.
 FORMULA_MACROFILE      =
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side JavaScript for the rendering
+# https://www.mathjax.org) which uses client side Javascript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@ -1634,7 +1626,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using JavaScript. There
+# implemented using a web server instead of a web client using Javascript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
--- a/doxygen/compilation.dox
+++ b/doxygen/compilation.dox
@ -30,7 +30,7 @@ Development is done with the following library versions:
 | Cairographics | GLib2      | GTK3      |
 | ------------- | ---------- | --------- |
-| 1.17.2        | 2.64.2     | 3.24.18   |
+| 1.17.3        | 2.60.6-1   | 3.24.10-1 |
@section comp-instr Compilation Instructions
@subsection linux-build General Linux Build Instruction
@ -59,7 +59,7 @@ The subfolder 'AUR' contains a PKGBUILD file to build an Archlinux/Pacman packag
@subsection comp-warnings Compiler Warnings
-The compiler will throw the following warnings. Compiled with GCC 9.3.0.
+The compiler will throw the following warnings. Compiled with GCC 8.2.1.
 | Warning | Assessment |
 | ------- | ---------- |
--- a/doxygen/versioning.dox
+++ b/doxygen/versioning.dox
@ -5,7 +5,7 @@
 The version number of this application consists of a given version in the format of 'v1.0'.
 Where the first number indicates a major release and the second number indicates minor changes.
-Versions, including release candidates and patch-levels, are tagged in git.
+Versions, including release candidates and path-levels, are tagged in git.
@subsection rc Release Candidates
 Release candidates are software versions that seem stable and functional to become a new version but testing is not fully finished. These versions are marked with an '-rcX', where X is the number of the release candidate.
--- a/gds-render-gui.c
+++ b/gds-render-gui.c
@ -37,7 +37,6 @@
 #include <gds-render/layer/layer-selector.h>
 #include <gds-render/widgets/activity-bar.h>
 #include <gds-render/cell-selector/lib-cell-renderer.h>
 #include <gds-render/cell-selector/cell-statistics-renderer.h>
 #include <gds-render/output-renderers/latex-renderer.h>
 #include <gds-render/output-renderers/cairo-renderer.h>
 #include <gds-render/widgets/conv-settings-dialog.h>
@ -49,7 +48,6 @@ enum cell_store_columns {
 	CELL_SEL_LIBRARY = 0,
 	CELL_SEL_CELL,
 	CELL_SEL_CELL_ERROR_STATE, /**< Used for cell color and selectability */
 	CELL_SEL_STAT,
 	CELL_SEL_COLUMN_COUNT /**< @brief Not a column. Used to determine count of columns */
 };
@ -221,11 +219,10 @@ int gds_render_gui_setup_cell_selector(GdsRenderGui *self)
 {
 	GtkCellRenderer *render_cell;
 	GtkCellRenderer *render_lib;
 	GtkCellRenderer *render_vertex_count;
 	GtkTreeViewColumn *column;
 	self->cell_tree_store = gtk_tree_store_new(CELL_SEL_COLUMN_COUNT, G_TYPE_POINTER,
-					 G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_POINTER);
+					 G_TYPE_POINTER, G_TYPE_UINT);
 	/* Searching */
 	self->cell_filter = GTK_TREE_MODEL_FILTER(
@ -241,7 +238,6 @@ int gds_render_gui_setup_cell_selector(GdsRenderGui *self)
 	render_cell = lib_cell_renderer_new();
 	render_lib = lib_cell_renderer_new();
 	render_vertex_count = cell_statistics_renderer_new();
 	column = gtk_tree_view_column_new_with_attributes(_("Library"), render_lib, "gds-lib", CELL_SEL_LIBRARY, NULL);
 	gtk_tree_view_append_column(self->cell_tree_view, column);
@ -250,10 +246,6 @@ int gds_render_gui_setup_cell_selector(GdsRenderGui *self)
 							  "error-level", CELL_SEL_CELL_ERROR_STATE, NULL);
 	gtk_tree_view_append_column(self->cell_tree_view, column);
 	column = gtk_tree_view_column_new_with_attributes(_("Vertex | GFX Count"), render_vertex_count, "cell-stat", CELL_SEL_STAT,
 							  NULL);
 	gtk_tree_view_append_column(self->cell_tree_view, column);
 	/* Callback for selection
 	 * This prevents selecting a library
 	 */
@ -263,10 +255,6 @@ int gds_render_gui_setup_cell_selector(GdsRenderGui *self)
 	return 0;
 }
 const struct gds_cell_statistics cc =  {
 	.vertex_count = 12,
 };
 /**
 * @brief Callback function of Load GDS button
 * @param button
@ -290,10 +278,6 @@ static void on_load_gds(gpointer button, gpointer user)
 	char *filename;
 	unsigned int cell_error_level;
 	const struct gds_library_parsing_opts gds_parsing_options = {
 		.simplified_polygons = 1,
 	};
 	self = RENDERER_GUI(user);
 	if (!self)
 		return;
@ -323,7 +307,7 @@ static void on_load_gds(gpointer button, gpointer user)
 	clear_lib_list(&self->gds_libraries);
 	/* Parse new GDSII file */
-	gds_result = parse_gds_from_file(filename, &self->gds_libraries, &gds_parsing_options);
+	gds_result = parse_gds_from_file(filename, &self->gds_libraries);
 	/* Delete file name afterwards */
 	g_free(filename);
@ -365,7 +349,6 @@ static void on_load_gds(gpointer button, gpointer user)
 					   CELL_SEL_CELL, gds_c,
 					   CELL_SEL_CELL_ERROR_STATE, cell_error_level,
 					   CELL_SEL_LIBRARY, gds_c->parent_library,
 					   CELL_SEL_STAT, &gds_c->stats,
 					   -1);
 		} /* for cells */
 	} /* for libraries */
@ -708,13 +691,19 @@ static void on_select_all_layers_clicked(GtkWidget *button, gpointer user_data)
 	layer_selector_select_all_layers(gui->layer_selector, TRUE);
 }
-static gboolean auto_naming_ask_for_override(GdsRenderGui *gui)
+static void auto_naming_clicked(GtkWidget *button, gpointer user_data)
 {
 	GdsRenderGui *gui;
 	GtkDialog *dialog;
-	gint dialog_result;
+	gboolean overwrite;
-	gboolean overwrite = FALSE;
+	int dialog_result;
 	(void)button;
-	g_return_val_if_fail(RENDERER_IS_GUI(gui), FALSE);
+	gui = RENDERER_GUI(user_data);
 	/* Don't do anything if the selector is empty. */
 	if (!layer_selector_contains_elements(gui->layer_selector))
 		return;
 	/* Ask for overwrite */
 	dialog = GTK_DIALOG(gtk_message_dialog_new(gui->main_window, GTK_DIALOG_USE_HEADER_BAR, GTK_MESSAGE_QUESTION,
@ -731,25 +720,6 @@ static gboolean auto_naming_ask_for_override(GdsRenderGui *gui)
 	}
 	gtk_widget_destroy(GTK_WIDGET(dialog));
 	return overwrite;
 }
 static void auto_naming_clicked(GtkWidget *button, gpointer user_data)
 {
 	GdsRenderGui *gui;
 	gboolean overwrite = FALSE;
 	(void)button;
 	gui = RENDERER_GUI(user_data);
 	/* Don't do anything if the selector is empty. */
 	if (!layer_selector_contains_elements(gui->layer_selector))
 		return;
 	/* Ask, if names shall be overwritten, if they are not empty */
 	if (layer_selector_num_of_named_elements(gui->layer_selector) > 0)
 		overwrite = auto_naming_ask_for_override(gui);
 	layer_selector_auto_name_layers(gui->layer_selector, overwrite);
 }
--- a/gds-utils/gds-parser.c
+++ b/gds-utils/gds-parser.c
@ -43,7 +43,6 @@
 #include <glib/gi18n.h>
 #include <gds-render/gds-utils/gds-parser.h>
 #include <gds-render/gds-utils/gds-statistics.h>
 /**
 * @brief Default units assumed for library.
@ -51,8 +50,8 @@
 */
 #define GDS_DEFAULT_UNITS (10E-9)
-#define GDS_ERROR(fmt, ...) fprintf(stderr, "[PARSE_ERROR] " fmt "\n", ##__VA_ARGS__) /**< @brief Print GDS error*/
+#define GDS_ERROR(fmt, ...) printf("[PARSE_ERROR] " fmt "\n", ##__VA_ARGS__) /**< @brief Print GDS error*/
-#define GDS_WARN(fmt, ...) fprintf(stderr, "[PARSE_WARNING] " fmt "\n", ##__VA_ARGS__) /**< @brief Print GDS warning */
+#define GDS_WARN(fmt, ...) printf("[PARSE_WARNING] " fmt "\n", ##__VA_ARGS__) /**< @brief Print GDS warning */
 #if GDS_PRINT_DEBUG_INFOS
 	/**< @brief standard printf. But can be disabled in code. */
@ -81,7 +80,6 @@ enum gds_record {
 	STRANS = 0x1A01,
 	BOX = 0x2D00,
 	LAYER = 0x0D02,
 	DATATYPE = 0x0E02,
 	WIDTH = 0x0F03,
 	PATHTYPE = 0x2102,
 	COLROW = 0x1302,
@ -267,8 +265,7 @@ static uint16_t gds_convert_unsigned_int16(const char *data)
 * @param library_ptr Return of newly created library.
 * @return Newly created list pointer
 */
-static GList *append_library(GList *curr_list, const struct gds_library_parsing_opts *opts,
+static GList *append_library(GList *curr_list, struct gds_library **library_ptr)
 			     struct gds_library **library_ptr)
 {
 	struct gds_library *lib;
@ -278,15 +275,8 @@ static GList *append_library(GList *curr_list, const struct gds_library_parsing_
 		lib->name[0] = 0;
 		lib->unit_in_meters = GDS_DEFAULT_UNITS; // Default. Will be overwritten
 		lib->cell_names = NULL;
-		/* Copy the settings into the library */
+	} else
 		memcpy(&lib->parsing_opts, opts, sizeof(struct gds_library_parsing_opts));
 		lib->stats.cell_count = 0;
 		lib->stats.gfx_count = 0;
 		lib->stats.reference_count = 0;
 		lib->stats.vertex_count = 0;
 	} else {
 		return NULL;
 	}
 	if (library_ptr)
 		*library_ptr = lib;
@ -362,11 +352,6 @@ static GList *append_cell(GList *curr_list, struct gds_cell **cell_ptr)
 		cell->parent_library = NULL;
 		cell->checks.unresolved_child_count = GDS_CELL_CHECK_NOT_RUN;
 		cell->checks.affected_by_reference_loop = GDS_CELL_CHECK_NOT_RUN;
 		cell->stats.reference_count = 0;
 		cell->stats.total_vertex_count = 0;
 		cell->stats.total_gfx_count = 0;
 		cell->stats.gfx_count = 0;
 		cell->stats.vertex_count = 0;
 	} else
 		return NULL;
 	/* return cell */
@ -502,102 +487,20 @@ static void parse_reference_list(gpointer gcell_ref, gpointer glibrary)
 }
 /**
- * @brief Simplify graphics objects
+ * @brief Scans cell references inside cell
- * @param graphics gfx struct
+ This function searches all the references in \p gcell and updates the gds_cell_instance::cell_ref field in each instance
 * @param user_data GDS library
 */
 static void simplify_graphics(gpointer graphics, gpointer user_data)
 {
 	struct gds_graphics *gfx;
 	const struct gds_point *first_vertex = NULL;
 	const struct gds_point *prev_vertex = NULL;
 	const struct gds_point *current_vertex;
 	GList *vertex_iter;
 	GList *next_iter;
 	(void)user_data;
 	size_t processed_count = 0U;
 	size_t removed_count = 0U;
 	gfx = (struct gds_graphics *)graphics;
 	if (gfx->gfx_type == GRAPHIC_POLYGON) {
 		GDS_INF("\t\t\tPolygon found\n");
 		/* Loop over all vertices */
 		for (vertex_iter = gfx->vertices; vertex_iter;) {
 			current_vertex = (const struct gds_point *)vertex_iter->data;
 			next_iter = g_list_next(vertex_iter);
 			processed_count++;
 			if (vertex_iter == gfx->vertices) {
 				/* This is the first vertex */
 				first_vertex = current_vertex;
 				prev_vertex = NULL;
 			}
 			if (prev_vertex) {
 				if (current_vertex->x == prev_vertex->x && current_vertex->y == prev_vertex->y) {
 					/* Vertex is the same as the previous one */
 					GDS_INF("\t\t\t\tDuplicate vertex (%d,%d). Removing...\n",
 						current_vertex->x, current_vertex->y);
 					/* Delete the current one from the list */
 					gfx->vertices = g_list_remove_link(gfx->vertices, vertex_iter);
 					/* Free the data */
 					if (vertex_iter->data)
 						free(vertex_iter->data);
 					vertex_iter->data = NULL;
 					g_list_free_1(vertex_iter);
 					removed_count++;
 				} else if (!g_list_next(vertex_iter)) {
 					/* This is the last element in the list */
 					if (current_vertex->x == first_vertex->x &&
 							current_vertex->y == first_vertex->y) {
 						GDS_INF("\t\t\t\tLast vertex is identical to first vertex (%d,%d). Removing\n",
 							current_vertex->x, current_vertex->y);
 						gfx->vertices = g_list_remove_link(gfx->vertices, vertex_iter);
 						if (vertex_iter->data)
 							free(vertex_iter->data);
 						g_list_free_1(vertex_iter);
 						removed_count++;
 					} else {
 						GDS_WARN("First vertex is not coincident with first vertex, although the GDS file format specifies this. However, this is not a problem.");
 					}
 				}
 			}
 			vertex_iter = next_iter;
 			prev_vertex = current_vertex;
 		}
 		GDS_INF("\t\t\tProcessed %zu vertices. %zu removed.\n", processed_count, removed_count);
 	}
 }
 /**
 * @brief Scans cell and resolves references and simplifies polygons
 * This function searches all the references in \p gcell and updates the gds_cell_instance::cell_ref field in each instance
 *
 * @param gcell pointer cast of #gds_cell *
 * @param library Library where the cell references are searched in
 */
-static void scan_cell_references_and_polygons(gpointer gcell, gpointer library)
+static void scan_cell_reference_dependencies(gpointer gcell, gpointer library)
 {
 	struct gds_cell *cell = (struct gds_cell *)gcell;
 	struct gds_library *my_lib = (struct gds_library *)library;
 	int simplify_polygons;
 	simplify_polygons = my_lib->parsing_opts.simplified_polygons;
 	GDS_INF("\tScanning cell: %s\n", cell->name);
-	GDS_INF("\t\tCell references\n");
+
 	/* Scan all library references */
 	g_list_foreach(cell->child_cells, parse_reference_list, library);
 	GDS_INF("\t\tSimplifying Polygons%s\n", simplify_polygons ? "" : ": skipped");
 	if (simplify_polygons) {
 		g_list_foreach(cell->graphic_objs, simplify_graphics, library);
 	}
 }
 /**
@ -613,16 +516,7 @@ static void scan_library_references(gpointer library_list_item, gpointer user)
 	(void)user;
 	GDS_INF("Scanning Library: %s\n", lib->name);
-	g_list_foreach(lib->cells, scan_cell_references_and_polygons, lib);
+	g_list_foreach(lib->cells, scan_cell_reference_dependencies, lib);
 }
 static void calc_library_stats(gpointer library_list_item, gpointer user)
 {
 	struct gds_library *lib = (struct gds_library *)library_list_item;
 	(void)user;
 	GDS_INF("Calculating stats for Library: %s\n", lib->name);
 	gds_statistics_calc_cummulative_counts_in_lib(lib);
 }
 /**
@ -706,7 +600,6 @@ static void convert_aref_to_sref(struct gds_cell_array_instance *aref, struct gd
 		for (row = 0; row < aref->rows; row++) {
 			/* Create new instance for this row/column and configure data */
 			container_cell->child_cells = append_cell_ref(container_cell->child_cells, &sref_inst);
 			container_cell->stats.reference_count++;
 			if (!sref_inst) {
 				GDS_ERROR("Appending cell ref failed!");
 				continue;
@ -723,8 +616,7 @@ static void convert_aref_to_sref(struct gds_cell_array_instance *aref, struct gd
 	GDS_INF("Converted AREF to SREFs\n");
 }
-int parse_gds_from_file(const char *filename, GList **library_list,
+int parse_gds_from_file(const char *filename, GList **library_list)
 			const struct gds_library_parsing_opts *parsing_options)
 {
 	char *workbuff;
 	int read;
@ -804,7 +696,7 @@ int parse_gds_from_file(const char *filename, GList **library_list,
 		/* if begin: Allocate structures */
 		switch (rec_type) {
 		case BGNLIB:
-			lib_list = append_library(lib_list, parsing_options, &current_lib);
+			lib_list = append_library(lib_list, &current_lib);
 			if (lib_list == NULL) {
 				GDS_ERROR("Allocating memory failed");
 				run = -3;
@ -878,7 +770,7 @@ int parse_gds_from_file(const char *filename, GList **library_list,
 				run = -4;
 				break;
 			}
-			GDS_INF("\tEntering boundary of type %s\n", rec_type==BOUNDARY ? "polygon" : "box");
+			GDS_INF("\tEntering boundary/Box\n");
 			break;
 		case SREF:
 			if (current_cell == NULL) {
@ -888,7 +780,6 @@ int parse_gds_from_file(const char *filename, GList **library_list,
 			}
 			current_cell->child_cells = append_cell_ref(current_cell->child_cells,
 								    &current_s_reference);
 			current_cell->stats.reference_count++;
 			if (current_cell->child_cells == NULL) {
 				GDS_ERROR("Memory allocation failed");
 				run = -4;
@ -914,13 +805,8 @@ int parse_gds_from_file(const char *filename, GList **library_list,
 			break;
 		case ENDEL:
 			if (current_graphics != NULL) {
-				GDS_INF("\tLeaving %s\n", (current_graphics->gfx_type == GRAPHIC_POLYGON ? "boundary"
+				GDS_INF("\tLeaving %s\n", (current_graphics->gfx_type == GRAPHIC_POLYGON ? "boundary" : "path"));
 							: (current_graphics->gfx_type == GRAPHIC_PATH ? "path"
 							: "box")));
 				current_graphics = NULL;
 				if (current_cell) {
 					current_cell->stats.gfx_count++;
 				}
 			}
 			if (current_s_reference != NULL) {
 				GDS_INF("\tLeaving Reference\n");
@ -938,11 +824,11 @@ int parse_gds_from_file(const char *filename, GList **library_list,
 			} else if (current_s_reference) {
 				if (rec_data_length != 8) {
-					GDS_WARN("Instance has weird coordinates. Rendered output might be wrong!");
+					GDS_WARN("Instance has weird coordinates. Rendered output might be screwed!");
 				}
 			} else if (current_a_reference) {
 				if (rec_data_length != (3*(4+4)))
-					GDS_WARN("Array instance has weird coordinates. Rendered output might be wrong!");
+					GDS_WARN("Array instance has weird coordinates. Rendered output might be screwed!");
 			}
 			break;
 		case AREF:
@ -981,7 +867,6 @@ int parse_gds_from_file(const char *filename, GList **library_list,
 		case LIBNAME:
 		case SNAME:
 		case LAYER:
 		case DATATYPE:
 		case STRNAME:
 			break;
 		default:
@ -1070,9 +955,7 @@ int parse_gds_from_file(const char *filename, GList **library_list,
 					current_graphics->vertices =
 							append_vertex(current_graphics->vertices, x, y);
 					GDS_INF("\t\tSet coordinate: %d/%d\n", x, y);
-					if (current_cell) {
+
 						current_cell->stats.vertex_count++;
 					}
 				}
 			} else if (current_a_reference) {
 				for (i = 0; i < 3; i++) {
@ -1120,16 +1003,6 @@ int parse_gds_from_file(const char *filename, GList **library_list,
 			}
 			GDS_INF("\t\tAdded layer %d\n", (int)current_graphics->layer);
 			break;
 		case DATATYPE:
 			if (!current_graphics) {
 				GDS_WARN("Datatype has to be defined inside graphics object. Probably unknown object. Implement it yourself!");
 				break;
 			}
 			current_graphics->datatype = gds_convert_signed_int16(workbuff);
 			if (current_graphics->datatype < 0)
 				GDS_WARN("Datatype negative!");
 			GDS_INF("\t\tAdded datatype %d\n", (int)current_graphics->datatype);
 			break;
 		case MAG:
 			if (rec_data_length != 8) {
 				GDS_WARN("Magnification is not an 8 byte real. Results may be wrong");
@ -1188,13 +1061,8 @@ int parse_gds_from_file(const char *filename, GList **library_list,
 	if (!run) {
 		/* Iterate and find references to cells */
 		g_list_foreach(lib_list, scan_library_references, NULL);
 		/* Calculate lib stats and cummulative total counts */
 		g_list_foreach(lib_list, calc_library_stats, NULL);
 	}
 	*library_list = lib_list;
 	free(workbuff);
--- a/gds-utils/gds-statistics.c
+++ b/gds-utils/gds-statistics.c
@ -1,93 +0,0 @@
 /*
 * GDSII-Converter
 * Copyright (C) 2018  Mario Hüttel <mario.huettel@gmx.net>
 *
 * This file is part of GDSII-Converter.
 *
 * GDSII-Converter is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 *
 * GDSII-Converter 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 GDSII-Converter.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * @file gds-statistics.c
 * @brief Statistics of GDS files
 * @author Mario Hüttel <mario.huettel@gmx.net>
 *
 */
 #include <gds-render/gds-utils/gds-statistics.h>
 #include <stdio.h>
 /**
 * @addtogroup GDS-Utilities
 * @{
 */
 #define MAX_RECURSION_DEPTH (1024)
 static void calculate_vertex_gfx_count_cell(struct gds_cell *cell, unsigned int recursion_depth)
 {
 	GList *cell_iter;
 	struct gds_cell_instance *cell_ref;
 	struct gds_cell *sub_cell;
 	g_return_if_fail(cell);
 	/* Check if cell has already been calculated */
 	if (cell->stats.total_gfx_count && cell->stats.total_vertex_count) {
 		/* Return. This cell and all of its subcells have been calculated */
 		return;
 	}
 	/* Update with own vertex / GFX count */
 	cell->stats.total_vertex_count = cell->stats.vertex_count;
 	cell->stats.total_gfx_count = cell->stats.gfx_count;
 	/* Do not analyze further, if maximum recursion depth is reached */
 	if (!recursion_depth)
 		return;
 	for (cell_iter = cell->child_cells; cell_iter; cell_iter = g_list_next(cell_iter)) {
 		/* Scan all subcells recursively, if there are any */
 		cell_ref = (struct gds_cell_instance *)cell_iter->data;
 		sub_cell = (struct gds_cell *)cell_ref->cell_ref;
 		calculate_vertex_gfx_count_cell(sub_cell, recursion_depth - 1);
 		/* Increment count */
 		cell->stats.total_vertex_count += sub_cell->stats.total_vertex_count;
 		cell->stats.total_gfx_count += sub_cell->stats.total_vertex_count;
 	}
 }
 void gds_statistics_calc_cummulative_counts_in_lib(struct gds_library *lib)
 {
 	GList *cell_iter;
 	struct gds_cell *cell;
 	g_return_if_fail(lib);
 	for (cell_iter = lib->cells; cell_iter; cell_iter = g_list_next(cell_iter)) {
 		cell = (struct gds_cell *)cell_iter->data;
 		calculate_vertex_gfx_count_cell(cell, MAX_RECURSION_DEPTH);
 		lib->stats.vertex_count += cell->stats.vertex_count;
 		lib->stats.cell_count++;
 		lib->stats.gfx_count += cell->stats.gfx_count;
 		lib->stats.reference_count += cell->stats.reference_count;
 	}
 }
 /** @} */
--- a/geometric/bounding-box.c
+++ b/geometric/bounding-box.c
@ -37,7 +37,7 @@
 #define MAX(a, b) (((a) > (b)) ? (a) : (b)) /**< @brief Return bigger number */
 #define ABS_DBL(a) ((a) < 0 ? -(a) : (a))
-void bounding_box_calculate_from_polygon(GList *vertices, conv_generic_to_vector_2d_t conv_func, union bounding_box *box)
+void bounding_box_calculate_polygon(GList *vertices, conv_generic_to_vector_2d_t conv_func, union bounding_box *box)
 {
 	double xmin = DBL_MAX, xmax = -DBL_MAX, ymin = DBL_MAX, ymax = -DBL_MAX;
 	struct vector_2d temp_vec;
@ -68,7 +68,7 @@ void bounding_box_calculate_from_polygon(GList *vertices, conv_generic_to_vector
 	box->vectors.upper_right.y = ymax;
 }
-void bounding_box_update_with_box(union bounding_box *destination, union bounding_box *update)
+void bounding_box_update_box(union bounding_box *destination, union bounding_box *update)
 {
 	if (!destination || !update)
 		return;
@ -151,6 +151,8 @@ void bounding_box_update_with_path(GList *vertices, double thickness,
 	GList *vertex_iterator;
 	struct vector_2d pt;
 	/* printf("Warning! Function %s not yet implemented correctly!\n", __func__); */
 	if (!vertices || !box)
 		return;
@ -171,7 +173,7 @@ void bounding_box_update_with_path(GList *vertices, double thickness,
 	}
 }
-void bounding_box_update_with_point(union bounding_box *destination, conv_generic_to_vector_2d_t conv_func, void *pt)
+void bounding_box_update_point(union bounding_box *destination, conv_generic_to_vector_2d_t conv_func, void *pt)
 {
 	struct vector_2d point;
@ -222,7 +224,7 @@ void bounding_box_apply_transform(double scale, double rotation_deg, bool flip_a
 		vector_2d_rotate(&input_points[i], rotation_deg * M_PI / 180.0);
 		vector_2d_scale(&input_points[i], scale);
-		bounding_box_update_with_point(box, NULL, &input_points[i]);
+		bounding_box_update_point(box, NULL, &input_points[i]);
 	}
 }
--- a/geometric/cell-geometrics.c
+++ b/geometric/cell-geometrics.c
@ -53,7 +53,7 @@ static void update_box_with_gfx(union bounding_box *box, struct gds_graphics *gf
 	case GRAPHIC_BOX:
 		/* Expected fallthrough */
 	case GRAPHIC_POLYGON:
-		bounding_box_calculate_from_polygon(gfx->vertices,
+		bounding_box_calculate_polygon(gfx->vertices,
 							(conv_generic_to_vector_2d_t)&convert_gds_point_to_2d_vector,
 							&current_box);
 		break;
@ -74,7 +74,7 @@ static void update_box_with_gfx(union bounding_box *box, struct gds_graphics *gf
 	}
 	/* Update box with results */
-	bounding_box_update_with_box(box, &current_box);
+	bounding_box_update_box(box, &current_box);
 }
 void calculate_cell_bounding_box(union bounding_box *box, struct gds_cell *cell)
@ -113,7 +113,7 @@ void calculate_cell_bounding_box(union bounding_box *box, struct gds_cell *cell)
 		temp_box.vectors.upper_right.y += sub_cell->origin.y;
 		/* update the parent's box */
-		bounding_box_update_with_box(box, &temp_box);
+		bounding_box_update_box(box, &temp_box);
 	}
 }
--- a/geometric/vector-operations.c
+++ b/geometric/vector-operations.c
@ -65,7 +65,7 @@ void vector_2d_rotate(struct vector_2d *vec, double angle)
 	sin_val = sin(angle);
 	cos_val = cos(angle);
-	(void)vector_2d_copy(&temp, vec);
+	vector_2d_copy(&temp, vec);
 	/* Apply rotation matrix */
 	vec->x = (cos_val * temp.x) - (sin_val * temp.y);
--- a/include/gds-render/cell-selector/cell-statistics-renderer.h
+++ b/include/gds-render/cell-selector/cell-statistics-renderer.h
@ -1,56 +0,0 @@
 /*
 * GDSII-Converter
 * Copyright (C) 2022  Mario Hüttel <mario.huettel@gmx.net>
 *
 * This file is part of GDSII-Converter.
 *
 * GDSII-Converter is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 *
 * GDSII-Converter 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 GDSII-Converter.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * @file cell-statistics-renderer.h
 * @brief Header file for the CellStatisticsRenderer GObject Class
 * @author Mario Hüttel <mario.huettel@gmx.net>
 */
 /**
 * @addtogroup CellStatisticsRenderer
 * @{
 */
 #ifndef _CELL_STATISTICS_RENDERER_H_
 #define _CELL_STATISTICS_RENDERER_H_
 #include <gtk/gtk.h>
 #include <gds-render/gds-utils/gds-statistics.h>
 G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE(CellStatisticsRenderer, cell_statistics_renderer, GDS_RENDER, CELL_STAT_RENDERER, GtkCellRendererText)
 #define TYPE_GDS_RENDER_CELL_STAT_RENDERER (cell_statistics_renderer_get_type())
 typedef struct _CellStatisticsRenderer {
    GtkCellRendererText super;
 } CellStatisticsRenderer;
 /**
 * @brief New Cell statistics renderer
 * @return GObject
 */
 GtkCellRenderer *cell_statistics_renderer_new(void);
 G_END_DECLS
 #endif /* _CELL_STATISTICS_RENDERER_H_ */
 /** @} */
--- a/include/gds-render/command-line.h
+++ b/include/gds-render/command-line.h
@ -71,14 +71,6 @@ int command_line_convert_gds(const char *gds_name,
 			     gboolean tex_layers,
 			     double scale);
 /**
 * @brief Analyze the given GDS file
 * @param format Output format of the analysis result
 * @param gds_name GDS file name
 * @return 0 if successful
 */
 int command_line_analyze_lib(const char *format, const char *gds_name);
 #endif /* _COMMAND_LINE_H_ */
 /** @} */
--- a/include/gds-render/gds-utils/gds-parser.h
+++ b/include/gds-render/gds-utils/gds-parser.h
@ -48,11 +48,9 @@
 *
 * @param[in] filename Path to the GDS file
 * @param[in,out] library_array GList Pointer.
 * @param[in] parsing_options Parsing options.
 * @return 0 if successful
 */
-int parse_gds_from_file(const char *filename, GList **library_array,
+int parse_gds_from_file(const char *filename, GList **library_array);
                        const struct gds_library_parsing_opts *parsing_options);
 /**
 * @brief Deletes all libraries including cells, references etc.
--- a/include/gds-render/gds-utils/gds-statistics.h
+++ b/include/gds-render/gds-utils/gds-statistics.h
@ -1,42 +0,0 @@
 /*
 * GDSII-Converter
 * Copyright (C) 2018  Mario Hüttel <mario.huettel@gmx.net>
 *
 * This file is part of GDSII-Converter.
 *
 * GDSII-Converter is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 *
 * GDSII-Converter 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 GDSII-Converter.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * @file gds-parser.h
 * @brief Header file for the GDS statistics
 * @author Mario Hüttel <mario.huettel@gmx.net>
 */
 #ifndef _GDS_STATISTICS_H_
 #define _GDS_STATISTICS_H_
 /**
 * @addtogroup GDS-Utilities
 * @{
 */
 #include <glib.h>
 #include <gds-render/gds-utils/gds-types.h>
 void gds_statistics_calc_cummulative_counts_in_lib(struct gds_library *lib);
 /** @} */
 #endif				/* _GDS_STATISTICS_H_ */
--- a/include/gds-render/gds-utils/gds-types.h
+++ b/include/gds-render/gds-utils/gds-types.h
@ -65,22 +65,6 @@ struct gds_point {
 	int y;
 };
 struct gds_cell_statistics {
    size_t gfx_count;
    size_t vertex_count;
    size_t total_vertex_count;
    size_t total_gfx_count;
    size_t reference_count;
 };
 struct gds_lib_statistics {
    size_t gfx_count;
    size_t vertex_count;
    size_t reference_count;
    size_t cell_count;
 };
 /**
 * @brief Stores the result of the cell checks.
 */
@ -117,7 +101,7 @@ struct gds_graphics {
 	enum path_type path_render_type; /**< @brief Line cap */
 	int width_absolute; /**< @brief Width. Not used for objects other than paths */
 	int16_t layer; /**< @brief Layer the graphic object is on */
-	int16_t datatype; /**< @brief Data type of graphic object */
+	uint16_t datatype;
 };
 /**
@ -143,14 +127,6 @@ struct gds_cell {
 	GList *graphic_objs; /**< @brief List of #gds_graphics */
 	struct gds_library *parent_library; /**< @brief Pointer to parent library */
 	struct gds_cell_checks checks; /**< @brief Checking results */
    struct gds_cell_statistics stats; /**< @brief Optional statistic info */
 };
 /**
 * @brief Options, hwo this liobrary was parsed.
 */
 struct gds_library_parsing_opts {
    int simplified_polygons; /**< @brief Polygons have been simplified. Coincident end point removed. */
 };
 /**
@ -160,14 +136,11 @@ struct gds_library {
 	char name[CELL_NAME_MAX];
 	struct gds_time_field mod_time;
 	struct gds_time_field access_time;
    struct gds_library_parsing_opts parsing_opts;
 	double unit_in_meters;  /**< Length of a database unit in meters */
 	GList *cells; /**< List of #gds_cell that contains all cells in this library*/
 	GList *cell_names /**< List of strings that contains all cell names */;
    struct gds_lib_statistics stats;
 };
 /** @} */
 #endif /* __GDS_TYPES_H__ */
--- a/include/gds-render/geometric/bounding-box.h
+++ b/include/gds-render/geometric/bounding-box.h
@ -35,44 +35,15 @@
 #include <gds-render/geometric/vector-operations.h>
 #include <stdbool.h>
 /**
 * @brief Union describing a bounding box
 *
 * Two ways of accessing a bounding box are possible.
 *
 * Either, use the "named" vectors struct to specifically access the points
 * @code
 * 	lower_left = box.vectors.lower_left;
 * 	upper right = box.vectors.upper_right;
 * @endcode
 *
 * or use the iterable vector array:
 * @code
 * 	for (i = 0; i < 2; i++)
 * 		box.vector_array[i] = points[i];
 * @endcode
 */
 union bounding_box {
-	/**
+	/** Coordinate System is (y up | x right) */
 	 * @brief Location vectors of upper right and lower left bounding box points
 	 * @note Coordinate System is (y up | x right)
 	 */
 	struct _vectors {
 		/** @brief Lower left point of the bounding box */
 		struct vector_2d lower_left;
 		/** @brief Upper right point of the bounding box */
 		struct vector_2d upper_right;
 	} vectors;
 	/**
 	 * @brief Array of vectors representing a bounding box
 	 * @note This is more convenient for iterating
 	 */
 	struct vector_2d vector_array[2];
 };
 /*
 * @brief Pointer to a function that takes any pointer and converts this object to a vector_2d struct
 */
 typedef void (*conv_generic_to_vector_2d_t)(void *, struct vector_2d *);
 /**
@ -81,14 +52,14 @@ typedef void (*conv_generic_to_vector_2d_t)(void *, struct vector_2d *);
 * @param conv_func Conversion function to convert vertices to vector_2d structs.
 * @param box Box to write to. This box is not updated! All previous data is discarded
 */
-void bounding_box_calculate_from_polygon(GList *vertices, conv_generic_to_vector_2d_t conv_func, union bounding_box *box);
+void bounding_box_calculate_polygon(GList *vertices, conv_generic_to_vector_2d_t conv_func, union bounding_box *box);
 /**
 * @brief Update an exisitng bounding box with another one.
 * @param destination Target box to update
 * @param update Box to update the target with
 */
-void bounding_box_update_with_box(union bounding_box *destination, union bounding_box *update);
+void bounding_box_update_box(union bounding_box *destination, union bounding_box *update);
 /**
 * @brief Prepare an empty bounding box.
@ -105,7 +76,7 @@ void bounding_box_prepare_empty(union bounding_box *box);
 * @param conv_func Conversion function to convert \p pt to a vector_2d. May be NULL
 * @param pt Point to update bounding box with
 */
-void bounding_box_update_with_point(union bounding_box *destination, conv_generic_to_vector_2d_t conv_func, void *pt);
+void bounding_box_update_point(union bounding_box *destination, conv_generic_to_vector_2d_t conv_func, void *pt);
 /**
 * @brief Return all four corner points of a bounding box
@ -131,7 +102,7 @@ void bounding_box_get_all_points(struct vector_2d *points, union bounding_box *b
 * @param rotation_deg Rotation of bounding box around the origin in degrees (counterclockwise)
 * @param flip_at_x Flip the boundig box on the x axis before rotating.
 * @param box Bounding box the operations should be applied to.
- * @note Keep in mind, that this bounding box is actually the bounding box of the rotated boundig box and not the object itself.
+ * @note Keep in mind, that this bounding boxy is actually the bounding box of the rotated boundig box and not the object itself.
 *       It might be too big.
 */
 void bounding_box_apply_transform(double scale, double rotation_deg, bool flip_at_x, union bounding_box *box);
@ -142,9 +113,6 @@ void bounding_box_apply_transform(double scale, double rotation_deg, bool flip_a
 * @param thickness Thisckness of the path
 * @param conv_func Conversion function for vertices to vector_2d structs
 * @param box Bounding box to write results in.
 * @warning This function is not yet implemented correctly. Miter points of paths are not taken into account.
 *		If a path is the outmost object of your cell _and_ it is not parallel to one of the coordinate axes,
 *		the calculated bounding box size might be off. In other cases it should be reasonable close to the real bounding box.
 */
 void bounding_box_update_with_path(GList *vertices, double thickness, conv_generic_to_vector_2d_t conv_func, union bounding_box *box);
--- a/include/gds-render/geometric/cell-geometrics.h
+++ b/include/gds-render/geometric/cell-geometrics.h
@ -35,17 +35,10 @@
 #include <gds-render/gds-utils/gds-types.h>
 /**
- * @brief Calculate bounding box of a gds cell.
+ * @brief calculate_cell_bounding_box Calculate bounding box of gds cell
- *
+ * @param box Resulting boundig box. Will be uüdated and not overwritten
 * This function updates a given bounding box with the dimensions of a
 * gds_cell. Please note that the handling of path miter points is not complete yet.
 * If a path object is the outmost object of your cell at any edge,
 * the resulting bounding box might be the wrong size. The devistion from the real size
 * is guaranteed to be within the width of the path object.
 *
 * @param box Resulting boundig box. Will be updated and not overwritten
 * @param cell Toplevel cell
- * @warning Handling of Path graphic objects not yet implemented correctly.
+ * @warning Path handling not yet implemented correctly.
 */
 void calculate_cell_bounding_box(union bounding_box *box, struct gds_cell *cell);
--- a/include/gds-render/layer/layer-selector.h
+++ b/include/gds-render/layer/layer-selector.h
@ -130,13 +130,6 @@ void layer_selector_auto_name_layers(LayerSelector *layer_selector, gboolean ove
 */
 gboolean layer_selector_contains_elements(LayerSelector *layer_selector);
 /**
 * @brief Get number of layer elements that are named
 * @param[in] layer_selector Layer selector
 * @return Number of layers with a name != NULL or != ""
 */
 size_t layer_selector_num_of_named_elements(LayerSelector *layer_selector);
 G_END_DECLS
 #endif /* __LAYER_SELECTOR_H__ */
--- a/include/gds-render/layer/layer-settings.h
+++ b/include/gds-render/layer/layer-settings.h
@ -41,7 +41,7 @@ struct layer_info
 {
 	int layer; /**< @brief Layer number */
 	char *name; /**< @brief Layer name. */
-	int stacked_position; /**< @brief Position of layer in output @warning This parameter is not used by any renderer so far @note Lower is bottom, higher is top */
+	int stacked_position; ///< @brief Position of layer in output @warning This parameter is not used by any renderer so far @note Lower is bottom, higher is top
 	GdkRGBA color; /**< @brief RGBA color used to render this layer */
 	int render; /**< @brief true: Render to output */
 };
--- a/include/gds-render/output-renderers/cairo-renderer.h
+++ b/include/gds-render/output-renderers/cairo-renderer.h
@ -38,7 +38,7 @@ G_DECLARE_FINAL_TYPE(CairoRenderer, cairo_renderer, GDS_RENDER, CAIRO_RENDERER,
 #define GDS_RENDER_TYPE_CAIRO_RENDERER (cairo_renderer_get_type())
-#define MAX_LAYERS (5000) /**< \brief Maximum layer count the output renderer can process. Typically GDS only specifies up to 255 layers.*/
+#define MAX_LAYERS (300) /**< \brief Maximum layer count the output renderer can process. Typically GDS only specifies up to 255 layers.*/
 /**
 * @brief Create new CairoRenderer for SVG output
--- a/include/gds-render/output-renderers/external-renderer-interfaces.h
+++ b/include/gds-render/output-renderers/external-renderer-interfaces.h
@ -1,22 +1,3 @@
 /*
 * GDSII-Converter
 * Copyright (C) 2018  Mario Hüttel <mario.huettel@gmx.net>
 *
 * This file is part of GDSII-Converter.
 *
 * GDSII-Converter is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 *
 * GDSII-Converter 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 GDSII-Converter.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __EXTERNAL_RENDERER_INTERFACES_H__
 #define __EXTERNAL_RENDERER_INTERFACES_H__
--- a/layer/color-palette.c
+++ b/layer/color-palette.c
@ -238,7 +238,6 @@ static void color_palette_dispose(GObject *gobj)
 	if (palette->color_array) {
 		palette->color_array_length = 0;
 		free(palette->color_array);
 		palette->color_array = NULL;
 	}
 	/* Chain up to parent class */
--- a/layer/layer-selector.c
+++ b/layer/layer-selector.c
@ -822,10 +822,12 @@ void layer_selector_auto_color_layers(LayerSelector *layer_selector, ColorPalett
 	unsigned int color_count;
 	GdkRGBA color;
-	g_return_if_fail(GDS_RENDER_IS_COLOR_PALETTE(palette));
+	if (GDS_RENDER_IS_COLOR_PALETTE(palette) == FALSE || LAYER_IS_SELECTOR(layer_selector) == FALSE)
-	g_return_if_fail(LAYER_IS_SELECTOR(layer_selector));
+		return;
-	g_return_if_fail(global_alpha > 0);
+	if (global_alpha <= 0)
-	g_return_if_fail(GTK_IS_LIST_BOX(layer_selector->list_box));
+		return;
 	if (GTK_IS_LIST_BOX(layer_selector->list_box) == FALSE)
 		return;
 	le_list = gtk_container_get_children(GTK_CONTAINER(layer_selector->list_box));
@ -896,31 +898,4 @@ gboolean layer_selector_contains_elements(LayerSelector *layer_selector)
 	return (layer_element_list ? TRUE : FALSE);
 }
 size_t layer_selector_num_of_named_elements(LayerSelector *layer_selector)
 {
 	GList *le_list;
 	GList *le_list_ptr;
 	LayerElement *le;
 	const char *layer_name;
 	size_t count = 0U;
 	g_return_val_if_fail(LAYER_IS_SELECTOR(layer_selector), 0U);
 	le_list = gtk_container_get_children(GTK_CONTAINER(layer_selector->list_box));
 	for (le_list_ptr = le_list; le_list_ptr != NULL; le_list_ptr = g_list_next(le_list_ptr)) {
 		le = LAYER_ELEMENT(le_list_ptr->data);
 		if (!le)
 			continue;
 		layer_name = layer_element_get_name(le);
 		if (layer_name && *layer_name) {
 			/* Layer name is not empty. Count it */
 			count++;
 		}
 	}
 	return count;
 }
 /** @} */
--- a/main.c
+++ b/main.c
@ -262,8 +262,6 @@ int main(int argc, char **argv)
 	gchar *cellname = NULL;
 	gchar **renderer_args = NULL;
 	gboolean version = FALSE, pdf_standalone = FALSE, pdf_layers = FALSE;
 	gboolean analyze = FALSE;
 	gchar *format = NULL;
 	int scale = 1000;
 	int app_status = 0;
 	struct external_renderer_params so_render_params;
@ -277,8 +275,6 @@ int main(int argc, char **argv)
 	GOptionEntry entries[] = {
 		{"version", 'v', 0, G_OPTION_ARG_NONE, &version, _("Print version"), NULL},
 		{"analyze", 'A', 0, G_OPTION_ARG_NONE, &analyze, _("Anaylze GDS file"), NULL},
 		{"format", 'f', 0, G_OPTION_ARG_STRING, &format, _("Output format of analysis result, Default simple"), "[simple | pretty | cellsonly]"},
 		{"renderer", 'r', 0, G_OPTION_ARG_STRING_ARRAY, &renderer_args,
 			_("Renderer to use. Can be used multiple times."), "pdf|svg|tikz|ext"},
 		{"scale", 's', 0, G_OPTION_ARG_INT, &scale, _("Divide output coordinates by <SCALE>"), "<SCALE>" },
@ -324,13 +320,10 @@ int main(int argc, char **argv)
 		for (i = 2; i < argc; i++)
 			printf(_("Ignored argument: %s"), argv[i]);
-		if (analyze) {
+		app_status =
-			app_status = command_line_analyze_lib(format, gds_name);
+			command_line_convert_gds(gds_name, cellname, renderer_args, output_paths, mappingname,
-		} else {
+						 &so_render_params, pdf_standalone, pdf_layers, scale);
-			app_status =
+
 				command_line_convert_gds(gds_name, cellname, renderer_args, output_paths, mappingname,
 							 &so_render_params, pdf_standalone, pdf_layers, scale);
 		}
 	} else {
 		app_status = start_gui(argc, argv);
 	}
--- a/output-renderers/cairo-renderer.c
+++ b/output-renderers/cairo-renderer.c
@ -275,20 +275,12 @@ static int cairo_renderer_render_cell_to_vector_file(GdsOutputRenderer *renderer
 		goto ret_parent;
 	}
-	/* We are now in a separate process just for rendering the output image.
+	/* Close stdin and (stdout and stderr may live on) */
     * You may print a log message to the activity bar of the gui by writing a line
     * teminated with '\n' to comm_pipe[1]. This will be handled by the parent process.
     * Directly calling the update function 
     *     gds_output_renderer_update_async_progress()
     * does not have any effect because this is a separate process.
     */
 	/*
     * Close stdin and (stdout and stderr may live on)
     */
 	close(0);
 	//close(1);
 	close(comm_pipe[0]);
 	layers = (struct cairo_layer *)calloc(MAX_LAYERS, sizeof(struct cairo_layer));
 	/* Clear layers */
@ -371,6 +363,8 @@ static int cairo_renderer_render_cell_to_vector_file(GdsOutputRenderer *renderer
 	for (info_list = layer_infos; info_list != NULL; info_list = g_list_next(info_list)) {
 		linfo = (struct layer_info *)info_list->data;
 		dprintf(comm_pipe[1], _("Exporting layer %d to file\n"), linfo->layer);
 		if (linfo->layer >= MAX_LAYERS) {
 			printf(_("Layer outside of spec.\n"));
 			continue;
@ -379,8 +373,6 @@ static int cairo_renderer_render_cell_to_vector_file(GdsOutputRenderer *renderer
 		if (!linfo->render)
 			continue;
 		dprintf(comm_pipe[1], _("Exporting layer %d to file\n"), linfo->layer);
 		if (pdf_file && pdf_cr) {
 			cairo_set_source_surface(pdf_cr, layers[linfo->layer].rec, -xmin, -ymin);
 			cairo_paint_with_alpha(pdf_cr, linfo->color.alpha);
--- a/output-renderers/gds-output-renderer.c
+++ b/output-renderers/gds-output-renderer.c
@ -100,11 +100,6 @@ static void gds_output_renderer_dispose(GObject *self_obj)
 	if (priv->output_file)
 		g_free(priv->output_file);
 	if (priv->idle_function_parameters.status_message) {
 		g_free(priv->idle_function_parameters.status_message);
 		priv->idle_function_parameters.status_message = NULL;
 	}
 	g_clear_object(&priv->layer_settings);
 	/* Chain up to parent class */
--- a/output-renderers/latex-renderer.c
+++ b/output-renderers/latex-renderer.c
@ -370,7 +370,7 @@ static int latex_renderer_render_output(GdsOutputRenderer *renderer,
 						l_renderer->pdf_layers, l_renderer->tex_standalone, renderer);
 		fclose(tex_file);
 	} else {
-        g_warning(_("Could not open LaTeX output file"));
+		g_error(_("Could not open LaTeX output file"));
 	}
 	if (settings)
--- a/resources/layer-widget.glade
+++ b/resources/layer-widget.glade
@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
  <requires lib="gtk+" version="3.20"/>
  <object class="GtkAdjustment" id="adjustment1">
    <property name="upper">1</property>
    <property name="value">1</property>
-    <property name="step-increment">0.01</property>
+    <property name="step_increment">0.01</property>
-    <property name="page-increment">0.10</property>
+    <property name="page_increment">0.10000000000000001</property>
  </object>
  <object class="GtkBox" id="box">
    <property name="visible">True</property>
-    <property name="can-focus">False</property>
+    <property name="can_focus">False</property>
    <property name="spacing">3</property>
    <child>
      <object class="GtkEventBox" id="event-box">
        <property name="visible">True</property>
-        <property name="can-focus">False</property>
+        <property name="can_focus">False</property>
        <child>
          <object class="GtkImage">
            <property name="visible">True</property>
-            <property name="can-focus">False</property>
+            <property name="can_focus">False</property>
-            <property name="icon-name">open-menu-symbolic</property>
+            <property name="stock">gtk-justify-fill</property>
          </object>
        </child>
      </object>
@ -33,7 +33,7 @@
    <child>
      <object class="GtkLabel" id="layer">
        <property name="visible">True</property>
-        <property name="can-focus">False</property>
+        <property name="can_focus">False</property>
        <property name="label" translatable="yes">label</property>
      </object>
      <packing>
@ -45,9 +45,9 @@
    <child>
      <object class="GtkColorButton" id="color">
        <property name="visible">True</property>
-        <property name="can-focus">True</property>
+        <property name="can_focus">True</property>
-        <property name="receives-default">True</property>
+        <property name="receives_default">True</property>
-        <property name="use-alpha">True</property>
+        <property name="use_alpha">True</property>
        <property name="title" translatable="yes">Select Layer Color and Opacity</property>
        <property name="rgba">rgb(0,0,0)</property>
      </object>
@ -61,9 +61,9 @@
      <object class="GtkCheckButton" id="export">
        <property name="label" translatable="yes">Export Layer</property>
        <property name="visible">True</property>
-        <property name="can-focus">True</property>
+        <property name="can_focus">True</property>
-        <property name="receives-default">False</property>
+        <property name="receives_default">False</property>
-        <property name="draw-indicator">True</property>
+        <property name="draw_indicator">True</property>
      </object>
      <packing>
        <property name="expand">False</property>
@ -74,7 +74,7 @@
    <child>
      <object class="GtkEntry" id="entry">
        <property name="visible">True</property>
-        <property name="can-focus">True</property>
+        <property name="can_focus">True</property>
      </object>
      <packing>
        <property name="expand">True</property>
--- a/resources/main.glade
+++ b/resources/main.glade
@ -1,57 +1,145 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
  <requires lib="gtk+" version="3.20"/>
  <object class="GtkImage" id="auto-name-img">
    <property name="visible">True</property>
-    <property name="can-focus">False</property>
+    <property name="can_focus">False</property>
-    <property name="icon-name">format-text-rich-symbolic</property>
+    <property name="stock">gtk-edit</property>
  </object>
  <object class="GtkImage" id="color-img">
    <property name="visible">True</property>
-    <property name="can-focus">False</property>
+    <property name="can_focus">False</property>
-    <property name="icon-name">color-select-symbolic</property>
+    <property name="stock">gtk-select-color</property>
  </object>
  <object class="GtkImage" id="load-mapping-img">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="stock">gtk-open</property>
  </object>
  <object class="GtkImage" id="save-mapping-img">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="tooltip_text" translatable="yes">Save the current layer configuration to CSV</property>
    <property name="stock">gtk-save-as</property>
  </object>
  <object class="GtkImage" id="select-all-img">
    <property name="visible">True</property>
-    <property name="can-focus">False</property>
+    <property name="can_focus">False</property>
-    <property name="icon-name">emblem-ok-symbolic</property>
+    <property name="stock">gtk-apply</property>
  </object>
  <object class="GtkImage" id="sort-down-img">
    <property name="visible">True</property>
-    <property name="can-focus">False</property>
+    <property name="can_focus">False</property>
-    <property name="icon-name">view-sort-descending-symbolic</property>
+    <property name="stock">gtk-sort-ascending</property>
  </object>
  <object class="GtkImage" id="sort-up-img">
    <property name="visible">True</property>
-    <property name="can-focus">False</property>
+    <property name="can_focus">False</property>
-    <property name="icon-name">view-sort-ascending-symbolic</property>
+    <property name="stock">gtk-sort-descending</property>
  </object>
  <object class="GtkWindow" id="main-window">
-    <property name="height-request">250</property>
+    <property name="height_request">250</property>
-    <property name="can-focus">False</property>
+    <property name="can_focus">False</property>
-    <property name="icon-name">gds-render</property>
+    <property name="icon_name">gds-render</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header-bar">
        <property name="name">header</property>
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="title" translatable="yes">GDS-Render</property>
        <property name="show_close_button">True</property>
        <child>
          <object class="GtkButton" id="button-load-gds">
            <property name="label">gtk-open</property>
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="tooltip_text" translatable="yes">Open GDS2 Database</property>
            <property name="use_stock">True</property>
            <property name="always_show_image">True</property>
            <style>
              <class name="suggested-action"/>
            </style>
          </object>
        </child>
        <child>
          <object class="GtkButton" id="button-load-mapping">
            <property name="label" translatable="yes">Load Mapping</property>
            <property name="visible">True</property>
            <property name="sensitive">False</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="tooltip_text" translatable="yes">Load the current layer configuration from CSV</property>
            <property name="image">load-mapping-img</property>
            <property name="always_show_image">True</property>
            <style>
              <class name="suggested-action"/>
            </style>
          </object>
          <packing>
            <property name="position">1</property>
          </packing>
        </child>
        <child>
          <object class="GtkButton" id="button-save-mapping">
            <property name="label" translatable="yes">Save Mapping</property>
            <property name="visible">True</property>
            <property name="sensitive">False</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="image">save-mapping-img</property>
            <property name="always_show_image">True</property>
            <style>
              <class name="suggested-action"/>
            </style>
          </object>
          <packing>
            <property name="position">2</property>
          </packing>
        </child>
        <child>
          <object class="GtkButton" id="convert-button">
            <property name="label">gtk-convert</property>
            <property name="name">button-convert</property>
            <property name="visible">True</property>
            <property name="sensitive">False</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="tooltip_text" translatable="yes">Convert selected cell</property>
            <property name="use_stock">True</property>
            <property name="always_show_image">True</property>
            <style>
              <class name="suggested-action"/>
            </style>
          </object>
          <packing>
            <property name="position">3</property>
          </packing>
        </child>
      </object>
    </child>
    <child>
      <object class="GtkBox">
        <property name="visible">True</property>
-        <property name="can-focus">False</property>
+        <property name="can_focus">False</property>
        <property name="orientation">vertical</property>
        <child>
          <object class="GtkBox">
            <property name="visible">True</property>
-            <property name="can-focus">False</property>
+            <property name="can_focus">False</property>
            <child>
              <object class="GtkBox">
                <property name="visible">True</property>
-                <property name="can-focus">False</property>
+                <property name="can_focus">False</property>
                <property name="orientation">vertical</property>
                <child>
                  <object class="GtkSearchEntry" id="cell-search">
                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
+                    <property name="can_focus">True</property>
-                    <property name="primary-icon-name">edit-find-symbolic</property>
+                    <property name="primary_icon_name">edit-find-symbolic</property>
-                    <property name="primary-icon-activatable">False</property>
+                    <property name="primary_icon_activatable">False</property>
-                    <property name="primary-icon-sensitive">False</property>
+                    <property name="primary_icon_sensitive">False</property>
                  </object>
                  <packing>
                    <property name="expand">False</property>
@ -62,15 +150,15 @@
                <child>
                  <object class="GtkScrolledWindow">
                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
+                    <property name="can_focus">True</property>
-                    <property name="hscrollbar-policy">never</property>
+                    <property name="hscrollbar_policy">never</property>
-                    <property name="shadow-type">in</property>
+                    <property name="shadow_type">in</property>
                    <child>
                      <object class="GtkTreeView" id="cell-tree">
                        <property name="visible">True</property>
-                        <property name="can-focus">True</property>
+                        <property name="can_focus">True</property>
-                        <property name="enable-search">False</property>
+                        <property name="enable_search">False</property>
-                        <property name="enable-grid-lines">both</property>
+                        <property name="enable_grid_lines">both</property>
                        <child internal-child="selection">
                          <object class="GtkTreeSelection"/>
                        </child>
@ -93,20 +181,20 @@
            <child>
              <object class="GtkBox">
                <property name="visible">True</property>
-                <property name="can-focus">False</property>
+                <property name="can_focus">False</property>
                <property name="orientation">vertical</property>
                <child>
                  <object class="GtkBox">
                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
+                    <property name="can_focus">False</property>
                    <child>
                      <object class="GtkButton" id="button-up-sort">
                        <property name="visible">True</property>
-                        <property name="can-focus">True</property>
+                        <property name="can_focus">True</property>
-                        <property name="receives-default">True</property>
+                        <property name="receives_default">True</property>
-                        <property name="tooltip-text" translatable="yes">Sort layers ascending</property>
+                        <property name="tooltip_text" translatable="yes">Sort layers ascending</property>
                        <property name="image">sort-up-img</property>
-                        <property name="always-show-image">True</property>
+                        <property name="always_show_image">True</property>
                      </object>
                      <packing>
                        <property name="expand">False</property>
@ -117,11 +205,11 @@
                    <child>
                      <object class="GtkButton" id="button-down-sort">
                        <property name="visible">True</property>
-                        <property name="can-focus">True</property>
+                        <property name="can_focus">True</property>
-                        <property name="receives-default">True</property>
+                        <property name="receives_default">True</property>
-                        <property name="tooltip-text" translatable="yes">Sort layers descending</property>
+                        <property name="tooltip_text" translatable="yes">Sort layers descending</property>
                        <property name="image">sort-down-img</property>
-                        <property name="always-show-image">True</property>
+                        <property name="always_show_image">True</property>
                      </object>
                      <packing>
                        <property name="expand">False</property>
@ -132,11 +220,11 @@
                    <child>
                      <object class="GtkButton" id="auto-color-button">
                        <property name="visible">True</property>
-                        <property name="can-focus">True</property>
+                        <property name="can_focus">True</property>
-                        <property name="receives-default">True</property>
+                        <property name="receives_default">True</property>
-                        <property name="tooltip-text" translatable="yes">Automatically color layers</property>
+                        <property name="tooltip_text" translatable="yes">Automatically color layers</property>
                        <property name="image">color-img</property>
-                        <property name="always-show-image">True</property>
+                        <property name="always_show_image">True</property>
                      </object>
                      <packing>
                        <property name="expand">False</property>
@ -147,11 +235,11 @@
                    <child>
                      <object class="GtkButton" id="button-select-all">
                        <property name="visible">True</property>
-                        <property name="can-focus">True</property>
+                        <property name="can_focus">True</property>
-                        <property name="receives-default">True</property>
+                        <property name="receives_default">True</property>
-                        <property name="tooltip-text" translatable="yes">Select all layers for export</property>
+                        <property name="tooltip_text" translatable="yes">Select all layers for export</property>
                        <property name="image">select-all-img</property>
-                        <property name="always-show-image">True</property>
+                        <property name="always_show_image">True</property>
                      </object>
                      <packing>
                        <property name="expand">False</property>
@ -162,11 +250,11 @@
                    <child>
                      <object class="GtkButton" id="button-auto-name">
                        <property name="visible">True</property>
-                        <property name="can-focus">True</property>
+                        <property name="can_focus">True</property>
-                        <property name="receives-default">True</property>
+                        <property name="receives_default">True</property>
-                        <property name="tooltip-text" translatable="yes">Automatically name layers</property>
+                        <property name="tooltip_text" translatable="yes">Automatically name layers</property>
                        <property name="image">auto-name-img</property>
-                        <property name="always-show-image">True</property>
+                        <property name="always_show_image">True</property>
                      </object>
                      <packing>
                        <property name="expand">False</property>
@ -184,19 +272,19 @@
                <child>
                  <object class="GtkScrolledWindow">
                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
+                    <property name="can_focus">True</property>
-                    <property name="margin-top">1</property>
+                    <property name="margin_top">1</property>
-                    <property name="hscrollbar-policy">never</property>
+                    <property name="hscrollbar_policy">never</property>
-                    <property name="shadow-type">in</property>
+                    <property name="shadow_type">in</property>
                    <child>
                      <object class="GtkViewport">
                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
+                        <property name="can_focus">False</property>
                        <child>
                          <object class="GtkListBox" id="layer-list">
                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
+                            <property name="can_focus">False</property>
-                            <property name="selection-mode">none</property>
+                            <property name="selection_mode">none</property>
                          </object>
                        </child>
                      </object>
@ -225,7 +313,7 @@
        <child>
          <object class="GtkBox" id="activity-bar">
            <property name="visible">True</property>
-            <property name="can-focus">False</property>
+            <property name="can_focus">False</property>
            <property name="orientation">vertical</property>
            <child>
              <placeholder/>
@ -239,75 +327,5 @@
        </child>
      </object>
    </child>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header-bar">
        <property name="name">header</property>
        <property name="visible">True</property>
        <property name="can-focus">False</property>
        <property name="title" translatable="yes">GDS-Render</property>
        <property name="show-close-button">True</property>
        <child>
          <object class="GtkButton" id="button-load-gds">
            <property name="label">Open GDS</property>
            <property name="visible">True</property>
            <property name="can-focus">True</property>
            <property name="receives-default">True</property>
            <property name="tooltip-text" translatable="yes">Open GDS2 Database</property>
            <style>
              <class name="suggested-action"/>
            </style>
          </object>
        </child>
        <child>
          <object class="GtkButton" id="button-load-mapping">
            <property name="label" translatable="yes">Load Mapping</property>
            <property name="visible">True</property>
            <property name="sensitive">False</property>
            <property name="can-focus">True</property>
            <property name="receives-default">True</property>
            <property name="tooltip-text" translatable="yes">Load the current layer configuration from CSV</property>
            <style>
              <class name="suggested-action"/>
            </style>
          </object>
          <packing>
            <property name="position">1</property>
          </packing>
        </child>
        <child>
          <object class="GtkButton" id="button-save-mapping">
            <property name="label" translatable="yes">Save Mapping</property>
            <property name="visible">True</property>
            <property name="sensitive">False</property>
            <property name="can-focus">True</property>
            <property name="receives-default">True</property>
            <style>
              <class name="suggested-action"/>
            </style>
          </object>
          <packing>
            <property name="position">2</property>
          </packing>
        </child>
        <child>
          <object class="GtkButton" id="convert-button">
            <property name="label">Convert Cell</property>
            <property name="name">button-convert</property>
            <property name="visible">True</property>
            <property name="sensitive">False</property>
            <property name="can-focus">True</property>
            <property name="receives-default">True</property>
            <property name="tooltip-text" translatable="yes">Convert selected cell</property>
            <property name="always-show-image">True</property>
            <style>
              <class name="suggested-action"/>
            </style>
          </object>
          <packing>
            <property name="position">3</property>
          </packing>
        </child>
      </object>
    </child>
  </object>
 </interface>
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -1,41 +0,0 @@
 project(gds-render-test)
 add_custom_target(test "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}" "-r compact" "-s" DEPENDS ${PROJECT_NAME})
 if(NOT WIN32)
  string(ASCII 27 Esc)
  set(ColorReset "${Esc}[m")
  set(ColorBold  "${Esc}[1m")
  set(Red         "${Esc}[31m")
  set(Green       "${Esc}[32m")
  set(Yellow      "${Esc}[33m")
  set(Blue        "${Esc}[34m")
  set(Magenta     "${Esc}[35m")
  set(Cyan        "${Esc}[36m")
  set(White       "${Esc}[37m")
  set(BoldRed     "${Esc}[1;31m")
  set(BoldGreen   "${Esc}[1;32m")
  set(BoldYellow  "${Esc}[1;33m")
  set(BoldBlue    "${Esc}[1;34m")
  set(BoldMagenta "${Esc}[1;35m")
  set(BoldCyan    "${Esc}[1;36m")
  set(BoldWhite   "${Esc}[1;37m")
 endif()
 cmake_minimum_required(VERSION 2.8)
 find_package(PkgConfig REQUIRED)
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/catch-framework")
 aux_source_directory("geometric" GEOMETRIC_TEST_SOURCES)
 set(TEST_SOURCES
 	${GEOMETRIC_TEST_SOURCES}
 )
 set(DUT_SOURCES
 	"../geometric/vector-operations.c"
 )
 add_executable(${PROJECT_NAME} EXCLUDE_FROM_ALL "test-main.cpp" ${TEST_SOURCES} ${DUT_SOURCES})
 target_link_libraries(${PROJECT_NAME} ${GLIB_LDFLAGS} ${GTK3_LDFLAGS} ${CAIRO_LDFLAGS} m version ${CMAKE_DL_LIBS})
--- a/test/catch-framework/catch.hpp
+++ b/test/catch-framework/catch.hpp
--- a/test/geometric/vector-operations.cpp
+++ b/test/geometric/vector-operations.cpp
@ -1,160 +0,0 @@
 #include <catch.hpp>
 #include <limits>
 extern "C" {
 #include <gds-render/geometric/vector-operations.h>
 }
 TEST_CASE("geometric/vector-operations/vector_2d_add", "[GEOMETRIC]")
 {
 	struct vector_2d res;
 	struct vector_2d a;
 	struct vector_2d b;
 	a.x = 1;
 	a.y = 2;
 	b.x = 2;
 	b.y = 6;
 	vector_2d_add(&res, &a, &b);
 	REQUIRE(res.x == Approx(a.x + b.x));
 	REQUIRE(res.y == Approx(a.y + b.y));
 }
 TEST_CASE("geometric/vector-operations/vector_2d_calculate_angle_between", "[GEOMETRIC]")
 {
 	double angle;
 	struct vector_2d a;
 	struct vector_2d b;
 	a.x = 1;
 	a.y = 0;
 	b.x = 0;
 	b.y = 1;
 	angle = vector_2d_calculate_angle_between(&a, &a);
 	REQUIRE(angle == Approx(0.0));
 	angle = vector_2d_calculate_angle_between(&a, &b);
 	REQUIRE(angle == Approx(90.0 / 180.0 * M_PI));
 }
 TEST_CASE("geometric/vector-operations/vector_2d_subtract", "[GEOMETRIC]")
 {
 	struct vector_2d res;
 	struct vector_2d a;
 	struct vector_2d b;
 	a.x = 1;
 	a.y = 2;
 	b.x = 2;
 	b.y = 6;
 	vector_2d_subtract(&res, &a, &b);
 	REQUIRE(res.x == Approx(a.x - b.x));
 	REQUIRE(res.y == Approx(a.y - b.y));
 }
 TEST_CASE("geometric/vector-operations/vector_2d_abs", "[GEOMETRIC]")
 {
 	struct vector_2d c;
 	struct vector_2d a;
 	struct vector_2d b;
 	double a_len, b_len, c_len;
 	a.x = 1;
 	a.y = 0;
 	b.x = 0;
 	b.y = 2;
 	c.x = 3;
 	c.y = 4;
 	a_len = vector_2d_abs(&a);
 	b_len = vector_2d_abs(&b);
 	c_len = vector_2d_abs(&c);
 	REQUIRE(a_len == Approx(1.0));
 	REQUIRE(b_len == Approx(2.0));
 	REQUIRE(c_len == Approx(5.0));
 }
 TEST_CASE("geometric/vector-operations/vector_2d_scalar_multipy", "[GEOMETRIC]")
 {
 	struct vector_2d c;
 	struct vector_2d a;
 	struct vector_2d b;
 	double mult;
 	a.x = 1;
 	a.y = 0;
 	b.x = 0;
 	b.y = 2;
 	mult = vector_2d_scalar_multipy(&a, &b);
 	REQUIRE(mult == Approx(0.0));
 	a.x = 1;
 	a.y = 1;
 	b.x = 1;
 	b.y = 1;
 	mult = vector_2d_scalar_multipy(&a, &b);
 	REQUIRE(mult == Approx(2.0));	
 }
 TEST_CASE("geometric/vector-operations/vector_2d_normalize", "[GEOMETRIC]")
 {
 	struct vector_2d a;
 	a.x = 1;
 	a.y = 0;
 	vector_2d_normalize(&a);
 	REQUIRE(a.x == Approx(1.0));
 	REQUIRE(a.y == Approx(0.0));
 	a.x = 1;
 	a.y = -1;
 	vector_2d_normalize(&a);
 	REQUIRE(a.x == Approx(1.0/sqrt(2)));
 	REQUIRE(a.y == Approx(-1.0/sqrt(2)));
 }
 TEST_CASE("geometric/vector-operations/vector_2d_rotate", "[GEOMETRIC]")
 {
 	struct vector_2d a;
 	a.x = 1;
 	a.y = 0;
 	vector_2d_rotate(&a, M_PI/2);
 	REQUIRE(a.x == Approx(0.0).scale(0.001));
 	REQUIRE(a.y == Approx(1.0));
 	a.x = 0;
 	a.y = 1;
 	vector_2d_rotate(&a, -M_PI/2);
 	vector_2d_rotate(&a, M_PI);
 	REQUIRE(a.x == Approx(-1.0));
 	REQUIRE(a.y == Approx(0.0).scale(0.001));
 }
 TEST_CASE("geometric/vector-operations/vector_2d_scale", "[GEOMETRIC]")
 {
 	struct vector_2d a;
 	a.x = 1;
 	a.y = 0;
 	vector_2d_scale(&a, 2.0);
 	REQUIRE(a.x == Approx(2.0));
 	REQUIRE(a.y == Approx(0.0));
 	a.x = 1;
 	a.y = -3;
 	vector_2d_scale(&a, 0.5);
 	REQUIRE(a.x == Approx(0.5));
 	REQUIRE(a.y == Approx(-1.5));
 }
--- a/test/test-main.cpp
+++ b/test/test-main.cpp
@ -1,2 +0,0 @@
 #define CATCH_CONFIG_MAIN
 #include "catch-framework/catch.hpp"
		`@ -1 +0,0 @@`
			`Subproject commit 41237162a9bd34a30a88069ee4e230584ae8d674`
		`@ -1,2 +0,0 @@`
			`#define CATCH_CONFIG_MAIN`
			`#include "catch-framework/catch.hpp"`