Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[xsrc/trunk]: xsrc/external/mit/fontconfig merge fontconfig 2.14.



details:   https://anonhg.NetBSD.org/xsrc/rev/c48385e8b899
branches:  trunk
changeset: 7394:c48385e8b899
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Jan 19 06:14:17 2023 +0000

description:
merge fontconfig 2.14.

diffstat:

 external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3 |     2 +-
 external/mit/fontconfig/dist/doc/edit-sgml.c         |   546 -----
 external/mit/fontconfig/dist/doc/fcatomic.sgml       |   408 ---
 external/mit/fontconfig/dist/doc/fcblanks.sgml       |   206 -
 external/mit/fontconfig/dist/doc/fccache.sgml        |   479 ----
 external/mit/fontconfig/dist/doc/fccharset.sgml      |  1019 ---------
 external/mit/fontconfig/dist/doc/fcconfig.sgml       |  1907 ------------------
 external/mit/fontconfig/dist/doc/fcconstant.sgml     |   204 -
 external/mit/fontconfig/dist/doc/fcdircache.sgml     |   374 ---
 external/mit/fontconfig/dist/doc/fcfile.sgml         |   232 --
 external/mit/fontconfig/dist/doc/fcfontset.sgml      |   454 ----
 external/mit/fontconfig/dist/doc/fcformat.sgml       |   328 ---
 external/mit/fontconfig/dist/doc/fcfreetype.sgml     |   348 ---
 external/mit/fontconfig/dist/doc/fcinit.sgml         |   364 ---
 external/mit/fontconfig/dist/doc/fclangset.sgml      |   904 --------
 external/mit/fontconfig/dist/doc/fcmatrix.sgml       |   386 ---
 external/mit/fontconfig/dist/doc/fcobjectset.sgml    |   218 --
 external/mit/fontconfig/dist/doc/fcobjecttype.sgml   |   152 -
 external/mit/fontconfig/dist/doc/fcpattern.sgml      |  1794 ----------------
 external/mit/fontconfig/dist/doc/fcrange.sgml        |   273 --
 external/mit/fontconfig/dist/doc/fcstring.sgml       |  1018 ---------
 external/mit/fontconfig/dist/doc/fcstrset.sgml       |   564 -----
 external/mit/fontconfig/dist/doc/fcvalue.sgml        |   207 -
 external/mit/fontconfig/dist/doc/fcweight.sgml       |   225 --
 external/mit/fontconfig/dist/fc-cache/fc-cache.c     |    39 +-
 external/mit/fontconfig/dist/fc-case/fc-case.c       |   363 ---
 external/mit/fontconfig/dist/fc-lang/fc-lang.c       |   595 -----
 external/mit/fontconfig/dist/fontconfig.spec         |   138 -
 external/mit/fontconfig/dist/fontconfig.spec.in      |   138 -
 external/mit/fontconfig/dist/src/fccache.c           |   829 +++----
 external/mit/fontconfig/dist/src/fccfg.c             |  1336 ++++++++---
 external/mit/fontconfig/dist/src/fcdir.c             |    76 +-
 external/mit/fontconfig/dist/src/fcfreetype.c        |   385 ++-
 external/mit/fontconfig/dist/src/fchash.c            |    24 -
 external/mit/fontconfig/dist/src/fcinit.c            |    22 +-
 external/mit/fontconfig/dist/src/fcint.h             |    87 +-
 external/mit/fontconfig/dist/src/fcmatch.c           |   346 ++-
 external/mit/fontconfig/dist/src/fcname.c            |    34 +-
 external/mit/fontconfig/dist/src/fcstat.c            |     4 +-
 external/mit/fontconfig/dist/src/ftglue.c            |    11 +-
 external/mit/fontconfig/dist/test/test-hash.c        |   187 -
 external/mit/fontconfig/include/config.h             |   131 +-
 external/mit/fontconfig/include/fcalias.h            |     4 +
 external/mit/fontconfig/include/fcaliastail.h        |     4 +
 external/mit/fontconfig/include/fcobjshash.h         |   441 ++--
 45 files changed, 2343 insertions(+), 15463 deletions(-)

diffs (truncated from 20286 to 300 lines):

diff -r 222c493fa41a -r c48385e8b899 external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3
--- a/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3      Thu Jan 19 06:11:33 2023 +0000
+++ b/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3      Thu Jan 19 06:14:17 2023 +0000
@@ -1,5 +1,5 @@
 .\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetGetLangs" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
+.TH "FcLangSetGetLangs" "3" "31 3月 2022" "Fontconfig 2.14.0" ""
 .SH NAME
 FcLangSetGetLangs \- get the list of languages in the langset
 .SH SYNOPSIS
