xmlNodePtr stack_node[ STACK_SIZE ];
int stack_node_size;
xmlDocPtr entity_doc;
+ int entity_is_replace;
int depth;
int branch[ STACK_SIZE ];
const xmlChar *publicId;
if ( context->stack_node_size > 0 )
xmlNodeAddContent( context->stack_node[ context->stack_node_size - 1 ], ( xmlChar* )value );
- else if ( context->property != NULL && context->producer_properties != NULL )
- mlt_properties_set( context->producer_properties, context->property, value );
+ // libxml2 generates an on_characters immediately after a get_entity within
+ // an element value, and we ignore it because it is called again during
+ // actual substitution.
+ else if ( context->property != NULL && context->producer_properties != NULL
+ && context->entity_is_replace == 0 )
+ {
+ char *s = mlt_properties_get( context->producer_properties, context->property );
+ if ( s != NULL )
+ {
+ // Append new text to existing content
+ char *new = calloc( strlen( s ) + len + 1, 1 );
+ strcat( new, s );
+ strcat( new, value );
+ mlt_properties_set( context->producer_properties, context->property, new );
+ free( new );
+ }
+ else
+ mlt_properties_set( context->producer_properties, context->property, value );
+ }
+ context->entity_is_replace = 0;
free( value);
}
{
struct _xmlParserCtxt *xmlcontext = ( struct _xmlParserCtxt* )ctx;
deserialise_context context = ( deserialise_context )( xmlcontext->_private );
+ xmlEntityPtr e = NULL;
// Setup for entity declarations if not ready
if ( xmlGetIntSubset( context->entity_doc ) == NULL )
// Add our parameters if not already
params_to_entities( context );
- return xmlGetDocEntity( context->entity_doc, name );
+ e = xmlGetDocEntity( context->entity_doc, name );
+
+ // Send signal to on_characters that an entity substitutin is pending
+ if ( e != NULL )
+ context->entity_is_replace = 1;
+
+ return e;
}
/** Convert a hexadecimal character to its value.
mlt_producer producer_westley_init( char *url )
{
+ if ( url == NULL )
+ return NULL;
xmlSAXHandler *sax = calloc( 1, sizeof( xmlSAXHandler ) );
struct deserialise_context_s *context = calloc( 1, sizeof( struct deserialise_context_s ) );
mlt_properties properties = NULL;