Re: Error in lilypond-book

[Neil Puttock]

2009/6/8 Francisco Vila <address@hidden>:

> Great! Let's do it, could you send a patch? Forwarding to -devel.

Sure, here's a patch using my first suggestion:

>From b387a453c08b4f8618c51a0b48abee87d7d62644 Mon Sep 17 00:00:00 2001
From: Neil Puttock <address@hidden>
Date: Wed, 10 Jun 2009 23:47:25 +0100
Subject: [PATCH] Lilypond-book: robustify searches inside
get_latex_textwidth ().

- when searching for `columns', `columnsep' and `textwidth',
  try to match at least one digit following equals sign.
---
 scripts/lilypond-book.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index e851a40..886396c 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1747,17 +1747,17 @@ def get_latex_textwidth (source):
     os.unlink (logfile)

     columns = 0
-    m = re.search ('columns=([0-9.]*)', parameter_string)
+    m = re.search ('columns=([0-9.]+)', parameter_string)
     if m:
         columns = int (m.group (1))

     columnsep = 0
-    m = re.search ('columnsep=([0-9.]*)pt', parameter_string)
+    m = re.search ('columnsep=([0-9.]+)pt', parameter_string)
     if m:
         columnsep = float (m.group (1))

     textwidth = 0
-    m = re.search ('textwidth=([0-9.]*)pt', parameter_string)
+    m = re.search ('textwidth=([0-9.]+)pt', parameter_string)
     if m:
         textwidth = float (m.group (1))
         if columns:
-- 
1.6.0.4

Regards,
Neil

0001-Lilypond-book-robustify-searches-inside-get_latex_t.patch
Description: Text Data