[sinhala-cvs-commits] sinhala/scim/sayura/src scim_sinhala_imengine.cpp, 1.14, 1.15

[Anuradha R. <ara...@us...>]

Update of /cvsroot/sinhala/sinhala/scim/sayura/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22883/src

Modified Files:
	scim_sinhala_imengine.cpp 
Log Message:
Validate R and Y also when possible.

Index: scim_sinhala_imengine.cpp
===================================================================
RCS file: /cvsroot/sinhala/sinhala/scim/sayura/src/scim_sinhala_imengine.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** scim_sinhala_imengine.cpp	28 May 2008 11:01:04 -0000	1.14
--- scim_sinhala_imengine.cpp	28 May 2008 11:11:07 -0000	1.15
***************
*** 79,87 ****
  	{0xc0, 0x00, 0x00, SCIM_KEY_W},
  	{0xbb, 0x00, 0x00, SCIM_KEY_r},
! 	{0xca, 0x00, 0x00, SCIM_KEY_R},
  	{0xad, 0xae, 0x00, SCIM_KEY_t},
  	{0xa7, 0xa8, 0x00, SCIM_KEY_T},
  	{0xba, 0x00, 0x00, SCIM_KEY_y},
! 	{0xca, 0x00, 0x00, SCIM_KEY_Y},
  	{0xb4, 0xb5, 0x00, SCIM_KEY_p},
  	{0xb5, 0xb5, 0x00, SCIM_KEY_P},
--- 79,87 ----
  	{0xc0, 0x00, 0x00, SCIM_KEY_W},
  	{0xbb, 0x00, 0x00, SCIM_KEY_r},
! 	{0xbb, 0x00, 0x00, SCIM_KEY_R},
  	{0xad, 0xae, 0x00, SCIM_KEY_t},
  	{0xa7, 0xa8, 0x00, SCIM_KEY_T},
  	{0xba, 0x00, 0x00, SCIM_KEY_y},
! 	{0xba, 0x00, 0x00, SCIM_KEY_Y},
  	{0xb4, 0xb5, 0x00, SCIM_KEY_p},
  	{0xb5, 0xb5, 0x00, SCIM_KEY_P},
***************
*** 504,508 ****
  			c2 = lsb_to_unicode(c1);
  			m_preedit_string.erase(m_preedit_string.length() - 1, 1);
! 		}
  		m_preedit_string.push_back(0x0dca);
  		m_preedit_string.push_back(0x200d);
--- 504,509 ----
  			c2 = lsb_to_unicode(c1);
  			m_preedit_string.erase(m_preedit_string.length() - 1, 1);
! 		} else if ((c1 != -1) && !is_consonent(c1))
! 			goto cons;
  		m_preedit_string.push_back(0x0dca);
  		m_preedit_string.push_back(0x200d);
***************
*** 513,516 ****
--- 514,518 ----
  	}
  
+ cons:
  	if (c1 != 0x0d) reset();
  	m_preedit_string.push_back(lsb_to_unicode(consonents[c].character));