diff options
| author | das <das> | 2006-03-22 00:21:15 (GMT) |
|---|---|---|
| committer | das <das> | 2006-03-22 00:21:15 (GMT) |
| commit | 2579527c4a82ca0cea032dfa5e9ed757f43cd59e (patch) | |
| tree | fedd23bf410c6a013f190bd8aa27dbf9999214f1 /library | |
| parent | a035d9f0c9008fbb62a43d011474036c0c56ed3c (diff) | |
| download | tk-2579527c4a82ca0cea032dfa5e9ed757f43cd59e.zip tk-2579527c4a82ca0cea032dfa5e9ed757f43cd59e.tar.gz tk-2579527c4a82ca0cea032dfa5e9ed757f43cd59e.tar.bz2 | |
* generic/tkFont.c: implementation of ATSUI text rendering
* generic/tkInt.h: in TkAqua provided by Benjamin
* generic/tkTextDisp.c: Riefenstahl. [Patch 638966]
* library/demos/unicodeout.tcl:
* macosx/tkMacOSXFont.h (new file):
* macosx/tkMacOSXFont.c:
* tests/font.test:
* unix/tkUnixFont.c:
* win/tkWinFont.c:
* generic/tkFont.c: moved MODULE_SCOPE declarations of
* generic/tkFont.h: font helper procs into header files.
* macosx/tkMacOSXButton.c:
* macosx/tkMacOSXFont.h:
* macosx/tkMacOSXMenubutton.c:
* macosx/Wish.xcode/project.pbxproj: add new tkMacOSXFont.h file,
* macosx/Wish.xcodeproj/project.pbxproj: turn off dead code stripping
as it interferes with -sectcreate (rdar://4486223).
* macosx/Wish.xcode/default.pbxuser: add TCLLIBPATH=/Library/Tcl
* macosx/Wish.xcodeproj/default.pbxuser: env var setting to tktest.
* unix/configure.in: fix detection of symbols build when enabling
TkAqua debug code; filter nm output of libtclstub better to avoid
error on intel macs [Bug 1415789].
* unix/configure: autoconf-2.59
Diffstat (limited to 'library')
| -rw-r--r-- | library/demos/unicodeout.tcl | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/library/demos/unicodeout.tcl b/library/demos/unicodeout.tcl index d9f0fef..bd9738c 100644 --- a/library/demos/unicodeout.tcl +++ b/library/demos/unicodeout.tcl @@ -3,7 +3,7 @@ # This demonstration script shows how you can produce output (in label # widgets) using many different alphabets. # -# RCS: @(#) $Id: unicodeout.tcl,v 1.4 2004/12/21 11:56:35 dkf Exp $ +# RCS: @(#) $Id: unicodeout.tcl,v 1.5 2006/03/22 00:21:17 das Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." @@ -55,17 +55,33 @@ set oldCursor [$w cget -cursor] $w conf -cursor watch update -addSample $w Arabic \ - "\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94" \ - "\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D" +if {[tk windowingsystem] eq "x11"} { + # Using presentation forms (pre-layouted) + addSample $w Arabic \ + "\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D " \ + "\uFE94\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D" +} else { + # Using standard text characters + addSample $w Arabic \ + "\u0627\u0644\u0643\u0644\u0645\u0629 " \ + "\u0627\u0644\u0639\u0631\u0628\u064A\u0629" +} addSample $w "Trad. Chinese" "\u4E2D\u570B\u7684\u6F22\u5B57" addSample $w "Simpl. Chinese" "\u6C49\u8BED" addSample $w Greek \ "\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE " \ "\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1" -addSample $w Hebrew \ - "\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 " \ - "\u05DC\u05D9\u05D0\u05E8\u05E9\u05D9" +if {[tk windowingsystem] eq "x11"} { + # Visual order (pre-layouted) + addSample $w Hebrew \ + "\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 " \ + "\u05DC\u05D9\u05D0\u05E8\u05E9\u05D9" +} else { + # Standard logical order + addSample $w Hebrew \ + "\u05D9\u05E9\u05E8\u05D0\u05D9\u05DC " \ + "\u05D9\u05E8\u05D5\u05E9\u05DC\u05D9\u05DD" +} addSample $w Japanese \ "\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, " \ "\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA" |