Merge branch 'master' of git.lyx.org:lyx

This commit is contained in:
Kornel Benko 2012-10-09 13:24:39 +02:00
commit df880b8e92

View File

@ -1059,7 +1059,7 @@ def processLayoutFile(file, bool_docbook):
prereq_docbook = {'true':'', 'false':'docbook'}[bool_docbook]
prereq = {'LaTeX':prereq_latex, 'DocBook':prereq_docbook}[classtype]
classdeclaration = '"%s" "%s" "%s" "%s" "%s"' % (classname, opt, desc, avai, prereq)
if categorydeclaration != "":
if categorydeclaration != '""':
return classdeclaration + " " + categorydeclaration
if qres != None:
categorydeclaration = '"%s"' % (qres.groups()[0])