source: trunk/third/gtkhtml3/src/gtkhtmlfontstyle.c @ 19539

Revision 19539, 1.4 KB checked in by ghudson, 21 years ago (diff)
This commit was generated by cvs2svn to compensate for changes in r19538, which included commits to RCS files with non-trunk default branches.
Line 
1/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
2/* This file is part of the GtkHTML library.
3
4   Copyright (C) 2000 Helix Code, Inc.
5   
6   This library is free software; you can redistribute it and/or
7   modify it under the terms of the GNU Library General Public
8   License as published by the Free Software Foundation; either
9   version 2 of the License, or (at your option) any later version.
10   
11   This library is distributed in the hope that it will be useful,
12   but WITHOUT ANY WARRANTY; without even the implied warranty of
13   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14   Library General Public License for more details.
15   
16   You should have received a copy of the GNU Library General Public License
17   along with this library; see the file COPYING.LIB.  If not, write to
18   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
19   Boston, MA 02111-1307, USA.
20*/
21
22#include <config.h>
23#include "gtkhtmlfontstyle.h"
24
25
26GtkHTMLFontStyle
27gtk_html_font_style_merge (GtkHTMLFontStyle a,
28                           GtkHTMLFontStyle b)
29{
30        GtkHTMLFontStyle retval;
31
32        if (a == GTK_HTML_FONT_STYLE_DEFAULT && b != GTK_HTML_FONT_STYLE_DEFAULT)
33                a = GTK_HTML_FONT_STYLE_SIZE_3;
34
35        if ((b & GTK_HTML_FONT_STYLE_SIZE_MASK) != 0)
36                retval = ((b & GTK_HTML_FONT_STYLE_SIZE_MASK)
37                          | (a & ~GTK_HTML_FONT_STYLE_SIZE_MASK));
38        else
39                retval = a;
40
41        retval |= b & ~GTK_HTML_FONT_STYLE_SIZE_MASK;
42
43        return retval;
44}
Note: See TracBrowser for help on using the repository browser.