Changeset - r1039:7f37e5fc416e
« 1037:d3b041
« 1035:d149ea
1043:4e36fd »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge #404 to branch 1.2
1 4 1
merge 1.2
5 files changed with 55 insertions and 23 deletions:
configure.ac
2
1
doc/CMakeLists.txt
6
doc/Doxyfile.in
34
9
doc/DoxygenLayout.xml
12
12
doc/mainpage.dox.in
1
1
↑ Collapse diff ↑
configure.ac
Ignore white space 6 line context
... ... 
@@ -116,3 +116,3 @@
116 116 
AC_SUBST([CONFIG_STATUS_DEPENDENCIES],
117 
  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])
117 
  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/doc/mainpage.dox.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])
118 118 

			




	...
	...
	
		
@@ -123,2 +123,3 @@


			




	123
	123
	
		
doc/Doxyfile


			




	
	124
	
		
doc/mainpage.dox


			




	124
	125
	
		
lemon/lemon.pc

			




        

    

    

    

        

            

                

                    doc/CMakeLists.txt
                

                

                  
                  
                  
                  Show white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -13,2 +13,8 @@


			




	13
	13
	
		

			




	
	14
	
		
CONFIGURE_FILE(


			




	
	15
	
		
  ${PROJECT_SOURCE_DIR}/doc/mainpage.dox.in


			




	
	16
	
		
  ${PROJECT_BINARY_DIR}/doc/mainpage.dox


			




	
	17
	
		
  @ONLY


			




	
	18
	
		
)


			




	
	19
	
		

			




	14
	20
	
		
IF(DOXYGEN_EXECUTABLE AND PYTHONINTERP_FOUND AND GHOSTSCRIPT_EXECUTABLE)

			




        

    

    

    

        

            

                

                    doc/Doxyfile.in
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	1
	
	
		
# Doxyfile 1.5.9


			




	
	1
	
		
# Doxyfile 1.7.3


			




	2
	2
	
		

			




	...
	...
	
		
@@ -6,4 +6,6 @@


			




	6
	6
	
		
DOXYFILE_ENCODING      = UTF-8


			




	7
	
	
		
PROJECT_NAME           = @PACKAGE_NAME@


			




	8
	
	
		
PROJECT_NUMBER         = @PACKAGE_VERSION@


			




	
	7
	
		
PROJECT_NAME           = 


			




	
	8
	
		
PROJECT_NUMBER         = 


			




	
	9
	
		
PROJECT_BRIEF          =


			




	
	10
	
		
PROJECT_LOGO           =


			




	9
	11
	
		
OUTPUT_DIRECTORY       = 


			




	...
	...
	
		
@@ -31,2 +33,3 @@


			




	31
	33
	
		
OPTIMIZE_OUTPUT_VHDL   = NO


			




	
	34
	
		
EXTENSION_MAPPING      =


			




	32
	35
	
		
BUILTIN_STL_SUPPORT    = YES


			




	...
	...
	
		
@@ -56,2 +59,3 @@


			




	56
	59
	
		
SHOW_INCLUDE_FILES     = YES


			




	
	60
	
		
FORCE_LOCAL_INCLUDES   = NO


			




	57
	61
	
		
INLINE_INFO            = YES


			




	...
	...
	
		
@@ -59,4 +63,6 @@


			




	59
	63
	
		
SORT_BRIEF_DOCS        = NO


			




	
	64
	
		
SORT_MEMBERS_CTORS_1ST = NO


			




	60
	65
	
		
SORT_GROUP_NAMES       = NO


			




	61
	66
	
		
SORT_BY_SCOPE_NAME     = NO


			




	
	67
	
		
STRICT_PROTO_MATCHING  = NO


			




	62
	68
	
		
GENERATE_TODOLIST      = YES


			




	...
	...
	
		
