diff --git a/Doxyfile.procs b/Doxyfile.procs index 8ae7cb50..aba3917f 100644 --- a/Doxyfile.procs +++ b/Doxyfile.procs @@ -38,7 +38,7 @@ PROJECT_NAME = "MiniGUI API Reference (MiniGUI-Processes)" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = v3.2.0 +PROJECT_NUMBER = v4.0.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a @@ -58,7 +58,7 @@ PROJECT_LOGO = # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = doc +OUTPUT_DIRECTORY = doc-api-ref-minigui-procs-4.0.0 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and @@ -782,6 +782,7 @@ WARN_LOGFILE = # Note: If this tag is empty the current directory is searched. INPUT = ./include +INPUT += README.md # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses @@ -939,7 +940,7 @@ FILTER_SOURCE_PATTERNS = # (index.html). This can be useful if you have a project on for instance GitHub # and want to reuse the introduction page also for the doxygen output. -USE_MDFILE_AS_MAINPAGE = +USE_MDFILE_AS_MAINPAGE = README.md #--------------------------------------------------------------------------- # Configuration options related to source browsing @@ -1288,7 +1289,7 @@ GENERATE_HTMLHELP = NO # written to the html output directory. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. -CHM_FILE = +CHM_FILE = # The HHC_LOCATION tag can be used to specify the location (absolute path # including file name) of the HTML help compiler (hhc.exe). If non-empty, @@ -2073,6 +2074,7 @@ PREDEFINED = _MGRM_PROCESSES \ _MGMISC_SAVEBITMAP \ _MGHAVE_CURSOR \ _MGCHARSET_UNICODE \ + _MGCOMPLEX_SCRIPTS \ _MGCTRL_STATIC \ _MGCTRL_SLEDIT \ _MGCTRL_BIDISLEDIT \ diff --git a/Doxyfile.sa b/Doxyfile.sal similarity index 99% rename from Doxyfile.sa rename to Doxyfile.sal index b5978448..3a11e97b 100644 --- a/Doxyfile.sa +++ b/Doxyfile.sal @@ -58,7 +58,7 @@ PROJECT_LOGO = # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = doc +OUTPUT_DIRECTORY = doc-api-ref-minigui-sa-4.0.0 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and @@ -782,6 +782,7 @@ WARN_LOGFILE = # Note: If this tag is empty the current directory is searched. INPUT = ./include +INPUT += README.md # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses @@ -939,7 +940,7 @@ FILTER_SOURCE_PATTERNS = # (index.html). This can be useful if you have a project on for instance GitHub # and want to reuse the introduction page also for the doxygen output. -USE_MDFILE_AS_MAINPAGE = +USE_MDFILE_AS_MAINPAGE = README.md #--------------------------------------------------------------------------- # Configuration options related to source browsing @@ -1288,7 +1289,7 @@ GENERATE_HTMLHELP = NO # written to the html output directory. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. -CHM_FILE = +CHM_FILE = # The HHC_LOCATION tag can be used to specify the location (absolute path # including file name) of the HTML help compiler (hhc.exe). If non-empty, @@ -2073,6 +2074,7 @@ PREDEFINED = _MGRM_STANDALONE \ _MGMISC_SAVEBITMAP \ _MGHAVE_CURSOR \ _MGCHARSET_UNICODE \ + _MGCOMPLEX_SCRIPTS \ _MGCTRL_STATIC \ _MGCTRL_SLEDIT \ _MGCTRL_BIDISLEDIT \ diff --git a/Doxyfile.ths b/Doxyfile.ths index 91fa16b0..9ab58204 100644 --- a/Doxyfile.ths +++ b/Doxyfile.ths @@ -58,7 +58,7 @@ PROJECT_LOGO = # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = doc +OUTPUT_DIRECTORY = doc-api-ref-minigui-ths-4.0.0 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and @@ -783,7 +783,6 @@ WARN_LOGFILE = INPUT = ./include INPUT += README.md -INPUT += RELEASENOTES.md # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/Makefile.am b/Makefile.am index 14a89263..0b22da46 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,10 @@ SUBDIRS = src 3rd-party include rtos etc m4 cmake build -EXTRA_DIST = \ - minigui.pc.in \ +EXTRA_DIST = minigui.pc.in \ GNUmakefile makefile.ng makefile.msvc rules.make \ Version INSTALL LICENSE \ README.md RELEASE-NOTES.md \ - LICENSE-POLICY-en.md LICENSE-POLICY-zh.md + LICENSE-POLICY-en.md LICENSE-POLICY-zh.md # The directory where the include files will be installed libminiguiincludedir = $(includedir)/minigui @@ -13,15 +12,17 @@ libminiguiincludedir = $(includedir)/minigui # Which header files to install libminiguiinclude_HEADERS = mgconfig.h -docs: - doxygen Doxyfile.procs Doxyfile.ths Doxyfile.sa - -dist-nolicense: dist - ./clean_license.sh $(DIST_ARCHIVES) - -dist: -distcheck-nolicense:dist-nolicense distcheck - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = minigui.pc +docs: + doxygen Doxyfile.procs + doxygen Doxyfile.ths + doxygen Doxyfile.sal + +#dist-nolicense: dist +# ./clean_license.sh $(DIST_ARCHIVES) +# +#dist: +#distcheck-nolicense:dist-nolicense distcheck + diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 9f09c285..9ef83837 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -273,6 +273,9 @@ Note that this implementation is derived from LGPL'd glib. One should get the font metrics information by calling `GetFontMetrics` function if you want to get the height and descent data of one font. +* The the basic glyph type and break type have been removed from GLYPHINFO +structure. + * More fields added for GLYPHBITMAP structure in order to return the completed rasterized glyph bitmap information. @@ -280,10 +283,6 @@ rasterized glyph bitmap information. has this bit set, any pixel which is equal to `bmColorKey` will be replaced by `bmColorRep`. -* `GetGlyphInfo` now can return the basic glyph type and break type of a -UNICODE character. If the glyph is an ASCII character, the old `MCHAR_TYPE` -can also be returned. - * Rename `mg_FT_LcdFilter` to `FT2LCDFilter` in order to follow MiniGUI naming rules. diff --git a/src/font/Makefile.am b/src/font/Makefile.am index 41442fef..6be13657 100644 --- a/src/font/Makefile.am +++ b/src/font/Makefile.am @@ -30,8 +30,8 @@ HDR_FILES = charset.h rawbitmap.h varbitmap.h freetype2.h qpf.h se_minigui.h \ unicode-joining-type-table.inc \ unicode-arabic-shaping-table.inc \ unicode-arabic-misc-table.inc \ - unicode-bidi-bidi-types-list.inc \ - unicode-bidi-bidi-type-table.inc \ + unicode-bidi-types-list.inc \ + unicode-bidi-type-table.inc \ unicode-bidi-brackets-table.inc \ unicode-bidi-brackets-type-table.inc \ unicode-bidi-mirroring-table.inc \