Changeset 1031 for trunk/plugins/en/output_VAR.tcl

Timestamp:

09/11/09 05:40:45 (3 years ago)

Author:

james

Message:

Add revmixin and nomixin options to %VAR, to allow the gender-mixin stuff to be controlled

File:

• trunk/plugins/en/output_VAR.tcl (modified) (4 diffs)

trunk/plugins/en/output_VAR.tcl

@@ -24 +24 @@
 proc bMotion_plugin_output_VAR { channel line } {
         bMotion_putloglev 4 * "bMotion_plugin_output_VAR $channel $line"
+        global BMOTION_MIXIN_NONE BMOTION_MIXIN_REVERSE BMOTION_MIXIN_DEFAULT
 
         set line [string map { "%noun" "%VAR{sillyThings}" } $line]
@@ -30 +31 @@
         regsub {%VAR\{([^\}]+)\}\{strip\}} $line "%VAR{\\1:strip}" line
 
-        if {[regexp -nocase {(%VAR\{([^\}:]+)(:[^\}]+)?\}(\{strip\})?)} $line matches whole_thing abstract options clean]} {
+        if {[regexp -nocase {(%VAR\{([^\}:]+)(:([^\}]+))?\}(\{strip\})?)} $line matches whole_thing abstract 1 options clean]} {
                 global $abstract
+
+                bMotion_putloglev 1 * "options for $abstract are $options"
+
+                # check options
+                if {$options != ""} {
+                        set options_list [split $options ","]
+                } else {
+                        set options_list [list]
+                }
+                bMotion_putloglev 1 * "options list is $options_list"
+
+                if {$clean == "{strip}"} {
+                        lappend options_list "clean"
+                }
+
+                set mixin_type $BMOTION_MIXIN_DEFAULT
+
+                if {[lsearch $options_list "revmixin"] > -1} {
+                        bMotion_putloglev 1 * "mixin type for $abstract is reverse"
+                        set mixin_type $BMOTION_MIXIN_REVERSE
+                } elseif {[lsearch $options_list "nomixin"] > -1} {
+                        bMotion_putloglev 1 * "mixin type for $abstract is none"
+                        set mixin_type $BMOTION_MIXIN_NONE
+                }
+
                 #see if we have a new-style abstract available
-                set newText [bMotion_abstract_get $abstract]
+                set newText [bMotion_abstract_get $abstract $mixin_type]
                 set replacement ""
                 if {$newText == ""} {
@@ -49 +75 @@
                 }
 
-                # check options
-                set options [string range $options 1 end]
-                if {$options != ""} {
-                        set options_list [split $options ","]
-                } else {
-                        set options_list [list]
-                }
-
-                if {$clean == "{strip}"} {
-                        lappend options_list "clean"
-                }
 
                 if {[lsearch $options_list "strip"] == -1} {
@@ -131 +146 @@
 }
 
+
 bMotion_plugin_add_output "VAR" bMotion_plugin_output_VAR 1 "en" 3