Changeset 865

Show
Ignore:
Timestamp:
04/22/08 21:19:11 (6 months ago)
Author:
astrange
Message:

Improve SSA parsing for files with stray [ in them.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Subtitles/SubParsing.m.rl

    r841 r865  
    171171                sline = (("Style:" ws* %sstart str %csvlineend) | str) :> nl; 
    172172                 
    173                 styles = stylename % {cur_array=stylearr;} nl (format %{styleformat=str;})? <: (sline*); 
     173                styles = stylename % {cur_array=stylearr;} nl :> (format %{styleformat=str;})? <: (sline*); 
    174174                 
    175175                event_txt = (("Dialogue:" ws* %sstart str %csvlineend) | str); 
    176176                event = event_txt :> nl; 
    177177                         
    178                 lines = "[Events]" %setupevents nl (format %{eventformat=str;})? <: (event*); 
    179                  
    180                 main := bom? header :> styles :> lines?; 
     178                lines = "[Events]" %setupevents nl :> (format %{eventformat=str;})? <: (event*); 
     179                 
     180                main := bom? header styles lines?; 
    181181        }%% 
    182182