Skip to content

Commit 8c2abc9

Browse files
mobius3mobius3
committed
Merge branch 'release/1.0.1'
2 parents 132191d + cfbe899 commit 8c2abc9

File tree

8 files changed

+569
-20
lines changed

8 files changed

+569
-20
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.0)
22
cmake_policy(SET CMP0063 NEW)
3-
project(font-chef LANGUAGES C CXX VERSION 1.0.0)
3+
project(font-chef LANGUAGES C CXX VERSION 1.0.1)
44
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake-modules)
55

66
set(CMAKE_C_STANDARD 99)

‎doc/CMakeLists.txt‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,33 @@ endif()
77

88
file(GLOB_RECURSE FONT_CHEF_PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/font-chef/*.h ${CMAKE_CURRENT_SOURCE_DIR}/../include/font-chef/*.hpp)
99

10-
1110
if(DOXYGEN_FOUND)
1211
set(DOXYGEN_TARGET_INDEX_HTML ${CMAKE_CURRENT_BINARY_DIR}/html/index.html)
1312
set(CSS_INPUT ${CMAKE_CURRENT_SOURCE_DIR}/doxygen-extra.css)
1413
set(CSS_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/doxygen-extra.css)
14+
set(MANUAL_DOX_INPUT ${CMAKE_CURRENT_SOURCE_DIR}/manual.dox)
15+
set(MANUAL_DOX_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/manual.dox)
16+
set(DOXYGENLAYOUT_INPUT ${CMAKE_CURRENT_SOURCE_DIR}/DoxygenLayout.xml)
17+
set(DOXYGENLAYOUT_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/DoxygenLayout.xml)
1518

1619
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
1720
add_custom_command(OUTPUT
1821
${CSS_OUTPUT}
1922
COMMAND ${CMAKE_COMMAND} -E copy ${CSS_INPUT} ${CSS_OUTPUT}
2023
DEPENDS ${CSS_INPUT}
2124
)
25+
add_custom_command(OUTPUT
26+
${MANUAL_DOX_OUTPUT}
27+
COMMAND ${CMAKE_COMMAND} -E copy ${MANUAL_DOX_INPUT} ${MANUAL_DOX_OUTPUT}
28+
DEPENDS ${MANUAL_DOX_INPUT}
29+
)
30+
add_custom_command(OUTPUT
31+
${DOXYGENLAYOUT_OUTPUT}
32+
COMMAND ${CMAKE_COMMAND} -E copy ${DOXYGENLAYOUT_INPUT} ${DOXYGENLAYOUT_OUTPUT}
33+
DEPENDS ${DOXYGENLAYOUT_INPUT}
34+
)
2235
add_custom_command(OUTPUT ${DOXYGEN_TARGET_INDEX_HTML}
23-
DEPENDS ${FONT_CHEF_PUBLIC_HEADERS} ${CSS_OUTPUT}
36+
DEPENDS ${FONT_CHEF_PUBLIC_HEADERS} ${CSS_OUTPUT} ${MANUAL_DOX_OUTPUT} ${DOXYGENLAYOUT_OUTPUT}
2437
MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
2538
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
2639
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile

‎doc/Doxyfile.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ WARN_LOGFILE =
829829
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
830830
# Note: If this tag is empty the current directory is searched.
831831

832-
INPUT = @CMAKE_CURRENT_SOURCE_DIR@/../include/font-chef
832+
INPUT = manual.dox @CMAKE_CURRENT_SOURCE_DIR@/../include/font-chef
833833

834834
# This tag can be used to specify the character encoding of the source files
835835
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -946,21 +946,21 @@ EXCLUDE_SYMBOLS =
946946
# that contain example code fragments that are included (see the \include
947947
# command).
948948

949-
EXAMPLE_PATH =
949+
EXAMPLE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/../src/examples
950950

951951
# If the value of the EXAMPLE_PATH tag contains directories, you can use the
952952
# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
953953
# *.h) to filter out the source-files in the directories. If left blank all
954954
# files are included.
955955

956-
EXAMPLE_PATTERNS = *
956+
EXAMPLE_PATTERNS = *c *.cpp
957957

958958
# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
959959
# searched for input files to be used with the \include or \dontinclude commands
960960
# irrespective of the value of the RECURSIVE tag.
961961
# The default value is: NO.
962962

963-
EXAMPLE_RECURSIVE = NO
963+
EXAMPLE_RECURSIVE = YES
964964

965965
# The IMAGE_PATH tag can be used to specify one or more files or directories
966966
# that contain images that are to be included in the documentation (see the

‎doc/DoxygenLayout.xml‎

Lines changed: 227 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,227 @@
1+
<doxygenlayout version="1.0">
2+
<!-- Generated by doxygen 1.8.17 -->
3+
<!-- Navigation index tabs for HTML output -->
4+
<navindex>
5+
<tab type="mainpage" visible="yes" title=""/>
6+
<tab type="pages" visible="no" title="" intro=""/>
7+
<tab type="user" url="@ref manual" visible="yes" title="Manual" intro=""/>
8+
<tab type="modules" visible="yes" title="" intro=""/>
9+
<tab type="namespaces" visible="yes" title="">
10+
<tab type="namespacelist" visible="yes" title="" intro=""/>
11+
<tab type="namespacemembers" visible="yes" title="" intro=""/>
12+
</tab>
13+
<tab type="interfaces" visible="yes" title="">
14+
<tab type="interfacelist" visible="yes" title="" intro=""/>
15+
<tab type="interfaceindex" visible="$ALPHABETICAL_INDEX" title=""/>
16+
<tab type="interfacehierarchy" visible="yes" title="" intro=""/>
17+
</tab>
18+
<tab type="classes" visible="yes" title="">
19+
<tab type="classlist" visible="yes" title="" intro=""/>
20+
<tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
21+
<tab type="hierarchy" visible="yes" title="" intro=""/>
22+
<tab type="classmembers" visible="yes" title="" intro=""/>
23+
</tab>
24+
<tab type="structs" visible="yes" title="">
25+
<tab type="structlist" visible="yes" title="" intro=""/>
26+
<tab type="structindex" visible="$ALPHABETICAL_INDEX" title=""/>
27+
</tab>
28+
<tab type="exceptions" visible="yes" title="">
29+
<tab type="exceptionlist" visible="yes" title="" intro=""/>
30+
<tab type="exceptionindex" visible="$ALPHABETICAL_INDEX" title=""/>
31+
<tab type="exceptionhierarchy" visible="yes" title="" intro=""/>
32+
</tab>
33+
<tab type="files" visible="yes" title="">
34+
<tab type="filelist" visible="yes" title="" intro=""/>
35+
<tab type="globals" visible="yes" title="" intro=""/>
36+
</tab>
37+
<tab type="examples" visible="yes" title="" intro=""/>
38+
</navindex>
39+
40+
<!-- Layout definition for a class page -->
41+
<class>
42+
<briefdescription visible="yes"/>
43+
<includes visible="$SHOW_INCLUDE_FILES"/>
44+
<inheritancegraph visible="$CLASS_GRAPH"/>
45+
<collaborationgraph visible="$COLLABORATION_GRAPH"/>
46+
<memberdecl>
47+
<nestedclasses visible="yes" title=""/>
48+
<publictypes title=""/>
49+
<services title=""/>
50+
<interfaces title=""/>
51+
<publicslots title=""/>
52+
<signals title=""/>
53+
<publicmethods title=""/>
54+
<publicstaticmethods title=""/>
55+
<publicattributes title=""/>
56+
<publicstaticattributes title=""/>
57+
<protectedtypes title=""/>
58+
<protectedslots title=""/>
59+
<protectedmethods title=""/>
60+
<protectedstaticmethods title=""/>
61+
<protectedattributes title=""/>
62+
<protectedstaticattributes title=""/>
63+
<packagetypes title=""/>
64+
<packagemethods title=""/>
65+
<packagestaticmethods title=""/>
66+
<packageattributes title=""/>
67+
<packagestaticattributes title=""/>
68+
<properties title=""/>
69+
<events title=""/>
70+
<privatetypes title=""/>
71+
<privateslots title=""/>
72+
<privatemethods title=""/>
73+
<privatestaticmethods title=""/>
74+
<privateattributes title=""/>
75+
<privatestaticattributes title=""/>
76+
<friends title=""/>
77+
<related title="" subtitle=""/>
78+
<membergroups visible="yes"/>
79+
</memberdecl>
80+
<detaileddescription title=""/>
81+
<memberdef>
82+
<inlineclasses title=""/>
83+
<typedefs title=""/>
84+
<enums title=""/>
85+
<services title=""/>
86+
<interfaces title=""/>
87+
<constructors title=""/>
88+
<functions title=""/>
89+
<related title=""/>
90+
<variables title=""/>
91+
<properties title=""/>
92+
<events title=""/>
93+
</memberdef>
94+
<allmemberslink visible="yes"/>
95+
<usedfiles visible="$SHOW_USED_FILES"/>
96+
<authorsection visible="yes"/>
97+
</class>
98+
99+
<!-- Layout definition for a namespace page -->
100+
<namespace>
101+
<briefdescription visible="yes"/>
102+
<memberdecl>
103+
<nestednamespaces visible="yes" title=""/>
104+
<constantgroups visible="yes" title=""/>
105+
<interfaces visible="yes" title=""/>
106+
<classes visible="yes" title=""/>
107+
<structs visible="yes" title=""/>
108+
<exceptions visible="yes" title=""/>
109+
<typedefs title=""/>
110+
<sequences title=""/>
111+
<dictionaries title=""/>
112+
<enums title=""/>
113+
<functions title=""/>
114+
<variables title=""/>
115+
<membergroups visible="yes"/>
116+
</memberdecl>
117+
<detaileddescription title=""/>
118+
<memberdef>
119+
<inlineclasses title=""/>
120+
<typedefs title=""/>
121+
<sequences title=""/>
122+
<dictionaries title=""/>
123+
<enums title=""/>
124+
<functions title=""/>
125+
<variables title=""/>
126+
</memberdef>
127+
<authorsection visible="yes"/>
128+
</namespace>
129+
130+
<!-- Layout definition for a file page -->
131+
<file>
132+
<briefdescription visible="yes"/>
133+
<includes visible="$SHOW_INCLUDE_FILES"/>
134+
<includegraph visible="$INCLUDE_GRAPH"/>
135+
<includedbygraph visible="$INCLUDED_BY_GRAPH"/>
136+
<sourcelink visible="yes"/>
137+
<memberdecl>
138+
<interfaces visible="yes" title=""/>
139+
<classes visible="yes" title=""/>
140+
<structs visible="yes" title=""/>
141+
<exceptions visible="yes" title=""/>
142+
<namespaces visible="yes" title=""/>
143+
<constantgroups visible="yes" title=""/>
144+
<defines title=""/>
145+
<typedefs title=""/>
146+
<sequences title=""/>
147+
<dictionaries title=""/>
148+
<enums title=""/>
149+
<functions title=""/>
150+
<variables title=""/>
151+
<membergroups visible="yes"/>
152+
</memberdecl>
153+
<detaileddescription title=""/>
154+
<memberdef>
155+
<inlineclasses title=""/>
156+
<defines title=""/>
157+
<typedefs title=""/>
158+
<sequences title=""/>
159+
<dictionaries title=""/>
160+
<enums title=""/>
161+
<functions title=""/>
162+
<variables title=""/>
163+
</memberdef>
164+
<authorsection/>
165+
</file>
166+
167+
<!-- Layout definition for a group page -->
168+
<group>
169+
<briefdescription visible="yes"/>
170+
<groupgraph visible="$GROUP_GRAPHS"/>
171+
<memberdecl>
172+
<nestedgroups visible="yes" title=""/>
173+
<dirs visible="yes" title=""/>
174+
<files visible="yes" title=""/>
175+
<namespaces visible="yes" title=""/>
176+
<classes visible="yes" title=""/>
177+
<defines title=""/>
178+
<typedefs title=""/>
179+
<sequences title=""/>
180+
<dictionaries title=""/>
181+
<enums title=""/>
182+
<enumvalues title=""/>
183+
<functions title=""/>
184+
<variables title=""/>
185+
<signals title=""/>
186+
<publicslots title=""/>
187+
<protectedslots title=""/>
188+
<privateslots title=""/>
189+
<events title=""/>
190+
<properties title=""/>
191+
<friends title=""/>
192+
<membergroups visible="yes"/>
193+
</memberdecl>
194+
<detaileddescription title=""/>
195+
<memberdef>
196+
<pagedocs/>
197+
<inlineclasses title=""/>
198+
<defines title=""/>
199+
<typedefs title=""/>
200+
<sequences title=""/>
201+
<dictionaries title=""/>
202+
<enums title=""/>
203+
<enumvalues title=""/>
204+
<functions title=""/>
205+
<variables title=""/>
206+
<signals title=""/>
207+
<publicslots title=""/>
208+
<protectedslots title=""/>
209+
<privateslots title=""/>
210+
<events title=""/>
211+
<properties title=""/>
212+
<friends title=""/>
213+
</memberdef>
214+
<authorsection visible="yes"/>
215+
</group>
216+
217+
<!-- Layout definition for a directory page -->
218+
<directory>
219+
<briefdescription visible="yes"/>
220+
<directorygraph visible="yes"/>
221+
<memberdecl>
222+
<dirs visible="yes"/>
223+
<files visible="yes"/>
224+
</memberdecl>
225+
<detaileddescription title=""/>
226+
</directory>
227+
</doxygenlayout>

0 commit comments

Comments
 (0)