anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix another couple of issues spotted by Guillaume

Browse Source 
* Take into account macro redefinitions in the legacy route
* Take into account macros inside nested macro definitions
This commit is contained in:
Enrico Forestieri 2015-06-20 16:37:12 +02:00
parent b610c13f67
commit cabc7c4be1
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/scripts/lyxpreview_tools.py
View File

@ -272,11 +272,13 @@ def write_metrics_info(metrics_info, metrics_file):
# Reads a .tex files and create an identical file but only with
# pages whose index is in pages_to_keep
def filter_pages(source_path, destination_path, pages_to_keep):
def_re = re.compile(r"(\\newcommandx|\\renewcommandx|\\global\\long\\def)(\\[a-zA-Z]+)(.+)")
source_file = open(source_path, "r")
destination_file = open(destination_path, "w")
page_index = 0
skip_page = False
macros = []
for line in source_file:
# We found a new page
if line.startswith("\\begin{preview}"):
@ -285,6 +287,14 @@ def filter_pages(source_path, destination_path, pages_to_keep):
skip_page = page_index not in pages_to_keep
if not skip_page:
match = def_re.match(line)
if match != None:
definecmd = match.group(1)
macroname = match.group(2)
if not macroname in macros:
macros.append(macroname)
if definecmd == "\\renewcommandx":
line = line.replace(definecmd, "\\newcommandx")
destination_file.write(line)
# End of a page, we reset the skip_page bool

6
src/mathed/InsetMathHull.cpp
View File

@ -37,6 +37,7 @@
#include "LyXRC.h"
#include "MacroTable.h"
#include "MathMacro.h"
#include "MathMacroTemplate.h"
#include "output_xhtml.h"
#include "Paragraph.h"
#include "ParIterator.h"
@ -635,6 +636,7 @@ void InsetMathHull::usedMacros(MathData const & md, DocIterator const & pos,
for (size_t i = 0; i < md.size(); ++i) {
MathMacro const * mi = md[i].nucleus()->asMacro();
MathMacroTemplate const * mt = md[i].nucleus()->asMacroTemplate();
InsetMathScript const * si = md[i].nucleus()->asScriptInset();
InsetMathFracBase const * fi = md[i].nucleus()->asFracBaseInset();
InsetMathGrid const * gi = md[i].nucleus()->asGridInset();
@ -662,6 +664,10 @@ void InsetMathHull::usedMacros(MathData const & md, DocIterator const & pos,
asArray(data->definition(), ar);
}
usedMacros(ar, pos, macros, defs);
} else if (mt) {
MathData ar(pos.buffer());
asArray(mt->definition(), ar);
usedMacros(ar, pos, macros, defs);
} else if (si) {
if (!si->nuc().empty())
usedMacros(si->nuc(), pos, macros, defs);