[LyX master] Fix bug #8164: lyxpak.py fails to include filenames with spaces
The branch, master, has been updated. - Log - commit fbcf2486d84b4ea543560cb7f583bc38e6cf67f5 Author: Enrico Forestieri for...@lyx.org Date: Sun May 20 16:32:47 2012 +0200 Fix bug #8164: lyxpak.py fails to include filenames with spaces People love embedding spaces in filenames, so account for that. diff --git a/lib/scripts/lyxpak.py b/lib/scripts/lyxpak.py index 37829e0..d341977 100755 --- a/lib/scripts/lyxpak.py +++ b/lib/scripts/lyxpak.py @@ -23,15 +23,15 @@ from getopt import getopt # Pre-compiled regular expressions. re_lyxfile = re.compile(\.lyx$) -re_input = re.compile(r'^(.*)\\(input|include){(\s*)(\S+)(\s*)}.*$') -re_ertinput = re.compile(r'^(input|include)({)(\s*)(\S+)(\s*)}.*$') -re_package = re.compile(r'^(.*)\\(usepackage){(\s*)(\S+)(\s*)}.*$') -re_class = re.compile(r'^(\\)(textclass)(\s+)(\S+)$') -re_norecur = re.compile(r'^(.*)\\(verbatiminput|lstinputlisting|includegraphics\[*.*\]*){(\s*)(\S+)(\s*)}.*$') -re_ertnorecur = re.compile(r'^(verbatiminput|lstinputlisting|includegraphics\[*.*\]*)({)(\s*)(\S+)(\s*)}.*$') -re_filename = re.compile(r'^(\s*)(filename)(\s+)(\S+)$') -re_options = re.compile(r'^(\s*)options(\s+)(\S+)$') -re_bibfiles = re.compile(r'^(\s*)bibfiles(\s+)(\S+)$') +re_input = re.compile(r'^(.*)\\(input|include){(\s*)(.+)(\s*)}.*$') +re_ertinput = re.compile(r'^(input|include)({)(\s*)(.+)(\s*)}.*$') +re_package = re.compile(r'^(.*)\\(usepackage){(\s*)(.+)(\s*)}.*$') +re_class = re.compile(r'^(\\)(textclass)(\s+)(.+)\s*$') +re_norecur = re.compile(r'^(.*)\\(verbatiminput|lstinputlisting|includegraphics\[*.*\]*){(\s*)(.+)(\s*)}.*$') +re_ertnorecur = re.compile(r'^(verbatiminput|lstinputlisting|includegraphics\[*.*\]*)({)(\s*)(.+)(\s*)}.*$') +re_filename = re.compile(r'^(\s*)(filename)(\s+)(.+)\s*$') +re_options = re.compile(r'^(\s*)options(\s+)(.+)\s*$') +re_bibfiles = re.compile(r'^(\s*)bibfiles(\s+)(.+)\s*$') def usage(prog_name): --- Summary of changes: lib/scripts/lyxpak.py | 18 +- 1 files changed, 9 insertions(+), 9 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX 2.0.x] Fix bug #8164: lyxpak.py fails to include filenames with spaces
The branch, 2.0.x, has been updated. - Log - commit 5909fc467a2e1106b57561fb811c8d2f4198db63 Author: Enrico Forestieri for...@lyx.org Date: Sun May 20 16:32:47 2012 +0200 Fix bug #8164: lyxpak.py fails to include filenames with spaces People love embedding spaces in filenames, so account for that. (cherry picked from commit fbcf2486d84b4ea543560cb7f583bc38e6cf67f5) diff --git a/lib/scripts/lyxpak.py b/lib/scripts/lyxpak.py index 37829e0..d341977 100755 --- a/lib/scripts/lyxpak.py +++ b/lib/scripts/lyxpak.py @@ -23,15 +23,15 @@ from getopt import getopt # Pre-compiled regular expressions. re_lyxfile = re.compile(\.lyx$) -re_input = re.compile(r'^(.*)\\(input|include){(\s*)(\S+)(\s*)}.*$') -re_ertinput = re.compile(r'^(input|include)({)(\s*)(\S+)(\s*)}.*$') -re_package = re.compile(r'^(.*)\\(usepackage){(\s*)(\S+)(\s*)}.*$') -re_class = re.compile(r'^(\\)(textclass)(\s+)(\S+)$') -re_norecur = re.compile(r'^(.*)\\(verbatiminput|lstinputlisting|includegraphics\[*.*\]*){(\s*)(\S+)(\s*)}.*$') -re_ertnorecur = re.compile(r'^(verbatiminput|lstinputlisting|includegraphics\[*.*\]*)({)(\s*)(\S+)(\s*)}.*$') -re_filename = re.compile(r'^(\s*)(filename)(\s+)(\S+)$') -re_options = re.compile(r'^(\s*)options(\s+)(\S+)$') -re_bibfiles = re.compile(r'^(\s*)bibfiles(\s+)(\S+)$') +re_input = re.compile(r'^(.*)\\(input|include){(\s*)(.+)(\s*)}.*$') +re_ertinput = re.compile(r'^(input|include)({)(\s*)(.+)(\s*)}.*$') +re_package = re.compile(r'^(.*)\\(usepackage){(\s*)(.+)(\s*)}.*$') +re_class = re.compile(r'^(\\)(textclass)(\s+)(.+)\s*$') +re_norecur = re.compile(r'^(.*)\\(verbatiminput|lstinputlisting|includegraphics\[*.*\]*){(\s*)(.+)(\s*)}.*$') +re_ertnorecur = re.compile(r'^(verbatiminput|lstinputlisting|includegraphics\[*.*\]*)({)(\s*)(.+)(\s*)}.*$') +re_filename = re.compile(r'^(\s*)(filename)(\s+)(.+)\s*$') +re_options = re.compile(r'^(\s*)options(\s+)(.+)\s*$') +re_bibfiles = re.compile(r'^(\s*)bibfiles(\s+)(.+)\s*$') def usage(prog_name): diff --git a/status.20x b/status.20x index 7b058cf..4a99172 100644 --- a/status.20x +++ b/status.20x @@ -118,6 +118,9 @@ What's new - Fixed XHTML output of id's for bibitems (bug 8156). +- Fix generation of a lyx archive when included files have spaces embedded + in their names (bug 8164). + * USER INTERFACE --- Summary of changes: lib/scripts/lyxpak.py | 18 +- status.20x|3 +++ 2 files changed, 12 insertions(+), 9 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] Fix bug #8164: lyxpak.py fails to include filenames with spaces
The branch, master, has been updated. - Log - commit fbcf2486d84b4ea543560cb7f583bc38e6cf67f5 Author: Enrico ForestieriDate: Sun May 20 16:32:47 2012 +0200 Fix bug #8164: lyxpak.py fails to include filenames with spaces People love embedding spaces in filenames, so account for that. diff --git a/lib/scripts/lyxpak.py b/lib/scripts/lyxpak.py index 37829e0..d341977 100755 --- a/lib/scripts/lyxpak.py +++ b/lib/scripts/lyxpak.py @@ -23,15 +23,15 @@ from getopt import getopt # Pre-compiled regular expressions. re_lyxfile = re.compile("\.lyx$") -re_input = re.compile(r'^(.*)\\(input|include){(\s*)(\S+)(\s*)}.*$') -re_ertinput = re.compile(r'^(input|include)({)(\s*)(\S+)(\s*)}.*$') -re_package = re.compile(r'^(.*)\\(usepackage){(\s*)(\S+)(\s*)}.*$') -re_class = re.compile(r'^(\\)(textclass)(\s+)(\S+)$') -re_norecur = re.compile(r'^(.*)\\(verbatiminput|lstinputlisting|includegraphics\[*.*\]*){(\s*)(\S+)(\s*)}.*$') -re_ertnorecur = re.compile(r'^(verbatiminput|lstinputlisting|includegraphics\[*.*\]*)({)(\s*)(\S+)(\s*)}.*$') -re_filename = re.compile(r'^(\s*)(filename)(\s+)(\S+)$') -re_options = re.compile(r'^(\s*)options(\s+)(\S+)$') -re_bibfiles = re.compile(r'^(\s*)bibfiles(\s+)(\S+)$') +re_input = re.compile(r'^(.*)\\(input|include){(\s*)(.+)(\s*)}.*$') +re_ertinput = re.compile(r'^(input|include)({)(\s*)(.+)(\s*)}.*$') +re_package = re.compile(r'^(.*)\\(usepackage){(\s*)(.+)(\s*)}.*$') +re_class = re.compile(r'^(\\)(textclass)(\s+)(.+)\s*$') +re_norecur = re.compile(r'^(.*)\\(verbatiminput|lstinputlisting|includegraphics\[*.*\]*){(\s*)(.+)(\s*)}.*$') +re_ertnorecur = re.compile(r'^(verbatiminput|lstinputlisting|includegraphics\[*.*\]*)({)(\s*)(.+)(\s*)}.*$') +re_filename = re.compile(r'^(\s*)(filename)(\s+)(.+)\s*$') +re_options = re.compile(r'^(\s*)options(\s+)(.+)\s*$') +re_bibfiles = re.compile(r'^(\s*)bibfiles(\s+)(.+)\s*$') def usage(prog_name): --- Summary of changes: lib/scripts/lyxpak.py | 18 +- 1 files changed, 9 insertions(+), 9 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX 2.0.x] Fix bug #8164: lyxpak.py fails to include filenames with spaces
The branch, 2.0.x, has been updated. - Log - commit 5909fc467a2e1106b57561fb811c8d2f4198db63 Author: Enrico ForestieriDate: Sun May 20 16:32:47 2012 +0200 Fix bug #8164: lyxpak.py fails to include filenames with spaces People love embedding spaces in filenames, so account for that. (cherry picked from commit fbcf2486d84b4ea543560cb7f583bc38e6cf67f5) diff --git a/lib/scripts/lyxpak.py b/lib/scripts/lyxpak.py index 37829e0..d341977 100755 --- a/lib/scripts/lyxpak.py +++ b/lib/scripts/lyxpak.py @@ -23,15 +23,15 @@ from getopt import getopt # Pre-compiled regular expressions. re_lyxfile = re.compile("\.lyx$") -re_input = re.compile(r'^(.*)\\(input|include){(\s*)(\S+)(\s*)}.*$') -re_ertinput = re.compile(r'^(input|include)({)(\s*)(\S+)(\s*)}.*$') -re_package = re.compile(r'^(.*)\\(usepackage){(\s*)(\S+)(\s*)}.*$') -re_class = re.compile(r'^(\\)(textclass)(\s+)(\S+)$') -re_norecur = re.compile(r'^(.*)\\(verbatiminput|lstinputlisting|includegraphics\[*.*\]*){(\s*)(\S+)(\s*)}.*$') -re_ertnorecur = re.compile(r'^(verbatiminput|lstinputlisting|includegraphics\[*.*\]*)({)(\s*)(\S+)(\s*)}.*$') -re_filename = re.compile(r'^(\s*)(filename)(\s+)(\S+)$') -re_options = re.compile(r'^(\s*)options(\s+)(\S+)$') -re_bibfiles = re.compile(r'^(\s*)bibfiles(\s+)(\S+)$') +re_input = re.compile(r'^(.*)\\(input|include){(\s*)(.+)(\s*)}.*$') +re_ertinput = re.compile(r'^(input|include)({)(\s*)(.+)(\s*)}.*$') +re_package = re.compile(r'^(.*)\\(usepackage){(\s*)(.+)(\s*)}.*$') +re_class = re.compile(r'^(\\)(textclass)(\s+)(.+)\s*$') +re_norecur = re.compile(r'^(.*)\\(verbatiminput|lstinputlisting|includegraphics\[*.*\]*){(\s*)(.+)(\s*)}.*$') +re_ertnorecur = re.compile(r'^(verbatiminput|lstinputlisting|includegraphics\[*.*\]*)({)(\s*)(.+)(\s*)}.*$') +re_filename = re.compile(r'^(\s*)(filename)(\s+)(.+)\s*$') +re_options = re.compile(r'^(\s*)options(\s+)(.+)\s*$') +re_bibfiles = re.compile(r'^(\s*)bibfiles(\s+)(.+)\s*$') def usage(prog_name): diff --git a/status.20x b/status.20x index 7b058cf..4a99172 100644 --- a/status.20x +++ b/status.20x @@ -118,6 +118,9 @@ What's new - Fixed XHTML output of id's for bibitems (bug 8156). +- Fix generation of a lyx archive when included files have spaces embedded + in their names (bug 8164). + * USER INTERFACE --- Summary of changes: lib/scripts/lyxpak.py | 18 +- status.20x|3 +++ 2 files changed, 12 insertions(+), 9 deletions(-) hooks/post-receive -- The LyX Source Repository