Module: ppl/ppl Branch: ppl-0_11-branch Commit: fd99c696ace5e8aa3b450eaac39e4c09100b561e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=fd99c696ace5e...

Author: Enea Zaffanella zaffanella@cs.unipr.it Date: Wed Feb 23 18:32:51 2011 +0100

Avoid duplicate PDF labels in the configured C interface manuals.

---

doc/Makefile.am | 8 ++++++++ doc/devref-language-interface.doxyconf.in | 3 ++- doc/user-language-interface.doxyconf.in | 3 ++- interfaces/C/C_interface.dox | 8 ++++++++ 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am index 5a2efcc..aa547e0 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -875,6 +875,7 @@ $(SED_LATEX_OPTION) \ # C Language Interface Targets

SED_C_OPTION = \ + -e 's/<PPL_SED_CONFIGURED_MANUAL>//' \ -e 's/<PPL_SED_LANGUAGE_NAME>/C/' \ -e 's/<PPL_SED_INTERFACE_NAME>/c-interface/' \ -e 's/<PPL_SED_USEPACKAGE_OCAMLDOC>//' @@ -955,6 +956,7 @@ $(DEVREF_C_INTERFACE_STUFF) $(DEVREF_CORE_HTML_DIR) # (System Independent) Prolog Language Interface Targets

SED_PROLOG_OPTION = \ + -e 's/<PPL_SED_CONFIGURED_MANUAL>//' \ -e 's/<PPL_SED_LANGUAGE_NAME>/Prolog/' \ -e 's/<PPL_SED_INTERFACE_NAME>/prolog-interface/' \ -e 's/<PPL_SED_USEPACKAGE_OCAMLDOC>//' @@ -1031,6 +1033,7 @@ $(DEVREF_PROLOG_INTERFACE_STUFF) $(DEVREF_CORE_HTML_DIR) # OCaml Language Interface Targets

SED_OCAML_OPTION = \ + -e 's/<PPL_SED_CONFIGURED_MANUAL>//' \ -e 's/<PPL_SED_LANGUAGE_NAME>/OCaml/' \ -e 's/<PPL_SED_INTERFACE_NAME>/ocaml-interface/' \ -e 's/<PPL_SED_USEPACKAGE_OCAMLDOC>/\usepackage{ocamldoc}/' @@ -1124,6 +1127,7 @@ $(DEVREF_OCAML_INTERFACE_STUFF) $(DEVREF_CORE_HTML_DIR) # Java Language Interface Targets

SED_JAVA_OPTION = \ + -e 's/<PPL_SED_CONFIGURED_MANUAL>//' \ -e 's/<PPL_SED_LANGUAGE_NAME>/Java/' \ -e 's/<PPL_SED_INTERFACE_NAME>/java-interface/' \ -e 's/<PPL_SED_USEPACKAGE_OCAMLDOC>//' @@ -1206,6 +1210,7 @@ $(DEVREF_JAVA_INTERFACE_STUFF) $(DEVREF_CORE_HTML_DIR) if BUILD_C_INTERFACE

SED_CONFIGURED_C_OPTION = \ + -e 's/<PPL_SED_CONFIGURED_MANUAL>/PPL_DOXYGEN_CONFIGURED_MANUAL/' \ -e 's/<PPL_SED_LANGUAGE_NAME>/Configured C/' \ -e 's/<PPL_SED_INTERFACE_NAME>/configured-c-interface/' \ -e 's/<PPL_SED_USEPACKAGE_OCAMLDOC>//' @@ -1290,6 +1295,7 @@ endif BUILD_C_INTERFACE if BUILD_SOME_PROLOG_INTERFACES

SED_CONFIGURED_PROLOG_OPTION = \ + -e 's/<PPL_SED_CONFIGURED_MANUAL>/PPL_DOXYGEN_CONFIGURED_MANUAL/' \ -e 's/<PPL_SED_LANGUAGE_NAME>/Configured Prolog/' \ -e 's/<PPL_SED_INTERFACE_NAME>/configured-prolog-interface/' \ -e 's/<PPL_SED_USEPACKAGE_OCAMLDOC>//' @@ -1372,6 +1378,7 @@ endif BUILD_SOME_PROLOG_INTERFACES if BUILD_OCAML_INTERFACE

