luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ngspice input deck may contain special characters like µ (mu). 

Detect mu for ANSI and UTF-8 and translate it to u.
This commit is contained in:
Holger Vogt 2021-09-25 13:50:16 +02:00
parent 4ce4f52938
commit 3dcc36c1c3
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/frontend/inpcom.c
View File

@ -9851,7 +9851,8 @@ void inp_rem_unused_models(struct nscope *root, struct card *deck)
* or overlong UTF-8 sequence found, or NULL if the string contains * or overlong UTF-8 sequence found, or NULL if the string contains
* only correct UTF-8. It also spots UTF-8 sequences that could cause * only correct UTF-8. It also spots UTF-8 sequences that could cause
* trouble if converted to UTF-16, namely surrogate characters * trouble if converted to UTF-16, namely surrogate characters
* (U+D800..U+DFFF) and non-Unicode positions (U+FFFE..U+FFFF).*/ * (U+D800..U+DFFF) and non-Unicode positions (U+FFFE..U+FFFF).
* In addition we check for some ngspice-specific characters like µ etc.*/
#ifndef EXT_ASC #ifndef EXT_ASC
static unsigned char* static unsigned char*
utf8_check(unsigned char *s) utf8_check(unsigned char *s)
@ -9860,6 +9861,23 @@ utf8_check(unsigned char *s)
if (*s < 0x80) if (*s < 0x80)
/* 0xxxxxxx */ /* 0xxxxxxx */
s++; s++;
else if (*s == 0xb5) {
/* translate ansi micro µ to u */
*s = 'u';
s++;
}
else if (s[0] == 0xc2 && s[1] == 0xb5) {
/* translate utf-8 micro µ to u */
s[0] = 'u';
s[1] = ' ';
/* remove second byte */
unsigned char *y = s + 1;
unsigned char *z = s + 2;
while (*z) {
*y++ = *z++;
}
s++;
}
else if ((s[0] & 0xe0) == 0xc0) { else if ((s[0] & 0xe0) == 0xc0) {
/* 110XXXXx 10xxxxxx */ /* 110XXXXx 10xxxxxx */
if ((s[1] & 0xc0) != 0x80 || if ((s[1] & 0xc0) != 0x80 ||