linebreak.c.diff revision 1.1 1 1.1 christos *** gnulib/lib/linebreak.c 2006-07-22 17:27:19.000000000 +0200
2 1.1 christos --- gettext-tools/lib/linebreak.c 2005-05-21 00:19:09.000000000 +0200
3 1.1 christos ***************
4 1.1 christos *** 30,38 ****
5 1.1 christos
6 1.1 christos #include "utf8-ucs4.h"
7 1.1 christos
8 1.1 christos #include "utf16-ucs4.h"
9 1.1 christos
10 1.1 christos - #ifdef unused
11 1.1 christos static inline int
12 1.1 christos u32_mbtouc (unsigned int *puc, const unsigned int *s, size_t n)
13 1.1 christos {
14 1.1 christos --- 30,38 ----
15 1.1 christos
16 1.1 christos #include "utf8-ucs4.h"
17 1.1 christos
18 1.1 christos + #ifdef unused
19 1.1 christos #include "utf16-ucs4.h"
20 1.1 christos
21 1.1 christos static inline int
22 1.1 christos u32_mbtouc (unsigned int *puc, const unsigned int *s, size_t n)
23 1.1 christos {
24 1.1 christos ***************
25 1.1 christos *** 460,465 ****
26 1.1 christos --- 460,467 ----
27 1.1 christos }
28 1.1 christos
29 1.1 christos
30 1.1 christos + #ifdef unused
31 1.1 christos +
32 1.1 christos /* Determine number of column positions required for first N units
33 1.1 christos (or fewer if S ends before this) in S. */
34 1.1 christos
35 1.1 christos ***************
36 1.1 christos *** 533,538 ****
37 1.1 christos --- 535,542 ----
38 1.1 christos return width;
39 1.1 christos }
40 1.1 christos
41 1.1 christos + #endif
42 1.1 christos +
43 1.1 christos
44 1.1 christos /* Determine the line break points in S, and store the result at p[0..n-1]. */
45 1.1 christos /* We don't support line breaking of complex-context dependent characters
46 1.1 christos ***************
47 1.1 christos *** 741,746 ****
48 1.1 christos --- 745,752 ----
49 1.1 christos }
50 1.1 christos }
51 1.1 christos
52 1.1 christos + #ifdef unused
53 1.1 christos +
54 1.1 christos void
55 1.1 christos u16_possible_linebreaks (const unsigned short *s, size_t n, const char *encoding, char *p)
56 1.1 christos {
57 1.1 christos ***************
58 1.1 christos *** 961,966 ****
59 1.1 christos --- 967,974 ----
60 1.1 christos }
61 1.1 christos }
62 1.1 christos
63 1.1 christos + #endif
64 1.1 christos +
65 1.1 christos
66 1.1 christos /* Choose the best line breaks, assuming the uc_width function.
67 1.1 christos Return the column after the end of the string. */
68 1.1 christos ***************
69 1.1 christos *** 1049,1054 ****
70 1.1 christos --- 1057,1064 ----
71 1.1 christos return last_column + piece_width;
72 1.1 christos }
73 1.1 christos
74 1.1 christos + #ifdef unused
75 1.1 christos +
76 1.1 christos int
77 1.1 christos u16_width_linebreaks (const unsigned short *s, size_t n,
78 1.1 christos int width, int start_column, int at_end_columns,
79 1.1 christos ***************
80 1.1 christos *** 1216,1221 ****
81 1.1 christos --- 1226,1233 ----
82 1.1 christos return last_column + piece_width;
83 1.1 christos }
84 1.1 christos
85 1.1 christos + #endif
86 1.1 christos +
87 1.1 christos
88 1.1 christos #ifdef TEST1
89 1.1 christos
90 1.1 christos ***************
91 1.1 christos *** 1481,1486 ****
92 1.1 christos --- 1493,1500 ----
93 1.1 christos
94 1.1 christos #endif /* C_CTYPE_ASCII */
95 1.1 christos
96 1.1 christos + #if defined unused || defined TEST2
97 1.1 christos +
98 1.1 christos void
99 1.1 christos mbs_possible_linebreaks (const char *s, size_t n, const char *encoding,
100 1.1 christos char *p)
101 1.1 christos ***************
102 1.1 christos *** 1574,1579 ****
103 1.1 christos --- 1588,1595 ----
104 1.1 christos }
105 1.1 christos }
106 1.1 christos
107 1.1 christos + #endif
108 1.1 christos +
109 1.1 christos int
110 1.1 christos mbs_width_linebreaks (const char *s, size_t n,
111 1.1 christos int width, int start_column, int at_end_columns,
112