2009-09-19 Jim Evins <evins@snaught.com>

[glabels] / glabels2 / libglabels / paper.h

diff --git a/glabels2/libglabels/paper.h b/glabels2/libglabels/paper.h
index 25a5cb823116cc2f17162eb9fd3fca71c9960340..0cf918f2159db96480a518d83758a807d20b4eb3 100644 (file)
--- a/glabels2/libglabels/paper.h
+++ b/glabels2/libglabels/paper.h
@@ -1,33 +1,27 @@
 /*
- *  (LIBGLABELS) Template library for GLABELS
+ *  paper.h
+ *  Copyright (C) 2003-2009  Jim Evins <evins@snaught.com>.
  *
- *  paper.h:  paper module header file
+ *  This file is part of libglabels.
  *
- *  Copyright (C) 2003, 2004  Jim Evins <evins@snaught.com>.
+ *  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 <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __PAPER_H__
 #define __PAPER_H__
 
-#include <glib/gtypes.h>
-#include <glib/glist.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
@@ -38,65 +32,39 @@ G_BEGIN_DECLS
 typedef struct _lglPaper lglPaper;
 
 struct _lglPaper {
-       gchar               *id;     /* Unique ID of paper definition */
-       gchar               *name;   /* Localized name of paper */
-       gdouble              width;  /* Width (in points) */
-       gdouble              height; /* Height (in points) */
+       gchar               *id;       /* Unique ID of paper definition */
+       gchar               *name;     /* Localized name of paper */
+       gdouble              width;    /* Width (in points) */
+       gdouble              height;   /* Height (in points) */
+       gchar               *pwg_size; /* PWG 5101.1-2002 size name */
 };
 
 
-/*
- * Module initialization
- */
-void                 lgl_paper_init                (void);
-
-
 /*
  * Paper construction
  */
 lglPaper            *lgl_paper_new                 (gchar           *id,
                                                    gchar           *name,
                                                    gdouble          width,
-                                                   gdouble          height);
+                                                   gdouble          height,
+                                                   gchar           *pwg_size);
 
 lglPaper             *lgl_paper_dup                (const lglPaper   *orig);
 
 void                 lgl_paper_free                (lglPaper         *paper);
 
 
-/*
- * ID lists
- */
-GList               *lgl_paper_get_id_list         (void);
-void                 lgl_paper_free_id_list        (GList           *ids);
-
-
-/*
- * Name lists
- */
-GList               *lgl_paper_get_name_list       (void);
-void                 lgl_paper_free_name_list      (GList           *names);
-
-
-/*
- * Query functions
- */
-gboolean             lgl_paper_is_id_known         (const gchar     *id);
-gboolean             lgl_paper_is_id_other         (const gchar     *id);
+G_END_DECLS
 
-lglPaper            *lgl_paper_from_id             (const gchar     *id);
-lglPaper            *lgl_paper_from_name           (const gchar     *name);
+#endif
 
-gchar               *lgl_paper_lookup_id_from_name (const gchar     *name);
-gchar               *lgl_paper_lookup_name_from_id (const gchar     *id);
 
 
 /*
- * Debugging
+ * Local Variables:       -- emacs
+ * mode: C                -- emacs
+ * c-basic-offset: 8      -- emacs
+ * tab-width: 8           -- emacs
+ * indent-tabs-mode: nil  -- emacs
+ * End:                   -- emacs
  */
-void                 lgl_paper_print_known_papers  (void);
-
-
-G_END_DECLS
-
-#endif