@@ -93,2 +99,3 @@


			




	93
	99
	
		
                         "@abs_top_srcdir@/test/test_tools.h" \


			




	
	100
	
		
                         "@abs_top_builddir@/doc/mainpage.dox" \


			




	94
	101
	
		
                         "@abs_top_builddir@/doc/references.dox"


			




	...
	...
	
		
@@ -113,2 +120,3 @@


			




	113
	120
	
		
FILTER_SOURCE_FILES    = NO


			




	
	121
	
		
FILTER_SOURCE_PATTERNS =


			




	114
	122
	
		
#---------------------------------------------------------------------------


			




	...
	...
	
		
@@ -139,4 +147,8 @@


			




	139
	147
	
		
HTML_STYLESHEET        = 


			




	
	148
	
		
HTML_COLORSTYLE_HUE    = 220


			




	
	149
	
		
HTML_COLORSTYLE_SAT    = 100


			




	
	150
	
		
HTML_COLORSTYLE_GAMMA  = 80


			




	
	151
	
		
HTML_TIMESTAMP         = YES


			




	140
	152
	
		
HTML_ALIGN_MEMBERS     = YES


			




	141
	
	
		
HTML_DYNAMIC_SECTIONS  = NO


			




	
	153
	
		
HTML_DYNAMIC_SECTIONS  = YES


			




	142
	154
	
		
GENERATE_DOCSET        = NO


			




	...
	...
	
		
@@ -144,2 +156,4 @@


			




	144
	156
	
		
DOCSET_BUNDLE_ID       = org.doxygen.Project


			




	
	157
	
		
DOCSET_PUBLISHER_ID    = org.doxygen.Publisher


			




	
	158
	
		
DOCSET_PUBLISHER_NAME  = Publisher


			




	145
	159
	
		
GENERATE_HTMLHELP      = NO


			




	...
	...
	
		
@@ -155,3 +169,8 @@


			




	155
	169
	
		
QHP_VIRTUAL_FOLDER     = doc


			




	
	170
	
		
QHP_CUST_FILTER_NAME   =


			




	
	171
	
		
QHP_CUST_FILTER_ATTRS  =


			




	
	172
	
		
QHP_SECT_FILTER_ATTRS  =


			




	156
	173
	
		
QHG_LOCATION           = 


			




	
	174
	
		
GENERATE_ECLIPSEHELP   = NO


			




	
	175
	
		
ECLIPSE_DOC_ID         = org.doxygen.Project


			




	157
	176
	
		
DISABLE_INDEX          = NO


			




	...
	...
	
		
@@ -159,4 +178,11 @@


			




	159
	178
	
		
GENERATE_TREEVIEW      = NO


			




	
	179
	
		
USE_INLINE_TREES       = NO


			




	160
	180
	
		
TREEVIEW_WIDTH         = 250


			




	
	181
	
		
EXT_LINKS_IN_WINDOW    = NO


			




	161
	182
	
		
FORMULA_FONTSIZE       = 10


			




	
	183
	
		
FORMULA_TRANSPARENT    = YES


			




	
	184
	
		
USE_MATHJAX            = NO


			




	
	185
	
		
MATHJAX_RELPATH        = http://www.mathjax.org/mathjax


			




	
	186
	
		
SEARCHENGINE           = YES


			




	
	187
	
		
SERVER_BASED_SEARCH    = NO


			




	162
	188
	
		
#---------------------------------------------------------------------------


			




	...
	...
	
		
@@ -177,2 +203,3 @@


			




	177
	203
	
		
LATEX_HIDE_INDICES     = NO


			




	
	204
	
		
LATEX_SOURCE_CODE      = NO


			




	178
	205
	
		
#---------------------------------------------------------------------------


			




	...
	...
	
		
@@ -225,3 +252,3 @@


			




	225
	252
	
		
#---------------------------------------------------------------------------


			




	226
	
	
		
# Options related to the search engine   


			




	
	253
	
		
# Configuration::additions related to external references


			




	227
	254
	
		
#---------------------------------------------------------------------------


			




	...
	...
	
		
@@ -239,2 +266,3 @@


			




	239
	266
	
		
