summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog20
-rw-r--r--font/devX100-12/S1
-rw-r--r--font/devX100/S1
-rw-r--r--font/devX75-12/S1
-rw-r--r--font/devX75/S1
-rw-r--r--font/devdvi/EX1
-rw-r--r--font/devdvi/generate/texex.map2
-rw-r--r--font/devhtml/R.proto1
-rw-r--r--font/devlj4/S1
-rw-r--r--font/devlj4/generate/special.map1
-rw-r--r--font/devps/S1
-rw-r--r--font/devps/generate/textmap1
-rw-r--r--font/devutf8/R.proto1
-rw-r--r--src/preproc/tbl/main.cc4
-rw-r--r--src/preproc/tbl/table.cc17
-rw-r--r--src/roff/troff/glyphuni.cc1
-rw-r--r--src/roff/troff/uniglyph.cc1
-rw-r--r--tmac/dvi.tmac4
18 files changed, 41 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 0adb7db8..81dc2f97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2003-01-03 Werner LEMBERG <wl@gnu.org>
+
+ `is' is now a text symbol (only relevant for dvi). The math variant
+ can be accessed with `integral'.
+
+ * font/devX*/S: Regenerated.
+ * font/devdvi/generate/texex.map: Remove `is'.
+ * font/devdvi/EX: Updated.
+ * font/devhtml/R.proto, font/devutf8/R.proto: Add `integral'.
+ * font/devlj4/generate/special.map: Ditto.
+ * font/devlj4/S: Regenerated.
+ * font/devps/generate/textmap: Add `integral'.
+ * font/devps/S: Regenerated.
+
+ * tmac/dvi.tmac: Define `is'.
+
+ * src/roff/troff/glyphuni.cc (glyph_to_unicode_list): Add `integral'.
+
+ * src/preproc/tbl/main.cc (process_format): Fix error message.
+
2003-01-02 Werner LEMBERG <wl@gnu.org>
* font/devhtml/R.proto, font/devutf8/R.proto: Add `ne' and `nc'.
diff --git a/font/devX100-12/S b/font/devX100-12/S
index 3484d073..f64f1574 100644
--- a/font/devX100-12/S
+++ b/font/devX100-12/S
@@ -200,6 +200,7 @@ braceex "
bv "
ra 5,13,2 0 0361
is 5,13,4 0 0362
+integral "
--- 11,13,4 0 0363
--- 11,13,4 0 0364
--- 11,13,4 0 0365
diff --git a/font/devX100/S b/font/devX100/S
index 4b7295ce..65916e2b 100644
--- a/font/devX100/S
+++ b/font/devX100/S
@@ -200,6 +200,7 @@ braceex "
bv "
ra 5,12,3 0 0361
is 4,12,1 0 0362
+integral "
--- 10,12,3 0 0363
--- 10,12,3 0 0364
--- 10,12,3 0 0365
diff --git a/font/devX75-12/S b/font/devX75-12/S
index 761b46e5..198b4bb8 100644
--- a/font/devX75-12/S
+++ b/font/devX75-12/S
@@ -200,6 +200,7 @@ braceex "
bv "
ra 4,10,2 0 0361
is 4,12,3 0 0362
+integral "
--- 9,12,4 0 0363
--- 9,12,4 0 0364
--- 9,12,3 0 0365
diff --git a/font/devX75/S b/font/devX75/S
index 80b2d738..e55e6f00 100644
--- a/font/devX75/S
+++ b/font/devX75/S
@@ -200,6 +200,7 @@ braceex "
bv "
ra 3,7,2 0 0361
is 3,10,2 0 0362
+integral "
--- 7,10,4 0 0363
--- 7,10,4 0 0364
--- 7,10,2 0 0365
diff --git a/font/devdvi/EX b/font/devdvi/EX
index 6e83d02b..5c8b8eb5 100644
--- a/font/devdvi/EX
+++ b/font/devdvi/EX
@@ -104,7 +104,6 @@ bigcirclemultiply 1584520,104859,1572877 1 0117
sum 1514614,104859,1572877 1 0130
product 1339851,104859,1572877 1 0131
integral 582544,0,2330194,466035 1 0132
-is "
bigunion 1165088,104859,1572877 1 0133
bigintersection 1165088,104859,1572877 1 0134
bigunionplus 1165088,104859,1572877 1 0135
diff --git a/font/devdvi/generate/texex.map b/font/devdvi/generate/texex.map
index a5b26901..081d2cb8 100644
--- a/font/devdvi/generate/texex.map
+++ b/font/devdvi/generate/texex.map
@@ -74,7 +74,7 @@
79 bigcirclemultiply
88 sum
89 product
-90 is integral
+90 integral
91 bigunion
92 bigintersection
93 bigunionplus
diff --git a/font/devhtml/R.proto b/font/devhtml/R.proto
index 9fa36028..c1b376e7 100644
--- a/font/devhtml/R.proto
+++ b/font/devhtml/R.proto
@@ -357,6 +357,7 @@ OR 24 0 0x2228 &or;
ca 24 0 0x2229 &cap;
cu 24 0 0x222A &cup;
is 24 0 0x222B &int;
+integral "
tf 24 0 0x2234 &there4;
3d "
ap 24 0 0x223C &sim;
diff --git a/font/devlj4/S b/font/devlj4/S
index b1691d85..d2bc46c4 100644
--- a/font/devlj4/S
+++ b/font/devlj4/S
@@ -142,6 +142,7 @@ AN 26346,15240 0 69061
OR 26346,15240 0 69062
ci 26346,18900 2 69069
is 26346,20268,5997 3 69077
+integral "
/_ 26346,19365 2 69079
es 26346,18465,435 2 69080
Ah 13173,13980 0 69081
diff --git a/font/devlj4/generate/special.map b/font/devlj4/generate/special.map
index 99cba188..7fae6868 100644
--- a/font/devlj4/generate/special.map
+++ b/font/devlj4/generate/special.map
@@ -116,6 +116,7 @@
581 OR
584 ci
587 is
+587 integral
589 /_
590 es
591 Ah
diff --git a/font/devps/S b/font/devps/S
index 52d7fd67..a2416b8f 100644
--- a/font/devps/S
+++ b/font/devps/S
@@ -206,6 +206,7 @@ barex "
bv "
ra 329,746,198,0,-21 3 0361 -- angleright
is 274,916,107,67,52,-10 3 0362 -- integral
+integral "
--- 686,921,83,29,-332 3 0363 -- integraltp
--- 686,975,88,0,-332 3 0364 -- integralex
--- 686,921,81,0,-39 3 0365 -- integralbt
diff --git a/font/devps/generate/textmap b/font/devps/generate/textmap
index a68fc8eb..f69a9a05 100644
--- a/font/devps/generate/textmap
+++ b/font/devps/generate/textmap
@@ -210,6 +210,7 @@ igrave `i
ij ij
infinity if
integral is
+integral integral
intersection ca
less <
lessequal <=
diff --git a/font/devutf8/R.proto b/font/devutf8/R.proto
index 3d25e39b..3bebeec7 100644
--- a/font/devutf8/R.proto
+++ b/font/devutf8/R.proto
@@ -359,6 +359,7 @@ OR 24 0 0x2228
ca 24 0 0x2229
cu 24 0 0x222A
is 24 0 0x222B
+integral "
tf 24 0 0x2234
3d "
ap 24 0 0x223C
diff --git a/src/preproc/tbl/main.cc b/src/preproc/tbl/main.cc
index dc0bdcef..fe3aabf9 100644
--- a/src/preproc/tbl/main.cc
+++ b/src/preproc/tbl/main.cc
@@ -1,5 +1,5 @@
// -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -908,7 +908,7 @@ format *process_format(table_input &in, options *opt,
}
if (list->vertical_spacing.val > MAX_VERTICAL_SPACING
|| list->vertical_spacing.val < -MAX_VERTICAL_SPACING) {
- error("unreasonable point size");
+ error("unreasonable vertical spacing");
list->vertical_spacing.val = 0;
list->vertical_spacing.inc = 0;
}
diff --git a/src/preproc/tbl/table.cc b/src/preproc/tbl/table.cc
index c7f96cd3..32068c36 100644
--- a/src/preproc/tbl/table.cc
+++ b/src/preproc/tbl/table.cc
@@ -1,5 +1,6 @@
// -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2003
+ Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
This file is part of groff.
@@ -454,7 +455,6 @@ text_entry::~text_entry()
a_delete contents;
}
-
repeated_char_entry::repeated_char_entry(char *s, const entry_modifier *m)
: text_entry(s, m)
{
@@ -735,8 +735,6 @@ void left_block_entry::print()
prints(".in\n");
}
-
-
right_block_entry::right_block_entry(char *s, const entry_modifier *m)
: block_entry(s, m)
{
@@ -804,7 +802,6 @@ void line_entry::note_double_vrule_on_left(int is_corner)
double_vrule_on_left = is_corner ? 1 : 2;
}
-
single_line_entry::single_line_entry(const entry_modifier *m)
: line_entry(m)
{
@@ -996,7 +993,6 @@ void restore_inline_modifier(const entry_modifier *m)
prints("\\v'.5v'");
}
-
struct stuff {
stuff *next;
int row; // occurs before row `row'
@@ -1027,7 +1023,6 @@ struct text_stuff : public stuff {
void print(table *);
};
-
text_stuff::text_stuff(const string &s, int r, const char *fn, int ln)
: stuff(r), contents(s), filename(fn), lineno(ln)
{
@@ -1688,7 +1683,6 @@ void table::determine_row_type()
}
}
-
void table::init_output()
{
prints(".nr " COMPATIBLE_REG " \\n(.C\n"
@@ -1854,7 +1848,6 @@ string span_alphabetic_width_reg(int start_col, int end_col)
return string(name);
}
-
string column_separation_reg(int col)
{
static char name[sizeof(COLUMN_SEPARATION_PREFIX)+INT_DIGITS];
@@ -1914,11 +1907,10 @@ void compute_span_width(int start_col, int end_col)
span_left_numeric_width_reg(start_col, end_col),
span_right_numeric_width_reg(start_col, end_col),
span_alphabetic_width_reg(start_col, end_col));
-
}
// Increase the widths of columns so that the width of any spanning entry
-// is no greater than the sum of the widths of the columns that it spans.
+// is not greater than the sum of the widths of the columns that it spans.
// Ensure that the widths of columns remain equal.
void table::divide_span(int start_col, int end_col)
@@ -1954,7 +1946,6 @@ void table::divide_span(int start_col, int end_col)
prints(".\\}\n");
}
-
void table::sum_columns(int start_col, int end_col)
{
assert(end_col > start_col);
@@ -2008,7 +1999,6 @@ void table::build_span_list()
}
}
-
void table::compute_separation_factor()
{
if (flags & (ALLBOX|BOX|DOUBLEBOX))
@@ -2475,7 +2465,6 @@ void table::define_bottom_macro()
".ec\n");
}
-
// is the vertical line before column c in row r horizontally spanned?
int table::vline_spanned(int r, int c)
diff --git a/src/roff/troff/glyphuni.cc b/src/roff/troff/glyphuni.cc
index 9910923d..7c377329 100644
--- a/src/roff/troff/glyphuni.cc
+++ b/src/roff/troff/glyphuni.cc
@@ -399,6 +399,7 @@ struct {
{ "ca", "2229" },
{ "cu", "222A" },
{ "is", "222B" },
+ { "integral", "222B" },
{ "tf", "2234" },
{ "3d", "2234" },
{ "ap", "223C" },
diff --git a/src/roff/troff/uniglyph.cc b/src/roff/troff/uniglyph.cc
index 498f8bb6..658712cf 100644
--- a/src/roff/troff/uniglyph.cc
+++ b/src/roff/troff/uniglyph.cc
@@ -400,6 +400,7 @@ struct {
{ "2229", "ca" },
{ "222A", "cu" },
{ "222B", "is" },
+//{ "222B", "integral" },
//{ "2234", "3d" },
{ "2234", "tf" },
{ "223C", "ap" },
diff --git a/tmac/dvi.tmac b/tmac/dvi.tmac
index 717686f3..91e6260d 100644
--- a/tmac/dvi.tmac
+++ b/tmac/dvi.tmac
@@ -77,8 +77,10 @@
.fschar CW \[ne] \o'/\[==]'
.fschar CWI \[ne] \o'\f[CW]/\[==]'
.fchar \[=~] \v'.1m'\Z'\[eq]'\v'-.4m'\[ap]\v'.3m'
+.\" \[is] is a text variant of \[integral]
+.char \[is] \v'-.8m'\f[EX]\s[\En[.s]*5u/10u]\[integral]\s[0]\f[]\v'.8m'\h'.2m'
.fchar \[tm] \v'-.3m'\s[\En[.s]/2u]TM\s0\v'.3m'
-.\" TC fonts contain real \[aq]
+.\" TC fonts contain real \[aq] glyphs
.schar \[aq] '
.fchar \[bq] ,
.fchar \[Bq] ,\h'\w'\[rq]'u-(2u*\w"'"u)',
View Lorry Controller Status