Disable prints in GDS renderer. Wrote documentation

CMakeLists.txt

@@ -18,7 +18,7 @@ aux_source_directory("tree-renderer" RENDERER_SOURCES)
 aux_source_directory("gds-parser" PARSER_SOURCES)
 aux_source_directory("latex-output" LATEX_SOURCES)
 aux_source_directory("cairo-output" CAIRO_SOURCES)
-set(SOURCE "main.c" "layer-selector.c" "main-window.c")
+set(SOURCE "main.c" "layer-selector.c" "mapping-parser.c" "command-line.c" "main-window.c")
 
 set(SOURCE
   ${SOURCE}

cairo-output/cairo-output.c

@@ -16,6 +16,15 @@
  * 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 cairo-output.c
+  * @brief Output renderer for Cairo PDF export
+  * @author Mario Hüttel <mario.huettel@gmx.net>
+  */
+
+/** @addtogroup Cairo-Renderer
+ *  @{
+ */
 
 #include "cairo-output.h"
 #include <math.h>
@@ -23,12 +32,20 @@
 #include <cairo.h>
 #include <cairo-pdf.h>
 
+/**
+ * @brief The cairo_layer struct
+ * Each rendered layer is represented by this struct.
+ */
 struct cairo_layer {
-		cairo_t *cr;
+		cairo_t *cr; /**< @brief cairo context for layer*/
-		cairo_surface_t *rec;
+		cairo_surface_t *rec; /**< @brief Recording surface to hold the layer */
-		struct layer_info *linfo;
+		struct layer_info *linfo; /**< @brief Reference to layer information */
 };
 
+/**
+ * @brief Revert the last transformation on all layers
+ * @param layers Pointer to #cairo_layer structures
+ */
 static void revert_inherited_transform(struct cairo_layer *layers)
 {
 	int i;
@@ -40,6 +57,15 @@ static void revert_inherited_transform(struct cairo_layer *layers)
 	}
 }
 
+/**
+ * @brief Applies transformation to all layers
+ * @param layers Array of layers
+ * @param origin Origin translation
+ * @param magnification Scaling
+ * @param flipping Mirror image on x-axis before rotating
+ * @param rotation Rotattion in degrees
+ * @param scale Scale the image down by. Only used for sclaing origin coordinates. Not applied to layer.
+ */
 static void apply_inherited_transform_to_all_layers(struct cairo_layer *layers,
 						    const struct gds_point *origin,
 						    double magnification,
@@ -64,6 +90,12 @@ static void apply_inherited_transform_to_all_layers(struct cairo_layer *layers,
 	}
 }
 
+/**
+ * @brief render_cell Render a cell with its sub-cells
+ * @param cell Cell to render
+ * @param layers Cell will be rendered into these layers
+ * @param scale sclae image down by this factor
+ */
 static void render_cell(struct gds_cell *cell, struct cairo_layer *layers, double scale)
 {
 	GList *instance_list;
@@ -246,3 +278,5 @@ ret_clear_layers:
 
 	printf("cairo export finished. It might still be buggy!\n");
 }
+
+/** @} */

cairo-output/cairo-output.h

@@ -16,15 +16,32 @@
  * 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 cairo-output.h
+ * @brief Header File for Cairo output renderer
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
 #ifndef __CAIRO_OUTPUT_H__
 #define __CAIRO_OUTPUT_H__
 
 #include "../layer-selector.h"
 #include "../gds-parser/gds-types.h"
 
-#define MAX_LAYERS (300)
+/** @addtogroup Cairo-Renderer
+ *  @{
+ */
 
+#define MAX_LAYERS (300) /**< \brief Maximum layer count the output renderer can process. Typically GDS only specifies up to 255 layers.*/
+
+/**
+ * @brief Render \p cell to a PDF file specified by \p pdf_file
+ * @param cell Toplevel cell to render
+ * @param layer_infos List of layer information. Specifies color and layer stacking
+ * @param pdf_file Output file
+ * @param scale Scale the output image down by \p scale
+ */
 void cairo_render_cell_to_pdf(struct gds_cell *cell, GList *layer_infos, char *pdf_file, double scale);
 
+/** @} */
+
 #endif /* __CAIRO_OUTPUT_H__ */

command-line.c

@@ -0,0 +1,137 @@
+/*
+ * 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/>.
+ */
+
+#include <stdio.h>
+#include "command-line.h"
+#include "gds-parser/gds-parser.h"
+#include "mapping-parser.h"
+#include "cairo-output/cairo-output.h"
+#include "latex-output/latex-output.h"
+
+static void delete_layer_info_with_name(struct layer_info *info)
+{
+	if (info) {
+		if (info->name)
+			g_free(info->name);
+		free(info);
+	}
+}
+
+void command_line_convert_gds(char *gds_name, char *pdf_name, char *tex_name, gboolean pdf, gboolean tex,
+			      char *layer_file, char *cell_name, double scale, gboolean pdf_layers, gboolean pdf_standalone)
+{
+	GList *libs = NULL;
+	FILE *tex_file;
+	int res;
+	GFile *file;
+	int i;
+	GFileInputStream *stream;
+	GDataInputStream *dstream;
+	gboolean layer_export;
+	GdkRGBA layer_color;
+	int layer;
+	char *layer_name;
+	GList *layer_info_list = NULL;
+	GList *cell_list;
+	struct layer_info *linfo_temp;
+	struct gds_cell *toplevel_cell = NULL, *temp_cell;
+
+	/* Check if parameters are valid */
+	if (!gds_name || ! pdf_name || !tex_name || !layer_file || !cell_name) {
+		printf("Probably missing argument. Check --help option\n");
+		return;
+	}
+
+	/* Load GDS */
+	clear_lib_list(&libs);
+	res = parse_gds_from_file(gds_name, &libs);
+	if (res)
+		return;
+
+	file = g_file_new_for_path(layer_file);
+	stream = g_file_read(file, NULL, NULL);
+
+	if (!stream) {
+		printf("Layer mapping not readable!\n");
+		goto destroy_file;
+	}
+	dstream = g_data_input_stream_new(G_INPUT_STREAM(stream));
+	i = 0;
+	do {
+		res = load_csv_line(dstream, &layer_export, &layer_name, &layer, &layer_color);
+		if (res == 0) {
+			if (!layer_export)
+				continue;
+			linfo_temp = (struct layer_info *)malloc(sizeof(struct layer_info));
+			if (!linfo_temp) {
+				printf("Out of memory\n");
+				goto ret_clear_list;
+			}
+			linfo_temp->color.alpha = layer_color.alpha;
+			linfo_temp->color.red = layer_color.red;
+			linfo_temp->color.green = layer_color.green;
+			linfo_temp->color.blue = layer_color.blue;
+			linfo_temp->name = layer_name;
+			linfo_temp->stacked_position = i++;
+			linfo_temp->layer = layer;
+			layer_info_list = g_list_append(layer_info_list, (gpointer)linfo_temp);
+		}
+	} while(res >= 0);
+
+
+	/* find_cell in first library. */
+	if (!libs)
+		goto ret_clear_list;
+
+	for (cell_list = ((struct gds_library *)libs->data)->cells; cell_list != NULL; cell_list = g_list_next(cell_list)) {
+		temp_cell = (struct gds_cell *)cell_list->data;
+		if (!strcmp(temp_cell->name, cell_name)) {
+			toplevel_cell = temp_cell;
+			break;
+		}
+	}
+
+	if (!toplevel_cell) {
+		printf("Couldn't find cell in first library!\n");
+		goto ret_clear_list;
+	}
+
+	/* Render outputs */
+	if (pdf == TRUE) {
+		cairo_render_cell_to_pdf(toplevel_cell, layer_info_list, pdf_name, scale);
+	}
+
+	if (tex == TRUE) {
+		tex_file = fopen(tex_name, "w");
+		if (!tex_file)
+			goto ret_clear_list;
+		latex_render_cell_to_code(toplevel_cell, layer_info_list, tex_file, scale, pdf_layers, pdf_standalone);
+		fclose(tex_file);
+	}
+
+ret_clear_list:
+	g_list_free_full(layer_info_list, (GDestroyNotify)delete_layer_info_with_name);
+
+	g_object_unref(dstream);
+	g_object_unref(stream);
+destroy_file:
+	g_object_unref(file);
+
+
+}

