Skip to content

Move from dev-1.50 to master #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rijnb merged 10 commits into from
May 22, 2015
Merged

Move from dev-1.50 to master #3

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ffe20f3
Development for 1.50
rijnb May 18, 2015
009b34e
Untabbed, added release note
rijnb May 18, 2015
14493fd
Improved release note
rijnb May 18, 2015
1ed5d4b
Changed language to alphabet
rijnb May 18, 2015
d68970a
Changed example to utility
rijnb May 18, 2015
7eb0d68
Fixed bug in coder
rijnb May 19, 2015
f9097ac
Fixed copyright and tabs/CR/LF
rijnb May 20, 2015
9de1640
Prepare for release
rijnb May 21, 2015
5e372d0
Switched off self check
rijnb May 21, 2015
c93d215
Updated for release
rijnb May 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Updated for release
  • Loading branch information
@rijnb
rijnb committed May 22, 2015
commit c93d215756b05f081b85403cd6a9ef558860010f
32 changes: 16 additions & 16 deletions mapcodelib/mapcoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,17 +1047,17 @@ void repack_if_alldigits(char *input,int aonly)
if (alldigits && dotpos && s>dotpos) // e is last char, s is one before, both are beyond dot, all characters are digits
{
if (aonly) // v1.50 - encode only using the letter A
{
{
int v = ((*input)-'0')*100 + ((*s)-'0')*10 + ((*e)-'0');
*input='A';
*s = encode_chars[v/32];
*e = encode_chars[v%32];
}
}
else // encode using A,E,U
{
{
int v = ((*s)-'0') *10 + ((*e)-'0');
*s = encode_chars[(v/34)+31];
*e = encode_chars[v%34];
*e = encode_chars[v%34];
}
}
}
Expand All @@ -1066,14 +1066,14 @@ int unpack_if_alldigits(char *input) // returns 1 if unpacked, 0 if left unchang
{ // rewrite all-digit codes
char *s=input;
char *dotpos=NULL;
int aonly=(*s=='A' || *s=='a'); if (aonly) s++; //*** v1.50
for (;*s!=0 && s[2]!=0 && s[2]!='-';s++)
int aonly=(*s=='A' || *s=='a'); if (aonly) s++; //*** v1.50
for (;*s!=0 && s[2]!=0 && s[2]!='-';s++)
{
if (*s=='-')
break;
else if (*s=='.' && !dotpos)
dotpos=s;
else if ( decode_chars[*s]<0 || decode_chars[*s]>9 )
if (*s=='-')
break;
else if (*s=='.' && !dotpos)
dotpos=s;
else if ( decode_chars[*s]<0 || decode_chars[*s]>9 )
return 0; // nondigit, so stop
}

Expand Down Expand Up @@ -1305,8 +1305,8 @@ int master_decode( long *nx,long *ny, // <- store result in nx,ny

// debug support: U-lead pre-processing
if (*input=='u' || *input=='U') {
strcpy(input,input+1);
ilen--;
strcpy(input,input+1);
ilen--;
voweled=1;
}

Expand All @@ -1318,7 +1318,7 @@ int master_decode( long *nx,long *ny, // <- store result in nx,ny
const char *s=input;
for ( ; *s!=0; s++ )
{
if (*s=='.')
if (*s=='.')
{ if (dot) return -5; else dot=s; }
else if ( decode_chars[*s]<0 )
return -4; // invalid char
Expand Down Expand Up @@ -2132,7 +2132,7 @@ static struct { UWORD min; UWORD max; const char *convert; } unicode2asc[] =
{0x0410,0x042f,"AZBGDEFNI?KLMHOJPCTYQXSVW????U?R"}, // Cyrillic
{0x05d0,0x05ea,"ABCDFIGHJKLMNPQ?ROSETUVWXYZ"}, // Hebrew
{0x0905,0x0939,"A?????????E?????B?CD?F?G??HJZ?KL?MNP?QU?RS?T?V??W??XY"}, // Hindi
{0x0d07,0x0d39,"I?U?E??????A??BCD??F?G??HOJ??KLMNP?????Q?RST?VWX?YZ"}, // Malai
{0x0d07,0x0d39,"I?U?E??????A??BCD??F?G??HOJ??KLMNP?????Q?RST?VWX?YZ"}, // Malay
{0x10a0,0x10bf,"AB?CE?D?UF?GHOJ?KLMINPQRSTVW?XYZ"}, // Georgisch
{0x30a2,0x30f2,"A?I?O?U?EB?C?D?F?G?H???J???????K??????L?M?N?????P??Q??R??S?????TV?????WX???Y????Z"}, // Katakana
{0x0e01,0x0e32,"BC?D??FGHJ??O???K??L?MNP?Q?R????S?T?V?W????UXYZAIE"}, // Thai
Expand Down Expand Up @@ -2591,7 +2591,7 @@ const UWORD* encodeToAlphabet(const char *mapcode,int alphabet) // 0=roman, 2=cy
if ( asc2lan[alphabet][4]==0x003f ) // alphabet has no letter E
if ( strchr(mapcode,'E') || strchr(mapcode,'U') || strchr(mapcode,'e') || strchr(mapcode,'u') ) // v1.50 get rid of E and U
{
char u[16];
char u[16];
strcpy(u,mapcode);
unpack_if_alldigits(u);
repack_if_alldigits(u,1);
Expand Down
4 changes: 2 additions & 2 deletions mapcodelib/mapcoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ int getParentCountryOfState(int territoryCode);
#define MAPCODE_ALPHABET_CYRILLIC 2
#define MAPCODE_ALPHABET_HEBREW 3
#define MAPCODE_ALPHABET_HINDI 4
#define MAPCODE_ALPHABET_MALAI 5
#define MAPCODE_ALPHABET_MALAY 5
#define MAPCODE_ALPHABET_GEORGIAN 6
#define MAPCODE_ALPHABET_KATAKANA 7
#define MAPCODE_ALPHABET_THAI 8
Expand Down Expand Up @@ -236,7 +236,7 @@ const UWORD* encodeToAlphabet(const char* mapcode, int alphabet);
#define MAPCODE_LANGUAGE_CYRILLIC MAPCODE_ALPHABET_CYRILLIC
#define MAPCODE_LANGUAGE_HEBREW MAPCODE_ALPHABET_HEBREW
#define MAPCODE_LANGUAGE_HINDI MAPCODE_ALPHABET_HINDI
#define MAPCODE_LANGUAGE_MALAI MAPCODE_ALPHABET_MALAI
#define MAPCODE_LANGUAGE_MALAY MAPCODE_ALPHABET_MALAY
#define MAPCODE_LANGUAGE_GEORGIAN MAPCODE_ALPHABET_GEORGIAN
#define MAPCODE_LANGUAGE_KATAKANA MAPCODE_ALPHABET_KATAKANA
#define MAPCODE_LANGUAGE_THAI MAPCODE_ALPHABET_THAI
Expand Down