projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
batchrender asset path fix, ru xlat, fixup hevc/h265 opts, expand new bg pngs
[goodguy/history.git]
/
cinelerra-5.1
/
po
/
xlat.C
diff --git
a/cinelerra-5.1/po/xlat.C
b/cinelerra-5.1/po/xlat.C
index 7a38f2937956170924c92c0119c44143870e7db9..2b59312e715a5ce6dc75ab313558d97942f1433c 100644
(file)
--- a/
cinelerra-5.1/po/xlat.C
+++ b/
cinelerra-5.1/po/xlat.C
@@
-108,19
+108,20
@@
static inline unsigned gch(uint8_t *&in) {
// converts string (with opn/cls attached) to c string
static void xlat2(uint8_t *in, uint8_t *out)
{
// converts string (with opn/cls attached) to c string
static void xlat2(uint8_t *in, uint8_t *out)
{
- uint8_t *obp = out;
- unsigned lch = 0, ch = gch(in);
- if( ch ) {
- if( !is_opnr(ch) ) wnext(out, ch);
- while( (ch=gch(in)) != 0 ) {
- lch = ch; obp = out;
- wnext(out, ch);
+ unsigned lch = gch(in), rch = 1, ch = 0;
+ if( lch ) {
+ if( is_opnr(lch) ) {
+ for( uint8_t *ip=in; (ch=gch(ip))!=0; rch=ch );
+ if( lch == rch ) { lch = gch(in); rch = 0; }
}
}
- if( lch && is_opnr(lch) ) out = obp;
+ while( (ch=gch(in)) != 0 ) { wnext(out, lch); lch = ch; }
+ if( rch ) wnext(out, lch);
}
*out = 0;
}
}
*out = 0;
}
+int brkput = 0;
+
// converts c++ string to c string text
static void xlat3(const char *cp, uint8_t *out)
{
// converts c++ string to c string text
static void xlat3(const char *cp, uint8_t *out)
{
@@
-141,7
+142,7
@@
static void xlat3(const char *cp, uint8_t *out)
}
wnext(out,'\\');
wnext(out, ch);
}
wnext(out,'\\');
wnext(out, ch);
- if( ch == 'n' && *bp ) {
+ if(
brkput &&
ch == 'n' && *bp ) {
wnext(out, '\"');
wnext(out, '\n');
wnext(out, '\"');
wnext(out, '\"');
wnext(out, '\n');
wnext(out, '\"');
@@
-211,7
+212,9
@@
static inline int bputs(uint8_t *bp, FILE *fp)
if( !fp ) return 0;
fputs((const char*)bp, fp);
fputc('\n',fp);
if( !fp ) return 0;
fputs((const char*)bp, fp);
fputc('\n',fp);
- return 1;
+ int n = 1;
+ while( *bp ) if( *bp++ == '\n' ) ++n;
+ return n;
}
static inline int bput(uint8_t *bp, FILE *fp)
{
}
static inline int bput(uint8_t *bp, FILE *fp)
{
@@
-455,7
+458,7
@@
void scan_po(FILE *ifp, FILE *ofp)
while( bgets(ibfr, sizeof(ibfr), ifp) ) {
if( !prefix_is(ibfr, "msgid ") ) {
if( nocmts && ibfr[0] == '#' ) continue;
while( bgets(ibfr, sizeof(ibfr), ifp) ) {
if( !prefix_is(ibfr, "msgid ") ) {
if( nocmts && ibfr[0] == '#' ) continue;
-
bputs(ibfr, ofp); ++no
;
+
no += bputs(ibfr, ofp)
;
continue;
}
uint8_t str[MX_STR]; xlat2(&ibfr[6], str);
continue;
}
uint8_t str[MX_STR]; xlat2(&ibfr[6], str);
@@
-464,10
+467,10
@@
void scan_po(FILE *ifp, FILE *ofp)
fprintf(stderr, "file truncated line %d: %s", no, ibfr);
exit(1);
}
fprintf(stderr, "file truncated line %d: %s", no, ibfr);
exit(1);
}
-
bputs(ibfr, ofp); ++no
;
+
no += bputs(ibfr, ofp)
;
while( tbfr[0] == '"' ) {
while( tbfr[0] == '"' ) {
-
bputs(tbfr, ofp); ++no
;
+
no += bputs(tbfr, ofp)
;
xlat2(&tbfr[0], str); key.append((const char*)str);
if( !bgets(tbfr, sizeof(tbfr), ifp) ) {
fprintf(stderr, "file truncated line %d: %s", no, ibfr);
xlat2(&tbfr[0], str); key.append((const char*)str);
if( !bgets(tbfr, sizeof(tbfr), ifp) ) {
fprintf(stderr, "file truncated line %d: %s", no, ibfr);
@@
-490,26
+493,26
@@
void scan_po(FILE *ifp, FILE *ofp)
if( it == trans.end() || it->first.compare(key) ) {
fprintf(stderr, "no trans line %d: %s\n", no, ibfr);
xlat3(key.c_str(), &tbfr[7]);
if( it == trans.end() || it->first.compare(key) ) {
fprintf(stderr, "no trans line %d: %s\n", no, ibfr);
xlat3(key.c_str(), &tbfr[7]);
-
bputs(tbfr, ofp); ++no
;
-
bputs((uint8_t*)"#msgstr \"\"", ofp); ++no
;
+
no += bputs(tbfr, ofp)
;
+
no += bputs((uint8_t*)"#msgstr \"\"", ofp)
;
}
}
- else if( !it->second.ok ) {
+ else if(
0 &&
!it->second.ok ) {
fprintf(stderr, "bad fmt line %d: %s\n", no, ibfr);
xlat3(it->first.c_str(), &tbfr[7]);
fprintf(stderr, "bad fmt line %d: %s\n", no, ibfr);
xlat3(it->first.c_str(), &tbfr[7]);
-
bputs(tbfr, ofp); ++no
;
+
no += bputs(tbfr, ofp)
;
xlat3(it->second.c_str(), str);
bput((uint8_t*)"#msgstr ", ofp);
xlat3(it->second.c_str(), str);
bput((uint8_t*)"#msgstr ", ofp);
-
bputs(str, ofp); ++no
;
+
no += bputs(str, ofp)
;
}
else {
xlat3(it->second.c_str(), &tbfr[7]);
}
else {
xlat3(it->second.c_str(), &tbfr[7]);
-
bputs(tbfr, ofp); ++no
;
+
no += bputs(tbfr, ofp)
;
}
}
if( ifp != stdin ) fclose(ifp);
}
}
}
if( ifp != stdin ) fclose(ifp);
}
-void list_po(FILE *ifp, FILE *ofp)
+void list_po(FILE *ifp, FILE *ofp
, int xeqx = 0, int nnul = 0
)
{
int no = 0;
int dup = 0, nul = 0;
{
int no = 0;
int dup = 0, nul = 0;
@@
-546,8
+549,15
@@
void list_po(FILE *ifp, FILE *ofp)
xlat2(&tbfr[0], str); txt.append((const char*)str);
++no;
}
xlat2(&tbfr[0], str); txt.append((const char*)str);
++no;
}
- if( !txt.size() ) { ++nul; continue; }
- if( !key.compare(txt) ) { ++dup; continue; }
+ if( nnul && !txt.size() ) {
+ ++nul;
+ if( nnul > 0 ) continue;
+ }
+ else if( xeqx && !key.compare(txt) ) {
+ ++dup;
+ if( xeqx > 0 ) continue;
+ }
+ else if( nnul < 0 || xeqx < 0 ) continue;
xlat4(key.c_str(), str);
fprintf(ofp, "%s,", (char *)str);
xlat4(txt.c_str(), str);
xlat4(key.c_str(), str);
fprintf(ofp, "%s,", (char *)str);
xlat4(txt.c_str(), str);
@@
-558,9
+568,11
@@
void list_po(FILE *ifp, FILE *ofp)
static void usage(const char *av0)
{
static void usage(const char *av0)
{
- printf("test csv %s csv < data.csv\n",av0);
- printf("test po %s po < data.po\n",av0);
- printf("get strings %s key < xgettext.po\n",av0);
+ printf("list csv %s csv < data.csv > data.po\n",av0);
+ printf("list po %s po < data.po > data.csv\n",av0);
+ printf("list po %s dups < data.po\n",av0);
+ printf("list po %s nodups < data.po\n",av0);
+ printf("get strings %s key < xgettext.po\n",av0);
printf("gen xlation %s xlat xgettext.po xlat.csv\n",av0);
printf("gen xlation %s xlat - text,xlat ... < xgettext.po\n",av0);
exit(1);
printf("gen xlation %s xlat xgettext.po xlat.csv\n",av0);
printf("gen xlation %s xlat - text,xlat ... < xgettext.po\n",av0);
exit(1);
@@
-577,12
+589,24
@@
int main(int ac, char **av)
if( !strcmp(av[1],"csv") ) { // test csv
load(stdin, 0);
for( Trans::iterator it = trans.begin(); it!=trans.end(); ++it ) {
if( !strcmp(av[1],"csv") ) { // test csv
load(stdin, 0);
for( Trans::iterator it = trans.begin(); it!=trans.end(); ++it ) {
- uint8_t str[MX_STR]; xlat3(it->second.c_str(), str);
- printf("key = \"%s\", val = %s\n", it->first.c_str(), (char *)str);
+ uint8_t str1[MX_STR]; xlat3(it->first.c_str(), str1);
+ printf("msgid %s\n", (char *)str1);
+ uint8_t str2[MX_STR]; xlat3(it->second.c_str(), str2);
+ printf("msgstr %s\n\n", (char *)str2);
}
return 0;
}
}
return 0;
}
+ if( !strcmp(av[1],"dups") ) { // test po
+ list_po(stdin, stdout, -1, -1);
+ return 0;
+ }
+
+ if( !strcmp(av[1],"nodups") ) { // test po
+ list_po(stdin, stdout, 1, 1);
+ return 0;
+ }
+
if( !strcmp(av[1],"po") ) { // test po
list_po(stdin, stdout);
return 0;
if( !strcmp(av[1],"po") ) { // test po
list_po(stdin, stdout);
return 0;
@@
-605,6
+629,7
@@
int main(int ac, char **av)
return 1;
}
return 1;
}
+ brkput = 1;
for( int i=3; i<ac; ++i ) { // create trans mapping
fprintf(stderr,"*** load %s\n", av[i]);
char fn[MX_STR*2];
for( int i=3; i<ac; ++i ) { // create trans mapping
fprintf(stderr,"*** load %s\n", av[i]);
char fn[MX_STR*2];