command-line.h

@@ -0,0 +1,27 @@
+/*
+ * 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 _COMMAND_LINE_H_
+#define _COMMAND_LINE_H_
+#include <glib.h>
+
+void command_line_convert_gds(char *gds_name, char *pdf_name, char *tex_name, gboolean pdf, gboolean tex,
+			      char *layer_file, char *cell_name, double scale, gboolean pdf_layers, gboolean pdf_standalone);
+
+#endif /* _COMMAND_LINE_H_ */

doxygen/main-application.h

@@ -0,0 +1,6 @@
+/* This file only contains help information for doxygen */
+
+/**
+ * @defgroup MainApplication Main Application
+ *
+ */

doxygen/output/.gitignore

@@ -0,0 +1,3 @@
+*
+*/
+!.gitignore

gds-parser/gds-parser.c

@@ -18,14 +18,27 @@
  */
 
 /*
+
+ */
+
+
+/**
+ * @file gds_parser.h
+ * @brief Header file for the GDS-Parser
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ *
  * What's missing? - A lot:
- * Support for Boxes
  * Support for 4 Byte real
  * Support for pathtypes
  * Support for datatypes (only layer so far)
  * etc...
  */
 
+/**
+ * @addtogroup GDS-Parser
+ * @{
+ */
+
 
 #include "gds-parser.h"
 #include <stdlib.h>
@@ -35,10 +48,15 @@
 #include <math.h>
 #include <cairo.h>
 
-#define GDS_ERROR(fmt, ...) printf("[PARSE_ERROR] " fmt "\n", ##__VA_ARGS__)
+#define GDS_ERROR(fmt, ...) printf("[PARSE_ERROR] " fmt "\n", ##__VA_ARGS__) /**< @brief Print GDS error*/
-#define GDS_WARN(fmt, ...) printf("[PARSE_WARNING] " fmt "\n", ##__VA_ARGS__)
+#define GDS_WARN(fmt, ...) printf("[PARSE_WARNING] " fmt "\n", ##__VA_ARGS__) /**< @brief Print GDS warning */
 
