[LyX/2.1.1-staging] Patch from Enrico fixing a problem with the lyxpak.py script when "Add Bibliography to TOC" is used. Fixes #9044. (cherry picked from commit 1fe2910774b5f1d673e3f85349c8d360023214db)

[Richard Heck]

commit 1c637181114bab913727ee922db2ac64d9acf7e5
Author: Richard Heck <***@lyx.org>
Date: Sat Mar 22 20:19:17 2014 -0400

Patch from Enrico fixing a problem with the lyxpak.py script when
"Add Bibliography to TOC" is used. Fixes #9044.
(cherry picked from commit 1fe2910774b5f1d673e3f85349c8d360023214db)

diff --git a/lib/scripts/lyxpak.py b/lib/scripts/lyxpak.py
index f3b8078..ed4f206 100755
--- a/lib/scripts/lyxpak.py
+++ b/lib/scripts/lyxpak.py
@@ -145,6 +145,8 @@ def gather_files(curfile, incfiles, lyx2lyx):
match = re_options.match(lines[i])
if match:
file = match.group(3).strip('"')
+ if file.startswith("bibtotoc,"):
+ file = file[9:]
if not os.path.isabs(file):
file = os.path.join(curdir, file + '.bst')
if os.path.exists(fi

[Richard Heck]

commit e60af4e98af1fe0ba51bd7a312e02b05201cd784
Author: Richard Heck <***@lyx.org>
Date: Sat Mar 22 20:19:17 2014 -0400

Patch from Enrico fixing a problem with the lyxpak.py script when
"Add Bibliography to TOC" is used. Fixes #9044.
(cherry picked from commit 1fe2910774b5f1d673e3f85349c8d360023214db)

diff --git a/lib/scripts/lyxpak.py b/lib/scripts/lyxpak.py
index 77b16fa..7c08854 100755
--- a/lib/scripts/lyxpak.py
+++ b/lib/scripts/lyxpak.py
@@ -146,6 +146,8 @@ def gather_files(curfile, incfiles, lyx2lyx):
match = re_options.match(lines[i])
if match:
file = match.group(3).strip('"')
+ if file.startswith("bibtotoc,"):
+ file = file[9:]
if not os.path.isabs(file):
file = os.path.join(curdir, file + '.bst')
if os.path.exists(file):
diff --git a/status.20x b/status.20x
index dd5b8de..b784b6b 100644
--- a/status.20x
+++ b/status.20x
@@ -68,6 +68,8 @@ What's new

- Fix clash between \protect and \ensuremath (bug 8889).

+- Fix problem with export of LyX archive when bibtotoc is used (bug 9044).
+

* USER