Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Only detect the template type keyword on the first line.

Browse Source 
Remove an extra space from the default formatter exception message.
This commit is contained in:
Charles Haley 2022-10-10 21:06:09 +01:00
parent f1f8c32975
commit 294a28433c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/gui2/dialogs/template_dialog.py
View File

@ -216,7 +216,14 @@ class TemplateHighlighter(QSyntaxHighlighter):
pp = self.find_paren(bn, i) pp = self.find_paren(bn, i)
if pp and pp.highlight: if pp and pp.highlight:
self.setFormat(i, length, self.Formats[format_]) self.setFormat(i, length, self.Formats[format_])
elif format_ == 'keyword':
if bn > 0 and i == 0:
if text[i:i+length] == ('python:' if self.for_python else 'program:'):
continue
print('bn', bn, format_, text[i:i+length])
self.setFormat(i, length, self.Formats[format_])
else: else:
print('bn', bn, format_, text[i:i+length])
self.setFormat(i, length, self.Formats[format_]) self.setFormat(i, length, self.Formats[format_])
self.setCurrentBlockState(NORMAL) self.setCurrentBlockState(NORMAL)
@ -796,7 +803,7 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
w = tv.cellWidget(r, 0) w = tv.cellWidget(r, 0)
w.setText(mi.title) w.setText(mi.title)
w.setCursorPosition(0) w.setCursorPosition(0)
v = SafeFormat().safe_format(txt, mi, _('EXCEPTION: '), v = SafeFormat().safe_format(txt, mi, _('EXCEPTION:'),
mi, global_vars=self.global_vars, mi, global_vars=self.global_vars,
template_functions=self.all_functions, template_functions=self.all_functions,
break_reporter=self.break_reporter if r == break_on_mi else None) break_reporter=self.break_reporter if r == break_on_mi else None)

2
src/calibre/utils/formatter.py
View File

@ -1591,7 +1591,7 @@ class TemplateFormatter(string.Formatter):
raise(ValueError( raise(ValueError(
_('Syntax error on line {0} column {1}: text {2}').format(e.lineno, e.offset, e.text))) _('Syntax error on line {0} column {1}: text {2}').format(e.lineno, e.offset, e.text)))
except KeyError: except KeyError:
raise(ValueError(_("Error: the {0} function is not defined in the template").format('evaluate'))) raise(ValueError(_("The {0} function is not defined in the template").format('evaluate')))
# ################# Override parent classes methods ##################### # ################# Override parent classes methods #####################