diff -r 222c493fa41a -r c48385e8b899 external/mit/fontconfig/dist/doc/edit-sgml.c
--- a/external/mit/fontconfig/dist/doc/edit-sgml.c      Thu Jan 19 06:11:33 2023 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,546 +0,0 @@
-/*
- * fontconfig/doc/edit-sgml.c
- *
- * Copyright © 2003 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of the author(s) not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  The authors make no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-static void *
-New (int size);
-
-static void *
-Reallocate (void *p, int size);
-
-static void
-Dispose (void *p);
-
-typedef enum { False, True } Bool;
-
-typedef struct {
-    char    *buf;
-    int            size;
-    int            len;
-} String;
-
-static String *
-StringNew (void);
-
-static void
-StringAdd (String *s, char c);
-
-static void
-StringAddString (String *s, char *buf);
-
-static String *
-StringMake (char *buf);
-
-static void
-StringDel (String *s);
-
-static void
-StringPut (FILE *f, String *s);
-
-static void
-StringDispose (String *s);
-
-typedef struct {
-    String  *tag;
-    String  *text;
-} Replace;
-
-static Replace *
-ReplaceNew (void);
-
-static void
-ReplaceDispose (Replace *r);
-
-static void
-Bail (const char *format, int line, const char *arg);
-
-static Replace *
-ReplaceRead (FILE *f, int *linep);
-
-typedef struct _replaceList {
-    struct _replaceList        *next;
-    Replace            *r;
-} ReplaceList;
-
-static ReplaceList *
-ReplaceListNew (Replace *r, ReplaceList *next);
-
-static void
-ReplaceListDispose (ReplaceList *l);
-
-typedef struct {
-    ReplaceList        *head;
-} ReplaceSet;
-
-static ReplaceSet *
-ReplaceSetNew (void);
-
-static void
-ReplaceSetDispose (ReplaceSet *s);
-
-static void
-ReplaceSetAdd (ReplaceSet *s, Replace *r);
-
-static Replace *
-ReplaceSetFind (ReplaceSet *s, char *tag);
-
-static ReplaceSet *
-ReplaceSetRead (FILE *f, int *linep);
-
-typedef struct _skipStack {
-    struct _skipStack  *prev;
-    int                        skipping;
-} SkipStack;
-
-static SkipStack *
-SkipStackPush (SkipStack *prev, int skipping);
-
-static SkipStack *
-SkipStackPop (SkipStack *prev);
-
-typedef struct _loopStack {
-    struct _loopStack  *prev;
-    String             *tag;
-    String             *extra;
-    long               pos;
-} LoopStack;
-
-static LoopStack *
-LoopStackPush (LoopStack *prev, FILE *f, char *tag);
-
-static LoopStack *
-LoopStackLoop (ReplaceSet *rs, LoopStack *ls, FILE *f);
-
-static void
-LineSkip (FILE *f, int *linep);
-
-static void
-DoReplace (FILE *f, int *linep, ReplaceSet *s);
-
-#define STRING_INIT 128
-
-static void *
-New (int size)
-{
-    void    *m = malloc (size);
-    if (!m)
-       abort ();
-    return m;
-}
-
-static void *
-Reallocate (void *p, int size)
-{
-    void    *r = realloc (p, size);
-
-    if (!r)
-       abort ();
-    return r;
-}
-
-static void
-Dispose (void *p)
-{
-    free (p);
-}
-
-static String *
-StringNew (void)
-{
-    String  *s;
-
-    s = New (sizeof (String));
-    s->buf = New (STRING_INIT);
-    s->size = STRING_INIT - 1;
-    s->buf[0] = '\0';
-    s->len = 0;
-    return s;
-}
-
-static void
-StringAdd (String *s, char c)
-{
-    if (s->len == s->size)
-       s->buf = Reallocate (s->buf, (s->size *= 2) + 1);
-    s->buf[s->len++] = c;
-    s->buf[s->len] = '\0';
-}
-
-static void
-StringAddString (String *s, char *buf)
-{
-    while (*buf)
-       StringAdd (s, *buf++);
-}
-
-static String *
-StringMake (char *buf)
-{
-    String  *s = StringNew ();
-    StringAddString (s, buf);
-    return s;
-}
-
-static void
-StringDel (String *s)
-{
-    if (s->len)
-       s->buf[--s->len] = '\0';
-}
-
-static void
-StringPut (FILE *f, String *s)
-{
-    char    *b = s->buf;
-
-    while (*b)
-       putc (*b++, f);
-}
-
-#define StringLast(s)  ((s)->len ? (s)->buf[(s)->len - 1] : '\0')
-
-static void
-StringDispose (String *s)
-{
-    Dispose (s->buf);
-    Dispose (s);
-}
-
-static Replace *
-ReplaceNew (void)
-{
-    Replace *r = New (sizeof (Replace));
-    r->tag = StringNew ();
-    r->text = StringNew ();
-    return r;
-}
-
-static void
-ReplaceDispose (Replace *r)
-{
-    StringDispose (r->tag);
-    StringDispose (r->text);
-    Dispose (r);
-}
-
-static void
-Bail (const char *format, int line, const char *arg)
-{
-    fprintf (stderr, "fatal: ");
-    fprintf (stderr, format, line, arg);
-    fprintf (stderr, "\n");
-    exit (1);
-}
-
-static int
-Getc (FILE *f, int *linep)
-{
-    int        c = getc (f);
-    if (c == '\n')
-       ++(*linep);
-    return c;
-}
-
-static void
-Ungetc (int c, FILE *f, int *linep)
-{
-    if (c == '\n')
-       --(*linep);
-    ungetc (c, f);
-}
-
-static Replace *
-ReplaceRead (FILE *f, int *linep)
-{
-    int            c;
-    Replace *r;
-
-    while ((c = Getc (f, linep)) != '@')
-    {
-       if (c == EOF)
-           return 0;


Home | Main Index | Thread Index | Old Index