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