From owner-man-jp@jp.freebsd.org  Fri Jul 27 16:50:42 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id QAA58846;
	Fri, 27 Jul 2001 16:50:42 +0900 (JST)
	(envelope-from owner-man-jp@jp.FreeBSD.org)
Received: from shiva.tri.asanuma.co.jp (shiva.tri.asanuma.co.jp [210.160.188.2])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id QAA58838
	for <man-jp@jp.freebsd.org>; Fri, 27 Jul 2001 16:50:39 +0900 (JST)
	(envelope-from mori@tri.asanuma.co.jp)
Received: from yashoda.tri.asanuma.co.jp (yashoda.tri.asanuma.co.jp [172.16.57.11])
	by shiva.tri.asanuma.co.jp (Postfix) with ESMTP id 3C14E5443
	for <man-jp@jp.freebsd.org>; Fri, 27 Jul 2001 16:50:36 +0900 (JST)
Received: from kurishna.tri.asanuma.co.jp (kurishna.tri.asanuma.co.jp [172.16.57.2])
	by yashoda.tri.asanuma.co.jp (8.11.0/8.11.0) with ESMTP id f6R7oYx29164
	for <man-jp@jp.freebsd.org>; Fri, 27 Jul 2001 16:50:35 +0900 (JST)
To: man-jp@jp.freebsd.org
References: <86ae31kx24.wl@dolphin.be.to>
Siganture-File: ~/.signature
MIME-Version: 1.0 (generated by REMI 1.14.2 - =?ISO-8859-4?Q?=22Hokuhoku-=D2?=
 =?ISO-8859-4?Q?shima=22?=)
Content-Type: multipart/mixed;
 boundary="Multipart_Fri_Jul_27_16:50:34_2001-1"
From: Mori Kouji <mori@tri.asanuma.co.jp>
Date: 27 Jul 2001 16:50:34 +0900
Message-ID: <80r8v24xpx.fsf@kurishna.tri.asanuma.co.jp>
Lines: 243
User-Agent: Nana-gnus/7.1.0.23 REMI/1.14.2 (=?ISO-8859-4?Q?Hokuhoku-=D2shi?=
 =?ISO-8859-4?Q?ma?=) Chao/1.14.1 (=?ISO-8859-4?Q?Rokujiz=F2?=) APEL/10.3
 Emacs/21.0.103 (i386--freebsd) MULE/5.0 (SAKAKI)
Reply-To: man-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+010328
X-Sequence: man-jp 3628
Subject: [man-jp 3628] ja-groff-1.17 Italic support patch
Errors-To: owner-man-jp@jp.freebsd.org
Sender: owner-man-jp@jp.freebsd.org
X-Originator: mori@kurishna.tri.asanuma.co.jp

--Multipart_Fri_Jul_27_16:50:34_2001-1
Content-Type: text/plain; charset=ISO-2022-JP

$B?9$G$9!#(B

