From: Jim Evins Date: Sat, 19 Sep 2009 16:56:36 +0000 (+0000) Subject: 2009-09-19 Jim Evins X-Git-Tag: glabels-2_3_0~188 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cc737549c143021a3463c490c6122261717b918c;p=glabels 2009-09-19 Jim Evins * libglabels/category.c: * libglabels/category.h: * libglabels/db.c: * libglabels/db.h: * libglabels/enums.h: * libglabels/libglabels-private.h: * libglabels/libglabels.h: * libglabels/paper.c: * libglabels/paper.h: * libglabels/str.c: * libglabels/str.h: * libglabels/template.c: * libglabels/template.h: * libglabels/xml-category.c: * libglabels/xml-category.h: * libglabels/xml-paper.c: * libglabels/xml-paper.h: * libglabels/xml-template.c: * libglabels/xml-template.h: * libglabels/xml.c: * libglabels/xml.h: - Cleaned up GTK/GLIB includes. - Updated license notification to LGPL3+. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@890 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index be65a4f7..05103be1 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,29 @@ +2009-09-19 Jim Evins + + * libglabels/category.c: + * libglabels/category.h: + * libglabels/db.c: + * libglabels/db.h: + * libglabels/enums.h: + * libglabels/libglabels-private.h: + * libglabels/libglabels.h: + * libglabels/paper.c: + * libglabels/paper.h: + * libglabels/str.c: + * libglabels/str.h: + * libglabels/template.c: + * libglabels/template.h: + * libglabels/xml-category.c: + * libglabels/xml-category.h: + * libglabels/xml-paper.c: + * libglabels/xml-paper.h: + * libglabels/xml-template.c: + * libglabels/xml-template.h: + * libglabels/xml.c: + * libglabels/xml.h: + - Cleaned up GTK/GLIB includes. + - Updated license notification to LGPL3+. + 2009-09-18 Jim Evins * po/POTFILES.in: diff --git a/glabels2/libglabels/category.c b/glabels2/libglabels/category.c index e82e0849..f7f4052c 100644 --- a/glabels2/libglabels/category.c +++ b/glabels2/libglabels/category.c @@ -1,41 +1,34 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (LIBGLABELS) Template library for GLABELS - * - * category.c: template category module - * - * Copyright (C) 2001-2006 Jim Evins . + * category.c + * Copyright (C) 2006-2009 Jim Evins . * - * This file is part of the LIBGLABELS library. + * This file is part of libglabels. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ + #include #include "category.h" #include -#include -#include -#include +#include #include #include "libglabels-private.h" + /*===========================================*/ /* Private types */ /*===========================================*/ @@ -54,6 +47,7 @@ /*===========================================*/ /* Functions. */ /*===========================================*/ + /** * lgl_category_new: * @id: Id of category definition. (E.g. label, card, etc.) Should be @@ -127,3 +121,12 @@ void lgl_category_free (lglCategory *category) } + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/category.h b/glabels2/libglabels/category.h index dccbc194..3c19bf2e 100644 --- a/glabels2/libglabels/category.h +++ b/glabels2/libglabels/category.h @@ -1,28 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (LIBGLABELS) Template library for GLABELS - * - * category.h: template category module header file + * category.h + * Copyright (C) 2006-2009 Jim Evins . * - * Copyright (C) 2006 Jim Evins . + * This file is part of libglabels. * - * This file is part of the LIBGLABELS library. + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ #ifndef __CATEGORY_H__ @@ -46,8 +39,8 @@ struct _lglCategory { /* * Category construction */ -lglCategory *lgl_category_new (gchar *id, - gchar *name); +lglCategory *lgl_category_new (gchar *id, + gchar *name); lglCategory *lgl_category_dup (const lglCategory *orig); void lgl_category_free (lglCategory *category); @@ -56,3 +49,14 @@ void lgl_category_free (lglCategory *category) G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/db.c b/glabels2/libglabels/db.c index a7279047..4a582e8d 100644 --- a/glabels2/libglabels/db.c +++ b/glabels2/libglabels/db.c @@ -1,39 +1,29 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (LIBGLABELS) Template library for GLABELS - * - * db.c: template db module + * db.c + * Copyright (C) 2003-2009 Jim Evins . * - * Copyright (C) 2003-2007 Jim Evins . + * This file is part of libglabels. * - * This file is part of the LIBGLABELS library. + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ + #include #include "db.h" #include -#include -#include -#include -#include -#include +#include #include #include #include @@ -49,6 +39,7 @@ /* Private types */ /*===========================================*/ + /*===========================================*/ /* Private globals */ /*===========================================*/ @@ -59,6 +50,7 @@ static GList *templates = NULL; static GHashTable *template_cache = NULL; + /*===========================================*/ /* Local function prototypes */ /*===========================================*/ @@ -81,7 +73,6 @@ static GList *read_template_files_from_dir (GList *templates, static lglTemplate *template_full_page (const gchar *page_size); - /*===========================================*/ /* Module initialization */ /*===========================================*/ @@ -157,7 +148,6 @@ lgl_db_init (void) } - /*===========================================*/ /* Paper db functions. */ /*===========================================*/ @@ -443,6 +433,7 @@ lgl_db_is_paper_id_known (const gchar *id) return FALSE; } + /** * lgl_db_is_paper_id_other: * @id: paper id to test @@ -963,7 +954,6 @@ lgl_db_print_known_categories (void) } - /*===========================================*/ /* Brand db functions. */ /*===========================================*/ @@ -1043,7 +1033,6 @@ lgl_db_free_brand_list (GList *brands) } - /*===========================================*/ /* Template db functions. */ /*===========================================*/ @@ -1587,6 +1576,7 @@ lgl_db_print_known_templates (void) } + /** * lgl_db_print_aliases: * @template: template @@ -1613,3 +1603,12 @@ lgl_db_print_aliases (const lglTemplate *template) } + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/db.h b/glabels2/libglabels/db.h index a7b77c7f..96367c1d 100644 --- a/glabels2/libglabels/db.h +++ b/glabels2/libglabels/db.h @@ -1,28 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (LIBGLABELS) Template library for GLABELS - * - * db.h: template db module header file + * db.h + * Copyright (C) 2006-2009 Jim Evins . * - * Copyright (C) 2006-2007 Jim Evins . + * This file is part of libglabels. * - * This file is part of the LIBGLABELS library. + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ #ifndef __DB_H__ @@ -145,3 +138,14 @@ void lgl_db_print_aliases (const lglTemplate *temp G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/enums.h b/glabels2/libglabels/enums.h index d139dc25..6ebcc1d8 100644 --- a/glabels2/libglabels/enums.h +++ b/glabels2/libglabels/enums.h @@ -1,26 +1,21 @@ /* - * (LIBGLABELS) Template library for GLABELS + * enums.h + * Copyright (C) 2003-2009 Jim Evins . * - * enums.h: common libGLabels enumerations header file + * This file is part of libglabels. * - * Copyright (C) 2003, 2004 Jim Evins . + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This file is part of the LIBGLABELS library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ #ifndef __ENUMS_H__ @@ -47,3 +42,14 @@ G_END_DECLS #endif /* __ENUMS_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/libglabels-private.h b/glabels2/libglabels/libglabels-private.h index dd8bda83..fa205ee8 100644 --- a/glabels2/libglabels/libglabels-private.h +++ b/glabels2/libglabels/libglabels-private.h @@ -1,34 +1,27 @@ /* - * (LIBGLABELS) Template library for GLABELS + * libglabels-private.h + * Copyright (C) 2004-2009 Jim Evins . * - * libglabels-private.h: libglabels private header file + * This file is part of libglabels. * - * Copyright (C) 2004 Jim Evins . + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This file is part of the LIBGLABELS library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ #ifndef __LIBGLABELS_PRIVATE_H__ #define __LIBGLABELS_PRIVATE_H__ -#include -#include -#include +#include #include "str.h" @@ -44,3 +37,14 @@ #endif /* __LIBGLABELS_PRIVATE_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/libglabels.h b/glabels2/libglabels/libglabels.h index c74fbe01..bd46b19d 100644 --- a/glabels2/libglabels/libglabels.h +++ b/glabels2/libglabels/libglabels.h @@ -1,26 +1,21 @@ /* - * (LIBGLABELS) Template library for GLABELS + * libglabels.h + * Copyright (C) 2003-2009 Jim Evins . * - * libglabels.h: libglabels master header file + * This file is part of libglabels. * - * Copyright (C) 2004 Jim Evins . + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This file is part of the LIBGLABELS library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ #ifndef __LIBGLABELS_H__ @@ -38,3 +33,14 @@ #include #endif /* __LIBGLABELS_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/paper.c b/glabels2/libglabels/paper.c index 98826c9b..d0b80fbb 100644 --- a/glabels2/libglabels/paper.c +++ b/glabels2/libglabels/paper.c @@ -1,35 +1,29 @@ /* - * (LIBGLABELS) Template library for GLABELS + * paper.c + * Copyright (C) 2003-2009 Jim Evins . * - * paper.c: paper module + * This file is part of libglabels. * - * Copyright (C) 2003, 2004 Jim Evins . + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This file is part of the LIBGLABELS library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ + #include #include "paper.h" #include -#include -#include -#include +#include #include #include "libglabels-private.h" @@ -142,3 +136,12 @@ void lgl_paper_free (lglPaper *paper) } + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/paper.h b/glabels2/libglabels/paper.h index 6f197cb7..0cf918f2 100644 --- a/glabels2/libglabels/paper.h +++ b/glabels2/libglabels/paper.h @@ -1,26 +1,21 @@ /* - * (LIBGLABELS) Template library for GLABELS + * paper.h + * Copyright (C) 2003-2009 Jim Evins . * - * paper.h: paper module header file + * This file is part of libglabels. * - * Copyright (C) 2003, 2004 Jim Evins . + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This file is part of the LIBGLABELS library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ #ifndef __PAPER_H__ @@ -62,3 +57,14 @@ void lgl_paper_free (lglPaper *paper); G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/str.c b/glabels2/libglabels/str.c index 7c1f59a6..5c21f189 100644 --- a/glabels2/libglabels/str.c +++ b/glabels2/libglabels/str.c @@ -1,29 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (LIBGLABELS) Template library for GLABELS - * - * str.c: libGLabels string utilities + * str.c + * Copyright (C) 2007-2009 Jim Evins . * - * Copyright (C) 2007 Jim Evins . + * This file is part of libglabels. * - * This file is part of the LIBGLABELS library. + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ + #include #include "str.h" @@ -82,3 +76,12 @@ lgl_str_utf8_casecmp (const gchar *s1, } + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/str.h b/glabels2/libglabels/str.h index bc6312f7..54e2361a 100644 --- a/glabels2/libglabels/str.h +++ b/glabels2/libglabels/str.h @@ -1,28 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (LIBGLABELS) Template library for GLABELS - * - * str.h: libGLabels string utilities header file + * str.h + * Copyright (C) 2007-2009 Jim Evins . * - * Copyright (C) 2007 Jim Evins . + * This file is part of libglabels. * - * This file is part of the LIBGLABELS library. + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ #ifndef __STR_H__ @@ -39,3 +32,14 @@ G_END_DECLS #endif /* __STR_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/template.c b/glabels2/libglabels/template.c index f6d6d212..5675c401 100644 --- a/glabels2/libglabels/template.c +++ b/glabels2/libglabels/template.c @@ -1,38 +1,29 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (LIBGLABELS) Template library for GLABELS - * - * template.c: template module + * template.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2006 Jim Evins . + * This file is part of libglabels. * - * This file is part of the LIBGLABELS library. + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ + #include #include "template.h" #include -#include -#include -#include -#include +#include #include #include #include @@ -1119,3 +1110,13 @@ compare_origins (gconstpointer a, } } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/template.h b/glabels2/libglabels/template.h index 683775dd..ca53ab1b 100644 --- a/glabels2/libglabels/template.h +++ b/glabels2/libglabels/template.h @@ -1,28 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (LIBGLABELS) Template library for GLABELS - * - * template.h: template module header file + * template.h + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2006 Jim Evins . + * This file is part of libglabels. * - * This file is part of the LIBGLABELS library. + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ #ifndef __TEMPLATE_H__ @@ -377,3 +370,14 @@ void lgl_template_markup_free (lglTemplateMarkup G_END_DECLS #endif + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/xml-category.c b/glabels2/libglabels/xml-category.c index 0e759c9a..4925eba3 100644 --- a/glabels2/libglabels/xml-category.c +++ b/glabels2/libglabels/xml-category.c @@ -1,33 +1,29 @@ /* - * (LIBGLABELS) Template library for GLABELS + * xml-category.c + * Copyright (C) 2006-2009 Jim Evins . * - * xml-category.c: category xml module + * This file is part of libglabels. * - * Copyright (C) 2006 Jim Evins . + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This file is part of the LIBGLABELS library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ + #include #include "xml-category.h" #include -#include +#include #include #include @@ -167,3 +163,13 @@ lgl_xml_category_parse_category_node (xmlNodePtr category_node) return category; } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/xml-category.h b/glabels2/libglabels/xml-category.h index 7cf1065c..815acf96 100644 --- a/glabels2/libglabels/xml-category.h +++ b/glabels2/libglabels/xml-category.h @@ -1,26 +1,21 @@ /* - * (LIBGLABELS) Template library for GLABELS + * xml-category.h + * Copyright (C) 2006-2009 Jim Evins . * - * xml-category.h: category xml module header file + * This file is part of libglabels. * - * Copyright (C) 2006 Jim Evins . + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This file is part of the LIBGLABELS library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ #ifndef __XML_CATEGORY_H__ @@ -43,3 +38,14 @@ lglCategory *lgl_xml_category_parse_category_node (xmlNodePtr category_ G_END_DECLS #endif /* __XML_CATEGORY_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/xml-paper.c b/glabels2/libglabels/xml-paper.c index fc6f07fa..00263e71 100644 --- a/glabels2/libglabels/xml-paper.c +++ b/glabels2/libglabels/xml-paper.c @@ -1,33 +1,29 @@ /* - * (LIBGLABELS) Template library for GLABELS + * xml-paper.c + * Copyright (C) 2003-2009 Jim Evins . * - * xml-paper.c: paper xml module + * This file is part of libglabels. * - * Copyright (C) 2003, 2004 Jim Evins . + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This file is part of the LIBGLABELS library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ + #include #include "xml-paper.h" #include -#include +#include #include #include @@ -174,3 +170,13 @@ lgl_xml_paper_parse_paper_node (xmlNodePtr paper_node) return paper; } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/xml-paper.h b/glabels2/libglabels/xml-paper.h index a05cd2fc..bffda36f 100644 --- a/glabels2/libglabels/xml-paper.h +++ b/glabels2/libglabels/xml-paper.h @@ -1,26 +1,21 @@ /* - * (LIBGLABELS) Template library for GLABELS + * xml-paper.h + * Copyright (C) 2003-2009 Jim Evins . * - * xml-paper.h: paper xml module header file + * This file is part of libglabels. * - * Copyright (C) 2003, 2004 Jim Evins . + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This file is part of the LIBGLABELS library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ #ifndef __XML_PAPER_H__ @@ -43,3 +38,14 @@ lglPaper *lgl_xml_paper_parse_paper_node (xmlNodePtr paper_node); G_END_DECLS #endif /* __XML_PAPER_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/xml-template.c b/glabels2/libglabels/xml-template.c index 6f1ae4b8..9a880c3c 100644 --- a/glabels2/libglabels/xml-template.c +++ b/glabels2/libglabels/xml-template.c @@ -1,35 +1,29 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - /* - * (LIBGLABELS) Template library for GLABELS - * - * xml-template.c: template xml module + * xml-template.c + * Copyright (C) 2001-2009 Jim Evins . * - * Copyright (C) 2001-2006 Jim Evins . + * This file is part of libglabels. * - * This file is part of the LIBGLABELS library. + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ + #include #include "xml-template.h" #include -#include +#include #include #include @@ -970,3 +964,13 @@ xml_create_alias_node (const lglTemplateAlias *alias, } + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/xml-template.h b/glabels2/libglabels/xml-template.h index b940db32..e4460070 100644 --- a/glabels2/libglabels/xml-template.h +++ b/glabels2/libglabels/xml-template.h @@ -1,26 +1,21 @@ /* - * (LIBGLABELS) Template library for GLABELS + * xml-template.h + * Copyright (C) 2001-2009 Jim Evins . * - * xml-template.h: template xml module header file + * This file is part of libglabels. * - * Copyright (C) 2001-2004 Jim Evins . + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This file is part of the LIBGLABELS library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ #ifndef __XML_TEMPLATE_H__ @@ -53,3 +48,14 @@ void lgl_xml_template_create_template_node (const lglTemplate *templ G_END_DECLS #endif /* __XML_TEMPLATE_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/xml.c b/glabels2/libglabels/xml.c index 0943d908..91cbb205 100644 --- a/glabels2/libglabels/xml.c +++ b/glabels2/libglabels/xml.c @@ -1,34 +1,29 @@ /* - * (LIBGLABELS) Template library for GLABELS + * xml.c + * Copyright (C) 2003-2009 Jim Evins . * - * xml.c: GLabels xml utilities module + * This file is part of libglabels. * - * Copyright (C) 2003, 2004 Jim Evins . + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This file is part of the LIBGLABELS library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ + #include #include "xml.h" #include -#include -#include +#include #include #include "libglabels-private.h" @@ -537,3 +532,12 @@ lgl_xml_set_default_units (lglUnitsType units) } + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */ diff --git a/glabels2/libglabels/xml.h b/glabels2/libglabels/xml.h index be0ec9a3..257ee455 100644 --- a/glabels2/libglabels/xml.h +++ b/glabels2/libglabels/xml.h @@ -1,26 +1,21 @@ /* - * (LIBGLABELS) Template library for GLABELS + * xml.h + * Copyright (C) 2003-2009 Jim Evins . * - * xml.h: GLabels xml utilities header file + * This file is part of libglabels. * - * Copyright (C) 2003, 2004 Jim Evins . + * libglabels is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This file is part of the LIBGLABELS library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, + * libglabels 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 - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public License + * along with libglabels. If not, see . */ #ifndef __XML_H__ @@ -111,3 +106,14 @@ G_END_DECLS #endif /* __XML_H__ */ + + + +/* + * Local Variables: -- emacs + * mode: C -- emacs + * c-basic-offset: 8 -- emacs + * tab-width: 8 -- emacs + * indent-tabs-mode: nil -- emacs + * End: -- emacs + */