-enum record {
+#if GDS_PRINT_DEBUG_INFOS
+	#define GDS_INF(fmt, ...) printf(fmt, ##__VA_ARGS__) /**< @brief standard printf. But cna be disabled in code */
+#else
+	#define GDS_INF(fmt, ...)
+#endif
+enum gds_record {
 	INVALID = 0x0000,
 	HEADER = 0x0002,
 	BGNLIB = 0x0102,
@@ -63,6 +81,13 @@ enum record {
 	PATHTYPE = 0x2102
 };
 
+/**
+ * @brief Name cell reference
+ * @param cell_inst Cell reference
+ * @param bytes Length of name
+ * @param data Name
+ * @return 0 if successful
+ */
 static int name_cell_ref(struct gds_cell_instance *cell_inst,
 			 unsigned int bytes, char *data)
 {
@@ -73,7 +98,7 @@ static int name_cell_ref(struct gds_cell_instance *cell_inst,
 		return -1;
 	}
 	data[bytes] = 0; // Append '0'
-	len = strlen(data);
+	len = (int)strlen(data);
 	if (len > CELL_NAME_MAX-1) {
 		GDS_ERROR("Cell name '%s' too long: %d\n", data, len);
 		return -1;
@@ -81,11 +106,16 @@ static int name_cell_ref(struct gds_cell_instance *cell_inst,
 
 	/* else: */
 	strcpy(cell_inst->ref_name, data);
-	printf("\tCell referenced: %s\n", cell_inst->ref_name);
+	GDS_INF("\tCell referenced: %s\n", cell_inst->ref_name);
 
 	return 0;
 }
 
+/**
+ * @brief Convert GDS 8-byte real to double
+ * @param data 8 Byte GDS real
+ * @return result
+ */
 static double gds_convert_double(const char *data)
 {
 	bool sign_bit;
@@ -126,6 +156,11 @@ static double gds_convert_double(const char *data)
 	return ret_val;
 }
 
+/**
+ * @brief Convert GDS INT32 to int
+ * @param data Buffer containing the int
+ * @return result
+ */
 static signed int gds_convert_signed_int(const char *data)
 {
 	int ret;
@@ -142,6 +177,11 @@ static signed int gds_convert_signed_int(const char *data)
 	return ret;
 }
 
+/**
+ * @brief Convert GDS INT16 to int16
+ * @param data Buffer containing the INT16
+ * @return result
+ */
 static int16_t gds_convert_signed_int16(const char *data)
 {
 	if (!data) {
@@ -152,6 +192,11 @@ static int16_t gds_convert_signed_int16(const char *data)
 			(((int16_t)(data[1]) & 0xFF) <<  0));
 }
 
+/**
+ * @brief Convert GDS UINT16 String to uint16
+ * @param data Buffer containing the uint16
+ * @return result
+ */
 static uint16_t gds_convert_unsigend_int16(const char *data)
 {
 	if (!data) {
@@ -162,6 +207,12 @@ static uint16_t gds_convert_unsigend_int16(const char *data)
 			(((uint16_t)(data[1]) & 0xFF) <<  0));
 }
 
+/**
+ * @brief Append library to list
+ * @param curr_list List containing gds_library elements. May be NULL.
+ * @param library_ptr Return of newly created library.
+ * @return Newly created list pointer
+ */
 static GList *append_library(GList *curr_list, struct gds_library **library_ptr)
 {
 	struct gds_library *lib;
@@ -180,6 +231,13 @@ static GList *append_library(GList *curr_list, struct gds_library **library_ptr)
 	return g_list_append(curr_list, lib);
 }
 
+/**
+ * @brief Append graphics to list
+ * @param curr_list List containing gds_graphics elements. May be NULL
+ * @param type Type of graphics
+ * @param graphics_ptr newly created graphic is written here
+ * @return new list pointer
+ */
 static GList *append_graphics(GList *curr_list, enum graphics_type type,
 			      struct gds_graphics **graphics_ptr)
 {
@@ -202,6 +260,13 @@ static GList *append_graphics(GList *curr_list, enum graphics_type type,
 	return g_list_append(curr_list, gfx);
 }
 
+/**
+ * @brief Appends vertext List
+ * @param curr_list List containing gds_point elements. May be NULL.
+ * @param x x-coordinate of new point
+ * @param y y-coordinate of new point
+ * @return new Pointer to List.
+ */
 static GList *append_vertex(GList *curr_list, int x, int y)
 {
 	struct gds_point *vertex;
@@ -215,6 +280,14 @@ static GList *append_vertex(GList *curr_list, int x, int y)
 	return g_list_append(curr_list, vertex);
 }
 
+/**
+ * @brief append_cell Append a gds_cell to a list
+ *
+ * Usage similar to append_cell_ref().
+ * @param curr_list List containing gds_cell elements. May be NULL
+ * @param cell_ptr newly created cell
+ * @return new pointer to list
+ */
 static GList *append_cell(GList *curr_list, struct gds_cell **cell_ptr)
 {
 	struct gds_cell *cell;
@@ -233,6 +306,14 @@ static GList *append_cell(GList *curr_list, struct gds_cell **cell_ptr)
 	return g_list_append(curr_list, cell);
 }
 
+/**
+ * @brief Append a cell reference to the reference GList.
+ *
+ * Appends a new gds_cell_instance to \p curr_list and returns the new element via \p instance_ptr
+ * @param curr_list List of gds_cell_instance elements. May be NULL
+ * @param instance_ptr newly created element
+ * @return new GList pointer
+ */
 static GList *append_cell_ref(GList *curr_list, struct gds_cell_instance **instance_ptr)
 {
 	struct gds_cell_instance *inst;
@@ -254,6 +335,13 @@ static GList *append_cell_ref(GList *curr_list, struct gds_cell_instance **insta
 	return g_list_append(curr_list, inst);
 }
 
+/**
+ * @brief Name a gds_library
+ * @param current_library Library to name
+ * @param bytes Lenght of name
+ * @param data Name
+ * @return 0 if successful
+ */
 static int name_library(struct gds_library *current_library,
 			unsigned int bytes, char *data)
 {
@@ -265,18 +353,26 @@ static int name_library(struct gds_library *current_library,
 	}
 
 	data[bytes] = 0; // Append '0'
-	len = strlen(data);
+	len = (int)strlen(data);
 	if (len > CELL_NAME_MAX-1) {
 		GDS_ERROR("Library name '%s' too long: %d\n", data, len);
 		return -1;
 	}
 
 	strcpy(current_library->name, data);
-	printf("Named library: %s\n", current_library->name);
+	GDS_INF("Named library: %s\n", current_library->name);
 
 	return 0;
 }
 
+/**
+ * @brief Names a gds_cell
+ * @param cell Cell to name
+ * @param bytes Length of name
+ * @param data Name
+ * @param lib Library in which \p cell is located
+ * @return 0 id successful
+ */
 static int name_cell(struct gds_cell *cell, unsigned int bytes,
 		     char *data, struct gds_library *lib)
 {
@@ -294,7 +390,7 @@ static int name_cell(struct gds_cell *cell, unsigned int bytes,
 	}
 
 	strcpy(cell->name, data);
-	printf("Named cell: %s\n", cell->name);
+	GDS_INF("Named cell: %s\n", cell->name);
 
 	/* Append cell name to lib's list of names */
 	lib->cell_names = g_list_append(lib->cell_names, cell->name);
@@ -302,7 +398,13 @@ static int name_cell(struct gds_cell *cell, unsigned int bytes,
 	return 0;
 }
 
-
+/**
+ * @brief Search for cell reference \p gcell_ref in \p glibrary
+ *
+ * Search cell referenced by \p gcell_ref inside \p glibrary and update gds_cell_instance::cell_ref with found #gds_cell
+ * @param gcell_ref gpointer cast of struct gds_cell_instance *
+ * @param glibrary gpointer cast of struct gds_library *
+ */
 static void parse_reference_list(gpointer gcell_ref, gpointer glibrary)
 {
 	struct gds_cell_instance *inst = (struct gds_cell_instance *)gcell_ref;
@@ -310,7 +412,7 @@ static void parse_reference_list(gpointer gcell_ref, gpointer glibrary)
 	GList *cell_item;
 	struct gds_cell *cell;
 
-	printf("\t\t\tReference: %s: ", inst->ref_name);
+	GDS_INF("\t\t\tReference: %s: ", inst->ref_name);
 	/* Find cell */
 	for (cell_item = lib->cells; cell_item != NULL;
 	     cell_item = cell_item->next) {
@@ -318,36 +420,56 @@ static void parse_reference_list(gpointer gcell_ref, gpointer glibrary)
 		cell = (struct gds_cell *)cell_item->data;
 		/* Check if cell is found */
 		if (!strcmp(cell->name, inst->ref_name)) {
-			printf("found\n");
+			GDS_INF("found\n");
 			/* update reference link */
 			inst->cell_ref = cell;
 			return;
 		}
 	}
 
-	printf("MISSING!\n");
+	GDS_INF("MISSING!\n");
 	GDS_WARN("referenced cell could not be found in library");
 }
 
+/**
+ * @brief Scans cell references inside cell
+ 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_reference_dependencies(gpointer gcell, gpointer library)
 {
 	struct gds_cell *cell = (struct gds_cell *)gcell;
 
-	printf("\tScanning cell: %s\n", cell->name);
+	GDS_INF("\tScanning cell: %s\n", cell->name);
 
 	/* Scan all library references */
 	g_list_foreach(cell->child_cells, parse_reference_list, library);
 
 }
 
+/**
+ * @brief Scans library's cell references
+ *
+ * This function searches all the references between cells and updates the gds_cell_instance::cell_ref field in each instance
+ * @param library_list_item List containing #gds_library elements
+ * @param user not used
+ */
 static void scan_library_references(gpointer library_list_item, gpointer user)
 {
 	struct gds_library *lib = (struct gds_library *)library_list_item;
 
-	printf("Scanning Library: %s\n", lib->name);
+	GDS_INF("Scanning Library: %s\n", lib->name);
 	g_list_foreach(lib->cells, scan_cell_reference_dependencies, lib);
 }
 
+/**
+ * @brief gds_parse_date
+ * @param buffer Buffer that contains the GDS Date field
+ * @param length Length of \p buffer
+ * @param mod_date Modification Date
+ * @param access_date Last Access Date
+ */
 static void gds_parse_date(const char *buffer, int length, struct gds_time_field *mod_date, struct gds_time_field *access_date)
 {
 
@@ -390,7 +512,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 	int run = 1;
 	FILE *gds_file = NULL;
 	uint16_t rec_data_length;
-	enum record rec_type;
+	enum gds_record rec_type;
 	struct gds_library *current_lib = NULL;
 	struct gds_cell *current_cell = NULL;
 	struct gds_graphics *current_graphics = NULL;
@@ -466,7 +588,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 				break;
 
 			}
-			printf("Entering Lib\n");
+			GDS_INF("Entering Lib\n");
 			break;
 		case ENDLIB:
 			if (current_lib == NULL) {
@@ -482,7 +604,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 				break;
 			}
 			current_lib = NULL;
-			printf("Leaving Library\n");
+			GDS_INF("Leaving Library\n");
 			break;
 		case BGNSTR:
 			current_lib->cells = append_cell(current_lib->cells, &current_cell);
@@ -491,7 +613,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 				run = -3;
 				break;
 			}
-			printf("Entering Cell\n");
+			GDS_INF("Entering Cell\n");
 			break;
 		case ENDSTR:
 			if (current_cell == NULL) {
@@ -506,7 +628,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 				break;
 			}
 			current_cell = NULL;
-			printf("Leaving Cell\n");
+			GDS_INF("Leaving Cell\n");
 			break;
 		case BOX:
 		case BOUNDARY:
@@ -523,7 +645,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 				run = -4;
 				break;
 			}
-			printf("\tEntering boundary/Box\n");
+			GDS_INF("\tEntering boundary/Box\n");
 			break;
 		case SREF:
 			if (current_cell == NULL) {
@@ -539,7 +661,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 				break;
 			}
 
-			printf("\tEntering reference\n");
+			GDS_INF("\tEntering reference\n");
 			break;
 		case PATH:
 			if (current_cell == NULL) {
@@ -554,16 +676,16 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 				run = -4;
 				break;
 			}
-			printf("\tEntering Path\n");
+			GDS_INF("\tEntering Path\n");
 			break;
 		case ENDEL:
 			if (current_graphics != NULL) {
 
-				printf("\tLeaving %s\n", (current_graphics->gfx_type == GRAPHIC_POLYGON ? "boundary" : "path"));
+				GDS_INF("\tLeaving %s\n", (current_graphics->gfx_type == GRAPHIC_POLYGON ? "boundary" : "path"));
 				current_graphics = NULL;
 			}
 			if (current_s_reference != NULL) {
-				printf("\tLeaving Reference\n");
+				GDS_INF("\tLeaving Reference\n");
 				current_s_reference = NULL;
 			}
 			break;
@@ -628,17 +750,17 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 			gds_parse_date(workbuff, read, &current_cell->mod_time, &current_cell->access_time);
 			break;
 		case LIBNAME:
-			name_library(current_lib, read, workbuff);
+			name_library(current_lib, (unsigned int)read, workbuff);
 			break;
 		case STRNAME:
-			name_cell(current_cell, read, workbuff, current_lib);
+			name_cell(current_cell, (unsigned int)read, workbuff, current_lib);
 			break;
 		case XY:
 			if (current_s_reference) {
 				/* Get origin of reference */
 				current_s_reference->origin.x = gds_convert_signed_int(workbuff);
 				current_s_reference->origin.y = gds_convert_signed_int(&workbuff[4]);
-				printf("\t\tSet origin to: %d/%d\n", current_s_reference->origin.x,
+				GDS_INF("\t\tSet origin to: %d/%d\n", current_s_reference->origin.x,
 				       current_s_reference->origin.y);
 			} else if (current_graphics) {
 				for (i = 0; i < read/8; i++) {
@@ -646,7 +768,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 					y = gds_convert_signed_int(&workbuff[i*8+4]);
 					current_graphics->vertices =
 							append_vertex(current_graphics->vertices, x, y);
-					printf("\t\tSet coordinate: %d/%d\n", x, y);
+					GDS_INF("\t\tSet coordinate: %d/%d\n", x, y);
 
 				}
 			}
@@ -677,7 +799,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 			if (current_graphics->layer < 0) {
 				GDS_WARN("Layer negative!\n");
 			}
-			printf("\t\tAdded layer %d\n", (int)current_graphics->layer);
+			GDS_INF("\t\tAdded layer %d\n", (int)current_graphics->layer);
 			break;
 		case MAG:
 			if (rec_data_length != 8) {
@@ -690,7 +812,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 			}
 			if (current_s_reference != NULL) {
 				current_s_reference->magnification = gds_convert_double(workbuff);
-				printf("\t\tMagnification defined: %lf\n", current_s_reference->magnification);
+				GDS_INF("\t\tMagnification defined: %lf\n", current_s_reference->magnification);
 			}
 			break;
 		case ANGLE:
@@ -704,7 +826,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 			}
 			if (current_s_reference != NULL) {
 				current_s_reference->angle = gds_convert_double(workbuff);
-				printf("\t\tAngle defined: %lf\n", current_s_reference->angle);
+				GDS_INF("\t\tAngle defined: %lf\n", current_s_reference->angle);
 			}
 			break;
 		case PATHTYPE:
@@ -714,7 +836,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 			}
 			if (current_graphics->gfx_type == GRAPHIC_PATH) {
 				current_graphics->path_render_type = (int)gds_convert_signed_int16(workbuff);
-				printf("\t\tPathtype: %d\n", current_graphics->path_render_type);
+				GDS_INF("\t\tPathtype: %d\n", current_graphics->path_render_type);
 			} else {
 				GDS_WARN("Path type defined inside non-path graphics object. Ignoring");
 			}
@@ -742,22 +864,38 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 	return run;
 }
 
+/**
+ * @brief delete_cell_inst_element
+ * @param cell_inst
+ */
 static void delete_cell_inst_element(struct gds_cell_instance *cell_inst)
 {
 	free(cell_inst);
 }
 
+/**
+ * @brief delete_vertex
+ * @param vertex
+ */
 static void delete_vertex(struct gds_point *vertex)
 {
 	free(vertex);
 }
 
+/**
+ * @brief delete_graphics_obj
+ * @param gfx
+ */
 static void delete_graphics_obj(struct gds_graphics *gfx)
 {
 	g_list_free_full(gfx->vertices, (GDestroyNotify)delete_vertex);
 	free(gfx);
 }
 
+/**
+ * @brief delete_cell_element
+ * @param cell
+ */
 static void delete_cell_element(struct gds_cell *cell)
 {
 	g_list_free_full(cell->child_cells, (GDestroyNotify)delete_cell_inst_element);
@@ -765,6 +903,10 @@ static void delete_cell_element(struct gds_cell *cell)
 	free(cell);
 }
 
+/**
+ * @brief delete_library_element
+ * @param lib
+ */
 static void delete_library_element(struct gds_library *lib)
 {
 	g_list_free(lib->cell_names);
@@ -780,3 +922,5 @@ int clear_lib_list(GList **library_list)
 	*library_list = NULL;
 	return 0;
 }
+
+/** @} */

gds-parser/gds-parser.h

@@ -17,13 +17,33 @@
  * along with GDSII-Converter.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * @file gds_parser.h
+ * @brief Header file for the GDS-Parser
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
+/**
+ * @addtogroup GDS-Parser
+ * @{
+ */
+
 #ifndef __GDSPARSE_H__
 #define __GDSPARSE_H__
 
 #include <glib.h>
 #include "gds-types.h"
 
+#define GDS_PRINT_DEBUG_INFOS (0) /**< @brief 1: Print infos, 0: Don't print */
+
 int parse_gds_from_file(const char *filename, GList **library_array);
+/**
+ * @brief Deletes all libraries including cells, references etc.
+ * @param Pointer to a list of #gds_library. Is set to NULL after completion.
+ * @return 0
+ */
 int clear_lib_list(GList **library_list);
 
+/** @} */
+
 #endif /* __GDSPARSE_H__ */

gds-parser/gds-types.h

@@ -1,21 +1,67 @@
+/*
+ * 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-types.h
+ * @brief Defines types and macros used by the GDS-Parser
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
+/**
+  * @addtogroup GDS-Parser
+  * @{
+  */
+
 #ifndef __GDS_TYPES_H__
 #define __GDS_TYPES_H__
 
 #include <stdint.h>
 #include <glib.h>
 
-#define CELL_NAME_MAX (100)
+#define CELL_NAME_MAX (100) /**< @brief Maximum length of a gds_cell::name or a gds_library::name */
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#define MIN(a,b) (((a) < (b)) ? (a) : (b)) /**< @brief Find return smaller number */
-#define MAX(a,b) (((a) > (b)) ? (a) : (b))
+#define MAX(a,b) (((a) > (b)) ? (a) : (b)) /**< @brief Find return bigger number */
 
-enum graphics_type {GRAPHIC_PATH = 0, GRAPHIC_POLYGON = 1, GRAPHIC_BOX};
+/** @brief Types of graphic objects */
-enum path_type {PATH_FLUSH = 0, PATH_ROUNDED = 1, PATH_SQUARED = 2};
+enum graphics_type
+{
+		    GRAPHIC_PATH = 0, /**< @brief Path. Esentially a line */
+		    GRAPHIC_POLYGON = 1, /**< @brief An arbitrary polygon */
+		    GRAPHIC_BOX = 2 /**< @brief A rectangle. @warning Implementation in renderers might be buggy!*/
+};
 
+/**
+ * @brief Defines the line caps of a path
+ */
+enum path_type {PATH_FLUSH = 0, PATH_ROUNDED = 1, PATH_SQUARED = 2}; /**< Path line caps */
+
+/**
+ * @brief A point in the 2D plane. Sometimes references as vertex
+ */
 struct gds_point {
 	int x;
 	int y;
 };
 
+/**
+ * @brief Date information for cells and libraries
+ */
 struct gds_time_field {
 	uint16_t year;
 	uint16_t month;
@@ -25,39 +71,53 @@ struct gds_time_field {
 	uint16_t second;
 };
 
+/**
+ * @brief A GDS graphics object
+ */
 struct gds_graphics {
-	enum graphics_type gfx_type;
+	enum graphics_type gfx_type; /**< \brief Type of graphic */
-	GList *vertices;
+	GList *vertices; /**< @brief List of #gds_point */
-	enum path_type path_render_type;
+	enum path_type path_render_type; /**< @brief Line cap */
-	int width_absolute;
+	int width_absolute; /**< @brief Width. Not used for objects other than paths */
-	int16_t layer;
+	int16_t layer; /**< @brief Layer the graphic object is on */
 	uint16_t datatype;
 };
 
+/**
+ * @brief This represents an instanc of a cell inside another cell
+ */
 struct gds_cell_instance {
-	char ref_name[CELL_NAME_MAX];
+	char ref_name[CELL_NAME_MAX]; /**< @brief Name of referenced cell */
-	struct gds_cell *cell_ref;
+	struct gds_cell *cell_ref; /**< @brief Referenced gds_cell structure */
-	struct gds_point origin;
+	struct gds_point origin; /**< @brief Origin */
-	int flipped;
+	int flipped; /**< @brief Mirrored on x-axis before rotation */
-	double angle;
+	double angle; /**< @brief Angle of rotation (counter clockwise) in degrees */
-	double magnification;
+	double magnification; /**< @brief magnification */
 };
 
+/**
+ * @brief A Cell inside a gds_library
+ */
 struct gds_cell {
 	char name[CELL_NAME_MAX];
 	struct gds_time_field mod_time;
 	struct gds_time_field access_time;
-	GList *child_cells;
+	GList *child_cells; /**< @brief List of #gds_cell_instance elements */
-	GList *graphic_objs;
+	GList *graphic_objs; /**< @brief List of #gds_graphics */
 };
 
+/**
+ * @brief GDS Toplevel library
+ */
 struct gds_library {
 	char name[CELL_NAME_MAX];
 	struct gds_time_field mod_time;
 	struct gds_time_field access_time;
-	double unit_to_meters;
+	double unit_to_meters;  /**< @warning not yet implemented */
-	GList *cells;
+	GList *cells; /**< List of #gds_cell that contains all cells in this library*/
-	GList *cell_names;
+	GList *cell_names /**< List of strings that contains all cell names */;
 };
 
+/** @} */
+
 #endif /* __GDS_TYPES_H__ */

latex-output/latex-output.c

@@ -17,11 +17,35 @@
  * along with GDSII-Converter.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * @file latex-output.c
+ * @brief LaTeX output renderer
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
 #include "latex-output.h"
 #include <math.h>
 
+/**
+ * @addtogroup LaTeX-Renderer
+ * @{
+ */
+
+/** @brief Writes a GString \p buffer to the fixed file tex_file */
 #define WRITEOUT_BUFFER(buff) fwrite((buff)->str, sizeof(char), (buff)->len, tex_file)
 
+/**
+ * @brief Write the layer declarration to TeX file
+ *
+ * This writes the declaration of the layers and the mapping in which order
+ * the layers shall be rendered by TikZ. Layers are written in the order they are
+ * positioned inside the \p layer_infos list.
+ *
+ * @param tex_file TeX-File to write to
+ * @param layer_infos List containing layer_info structs.
+ * @param buffer
+ * @note  The field layer_info::stacked_position is ignored. Stack depends on list order.
+ */
 static void write_layer_definitions(FILE *tex_file, GList *layer_infos, GString *buffer)
 {
 	GList *list;
@@ -53,11 +77,30 @@ static void write_layer_definitions(FILE *tex_file, GList *layer_infos, GString
 }
 
 /**
- * @brief write_layer_env
+ * @brief Write layer Envirmonment
- * @param tex_file
+ *
- * @param layer
+ * If the requested layer shall be rendered, this code writes the necessary code
- * @param buffer
+ * to open the layer. It also returns the color the layer shall be rendered in.
- * @return TRUE if layer is placeable
+ *
+ * The followingenvironments are generated:
+ *
+ * @code{.tex}
+ * \begin{pgfonlayer}{<layer>}
+ * % If pdf layers shall be used also this is enabled:
+ * \begin{scope}[ocg={ref=<layer>, status=visible,name={<Layer Name>}}]
+ * @endcode
+ *
+ *
+ * If the layer shall not be rendered, FALSE is returned and the color is not filled in and
+ * the cod eis not written to the file.
+ *
+ * @param tex_file TeX file to write to
+ * @param color Return of the layer's color
+ * @param layer Requested layer number
+ * @param linfo Layer information list containing layer_info structs
+ * @param buffer Some working buffer
+ * @return TRUE, if the layer shall be rendered.
+ * @note The opened environments have to be closed afterwards
  */
 static gboolean write_layer_env(FILE *tex_file, GdkRGBA *color, int layer, GList *linfo, GString *buffer)
 {
@@ -80,7 +123,17 @@ static gboolean write_layer_env(FILE *tex_file, GdkRGBA *color, int layer, GList
 	return FALSE;
 }
 
-
+/**
+ * @brief Writes a graphics object to the specified tex_file
+ *
+ * This function opens the layer, writes a graphics object and closes the layer
+ *
+ * @param tex_file File to write to
+ * @param graphics Object to render
+ * @param linfo Layer information
+ * @param buffer Working buffer
+ * @param scale Scale abject down by this value
+ */
 static void generate_graphics(FILE *tex_file, GList *graphics, GList *linfo, GString *buffer, double scale)
 {
 	GList *temp;
@@ -144,7 +197,14 @@ static void generate_graphics(FILE *tex_file, GList *graphics, GList *linfo, GSt
 	} /* For graphics */
 }
 
-
+/**
+ * @brief Render cell to file
+ * @param cell Cell to render
+ * @param layer_infos Layer information
+ * @param tex_file File to write to
+ * @param buffer Working buffer
+ * @param scale Scale output down by this value
+ */
 static void render_cell(struct gds_cell *cell, GList *layer_infos, FILE *tex_file, GString *buffer, double scale)
 {
 
@@ -238,3 +298,5 @@ void latex_render_cell_to_code(struct gds_cell *cell, GList *layer_infos, FILE *
 	fflush(tex_file);
 	g_string_free(working_line, TRUE);
 }
+
+/** @} */

latex-output/latex-output.h

@@ -17,17 +17,39 @@
  * along with GDSII-Converter.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * @file latex-output.h
+ * @brief LaTeX output renderer
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
 #ifndef __LATEX_OUTPUT_H__
 #define __LATEX_OUTPUT_H__
 
+/**
+ * @addtogroup LaTeX-Renderer
+ * @{
+ */
+
 #include "../gds-parser/gds-types.h"
 #include <glib.h>
 #include <stdio.h>
-#include "../layer-selector.h"
+#include "../mapping-parser.h"
 
-#define LATEX_LINE_BUFFER_KB (10)
+#define LATEX_LINE_BUFFER_KB (10) /**< @brief Buffer for LaTeX Code line in KiB */
 
+/**
+ * @brief Render \p cell to LateX/TikZ code
+ * @param cell Cell to render
+ * @param layer_infos Layer information
+ * @param tex_file Already opened file to write data in
+ * @param scale Scale image down by this value
+ * @param create_pdf_layers Optional content groups used
+ * @param standalone_document document can be compiled standalone
+ */
 void latex_render_cell_to_code(struct gds_cell *cell, GList *layer_infos, FILE *tex_file, double scale,
 			       gboolean create_pdf_layers, gboolean standalone_document);
 
+/** @} */
+
 #endif /* __LATEX_OUTPUT_H__ */

layer-selector.c

@@ -170,79 +170,6 @@ void generate_layer_widgets(GtkListBox *listbox, GList *libs)
 	gtk_widget_set_sensitive(global_save_button, TRUE);
 }
 
-/**
- * @brief load_csv_line
- * @param file
- * @param export
- * @param name
- * @param layer
- * @param color
- * @param opacity
- * @return 0 if succesfull, 1 if line was malformatted or parameters are broken, -1 if file end
- */
-static int load_csv_line(GDataInputStream *stream, gboolean *export, char **name, int *layer, GdkRGBA *color)
-{
-	int ret;
-	gsize len;
-	gchar *line;
-	GRegex *regex;
-	GMatchInfo *mi;
-	char *match;
-
-	if ((!export) || (!name) || (!layer) || (!color)) {
-		ret = 1;
-		goto ret_direct;
-	}
-
-	regex = g_regex_new("^(?<layer>[0-9]+),(?<r>[0-9\\.]+),(?<g>[0-9\\.]+),(?<b>[0-9\\.]+),(?<a>[0-9\\.]+),(?<export>[01]),(?<name>.*)$", 0, 0, NULL);
-
-	line = g_data_input_stream_read_line(stream, &len, NULL, NULL);
-	if (!line) {
-		ret = -1;
-		goto destroy_regex;
-	}
-
-	/* Match line in CSV */
-	g_regex_match(regex, line, 0, &mi);
-	if (g_match_info_matches(mi)) {
-		/* Line is valid */
-		match = g_match_info_fetch_named(mi, "layer");
-		*layer = (int)g_ascii_strtoll(match, NULL, 10);
-		g_free(match);
-		match = g_match_info_fetch_named(mi, "r");
-		color->red = g_ascii_strtod(match, NULL);
-		g_free(match);
-		match = g_match_info_fetch_named(mi, "g");
-		color->green = g_ascii_strtod(match, NULL);
-		g_free(match);
-		match = g_match_info_fetch_named(mi, "b");
-		color->blue = g_ascii_strtod(match, NULL);
-		g_free(match);
-		match = g_match_info_fetch_named(mi, "a");
-		color->alpha = g_ascii_strtod(match, NULL);
-		g_free(match);
-		match = g_match_info_fetch_named(mi, "export");
-		*export = ((!strcmp(match, "1")) ? TRUE : FALSE);
-		g_free(match);
-		match = g_match_info_fetch_named(mi, "name");
-		*name = match;
-
-		ret = 0;
-	} else {
-		/* Line is malformatted */
-		printf("Could not recognize line in CSV as valid entry: %s\n", line);
-		ret = 1;
-	}
-
-	g_match_info_free(mi);
-	g_free(line);
-destroy_regex:
-	g_regex_unref(regex);
-ret_direct:
-	return ret;
-
-}
-
 static LayerElement *find_layer_element_in_list(GList *el_list, int layer)
 {
 	LayerElement *ret = NULL;

layer-selector.h

@@ -22,14 +22,7 @@
 
 #include <gtk/gtk.h>
 #include <glib.h>
-
+#include "mapping-parser.h"
-struct layer_info
-{
-	int layer;
-	char *name;
-	int stacked_position; ///< Lower is bottom, higher is top
-	GdkRGBA color;
-};
 
 void generate_layer_widgets(GtkListBox *listbox, GList *libs);
 void setup_load_mapping_callback(GtkWidget *button, GtkWindow *main_window);

main.c

@@ -19,7 +19,9 @@
 
 #include <stdio.h>
 #include <gtk/gtk.h>
+#include <glib.h>
 #include "main-window.h"
+#include "command-line.h"
 
 struct application_data {
 	GtkApplication *app;
@@ -44,7 +46,7 @@ static void app_about(GSimpleAction *action, GVariant *parameter, gpointer user_
 	gtk_window_set_transient_for(GTK_WINDOW(dialog), appdata->main_window);
 	gtk_dialog_run(dialog);
 
-	gtk_widget_destroy(dialog);
+	gtk_widget_destroy(GTK_WIDGET(dialog));
 	g_object_unref(builder);
 }
 
@@ -64,11 +66,12 @@ static void gapp_activate(GApplication *app, gpointer user_data)
 	gtk_widget_show(GTK_WIDGET(main_window));
 }
 
-int main(int argc, char **argv)
+static int start_gui(int argc, char **argv)
 {
+
 	GtkApplication *gapp;
 	int app_status;
-	struct application_data appdata;
+	static struct application_data appdata;
 	GMenu *menu;
 	GMenu *m_quit;
 	GMenu *m_about;
@@ -98,5 +101,83 @@ int main(int argc, char **argv)
 	app_status = g_application_run (G_APPLICATION(gapp), argc, argv);
 	g_object_unref (gapp);
 
+	return app_status;
+}
+
+int main(int argc, char **argv)
+{
+	GError *error = NULL;
+	GOptionContext *context;
+	gchar *gds_name;
+	gchar *basename;
+	gchar *pdfname = NULL, *texname = NULL, *mappingname = NULL, *cellname = NULL;
+	gboolean tikz = FALSE, pdf = FALSE, pdf_layers = FALSE, pdf_standalone = FALSE;
+	int scale = 1000;
+	int app_status;
+
+
+	GOptionEntry entries[] =
+	{
+	  { "tikz", 't', 0, G_OPTION_ARG_NONE, &tikz, "Output TikZ code", NULL },
+	  { "pdf", 'p', 0, G_OPTION_ARG_NONE, &pdf, "Output PDF document", NULL },
+	  { "scale", 's', 0, G_OPTION_ARG_INT, &scale, "Divide output coordinates by <SCALE>", "<SCALE>" },
+	  { "tex-output", 'o', 0, G_OPTION_ARG_FILENAME, &texname, "Optional path for TeX file", "PATH" },
+	  { "pdf-output", 'O', 0, G_OPTION_ARG_FILENAME, &pdfname, "Optional path for PDF file", "PATH" },
+	  { "mapping", 'm', 0, G_OPTION_ARG_FILENAME, &mappingname, "Path for Layer Mapping File", "PATH" },
+	  { "cell", 'c', 0, G_OPTION_ARG_STRING, &cellname, "Cell to render", "NAME" },
+	  { "tex-standalone", 'a', 0, G_OPTION_ARG_NONE, &pdf_standalone, "Create standalone PDF", NULL },
+	  { "tex-layers", 'l', 0, G_OPTION_ARG_NONE, &pdf_layers, "Create PDF Layers (OCG)", NULL },
+	  { NULL }
+	};
+
+	context = g_option_context_new(" FILE - Convert GDS file <FILE> to graphic");
+	g_option_context_add_main_entries(context, entries, NULL);
+	g_option_context_add_group(context, gtk_get_option_group(TRUE));
+	if (!g_option_context_parse (context, &argc, &argv, &error))
+	    {
+	      g_print ("Option parsing failed: %s\n", error->message);
+	      exit(1);
+	    }
+
+	if (argc >= 2) {
+		if (scale < 1) {
+			printf("Scale < 1 not allowed. Setting to 1\n");
+			scale = 1;
+		}
+
+		/* No format selected */
+		if (!(tikz || pdf)) {
+			tikz = TRUE;
+		}
+
+		/* Get gds name */
+		gds_name = argv[1];
+
+		/* Check if PDF/TeX names are supplied. if not generate */
+		basename = g_path_get_basename(gds_name);
+
+		if (!texname) {
+			texname = g_strdup_printf("./%s.tex", basename);
+		}
+
+		if (!pdfname) {
+			pdfname = g_strdup_printf("./%s.pdf", basename);
+		}
+
+		command_line_convert_gds(gds_name, pdfname, texname, pdf, tikz, mappingname, cellname,
+					 (double)scale, pdf_layers, pdf_standalone);
+		/* Clean up */
+		g_free(pdfname);
+		g_free(texname);
+		if (mappingname)
+			g_free(mappingname);
+		if (cellname)
+			g_free(cellname);
+		app_status = 0;
+	} else {
+		app_status = start_gui(argc, argv);
+	}
+
+
 	return app_status;
 }

mapping-parser.c

@@ -0,0 +1,98 @@
+/*
+ *
+ * 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 mapping-parser.c
+ * @brief Function to read a mapping file line and parse it.
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
+/**
+ * @addtogroup MainApplication
+ * @{
+ */
+
+#include "mapping-parser.h"
+
+int load_csv_line(GDataInputStream *stream, gboolean *export, char **name, int *layer, GdkRGBA *color)
+{
+	int ret;
+	gsize len;
+	gchar *line;
+	GRegex *regex;
+	GMatchInfo *mi;
+	char *match;
+
+	if ((!export) || (!name) || (!layer) || (!color)) {
+		ret = 1;
+		goto ret_direct;
+	}
+
+	regex = g_regex_new("^(?<layer>[0-9]+),(?<r>[0-9\\.]+),(?<g>[0-9\\.]+),(?<b>[0-9\\.]+),(?<a>[0-9\\.]+),(?<export>[01]),(?<name>.*)$", 0, 0, NULL);
+
+	line = g_data_input_stream_read_line(stream, &len, NULL, NULL);
+	if (!line) {
+		ret = -1;
+		goto destroy_regex;
+	}
+
+	/* Match line in CSV */
+	g_regex_match(regex, line, 0, &mi);
+	if (g_match_info_matches(mi)) {
+		/* Line is valid */
+		match = g_match_info_fetch_named(mi, "layer");
+		*layer = (int)g_ascii_strtoll(match, NULL, 10);
+		g_free(match);
+		match = g_match_info_fetch_named(mi, "r");
+		color->red = g_ascii_strtod(match, NULL);
+		g_free(match);
+		match = g_match_info_fetch_named(mi, "g");
+		color->green = g_ascii_strtod(match, NULL);
+		g_free(match);
+		match = g_match_info_fetch_named(mi, "b");
+		color->blue = g_ascii_strtod(match, NULL);
+		g_free(match);
+		match = g_match_info_fetch_named(mi, "a");
+		color->alpha = g_ascii_strtod(match, NULL);
+		g_free(match);
+		match = g_match_info_fetch_named(mi, "export");
+		*export = ((!strcmp(match, "1")) ? TRUE : FALSE);
+		g_free(match);
+		match = g_match_info_fetch_named(mi, "name");
+		*name = match;
+
+		ret = 0;
+	} else {
+		/* Line is malformatted */
+		printf("Could not recognize line in CSV as valid entry: %s\n", line);
+		ret = 1;
+	}
+
+	g_match_info_free(mi);
+	g_free(line);
+destroy_regex:
+	g_regex_unref(regex);
+ret_direct:
+	return ret;
+
+}
+
+/** @} */
+

mapping-parser.h

@@ -0,0 +1,62 @@
+/*
+ * 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 mapping-parser.h
+ * @brief Function to read a mapping file line and parse it.
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
+#ifndef __MAPPING_PARSER_H__
+#define __MAPPING_PARSER_H__
+
+/**
+ * @addtogroup MainApplication
+ * @{
+ */
+
+#include <gtk/gtk.h>
+
+/**
+ * @brief Layer information.
+ *
+ * This structs contains information on how to render a layer
+ */
+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
+	GdkRGBA color; /**< @brief RGBA color used to render this layer */
+};
+
+/**
+ * @brief Load a line from \p stream and parse try to parse it as layer information
+ * @param stream Input data stream
+ * @param export Layer shall be exported
+ * @param name Layer name. Free returned pointer after using.
+ * @param layer Layer number
+ * @param color RGBA color.
+ * @return 1 if malformatted line, 0 if parsing was successful and parameters are valid, -1 if file end
+ */
+int load_csv_line(GDataInputStream *stream, gboolean *export, char **name, int *layer, GdkRGBA *color);
+
+/** @} */
+
+#endif /* __MAPPING_PARSER_H__ */