On Tue, 31 Oct 2000, Vlad Harchev wrote:
I didn't have time to merge cjk.patch with everything else.
I merged next-cjk-patch.diff and Martin's patch (and of course next-cjk.diff)
into one patch and added some CJK fixes and placed it on
http://www.hippo.ru/~hvv/abiword/cjk-patch-add.diff
It should be applied over cjk.patch and I hope there won't be a lot of
problems with it.
Some new functionality added:
* { "CP950","GB2312"} entry added,
* Fix to ev_UnixKeyboard.cpp that was missing (reported by Belcon) added.
* RTF exporter fixed. At least it should produce correct RTF under CJK locales
(other locales are unaffected).
I hope someone will megre cjk.patch and cjk-patch-add.diff without many
problems.
> On Tue, 31 Oct 2000, sam th wrote:
>
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > On Tue, 31 Oct 2000, Vlad Harchev wrote:
> >
> > > I've put next version of next-cjk-patch, it's at the same location (i.e.
> > > previous version was overwritten):
> > > http://www.hippo.ru/~hvv/abiword/next-cjk-patch.diff
> > >
> > > Changes:
> > > * Everything that was in prev version of it
> > > * Fix for the problem of printing with dingbats font under latin1 locales
> > > Martin reported
> > > * It will assert that iconv knows encoding we've requested (remember this,
> > > Belcon)
> > > * It will not save encoding name in .abw file at first line to make .abw files
> > > readable by AW (before, encoding=".." should have been manually
> > > removed from 1st line under CJK locales)
> > > * Most important - it uses gdk_fontset_load for CJK fonts. It's supposed to
> > > allow CJK in GB2312 to be displayed.
> > >
> > > The last 3 are important for CJK users.
> > >
> > > IMO it should be safe to apply over previously applied prev version of
> > > enxt-cjk-patch (some hunks will be considered already applied - it's OK of
> > > course).
> > >
> >
> > I can't get any combination of all the patches to apply properly to new
> > CVS (and it isn't because of changes outside of the patches). Could you
> > put out one big patch with *all* the changes, so that we can get it tested
> > and committed?
> >
> > The important patches so far are:
> > the three available in the tar archive on my website, named:
> > cjk.patch
> > next-cjk.diff
> > martin-cjk.patch
> > and your newest
> > next-cjk-patch.diff
>
> You have to apply only the following
> cjk.patch
> next-cjk-patch.diff
> Martin's patch adds only casts around iconv's 2nd argument to files in
> /src/af/util/xp/ut_*
> and one cast to xap_EncodingManager.cpp
> So those 3 hunks from Martin's patch can be easily extracted and merged with
> other hunks. There won't be any conflict.
>
> Was the problem with FreeBSD solved?
>
> > If you (or anyone else) can get them all to apply, and post a big patch
> > with all of them, I would be eternally greatful.
>
> I will post it in 1 hour then.
>
> > Thanks.
> >
> > sam th
> > [EMAIL PROTECTED]
> > http://www.abisource.com/~sam/
> > GnuPG Key:
> > http://pgp5.ai.mit.edu:11371/pks/lookup?op=get&search=0xCABD33FC
> > -----BEGIN PGP SIGNATURE-----
> > Version: GnuPG v1.0.1 (GNU/Linux)
> > Comment: For info see http://www.gnupg.org
> >
> > iD8DBQE5/wZZt+kM0Mq9M/wRAqT0AJ9PwK7VEOY/ZR2HG9PWNcOQRvJfTwCgw2Y3
> > gvcfB+5NW73youW3J0PyIOM=
> > =2m0w
> > -----END PGP SIGNATURE-----
> >
>
> Best regards,
> -Vlad
>
Best regards,
-Vlad
