Index: TeXmacs/progs/fonts/fonts-composite.scm
===================================================================
--- TeXmacs/progs/fonts/fonts-composite.scm	(revision 3377)
+++ TeXmacs/progs/fonts/fonts-composite.scm	(working copy)
@@ -14,7 +14,7 @@
 (texmacs-module (fonts fonts-composite))
 
 (set-font-rules
-  '(((modern $v $a $b $s $d)
+  `(((modern $v $a $b $s $d)
      (compound (ec (roman $v $a $b $s $d))
 	       (la (cyrillic $v $a $b $s $d))
 	       (cmr (tex cmr $s $d))
@@ -36,6 +36,84 @@
 	       (long (virtual long $s $d))
 	       (negate (virtual negate $s $d))
 	       (misc (virtual misc $s $d))
-	       (hangul (unbatang $v $a $b $s $d))
-	       (oriental (ipa $v $a $b $s $d))
+           ,@(cond 
+              ((os-mingw?) 
+                '((hangul (batang $v $a $b $s $d))
+                  (oriental (msmincho $v $a $b $s $d))))
+              ((os-macos?) 
+                '((hangul (apple-myungjo $v $a $b $s $d))
+                  (oriental (hiragino $v $a $b $s $d))))
+              (else
+                '((hangul (unbatang $v $a $b $s $d))
+                  (oriental (takao $v $a $b $s $d)))))
 	       (any (roman $v $a $b $s $d))))))
+
+(set-font-rules
+  `(((songti $v $a $b $s $d)
+     (compound (ec (roman $v $a $b $s $d))
+           (la (cyrillic $v $a $b $s $d))
+           (cmr (tex cmr $s $d))
+           (cmmi (tex cmmi $s $d))
+           (cmsy (tex cmsy $s $d))
+           (msam (tex msam $s $d))
+           (msbm (tex $sbm $s $d))
+           (stmary (tex stmary $s $d))
+           (wasy (tex wasy $s $d))
+           (line (tex line $s $d))
+           (cmex (tex cmex $s $d))
+           (math-cal (tex cmsy $s $d))
+           (math-frak (tex eufm $s $d))
+           (math-bbb (tex bbm $s $d))
+           (math-upgreek (tex grmn $s $d))
+           (math-bold-1 (tex cmbx $s $d))
+           (math-bold-2 (tex cmmib $s $d))
+           (math-bold-cal (tex cmbsy $s $d))
+           (long (virtual long $s $d))
+           (negate (virtual negate $s $d))
+           (misc (virtual misc $s $d))
+           ,@(cond 
+              ((os-mingw?) 
+                '((hangul (batang $v $a $b $s $d))
+                  (oriental (simsun $v $a $b $s $d))))
+              ((os-macos?) 
+                '((hangul (apple-gothic $v $a $b $s $d))
+                  (oriental (stsong $v $a $b $s $d))))
+              (else
+                '((hangul (unbatang $v $a $b $s $d))
+                  (oriental (uming $v $a $b $s $d)))))
+           (any (roman $v $a $b $s $d))))))
+
+(set-font-rules
+  `(((mingti $v $a $b $s $d)
+     (compound (ec (roman $v $a $b $s $d))
+           (la (cyrillic $v $a $b $s $d))
+           (cmr (tex cmr $s $d))
+           (cmmi (tex cmmi $s $d))
+           (cmsy (tex cmsy $s $d))
+           (msam (tex msam $s $d))
+           (msbm (tex $sbm $s $d))
+           (stmary (tex stmary $s $d))
+           (wasy (tex wasy $s $d))
+           (line (tex line $s $d))
+           (cmex (tex cmex $s $d))
+           (math-cal (tex cmsy $s $d))
+           (math-frak (tex eufm $s $d))
+           (math-bbb (tex bbm $s $d))
+           (math-upgreek (tex grmn $s $d))
+           (math-bold-1 (tex cmbx $s $d))
+           (math-bold-2 (tex cmmib $s $d))
+           (math-bold-cal (tex cmbsy $s $d))
+           (long (virtual long $s $d))
+           (negate (virtual negate $s $d))
+           (misc (virtual misc $s $d))
+           ,@(cond 
+              ((os-mingw?) 
+                '((hangul (batang $v $a $b $s $d))
+                  (oriental (mingliu $v $a $b $s $d))))
+              ((os-macos?) 
+                '((hangul (apple-gothic $v $a $b $s $d))
+                  (oriental (lisong $v $a $b $s $d))))
+              (else   
+                '((hangul (unbatang $v $a $b $s $d))
+                  (oriental (bsmi $v $a $b $s $d)))))
+           (any (roman $v $a $b $s $d))))))
Index: TeXmacs/progs/fonts/fonts-truetype.scm
===================================================================
--- TeXmacs/progs/fonts/fonts-truetype.scm	(revision 3377)
+++ TeXmacs/progs/fonts/fonts-truetype.scm	(working copy)
@@ -63,11 +63,20 @@
     ((apple-gothic $v $a $b $s $d) (unicode AppleGothic $s $d))
     ((apple-lucida $v $a $b $s $d) (unicode LucidaGrande $s $d))
     ((apple-mingliu $v $a $b $s $d) (unicode PMingLiU $s $d))
+    ((apple-msgothic $v $a $b $s $d) (unicode #{MS Gothic}# $s $d))
+    ((apple-msmincho $v $a $b $s $d) (unicode #{MS Mincho}# $s $d))
+    ((apple-myungjo $v bold $b $s $d) (unicode AppleGothic $s $d))
+    ((apple-myungjo $v $a $b $s $d) (unicode AppleMyungjo $s $d))
     ((apple-symbols $v $a $b $s $d) (unicode #{Apple Symbols}# $s $d))
     ((apple-simsun $v $a $b $s $d) (unicode SimSun $s $d))
+    ((batang $v bold $b $s $d) (unicode Gulim $s $d))
     ((batang $v $a $b $s $d) (unicode Batang $s $d))
+    ((bsmi $v bold $b $s $d) (unicode bkai00mp $s $d))
+    ((bsmi $v $a $b $s $d) (unicode bsmi00lp $s $d))
     ((fireflysung $v $a $b $s $d) (unicode fireflysung $s $d))
     ((gulim $v $a $b $s $d) (unicode Gulim $s $d))
+    ((hiragino $v bold $b $s $d) (unicode #{ヒラギノ角ゴ Pro W3}# $s $d))
+    ((hiragino $v $a $b $s $d) (unicode #{ヒラギノ明朝 Pro W3}# $s $d))
     ((ipa ss $a $b $s $d) (unicode ipagui $s $d))
     ((ipa $v bold proportional $s $d) (unicode ipagp $s $d))
     ((ipa $v bold $b $s $d) (unicode ipag $s $d))
@@ -75,9 +84,14 @@
     ((ipa $v $a $b $s $d) (unicode ipam $s $d))
     ((kochi $v bold $b $s $d) (unicode kochi-gothic $s $d))
     ((kochi $v $a $b $s $d) (unicode kochi-mincho $s $d))
+    ((lihei $v $a $b $s $d) (unicode #{儷黑 Pro}# $s $d))
+    ((lisong $v bold $b $s $d) (unicode #{儷黑 Pro}# $s $d))
+    ((lisong $v $a $b $s $d) (unicode #{儷宋 Pro}# $s $d))
+    ((mingliu $v bold $b $s $d) (unicode msjh $s $d))
     ((mingliu $v $a $b $s $d) (unicode mingliu $s $d))
-    ((ms-gothic $v $a $b $s $d) (unicode #{MS Gothic}# $s $d))
-    ((ms-mincho $v $a $b $s $d) (unicode #{MS Mincho}# $s $d))
+    ((msgothic $v $a $b $s $d) (unicode msgothic $s $d))
+    ((msmincho $v bold $b $s $d) (unicode msgothic $s $d))
+    ((msmincho $v $a $b $s $d) (unicode msmincho $s $d))
     ((simfang $v $a $b $s $d) (unicode simfang $s $d))
     ((simhei $v $a $b $s $d) (unicode simhei $s $d))
     ((simkai $v $a $b $s $d) (unicode simkai $s $d))
@@ -86,6 +100,14 @@
     ((simsun $v bold $b $s $d) (unicode simhei $s $d))
     ((simsun $v $a $b $s $d) (unicode simsun $s $d))
     ((simyou $v $a $b $s $d) (unicode simyou $s $d))
+    ((sthei $v bold $b $s $d) (unicode 华文黑体 $s $d))
+    ((sthei $v $a $b $s $d) (unicode 华文细黑 $s $d))
+    ((stsong $v bold $b $s $d) (unicode 华文细黑 $s $d))
+    ((stsong $v $a $b $s $d) (unicode 华文宋体 $s $d))
+    ((takao $v bold proportional $s $d) (unicode TakaoPGothic $s $d))
+    ((takao $v bold $b $s $d) (unicode TakaoGothic $s $d))
+    ((takao $v $a proportional $s $d) (unicode TakaoPMincho $s $d))
+    ((takao $v $a $b $s $d) (unicode TakaoMincho $s $d))
     ((ukai $v $a $b $s $d) (unicode ukai $s $d))
     ((uming $v $a $b $s $d) (unicode uming $s $d))
     ((unbatang ss bold $b $s $d) (unicode UnDotumBold $s $d))
Index: TeXmacs/progs/generic/document-edit.scm
===================================================================
--- TeXmacs/progs/generic/document-edit.scm	(revision 3377)
+++ TeXmacs/progs/generic/document-edit.scm	(working copy)
@@ -80,20 +80,24 @@
   (let ((cyrillic-before (in? (tree->stree (get-init-tree "language"))
 			      '("bulgarian" "russian" "ukrainian")))
 	(cyrillic-after (in? lan '("bulgarian" "russian" "ukrainian")))
-	(chinese-before (in? (tree->stree (get-init-tree "language"))
-			     '("chinese" "taiwanese")))
-	(chinese-after (in? lan '("chinese" "taiwanese")))
+    (chinese-before (== (tree->stree (get-init-tree "language")) "chinese"))
+    (chinese-after (== lan "chinese"))
+    (taiwanese-before (== (tree->stree (get-init-tree "language")) "taiwanese"))
+    (taiwanese-after (== lan "taiwanese"))
 	(oriental-before (in? (tree->stree (get-init-tree "language"))
 			      '("japanese" "korean")))
 	(oriental-after (in? lan '("japanese" "korean"))))
     (if (and cyrillic-before (not cyrillic-after)) (init-default "font"))
     (if (and chinese-before (not chinese-after)) (init-default "font"))
+    (if (and taiwanese-before (not taiwanese-after)) (init-default "font"))
     (if (and oriental-before (not oriental-after)) (init-default "font"))
     (init-env "language" lan)
     (if (and cyrillic-after (not cyrillic-before))
 	(init-env "font" "cyrillic"))
     (if (and chinese-after (not chinese-before))
-	(init-env "font" "fireflysung"))
+    (init-env "font" "songti"))
+    (if (and taiwanese-after (not taiwanese-before))
+    (init-env "font" "mingti"))
     (if (and oriental-after (not oriental-before))
 	(init-env "font" "modern"))))
 
Index: TeXmacs/progs/kernel/texmacs/tm-modes.scm
===================================================================
--- TeXmacs/progs/kernel/texmacs/tm-modes.scm	(revision 3377)
+++ TeXmacs/progs/kernel/texmacs/tm-modes.scm	(working copy)
@@ -84,13 +84,28 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-public (supports-chinese?)
-  (font-exists-in-tt? "fireflysung"))
+  (cond 
+    ((os-mingw?) (font-exists-in-tt? "simsun"))
+    ((os-macos?) (font-exists-in-tt? "华文宋体"))
+    (else (font-exists-in-tt? "uming"))))
 
+(define-public (supports-taiwanese?)
+  (cond 
+    ((os-mingw?) (font-exists-in-tt? "mingliu"))
+    ((os-macos?) (font-exists-in-tt? "儷宋 Pro"))
+    (else (font-exists-in-tt? "bsmi00lp"))))
+
 (define-public (supports-japanese?)
-  (font-exists-in-tt? "ipam"))
+  (cond 
+    ((os-mingw?) (font-exists-in-tt? "msmincho"))
+    ((os-macos?) (font-exists-in-tt? "ヒラギノ明朝 Pro W3"))
+    (else (font-exists-in-tt? "TakaoMincho"))))
 
 (define-public (supports-korean?)
-  (font-exists-in-tt? "UnBatang"))
+  (cond 
+    ((os-mingw?) (font-exists-in-tt? "batang"))
+    ((os-macos?) (font-exists-in-tt? "AppleMyungjo"))
+    (else (font-exists-in-tt? "UnBatang"))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Mode related
Index: TeXmacs/progs/text/format-text-menu.scm
===================================================================
--- TeXmacs/progs/text/format-text-menu.scm	(revision 3377)
+++ TeXmacs/progs/text/format-text-menu.scm	(working copy)
@@ -147,11 +147,17 @@
 	      (if (font-exists-in-tt? "mingliu")
 		  ("MingLiU" (make-with "font" "mingliu")))
 	      (if (font-exists-in-tt? "PMingLiU")
-		  ("MingLiU" (make-with "font" "pmingliu")))	      
+		  ("MingLiU" (make-with "font" "pmingliu")))
 	      (if (font-exists-in-tt? "MS Gothic")
-		  ("MS Gothic" (make-with "font" "ms-gothic")))
+		  ("MS Gothic" (make-with "font" "msgothic")))
+	      (if (and (font-exists-in-tt? "MS Gothic")
+		       (not (font-exists-in-tt? "msgothic")))
+		  ("MS Gothic" (make-with "font" "apple-msgothic")))
 	      (if (font-exists-in-tt? "MS Mincho")
-		  ("MS Mincho" (make-with "font" "ms-mincho")))
+		  ("MS Mincho" (make-with "font" "msmincho")))
+	      (if (and (font-exists-in-tt? "MS Mincho")
+		       (not (font-exists-in-tt? "msmincho")))
+		  ("MS Mincho" (make-with "font" "apple-msmincho")))
 	      (if (font-exists-in-tt? "simfang")
 		  ("SimFang" (make-with "font" "simfang")))
 	      (if (font-exists-in-tt? "simhei")
@@ -303,7 +309,7 @@
     ("Chinese"
      (begin
        (make-with "language" "chinese")
-       (make-with "font" "fireflysung"))))
+       (make-with "font" "songti"))))
   ("Czech" (make-with "language" "czech"))
   ("Danish" (make-with "language" "danish"))
   ("Dutch" (make-with "language" "dutch"))
@@ -327,11 +333,11 @@
   ("Slovene" (make-with "language" "slovene"))
   ("Spanish" (make-with "language" "spanish"))
   ("Swedish" (make-with "language" "swedish"))
-  (when (supports-chinese?)
+  (when (supports-taiwanese?)
     ("Taiwanese"
      (begin
        (make-with "language" "taiwanese")
-       (make-with "font" "fireflysung"))))
+       (make-with "font" "mingti"))))
   ("Ukrainian"
    (begin
      (make-with "language" "ukrainian")