SED_CONFIGURED_OCAML_OPTION = \ + -e 's/<PPL_SED_CONFIGURED_MANUAL>/PPL_DOXYGEN_CONFIGURED_MANUAL/' \ -e 's/<PPL_SED_LANGUAGE_NAME>/Configured OCaml/' \ -e 's/<PPL_SED_INTERFACE_NAME>/configured-ocaml-interface/' \ -e 's/<PPL_SED_USEPACKAGE_OCAMLDOC>/\usepackage{ocamldoc}/' @@ -1463,6 +1470,7 @@ endif BUILD_OCAML_INTERFACE if BUILD_JAVA_INTERFACE

SED_CONFIGURED_JAVA_OPTION = \ + -e 's/<PPL_SED_CONFIGURED_MANUAL>/PPL_DOXYGEN_CONFIGURED_MANUAL/' \ -e 's/<PPL_SED_LANGUAGE_NAME>/Configured Java/' \ -e 's/<PPL_SED_INTERFACE_NAME>/configured-java-interface/' \ -e 's/<PPL_SED_USEPACKAGE_OCAMLDOC>//' diff --git a/doc/devref-language-interface.doxyconf.in b/doc/devref-language-interface.doxyconf.in index e277689..9f5204b 100644 --- a/doc/devref-language-interface.doxyconf.in +++ b/doc/devref-language-interface.doxyconf.in @@ -219,7 +219,8 @@ EXPAND_ONLY_PREDEF = YES SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS \ +PREDEFINED = <PPL_SED_CONFIGURED_MANUAL> \ + PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS \ PPL_PROTO(protos):=protos EXPAND_AS_DEFINED = DECLARE_CONVERSIONS \ CATCH_ALL diff --git a/doc/user-language-interface.doxyconf.in b/doc/user-language-interface.doxyconf.in index 852427b..8db43fc 100644 --- a/doc/user-language-interface.doxyconf.in +++ b/doc/user-language-interface.doxyconf.in @@ -219,7 +219,8 @@ EXPAND_ONLY_PREDEF = YES SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = PPL_PROTO(protos):=protos +PREDEFINED = <PPL_SED_CONFIGURED_MANUAL> \ + PPL_PROTO(protos):=protos EXPAND_AS_DEFINED = PPL_TYPE_DECLARATION \ PPL_DECLARE_PRINT_FUNCTIONS \ PPL_DECLARE_ASCII_DUMP_LOAD_FUNCTIONS \ diff --git a/interfaces/C/C_interface.dox b/interfaces/C/C_interface.dox index e0a99e4..df185b3 100644 --- a/interfaces/C/C_interface.dox +++ b/interfaces/C/C_interface.dox @@ -39,12 +39,16 @@ site: http://www.cs.unipr.it/ppl/ . */ space-dimension compatible. */

+#if !defined(PPL_DOXYGEN_CONFIGURED_MANUAL) + /*! \brief Opaque pointer \ingroup Datatypes */ typedef struct ppl_Polyhedron_tag* ppl_Polyhedron_t;

/*! \brief Opaque pointer to const object \ingroup Datatypes */ typedef struct ppl_Polyhedron_tag const* ppl_const_Polyhedron_t;

+#endif /* !defined(PPL_DOXYGEN_CONFIGURED_MANUAL) */ + /*! \brief \name Constructors and Assignment for C_Polyhedron */ /*@{*/

@@ -1456,6 +1460,8 @@ ppl_Polyhedron_bounded_H79_extrapolation_assign manipulation of the collection of disjuncts. */

+#if !defined(PPL_DOXYGEN_CONFIGURED_MANUAL) + /*! \brief Opaque pointer \ingroup Datatypes */ typedef struct ppl_Pointset_Powerset_C_Polyhedron_tag* ppl_Pointset_Powerset_C_Polyhedron_t; @@ -1492,6 +1498,8 @@ typedef struct ppl_Pointset_Powerset_C_Polyhedron_const_iterator_tag* typedef struct ppl_Pointset_Powerset_C_Polyhedron_const_iterator_tag const* ppl_const_Pointset_Powerset_C_Polyhedron_const_iterator_t;

+#endif /* !defined(PPL_DOXYGEN_CONFIGURED_MANUAL) */ + /*! \brief \name Construction, Initialization and Destruction */ /*@{*/