From: Andrea Zagli Date: Sun, 25 Mar 2007 14:04:33 +0000 (+0000) Subject: Small changes on autotools files. X-Git-Tag: 0.2.0~36 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=33877037871dfb841340148fee4cef71f4ebdbc9;p=reptool%2Flibreptool Small changes on autotools files. Generation of the documentation. Version 0.0.1 git-svn-id: svn+ssh://saetta.homelinux.org/svn/libreptool/trunk@7 3191ed1d-3fce-41bb-ab4a-0cebc0943b59 --- diff --git a/Makefile.am b/Makefile.am index 509e452..7fd5ac4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,6 @@ -SUBDIRS = src tests docs +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc + +SUBDIRS = src tests docs data EXTRA_DIST = libreptool.pc.in diff --git a/configure.ac b/configure.ac index c4193c2..7a37f9c 100644 --- a/configure.ac +++ b/configure.ac @@ -43,5 +43,6 @@ AC_CONFIG_FILES([ docs/Makefile docs/reference/Makefile docs/reference/version.xml + data/Makefile ]) AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..b2b5c59 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,3 @@ +EXTRA_DIST = \ + reptool.dtd \ + reptool_report.dtd diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 8e0f0e7..4ff0afd 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -55,7 +55,7 @@ HTML_IMAGES= # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). # e.g. content_files=running.sgml building.sgml changes-2.0.sgml -content_files= +content_files = version.xml # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded # These files must be listed here *and* in content_files diff --git a/docs/reference/libreptool-docs.sgml b/docs/reference/libreptool-docs.sgml index b1607d0..6aa08b4 100644 --- a/docs/reference/libreptool-docs.sgml +++ b/docs/reference/libreptool-docs.sgml @@ -1,13 +1,23 @@ + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + +]> - Libreptool Reference Manual + LibRepTool Reference Manual + for LibRepTool &version; - Libreptool + LibRepTool + + + + + + + diff --git a/docs/reference/libreptool-sections.txt b/docs/reference/libreptool-sections.txt index ea292f5..1543bec 100644 --- a/docs/reference/libreptool-sections.txt +++ b/docs/reference/libreptool-sections.txt @@ -1,16 +1,129 @@ +
+rptobjectimage +RptObjImage +RptObjImage +rpt_obj_image_new +rpt_obj_image_new_from_xml +rpt_obj_image_get_xml + +TYPE_RPT_OBJ_IMAGE +RPT_OBJ_IMAGE +RPT_OBJ_IMAGE_CLASS +IS_RPT_OBJ_IMAGE +IS_RPT_OBJ_IMAGE_CLASS +RPT_OBJ_IMAGE_GET_CLASS +rpt_obj_image_get_type +
+
rptprint +RptPrint +RptPrint +RptPrintOutputType +rpt_print_new_from_xml +rpt_print_new_from_file + TYPE_RPT_PRINT RPT_PRINT RPT_PRINT_COMMON_CLASS IS_RPT_PRINT IS_RPT_PRINT_COMMON_CLASS RPT_PRINT_COMMON_GET_CLASS -RptPrint -RptPrint rpt_print_get_type -RptPrintOutputType -rpt_print_new_from_xml -rpt_print_new_from_file +
+ +
+libreptool +
+ +
+rptobjectline +RptObjLine +RptObjLine +rpt_obj_line_new +rpt_obj_line_new_from_xml +rpt_obj_line_get_xml + +TYPE_RPT_OBJ_LINE +RPT_OBJ_LINE +RPT_OBJ_LINE_CLASS +IS_RPT_OBJ_LINE +IS_RPT_OBJ_LINE_CLASS +RPT_OBJ_LINE_GET_CLASS +rpt_obj_line_get_type +
+ +
+rptobject +RptObject +RptObject +rpt_object_new +rpt_object_get_xml + +TYPE_RPT_OBJECT +RPT_OBJECT +RPT_OBJECT_CLASS +IS_RPT_OBJECT +IS_RPT_OBJECT_CLASS +RPT_OBJECT_GET_CLASS +rpt_object_get_type +
+ +
+rptreport +RptReport +RptReport +rpt_report_new_from_xml +rpt_report_new_from_file +rpt_report_get_xml +rpt_report_get_xml_rptprint + +TYPE_RPT_REPORT +RPT_REPORT +RPT_REPORT_CLASS +IS_RPT_REPORT +IS_RPT_REPORT_CLASS +RPT_REPORT_GET_CLASS +rpt_report_get_type +
+ +
+rptobjecttext +RptObjText +RptObjText +rpt_obj_text_new +rpt_obj_text_new_from_xml +rpt_obj_text_get_xml + +TYPE_RPT_OBJ_TEXT +RPT_OBJ_TEXT +RPT_OBJ_TEXT_CLASS +IS_RPT_OBJ_TEXT +IS_RPT_OBJ_TEXT_CLASS +RPT_OBJ_TEXT_GET_CLASS +rpt_obj_text_get_type +
+ +
+rptobjectrect +RptObjRect +RptObjRect +rpt_obj_rect_new +rpt_obj_rect_new_from_xml +rpt_obj_rect_get_xml + +TYPE_RPT_OBJ_RECT +RPT_OBJ_RECT +RPT_OBJ_RECT_CLASS +IS_RPT_OBJ_RECT +IS_RPT_OBJ_RECT_CLASS +RPT_OBJ_RECT_GET_CLASS +rpt_obj_rect_get_type +
+ +
+rptcommon +rpt_common_get_position +rpt_common_get_size
diff --git a/docs/reference/libreptool.types b/docs/reference/libreptool.types index 1de7bf8..a37d90f 100644 --- a/docs/reference/libreptool.types +++ b/docs/reference/libreptool.types @@ -1,3 +1,14 @@ #include +#include +#include +#include +#include +#include +rpt_report_get_type +rpt_object_get_type +rpt_obj_text_get_type +rpt_obj_line_get_type +rpt_obj_rect_get_type +rpt_obj_image_get_type rpt_print_get_type diff --git a/docs/reference/tmpl/libreptool-unused.sgml b/docs/reference/tmpl/libreptool-unused.sgml new file mode 100644 index 0000000..bdcd8d0 --- /dev/null +++ b/docs/reference/tmpl/libreptool-unused.sgml @@ -0,0 +1,336 @@ + + + + + +@obj: + + + + + + +@klass: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@obj: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@obj: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@obj: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@obj: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@obj: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@obj: + + + + + + +@obj: + + + + + + +@klass: + + + + + + +@obj: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + diff --git a/docs/reference/tmpl/libreptool.sgml b/docs/reference/tmpl/libreptool.sgml new file mode 100644 index 0000000..8ba947b --- /dev/null +++ b/docs/reference/tmpl/libreptool.sgml @@ -0,0 +1,19 @@ + +libreptool + + + + + + + + + + + + + + + + + diff --git a/docs/reference/tmpl/rptcommon.sgml b/docs/reference/tmpl/rptcommon.sgml new file mode 100644 index 0000000..ad23c81 --- /dev/null +++ b/docs/reference/tmpl/rptcommon.sgml @@ -0,0 +1,37 @@ + +rptcommon + + +Common functions usefull for the library's classes. + + + + + + + + + + + + + + + + + + + +@xnode: +@position: + + + + + + + +@xnode: +@size: + + diff --git a/docs/reference/tmpl/rptobject.sgml b/docs/reference/tmpl/rptobject.sgml new file mode 100644 index 0000000..6db88c8 --- /dev/null +++ b/docs/reference/tmpl/rptobject.sgml @@ -0,0 +1,54 @@ + +RptObject + + +The base class for report's objects. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@name: +@position: +@Returns: + + + + + + + +@rpt_object: +@xnode: + + diff --git a/docs/reference/tmpl/rptobjectimage.sgml b/docs/reference/tmpl/rptobjectimage.sgml new file mode 100644 index 0000000..cffaa8a --- /dev/null +++ b/docs/reference/tmpl/rptobjectimage.sgml @@ -0,0 +1,63 @@ + +RptObjImage + + +An image object. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@name: +@position: +@Returns: + + + + + + + +@xnode: +@Returns: + + + + + + + +@rpt_objimage: +@xnode: + + diff --git a/docs/reference/tmpl/rptobjectline.sgml b/docs/reference/tmpl/rptobjectline.sgml new file mode 100644 index 0000000..cd8c65a --- /dev/null +++ b/docs/reference/tmpl/rptobjectline.sgml @@ -0,0 +1,58 @@ + +RptObjLine + + +A line object. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@name: +@position: +@Returns: + + + + + + + +@xnode: +@Returns: + + + + + + + +@rpt_objline: +@xnode: + + diff --git a/docs/reference/tmpl/rptobjectrect.sgml b/docs/reference/tmpl/rptobjectrect.sgml new file mode 100644 index 0000000..4d6c55a --- /dev/null +++ b/docs/reference/tmpl/rptobjectrect.sgml @@ -0,0 +1,53 @@ + +RptObjRect + + +A rectangular object. + + + + + + + + + + + + + + + + + + + + + + + + + +@name: +@position: +@Returns: + + + + + + + +@xnode: +@Returns: + + + + + + + +@rpt_object: +@xnode: + + diff --git a/docs/reference/tmpl/rptobjecttext.sgml b/docs/reference/tmpl/rptobjecttext.sgml new file mode 100644 index 0000000..23d3529 --- /dev/null +++ b/docs/reference/tmpl/rptobjecttext.sgml @@ -0,0 +1,63 @@ + +RptObjText + + +A textual object. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@name: +@position: +@Returns: + + + + + + + +@xnode: +@Returns: + + + + + + + +@rpt_objtext: +@xnode: + + diff --git a/docs/reference/tmpl/rptprint.sgml b/docs/reference/tmpl/rptprint.sgml index 4e359cc..f5f8802 100644 --- a/docs/reference/tmpl/rptprint.sgml +++ b/docs/reference/tmpl/rptprint.sgml @@ -2,7 +2,7 @@ RptPrint - +Produces the report/print. @@ -17,67 +17,12 @@ RptPrint - - - - - - - - - - - - -@obj: - - - - - - - -@klass: - - - - - - - -@obj: - - - - - - - -@klass: - - - - - - - -@obj: - - - - - - - -@Returns: - - diff --git a/docs/reference/tmpl/rptreport.sgml b/docs/reference/tmpl/rptreport.sgml new file mode 100644 index 0000000..211c3f1 --- /dev/null +++ b/docs/reference/tmpl/rptreport.sgml @@ -0,0 +1,61 @@ + +RptReport + + +Manage report definition files and produces the xml report/print's file. + + + + + + + + + + + + + + + + + + + + + + + + + +@xdoc: +@Returns: + + + + + + + +@filename: +@Returns: + + + + + + + +@rpt_report: +@Returns: + + + + + + + +@rpt_report: +@Returns: + + diff --git a/src/Makefile.am b/src/Makefile.am index e8e4e29..14ff775 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,6 +15,7 @@ libreptool_la_SOURCES = \ rptcommon.c include_HEADERS = \ + libreptool.h \ rptobject.h \ rptobjecttext.h \ rptobjectline.h \ diff --git a/src/libreptool.h b/src/libreptool.h index c81832b..42526d6 100644 --- a/src/libreptool.h +++ b/src/libreptool.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2007 Andrea Zagli + * Copyright (C) 2007 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/rptcommon.c b/src/rptcommon.c index 9c12935..f8d43f2 100644 --- a/src/rptcommon.c +++ b/src/rptcommon.c @@ -21,6 +21,12 @@ #include "rptcommon.h" +/** + * rpt_common_get_position: + * @xnode: + * @position: + * + */ void rpt_common_get_position (xmlNode *xnode, RptPoint *position) { @@ -41,6 +47,12 @@ rpt_common_get_position (xmlNode *xnode, RptPoint *position) } } +/** + * rpt_common_get_size: + * @xnode: + * @size: + * + */ void rpt_common_get_size (xmlNode *xnode, RptSize *size) { diff --git a/src/rptobject.h b/src/rptobject.h index 2d14bf4..5a3533a 100644 --- a/src/rptobject.h +++ b/src/rptobject.h @@ -57,7 +57,7 @@ GType rpt_object_get_type (void) G_GNUC_CONST; RptObject *rpt_object_new (const gchar *name, RptPoint position); -void rpt_object_get_xml (RptObject *rptobj, xmlNode *xnode); +void rpt_object_get_xml (RptObject *rpt_object, xmlNode *xnode); G_END_DECLS diff --git a/tests/Makefile.am b/tests/Makefile.am index 10c0cee..ccd4a53 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,7 @@ LIBS = $(REPTOOL_LIBS) AM_CPPFLAGS = $(REPTOOL_CFLAGS) \ - -I$(top_builddir)/src + -I$(top_srcdir)/src libreptool = $(top_builddir)/src/libreptool.la @@ -9,3 +9,8 @@ noinst_PROGRAMS = test_rptprint \ test_rptreport LDADD = $(libreptool) + +EXTRA_DIST = \ + test_report.rpt \ + test_report_db.rpt \ + test_rptprint.rptr