man $B$N%=!<%9$G6/D4$7$h$&$H(B .Em ($B%$%?%j%C%/;XDj$KE83+$5$l$k(B) $B$H$7$F$b(B
$BF|K\8l$G$O%$%?%j%C%/BN$,$J$$$?$a$KL5;k$5$l$F$7$^$&!"$H$$$&Ha$7$$;vBV$r(B
$BBGGK$9$k$?$a!"(Bgroff-1.17 + groff-1.17-jgroff-0.0.1.diff $B$N(B patch $B$r(B
$B:n$j$^$7$?!#(B

$B$3$N%Q%C%A$r$"$F$?(B groff $B$r;H$&$HF|K\8l%^%K%e%"%k$G:#$^$G8+$($J$+$C$?(B
$B6/D4I=8=$,%"%s%@!<%i%$%s$H$7$FI=<($5$l$k$h$&$K$J$j$^$9!#(B

# kterm + jless $B;HMQ$N>l9g!#$?$@$7(B $B%\!<%k%I(B+$B%$%?%j%C%/$GI=<($5$l$k$Y$-(B
# $B$H$3$m$O$OC1$J$k%\!<%k%I$H$7$FI=<($5$l$k!#$3$l$O$*$=$i$/(B kterm $B$+(B
# jless $B$NLdBj!#$H$j$"$($:F|K\8l$H$OL54X78!#(B

PostScript $B$N>l9g$O(B PostScript $B$N%3!<%I$r=q$1$P$$$1$k$O$:$G$9$,!"(B
$B%9%-%k$J$$$N$G8=>u$HF1$8=PNO$K$7$F$^$9!#(BRyumin-Light, GothicBBB-Medium
$B$N$_$N4D6-$G4hD%$k$J$iBP1~$9$k2>A[%U%)%s%H$r:n@.$9$k(B PostScript $B%3!<%I$r(B
$B=q$/$3$H$K$J$j$^$9!#(B

$B$=$NB>$N=PNO%G%P%$%9$O:n6H$7$F$J$$$N$G%(%i!<$,$G$FF0$+$J$$$H;W$$$^$9!#(B

[man-jp 3564] $B$N2,:j$5$s$N(B groff-1.17 $B$KBP$9$k(B patch $B$K$7$F$"$j$^$9!#(B


--Multipart_Fri_Jul_27_16:50:34_2001-1
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: attachment; filename="ja-groff-1_17.patch"
Content-Transfer-Encoding: 7bit

diff -urN groff/files/patch-za groff.new/files/patch-za
--- groff/files/patch-za	Thu Jan  1 09:00:00 1970
+++ groff.new/files/patch-za	Fri Jul 27 15:55:02 2001
@@ -0,0 +1,166 @@
+--- ../groff-1.17.old/src/libs/libgroff/font.cc	Fri Jul 27 15:42:08 2001
++++ src/libs/libgroff/font.cc	Fri Jul 27 14:38:02 2001
+@@ -975,7 +975,7 @@
+     }
+ #ifdef	NIPPON
+     else if (strcmp("ondemand", p) == 0) { 
+-      int table_size = 3;	// enough room for M and G.
++      int table_size = 5;	// enough room for M, G, MI, GI.
+       on_demand_fonts = (const char **)new char *[table_size];
+       for (int j = 0; j < table_size; j++)
+ 	on_demand_fonts[j] = 0;
+--- ../groff-1.17.old/src/roff/troff/node.h	Fri Jul 27 15:42:10 2001
++++ src/roff/troff/node.h	Fri Jul 27 15:15:20 2001
+@@ -609,4 +609,5 @@
+ 
+ #ifdef	NIPPON
+ int is_boldfont(int);
++int is_italicfont(int);
+ #endif
+--- ../groff-1.17.old/src/roff/troff/node.cc	Fri Jul 27 15:42:10 2001
++++ src/roff/troff/node.cc	Fri Jul 27 15:32:18 2001
+@@ -149,6 +149,7 @@
+   int is_style();
+ #ifdef	NIPPON
+   friend int is_boldfont(int);
++  friend int is_italicfont(int);
+ #endif
+ };
+ 
+@@ -5703,7 +5704,8 @@
+ 
+ #ifdef	NIPPON
+ static char *boldfont_list[] = {
+-  "AB", "B", "BMB", "CB", "HB", "HNB", "NB", "PB", "SB", "TB", 0
++  "AB", "B", "BMB", "CB", "HB", "HNB", "NB", "PB", "SB", "TB",
++  "ABI", "BI", "BMBI", "CBI", "HBI", "HNBI", "NBI", "PBI", "SBI", "TBI", 0
+ };
+ 
+ int is_boldfont(int fontno)
+@@ -5713,6 +5715,25 @@
+     if (name == '\0')
+       return fontno == 3 ? 1 : 0;
+     for (char **p = boldfont_list; *p; p++) {
++      if (strcmp(name, *p) == 0)
++	return 1;
++    }
++  }
++  return 0;
++}
++
++static char *italicfont_list[] = {
++  "AI", "I", "BMI", "CI", "HI", "HNI", "NI", "PI", "SI", "TI",
++  "ABI", "BI", "BMBI", "CBI", "HBI", "HNBI", "NBI", "PBI", "SBI", "TBI", 0
++};
++
++int is_italicfont(int fontno)
++{
++  if (fontno >= 0 && fontno < font_table_size && font_table[fontno] != NULL) {
++    const char *name = font_table[fontno]->external_name.contents();
++    if (name == '\0')
++      return fontno == 2 ? 1 : 0; // what???
++    for (char **p = italicfont_list; *p; p++) {
+       if (strcmp(name, *p) == 0)
+ 	return 1;
+     }
+--- ../groff-1.17.old/src/roff/troff/input.cc	Fri Jul 27 15:42:10 2001
++++ src/roff/troff/input.cc	Fri Jul 27 15:12:59 2001
+@@ -2294,9 +2294,15 @@
+ 	  for (;;) {
+ 	    fontno = curenv->get_font(); // save a current font #
+ 	    if (is_boldfont(fontno))
+-	      curenv->change_curfont(symbol("G")); // set Gothic font
++	      if (is_italicfont(fontno))
++		curenv->change_curfont(symbol("GI")); // set Gothic font
++	      else
++		curenv->change_curfont(symbol("G")); // set Gothic font
+ 	    else
+-	      curenv->change_curfont(symbol("M")); // set Mintyo font
++	      if (is_italicfont(fontno))
++		curenv->change_curfont(symbol("MI"));
++	      else
++		curenv->change_curfont(symbol("M")); // set Mintyo font
+ 	    curenv->add_char(wcharset_table_entry(wch));
+ 	    curenv->change_curfont(fontno); // restore a saved font #
+ 	    tok.next();
+--- ../groff-1.17.old/src/devices/grotty/tty.cc	Fri Jul 27 15:42:08 2001
++++ src/devices/grotty/tty.cc	Fri Jul 27 14:50:33 2001
+@@ -78,6 +78,7 @@
+     n = strtol(num, 0, 0);
+     switch (n) {
+     case 1:
++    case 6:
+       f->mode = int(UNDERLINE_MODE);
+       break;
+     case 2:
+@@ -85,6 +86,7 @@
+       f->mode = int(BOLD_MODE);
+       break;
+     case 3:
++    case 7:
+       f->mode = int(BOLD_MODE|UNDERLINE_MODE);
+       break;
+     }
+--- ../groff-1.17.old/font/devps/Makefile.sub	Fri Jul 27 15:42:07 2001
++++ font/devps/Makefile.sub	Fri Jul 27 15:39:39 2001
+@@ -2,14 +2,14 @@
+ DISTFILES=text.enc download \
+   S ZD ZDR SS AB ABI AI AR BMB BMBI BMI BMR \
+   CB CBI CI CR HB HBI HI HR HNB HNBI HNI HNR \
+-  NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI M G
++  NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI M G MI GI
+ PSFILES=prologue symbolsl.pfa zapfdr.pfa
+ DEVGENFILES=generate/Makefile generate/afmname generate/dingbats.map \
+   generate/dingbats.rmap generate/lgreekmap generate/symbol.sed \
+   generate/symbolchars generate/symbolsl.afm generate/textmap
+ DEVFILES=DESC $(PSFILES) $(DISTFILES) $(DEVGENFILES)
+ 
+-CLEANADD=DESC $(PSFILES) M G
++CLEANADD=DESC $(PSFILES) M G MI GI
+ 
+ DESC: DESC.in
+ 	-rm -f DESC
+@@ -44,3 +44,14 @@
+ 	@-rm -f G
+ 	@sed -e 's/name M/name G/' \
+ 	    -e 's/internalname Ryumin-Light-EUC-H/internalname GothicBBB-Medium-EUC-H/' M > G
++
++MI: M
++	@echo Making MI
++	@-rm -f MI
++	@sed -e 's/name M/name MI/' M > MI
++
++GI: M
++	@echo Making GI
++	@-rm -f GI
++	@sed -e 's/name M/name GI/' \
++	    -e 's/internalname Ryumin-Light-EUC-H/internalname GothicBBB-Medium-EUC-H/' M > GI
+--- ../groff-1.17.old/font/devnippon/Makefile.sub	Fri Jul 27 15:42:07 2001
++++ font/devnippon/Makefile.sub	Fri Jul 27 15:37:36 2001
+@@ -1,6 +1,6 @@
+ DEV=nippon
+ FONTS=R I B BI
+-WFONTS=M G
++WFONTS=M G MI GI
+ ALLFONTS=$(FONTS) $(WFONTS)
+ DEVFILES=$(ALLFONTS) DESC
+ CLEANADD=$(ALLFONTS) DESC
+@@ -37,6 +37,18 @@
+ 	@-rm -f G
+ 	@sed -e 's/name M/name G/' \
+ 	    -e 's/internalname 4/internalname 5/' M > G
++		
++MI: M
++	@echo Making MI
++	@-rm -f MI
++	@sed -e 's/name M/name MI/' \
++	    -e 's/internalname 4/internalname 6/' M > MI
++		
++GI: M
++	@echo Making GI
++	@-rm -f GI
++	@sed -e 's/name M/name GI/' \
++	    -e 's/internalname 4/internalname 7/' M > GI
+ 		
+ DESC: DESC.proto
+ 	@echo Making $@
diff -urN groff/pkg-plist groff.new/pkg-plist
--- groff/pkg-plist	Fri Jul 27 16:14:29 2001
+++ groff.new/pkg-plist	Fri Jul 27 15:56:46 2001
@@ -235,8 +235,10 @@
 share/groff/%%GROFF_VERSION%%/font/devnippon/BI
 share/groff/%%GROFF_VERSION%%/font/devnippon/DESC
 share/groff/%%GROFF_VERSION%%/font/devnippon/G
+share/groff/%%GROFF_VERSION%%/font/devnippon/GI
 share/groff/%%GROFF_VERSION%%/font/devnippon/I
 share/groff/%%GROFF_VERSION%%/font/devnippon/M
+share/groff/%%GROFF_VERSION%%/font/devnippon/MI
 share/groff/%%GROFF_VERSION%%/font/devnippon/R
 share/groff/%%GROFF_VERSION%%/font/devps/AB
 share/groff/%%GROFF_VERSION%%/font/devps/ABI
@@ -252,6 +254,7 @@
 share/groff/%%GROFF_VERSION%%/font/devps/CR
 share/groff/%%GROFF_VERSION%%/font/devps/DESC
 share/groff/%%GROFF_VERSION%%/font/devps/G
+share/groff/%%GROFF_VERSION%%/font/devps/GI
 share/groff/%%GROFF_VERSION%%/font/devps/HB
 share/groff/%%GROFF_VERSION%%/font/devps/HBI
 share/groff/%%GROFF_VERSION%%/font/devps/HI
@@ -261,6 +264,7 @@
 share/groff/%%GROFF_VERSION%%/font/devps/HNR
 share/groff/%%GROFF_VERSION%%/font/devps/HR
 share/groff/%%GROFF_VERSION%%/font/devps/M
+share/groff/%%GROFF_VERSION%%/font/devps/MI
 share/groff/%%GROFF_VERSION%%/font/devps/NB
 share/groff/%%GROFF_VERSION%%/font/devps/NBI
 share/groff/%%GROFF_VERSION%%/font/devps/NI

--Multipart_Fri_Jul_27_16:50:34_2001-1
Content-Type: text/plain; charset=ISO-2022-JP


-- 
$B?9(B $B9@Fs(B	(MORI Kouji)
($B3t(B)$B^I>BAH(B $B5;=Q8&5f=j(B
E-mail: mori@tri.asanuma.co.jp

--Multipart_Fri_Jul_27_16:50:34_2001-1--
