]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
A bunch of bugfixes and code cleanup for the documentation
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 8 Oct 2012 23:31:11 +0000 (23:31 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 8 Oct 2012 23:31:11 +0000 (23:31 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27020 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/doc/doxygen/CMakeLists.txt
deal.II/doc/doxygen/images/Makefile [deleted file]
deal.II/doc/doxygen/images/structure.cmapx [deleted file]
deal.II/doc/doxygen/images/structure.png [deleted file]
deal.II/doc/doxygen/tutorial/CMakeLists.txt
deal.II/doc/doxygen/tutorial/steps.png [deleted file]

index 45bbbeb0f3320114889b17b05eab550e938b0e6f..d861e6a08cbe8a4cc36847c66a0d40a547c6bb40 100644 (file)
@@ -24,7 +24,7 @@ ENDIF()
 
 
 #
-# Prepare the example steps for inclusion:
+# Prepare the example steps for doxygen:
 #
 
 ADD_SUBDIRECTORY(tutorial)
@@ -77,17 +77,18 @@ ADD_CUSTOM_COMMAND(
 file(GLOB doxygen_input
   ${CMAKE_SOURCE_DIR}/include/deal.II/*
   ${CMAKE_BINARY_DIR}/include/deal.II/*
+  ${CMAKE_CURRENT_SOURCE_DIR}/headers
+  ${CMAKE_CURRENT_BINARY_DIR}/tutorial
   ${CMAKE_SOURCE_DIR}/doc/news/*.h
   ${CMAKE_SOURCE_DIR}/contrib/parameter_gui/*.h
   ${CMAKE_SOURCE_DIR}/contrib/parameter_gui/main.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/headers
-  ${CMAKE_CURRENT_BINARY_DIR}/tutorial
   )
 
 TO_STRING(doxygen_input ${doxygen_input})
 
 file(GLOB doxygen_image_path
   ${CMAKE_CURRENT_SOURCE_DIR}/images
+  ${CMAKE_CURRENT_BINARY_DIR}/images
   ${CMAKE_SOURCE_DIR}/examples/*/doc
   ${CMAKE_SOURCE_DIR}/contrib/parameter_gui/images
   )
@@ -100,7 +101,12 @@ FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/options.dox"
   "
   )
 
-ADD_CUSTOM_TARGET(doxygen ALL # TODO: Really all?
+
+#
+# And, finally, call doxygen:
+#
+
+ADD_CUSTOM_TARGET(doxygen ALL
   #
   # ./deal.II is already created due to CONFIGURE_FILE(... deal.css ...)
   #
@@ -116,6 +122,7 @@ ADD_CUSTOM_TARGET(doxygen ALL # TODO: Really all?
 ADD_DEPENDENCIES(doxygen tutorial)
 
 INSTALL(DIRECTORY
+  ${CMAKE_CURRENT_SOURCE_DIR}/stylesheet.css
   ${CMAKE_CURRENT_BINARY_DIR}/deal.II
   DESTINATION ${DEAL_II_DOCUMENTATION_RELDIR}/doxygen
   COMPONENT documentation
diff --git a/deal.II/doc/doxygen/images/Makefile b/deal.II/doc/doxygen/images/Makefile
deleted file mode 100644 (file)
index e649676..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Id$
-
-structure.png: structure.dot
-       @echo ================== Making $@
-       @dot -Tpng -Tcmapx -O $<
-       @mv $<.png $(basename $<).png
-       @mv $<.cmapx $(basename $<).cmapx
diff --git a/deal.II/doc/doxygen/images/structure.cmapx b/deal.II/doc/doxygen/images/structure.cmapx
deleted file mode 100644 (file)
index 4ed9746..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<map id="G" name="G">
-<area shape="rect" href="../deal.II/group_fe.html" title="FiniteElement" alt="" coords="123,5,224,32"/>
-<area shape="rect" href="../deal.II/group_dofs.html" title="DoFHandler" alt="" coords="129,80,217,107"/>
-<area shape="rect" href="../deal.II/group_feaccess.html" title="FEValues" alt="" coords="247,80,324,107"/>
-<area shape="rect" href="../deal.II/group_grid.html" title="Triangulation" alt="" coords="5,5,99,32"/>
-<area shape="rect" href="../deal.II/group_LAC.html" title="Discrete System" alt="" coords="171,155,288,181"/>
-<area shape="rect" href="../deal.II/group_Quadrature.html" title="Quadrature" alt="" coords="248,5,333,32"/>
-<area shape="rect" href="../deal.II/group_mapping.html" title="Mapping" alt="" coords="357,5,427,32"/>
-<area shape="rect" href="../deal.II/group_Solvers.html" title="Solver" alt="" coords="201,229,257,256"/>
-<area shape="rect" href="../deal.II/group_output.html" title="Output" alt="" coords="200,304,259,331"/>
-</map>
diff --git a/deal.II/doc/doxygen/images/structure.png b/deal.II/doc/doxygen/images/structure.png
deleted file mode 100644 (file)
index 0e6832b..0000000
Binary files a/deal.II/doc/doxygen/images/structure.png and /dev/null differ
index 7a8f2b479cb3319ce85705ecae6475aa042c38d9..585a6473d67eaa1826f9d1084de3672fee373d5e 100644 (file)
@@ -68,6 +68,12 @@ ADD_CUSTOM_COMMAND(
   )
 
 
+#
+# TODO:
+# Are toc-list.html and toc-topics.html really generated by hand?
+#
+
+
 #
 # A target for the preparation of all the stuff happening in here...
 #
@@ -187,8 +193,8 @@ INSTALL(FILES
   index.html
   navbar.html
   title.html
-  toc-list.html #TODO
-  toc-topics.html #TODO
+  toc-list.html
+  toc-topics.html
   ${CMAKE_CURRENT_BINARY_DIR}/steps.png
   ${CMAKE_CURRENT_BINARY_DIR}/toc.html
   DESTINATION ${DEAL_II_DOCUMENTATION_RELDIR}/doxygen/tutorial
diff --git a/deal.II/doc/doxygen/tutorial/steps.png b/deal.II/doc/doxygen/tutorial/steps.png
deleted file mode 100644 (file)
index 82b260b..0000000
Binary files a/deal.II/doc/doxygen/tutorial/steps.png and /dev/null differ

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.