/[public]/psiconv/trunk/lib/psiconv/data.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/data.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 183 Revision 184
21#include "compat.h" 21#include "compat.h"
22#include <stdlib.h> 22#include <stdlib.h>
23#include <string.h> 23#include <string.h>
24#include "data.h" 24#include "data.h"
25#include "list.h" 25#include "list.h"
26#include "unicode.h"
26 27
27#ifdef DMALLOC 28#ifdef DMALLOC
28#include <dmalloc.h> 29#include <dmalloc.h>
29#endif 30#endif
30 31
82 { 83 {
83 0xff, /* red */ 84 0xff, /* red */
84 0xff, /* green */ 85 0xff, /* green */
85 0xff, /* blue */ 86 0xff, /* blue */
86 }; 87 };
88 static psiconv_ucs2 font_times[16] = { 'T','i','m','e','s',' ',
89 'N','e','w',' ',
90 'R','o','m','a','n',0 };
87 static struct psiconv_font_s font = 91 static struct psiconv_font_s font =
88 { 92 {
89 "Times New Roman", /* name */ 93 font_times, /* name */
90 3 /* screenfont */ 94 3 /* screenfont */
91 }; 95 };
92 struct psiconv_character_layout_s cl = 96 struct psiconv_character_layout_s cl =
93 { 97 {
94 &black, /* color */ 98 &black, /* color */
107 111
108/* Note: these defaults seem to be hard-coded somewhere outside the 112/* Note: these defaults seem to be hard-coded somewhere outside the
109 files themself. */ 113 files themself. */
110psiconv_paragraph_layout psiconv_basic_paragraph_layout(void) 114psiconv_paragraph_layout psiconv_basic_paragraph_layout(void)
111{ 115{
116 static psiconv_ucs2 font_times[16] = { 'T','i','m','e','s',' ',
117 'N','e','w',' ',
118 'R','o','m','a','n',0 };
119
112 static struct psiconv_font_s font = 120 static struct psiconv_font_s font =
113 { 121 {
114 "Times New Roman", /* name */ 122 font_times, /* name */
115 2 /* screenfont */ 123 2 /* screenfont */
116 }; 124 };
117 static struct psiconv_color_s black = 125 static struct psiconv_color_s black =
118 { 126 {
119 0x00, /* red */ 127 0x00, /* red */
134 }; 142 };
135 static struct psiconv_bullet_s bullet = 143 static struct psiconv_bullet_s bullet =
136 { 144 {
137 psiconv_bool_false, /* on */ 145 psiconv_bool_false, /* on */
138 10.0, /* font_size */ 146 10.0, /* font_size */
139 0x95, /* character */ 147 0x201d, /* character */
140 psiconv_bool_true, /* indent */ 148 psiconv_bool_true, /* indent */
141 &black, /* color */ 149 &black, /* color */
142 &font, /* font */ 150 &font, /* font */
143 }; 151 };
144 static struct psiconv_all_tabs_s tabs = 152 static struct psiconv_all_tabs_s tabs =
193{ 201{
194 psiconv_font result; 202 psiconv_font result;
195 if(!(result = malloc(sizeof(*result)))) 203 if(!(result = malloc(sizeof(*result))))
196 goto ERROR1; 204 goto ERROR1;
197 *result = *font; 205 *result = *font;
198 if (!(result->name = strdup(result->name))) 206 if (!(result->name = psiconv_unicode_strdup(result->name)))
199 goto ERROR2; 207 goto ERROR2;
200 return result; 208 return result;
201ERROR2: 209ERROR2:
202 free(result); 210 free(result);
203ERROR1: 211ERROR1:
948 const psiconv_font value2) 956 const psiconv_font value2)
949{ 957{
950 if (!value1 || !value2 || !value1->name || !value2->name) 958 if (!value1 || !value2 || !value1->name || !value2->name)
951 return 1; 959 return 1;
952 if ((value1->screenfont == value2->screenfont) && 960 if ((value1->screenfont == value2->screenfont) &&
953 !strcmp(value1->name,value2->name)) 961 !psiconv_unicode_strcmp(value1->name,value2->name))
954 return 0; 962 return 0;
955 else 963 else
956 return 1; 964 return 1;
957} 965}
958 966

Legend:
Removed from v.183  
changed lines
  Added in v.184

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26