Smarter ol parsing

markdown.py

@@ -342,11 +342,15 @@ def tokenise(source):

                                
                                
                                
                            
                                
                                    
                                        
                                            342  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            343  
                                                        content = []
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            344  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        345 -
                                                    while i < len(lines) and re.match(r"^\d+\.", line) and len(lines[i].split(".", 1)) > 1:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        345 +
                                                    while i < len(lines) and re.match(r"^ ?\d+\.", lines[i]) and len(lines[i].split(".", 1)) > 1:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            346  
                                                            inner_content = lines[i].split(".", 1)[1] + "\n"      # discard number and period
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            347  
                                                            i += 1
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        348 -
                                                        while i < len(lines) and lines[i].strip() and not re.match(r"^\d+\.", line):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        349 -
                                                            inner_content += lines[i][1:] + "\n"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        348 +
                                                        print(lines[i])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        349 +
                                                        marker_length = len(lines[i].split(".", 1)[0]) + 1
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        350 +
                                                        while i < len(lines) and lines[i].strip() and not re.match(r"^ ?\d+\.", lines[i]):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        351 +
                                                            if re.match(r"^  \d+\.", lines[i]):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        352 +
                                                                marker_length = 2
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        353 +
                                                            inner_content += lines[i][marker_length:] + "\n"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            354  
                                                                i += 1
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            355  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            356  
                                                            content.append(ListItem(inner_content))