X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftitler%2Ftitler.C;h=5086fea00d029d6101dae87de2b60ae5229449ed;hp=5d9f7cf25f8412601c4f3f0718b69aa0a5c46592;hb=7e5a0760f40ff787cc3d93cb7768a901ebe52809;hpb=1f004d22ca7bd7a98a3bf02b12ec5b1adece92f2

diff --git a/cinelerra-5.1/plugins/titler/titler.C b/cinelerra-5.1/plugins/titler/titler.C
index 5d9f7cf2..5086fea0 100644
--- a/cinelerra-5.1/plugins/titler/titler.C
+++ b/cinelerra-5.1/plugins/titler/titler.C
@@ -78,6 +78,10 @@ REGISTER_PLUGIN(TitleMain)
 #endif
 #define DEFAULT_TIMECODEFORMAT TIME_HMS
 
+static inline int kw_strcmp(const char *ap, const char *bp) {
+	return !strcmp(ap, bp) ? 0 : strcmp(ap,_(bp));
+}
+
 TitleConfig::TitleConfig()
 {
 	strcpy(font, "fixed");
@@ -1629,19 +1633,19 @@ int TitleCurNudge::set(const char *txt)
 
 int TitleParser::set_attributes(int ret)
 {
-        if( !strcmp(id,KW_NUDGE) )  return ret>1 ? cur_nudge.unset(text)  : cur_nudge.set(text);
-        if( !strcmp(id,KW_COLOR) )  return ret>1 ? cur_color.unset(text)  : cur_color.set(text);
-        if( !strcmp(id,KW_ALPHA) )  return ret>1 ? cur_alpha.unset(text)  : cur_alpha.set(text);
-        if( !strcmp(id,KW_FONT) )   return ret>1 ? cur_font.unset(text)   : cur_font.set(text);
-        if( !strcmp(id,KW_SIZE) )   return ret>1 ? cur_size.unset(text)   : cur_size.set(text);
-        if( !strcmp(id,KW_BOLD) )   return ret>1 ? cur_bold.unset(text)   : cur_bold.set(text);
-        if( !strcmp(id,KW_ITALIC) ) return ret>1 ? cur_italic.unset(text) : cur_italic.set(text);
-        if( !strcmp(id,KW_CAPS) )   return ret>1 ? cur_caps.unset(text)   : cur_caps.set(text);
-        if( !strcmp(id,KW_UL) )     return ret>1 ? cur_under.unset(text)  : cur_under.set(text);
-        if( !strcmp(id,KW_BLINK) )  return ret>1 ? cur_blink.unset(text)  : cur_blink.set(text);
-        if( !strcmp(id,KW_FIXED) )  return ret>1 ? cur_fixed.unset(text)  : cur_fixed.set(text);
-        if( !strcmp(id,KW_ALIAS) )  return ret>1 ? cur_alias.unset(text)  : cur_alias.set(text);
-        if( !strcmp(id,KW_SUP) )    return ret>1 ? cur_super.unset(text)  : cur_super.set(text);
+        if( !kw_strcmp(id,KW_NUDGE) )  return ret>1 ? cur_nudge.unset(text)  : cur_nudge.set(text);
+        if( !kw_strcmp(id,KW_COLOR) )  return ret>1 ? cur_color.unset(text)  : cur_color.set(text);
+        if( !kw_strcmp(id,KW_ALPHA) )  return ret>1 ? cur_alpha.unset(text)  : cur_alpha.set(text);
+        if( !kw_strcmp(id,KW_FONT) )   return ret>1 ? cur_font.unset(text)   : cur_font.set(text);
+        if( !kw_strcmp(id,KW_SIZE) )   return ret>1 ? cur_size.unset(text)   : cur_size.set(text);
+        if( !kw_strcmp(id,KW_BOLD) )   return ret>1 ? cur_bold.unset(text)   : cur_bold.set(text);
+        if( !kw_strcmp(id,KW_ITALIC) ) return ret>1 ? cur_italic.unset(text) : cur_italic.set(text);
+        if( !kw_strcmp(id,KW_CAPS) )   return ret>1 ? cur_caps.unset(text)   : cur_caps.set(text);
+        if( !kw_strcmp(id,KW_UL) )     return ret>1 ? cur_under.unset(text)  : cur_under.set(text);
+        if( !kw_strcmp(id,KW_BLINK) )  return ret>1 ? cur_blink.unset(text)  : cur_blink.set(text);
+        if( !kw_strcmp(id,KW_FIXED) )  return ret>1 ? cur_fixed.unset(text)  : cur_fixed.set(text);
+        if( !kw_strcmp(id,KW_ALIAS) )  return ret>1 ? cur_alias.unset(text)  : cur_alias.set(text);
+        if( !kw_strcmp(id,KW_SUP) )    return ret>1 ? cur_super.unset(text)  : cur_super.set(text);
 	return 1;
 }
 
@@ -1658,7 +1662,7 @@ void TitleMain::load_glyphs()
 		int ret = wchrs.tget(wch);
 		if( ret > 0 ) {
 			if( !wchrs.set_attributes(ret) ) continue;
-			if( !strcmp(wchrs.id,KW_PNG) && add_image(wchrs.text) ) continue;
+			if( !kw_strcmp(wchrs.id,KW_PNG) && add_image(wchrs.text) ) continue;
 			wch = wch1;  wchrs.seek(ipos+1);
 			ret = 0;
 		}
@@ -1799,7 +1803,7 @@ int TitleMain::get_text()
 		if( ret > 0 ) {
 			if( !wchrs.set_attributes(ret) ) continue;
 			ret = -1;
-			if( !strcmp(wchrs.id,KW_PNG) ) {
+			if( !kw_strcmp(wchrs.id,KW_PNG) ) {
 				VFrame *png_image = get_image(wchrs.text);
 				if( png_image ) {
 					chr = title_chars.add(CHAR_IMAGE, png_image);