From 391573a2b966c26a15e2393d33230b98f27fe96d Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Tue, 19 Feb 2013 00:49:01 +0000
Subject: [PATCH] 2013-02-19 01:48 UTC+0100 Przemyslaw Czerpak
 (druzus/at/poczta.onet.pl)   * harbour/src/codepage/l_sr_cyr.h     ! restored
 original Serbian collation by Srdjan Dragojlovic - thanks.

  * harbour/src/codepage/cpsr646c.c
    ! use special collation version for Serbian ISO-646C (Cyrillic YUSCII).
      AFAIK it should be the same order as in Serbian ISO-646 (Latin YUSCII)
      so user can dynamically switch between both encodings and still use
      the same binary indexes. If I'm wrong then Serbian users will have to
      fix me.
---
 harbour/ChangeLog.txt           | 11 +++++++++++
 harbour/src/codepage/cpsr646c.c |  3 ++-
 harbour/src/codepage/l_sr_cyr.h |  6 +++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index 9f930f2330..3b4d384182 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,17 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-02-19 01:48 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * harbour/src/codepage/l_sr_cyr.h
+    ! restored original Serbian collation by Srdjan Dragojlovic - thanks.
+
+  * harbour/src/codepage/cpsr646c.c
+    ! use special collation version for Serbian ISO-646C (Cyrillic YUSCII).
+      AFAIK it should be the same order as in Serbian ISO-646 (Latin YUSCII)
+      so user can dynamically switch between both encodings and still use
+      the same binary indexes. If I'm wrong then Serbian users will have to
+      fix me.
+
 2013-12-18 15:40 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/gtwvg/gtwgud.c
   * contrib/gtwvg/gtwvgd.c
diff --git a/harbour/src/codepage/cpsr646c.c b/harbour/src/codepage/cpsr646c.c
index b7a64cc34d..309199315b 100644
--- a/harbour/src/codepage/cpsr646c.c
+++ b/harbour/src/codepage/cpsr646c.c
@@ -54,7 +54,8 @@
 #define HB_CP_INFO      "Serbian ISO-646C (Cyrillic YUSCII)"
 #define HB_CP_UNITB     HB_UNITB_646YUC
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#include "l_sr_cyr.h"
+#define HB_CP_UPPER     "АБЦЧЋДЂЕФГХИЈКЛМНОПЉРСШТУВЊЏЅЗЖ"
+#define HB_CP_LOWER     "абцчћдђефгхијклмнопљрсштувњџѕзж"
 #define HB_CP_UTF8
 
 /* include CP registration code */
diff --git a/harbour/src/codepage/l_sr_cyr.h b/harbour/src/codepage/l_sr_cyr.h
index 2a4392f773..7c8a09d84b 100644
--- a/harbour/src/codepage/l_sr_cyr.h
+++ b/harbour/src/codepage/l_sr_cyr.h
@@ -2,7 +2,7 @@
  * $Id$
  */
 
-/* Przemyslaw Czerpak <druzus / at / priv.onet.pl> */
+/* SERBIAN collating sequence done by Srdjan Dragojlovic <digikv@yahoo.com> */
 
-#define HB_CP_UPPER     "АБЦЧЋДЂЕФГХИЈКЛМНОПЉРСШТУВЊЏЅЗЖ"
-#define HB_CP_LOWER     "абцчћдђефгхијклмнопљрсштувњџѕзж"
+#define HB_CP_UPPER     "АБВГДЂЕЖЗИЈКЛЉМНЊОПРСТЋУФХЦЧЏШ"
+#define HB_CP_LOWER     "абвгдђежзијклљмнњопрстћуфхцчџш"