HAVE_DOT               = YES


			




	
	267
	
		
DOT_NUM_THREADS        = 0


			




	240
	268
	
		
DOT_FONTNAME           = FreeSans


			




	...
	...
	
		
@@ -256,2 +284,3 @@


			




	256
	284
	
		
DOTFILE_DIRS           = 


			




	
	285
	
		
MSCFILE_DIRS           =


			




	257
	286
	
		
DOT_GRAPH_MAX_NODES    = 50


			




	...
	...
	
		
@@ -262,5 +291,1 @@


			




	262
	291
	
		
DOT_CLEANUP            = YES


			




	263
	
	
		
#---------------------------------------------------------------------------


			




	264
	
	
		
# Configuration::additions related to the search engine   


			




	265
	
	
		
#---------------------------------------------------------------------------


			




	266
	
	
		
SEARCHENGINE           = NO

			




        

    

    

    

        

            

                

                    doc/DoxygenLayout.xml
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -4,20 +4,20 @@


			




	4
	4
	
		
    <tab type="mainpage" visible="yes" title=""/>


			




	5
	
	
		
    <tab type="modules" visible="yes" title=""/>


			




	
	5
	
		
    <tab type="modules" visible="yes" title="" intro=""/>


			




	6
	6
	
		
    <tab type="classes" visible="yes" title="">


			




	7
	
	
		
      <tab type="classes" visible="yes" title=""/>


			




	8
	
	
		
      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/> 


			




	9
	
	
		
      <tab type="hierarchy" visible="yes" title=""/>


			




	10
	
	
		
      <tab type="classmembers" visible="yes" title=""/>


			




	
	7
	
		
      <tab type="classes" visible="yes" title="" intro=""/>


			




	
	8
	
		
      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>


			




	
	9
	
		
      <tab type="hierarchy" visible="yes" title="" intro=""/>


			




	
	10
	
		
      <tab type="classmembers" visible="yes" title="" intro=""/>


			




	11
	11
	
		
    </tab>


			




	12
	12
	
		
    <tab type="namespaces" visible="yes" title="">


			




	13
	
	
		
      <tab type="namespaces" visible="yes" title=""/>


			




	14
	
	
		
      <tab type="namespacemembers" visible="yes" title=""/>


			




	
	13
	
		
      <tab type="namespaces" visible="yes" title="" intro=""/>


			




	
	14
	
		
      <tab type="namespacemembers" visible="yes" title="" intro=""/>


			




	15
	15
	
		
    </tab>


			




	16
	16
	
		
    <tab type="files" visible="yes" title="">


			




	17
	
	
		
      <tab type="files" visible="yes" title=""/>


			




	18
	
	
		
      <tab type="globals" visible="yes" title=""/>


			




	
	17
	
		
      <tab type="files" visible="yes" title="" intro=""/>


			




	
	18
	
		
      <tab type="globals" visible="yes" title="" intro=""/>


			




	19
	19
	
		
    </tab>


			




	20
	
	
		
    <tab type="dirs" visible="yes" title=""/>


			




	21
	
	
		
    <tab type="examples" visible="yes" title=""/>  


			




	22
	
	
		
    <tab type="pages" visible="yes" title=""/>


			




	
	20
	
		
    <tab type="dirs" visible="yes" title="" intro=""/>


			




	
	21
	
		
    <tab type="examples" visible="yes" title="" intro=""/>


			




	
	22
	
		
    <tab type="pages" visible="yes" title="" intro=""/>


			




	23
	23
	
		
  </navindex>

			




        

    

    

    

        

            

                

                    doc/mainpage.dox.in
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -19,3 +19,3 @@


			




	19
	19
	
		
/**


			




	20
	
	
		
\mainpage LEMON Documentation


			




	
	20
	
		
\mainpage @PACKAGE_NAME@ @PACKAGE_VERSION@ Documentation


			




	21
	21
	
		

			




        

    






    
    



    


    

     
    
0 comments (0 inline)