diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-13 09:55:16 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-13 09:55:16 +0100 |
| commit | 88bcd02cfecbf8ba9cf726b0d337c56f9c9b2bc4 (patch) | |
| tree | ded42639873b943c7ec97b06961ad067228652d1 /freetype/src/tools | |
| parent | 3247a4e031a7d5160332c0d7ca2a91a516c082bb (diff) | |
| parent | aaf21968deb85b635cb6aa6544df233ea5981346 (diff) | |
| download | vcxsrv-88bcd02cfecbf8ba9cf726b0d337c56f9c9b2bc4.tar.gz vcxsrv-88bcd02cfecbf8ba9cf726b0d337c56f9c9b2bc4.tar.bz2 vcxsrv-88bcd02cfecbf8ba9cf726b0d337c56f9c9b2bc4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Update to following packages:
Conflicts:
freetype/src/autofit/afhints.c
freetype/src/autofit/afmodule.c
freetype/src/psaux/psconv.c
freetype/src/sfnt/sfntpic.h
openssl/Makefile
openssl/util/pl/VC-32.pl
Diffstat (limited to 'freetype/src/tools')
| -rw-r--r-- | freetype/src/tools/docmaker/content.py | 4 | ||||
| -rw-r--r-- | freetype/src/tools/docmaker/sources.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/freetype/src/tools/docmaker/content.py b/freetype/src/tools/docmaker/content.py index b398955b8..26087f7b8 100644 --- a/freetype/src/tools/docmaker/content.py +++ b/freetype/src/tools/docmaker/content.py @@ -1,4 +1,4 @@ -# Content (c) 2002, 2004, 2006, 2007, 2008, 2009 +# Content (c) 2002, 2004, 2006-2009, 2012 # David Turner <david@freetype.org> # # This file contains routines used to parse the content of documentation @@ -32,7 +32,7 @@ re_code_end = re.compile( r"(\s*)}\s*$" ) # this regular expression is used to isolate identifiers from # other text # -re_identifier = re.compile( r'(\w*)' ) +re_identifier = re.compile( r'((?:\w|-)*)' ) # we collect macros ending in `_H'; while outputting the object data, we use diff --git a/freetype/src/tools/docmaker/sources.py b/freetype/src/tools/docmaker/sources.py index 7b68c0701..490ba2506 100644 --- a/freetype/src/tools/docmaker/sources.py +++ b/freetype/src/tools/docmaker/sources.py @@ -1,4 +1,4 @@ -# Sources (c) 2002, 2003, 2004, 2006, 2007, 2008, 2009 +# Sources (c) 2002-2004, 2006-2009, 2012 # David Turner <david@freetype.org> # # @@ -120,8 +120,8 @@ re_source_block_formats = [re_source_block_format1, re_source_block_format2] # # notice how each markup tag _must_ begin a new line # -re_markup_tag1 = re.compile( r'''\s*<(\w*)>''' ) # <xxxx> format -re_markup_tag2 = re.compile( r'''\s*@(\w*):''' ) # @xxxx: format +re_markup_tag1 = re.compile( r'''\s*<((?:\w|-)*)>''' ) # <xxxx> format +re_markup_tag2 = re.compile( r'''\s*@((?:\w|-)*):''' ) # @xxxx: format # # the list of supported markup tags, we could add new ones relatively @@ -132,7 +132,7 @@ re_markup_tags = [re_markup_tag1, re_markup_tag2] # # used to detect a cross-reference, after markup tags have been stripped # -re_crossref = re.compile( r'@(\w*)(.*)' ) +re_crossref = re.compile( r'@((?:\w|-)*)(.*)' ) # # used to detect italic and bold styles in paragraph text |