Author: spitz
Date: Mon Mar 21 10:18:25 2011
New Revision: 37981
URL: http://www.lyx.org/trac/changeset/37981

Log:
backport r37909:

Author: spitz
Date: Sun Mar 13 12:57:01 2011
New Revision: 37909
URL: http://www.lyx.org/trac/changeset/37909

Log:
* LaTeX.cpp: fix another variant of bug #7344 (delete aux files and rerun LaTeX 
if hyperref has been toggled)

Modified:
   lyx-devel/branches/BRANCH_1_6_X/src/LaTeX.cpp
   lyx-devel/branches/BRANCH_1_6_X/status.16x

Modified: lyx-devel/branches/BRANCH_1_6_X/src/LaTeX.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/src/LaTeX.cpp       Mon Mar 21 01:46:15 
2011        (r37980)
+++ lyx-devel/branches/BRANCH_1_6_X/src/LaTeX.cpp       Mon Mar 21 10:18:25 
2011        (r37981)
@@ -758,6 +758,12 @@
                                        ++num_errors;
                                }
                        }
+
+                       if (prefixIs(token, "! Paragraph ended before 
\\Hy@setref@link was complete.")){
+                                       // bug 7344. We must rerun LaTeX if 
hyperref has been toggled.
+                                       retval |= ERROR_RERUN;
+                                       LYXERR(Debug::LATEX, "Force rerun.");
+                       }
                } else {
                        // information messages, TeX warnings and other
                        // warnings we have not caught earlier.

Modified: lyx-devel/branches/BRANCH_1_6_X/status.16x
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/status.16x  Mon Mar 21 01:46:15 2011        
(r37980)
+++ lyx-devel/branches/BRANCH_1_6_X/status.16x  Mon Mar 21 10:18:25 2011        
(r37981)
@@ -56,6 +56,8 @@
 
 - When exporting, alert about uncodable characters in child docs (bug 7326).
 
+- Prevent LaTeX error when toggling hyperref (bug 7344).
+
 
 * USER INTERFACE
 

Reply via email to