* Bram Moolenaar <Bram@> [060902 00:28]:
> > Better solution: keep tutor.ru.utf-8, generate .cp1251 and .koi8
> > From it and detect all encodings in tutor.vim.  vimtutor will
> > fall back to english in "unsupported" locales (ru_RU.ISO8859-5)
> > for example.
> I checked the existing Russian tutor files, and they are exactly the
> same when converted to utf-8.  Thus we can use the utf-8 file as the
> master and generate the others from it.
In this case only tutor.ru.utf-8 shall be kept in source tree.  I
guess it can't be done right now since patch will be to big.

New patch attached, should be included in next release.

-- 
Regards,
Sir Raorn.
diff -cdrN ../vim70-orig/runtime/tutor/Makefile runtime/tutor/Makefile
*** ../vim70-orig/runtime/tutor/Makefile        Mon Jun  7 18:32:39 2004
--- runtime/tutor/Makefile      Sat Sep  2 01:14:00 2006
***************
*** 3,9 ****
  # The Japanese tutor exists in three encodings.  Use the UTF-8 version as the
  # original and create the others with conversion.
  
! all: tutor.ja.sjis tutor.ja.euc tutor.ko.euc
  
  tutor.ja.sjis: tutor.ja.utf-8
        nkf -WXs tutor.ja.utf-8 > tutor.ja.sjis
--- 3,9 ----
  # The Japanese tutor exists in three encodings.  Use the UTF-8 version as the
  # original and create the others with conversion.
  
! all: tutor.ja.sjis tutor.ja.euc tutor.ko.euc tutor.ru.koi8 tutor.ru.cp1251
  
  tutor.ja.sjis: tutor.ja.utf-8
        nkf -WXs tutor.ja.utf-8 > tutor.ja.sjis
***************
*** 13,15 ****
--- 13,21 ----
  
  tutor.ko.euc: tutor.ko.utf-8
        iconv -f UTF-8 -t EUC-KR tutor.ko.utf-8 > tutor.ko.euc
+ 
+ tutor.ru.koi8: tutor.ru.utf-8
+       iconv -f UTF-8 -t KOI8-R tutor.ru.utf-8 > tutor.ru.koi8
+ 
+ tutor.ru.cp1251: tutor.ru.utf-8
+       iconv -f UTF-8 -t CP1251 tutor.ru.utf-8 > tutor.ru.cp1251
diff -cdrN ../vim70-orig/runtime/tutor/tutor.vim runtime/tutor/tutor.vim
*** ../vim70-orig/runtime/tutor/tutor.vim       Sat Mar 18 23:20:36 2006
--- runtime/tutor/tutor.vim     Sat Sep  2 01:08:54 2006
***************
*** 103,113 ****
    let s:ext = ".sk.cp1250"
  endif
  
! " The Russian tutor is available in two encodings, guess which one to use.
! " This segment is from the above lines and modified by
! " Alexey I. Froloff <[EMAIL PROTECTED]> for Russian vim tutorial
! if s:ext =~? '\.ru' && &enc =~ 1251
!   let s:ext = ".ru.cp1251"
  endif
  
  " Somehow ".ge" (Germany) is sometimes used for ".de" (Deutsch).
--- 103,117 ----
    let s:ext = ".sk.cp1250"
  endif
  
! " The Russian tutor is available in three encodings, guess which one to use.
! if s:ext =~? '\.ru'
!   if &enc == "utf-8"
!     let s:ext = ".ru.utf-8"
!   elseif &enc =~ "koi8"
!     let s:ext = ".ru.koi8"
!   elseif &enc =~ 1251
!     let s:ext = ".ru.cp1251"
!   endif
  endif
  
  " Somehow ".ge" (Germany) is sometimes used for ".de" (Deutsch).

Attachment: signature.asc
Description: Digital signature

Reply via email to