diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:13 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:13 +0000 |
| commit | dfea6bec2d256b103fa2ff235d1f4c5d847575e7 (patch) | |
| tree | 9df15e877668cec46332769264740ab2b5b24f3e | |
| parent | f89c45a5bfa0c138a62df688ebd36b8e24e32793 (diff) | |
| download | xorg-lib-libXfont-dfea6bec2d256b103fa2ff235d1f4c5d847575e7.tar.gz | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEXORG-RELEASE-1-TMIPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
153 files changed, 198 insertions, 178 deletions
diff --git a/include/X11/fonts/bdfint.h b/include/X11/fonts/bdfint.h index c389bfb..d41c4a5 100644 --- a/include/X11/fonts/bdfint.h +++ b/include/X11/fonts/bdfint.h @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bdfint.h,v 1.5 2001/12/14 19:56:45 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bdfint.h,v 1.4 2001/01/17 19:43:26 dawes Exp $ */ #ifndef BDFINT_H #define BDFINT_H diff --git a/include/X11/fonts/bitmap.h b/include/X11/fonts/bitmap.h index 29989e3..b5df964 100644 --- a/include/X11/fonts/bitmap.h +++ b/include/X11/fonts/bitmap.h @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/bitmap.h,v 1.10 2001/12/14 19:56:53 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/bitmap.h,v 1.9 2001/01/17 19:43:31 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/include/X11/fonts/bufio.h b/include/X11/fonts/bufio.h index 402685f..da90064 100644 --- a/include/X11/fonts/bufio.h +++ b/include/X11/fonts/bufio.h @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/bufio.h,v 1.7 2001/12/14 19:56:53 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/bufio.h,v 1.6 2001/07/31 16:44:55 alanh Exp $ */ #ifndef ___BUFIO_H___ #define ___BUFIO_H___ 1 diff --git a/include/X11/fonts/fntfil.h b/include/X11/fonts/fntfil.h index a8d9780..80ec872 100644 --- a/include/X11/fonts/fntfil.h +++ b/include/X11/fonts/fntfil.h @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/fntfil.h,v 1.10 2002/12/09 17:30:00 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fntfil.h,v 1.9 2001/12/14 19:56:54 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/include/X11/fonts/fntfilio.h b/include/X11/fonts/fntfilio.h index 1044da0..30a95c5 100644 --- a/include/X11/fonts/fntfilio.h +++ b/include/X11/fonts/fntfilio.h @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/fntfilio.h,v 1.7 2001/12/14 19:56:54 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fntfilio.h,v 1.6 2001/10/31 22:50:26 tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/include/X11/fonts/fntfilst.h b/include/X11/fonts/fntfilst.h index 8be46f2..c037267 100644 --- a/include/X11/fonts/fntfilst.h +++ b/include/X11/fonts/fntfilst.h @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/fntfilst.h,v 3.9 2002/12/10 22:23:52 tsi Exp $ */ +/* $XFree86: xc/lib/font/include/fntfilst.h,v 3.8 2002/12/09 17:30:00 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/include/X11/fonts/fontencc.h b/include/X11/fonts/fontencc.h index 8ed1d33..51e0e14 100644 --- a/include/X11/fonts/fontencc.h +++ b/include/X11/fonts/fontencc.h @@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/include/fontencc.h,v 1.1 2001/08/16 14:33:47 dawes Exp $ */ +/* $XFree86$ */ /* Binary compatibility entry points. */ diff --git a/include/X11/fonts/fontmisc.h b/include/X11/fonts/fontmisc.h index e6f2540..b7e3590 100644 --- a/include/X11/fonts/fontmisc.h +++ b/include/X11/fonts/fontmisc.h @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/fontmisc.h,v 3.17 2003/09/13 21:33:02 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fontmisc.h,v 3.16 2001/12/14 19:56:54 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/include/X11/fonts/fontmod.h b/include/X11/fonts/fontmod.h index 64bf757..42d277f 100644 --- a/include/X11/fonts/fontmod.h +++ b/include/X11/fonts/fontmod.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/include/fontmod.h,v 1.3 1998/12/13 05:32:33 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fontmod.h,v 1.2 1998/07/25 06:57:09 dawes Exp $ */ #ifndef _FONTMOD_H_ #define _FONTMOD_H_ diff --git a/include/X11/fonts/fontutil.h b/include/X11/fonts/fontutil.h index 7d3cfe9..daa8815 100644 --- a/include/X11/fonts/fontutil.h +++ b/include/X11/fonts/fontutil.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/include/fontutil.h,v 1.2 1999/08/21 13:48:06 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fontutil.h,v 1.1 1999/03/14 11:17:49 dawes Exp $ */ #ifndef _FONTUTIL_H_ #define _FONTUTIL_H_ diff --git a/include/X11/fonts/fontxlfd.h b/include/X11/fonts/fontxlfd.h index 49769bc..e9a12d2 100644 --- a/include/X11/fonts/fontxlfd.h +++ b/include/X11/fonts/fontxlfd.h @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/fontxlfd.h,v 1.6 2001/12/14 19:56:55 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fontxlfd.h,v 1.5 2001/01/17 19:43:32 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/include/X11/fonts/pcf.h b/include/X11/fonts/pcf.h index c627bf8..33b0cef 100644 --- a/include/X11/fonts/pcf.h +++ b/include/X11/fonts/pcf.h @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.5 2003/11/18 01:17:04 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.4 2001/12/14 19:56:47 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/FreeType/ft.h b/src/FreeType/ft.h index b597457..91c8d42 100644 --- a/src/FreeType/ft.h +++ b/src/FreeType/ft.h @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/FreeType/ft.h,v 1.23 2003/10/19 18:53:49 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/ft.h,v 1.22 2003/06/08 15:41:13 herrb Exp $ */ #ifndef _FT_H_ #define _FT_H_ diff --git a/src/FreeType/ftenc.c b/src/FreeType/ftenc.c index a3b02b9..d45dc32 100644 --- a/src/FreeType/ftenc.c +++ b/src/FreeType/ftenc.c @@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/FreeType/ftenc.c,v 1.25 2003/11/20 22:36:34 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/ftenc.c,v 1.24 2003/10/19 18:53:49 dawes Exp $ */ #ifndef FONTMODULE #include <string.h> diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c index 143fef0..dc58b2c 100644 --- a/src/FreeType/ftfuncs.c +++ b/src/FreeType/ftfuncs.c @@ -1328,7 +1328,7 @@ FreeTypeUnloadXFont(FontPtr pFont) static int FreeTypeAddProperties(FTFontPtr font, FontScalablePtr vals, FontInfoPtr info, - char *fontname, int rawAverageWidth) + char *fontname, int rawAverageWidth, Bool font_properties) { int i, j, maxprops; char *sp, *ep, val[MAXFONTNAMELEN], *vp; @@ -1377,9 +1377,11 @@ FreeTypeAddProperties(FTFontPtr font, FontScalablePtr vals, FontInfoPtr info, maxprops= 1 + /* NAME */ (xlfdProps ? 14 : 0) + /* from XLFD */ - 8 + - (os2 ? 6 : 0) + - (post || t1info? 3 : 0) + + 5 + + ( !face->bitmap ? 3 : 0 ) + /* raw_av,raw_asc,raw_dec */ + ( font_properties ? 2 : 0 ) + /* asc,dec */ + ( (font_properties && os2) ? 6 : 0 ) + + ( (font_properties && (post || t1info)) ? 3 : 0 ) + 2; /* type */ info->props = (FontPropPtr)xalloc(maxprops * sizeof(FontPropRec)); @@ -1445,29 +1447,41 @@ FreeTypeAddProperties(FTFontPtr font, FontScalablePtr vals, FontInfoPtr info, } } + info->props[i].name = MakeAtom("RAW_PIXEL_SIZE", 14, TRUE); + info->props[i].value = 1000; + i++; + + info->props[i].name = MakeAtom("RAW_POINT_SIZE", 14, TRUE); + info->props[i].value = (long)(72270.0 / (double)vals->y + .5); + i++; + if(!face->bitmap) { info->props[i].name = MakeAtom("RAW_AVERAGE_WIDTH", 17, TRUE); info->props[i].value = rawAverageWidth; i++; } - info->props[i].name = MakeAtom("FONT_ASCENT", 11, TRUE); - info->props[i].value = info->fontAscent; - i++; + if ( font_properties ) { + info->props[i].name = MakeAtom("FONT_ASCENT", 11, TRUE); + info->props[i].value = info->fontAscent; + i++; + } if(!face->bitmap) { - info->props[i].name = MakeAtom("RAW_ASCENT", 15, TRUE); + info->props[i].name = MakeAtom("RAW_ASCENT", 10, TRUE); info->props[i].value = ((double)face->face->ascender/(double)upm*1000.0); i++; } - info->props[i].name = MakeAtom("FONT_DESCENT", 12, TRUE); - info->props[i].value = info->fontDescent; - i++; + if ( font_properties ) { + info->props[i].name = MakeAtom("FONT_DESCENT", 12, TRUE); + info->props[i].value = info->fontDescent; + i++; + } if(!face->bitmap) { - info->props[i].name = MakeAtom("RAW_DESCENT", 16, TRUE); + info->props[i].name = MakeAtom("RAW_DESCENT", 11, TRUE); info->props[i].value = -((double)face->face->descender/(double)upm*1000.0); i++; @@ -1542,7 +1556,7 @@ FreeTypeAddProperties(FTFontPtr font, FontScalablePtr vals, FontInfoPtr info, /* In what follows, we assume the matrix is diagonal. In the rare case when it is not, the values will be somewhat wrong. */ - if(os2) { + if( font_properties && os2 ) { info->props[i].name = MakeAtom("SUBSCRIPT_SIZE",14,TRUE); info->props[i].value = TRANSFORM_FUNITS_Y(os2->ySubscriptYSize); @@ -1569,7 +1583,7 @@ FreeTypeAddProperties(FTFontPtr font, FontScalablePtr vals, FontInfoPtr info, i++; } - if(post || t1info) { + if( font_properties && (post || t1info) ) { int underlinePosition, underlineThickness; /* Raw underlineposition counts upwards, @@ -1910,8 +1924,8 @@ restrict_code_range_by_str(int count,unsigned short *refFirstCol, static int FreeTypeSetUpTTCap( char *fileName, FontScalablePtr vals, char **dynStrRealFileName, char **dynStrFTFileName, - struct TTCapInfo *ret, int *face_number, - FT_Int32 *load_flags, int *spacing, char **dynStrTTCapCodeRange ) + struct TTCapInfo *ret, int *face_number, FT_Int32 *load_flags, + int *spacing, Bool *font_properties, char **dynStrTTCapCodeRange ) { int result = Successful; SDynPropRecValList listPropRecVal; @@ -1921,6 +1935,7 @@ FreeTypeSetUpTTCap( char *fileName, FontScalablePtr vals, Bool alwaysEmbeddedBitmap = False; int pixel = vals->pixel; + *font_properties=True; *dynStrRealFileName=NULL; *dynStrFTFileName=NULL; *dynStrTTCapCodeRange=NULL; @@ -2405,6 +2420,13 @@ FreeTypeSetUpTTCap( char *fileName, FontScalablePtr vals, } } + if (SPropRecValList_search_record(&listPropRecVal, + &contRecValue, + "FontProperties")) { + /* Set or Reset the Flag of FontProperties */ + *font_properties=SPropContainer_value_bool(contRecValue); + } + ret->force_c_scale_b_box_width *= ret->scaleBBoxWidth; ret->force_c_scale_b_box_height *= ret->scaleBBoxHeight; @@ -2871,7 +2893,7 @@ FreeTypeLoadXFont(char *fileName, long rawWidth = 0, rawAverageWidth = 0; int upm, minLsb, maxRsb, ascent, descent, width, averageWidth; double scale, base_width, base_height; - Bool orig_is_matrix_unit; + Bool orig_is_matrix_unit, font_properties; int face_number, ttcap_spacing; struct TTCapInfo tmp_ttcap; struct TTCapInfo *ins_ttcap; @@ -2891,7 +2913,7 @@ FreeTypeLoadXFont(char *fileName, &dynStrRealFileName, &dynStrFTFileName, &tmp_ttcap, &face_number, &load_flags, &ttcap_spacing, - &dynStrTTCapCodeRange); + &font_properties, &dynStrTTCapCodeRange); if ( xrc != Successful ) { goto quit; } @@ -3320,8 +3342,12 @@ FreeTypeLoadXFont(char *fileName, /* set info */ if( info ){ + /* info->fontAscent = ascent; info->fontDescent = descent; + */ + info->fontAscent = info->maxbounds.ascent; + info->fontDescent = info->maxbounds.descent; /* Glyph metrics are accurate */ info->inkMetrics=1; @@ -3350,7 +3376,7 @@ FreeTypeLoadXFont(char *fileName, if(info) { xrc = FreeTypeAddProperties(font, vals, info, entry->name.name, - rawAverageWidth); + rawAverageWidth, font_properties); if (xrc != Successful) { goto quit; } diff --git a/src/FreeType/ftfuncs.h b/src/FreeType/ftfuncs.h index dadb546..6777667 100644 --- a/src/FreeType/ftfuncs.h +++ b/src/FreeType/ftfuncs.h @@ -174,8 +174,7 @@ static void FreeTypeFreeXFont(FontPtr pFont, int freeProps); static void FreeTypeUnloadXFont(FontPtr pFont); static int FreeTypeAddProperties(FTFontPtr font, FontScalablePtr vals, FontInfoPtr info, - char *fontname, - int rawAverageWidth); + char *fontname, int rawAverageWidth, Bool font_properties); static int FreeTypeFontGetGlyph(unsigned code, int flags, CharInfoPtr *g, FTFontPtr font); static int FreeTypeLoadFont(FTFontPtr font, FontInfoPtr info, FTFacePtr face, diff --git a/src/FreeType/ftsystem.c b/src/FreeType/ftsystem.c index 300ff5a..2378364 100644 --- a/src/FreeType/ftsystem.c +++ b/src/FreeType/ftsystem.c @@ -18,7 +18,7 @@ /***************************************************************************/ /* Modified for XFree86 */ -/* $XFree86: xc/lib/font/FreeType/ftsystem.c,v 1.3 2002/10/01 00:02:10 alanh Exp $ */ +/* $XFree86$ */ /*************************************************************************/ /* */ diff --git a/src/FreeType/fttools.c b/src/FreeType/fttools.c index 33c3e26..2cde03a 100644 --- a/src/FreeType/fttools.c +++ b/src/FreeType/fttools.c @@ -21,7 +21,7 @@ THE SOFTWARE. */ -/* $XFree86: xc/lib/font/FreeType/fttools.c,v 1.7 2003/11/20 22:36:37 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/fttools.c,v 1.6 2003/06/08 15:41:13 herrb Exp $ */ #include "fontmisc.h" #ifndef FONTMODULE diff --git a/src/FreeType/xttcap.c b/src/FreeType/xttcap.c index 8f1c599..1e2d566 100644 --- a/src/FreeType/xttcap.c +++ b/src/FreeType/xttcap.c @@ -102,7 +102,7 @@ static SPropertyRecord const validRecords[] = { "FaceNumber", eRecTypeString }, { "AutoItalic", eRecTypeDouble }, { "DoubleStrike", eRecTypeString }, - { "ForceProportional", eRecTypeBool }, + { "FontProperties", eRecTypeBool }, { "ForceSpacing", eRecTypeString }, { "ScaleBBoxWidth", eRecTypeString }, { "ScaleWidth", eRecTypeDouble }, @@ -126,13 +126,8 @@ static struct { } const correspondRelations[] = { { "fn", "FaceNumber" }, { "ai", "AutoItalic" }, -#if True /* obsoleted - pointed out by mrt ->->-> */ - { "ab", "DoubleStrike" }, -#endif /* <-<-<- obsoleted */ { "ds", "DoubleStrike" }, -#if True /* obsoleted ->->-> */ - { "fp", "ForceProportional" }, -#endif /* <-<-<- obsoleted */ + { "fp", "FontProperties" }, { "fs", "ForceSpacing" }, { "bw", "ScaleBBoxWidth" }, { "sw", "ScaleWidth" }, diff --git a/src/FreeType/xttcap.h b/src/FreeType/xttcap.h index 2b4826b..33c224f 100644 --- a/src/FreeType/xttcap.h +++ b/src/FreeType/xttcap.h @@ -30,7 +30,7 @@ Notice=== */ -/* $XFree86: xc/lib/font/FreeType/xttcap.h,v 1.1 2003/10/19 18:53:50 dawes Exp $ */ +/* $XFree86: xc/extras/X-TrueType/xttcap.h,v 1.2 2001/08/01 00:44:33 tsi Exp $ */ #ifndef _XTTCAP_H_ #define _XTTCAP_H_ (1) diff --git a/src/Speedo/bics-iso.h b/src/Speedo/bics-iso.h index d3cd35b..4964fa3 100644 --- a/src/Speedo/bics-iso.h +++ b/src/Speedo/bics-iso.h @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/bics-iso.h,v 1.7 2001/12/14 19:56:41 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/bics-iso.h,v 1.6 2001/01/17 19:43:17 dawes Exp $ */ int sp_bics_map[] = { 32, 0, diff --git a/src/Speedo/bics-unicode.c b/src/Speedo/bics-unicode.c index 22eed88..d1733cb 100644 --- a/src/Speedo/bics-unicode.c +++ b/src/Speedo/bics-unicode.c @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/Speedo/bics-unicode.c,v 1.1 1999/01/31 04:59:25 dawes Exp $ */ +/* $XFree86$ */ /* These data are very dodgy. */ diff --git a/src/Speedo/bics-unicode.h b/src/Speedo/bics-unicode.h index 3cf2ae4..90fa188 100644 --- a/src/Speedo/bics-unicode.h +++ b/src/Speedo/bics-unicode.h @@ -1,3 +1,3 @@ -/* $XFree86: xc/lib/font/Speedo/bics-unicode.h,v 1.1 1999/01/31 04:59:26 dawes Exp $ */ +/* $XFree86$ */ int unicode_to_bics(unsigned); diff --git a/src/Speedo/do_char.c b/src/Speedo/do_char.c index f28af7c..c45bb5f 100644 --- a/src/Speedo/do_char.c +++ b/src/Speedo/do_char.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/do_char.c,v 1.4 2001/08/27 19:49:50 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/do_char.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */ /***************************** D O - C H A R . C ***************************** * * diff --git a/src/Speedo/do_trns.c b/src/Speedo/do_trns.c index 25bc02a..2e397e8 100644 --- a/src/Speedo/do_trns.c +++ b/src/Speedo/do_trns.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/do_trns.c,v 1.4 2001/08/27 19:49:50 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/do_trns.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */ /**************************** D O _ T R N S . C ****************************** * * diff --git a/src/Speedo/out_bl2d.c b/src/Speedo/out_bl2d.c index 74a7310..61995e1 100644 --- a/src/Speedo/out_bl2d.c +++ b/src/Speedo/out_bl2d.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/out_bl2d.c,v 1.4 2001/01/17 19:43:17 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/out_bl2d.c,v 1.3 1999/02/07 11:47:14 dawes Exp $ */ /*************************** O U T _ B L 2 D . C ***************************** * * diff --git a/src/Speedo/out_blk.c b/src/Speedo/out_blk.c index e56eb1b..3ecefcc 100644 --- a/src/Speedo/out_blk.c +++ b/src/Speedo/out_blk.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/out_blk.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/out_blk.c,v 1.2 1999/02/07 06:18:16 dawes Exp $ */ /*************************** O U T _ B L K . C ********************************* diff --git a/src/Speedo/out_scrn.c b/src/Speedo/out_scrn.c index e17f7f6..8e1b48f 100644 --- a/src/Speedo/out_scrn.c +++ b/src/Speedo/out_scrn.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/out_scrn.c,v 1.5 2001/01/17 19:43:17 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/out_scrn.c,v 1.4 1999/12/27 00:39:25 robin Exp $ */ /*************************** O U T _ S C R N . C ***************************** diff --git a/src/Speedo/out_util.c b/src/Speedo/out_util.c index 357763f..a6f02f0 100644 --- a/src/Speedo/out_util.c +++ b/src/Speedo/out_util.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/out_util.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/out_util.c,v 1.2 1999/02/07 06:18:17 dawes Exp $ */ #define DEBUG 0 diff --git a/src/Speedo/reset.c b/src/Speedo/reset.c index 7711951..982d644 100644 --- a/src/Speedo/reset.c +++ b/src/Speedo/reset.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/reset.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/reset.c,v 1.2 1999/02/07 06:18:17 dawes Exp $ */ diff --git a/src/Speedo/set_spcs.c b/src/Speedo/set_spcs.c index 14ab53e..df45943 100644 --- a/src/Speedo/set_spcs.c +++ b/src/Speedo/set_spcs.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/set_spcs.c,v 1.4 2001/08/27 19:49:50 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/set_spcs.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */ /*************************** S E T _ S P C S . C ***************************** diff --git a/src/Speedo/set_trns.c b/src/Speedo/set_trns.c index 18d87ec..18cdb46 100644 --- a/src/Speedo/set_trns.c +++ b/src/Speedo/set_trns.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/set_trns.c,v 1.6 2003/05/27 22:26:44 tsi Exp $ */ +/* $XFree86: xc/lib/font/Speedo/set_trns.c,v 1.5tsi Exp $ */ diff --git a/src/Speedo/spdo_prv.h b/src/Speedo/spdo_prv.h index 272ffbf..162c0fd 100644 --- a/src/Speedo/spdo_prv.h +++ b/src/Speedo/spdo_prv.h @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/spdo_prv.h,v 1.5 2001/01/17 19:43:18 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spdo_prv.h,v 1.4 1999/03/14 03:21:17 dawes Exp $ */ diff --git a/src/Speedo/speedo.h b/src/Speedo/speedo.h index a0b607f..5eb516c 100644 --- a/src/Speedo/speedo.h +++ b/src/Speedo/speedo.h @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/speedo.h,v 3.6 2001/07/25 15:04:55 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/speedo.h,v 3.5 2001/01/17 19:43:18 dawes Exp $ */ #ifndef _SPEEDO_H_ #define _SPEEDO_H_ diff --git a/src/Speedo/spencode.c b/src/Speedo/spencode.c index 0daccff..b06798c 100644 --- a/src/Speedo/spencode.c +++ b/src/Speedo/spencode.c @@ -47,7 +47,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spencode.c,v 1.7 2001/12/14 19:56:41 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spencode.c,v 1.6 2001/01/17 19:43:18 dawes Exp $ */ #include "spint.h" diff --git a/src/Speedo/sperr.c b/src/Speedo/sperr.c index 8be42c6..82ed532 100644 --- a/src/Speedo/sperr.c +++ b/src/Speedo/sperr.c @@ -52,7 +52,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/sperr.c,v 1.7 2002/05/31 18:45:48 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/sperr.c,v 1.6 2001/12/14 19:56:41 dawes Exp $ */ #include "spint.h" diff --git a/src/Speedo/spfile.c b/src/Speedo/spfile.c index a5c34b3..ef2a764 100644 --- a/src/Speedo/spfile.c +++ b/src/Speedo/spfile.c @@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spfile.c,v 1.14 2001/12/14 19:56:41 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spfile.c,v 1.13 2001/08/13 21:46:47 dawes Exp $ */ #include "fntfilst.h" #include "fontenc.h" diff --git a/src/Speedo/spfont.c b/src/Speedo/spfont.c index 7799eef..04d2f90 100644 --- a/src/Speedo/spfont.c +++ b/src/Speedo/spfont.c @@ -21,7 +21,7 @@ * * Author: Dave Lemke, Network Computing Devices Inc */ -/* $XFree86: xc/lib/font/Speedo/spfont.c,v 3.13 2003/05/27 22:26:44 tsi Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spfont.c,v 3.12tsi Exp $ */ /* diff --git a/src/Speedo/spfuncs.c b/src/Speedo/spfuncs.c index 18204eb..75f779b 100644 --- a/src/Speedo/spfuncs.c +++ b/src/Speedo/spfuncs.c @@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spfuncs.c,v 1.8 2001/12/14 19:56:42 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spfuncs.c,v 1.7 2001/08/27 19:49:51 dawes Exp $ */ #ifndef FONTMODULE #include <X11/Xos.h> diff --git a/src/Speedo/spglyph.c b/src/Speedo/spglyph.c index 6db6302..979a472 100644 --- a/src/Speedo/spglyph.c +++ b/src/Speedo/spglyph.c @@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spglyph.c,v 1.7 2001/12/14 19:56:42 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spglyph.c,v 1.6 2001/01/17 19:43:20 dawes Exp $ */ #include <X11/X.h> /* for bit order #defines */ #include "spint.h" diff --git a/src/Speedo/spinfo.c b/src/Speedo/spinfo.c index d857485..d7c9c0e 100644 --- a/src/Speedo/spinfo.c +++ b/src/Speedo/spinfo.c @@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spinfo.c,v 1.13 2002/09/10 16:14:33 tsi Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spinfo.c,v 1.12 2001/12/14 19:56:42 dawes Exp $ */ #include "fntfilst.h" #include "fontutil.h" diff --git a/src/Speedo/spint.h b/src/Speedo/spint.h index 377edd8..18e5203 100644 --- a/src/Speedo/spint.h +++ b/src/Speedo/spint.h @@ -47,7 +47,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spint.h,v 1.10 2001/12/14 19:56:42 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spint.h,v 1.9 2001/01/17 19:43:20 dawes Exp $ */ #ifndef _SPINT_H_ #define _SPINT_H_ diff --git a/src/Type1/afm.c b/src/Type1/afm.c index 960e76f..7df8eba 100644 --- a/src/Type1/afm.c +++ b/src/Type1/afm.c @@ -15,7 +15,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/afm.c,v 1.3 2001/08/27 19:49:52 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/afm.c,v 1.2 1999/08/21 13:47:38 dawes Exp $ */ #ifdef BUILDCID #ifndef FONTMODULE diff --git a/src/Type1/arith.c b/src/Type1/arith.c index 6caaa3f..c9de69f 100644 --- a/src/Type1/arith.c +++ b/src/Type1/arith.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/arith.c,v 1.7 2003/05/27 22:26:45 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/arith.c,v 1.6tsi Exp $ */ /* ARITH CWEB V0006 ******** */ /* diff --git a/src/Type1/arith.h b/src/Type1/arith.h index 0eae659..6c810b9 100644 --- a/src/Type1/arith.h +++ b/src/Type1/arith.h @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/arith.h,v 1.5 2001/01/17 19:43:22 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/arith.h,v 1.4 1999/08/21 13:47:39 dawes Exp $ */ /*SHARED*/ diff --git a/src/Type1/blues.h b/src/Type1/blues.h index c3943ec..88602f7 100644 --- a/src/Type1/blues.h +++ b/src/Type1/blues.h @@ -28,7 +28,7 @@ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/blues.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/blues.h,v 1.3 1999/08/22 08:58:49 dawes Exp $ */ extern psobj *GetType1CharString ( psfont *fontP, unsigned char code ); diff --git a/src/Type1/cidchar.c b/src/Type1/cidchar.c index 593337e..6699318 100644 --- a/src/Type1/cidchar.c +++ b/src/Type1/cidchar.c @@ -15,7 +15,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/cidchar.c,v 1.10 2003/05/27 22:26:45 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/cidchar.c,v 1.9tsi Exp $ */ #ifdef BUILDCID #ifndef FONTMODULE diff --git a/src/Type1/curves.c b/src/Type1/curves.c index 206958a..36336e4 100644 --- a/src/Type1/curves.c +++ b/src/Type1/curves.c @@ -29,7 +29,7 @@ /* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT */ /* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS */ /* SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/curves.c,v 1.8 2002/02/18 20:51:57 herrb Exp $ */ +/* $XFree86: xc/lib/font/Type1/curves.c,v 1.7 2001/08/27 19:49:52 dawes Exp $ */ /* :h1.CURVES Module - Stepping Beziers diff --git a/src/Type1/curves.h b/src/Type1/curves.h index ff2bf48..ca54bad 100644 --- a/src/Type1/curves.h +++ b/src/Type1/curves.h @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/curves.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/curves.h,v 1.3 1999/08/22 08:58:50 dawes Exp $ */ /*SHARED*/ diff --git a/src/Type1/fontfcn.c b/src/Type1/fontfcn.c index 471a4ee..45078d7 100644 --- a/src/Type1/fontfcn.c +++ b/src/Type1/fontfcn.c @@ -45,7 +45,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/fontfcn.c,v 1.11 2001/11/23 19:21:31 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/fontfcn.c,v 1.10 2001/04/05 17:42:27 dawes Exp $ */ #ifndef FONTMODULE #include <stdio.h> diff --git a/src/Type1/fontfcn.h b/src/Type1/fontfcn.h index 9383e42..b53b4df 100644 --- a/src/Type1/fontfcn.h +++ b/src/Type1/fontfcn.h @@ -44,7 +44,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/fontfcn.h,v 1.5 2001/01/17 19:43:22 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/fontfcn.h,v 1.4 1999/08/22 08:58:50 dawes Exp $ */ #ifdef BUILDCID diff --git a/src/Type1/hints.c b/src/Type1/hints.c index 81b8a2c..691da9b 100644 --- a/src/Type1/hints.c +++ b/src/Type1/hints.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/hints.c,v 1.8 2003/05/27 22:26:45 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/hints.c,v 1.7tsi Exp $ */ /* HINTS CWEB V0006 ******** */ /* diff --git a/src/Type1/hints.h b/src/Type1/hints.h index d5bb829..8e2ae2a 100644 --- a/src/Type1/hints.h +++ b/src/Type1/hints.h @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/hints.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/hints.h,v 1.3 1999/08/22 08:58:51 dawes Exp $ */ /*SHARED*/ diff --git a/src/Type1/lines.c b/src/Type1/lines.c index 197943f..c2b0028 100644 --- a/src/Type1/lines.c +++ b/src/Type1/lines.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/lines.c,v 1.5 2003/05/27 22:26:45 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/lines.c,v 1.4tsi Exp $ */ /* LINES CWEB V0003 ******** */ /* diff --git a/src/Type1/lines.h b/src/Type1/lines.h index c0d7392..f8ffd3a 100644 --- a/src/Type1/lines.h +++ b/src/Type1/lines.h @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/lines.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/lines.h,v 1.3 1999/08/22 08:58:52 dawes Exp $ */ /*SHARED*/ diff --git a/src/Type1/objects.c b/src/Type1/objects.c index 2f2d30a..e79b338 100644 --- a/src/Type1/objects.c +++ b/src/Type1/objects.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/objects.c,v 1.11 2003/05/27 22:26:45 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/objects.c,v 1.10tsi Exp $ */ /* OBJECTS CWEB V0025 ******** */ /* :h1.OBJECTS Module - TYPE1IMAGER Objects Common Routines diff --git a/src/Type1/objects.h b/src/Type1/objects.h index e64d00e..59a22d6 100644 --- a/src/Type1/objects.h +++ b/src/Type1/objects.h @@ -43,7 +43,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/objects.h,v 1.15 2003/05/27 22:26:45 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/objects.h,v 1.14tsi Exp $ */ /*SHARED*/ /*END SHARED*/ diff --git a/src/Type1/paths.c b/src/Type1/paths.c index 3fec84e..4fa5f06 100644 --- a/src/Type1/paths.c +++ b/src/Type1/paths.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/paths.c,v 1.8 2003/05/27 22:26:46 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/paths.c,v 1.7tsi Exp $ */ /* PATHS CWEB V0021 ******** */ /* diff --git a/src/Type1/paths.h b/src/Type1/paths.h index 3f1b389..b61275b 100644 --- a/src/Type1/paths.h +++ b/src/Type1/paths.h @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/paths.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/paths.h,v 1.3 1999/08/22 08:58:53 dawes Exp $ */ /*SHARED*/ diff --git a/src/Type1/pictures.h b/src/Type1/pictures.h index aa02ce5..0abc715 100644 --- a/src/Type1/pictures.h +++ b/src/Type1/pictures.h @@ -27,7 +27,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/pictures.h,v 1.4 2001/01/17 19:43:23 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/pictures.h,v 1.3 1999/08/22 08:58:53 dawes Exp $ */ /* STUB */ diff --git a/src/Type1/regions.c b/src/Type1/regions.c index e24bacc..f747c8a 100644 --- a/src/Type1/regions.c +++ b/src/Type1/regions.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/regions.c,v 3.9 2003/05/27 22:26:46 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/regions.c,v 3.8tsi Exp $ */ /* REGIONS CWEB V0023 LOTS */ /* :h1 id=regions.REGIONS Module - Regions Operator Handler diff --git a/src/Type1/regions.h b/src/Type1/regions.h index 9d27e76..96ad1a5 100644 --- a/src/Type1/regions.h +++ b/src/Type1/regions.h @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/regions.h,v 1.8 2001/06/15 08:09:20 alanh Exp $ */ +/* $XFree86: xc/lib/font/Type1/regions.h,v 1.7 2001/01/17 19:43:23 dawes Exp $ */ /*SHARED*/ #define Interior(p,rule) t1_Interior(p,rule) diff --git a/src/Type1/scanfont.c b/src/Type1/scanfont.c index de3836a..64f7473 100644 --- a/src/Type1/scanfont.c +++ b/src/Type1/scanfont.c @@ -46,7 +46,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/scanfont.c,v 1.17 2003/11/29 04:55:28 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/scanfont.c,v 1.16 2003/05/27 22:26:46 tsi Exp $ */ #ifndef FONTMODULE #include <string.h> diff --git a/src/Type1/spaces.c b/src/Type1/spaces.c index 9c79954..1b2e7ae 100644 --- a/src/Type1/spaces.c +++ b/src/Type1/spaces.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/spaces.c,v 3.11 2003/05/27 22:26:47 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/spaces.c,v 3.10tsi Exp $ */ /* SPACES CWEB V0021 ******** */ /* :h1 id=spaces.SPACES Module - Handles Coordinate Spaces diff --git a/src/Type1/spaces.h b/src/Type1/spaces.h index efbcecb..ef78f2f 100644 --- a/src/Type1/spaces.h +++ b/src/Type1/spaces.h @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/spaces.h,v 3.4 2001/01/17 19:43:23 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/spaces.h,v 3.3 1999/08/22 08:58:53 dawes Exp $ */ /*SHARED*/ diff --git a/src/Type1/t1funcs.c b/src/Type1/t1funcs.c index 087c7e5..ecbd4d2 100644 --- a/src/Type1/t1funcs.c +++ b/src/Type1/t1funcs.c @@ -71,7 +71,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.34 2004/02/02 03:55:27 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.33 2003/07/19 13:16:40 tsi Exp $ */ /* diff --git a/src/Type1/t1imager.h b/src/Type1/t1imager.h index 7d72495..9730f9a 100644 --- a/src/Type1/t1imager.h +++ b/src/Type1/t1imager.h @@ -27,7 +27,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1imager.h,v 1.5 2001/07/25 15:04:55 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1imager.h,v 1.4 2001/01/17 19:43:23 dawes Exp $ */ #include "objects.h" diff --git a/src/Type1/t1info.c b/src/Type1/t1info.c index c1ef5f6..f6a5012 100644 --- a/src/Type1/t1info.c +++ b/src/Type1/t1info.c @@ -99,7 +99,7 @@ from The Open Group. * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/t1info.c,v 1.19 2003/05/27 22:26:47 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1info.c,v 1.18tsi Exp $ */ #include "fntfilst.h" #include "fontutil.h" diff --git a/src/Type1/t1intf.h b/src/Type1/t1intf.h index c1e0e44..3a1f00b 100644 --- a/src/Type1/t1intf.h +++ b/src/Type1/t1intf.h @@ -44,7 +44,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/t1intf.h,v 1.7 2001/07/25 15:04:55 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1intf.h,v 1.6 2001/01/17 19:43:23 dawes Exp $ */ #ifdef BUILDCID #include "AFM.h" diff --git a/src/Type1/t1io.c b/src/Type1/t1io.c index d5ce774..0843ae1 100644 --- a/src/Type1/t1io.c +++ b/src/Type1/t1io.c @@ -45,7 +45,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/t1io.c,v 3.9 2001/08/27 19:49:54 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1io.c,v 3.8 2001/01/17 19:43:23 dawes Exp $ */ /******************************************************************* * I/O package for Type 1 font reading ********************************************************************/ diff --git a/src/Type1/t1malloc.c b/src/Type1/t1malloc.c index 81ff220..9c885a0 100644 --- a/src/Type1/t1malloc.c +++ b/src/Type1/t1malloc.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1malloc.c,v 1.12 2004/01/23 03:55:25 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1malloc.c,v 1.11 2002/02/18 20:51:57 herrb Exp $ */ /* MALLOC CWEB V0004 LOTS */ /* :h1.MALLOC - Fast Memory Allocation diff --git a/src/Type1/t1snap.c b/src/Type1/t1snap.c index 90c396b..96b99f2 100644 --- a/src/Type1/t1snap.c +++ b/src/Type1/t1snap.c @@ -27,7 +27,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1snap.c,v 1.4 2001/01/17 19:43:24 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1snap.c,v 1.3 1999/08/22 08:58:54 dawes Exp $ */ #include "objects.h" diff --git a/src/Type1/t1stdio.h b/src/Type1/t1stdio.h index d4e71e8..cc4ba9d 100644 --- a/src/Type1/t1stdio.h +++ b/src/Type1/t1stdio.h @@ -27,7 +27,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1stdio.h,v 1.10 2001/07/25 15:04:55 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1stdio.h,v 1.9 2001/01/17 19:43:24 dawes Exp $ */ /* T1IO FILE structure and related stuff */ #ifdef XFree86LOADER #undef FILE diff --git a/src/Type1/t1stub.c b/src/Type1/t1stub.c index cfe6ea9..2c6cfed 100644 --- a/src/Type1/t1stub.c +++ b/src/Type1/t1stub.c @@ -27,7 +27,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1stub.c,v 1.9 2002/02/18 20:51:57 herrb Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1stub.c,v 1.8 2001/01/17 19:43:24 dawes Exp $ */ #ifdef FONTMODULE #include "Xdefs.h" /* Bool declaration */ diff --git a/src/Type1/t1unicode.c b/src/Type1/t1unicode.c index c6b1cd9..96f646d 100644 --- a/src/Type1/t1unicode.c +++ b/src/Type1/t1unicode.c @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1unicode.c,v 1.1 1999/01/31 04:59:30 dawes Exp $ */ +/* $XFree86$ */ #include "t1unicode.h" diff --git a/src/Type1/t1unicode.h b/src/Type1/t1unicode.h index f2a13fd..bad0274 100644 --- a/src/Type1/t1unicode.h +++ b/src/Type1/t1unicode.h @@ -20,6 +20,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1unicode.h,v 1.1 1999/01/31 04:59:31 dawes Exp $ */ +/* $XFree86$ */ char *unicodetoPSname(unsigned short code); diff --git a/src/Type1/token.c b/src/Type1/token.c index 6fb4109..0ec1947 100644 --- a/src/Type1/token.c +++ b/src/Type1/token.c @@ -27,7 +27,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/token.c,v 1.6 2003/05/27 22:26:47 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/token.c,v 1.5tsi Exp $ */ /* Authors: Sig Nin & Carol Thompson IBM Almaden Research Laboratory */ #include "t1stdio.h" #include "util.h" diff --git a/src/Type1/token.h b/src/Type1/token.h index caa2ca2..6639828 100644 --- a/src/Type1/token.h +++ b/src/Type1/token.h @@ -27,7 +27,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/token.h,v 1.4 2001/01/17 19:43:24 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/token.h,v 1.3 1999/08/22 08:58:54 dawes Exp $ */ #ifndef TOKEN_H #define TOKEN_H diff --git a/src/Type1/tokst.h b/src/Type1/tokst.h index 61f1ff9..02166af 100644 --- a/src/Type1/tokst.h +++ b/src/Type1/tokst.h @@ -27,7 +27,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/tokst.h,v 1.4 2001/01/17 19:43:24 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/tokst.h,v 1.3 1999/08/22 08:58:54 dawes Exp $ */ /* -------------------------------------- */ /* --- MACHINE GENERATED, DO NOT EDIT --- */ diff --git a/src/Type1/trig.h b/src/Type1/trig.h index f442a61..d569ed0 100644 --- a/src/Type1/trig.h +++ b/src/Type1/trig.h @@ -29,7 +29,7 @@ */ /*SHARED*/ -/* $XFree86: xc/lib/font/Type1/trig.h,v 1.3 2001/01/17 19:43:24 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/trig.h,v 1.2 1998/07/25 06:57:00 dawes Exp $ */ #undef DegreeCos #undef DegreeSin diff --git a/src/Type1/type1.c b/src/Type1/type1.c index 9bb8d00..e68ee5c 100644 --- a/src/Type1/type1.c +++ b/src/Type1/type1.c @@ -45,7 +45,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/type1.c,v 1.10 2003/05/27 22:26:47 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/type1.c,v 1.9tsi Exp $ */ /*********************************************************************/ /* */ diff --git a/src/Type1/util.c b/src/Type1/util.c index 9bd8a83..74d53fc 100644 --- a/src/Type1/util.c +++ b/src/Type1/util.c @@ -44,7 +44,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/util.c,v 1.6 2001/01/17 19:43:24 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/util.c,v 1.5 1999/08/21 13:47:53 dawes Exp $ */ /* Author: Katherine A. Hitchcock IBM Almaden Research Laboratory */ #ifndef FONTMODULE diff --git a/src/Type1/util.h b/src/Type1/util.h index 7abc289..ad4ad14 100644 --- a/src/Type1/util.h +++ b/src/Type1/util.h @@ -44,7 +44,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/util.h,v 1.5 2001/01/17 19:43:24 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/util.h,v 1.4 1999/08/22 08:58:55 dawes Exp $ */ #ifndef UTIL_H #define UTIL_H diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c index 813975a..1bcf3cb 100644 --- a/src/bitmap/bdfread.c +++ b/src/bitmap/bdfread.c @@ -50,7 +50,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bdfread.c,v 1.13 2003/05/27 22:26:48 tsi Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bdfread.c,v 1.12tsi Exp $ */ #ifndef FONTMODULE #include <ctype.h> diff --git a/src/bitmap/bdfutils.c b/src/bitmap/bdfutils.c index c1340af..a2641ef 100644 --- a/src/bitmap/bdfutils.c +++ b/src/bitmap/bdfutils.c @@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bdfutils.c,v 1.11 2003/09/13 21:33:02 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bdfutils.c,v 1.10 2001/12/14 19:56:45 dawes Exp $ */ #ifndef FONTMODULE #include <ctype.h> diff --git a/src/bitmap/bitmap.c b/src/bitmap/bitmap.c index 6fa7bfa..8c37f69 100644 --- a/src/bitmap/bitmap.c +++ b/src/bitmap/bitmap.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bitmap.c,v 1.7 2001/12/14 19:56:45 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bitmap.c,v 1.6 2001/01/17 19:43:27 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/bitmap/bitmapfunc.c b/src/bitmap/bitmapfunc.c index da06e7d..4312e88 100644 --- a/src/bitmap/bitmapfunc.c +++ b/src/bitmap/bitmapfunc.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bitmapfunc.c,v 3.18 2002/09/24 20:48:52 tsi Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bitmapfunc.c,v 3.17 2002/09/19 13:21:58 tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/bitmap/bitmaputil.c b/src/bitmap/bitmaputil.c index d061fcd..76643b8 100644 --- a/src/bitmap/bitmaputil.c +++ b/src/bitmap/bitmaputil.c @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bitmaputil.c,v 1.11 2003/02/19 01:22:34 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bitmaputil.c,v 1.10 2002/09/24 20:52:48 tsi Exp $ */ #include "fntfilst.h" #include "bitmap.h" diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c index 3966c0f..1af9f4f 100644 --- a/src/bitmap/bitscale.c +++ b/src/bitmap/bitscale.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bitscale.c,v 3.30 2003/05/27 22:26:48 tsi Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bitscale.c,v 3.29tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/bitmap/fontink.c b/src/bitmap/fontink.c index 45226c5..c3f5e8c 100644 --- a/src/bitmap/fontink.c +++ b/src/bitmap/fontink.c @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/fontink.c,v 1.7 2001/12/14 19:56:46 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/fontink.c,v 1.6 2001/01/17 19:43:27 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c index a7843cb..ed496be 100644 --- a/src/bitmap/pcfread.c +++ b/src/bitmap/pcfread.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/pcfread.c,v 1.22 2003/11/18 01:17:04 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/pcfread.c,v 1.21 2003/11/17 22:20:22 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/bitmap/pcfwrite.c b/src/bitmap/pcfwrite.c index c02f433..a55369f 100644 --- a/src/bitmap/pcfwrite.c +++ b/src/bitmap/pcfwrite.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/pcfwrite.c,v 1.12 2003/11/18 01:17:04 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/pcfwrite.c,v 1.11 2003/11/17 22:20:22 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/bitmap/snfread.c b/src/bitmap/snfread.c index 848db90..e40f392 100644 --- a/src/bitmap/snfread.c +++ b/src/bitmap/snfread.c @@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/snfread.c,v 1.13 2003/11/18 01:17:04 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/snfread.c,v 1.12 2003/11/17 22:20:22 dawes Exp $ */ #ifndef FONTMODULE #include <ctype.h> diff --git a/src/bitmap/snfstr.h b/src/bitmap/snfstr.h index 85f75f2..1043d50 100644 --- a/src/bitmap/snfstr.h +++ b/src/bitmap/snfstr.h @@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/snfstr.h,v 1.6 2003/11/18 01:17:04 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/snfstr.h,v 1.5 2001/12/14 19:56:47 dawes Exp $ */ #ifndef SNFSTR_H #define SNFSTR_H 1 diff --git a/src/builtins/builtin.h b/src/builtins/builtin.h index caee81c..f29a82c 100644 --- a/src/builtins/builtin.h +++ b/src/builtins/builtin.h @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/builtin.h,v 1.4 2000/02/23 20:29:33 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/builtin.h,v 1.3 1999/12/30 02:29:49 robin Exp $ */ #include <X11/Xdefs.h> #include <font.h> diff --git a/src/builtins/dir.c b/src/builtins/dir.c index c657710..52b1958 100644 --- a/src/builtins/dir.c +++ b/src/builtins/dir.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/dir.c,v 1.4 2000/02/23 20:29:33 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/dir.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */ #include "builtin.h" diff --git a/src/builtins/file.c b/src/builtins/file.c index 6fcaa79..b5a99bd 100644 --- a/src/builtins/file.c +++ b/src/builtins/file.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/file.c,v 1.4 2000/02/23 20:29:33 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/file.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */ #include "builtin.h" diff --git a/src/builtins/fonts.c b/src/builtins/fonts.c index cc7928e..6fef13f 100644 --- a/src/builtins/fonts.c +++ b/src/builtins/fonts.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/fonts.c,v 1.4 2000/02/23 20:29:34 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/fonts.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */ #include "builtin.h" diff --git a/src/builtins/fpe.c b/src/builtins/fpe.c index d96fc3d..219d998 100644 --- a/src/builtins/fpe.c +++ b/src/builtins/fpe.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/fpe.c,v 1.4 2000/02/23 20:29:36 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/fpe.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */ #include "fntfilst.h" diff --git a/src/builtins/render.c b/src/builtins/render.c index 5f63c66..7e7180e 100644 --- a/src/builtins/render.c +++ b/src/builtins/render.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/render.c,v 1.4 2000/02/23 20:29:36 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/render.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */ #include "fntfilst.h" #include "builtin.h" diff --git a/src/fc/fsconvert.c b/src/fc/fsconvert.c index 6b694fd..84ad901 100644 --- a/src/fc/fsconvert.c +++ b/src/fc/fsconvert.c @@ -22,7 +22,7 @@ * * Author: Dave Lemke, Network Computing Devices, Inc */ -/* $XFree86: xc/lib/font/fc/fsconvert.c,v 1.15 2003/09/01 20:50:43 herrb Exp $ */ +/* $XFree86: xc/lib/font/fc/fsconvert.c,v 1.14 2003/08/30 18:06:29 dawes Exp $ */ /* * FS data conversion */ diff --git a/src/fc/fserve.c b/src/fc/fserve.c index 5b251e0..85a4214 100644 --- a/src/fc/fserve.c +++ b/src/fc/fserve.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fc/fserve.c,v 3.27 2004/01/12 17:19:30 tsi Exp $ */ +/* $XFree86: xc/lib/font/fc/fserve.c,v 3.26tsi Exp $ */ /* * Copyright 1990 Network Computing Devices diff --git a/src/fc/fserve.h b/src/fc/fserve.h index 9d69257..3254f40 100644 --- a/src/fc/fserve.h +++ b/src/fc/fserve.h @@ -24,7 +24,7 @@ * Author: Dave Lemke, Network Computing Devices, Inc * */ -/* $XFree86: xc/lib/font/fc/fserve.h,v 1.5 2001/04/05 17:42:28 dawes Exp $ */ +/* $XFree86: xc/lib/font/fc/fserve.h,v 1.4 2001/01/17 19:43:29 dawes Exp $ */ #ifndef _FSERVE_H_ #define _FSERVE_H_ diff --git a/src/fc/fservestr.h b/src/fc/fservestr.h index 20c85f6..0e41666 100644 --- a/src/fc/fservestr.h +++ b/src/fc/fservestr.h @@ -23,7 +23,7 @@ * * Author: Dave Lemke, Network Computing Devices, Inc */ -/* $XFree86: xc/lib/font/fc/fservestr.h,v 3.4 2001/07/25 15:04:56 dawes Exp $ */ +/* $XFree86: xc/lib/font/fc/fservestr.h,v 3.3 2001/01/17 19:43:29 dawes Exp $ */ #ifndef _FSERVESTR_H_ #define _FSERVESTR_H_ diff --git a/src/fc/fsio.c b/src/fc/fsio.c index 6f589c8..e5c0c05 100644 --- a/src/fc/fsio.c +++ b/src/fc/fsio.c @@ -23,7 +23,7 @@ * * Author: Dave Lemke, Network Computing Devices, Inc */ -/* $XFree86: xc/lib/font/fc/fsio.c,v 3.17 2003/05/27 22:26:49 tsi Exp $ */ +/* $XFree86: xc/lib/font/fc/fsio.c,v 3.16tsi Exp $ */ /* * font server i/o routines */ diff --git a/src/fc/fsio.h b/src/fc/fsio.h index 974ef4a..2241436 100644 --- a/src/fc/fsio.h +++ b/src/fc/fsio.h @@ -23,7 +23,7 @@ * * Author: Dave Lemke, Network Computing Devices, Inc */ -/* $XFree86: xc/lib/font/fc/fsio.h,v 1.6 2001/01/17 19:43:29 dawes Exp $ */ +/* $XFree86: xc/lib/font/fc/fsio.h,v 1.5 1999/12/30 02:39:06 robin Exp $ */ #ifndef _FSIO_H_ #define _FSIO_H_ diff --git a/src/fc/fslibos.h b/src/fc/fslibos.h index 09f1ade..8d3ff55 100644 --- a/src/fc/fslibos.h +++ b/src/fc/fslibos.h @@ -31,7 +31,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.9 2003/09/01 20:50:44 herrb Exp $ */ +/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.8 2003/08/29 18:01:14 herrb Exp $ */ /* * FSlib networking & os include file diff --git a/src/fontcache/fontcache.c b/src/fontcache/fontcache.c index 0fec03b..4d44b8f 100644 --- a/src/fontcache/fontcache.c +++ b/src/fontcache/fontcache.c @@ -26,7 +26,7 @@ * * Id: fontcache.c,v 1.19 1999/01/31 13:06:00 akiyama Exp $ */ -/* $XFree86: xc/lib/font/fontcache/fontcache.c,v 1.5 2001/10/28 03:32:45 tsi Exp $ */ +/* $XFree86: xc/lib/font/fontcache/fontcache.c,v 1.4 2001/04/05 17:42:28 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/src/fontcache/fontcache.h b/src/fontcache/fontcache.h index 3a10b9f..713b314 100644 --- a/src/fontcache/fontcache.h +++ b/src/fontcache/fontcache.h @@ -26,7 +26,7 @@ * * Id: fontcache.h,v 1.12 1999/01/09 06:24:30 akiyama Exp $ */ -/* $XFree86: xc/lib/font/fontcache/fontcache.h,v 1.7 2003/01/26 03:02:19 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontcache/fontcache.h,v 1.6 2002/11/08 00:46:27 alanh Exp $ */ #ifndef _FONTCACHE_H_ #define _FONTCACHE_H_ diff --git a/src/fontfile/bitsource.c b/src/fontfile/bitsource.c index 0230535..b487ce4 100644 --- a/src/fontfile/bitsource.c +++ b/src/fontfile/bitsource.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/bitsource.c,v 1.4 2001/12/14 19:56:49 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/bitsource.c,v 1.3 2001/01/17 19:43:29 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/fontfile/bufio.c b/src/fontfile/bufio.c index 19d61bf..3f6d461 100644 --- a/src/fontfile/bufio.c +++ b/src/fontfile/bufio.c @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/bufio.c,v 3.10 2002/05/31 18:45:49 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/bufio.c,v 3.9 2001/12/14 19:56:50 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/fontfile/decompress.c b/src/fontfile/decompress.c index 187254d..d35f5a6 100644 --- a/src/fontfile/decompress.c +++ b/src/fontfile/decompress.c @@ -45,7 +45,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/decompress.c,v 1.5 2001/12/14 19:56:50 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/decompress.c,v 1.4 2001/01/17 19:43:29 dawes Exp $ */ /* * decompress - cat a compressed file */ diff --git a/src/fontfile/defaults.c b/src/fontfile/defaults.c index 6425d20..fb9dc81 100644 --- a/src/fontfile/defaults.c +++ b/src/fontfile/defaults.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/defaults.c,v 1.8 2001/12/14 19:56:50 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/defaults.c,v 1.7 2001/01/17 19:43:29 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c index b75042a..688bae1 100644 --- a/src/fontfile/dirfile.c +++ b/src/fontfile/dirfile.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/dirfile.c,v 3.18 2004/02/11 21:11:18 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/dirfile.c,v 3.17 2004/02/08 01:52:27 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/fontfile/ffcheck.c b/src/fontfile/ffcheck.c index 5289b7f..8a97a6e 100644 --- a/src/fontfile/ffcheck.c +++ b/src/fontfile/ffcheck.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/ffcheck.c,v 1.16 2003/05/27 22:26:49 tsi Exp $ */ +/* $XFree86: xc/lib/font/fontfile/ffcheck.c,v 1.15tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/fontfile/fileio.c b/src/fontfile/fileio.c index 8a7cb03..cdcc853 100644 --- a/src/fontfile/fileio.c +++ b/src/fontfile/fileio.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/fileio.c,v 3.10 2002/05/31 18:45:50 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fileio.c,v 3.9 2001/12/14 19:56:51 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/fontfile/filewr.c b/src/fontfile/filewr.c index 8de8f26..5deb1a5 100644 --- a/src/fontfile/filewr.c +++ b/src/fontfile/filewr.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/filewr.c,v 3.7 2002/05/31 18:45:50 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/filewr.c,v 3.6 2001/12/14 19:56:51 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c index e94c483..024ec03 100644 --- a/src/fontfile/fontdir.c +++ b/src/fontfile/fontdir.c @@ -26,7 +26,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/fontdir.c,v 3.23 2003/12/02 19:50:40 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontdir.c,v 3.22 2003/07/07 16:40:11 eich Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/fontfile/fontencc.c b/src/fontfile/fontencc.c index 2c8bdbd..cc77748 100644 --- a/src/fontfile/fontencc.c +++ b/src/fontfile/fontencc.c @@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/fontfile/fontencc.c,v 1.2 2001/08/16 14:33:46 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontencc.c,v 1.1 2001/08/13 21:46:47 dawes Exp $ */ /* Binary compatibility code. */ diff --git a/src/fontfile/fontfile.c b/src/fontfile/fontfile.c index 56d41d6..d32c4a1 100644 --- a/src/fontfile/fontfile.c +++ b/src/fontfile/fontfile.c @@ -26,7 +26,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/fontfile.c,v 3.22 2004/02/11 21:11:20 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontfile.c,v 3.21 2003/12/02 19:50:40 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/fontfile/fontscale.c b/src/fontfile/fontscale.c index 8fb63e4..3b7443f 100644 --- a/src/fontfile/fontscale.c +++ b/src/fontfile/fontscale.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/fontscale.c,v 3.10 2001/12/14 19:56:52 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontscale.c,v 3.9 2001/08/27 19:49:54 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/fontfile/gunzip.c b/src/fontfile/gunzip.c index 21894d0..bf737a8 100644 --- a/src/fontfile/gunzip.c +++ b/src/fontfile/gunzip.c @@ -2,7 +2,7 @@ /* lib/font/fontfile/gunzip.c written by Mark Eichin <eichin@kitten.gen.ma.us> September 1996. intended for inclusion in X11 public releases. */ -/* $XFree86: xc/lib/font/fontfile/gunzip.c,v 1.5 2001/01/17 19:43:30 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/gunzip.c,v 1.4 2000/09/19 12:46:08 eich Exp $ */ #include "fontmisc.h" #include <bufio.h> diff --git a/src/fontfile/printerfont.c b/src/fontfile/printerfont.c index 112b1bc..d241d1b 100644 --- a/src/fontfile/printerfont.c +++ b/src/fontfile/printerfont.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/printerfont.c,v 1.6 2003/05/27 22:26:49 tsi Exp $ */ +/* $XFree86: xc/lib/font/fontfile/printerfont.c,v 1.5tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/fontfile/register.c b/src/fontfile/register.c index 385d165..4bc7b8a 100644 --- a/src/fontfile/register.c +++ b/src/fontfile/register.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/register.c,v 1.15 2001/12/14 19:56:52 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/register.c,v 1.14 2001/01/17 19:43:30 dawes Exp $ */ /* * This is in a separate source file so that small programs diff --git a/src/fontfile/renderers.c b/src/fontfile/renderers.c index 0230e09..7d11d3e 100644 --- a/src/fontfile/renderers.c +++ b/src/fontfile/renderers.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/renderers.c,v 1.8 2004/01/06 16:28:21 martin Exp $ */ +/* $XFree86: xc/lib/font/fontfile/renderers.c,v 1.7 2002/12/09 17:30:00 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/stubs/cauthgen.c b/src/stubs/cauthgen.c index b40a440..690416e 100644 --- a/src/stubs/cauthgen.c +++ b/src/stubs/cauthgen.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/cauthgen.c,v 1.1 1999/01/11 05:13:18 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/src/stubs/csignal.c b/src/stubs/csignal.c index 668f4f5..a2919f7 100644 --- a/src/stubs/csignal.c +++ b/src/stubs/csignal.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/csignal.c,v 1.1 1999/01/11 05:13:18 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/src/stubs/delfntcid.c b/src/stubs/delfntcid.c index a9aaf35..7e9276a 100644 --- a/src/stubs/delfntcid.c +++ b/src/stubs/delfntcid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/delfntcid.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/src/stubs/errorf.c b/src/stubs/errorf.c index 7fdd1d5..f54868d 100644 --- a/src/stubs/errorf.c +++ b/src/stubs/errorf.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/errorf.c,v 1.2 2003/09/13 21:33:02 dawes Exp $ */ +/* $XFree86: xc/lib/font/stubs/errorf.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */ #include "stubs.h" diff --git a/src/stubs/fatalerror.c b/src/stubs/fatalerror.c index dbbfdd4..4b01cbd 100644 --- a/src/stubs/fatalerror.c +++ b/src/stubs/fatalerror.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/fatalerror.c,v 1.2 2003/09/13 21:33:02 dawes Exp $ */ +/* $XFree86: xc/lib/font/stubs/fatalerror.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */ #include "stubs.h" diff --git a/src/stubs/findoldfnt.c b/src/stubs/findoldfnt.c index ce8a9de..1b26797 100644 --- a/src/stubs/findoldfnt.c +++ b/src/stubs/findoldfnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/findoldfnt.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/src/stubs/getcres.c b/src/stubs/getcres.c index e1ce577..e08ec48 100644 --- a/src/stubs/getcres.c +++ b/src/stubs/getcres.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/getcres.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/src/stubs/getdefptsize.c b/src/stubs/getdefptsize.c index ada6c6a..b55a408 100644 --- a/src/stubs/getdefptsize.c +++ b/src/stubs/getdefptsize.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/getdefptsize.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/src/stubs/getnewfntcid.c b/src/stubs/getnewfntcid.c index a65fd27..7253d21 100644 --- a/src/stubs/getnewfntcid.c +++ b/src/stubs/getnewfntcid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/getnewfntcid.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/src/stubs/gettime.c b/src/stubs/gettime.c index 023441f..c92a980 100644 --- a/src/stubs/gettime.c +++ b/src/stubs/gettime.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/gettime.c,v 1.1 1999/12/15 01:14:36 robin Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/src/stubs/initfshdl.c b/src/stubs/initfshdl.c index 7a7f024..e7fffb0 100644 --- a/src/stubs/initfshdl.c +++ b/src/stubs/initfshdl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/initfshdl.c,v 1.2 2003/09/13 21:33:02 dawes Exp $ */ +/* $XFree86: xc/lib/font/stubs/initfshdl.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */ #include "stubs.h" diff --git a/src/stubs/regfpefunc.c b/src/stubs/regfpefunc.c index 96f4b92..0c6741a 100644 --- a/src/stubs/regfpefunc.c +++ b/src/stubs/regfpefunc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/regfpefunc.c,v 1.2 1999/08/21 13:48:07 dawes Exp $ */ +/* $XFree86: xc/lib/font/stubs/regfpefunc.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */ #include "stubs.h" diff --git a/src/stubs/rmfshdl.c b/src/stubs/rmfshdl.c index 1c6f650..bb50ea1 100644 --- a/src/stubs/rmfshdl.c +++ b/src/stubs/rmfshdl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/rmfshdl.c,v 1.2 2003/09/13 21:33:03 dawes Exp $ */ +/* $XFree86: xc/lib/font/stubs/rmfshdl.c,v 1.1 1999/01/11 05:13:21 dawes Exp $ */ #include "stubs.h" diff --git a/src/stubs/servclient.c b/src/stubs/servclient.c index 7f3e786..25c853f 100644 --- a/src/stubs/servclient.c +++ b/src/stubs/servclient.c @@ -1,3 +1,3 @@ -/* $XFree86: xc/lib/font/stubs/servclient.c,v 1.1 1999/01/11 05:13:21 dawes Exp $ */ +/* $XFree86$ */ void *serverClient = 0; diff --git a/src/stubs/setfntauth.c b/src/stubs/setfntauth.c index 75e59c4..b0eb94e 100644 --- a/src/stubs/setfntauth.c +++ b/src/stubs/setfntauth.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/setfntauth.c,v 1.1 1999/01/11 05:13:21 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/src/stubs/stfntcfnt.c b/src/stubs/stfntcfnt.c index cbb544f..7cfa12d 100644 --- a/src/stubs/stfntcfnt.c +++ b/src/stubs/stfntcfnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/stfntcfnt.c,v 1.1 1999/01/11 05:13:21 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/src/stubs/stubs.h b/src/stubs/stubs.h index 097b60c..fe8ddd1 100644 --- a/src/stubs/stubs.h +++ b/src/stubs/stubs.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/stubs.h,v 1.4 2003/09/13 21:33:03 dawes Exp $ */ +/* $XFree86: xc/lib/font/stubs/stubs.h,v 1.3 1999/12/15 01:14:36 robin Exp $ */ /* This directory includes dummy entry for bdftopcf and mkfontdir */ diff --git a/src/stubs/xpstubs.c b/src/stubs/xpstubs.c index c692bbc..5ac9117 100644 --- a/src/stubs/xpstubs.c +++ b/src/stubs/xpstubs.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/xpstubs.c,v 1.1 1999/01/11 05:13:22 dawes Exp $ */ +/* $XFree86$ */ /* stub for XpClient* functions. diff --git a/src/util/atom.c b/src/util/atom.c index 3863c94..36a2f44 100644 --- a/src/util/atom.c +++ b/src/util/atom.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/atom.c,v 1.10 2002/09/24 20:52:48 tsi Exp $ */ +/* $XFree86: xc/lib/font/util/atom.c,v 1.9 2002/09/19 13:22:00 tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/util/fontaccel.c b/src/util/fontaccel.c index f922145..3dd2492 100644 --- a/src/util/fontaccel.c +++ b/src/util/fontaccel.c @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/fontaccel.c,v 1.7 2001/12/14 19:56:56 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/fontaccel.c,v 1.6 2001/01/17 19:43:33 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/util/fontnames.c b/src/util/fontnames.c index cbd355a..130589f 100644 --- a/src/util/fontnames.c +++ b/src/util/fontnames.c @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/fontnames.c,v 1.5 2001/12/14 19:56:56 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/fontnames.c,v 1.4 2001/01/17 19:43:33 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/util/fontutil.c b/src/util/fontutil.c index 3bd5e51..daf65e4 100644 --- a/src/util/fontutil.c +++ b/src/util/fontutil.c @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/fontutil.c,v 3.7 2001/12/14 19:56:56 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/fontutil.c,v 3.6 2001/10/28 03:32:46 tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/util/fontxlfd.c b/src/util/fontxlfd.c index f2f1175..ac7c8ca 100644 --- a/src/util/fontxlfd.c +++ b/src/util/fontxlfd.c @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/fontxlfd.c,v 3.17 2003/10/24 16:11:52 tsi Exp $ */ +/* $XFree86: xc/lib/font/util/fontxlfd.c,v 3.16tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/util/format.c b/src/util/format.c index c406009..596e6eb 100644 --- a/src/util/format.c +++ b/src/util/format.c @@ -50,7 +50,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/format.c,v 1.5 2001/12/14 19:56:57 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/format.c,v 1.4 2001/01/17 19:43:33 dawes Exp $ */ #include "FSproto.h" #include "font.h" diff --git a/src/util/miscutil.c b/src/util/miscutil.c index 484e387..2d4e973 100644 --- a/src/util/miscutil.c +++ b/src/util/miscutil.c @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/miscutil.c,v 1.8 2001/12/14 19:56:57 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/miscutil.c,v 1.7 2001/07/25 15:04:57 dawes Exp $ */ #include <X11/Xosdefs.h> #include <stdlib.h> diff --git a/src/util/patcache.c b/src/util/patcache.c index 7b31016..37d0281 100644 --- a/src/util/patcache.c +++ b/src/util/patcache.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/patcache.c,v 3.5 2001/12/14 19:56:57 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/patcache.c,v 3.4 2001/01/17 19:43:33 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/util/private.c b/src/util/private.c index 729d41a..d902484 100644 --- a/src/util/private.c +++ b/src/util/private.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/private.c,v 1.9 2003/02/27 22:19:20 tsi Exp $ */ +/* $XFree86: xc/lib/font/util/private.c,v 1.8tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/src/util/utilbitmap.c b/src/util/utilbitmap.c index c407f29..bd7c2cd 100644 --- a/src/util/utilbitmap.c +++ b/src/util/utilbitmap.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/utilbitmap.c,v 1.5 2001/12/14 19:56:57 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/utilbitmap.c,v 1.4 2001/01/17 19:43:34 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium |