diff --git a/po/ar.po b/po/ar.po index f55211397b..07f97939b6 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6686,7 +6686,7 @@ msgstr "خيارات الصورة في السيرة" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "الاسم" @@ -14954,7 +14954,7 @@ msgstr "قطرة" msgid "Drop up" msgstr "قطرة مقلوبة" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "تيك" @@ -24640,7 +24640,7 @@ msgid "Table (CSV)" msgstr "جدول (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "ليك" @@ -32586,25 +32586,25 @@ msgstr "الحجم: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "تعذر اضافة خطوط أفقية للشبكة في '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, c-format msgid "Macro: %1$s" msgstr "ماكرو : %1$s" -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "أختياري" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "مختصر رياضي" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, c-format msgid "Math Macro: \\%1$s" msgstr "ماكرو رياضيات: \\%1$s" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "ماكرو غير صالح! \\%1$s" diff --git a/po/bg.po b/po/bg.po index 71d229e412..a86667c158 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8201,7 +8201,7 @@ msgstr "" #: lib/layouts/pdfcomment.module:57 lib/layouts/scrlettr.layout:116 #: lib/layouts/scrlttr2.layout:149 lib/layouts/sigplanconf.layout:84 #: lib/layouts/sigplanconf.layout:161 lib/layouts/tcolorbox.module:134 -#: src/frontends/qt4/GuiIndices.cpp:52 src/mathed/MathMacroTemplate.cpp:481 +#: src/frontends/qt4/GuiIndices.cpp:52 src/mathed/InsetMathMacroTemplate.cpp:481 msgid "Name" msgstr "Име" @@ -18459,7 +18459,7 @@ msgstr "" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:532 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:532 msgid "TeX" msgstr "TeX" @@ -30494,7 +30494,7 @@ msgstr "Дълга таблица" # src/frontends/kde/FormPrint.C:118 #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1326 -#: src/mathed/MathMacroTemplate.cpp:537 +#: src/mathed/InsetMathMacroTemplate.cpp:537 msgid "LyX" msgstr "LyX" @@ -39958,30 +39958,30 @@ msgid "Can't change horizontal alignment in '%1$s'" msgstr "Хориз. Подравняване(H)|#H" # src/mathed/formulamacro.C:144 src/mathed/formulamacro.C:171 -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr "Макрос: " # src/mathed/math_forms.C:152 -#: src/mathed/MathMacroTemplate.cpp:489 +#: src/mathed/InsetMathMacroTemplate.cpp:489 #, fuzzy msgid "optional" msgstr "Хориз. Подравняване(H)|#H" # src/LColor.C:81 -#: src/mathed/MathMacroTemplate.cpp:1270 +#: src/mathed/InsetMathMacroTemplate.cpp:1270 #, fuzzy msgid "math macro" msgstr "фон на математика" # src/LColor.C:81 -#: src/mathed/MathMacroTemplate.cpp:1377 +#: src/mathed/InsetMathMacroTemplate.cpp:1377 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "фон на математика" -#: src/mathed/MathMacroTemplate.cpp:1392 +#: src/mathed/InsetMathMacroTemplate.cpp:1392 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/ca.po b/po/ca.po index c105c39ad4..b9a0e47b13 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7077,7 +7077,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Nom" @@ -16013,7 +16013,7 @@ msgstr "" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -26372,7 +26372,7 @@ msgid "Table (CSV)" msgstr "Taula (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -34633,25 +34633,25 @@ msgstr "Comentari:" msgid "Can't change horizontal alignment in '%1$s'" msgstr "No es poden afegir línies horitzontals a %1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr "Paràmetre %1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "opcional" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "macro matemàtica" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "macro matemàtica" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/cs.po b/po/cs.po index 28532e09f6..e994480f06 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6813,7 +6813,7 @@ msgstr "Optional photo for biography" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Jméno" @@ -15336,7 +15336,7 @@ msgstr "Kapka (dolů)" msgid "Drop up" msgstr "Kapka (nahoru)" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -25171,7 +25171,7 @@ msgid "Table (CSV)" msgstr "Tabulka (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33467,25 +33467,25 @@ msgstr "Prohlížet %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Nelze změnit horizontální zarovnání v '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr " Makro: %1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "volitelné" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "mat. makro" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "Mat. makra" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/da.po b/po/da.po index 846855b022..5eadcafdec 100644 --- a/po/da.po +++ b/po/da.po @@ -6978,7 +6978,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Navn" @@ -16014,7 +16014,7 @@ msgstr "kasteskygge" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -26348,7 +26348,7 @@ msgid "Table (CSV)" msgstr "Tabel (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -34461,26 +34461,26 @@ msgstr "Vis %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Kan ikke ændre vandret justering i '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr " Makro: %1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 #, fuzzy msgid "optional" msgstr "valgfri" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "matematikmakro" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "Matematikmakroer" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/de.po b/po/de.po index a6f26c53a6..ef3ac871ed 100644 --- a/po/de.po +++ b/po/de.po @@ -6918,7 +6918,7 @@ msgstr "Optionales Foto für die Biografie" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Name" @@ -15204,7 +15204,7 @@ msgstr "Tropfen abwärts" msgid "Drop up" msgstr "Tropfen aufwärts" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -24920,7 +24920,7 @@ msgid "Table (CSV)" msgstr "Tabelle (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33371,25 +33371,25 @@ msgstr "Größe: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Die horizontale Ausrichtung kann in '%1$s' nicht geändert werden" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, c-format msgid "Macro: %1$s" msgstr "Makro: %1$s" -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "optional" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "Mathe-Makro" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, c-format msgid "Math Macro: \\%1$s" msgstr "Mathe-Makro: \\%1$s" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "Ungültiges Makro! \\%1$s" diff --git a/po/el.po b/po/el.po index 033fcaaabf..cdf8c9adaf 100644 --- a/po/el.po +++ b/po/el.po @@ -6952,7 +6952,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Όνομα" @@ -15731,7 +15731,7 @@ msgstr "Ρίψη σκιάς" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "" @@ -25674,7 +25674,7 @@ msgid "Table (CSV)" msgstr "Πίνακας (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "" @@ -33938,25 +33938,25 @@ msgstr "Προβολή %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Δεν είναι δυνατή η προσθήκη οριζόντιων γραμμών πλέγματος στο '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr " Μακροεντολή: %1$s:" -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "προαιρετικό" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "μακροεντολή μαθηματικών" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "Μαθηματικές Μακροεντολές" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/en.po b/po/en.po index 8722b0b7f7..60b889c0c9 100644 --- a/po/en.po +++ b/po/en.po @@ -6575,7 +6575,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "" @@ -14734,7 +14734,7 @@ msgstr "" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "" @@ -24303,7 +24303,7 @@ msgid "Table (CSV)" msgstr "" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "" @@ -31941,25 +31941,25 @@ msgstr "" msgid "Can't change horizontal alignment in '%1$s'" msgstr "" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, c-format msgid "Macro: %1$s" msgstr "" -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, c-format msgid "Math Macro: \\%1$s" msgstr "" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/es.po b/po/es.po index ea96ea3de2..396e63bb04 100644 --- a/po/es.po +++ b/po/es.po @@ -6806,7 +6806,7 @@ msgstr "Optional photo for biography" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Nombre" @@ -15160,7 +15160,7 @@ msgstr "Gota" msgid "Drop up" msgstr "Gota invertida" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -24929,7 +24929,7 @@ msgid "Table (CSV)" msgstr "Cuadro (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33286,25 +33286,25 @@ msgstr "Tamaño: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "No se puede cambiar la alineación horizontal en '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, c-format msgid "Macro: %1$s" msgstr " Macro: %1$s" -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "opcional" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "macro de ecuación" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, c-format msgid "Math Macro: \\%1$s" msgstr "Macro de ecuación: \\%1$s" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "¡Macro no válida! \\%1$s" diff --git a/po/eu.po b/po/eu.po index aa879d37b0..98e0ccda6b 100644 --- a/po/eu.po +++ b/po/eu.po @@ -6893,7 +6893,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Izena" @@ -15671,7 +15671,7 @@ msgstr "Jaregin itzala" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -25775,7 +25775,7 @@ msgid "Table (CSV)" msgstr "Taula (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -34158,25 +34158,25 @@ msgstr "Ikusi %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Ezin da lerrokadura horizontalik aldatu '%1$s'(e)n" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr " Makroa: %1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "aukerakoa" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "mat. makroa" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "Mat. makroak" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/fi.po b/po/fi.po index fc535bc907..4bd16d1eaf 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6792,7 +6792,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Nimi" @@ -15434,7 +15434,7 @@ msgstr "" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -25371,7 +25371,7 @@ msgid "Table (CSV)" msgstr "Taulukko (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33446,25 +33446,25 @@ msgstr "Koko: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "En voi lisätä vaakaviivat kohteeseen '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, c-format msgid "Macro: %1$s" msgstr "Makro: %1$s" -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "valinnainen" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "matematiikamakro" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, c-format msgid "Math Macro: \\%1$s" msgstr "Matematiikkamakro: \\%1$s" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "Virheellinen makro! \\%1$s" diff --git a/po/fr.po b/po/fr.po index 4a1ccc3e85..48f2bd966a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7148,7 +7148,7 @@ msgstr "Photo facultative pour la biographie" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Nom" @@ -15509,7 +15509,7 @@ msgstr "Goutte d'eau" msgid "Drop up" msgstr "Goutte inversée" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -25233,7 +25233,7 @@ msgid "Table (CSV)" msgstr "Tableau (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33615,25 +33615,25 @@ msgstr "Taille : %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Impossible de modifier l'alignement horizontal dans « %1$s »" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, c-format msgid "Macro: %1$s" msgstr "Macro : %1$s" -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "optionnel" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "macro mathématique" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, c-format msgid "Math Macro: \\%1$s" msgstr "Macros mathématique : \\%1$s" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "Macro mathématique invalide ! \\%1$s" diff --git a/po/gl.po b/po/gl.po index 4d080d8465..781b6d763c 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7101,7 +7101,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Nome" @@ -16040,7 +16040,7 @@ msgstr "" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -26456,7 +26456,7 @@ msgid "Table (CSV)" msgstr "Táboa" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -34935,26 +34935,26 @@ msgstr "Fonte: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Non é posíbel engadir liñas de cuadrícula horizontal en '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr " Macro: %1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 #, fuzzy msgid "optional" msgstr "Horizontal" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "macro matemática" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "macro matemática" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/he.po b/po/he.po index cfd1a3e23c..bc34747d2c 100644 --- a/po/he.po +++ b/po/he.po @@ -6835,7 +6835,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "שם" @@ -15723,7 +15723,7 @@ msgstr "הפל צל" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -25705,7 +25705,7 @@ msgid "Table (CSV)" msgstr "טבלה (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33865,25 +33865,25 @@ msgstr "גופן: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "לא יכול לשנות יישור אופקי בתוך '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr "מאקרו: %1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "אופציונלי" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "מאקרו מתמטיקה" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "מקרו מתמטיים" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, fuzzy, c-format msgid "Invalid macro! \\%1$s" msgstr "מקרו מתמטיים" diff --git a/po/hu.po b/po/hu.po index 43f28d4b23..c73ac39f8b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6905,7 +6905,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Név" @@ -15700,7 +15700,7 @@ msgstr "Árnyék megszüntetése" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -25906,7 +25906,7 @@ msgid "Table (CSV)" msgstr "Táblázat (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -34323,25 +34323,25 @@ msgstr "Betűkészlet: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Nem tudok vízszintes rácsvonalat adni '%1$s'-hoz" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr " Makró: %1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "opcionális" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "képlet makró" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "Képlet makrók" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/ia.po b/po/ia.po index 19415872ab..6d3457709c 100644 --- a/po/ia.po +++ b/po/ia.po @@ -6807,7 +6807,7 @@ msgstr "Photo optional pro biographia" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Nomine" @@ -15164,7 +15164,7 @@ msgstr "Disrola" msgid "Drop up" msgstr "Rola in alto" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -24931,7 +24931,7 @@ msgid "Table (CSV)" msgstr "Tabella (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33301,25 +33301,25 @@ msgstr "Grandor: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Non pote modificar le alineamento horizontal in '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, c-format msgid "Macro: %1$s" msgstr "Macro: %1$s" -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "optional" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "macro mathematic" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, c-format msgid "Math Macro: \\%1$s" msgstr "Macro mat.: \\%1$s" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "Macro non valide! \\%1$s" diff --git a/po/id.po b/po/id.po index 992543f7ea..5ca1799100 100644 --- a/po/id.po +++ b/po/id.po @@ -6863,7 +6863,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Nama" @@ -15636,7 +15636,7 @@ msgstr "Bingkai bayangan" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -25583,7 +25583,7 @@ msgid "Table (CSV)" msgstr "Tabel (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33957,25 +33957,25 @@ msgstr "Tampilkan %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Tidak bisa merubah perataan horisontal di '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr " Makro: %1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "tambahan" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "makro matematika" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "Makro Matematika" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/it.po b/po/it.po index 86a73070e0..8bb3e0da79 100644 --- a/po/it.po +++ b/po/it.po @@ -6733,7 +6733,7 @@ msgstr "Foto opzionale per la biografia" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Nome" @@ -15003,7 +15003,7 @@ msgstr "Drop down" msgid "Drop up" msgstr "Drop up" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -24705,7 +24705,7 @@ msgid "Table (CSV)" msgstr "Tabella (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33023,25 +33023,25 @@ msgstr "Dimensione: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Non si può modificare l'allineamento orizzontale in '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, c-format msgid "Macro: %1$s" msgstr "Macro: %1$s" -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "opzionale" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "macro matematica" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, c-format msgid "Math Macro: \\%1$s" msgstr "Macro mat.: \\%1$s" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "Macro non valida! \\%1$s" diff --git a/po/ja.po b/po/ja.po index 59acc50b83..bae4d1504e 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6725,7 +6725,7 @@ msgstr "経歴用の非必須写真" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "名前" @@ -15032,7 +15032,7 @@ msgstr "雫形" msgid "Drop up" msgstr "逆雫形" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -24723,7 +24723,7 @@ msgid "Table (CSV)" msgstr "表（CSV）" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33014,25 +33014,25 @@ msgstr "寸法: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "「%1$s」の水平揃えを変更することができません．" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, c-format msgid "Macro: %1$s" msgstr "マクロ: %1$s" -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "非必須" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "数式マクロ" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, c-format msgid "Math Macro: \\%1$s" msgstr "数式マクロ: \\%1$s" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "無効なマクロ！\\%1$s" diff --git a/po/ko.po b/po/ko.po index febc114ed2..f88b52c7cd 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6569,7 +6569,7 @@ msgstr "" #: lib/layouts/pdfcomment.module:57 lib/layouts/scrlettr.layout:116 #: lib/layouts/scrlttr2.layout:149 lib/layouts/sigplanconf.layout:84 #: lib/layouts/sigplanconf.layout:161 lib/layouts/tcolorbox.module:134 -#: src/frontends/qt4/GuiIndices.cpp:52 src/mathed/MathMacroTemplate.cpp:481 +#: src/frontends/qt4/GuiIndices.cpp:52 src/mathed/InsetMathMacroTemplate.cpp:481 msgid "Name" msgstr "" @@ -14783,7 +14783,7 @@ msgstr "" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:532 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:532 msgid "TeX" msgstr "TeX" @@ -24771,7 +24771,7 @@ msgid "Table (CSV)" msgstr "" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1326 -#: src/mathed/MathMacroTemplate.cpp:537 +#: src/mathed/InsetMathMacroTemplate.cpp:537 msgid "LyX" msgstr "LyX" @@ -32582,25 +32582,25 @@ msgstr "%1$s 보기" msgid "Can't change horizontal alignment in '%1$s'" msgstr "" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr "글꼴: %1$s" -#: src/mathed/MathMacroTemplate.cpp:489 +#: src/mathed/InsetMathMacroTemplate.cpp:489 msgid "optional" msgstr "" -#: src/mathed/MathMacroTemplate.cpp:1270 +#: src/mathed/InsetMathMacroTemplate.cpp:1270 msgid "math macro" msgstr "수식 매크로" -#: src/mathed/MathMacroTemplate.cpp:1377 +#: src/mathed/InsetMathMacroTemplate.cpp:1377 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "수식 매크로" -#: src/mathed/MathMacroTemplate.cpp:1392 +#: src/mathed/InsetMathMacroTemplate.cpp:1392 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/nb.po b/po/nb.po index aaab2fc834..cbc8429153 100644 --- a/po/nb.po +++ b/po/nb.po @@ -6741,7 +6741,7 @@ msgstr "Frivillig foto for biografi" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Navn" @@ -15137,7 +15137,7 @@ msgstr "Dråpe ned" msgid "Drop up" msgstr "Dråpe opp" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -24910,7 +24910,7 @@ msgid "Table (CSV)" msgstr "Tabell (kommaseparert)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33194,25 +33194,25 @@ msgstr "Størrelse: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Kan ikke endre vannrett justering i '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, c-format msgid "Macro: %1$s" msgstr "Makro: %1$s" -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "valgfri" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "mattemakro" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, c-format msgid "Math Macro: \\%1$s" msgstr "Mattemakro: \\%1$s" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "Ugyldig makro! \\%1$s" diff --git a/po/nl.po b/po/nl.po index 9a57e2bfbb..8de137986a 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6927,7 +6927,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "" @@ -15642,7 +15642,7 @@ msgstr "Schaduw" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -25717,7 +25717,7 @@ msgid "Table (CSV)" msgstr "Tabel (komma-gescheiden)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33609,25 +33609,25 @@ msgstr "%1$s weergeven" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Kan horizontale uitlijning van '%1$s' niet veranderen" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr " Macro: %1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "optioneel" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "math macro" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "Formule-macros" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/nn.po b/po/nn.po index e0c6ed2e29..1790a25aee 100644 --- a/po/nn.po +++ b/po/nn.po @@ -6807,7 +6807,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Namn" @@ -15508,7 +15508,7 @@ msgstr "Kastar skugge" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -25538,7 +25538,7 @@ msgid "Table (CSV)" msgstr "Tabell (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33820,25 +33820,25 @@ msgstr "Sjå %1$s." msgid "Can't change horizontal alignment in '%1$s'" msgstr "Kan ikkje endre vassrettjustering i '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr "Makro: %1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "valfritt" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "mattemakroar" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "Mattemakroar" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/pl.po b/po/pl.po index c6aa6d35c8..6672dbc606 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6879,7 +6879,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Nazwa" @@ -15655,7 +15655,7 @@ msgstr "Rzuca cień" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -25703,7 +25703,7 @@ msgid "Table (CSV)" msgstr "Tabela (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -34045,25 +34045,25 @@ msgstr "Podgląd %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Nie można zmienić poziomego wyrównania w '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr "Makro: %1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "opcjonalne" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "makro matematyczne" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "Makra matematyczne" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8fd4f07647..73f5876c91 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6811,7 +6811,7 @@ msgstr "Foto opcional para a biografia" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Nome" @@ -15157,7 +15157,7 @@ msgstr "Gota" msgid "Drop up" msgstr "Gota Invertida" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -24897,7 +24897,7 @@ msgid "Table (CSV)" msgstr "Tabela (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33252,25 +33252,25 @@ msgstr "Tamanho: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Não é possível alterar alinhamento horizontal em '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, c-format msgid "Macro: %1$s" msgstr "Macro: %1$s" -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "opcional" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "macro de matemática" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, c-format msgid "Math Macro: \\%1$s" msgstr "Macro de Matemática: \\%1$s" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "Macro inválida! \\%1$s" diff --git a/po/pt_PT.po b/po/pt_PT.po index 2bbf297b60..4f35b26f7c 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -6871,7 +6871,7 @@ msgstr "Foto opcional para a biografia" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Nome" @@ -15415,7 +15415,7 @@ msgstr "Gota" msgid "Drop up" msgstr "Gota Invertida" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -25224,7 +25224,7 @@ msgid "Table (CSV)" msgstr "Tabela (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33568,25 +33568,25 @@ msgstr "View %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Não é possível alterar alinhamento horizontal em '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr " Macro: %1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "Opcional" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "macro mat." -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "Macros Mat." -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/ro.po b/po/ro.po index d31d188c9e..754c8f67e0 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7044,7 +7044,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Nume" @@ -15906,7 +15906,7 @@ msgstr "" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -26277,7 +26277,7 @@ msgid "Table (CSV)" msgstr "Tabel (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -34679,27 +34679,27 @@ msgstr "Mărime font" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Aliniere orizontală în coloană" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr " Macro: %s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 #, fuzzy msgid "optional" msgstr "&Orizontal:" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 #, fuzzy msgid "math macro" msgstr "fundal mod matematic" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "Macrouri matematice" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/ru.po b/po/ru.po index 3337eca43e..c881fb6eed 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7047,7 +7047,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Название" @@ -16183,7 +16183,7 @@ msgstr "Отбрасывать тень" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -26512,7 +26512,7 @@ msgid "Table (CSV)" msgstr "Таблица (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -35016,25 +35016,25 @@ msgstr "Шрифт: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Невозможно добавить горизонтальные линии в '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr " Макрокоманда: %1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "необязательное" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "матемематическая макрокоманда" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "Математические макрокоманды" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/sk.po b/po/sk.po index 682e01b266..40cae678a1 100644 --- a/po/sk.po +++ b/po/sk.po @@ -6754,7 +6754,7 @@ msgstr "Voliteľná fotka do životopisu" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:481 +#: src/mathed/InsetMathMacroTemplate.cpp:481 msgid "Name" msgstr "Meno" @@ -15015,7 +15015,7 @@ msgstr "Kvapka nadol" msgid "Drop up" msgstr "Kvapka nahor" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:532 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:532 msgid "TeX" msgstr "TeX" @@ -24722,7 +24722,7 @@ msgid "Table (CSV)" msgstr "Tabuľka (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1326 -#: src/mathed/MathMacroTemplate.cpp:537 +#: src/mathed/InsetMathMacroTemplate.cpp:537 msgid "LyX" msgstr "LyX" @@ -32998,25 +32998,25 @@ msgstr "Veľkosť: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Nedá sa zmeniť horizontálna adjustácia v '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, c-format msgid "Macro: %1$s" msgstr "Makro: %1$s" -#: src/mathed/MathMacroTemplate.cpp:489 +#: src/mathed/InsetMathMacroTemplate.cpp:489 msgid "optional" msgstr "voliteľné" -#: src/mathed/MathMacroTemplate.cpp:1270 +#: src/mathed/InsetMathMacroTemplate.cpp:1270 msgid "math macro" msgstr "mat. makro" -#: src/mathed/MathMacroTemplate.cpp:1377 +#: src/mathed/InsetMathMacroTemplate.cpp:1377 #, c-format msgid "Math Macro: \\%1$s" msgstr "Mat. Makro: \\%1$s" -#: src/mathed/MathMacroTemplate.cpp:1392 +#: src/mathed/InsetMathMacroTemplate.cpp:1392 #, c-format msgid "Invalid macro! \\%1$s" msgstr "Neplatné makro! \\%1$s" diff --git a/po/sl.po b/po/sl.po index 3f35cc5eec..858a2de6a6 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7074,7 +7074,7 @@ msgstr "" #: lib/layouts/pdfcomment.module:57 lib/layouts/scrlettr.layout:116 #: lib/layouts/scrlttr2.layout:149 lib/layouts/sigplanconf.layout:84 #: lib/layouts/sigplanconf.layout:161 lib/layouts/tcolorbox.module:134 -#: src/frontends/qt4/GuiIndices.cpp:52 src/mathed/MathMacroTemplate.cpp:481 +#: src/frontends/qt4/GuiIndices.cpp:52 src/mathed/InsetMathMacroTemplate.cpp:481 msgid "Name" msgstr "Ime" @@ -15900,7 +15900,7 @@ msgstr "" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:532 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:532 #, fuzzy msgid "TeX" msgstr "LaTeX" @@ -26528,7 +26528,7 @@ msgid "Table (CSV)" msgstr "Tabela" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1326 -#: src/mathed/MathMacroTemplate.cpp:537 +#: src/mathed/InsetMathMacroTemplate.cpp:537 msgid "LyX" msgstr "LyX" @@ -34825,27 +34825,27 @@ msgstr "Pisava: " msgid "Can't change horizontal alignment in '%1$s'" msgstr "Vodoravna poravnava v stolpcu" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr " Makroukaz: %s: " -#: src/mathed/MathMacroTemplate.cpp:489 +#: src/mathed/InsetMathMacroTemplate.cpp:489 #, fuzzy msgid "optional" msgstr "&Vodoravno:" -#: src/mathed/MathMacroTemplate.cpp:1270 +#: src/mathed/InsetMathMacroTemplate.cpp:1270 #, fuzzy msgid "math macro" msgstr "ozadje matematike" -#: src/mathed/MathMacroTemplate.cpp:1377 +#: src/mathed/InsetMathMacroTemplate.cpp:1377 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "ozadje matematike" -#: src/mathed/MathMacroTemplate.cpp:1392 +#: src/mathed/InsetMathMacroTemplate.cpp:1392 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/sr.po b/po/sr.po index e901b2b99f..6b132599bb 100644 --- a/po/sr.po +++ b/po/sr.po @@ -6926,7 +6926,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Ime" @@ -15673,7 +15673,7 @@ msgstr "" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -25827,7 +25827,7 @@ msgid "Table (CSV)" msgstr "" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33770,25 +33770,25 @@ msgstr "Font: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Ne mogu da promenim broj kolona u '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr " Makro: %1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "mat makro" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "Matematički Makroi" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/sv.po b/po/sv.po index 96a86a4ec9..d57cef6096 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6968,7 +6968,7 @@ msgstr "Valfritt foto för biografi" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Namn" @@ -15292,7 +15292,7 @@ msgstr "Droppe ned" msgid "Drop up" msgstr "Droppe upp" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -24997,7 +24997,7 @@ msgid "Table (CSV)" msgstr "Tabell (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33290,25 +33290,25 @@ msgstr "Storlek: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Kan inte ändra horisontell justering i '%1$s'" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, c-format msgid "Macro: %1$s" msgstr "Makro: %1$s" -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "valfri" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "matematikmakro" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, c-format msgid "Math Macro: \\%1$s" msgstr "Matematikmakro: \\%1$s" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "Ogiltigt makro! \\%1$s" diff --git a/po/tr.po b/po/tr.po index cfe1f2ee0e..555be928ae 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6988,7 +6988,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Ad" @@ -15818,7 +15818,7 @@ msgstr "Gölgeyi Bırak|G" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -26061,7 +26061,7 @@ msgid "Table (CSV)" msgstr "Tablo (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -34299,25 +34299,25 @@ msgstr "Font: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "'%1$s' e yatay ızgara çizgileri eklenemiyor" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr " Makro: %1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "seçimlik" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "matematik makrosu" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "Matematik Makroları" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/uk.po b/po/uk.po index ca357985f5..1c00b17b48 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6805,7 +6805,7 @@ msgstr "Необов’язкова фотографія до біографії #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "Назва" @@ -15147,7 +15147,7 @@ msgstr "Крапля вниз" msgid "Drop up" msgstr "Крапля вгору" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -24863,7 +24863,7 @@ msgid "Table (CSV)" msgstr "Таблиця (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33199,25 +33199,25 @@ msgstr "Розмір: %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "Не вдалося змінити горизонтальне вирівнювання у «%1$s»" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, c-format msgid "Macro: %1$s" msgstr "Макрос: %1$s" -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "необов'язковий" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "математичний макрос" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, c-format msgid "Math Macro: \\%1$s" msgstr "Математичний макрос: \\%1$s" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "Некоректний макрос! \\%1$s" diff --git a/po/wa.po b/po/wa.po index 09d32554ad..c0f1935558 100644 --- a/po/wa.po +++ b/po/wa.po @@ -7241,7 +7241,7 @@ msgstr "" #: lib/layouts/pdfcomment.module:57 lib/layouts/scrlettr.layout:116 #: lib/layouts/scrlttr2.layout:149 lib/layouts/sigplanconf.layout:84 #: lib/layouts/sigplanconf.layout:161 lib/layouts/tcolorbox.module:134 -#: src/frontends/qt4/GuiIndices.cpp:52 src/mathed/MathMacroTemplate.cpp:481 +#: src/frontends/qt4/GuiIndices.cpp:52 src/mathed/InsetMathMacroTemplate.cpp:481 #, fuzzy msgid "Name" msgstr "No:|#N" @@ -16120,7 +16120,7 @@ msgstr "" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:532 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:532 #, fuzzy msgid "TeX" msgstr "LaTeX|#L" @@ -26766,7 +26766,7 @@ msgid "Table (CSV)" msgstr "Tåvlea%t" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1326 -#: src/mathed/MathMacroTemplate.cpp:537 +#: src/mathed/InsetMathMacroTemplate.cpp:537 msgid "LyX" msgstr "LyX" @@ -35083,27 +35083,27 @@ msgstr "Fonte: " msgid "Can't change horizontal alignment in '%1$s'" msgstr "Aroymint di coûtchî|#c" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr "Fonte: " -#: src/mathed/MathMacroTemplate.cpp:489 +#: src/mathed/InsetMathMacroTemplate.cpp:489 #, fuzzy msgid "optional" msgstr "Aroymint di coûtchî|#c" -#: src/mathed/MathMacroTemplate.cpp:1270 +#: src/mathed/InsetMathMacroTemplate.cpp:1270 #, fuzzy msgid "math macro" msgstr "Sititchî ene etikete" -#: src/mathed/MathMacroTemplate.cpp:1377 +#: src/mathed/InsetMathMacroTemplate.cpp:1377 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "Sititchî ene etikete" -#: src/mathed/MathMacroTemplate.cpp:1392 +#: src/mathed/InsetMathMacroTemplate.cpp:1392 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index d626a220b5..4b3fd690f5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6896,7 +6896,7 @@ msgstr "" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "名字" @@ -15761,7 +15761,7 @@ msgstr "阴影" msgid "Drop up" msgstr "" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX" @@ -25963,7 +25963,7 @@ msgid "Table (CSV)" msgstr "表格 (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -34251,25 +34251,25 @@ msgstr "查看 %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "无法改变 '%1$s' 的水平对齐" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr "宏：%1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "可选" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "数学宏" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "数学宏" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 1d31416ed0..ca395d04b9 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6866,7 +6866,7 @@ msgstr "傳記用的選項照片" #: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:149 #: lib/layouts/sigplanconf.layout:84 lib/layouts/sigplanconf.layout:161 #: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52 -#: src/mathed/MathMacroTemplate.cpp:493 +#: src/mathed/InsetMathMacroTemplate.cpp:493 msgid "Name" msgstr "名稱" @@ -15374,7 +15374,7 @@ msgstr "Drop down 下滴形水滴" msgid "Drop up" msgstr "Drop up 上滴形水滴" -#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:544 +#: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" msgstr "TeX 符號" @@ -25174,7 +25174,7 @@ msgid "Table (CSV)" msgstr "Table (CSV)" #: lib/configure.py:731 src/frontends/qt4/GuiView.cpp:1327 -#: src/mathed/MathMacroTemplate.cpp:549 +#: src/mathed/InsetMathMacroTemplate.cpp:549 msgid "LyX" msgstr "LyX" @@ -33344,25 +33344,25 @@ msgstr "檢視 %1$s" msgid "Can't change horizontal alignment in '%1$s'" msgstr "無法在「%1$s」中變更水平對齊" -#: src/mathed/MathMacro.cpp:1212 src/mathed/MathMacro.cpp:1218 +#: src/mathed/InsetMathMacro.cpp:1212 src/mathed/InsetMathMacro.cpp:1218 #, fuzzy, c-format msgid "Macro: %1$s" msgstr " 巨集: %1$s: " -#: src/mathed/MathMacroTemplate.cpp:501 +#: src/mathed/InsetMathMacroTemplate.cpp:501 msgid "optional" msgstr "選項" -#: src/mathed/MathMacroTemplate.cpp:1282 +#: src/mathed/InsetMathMacroTemplate.cpp:1282 msgid "math macro" msgstr "數學巨集" -#: src/mathed/MathMacroTemplate.cpp:1389 +#: src/mathed/InsetMathMacroTemplate.cpp:1389 #, fuzzy, c-format msgid "Math Macro: \\%1$s" msgstr "數學巨集" -#: src/mathed/MathMacroTemplate.cpp:1404 +#: src/mathed/InsetMathMacroTemplate.cpp:1404 #, c-format msgid "Invalid macro! \\%1$s" msgstr "" diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 5e2057ac5b..df7efa8f0c 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -76,7 +76,7 @@ #include "mathed/InsetMathHull.h" #include "mathed/MacroTable.h" -#include "mathed/MathMacroTemplate.h" +#include "mathed/InsetMathMacroTemplate.h" #include "mathed/MathSupport.h" #include "graphics/GraphicsCache.h" @@ -3598,7 +3598,7 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope) continue; // get macro data - MathMacroTemplate & macroTemplate = + InsetMathMacroTemplate & macroTemplate = *iit->inset->asInsetMath()->asMacroTemplate(); MacroContext mc(owner_, it); macroTemplate.updateToContext(mc); @@ -3748,7 +3748,7 @@ void Buffer::listParentMacros(MacroSet & macros, LaTeXFeatures & features) const if (data) { macros.insert(data); - // we cannot access the original MathMacroTemplate anymore + // we cannot access the original InsetMathMacroTemplate anymore // here to calls validate method. So we do its work here manually. // FIXME: somehow make the template accessible here. if (data->optionals() > 0) diff --git a/src/Cursor.cpp b/src/Cursor.cpp index eff32d0576..1223782c35 100644 --- a/src/Cursor.cpp +++ b/src/Cursor.cpp @@ -53,7 +53,7 @@ #include "mathed/MacroTable.h" #include "mathed/MathData.h" #include "mathed/MathFactory.h" -#include "mathed/MathMacro.h" +#include "mathed/InsetMathMacro.h" #include #include @@ -1431,12 +1431,12 @@ bool Cursor::macroModeClose() if (in && in->interpretString(*this, s)) return true; bool const user_macro = buffer()->getMacro(name, *this, false); - MathAtom atom = user_macro ? MathAtom(new MathMacro(buffer(), name)) + MathAtom atom = user_macro ? MathAtom(new InsetMathMacro(buffer(), name)) : createInsetMath(name, buffer()); // try to put argument into macro, if we just inserted a macro bool macroArg = false; - MathMacro * atomAsMacro = atom.nucleus()->asMacro(); + InsetMathMacro * atomAsMacro = atom.nucleus()->asMacro(); if (atomAsMacro) { // macros here are still unfolded (in init mode in fact). So // we have to resolve the macro here manually and check its arity @@ -1444,10 +1444,10 @@ bool Cursor::macroModeClose() MacroData const * data = buffer()->getMacro(atomAsMacro->name()); if (!selection.empty() && data && data->numargs() - data->optionals() > 0) { macroArg = true; - atomAsMacro->setDisplayMode(MathMacro::DISPLAY_INTERACTIVE_INIT, 1); + atomAsMacro->setDisplayMode(InsetMathMacro::DISPLAY_INTERACTIVE_INIT, 1); } else // non-greedy case. Do not touch the arguments behind - atomAsMacro->setDisplayMode(MathMacro::DISPLAY_INTERACTIVE_INIT, 0); + atomAsMacro->setDisplayMode(InsetMathMacro::DISPLAY_INTERACTIVE_INIT, 0); } // insert remembered selection into first argument of a non-macro diff --git a/src/CursorSlice.cpp b/src/CursorSlice.cpp index 76049a0541..c5be12f500 100644 --- a/src/CursorSlice.cpp +++ b/src/CursorSlice.cpp @@ -23,7 +23,7 @@ #include "insets/Inset.h" #include "mathed/InsetMath.h" -#include "mathed/MathMacro.h" +#include "mathed/InsetMathMacro.h" #include "support/ExceptionMessage.h" #include "support/gettext.h" diff --git a/src/Makefile.am b/src/Makefile.am index 5bf8f3bd5e..9bc6b19770 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -393,7 +393,6 @@ liblyxgraphics_a_SOURCES = \ noinst_LIBRARIES += liblyxmathed.a SOURCEFILESMATHED = \ - mathed/CommandInset.cpp \ mathed/InsetMathAMSArray.cpp \ mathed/InsetMathArray.cpp \ mathed/InsetMathBig.cpp \ @@ -407,6 +406,7 @@ SOURCEFILESMATHED = \ mathed/InsetMathChar.cpp \ mathed/InsetMathClass.cpp \ mathed/InsetMathColor.cpp \ + mathed/InsetMathCommand.cpp \ mathed/InsetMathComment.cpp \ mathed/InsetMathDecoration.cpp \ mathed/InsetMathDecoration.h \ @@ -425,6 +425,9 @@ SOURCEFILESMATHED = \ mathed/InsetMathKern.cpp \ mathed/InsetMathLefteqn.cpp \ mathed/InsetMathLim.cpp \ + mathed/InsetMathMacro.cpp \ + mathed/InsetMathMacroArgument.cpp \ + mathed/InsetMathMacroTemplate.cpp \ mathed/InsetMathMatrix.cpp \ mathed/InsetMathNest.cpp \ mathed/InsetMathNumber.cpp \ @@ -457,9 +460,6 @@ SOURCEFILESMATHED = \ mathed/MathData.cpp \ mathed/MathExtern.cpp \ mathed/MathFactory.cpp \ - mathed/MathMacro.cpp \ - mathed/MathMacroArgument.cpp \ - mathed/MathMacroTemplate.cpp \ mathed/MathParser.cpp \ mathed/MathRow.cpp \ mathed/MathStream.cpp \ @@ -467,7 +467,6 @@ SOURCEFILESMATHED = \ mathed/TextPainter.cpp HEADERFILESMATHED = \ - mathed/CommandInset.h \ mathed/InsetMathAMSArray.h \ mathed/InsetMathArray.h \ mathed/InsetMathBig.h \ @@ -480,6 +479,7 @@ HEADERFILESMATHED = \ mathed/InsetMathChar.h \ mathed/InsetMathClass.h \ mathed/InsetMathColor.h \ + mathed/InsetMathCommand.h \ mathed/InsetMathComment.h \ mathed/InsetMathDelim.h \ mathed/InsetMathDiff.h \ @@ -497,6 +497,9 @@ HEADERFILESMATHED = \ mathed/InsetMathKern.h \ mathed/InsetMathLefteqn.h \ mathed/InsetMathLim.h \ + mathed/InsetMathMacro.h \ + mathed/InsetMathMacroArgument.h \ + mathed/InsetMathMacroTemplate.h \ mathed/InsetMathMatrix.h \ mathed/InsetMathNest.h \ mathed/InsetMathNumber.h \ @@ -529,10 +532,7 @@ HEADERFILESMATHED = \ mathed/MathCompletionList.h \ mathed/MathExtern.h \ mathed/MathFactory.h \ - mathed/MathMacro.h \ - mathed/MathMacroArgument.h \ mathed/MacroTable.h \ - mathed/MathMacroTemplate.h \ mathed/MathParser.h \ mathed/MathParser_flags.h \ mathed/MathRow.h \ diff --git a/src/Text3.cpp b/src/Text3.cpp index e8e433587f..364e91c1dc 100644 --- a/src/Text3.cpp +++ b/src/Text3.cpp @@ -78,7 +78,7 @@ #include "support/regex.h" #include "mathed/InsetMathHull.h" -#include "mathed/MathMacroTemplate.h" +#include "mathed/InsetMathMacroTemplate.h" #include #include @@ -2044,7 +2044,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) // don't pass "on" as argument // (it would appear literally in the first cell) docstring sel = cur.selectionAsString(false); - MathMacroTemplate * macro = new MathMacroTemplate(cur.buffer()); + InsetMathMacroTemplate * macro = new InsetMathMacroTemplate(cur.buffer()); // create a macro template if we see "\\newcommand" somewhere, and // an ordinary formula otherwise if (!sel.empty() @@ -2080,7 +2080,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) MacroType type = MacroTypeNewcommand; if (s2 == "def") type = MacroTypeDef; - MathMacroTemplate * inset = new MathMacroTemplate(cur.buffer(), + InsetMathMacroTemplate * inset = new InsetMathMacroTemplate(cur.buffer(), from_utf8(token(s, ' ', 0)), nargs, false, type); inset->setBuffer(bv->buffer()); insertInset(cur, inset); diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp index f38c78d3ea..0967dacfd2 100644 --- a/src/TextMetrics.cpp +++ b/src/TextMetrics.cpp @@ -39,7 +39,7 @@ #include "insets/InsetText.h" -#include "mathed/MathMacroTemplate.h" +#include "mathed/InsetMathMacroTemplate.h" #include "frontends/FontMetrics.h" #include "frontends/Painter.h" diff --git a/src/factory.cpp b/src/factory.cpp index 7ec34fc8e3..72019cd6f7 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -59,7 +59,7 @@ #include "insets/InsetVSpace.h" #include "insets/InsetWrap.h" -#include "mathed/MathMacroTemplate.h" +#include "mathed/InsetMathMacroTemplate.h" #include "mathed/InsetMathHull.h" #include "frontends/alert.h" @@ -606,7 +606,7 @@ Inset * readInset(Lexer & lex, Buffer * buf) } else if (tmptok == "External") { inset.reset(new InsetExternal(buf)); } else if (tmptok == "FormulaMacro") { - inset.reset(new MathMacroTemplate(buf)); + inset.reset(new InsetMathMacroTemplate(buf)); } else if (tmptok == "Formula") { inset.reset(new InsetMathHull(buf)); } else if (tmptok == "Graphics") { diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp index 2190be7056..b458c8181b 100644 --- a/src/insets/Inset.cpp +++ b/src/insets/Inset.cpp @@ -414,7 +414,7 @@ bool Inset::getStatus(Cursor &, FuncRequest const & cmd, } case LFUN_IN_MATHMACROTEMPLATE: - // By default we're not in a MathMacroTemplate inset + // By default we're not in a InsetMathMacroTemplate inset flag.setEnabled(false); return true; diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h index a426db034a..bb4f234b9d 100644 --- a/src/insets/InsetCollapsable.h +++ b/src/insets/InsetCollapsable.h @@ -178,7 +178,7 @@ private: /// a substatus of the Open status, determined automatically in metrics bool openinlined_; /// the inset will automatically open when the cursor is inside. This is - /// dependent on the bufferview, compare with MathMacro::editing_. + /// dependent on the bufferview, compare with InsetMathMacro::editing_. bool auto_open_; /// changes color when mouse enters/leaves this inset bool mouse_hover_; diff --git a/src/mathed/InsetMath.h b/src/mathed/InsetMath.h index 81cad09b48..578b29fdcf 100644 --- a/src/mathed/InsetMath.h +++ b/src/mathed/InsetMath.h @@ -87,8 +87,8 @@ class MathStream; class WriteStream; class MathData; -class MathMacroTemplate; -class MathMacro; +class InsetMathMacroTemplate; +class InsetMathMacro; class MathRow; class TextPainter; class TextMetricsInfo; @@ -150,10 +150,10 @@ public: virtual InsetMathGrid const * asGridInset() const { return 0; } virtual InsetMathHull * asHullInset() { return 0; } virtual InsetMathHull const * asHullInset() const { return 0; } - virtual MathMacro * asMacro() { return 0; } - virtual MathMacro const * asMacro() const { return 0; } - virtual MathMacroTemplate * asMacroTemplate() { return 0; } - virtual MathMacroTemplate const * asMacroTemplate() const { return 0; } + virtual InsetMathMacro * asMacro() { return 0; } + virtual InsetMathMacro const * asMacro() const { return 0; } + virtual InsetMathMacroTemplate * asMacroTemplate() { return 0; } + virtual InsetMathMacroTemplate const * asMacroTemplate() const { return 0; } virtual InsetMathMatrix const * asMatrixInset() const { return 0; } virtual InsetMathNest * asNestInset() { return 0; } virtual InsetMathNest const * asNestInset() const { return 0; } diff --git a/src/mathed/CommandInset.cpp b/src/mathed/InsetMathCommand.cpp similarity index 63% rename from src/mathed/CommandInset.cpp rename to src/mathed/InsetMathCommand.cpp index 344c570323..deac6c3711 100644 --- a/src/mathed/CommandInset.cpp +++ b/src/mathed/InsetMathCommand.cpp @@ -1,5 +1,5 @@ /** - * \file CommandInset.cpp + * \file InsetMathCommand.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "CommandInset.h" +#include "InsetMathCommand.h" #include "MathData.h" #include "MathStream.h" #include "DispatchResult.h" @@ -22,7 +22,7 @@ using namespace std; namespace lyx { -CommandInset::CommandInset(Buffer * buf, docstring const & name, bool needs_math_mode) +InsetMathCommand::InsetMathCommand(Buffer * buf, docstring const & name, bool needs_math_mode) : InsetMathNest(buf, 2), name_(name), needs_math_mode_(needs_math_mode), set_label_(false) { @@ -30,13 +30,13 @@ CommandInset::CommandInset(Buffer * buf, docstring const & name, bool needs_math } -Inset * CommandInset::clone() const +Inset * InsetMathCommand::clone() const { - return new CommandInset(*this); + return new InsetMathCommand(*this); } -void CommandInset::metrics(MetricsInfo & mi, Dimension & dim) const +void InsetMathCommand::metrics(MetricsInfo & mi, Dimension & dim) const { if (!set_label_) { set_label_ = true; @@ -46,20 +46,20 @@ void CommandInset::metrics(MetricsInfo & mi, Dimension & dim) const } -Inset * CommandInset::editXY(Cursor & cur, int /*x*/, int /*y*/) +Inset * InsetMathCommand::editXY(Cursor & cur, int /*x*/, int /*y*/) { edit(cur, true); return this; } -void CommandInset::draw(PainterInfo & pi, int x, int y) const +void InsetMathCommand::draw(PainterInfo & pi, int x, int y) const { button_.draw(pi, x, y); } -void CommandInset::write(WriteStream & os) const +void InsetMathCommand::write(WriteStream & os) const { ModeSpecifier specifier(os, currentMode(), lockedMode(), asciiOnly()); MathEnsurer ensurer(os, needs_math_mode_); @@ -70,7 +70,7 @@ void CommandInset::write(WriteStream & os) const } -docstring const CommandInset::screenLabel() const +docstring const InsetMathCommand::screenLabel() const { return name_; } diff --git a/src/mathed/CommandInset.h b/src/mathed/InsetMathCommand.h similarity index 88% rename from src/mathed/CommandInset.h rename to src/mathed/InsetMathCommand.h index b820d72602..da4269c9ef 100644 --- a/src/mathed/CommandInset.h +++ b/src/mathed/InsetMathCommand.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file CommandInset.h + * \file InsetMathCommand.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -22,10 +22,10 @@ namespace lyx { /// Inset for things like \name[options]{contents} -class CommandInset : public InsetMathNest { +class InsetMathCommand : public InsetMathNest { public: /// - explicit CommandInset(Buffer * buf, docstring const & name, + explicit InsetMathCommand(Buffer * buf, docstring const & name, bool needs_math_mode = true); /// marker_type marker(BufferView const *) const { return NO_MARKER; } diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp index 3c72f4d6bd..f4005d9124 100644 --- a/src/mathed/InsetMathHull.cpp +++ b/src/mathed/InsetMathHull.cpp @@ -35,8 +35,8 @@ #include "LaTeXFeatures.h" #include "LyXRC.h" #include "MacroTable.h" -#include "MathMacro.h" -#include "MathMacroTemplate.h" +#include "InsetMathMacro.h" +#include "InsetMathMacroTemplate.h" #include "MetricsInfo.h" #include "output_xhtml.h" #include "Paragraph.h" @@ -752,8 +752,8 @@ void InsetMathHull::usedMacros(MathData const & md, DocIterator const & pos, MacroNameSet::iterator const end = macros.end(); for (size_t i = 0; i < md.size(); ++i) { - MathMacro const * mi = md[i].nucleus()->asMacro(); - MathMacroTemplate const * mt = md[i].nucleus()->asMacroTemplate(); + InsetMathMacro const * mi = md[i].nucleus()->asMacro(); + InsetMathMacroTemplate 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(); diff --git a/src/mathed/MathMacro.cpp b/src/mathed/InsetMathMacro.cpp similarity index 83% rename from src/mathed/MathMacro.cpp rename to src/mathed/InsetMathMacro.cpp index 63bb44f70b..d2d4a8bc5d 100644 --- a/src/mathed/MathMacro.cpp +++ b/src/mathed/InsetMathMacro.cpp @@ -1,5 +1,5 @@ /** - * \file MathMacro.cpp + * \file InsetMathMacro.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #include -#include "MathMacro.h" +#include "InsetMathMacro.h" #include "InsetMathChar.h" #include "MathCompletionList.h" @@ -51,21 +51,21 @@ namespace lyx { /// A proxy for the macro values -class ArgumentProxy : public InsetMath { +class InsetArgumentProxy : public InsetMath { public: /// - ArgumentProxy(MathMacro * mathMacro, size_t idx) + InsetArgumentProxy(InsetMathMacro * mathMacro, size_t idx) : mathMacro_(mathMacro), idx_(idx) {} /// - ArgumentProxy(MathMacro * mathMacro, size_t idx, docstring const & def) + InsetArgumentProxy(InsetMathMacro * mathMacro, size_t idx, docstring const & def) : mathMacro_(mathMacro), idx_(idx) { asArray(def, def_); } /// - void setOwner(MathMacro * mathMacro) { mathMacro_ = mathMacro; } + void setOwner(InsetMathMacro * mathMacro) { mathMacro_ = mathMacro; } /// - MathMacro const * owner() { return mathMacro_; } + InsetMathMacro const * owner() { return mathMacro_; } /// marker_type marker(BufferView const *) const { return NO_MARKER; } /// @@ -139,12 +139,12 @@ public: } /// void metrics(MetricsInfo &, Dimension &) const { - // This should never be invoked, since ArgumentProxy insets are linearized + // This should never be invoked, since InsetArgumentProxy insets are linearized LATTEST(false); } /// void draw(PainterInfo &, int, int) const { - // This should never be invoked, since ArgumentProxy insets are linearized + // This should never be invoked, since InsetArgumentProxy insets are linearized LATTEST(false); } /// @@ -153,7 +153,7 @@ public: return displayCell(bv).kerning(bv); } // write(), normalize(), infoize() and infoize2() are not needed since - // MathMacro uses the definition and not the expanded cells. + // InsetMathMacro uses the definition and not the expanded cells. /// void maple(MapleStream & ms) const { ms << mathMacro_->cell(idx_); } /// @@ -180,10 +180,10 @@ private: /// Inset * clone() const { - return new ArgumentProxy(*this); + return new InsetArgumentProxy(*this); } /// - MathMacro * mathMacro_; + InsetMathMacro * mathMacro_; /// size_t idx_; /// @@ -191,8 +191,8 @@ private: }; -/// Private implementation of MathMacro -class MathMacro::Private { +/// Private implementation of InsetMathMacro +class InsetMathMacro::Private { public: Private(Buffer * buf, docstring const & name) : name_(name), displayMode_(DISPLAY_INIT), @@ -205,10 +205,10 @@ public: /// Update the pointers to our owner of all expanded macros. /// This needs to be called every time a copy of the owner is created /// (bug 9418). - void updateChildren(MathMacro * owner); + void updateChildren(InsetMathMacro * owner); /// Recursively update the pointers of all expanded macros /// appearing in the arguments of the current macro - void updateNestedChildren(MathMacro * owner, InsetMathNest * ni); + void updateNestedChildren(InsetMathMacro * owner, InsetMathNest * ni); /// name of macro docstring name_; /// current display mode @@ -244,10 +244,10 @@ public: }; -void MathMacro::Private::updateChildren(MathMacro * owner) +void InsetMathMacro::Private::updateChildren(InsetMathMacro * owner) { for (size_t i = 0; i < expanded_.size(); ++i) { - ArgumentProxy * p = dynamic_cast(expanded_[i].nucleus()); + InsetArgumentProxy * p = dynamic_cast(expanded_[i].nucleus()); if (p) p->setOwner(owner); @@ -269,15 +269,15 @@ void MathMacro::Private::updateChildren(MathMacro * owner) } -void MathMacro::Private::updateNestedChildren(MathMacro * owner, InsetMathNest * ni) +void InsetMathMacro::Private::updateNestedChildren(InsetMathMacro * owner, InsetMathNest * ni) { for (size_t i = 0; i < ni->nargs(); ++i) { MathData & ar = ni->cell(i); for (size_t j = 0; j < ar.size(); ++j) { - ArgumentProxy * ap = dynamic_cast - (ar[j].nucleus()); + InsetArgumentProxy * ap = dynamic_cast + (ar[j].nucleus()); if (ap) { - MathMacro::Private * md = ap->owner()->d; + InsetMathMacro::Private * md = ap->owner()->d; if (md->macro_) md->macro_ = &md->macroBackup_; ap->setOwner(owner); @@ -290,12 +290,12 @@ void MathMacro::Private::updateNestedChildren(MathMacro * owner, InsetMathNest * } -MathMacro::MathMacro(Buffer * buf, docstring const & name) +InsetMathMacro::InsetMathMacro(Buffer * buf, docstring const & name) : InsetMathNest(buf, 0), d(new Private(buf, name)) {} -MathMacro::MathMacro(MathMacro const & that) +InsetMathMacro::InsetMathMacro(InsetMathMacro const & that) : InsetMathNest(that), d(new Private(*that.d)) { setBuffer(*that.buffer_); @@ -303,7 +303,7 @@ MathMacro::MathMacro(MathMacro const & that) } -MathMacro & MathMacro::operator=(MathMacro const & that) +InsetMathMacro & InsetMathMacro::operator=(InsetMathMacro const & that) { if (&that == this) return *this; @@ -314,13 +314,13 @@ MathMacro & MathMacro::operator=(MathMacro const & that) } -MathMacro::~MathMacro() +InsetMathMacro::~InsetMathMacro() { delete d; } -bool MathMacro::addToMathRow(MathRow & mrow, MetricsInfo & mi) const +bool InsetMathMacro::addToMathRow(MathRow & mrow, MetricsInfo & mi) const { // set edit mode for which we will have calculated row. // This is the same as what is done in metrics(). @@ -330,7 +330,7 @@ bool MathMacro::addToMathRow(MathRow & mrow, MetricsInfo & mi) const // - display mode different from normal // - editing with parameter list // - editing with box around macro - if (displayMode() != MathMacro::DISPLAY_NORMAL + if (displayMode() != InsetMathMacro::DISPLAY_NORMAL || (d->editing_[mi.base.bv] && lyxrc.macro_edit_style == LyXRC::MACRO_EDIT_LIST)) return InsetMath::addToMathRow(mrow, mi); @@ -364,42 +364,42 @@ bool MathMacro::addToMathRow(MathRow & mrow, MetricsInfo & mi) const return has_contents; } -void MathMacro::beforeMetrics() const +void InsetMathMacro::beforeMetrics() const { d->macro_->lock(); } -void MathMacro::afterMetrics() const +void InsetMathMacro::afterMetrics() const { d->macro_->unlock(); } -void MathMacro::beforeDraw(PainterInfo const & pi) const +void InsetMathMacro::beforeDraw(PainterInfo const & pi) const { if (d->editing_[pi.base.bv]) pi.pain.enterMonochromeMode(Color_mathbg, Color_mathmacroblend); } -void MathMacro::afterDraw(PainterInfo const & pi) const +void InsetMathMacro::afterDraw(PainterInfo const & pi) const { if (d->editing_[pi.base.bv]) pi.pain.leaveMonochromeMode(); } -Inset * MathMacro::clone() const +Inset * InsetMathMacro::clone() const { - MathMacro * copy = new MathMacro(*this); + InsetMathMacro * copy = new InsetMathMacro(*this); copy->d->needsUpdate_ = true; //copy->d->expanded_.clear(); return copy; } -void MathMacro::normalize(NormalStream & os) const +void InsetMathMacro::normalize(NormalStream & os) const { os << "[macro " << name(); for (size_t i = 0; i < nargs(); ++i) @@ -408,19 +408,19 @@ void MathMacro::normalize(NormalStream & os) const } -MathMacro::DisplayMode MathMacro::displayMode() const +InsetMathMacro::DisplayMode InsetMathMacro::displayMode() const { return d->displayMode_; } -bool MathMacro::extraBraces() const +bool InsetMathMacro::extraBraces() const { return d->displayMode_ == DISPLAY_NORMAL && arity() > 0; } -docstring MathMacro::name() const +docstring InsetMathMacro::name() const { if (d->displayMode_ == DISPLAY_UNFOLDED) return asString(cell(0)); @@ -429,19 +429,19 @@ docstring MathMacro::name() const } -docstring MathMacro::macroName() const +docstring InsetMathMacro::macroName() const { return d->name_; } -int MathMacro::nesting() const +int InsetMathMacro::nesting() const { return d->nesting_; } -void MathMacro::cursorPos(BufferView const & bv, +void InsetMathMacro::cursorPos(BufferView const & bv, CursorSlice const & sl, bool boundary, int & x, int & y) const { // We may have 0 arguments, but InsetMathNest requires at least one. @@ -450,7 +450,7 @@ void MathMacro::cursorPos(BufferView const & bv, } -bool MathMacro::editMode(BufferView const * bv) const { +bool InsetMathMacro::editMode(BufferView const * bv) const { // find this in cursor trace Cursor const & cur = bv->cursor(); for (size_t i = 0; i != cur.depth(); ++i) @@ -460,7 +460,7 @@ bool MathMacro::editMode(BufferView const * bv) const { for (; i != cur.depth(); ++i) { InsetMath * im = cur[i].asInsetMath(); if (im) { - MathMacro const * macro = im->asMacro(); + InsetMathMacro const * macro = im->asMacro(); if (macro && macro->displayMode() == DISPLAY_NORMAL) return false; } @@ -474,19 +474,19 @@ bool MathMacro::editMode(BufferView const * bv) const { } -MacroData const * MathMacro::macro() const +MacroData const * InsetMathMacro::macro() const { return d->macro_; } -bool MathMacro::editMetrics(BufferView const * bv) const +bool InsetMathMacro::editMetrics(BufferView const * bv) const { return d->editing_[bv]; } -InsetMath::marker_type MathMacro::marker(BufferView const * bv) const +InsetMath::marker_type InsetMathMacro::marker(BufferView const * bv) const { if (nargs() == 0) return NO_MARKER; @@ -512,7 +512,7 @@ InsetMath::marker_type MathMacro::marker(BufferView const * bv) const } -void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const +void InsetMathMacro::metrics(MetricsInfo & mi, Dimension & dim) const { /// The macro nesting can change display of insets. Change it locally. Changer chg = make_change(mi.base.macro_nesting, d->nesting_); @@ -578,7 +578,7 @@ void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const } -int MathMacro::kerning(BufferView const * bv) const { +int InsetMathMacro::kerning(BufferView const * bv) const { if (d->displayMode_ == DISPLAY_NORMAL && !d->editing_[bv]) return d->expanded_.kerning(bv); else @@ -586,7 +586,7 @@ int MathMacro::kerning(BufferView const * bv) const { } -void MathMacro::updateMacro(MacroContext const & mc) +void InsetMathMacro::updateMacro(MacroContext const & mc) { if (validName()) { d->macro_ = mc.get(name()); @@ -600,16 +600,16 @@ void MathMacro::updateMacro(MacroContext const & mc) } -class MathMacro::UpdateLocker +class InsetMathMacro::UpdateLocker { public: - explicit UpdateLocker(MathMacro & mm) : mac(mm) + explicit UpdateLocker(InsetMathMacro & mm) : mac(mm) { mac.d->isUpdating_ = true; } ~UpdateLocker() { mac.d->isUpdating_ = false; } private: - MathMacro & mac; + InsetMathMacro & mac; }; /** Avoid wrong usage of UpdateLocker. To avoid wrong usage: @@ -620,7 +620,7 @@ private: // Tip gotten from Bobby Schmidt's column in C/C++ Users Journal -void MathMacro::updateRepresentation(Cursor * cur, MacroContext const & mc, +void InsetMathMacro::updateRepresentation(Cursor * cur, MacroContext const & mc, UpdateType utype, int nesting) { // block recursive calls (bug 8999) @@ -652,17 +652,17 @@ void MathMacro::updateRepresentation(Cursor * cur, MacroContext const & mc, // create MathMacroArgumentValue objects pointing to the cells of the macro vector values(nargs()); for (size_t i = 0; i < nargs(); ++i) { - ArgumentProxy * proxy; + InsetArgumentProxy * proxy; if (i < defaults.size()) - proxy = new ArgumentProxy(this, i, defaults[i]); + proxy = new InsetArgumentProxy(this, i, defaults[i]); else - proxy = new ArgumentProxy(this, i); + proxy = new InsetArgumentProxy(this, i); values[i].insert(0, MathAtom(proxy)); } // expanding macro with the values // Only update the argument macros if anything was expanded, otherwise // we would get an endless loop (bug 9140). UpdateLocker does not work - // in this case, since MacroData::expand() creates new MathMacro + // in this case, since MacroData::expand() creates new InsetMathMacro // objects, so this would be a different recursion path than the one // protected by UpdateLocker. if (d->macro_->expand(values, d->expanded_)) { @@ -676,7 +676,7 @@ void MathMacro::updateRepresentation(Cursor * cur, MacroContext const & mc, } -void MathMacro::draw(PainterInfo & pi, int x, int y) const +void InsetMathMacro::draw(PainterInfo & pi, int x, int y) const { Dimension const dim = dimension(*pi.base.bv); @@ -753,7 +753,7 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const } -void MathMacro::setDisplayMode(MathMacro::DisplayMode mode, int appetite) +void InsetMathMacro::setDisplayMode(InsetMathMacro::DisplayMode mode, int appetite) { if (d->displayMode_ != mode) { // transfer name if changing from or to DISPLAY_UNFOLDED @@ -777,7 +777,7 @@ void MathMacro::setDisplayMode(MathMacro::DisplayMode mode, int appetite) } -MathMacro::DisplayMode MathMacro::computeDisplayMode() const +InsetMathMacro::DisplayMode InsetMathMacro::computeDisplayMode() const { if (d->nextFoldMode_ == true && d->macro_ && !d->macro_->locked()) return DISPLAY_NORMAL; @@ -786,7 +786,7 @@ MathMacro::DisplayMode MathMacro::computeDisplayMode() const } -bool MathMacro::validName() const +bool InsetMathMacro::validName() const { docstring n = name(); @@ -811,7 +811,7 @@ bool MathMacro::validName() const } -size_t MathMacro::arity() const +size_t InsetMathMacro::arity() const { if (d->displayMode_ == DISPLAY_NORMAL ) return cells_.size(); @@ -820,26 +820,26 @@ size_t MathMacro::arity() const } -size_t MathMacro::optionals() const +size_t InsetMathMacro::optionals() const { return d->optionals_; } -void MathMacro::setOptionals(int n) +void InsetMathMacro::setOptionals(int n) { if (n <= int(nargs())) d->optionals_ = n; } -size_t MathMacro::appetite() const +size_t InsetMathMacro::appetite() const { return d->appetite_; } -MathClass MathMacro::mathClass() const +MathClass InsetMathMacro::mathClass() const { // This can be just a heuristic, since it is only considered for display // when the macro is not linearised. Therefore it affects: @@ -859,7 +859,7 @@ MathClass MathMacro::mathClass() const } -InsetMath::mode_type MathMacro::currentMode() const +InsetMath::mode_type InsetMathMacro::currentMode() const { // There is no way to guess the mode of user defined macros, so they are // always assumed to be mathmode. Only the global macros defined in @@ -869,7 +869,7 @@ InsetMath::mode_type MathMacro::currentMode() const } -InsetMath::mode_type MathMacro::modeToEnsure() const +InsetMath::mode_type InsetMathMacro::modeToEnsure() const { // User defined macros can be either text mode or math mode for output and // display. There is no way to guess. For global macros defined in @@ -882,7 +882,7 @@ InsetMath::mode_type MathMacro::modeToEnsure() const } -MacroData const * MathMacro::macroBackup() const +MacroData const * InsetMathMacro::macroBackup() const { if (macro()) return &d->macroBackup_; @@ -892,7 +892,7 @@ MacroData const * MathMacro::macroBackup() const } -void MathMacro::validate(LaTeXFeatures & features) const +void InsetMathMacro::validate(LaTeXFeatures & features) const { // Immediately after a document is loaded, in some cases the MacroData // of the global macros defined in the lib/symbols file may still not @@ -921,14 +921,14 @@ void MathMacro::validate(LaTeXFeatures & features) const } -void MathMacro::edit(Cursor & cur, bool front, EntryDirection entry_from) +void InsetMathMacro::edit(Cursor & cur, bool front, EntryDirection entry_from) { cur.screenUpdateFlags(Update::SinglePar); InsetMathNest::edit(cur, front, entry_from); } -Inset * MathMacro::editXY(Cursor & cur, int x, int y) +Inset * InsetMathMacro::editXY(Cursor & cur, int x, int y) { // We may have 0 arguments, but InsetMathNest requires at least one. if (nargs() > 0) { @@ -939,7 +939,7 @@ Inset * MathMacro::editXY(Cursor & cur, int x, int y) } -void MathMacro::removeArgument(Inset::pos_type pos) { +void InsetMathMacro::removeArgument(Inset::pos_type pos) { if (d->displayMode_ == DISPLAY_NORMAL) { LASSERT(size_t(pos) < cells_.size(), return); cells_.erase(cells_.begin() + pos); @@ -954,7 +954,7 @@ void MathMacro::removeArgument(Inset::pos_type pos) { } -void MathMacro::insertArgument(Inset::pos_type pos) { +void InsetMathMacro::insertArgument(Inset::pos_type pos) { if (d->displayMode_ == DISPLAY_NORMAL) { LASSERT(size_t(pos) <= cells_.size(), return); cells_.insert(cells_.begin() + pos, MathData()); @@ -968,7 +968,7 @@ void MathMacro::insertArgument(Inset::pos_type pos) { } -void MathMacro::detachArguments(vector & args, bool strip) +void InsetMathMacro::detachArguments(vector & args, bool strip) { LASSERT(d->displayMode_ == DISPLAY_NORMAL, return); args = cells_; @@ -989,7 +989,7 @@ void MathMacro::detachArguments(vector & args, bool strip) } -void MathMacro::attachArguments(vector const & args, size_t arity, int optionals) +void InsetMathMacro::attachArguments(vector const & args, size_t arity, int optionals) { LASSERT(d->displayMode_ == DISPLAY_NORMAL, return); cells_ = args; @@ -1002,21 +1002,21 @@ void MathMacro::attachArguments(vector const & args, size_t arity, int } -bool MathMacro::idxFirst(Cursor & cur) const +bool InsetMathMacro::idxFirst(Cursor & cur) const { cur.screenUpdateFlags(Update::SinglePar); return InsetMathNest::idxFirst(cur); } -bool MathMacro::idxLast(Cursor & cur) const +bool InsetMathMacro::idxLast(Cursor & cur) const { cur.screenUpdateFlags(Update::SinglePar); return InsetMathNest::idxLast(cur); } -bool MathMacro::notifyCursorLeaves(Cursor const & old, Cursor & cur) +bool InsetMathMacro::notifyCursorLeaves(Cursor const & old, Cursor & cur) { if (d->displayMode_ == DISPLAY_UNFOLDED) { docstring const & unfolded_name = name(); @@ -1043,7 +1043,7 @@ bool MathMacro::notifyCursorLeaves(Cursor const & old, Cursor & cur) } -void MathMacro::fold(Cursor & cur) +void InsetMathMacro::fold(Cursor & cur) { if (!d->nextFoldMode_) { d->nextFoldMode_ = true; @@ -1052,7 +1052,7 @@ void MathMacro::fold(Cursor & cur) } -void MathMacro::unfold(Cursor & cur) +void InsetMathMacro::unfold(Cursor & cur) { if (d->nextFoldMode_) { d->nextFoldMode_ = false; @@ -1061,13 +1061,13 @@ void MathMacro::unfold(Cursor & cur) } -bool MathMacro::folded() const +bool InsetMathMacro::folded() const { return d->nextFoldMode_; } -void MathMacro::write(WriteStream & os) const +void InsetMathMacro::write(WriteStream & os) const { mode_type mode = modeToEnsure(); bool textmode_macro = mode == TEXT_MODE; @@ -1143,25 +1143,25 @@ void MathMacro::write(WriteStream & os) const } -void MathMacro::maple(MapleStream & os) const +void InsetMathMacro::maple(MapleStream & os) const { lyx::maple(d->expanded_, os); } -void MathMacro::maxima(MaximaStream & os) const +void InsetMathMacro::maxima(MaximaStream & os) const { lyx::maxima(d->expanded_, os); } -void MathMacro::mathematica(MathematicaStream & os) const +void InsetMathMacro::mathematica(MathematicaStream & os) const { lyx::mathematica(d->expanded_, os); } -void MathMacro::mathmlize(MathStream & os) const +void InsetMathMacro::mathmlize(MathStream & os) const { // macro_ is 0 if this is an unknown macro LATTEST(d->macro_ || d->displayMode_ != DISPLAY_NORMAL); @@ -1182,7 +1182,7 @@ void MathMacro::mathmlize(MathStream & os) const } -void MathMacro::htmlize(HtmlStream & os) const +void InsetMathMacro::htmlize(HtmlStream & os) const { // macro_ is 0 if this is an unknown macro LATTEST(d->macro_ || d->displayMode_ != DISPLAY_NORMAL); @@ -1201,25 +1201,25 @@ void MathMacro::htmlize(HtmlStream & os) const } -void MathMacro::octave(OctaveStream & os) const +void InsetMathMacro::octave(OctaveStream & os) const { lyx::octave(d->expanded_, os); } -void MathMacro::infoize(odocstream & os) const +void InsetMathMacro::infoize(odocstream & os) const { os << bformat(_("Macro: %1$s"), name()); } -void MathMacro::infoize2(odocstream & os) const +void InsetMathMacro::infoize2(odocstream & os) const { os << bformat(_("Macro: %1$s"), name()); } -bool MathMacro::completionSupported(Cursor const & cur) const +bool InsetMathMacro::completionSupported(Cursor const & cur) const { if (displayMode() != DISPLAY_UNFOLDED) return InsetMathNest::completionSupported(cur); @@ -1230,7 +1230,7 @@ bool MathMacro::completionSupported(Cursor const & cur) const } -bool MathMacro::inlineCompletionSupported(Cursor const & cur) const +bool InsetMathMacro::inlineCompletionSupported(Cursor const & cur) const { if (displayMode() != DISPLAY_UNFOLDED) return InsetMathNest::inlineCompletionSupported(cur); @@ -1241,7 +1241,7 @@ bool MathMacro::inlineCompletionSupported(Cursor const & cur) const } -bool MathMacro::automaticInlineCompletion() const +bool InsetMathMacro::automaticInlineCompletion() const { if (displayMode() != DISPLAY_UNFOLDED) return InsetMathNest::automaticInlineCompletion(); @@ -1250,7 +1250,7 @@ bool MathMacro::automaticInlineCompletion() const } -bool MathMacro::automaticPopupCompletion() const +bool InsetMathMacro::automaticPopupCompletion() const { if (displayMode() != DISPLAY_UNFOLDED) return InsetMathNest::automaticPopupCompletion(); @@ -1260,7 +1260,7 @@ bool MathMacro::automaticPopupCompletion() const CompletionList const * -MathMacro::createCompletionList(Cursor const & cur) const +InsetMathMacro::createCompletionList(Cursor const & cur) const { if (displayMode() != DISPLAY_UNFOLDED) return InsetMathNest::createCompletionList(cur); @@ -1269,7 +1269,7 @@ MathMacro::createCompletionList(Cursor const & cur) const } -docstring MathMacro::completionPrefix(Cursor const & cur) const +docstring InsetMathMacro::completionPrefix(Cursor const & cur) const { if (displayMode() != DISPLAY_UNFOLDED) return InsetMathNest::completionPrefix(cur); @@ -1281,7 +1281,7 @@ docstring MathMacro::completionPrefix(Cursor const & cur) const } -bool MathMacro::insertCompletion(Cursor & cur, docstring const & s, +bool InsetMathMacro::insertCompletion(Cursor & cur, docstring const & s, bool finished) { if (displayMode() != DISPLAY_UNFOLDED) @@ -1307,7 +1307,7 @@ bool MathMacro::insertCompletion(Cursor & cur, docstring const & s, } -void MathMacro::completionPosAndDim(Cursor const & cur, int & x, int & y, +void InsetMathMacro::completionPosAndDim(Cursor const & cur, int & x, int & y, Dimension & dim) const { if (displayMode() != DISPLAY_UNFOLDED) diff --git a/src/mathed/MathMacro.h b/src/mathed/InsetMathMacro.h similarity index 94% rename from src/mathed/MathMacro.h rename to src/mathed/InsetMathMacro.h index 0d4ba34bf5..4267a2b1e0 100644 --- a/src/mathed/MathMacro.h +++ b/src/mathed/InsetMathMacro.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file MathMacro.h + * \file InsetMathMacro.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -22,20 +22,20 @@ namespace lyx { /// This class contains the data for a macro. -class MathMacro : public InsetMathNest { +class InsetMathMacro : public InsetMathNest { public: /// A macro can be built from an existing template - MathMacro(Buffer * buf, docstring const & name); + InsetMathMacro(Buffer * buf, docstring const & name); /// - MathMacro(MathMacro const &); + InsetMathMacro(InsetMathMacro const &); /// - MathMacro & operator=(MathMacro const &); + InsetMathMacro & operator=(InsetMathMacro const &); /// - ~MathMacro(); + ~InsetMathMacro(); /// - virtual MathMacro * asMacro() { return this; } + virtual InsetMathMacro * asMacro() { return this; } /// - virtual MathMacro const * asMacro() const { return this; } + virtual InsetMathMacro const * asMacro() const { return this; } /// marker_type marker(BufferView const *) const; /// If the macro is in normal edit mode, dissolve its contents in diff --git a/src/mathed/MathMacroArgument.cpp b/src/mathed/InsetMathMacroArgument.cpp similarity index 72% rename from src/mathed/MathMacroArgument.cpp rename to src/mathed/InsetMathMacroArgument.cpp index d3a16ff8d9..7fca256d01 100644 --- a/src/mathed/MathMacroArgument.cpp +++ b/src/mathed/InsetMathMacroArgument.cpp @@ -1,5 +1,5 @@ /** - * \file MathMacroArgument.cpp + * \file InsetMathMacroArgument.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "MathMacroArgument.h" +#include "InsetMathMacroArgument.h" #include "MathStream.h" #include "MathSupport.h" @@ -52,11 +52,11 @@ void InsetMathHash::normalize(NormalStream & os) const } -MathMacroArgument::MathMacroArgument(int n) +InsetMathMacroArgument::InsetMathMacroArgument(int n) : number_(n) { if (n < 1 || n > 9) { - LYXERR0("MathMacroArgument::MathMacroArgument: wrong Argument id: " + LYXERR0("InsetMathMacroArgument::InsetMathMacroArgument: wrong Argument id: " << n); LASSERT(false, n = 1); } @@ -70,16 +70,16 @@ MathMacroArgument::MathMacroArgument(int n) } -Inset * MathMacroArgument::clone() const +Inset * InsetMathMacroArgument::clone() const { - return new MathMacroArgument(*this); + return new InsetMathMacroArgument(*this); } -void MathMacroArgument::setNumber(int n) +void InsetMathMacroArgument::setNumber(int n) { if (n < 1 || n > 9) { - LYXERR0("MathMacroArgument::setNumber: wrong Argument id: " << n); + LYXERR0("InsetMathMacroArgument::setNumber: wrong Argument id: " << n); LASSERT(false, return); } @@ -88,7 +88,7 @@ void MathMacroArgument::setNumber(int n) } -void MathMacroArgument::normalize(NormalStream & os) const +void InsetMathMacroArgument::normalize(NormalStream & os) const { os << "[macroarg " << str_ << "] "; } diff --git a/src/mathed/MathMacroArgument.h b/src/mathed/InsetMathMacroArgument.h similarity index 89% rename from src/mathed/MathMacroArgument.h rename to src/mathed/InsetMathMacroArgument.h index bb9fa1dc30..178c89818d 100644 --- a/src/mathed/MathMacroArgument.h +++ b/src/mathed/InsetMathMacroArgument.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file MathMacroArgument.h + * \file InsetMathMacroArgument.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -44,10 +44,10 @@ protected: /// A macro argument. -class MathMacroArgument : public InsetMathHash { +class InsetMathMacroArgument : public InsetMathHash { public: /// Assumes 0 < number <= 9 - explicit MathMacroArgument(int number); + explicit InsetMathMacroArgument(int number); /// int number() const { return number_; } /// Assumes 0 < n <= 9 diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/InsetMathMacroTemplate.cpp similarity index 85% rename from src/mathed/MathMacroTemplate.cpp rename to src/mathed/InsetMathMacroTemplate.cpp index 4aef5eb7b2..17fc2d04a2 100644 --- a/src/mathed/MathMacroTemplate.cpp +++ b/src/mathed/InsetMathMacroTemplate.cpp @@ -1,5 +1,5 @@ /** - * \file MathMacroTemplate.cpp + * \file InsetMathMacroTemplate.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,18 +11,18 @@ #include -#include "MathMacroTemplate.h" +#include "InsetMathMacroTemplate.h" #include "InsetMathBrace.h" #include "InsetMathChar.h" #include "InsetMathHull.h" #include "InsetMathSqrt.h" -#include "MathMacro.h" -#include "MathMacroArgument.h" +#include "InsetMathMacro.h" +#include "InsetMathMacroArgument.h" #include "MathStream.h" #include "MathParser.h" #include "MathSupport.h" -#include "MathMacroArgument.h" +#include "InsetMathMacroArgument.h" #include "Buffer.h" #include "BufferView.h" @@ -63,8 +63,8 @@ class InsetLabelBox : public InsetMathNest { public: /// InsetLabelBox(Buffer * buf, MathAtom const & atom, docstring label, - MathMacroTemplate const & parent, bool frame = false); - InsetLabelBox(Buffer * buf, docstring label, MathMacroTemplate const & parent, + InsetMathMacroTemplate const & parent, bool frame = false); + InsetLabelBox(Buffer * buf, docstring label, InsetMathMacroTemplate const & parent, bool frame = false); /// void metrics(MetricsInfo & mi, Dimension & dim) const; @@ -73,7 +73,7 @@ public: protected: /// - MathMacroTemplate const & parent_; + InsetMathMacroTemplate const & parent_; /// Inset * clone() const; /// @@ -84,7 +84,7 @@ protected: InsetLabelBox::InsetLabelBox(Buffer * buf, MathAtom const & atom, docstring label, - MathMacroTemplate const & parent, bool frame) + InsetMathMacroTemplate const & parent, bool frame) : InsetMathNest(buf, 1), parent_(parent), label_(label), frame_(frame) { cell(0).insert(0, atom); @@ -92,7 +92,7 @@ InsetLabelBox::InsetLabelBox(Buffer * buf, MathAtom const & atom, docstring labe InsetLabelBox::InsetLabelBox(Buffer * buf, docstring label, - MathMacroTemplate const & parent, bool frame) + InsetMathMacroTemplate const & parent, bool frame) : InsetMathNest(buf, 1), parent_(parent), label_(label), frame_(frame) { } @@ -183,11 +183,11 @@ void InsetLabelBox::draw(PainterInfo & pi, int x, int y) const ////////////////////////////////////////////////////////////////////// -class DisplayLabelBox : public InsetLabelBox { +class InsetDisplayLabelBox : public InsetLabelBox { public: /// - DisplayLabelBox(Buffer * buf, MathAtom const & atom, docstring label, - MathMacroTemplate const & parent); + InsetDisplayLabelBox(Buffer * buf, MathAtom const & atom, docstring label, + InsetMathMacroTemplate const & parent); /// marker_type marker(BufferView const *) const; @@ -202,22 +202,22 @@ protected: }; -DisplayLabelBox::DisplayLabelBox(Buffer * buf, MathAtom const & atom, +InsetDisplayLabelBox::InsetDisplayLabelBox(Buffer * buf, MathAtom const & atom, docstring label, - MathMacroTemplate const & parent) + InsetMathMacroTemplate const & parent) : InsetLabelBox(buf, atom, label, parent, true) { } -Inset * DisplayLabelBox::clone() const +Inset * InsetDisplayLabelBox::clone() const { - return new DisplayLabelBox(*this); + return new InsetDisplayLabelBox(*this); } -InsetMath::marker_type DisplayLabelBox::marker(BufferView const * bv) const +InsetMath::marker_type InsetDisplayLabelBox::marker(BufferView const * bv) const { if (parent_.editing(bv) || !parent_.cell(parent_.displayIdx()).empty()) @@ -227,7 +227,7 @@ InsetMath::marker_type DisplayLabelBox::marker(BufferView const * bv) const } -void DisplayLabelBox::metrics(MetricsInfo & mi, Dimension & dim) const +void InsetDisplayLabelBox::metrics(MetricsInfo & mi, Dimension & dim) const { InsetLabelBox::metrics(mi, dim); if (!parent_.editing(mi.base.bv) @@ -239,7 +239,7 @@ void DisplayLabelBox::metrics(MetricsInfo & mi, Dimension & dim) const } -void DisplayLabelBox::draw(PainterInfo & pi, int x, int y) const +void InsetDisplayLabelBox::draw(PainterInfo & pi, int x, int y) const { if (parent_.editing(pi.base.bv) || !parent_.cell(parent_.displayIdx()).empty()) { @@ -350,7 +350,7 @@ void InsetColoredCell::draw(PainterInfo & pi, int x, int y) const class InsetNameWrapper : public InsetMathWrapper { public: /// - InsetNameWrapper(MathData const * value, MathMacroTemplate const & parent); + InsetNameWrapper(MathData const * value, InsetMathMacroTemplate const & parent); /// void metrics(MetricsInfo & mi, Dimension & dim) const; /// @@ -358,14 +358,14 @@ public: private: /// - MathMacroTemplate const & parent_; + InsetMathMacroTemplate const & parent_; /// Inset * clone() const; }; InsetNameWrapper::InsetNameWrapper(MathData const * value, - MathMacroTemplate const & parent) + InsetMathMacroTemplate const & parent) : InsetMathWrapper(value), parent_(parent) { } @@ -404,7 +404,7 @@ void InsetNameWrapper::draw(PainterInfo & pi, int x, int y) const /////////////////////////////////////////////////////////////////////// -MathMacroTemplate::MathMacroTemplate(Buffer * buf) +InsetMathMacroTemplate::InsetMathMacroTemplate(Buffer * buf) : InsetMathNest(buf, 3), numargs_(0), argsInLook_(0), optionals_(0), type_(MacroTypeNewcommand), redefinition_(false), lookOutdated_(true), premetrics_(false), labelBoxAscent_(0), labelBoxDescent_(0) @@ -413,7 +413,7 @@ MathMacroTemplate::MathMacroTemplate(Buffer * buf) } -MathMacroTemplate::MathMacroTemplate(Buffer * buf, docstring const & name, int numargs, +InsetMathMacroTemplate::InsetMathMacroTemplate(Buffer * buf, docstring const & name, int numargs, int optionals, MacroType type, vector const & optionalValues, MathData const & def, MathData const & display) : InsetMathNest(buf, optionals + 3), numargs_(numargs), argsInLook_(numargs), @@ -424,7 +424,7 @@ MathMacroTemplate::MathMacroTemplate(Buffer * buf, docstring const & name, int n initMath(); if (numargs_ > 9) - lyxerr << "MathMacroTemplate::MathMacroTemplate: wrong # of arguments: " + lyxerr << "InsetMathMacroTemplate::InsetMathMacroTemplate: wrong # of arguments: " << numargs_ << endl; asArray(name, cell(0)); @@ -438,7 +438,7 @@ MathMacroTemplate::MathMacroTemplate(Buffer * buf, docstring const & name, int n } -bool MathMacroTemplate::fromString(docstring const & str) +bool InsetMathMacroTemplate::fromString(docstring const & str) { MathData ar(buffer_); mathed_parse_cell(ar, str, Parse::NORMAL); @@ -455,9 +455,9 @@ bool MathMacroTemplate::fromString(docstring const & str) } -Inset * MathMacroTemplate::clone() const +Inset * InsetMathMacroTemplate::clone() const { - MathMacroTemplate * inset = new MathMacroTemplate(*this); + InsetMathMacroTemplate * inset = new InsetMathMacroTemplate(*this); // the parent pointers of the proxy insets above will point to // to the old template. Hence, the look must be updated. inset->updateLook(); @@ -465,25 +465,25 @@ Inset * MathMacroTemplate::clone() const } -docstring MathMacroTemplate::name() const +docstring InsetMathMacroTemplate::name() const { return asString(cell(0)); } -void MathMacroTemplate::updateToContext(MacroContext const & mc) +void InsetMathMacroTemplate::updateToContext(MacroContext const & mc) { redefinition_ = mc.get(name()) != 0; } -void MathMacroTemplate::updateLook() const +void InsetMathMacroTemplate::updateLook() const { lookOutdated_ = true; } -void MathMacroTemplate::createLook(int args) const +void InsetMathMacroTemplate::createLook(int args) const { look_.clear(); argsInLook_ = args; @@ -518,7 +518,7 @@ void MathMacroTemplate::createLook(int args) const // {#3}{#4} for (; i < numargs_; ++i) { MathData arg; - arg.push_back(MathAtom(new MathMacroArgument(i + 1))); + arg.push_back(MathAtom(new InsetMathMacroArgument(i + 1))); if (i >= argsInLook_) { look_.push_back(MathAtom(new InsetColoredCell(buffer_, Color_mathbg, Color_mathmacrooldarg, @@ -528,7 +528,7 @@ void MathMacroTemplate::createLook(int args) const } for (; i < argsInLook_; ++i) { MathData arg; - arg.push_back(MathAtom(new MathMacroArgument(i + 1))); + arg.push_back(MathAtom(new InsetMathMacroArgument(i + 1))); look_.push_back(MathAtom(new InsetColoredCell(buffer_, Color_mathbg, Color_mathmacronewarg, MathAtom(new InsetMathBrace(arg))))); @@ -545,12 +545,12 @@ void MathMacroTemplate::createLook(int args) const // display look_.push_back(MathAtom( - new DisplayLabelBox(buffer_, MathAtom( + new InsetDisplayLabelBox(buffer_, MathAtom( new InsetMathWrapper(&cell(displayIdx()))), _("LyX"), *this))); } -void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const +void InsetMathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const { Changer dummy1 = mi.base.changeFontSet("mathnormal"); Changer dummy2 = mi.base.font.changeStyle(LM_ST_TEXT); @@ -590,7 +590,7 @@ void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const } -void MathMacroTemplate::draw(PainterInfo & pi, int x, int y) const +void InsetMathMacroTemplate::draw(PainterInfo & pi, int x, int y) const { // FIXME: Calling Changer on the same object repeatedly is inefficient. Changer dummy0 = pi.base.font.changeColor(Color_math); @@ -614,7 +614,7 @@ void MathMacroTemplate::draw(PainterInfo & pi, int x, int y) const } -void MathMacroTemplate::edit(Cursor & cur, bool front, EntryDirection entry_from) +void InsetMathMacroTemplate::edit(Cursor & cur, bool front, EntryDirection entry_from) { updateLook(); cur.screenUpdateFlags(Update::SinglePar); @@ -622,7 +622,7 @@ void MathMacroTemplate::edit(Cursor & cur, bool front, EntryDirection entry_from } -bool MathMacroTemplate::notifyCursorLeaves(Cursor const & old, Cursor & cur) +bool InsetMathMacroTemplate::notifyCursorLeaves(Cursor const & old, Cursor & cur) { unsigned int const nargs_before = nargs(); commitEditChanges(cur, old); @@ -634,7 +634,7 @@ bool MathMacroTemplate::notifyCursorLeaves(Cursor const & old, Cursor & cur) } -void MathMacroTemplate::removeArguments(Cursor & cur, +void InsetMathMacroTemplate::removeArguments(Cursor & cur, DocIterator const & /*inset_pos*/, int from, int to) { DocIterator it = doc_iterator_begin(&buffer(), this); @@ -643,7 +643,7 @@ void MathMacroTemplate::removeArguments(Cursor & cur, continue; if (it.nextInset()->lyxCode() != MATH_MACROARG_CODE) continue; - MathMacroArgument * arg = static_cast(it.nextInset()); + InsetMathMacroArgument * arg = static_cast(it.nextInset()); int n = arg->number() - 1; if (from <= n && n <= to) { int cellSlice = cur.find(it.cell()); @@ -658,14 +658,14 @@ void MathMacroTemplate::removeArguments(Cursor & cur, } -void MathMacroTemplate::shiftArguments(size_t from, int by) +void InsetMathMacroTemplate::shiftArguments(size_t from, int by) { for (DocIterator it = doc_iterator_begin(&buffer(), this); it; it.forwardChar()) { if (!it.nextInset()) continue; if (it.nextInset()->lyxCode() != MATH_MACROARG_CODE) continue; - MathMacroArgument * arg = static_cast(it.nextInset()); + InsetMathMacroArgument * arg = static_cast(it.nextInset()); if (arg->number() >= int(from) + 1) arg->setNumber(arg->number() + by); } @@ -674,7 +674,7 @@ void MathMacroTemplate::shiftArguments(size_t from, int by) } -int MathMacroTemplate::maxArgumentInDefinition() const +int InsetMathMacroTemplate::maxArgumentInDefinition() const { // We don't have a buffer when pasting from the clipboard (bug 6014). Buffer const * macro_buffer = isBufferLoaded() ? &buffer() : 0; @@ -686,14 +686,14 @@ int MathMacroTemplate::maxArgumentInDefinition() const continue; if (it.nextInset()->lyxCode() != MATH_MACROARG_CODE) continue; - MathMacroArgument * arg = static_cast(it.nextInset()); + InsetMathMacroArgument * arg = static_cast(it.nextInset()); maxArg = std::max(int(arg->number()), maxArg); } return maxArg; } -void MathMacroTemplate::insertMissingArguments(int maxArg) +void InsetMathMacroTemplate::insertMissingArguments(int maxArg) { bool found[9] = { false, false, false, false, false, false, false, false, false }; idx_type idx = cell(displayIdx()).empty() ? defIdx() : displayIdx(); @@ -706,7 +706,7 @@ void MathMacroTemplate::insertMissingArguments(int maxArg) continue; if (it.nextInset()->lyxCode() != MATH_MACROARG_CODE) continue; - MathMacroArgument * arg = static_cast(it.nextInset()); + InsetMathMacroArgument * arg = static_cast(it.nextInset()); found[arg->number() - 1] = true; } @@ -715,12 +715,12 @@ void MathMacroTemplate::insertMissingArguments(int maxArg) if (found[i]) continue; - cell(idx).push_back(MathAtom(new MathMacroArgument(i + 1))); + cell(idx).push_back(MathAtom(new InsetMathMacroArgument(i + 1))); } } -void MathMacroTemplate::changeArity(Cursor & cur, +void InsetMathMacroTemplate::changeArity(Cursor & cur, DocIterator const & inset_pos, int newNumArg) { // remove parameter which do not appear anymore in the definition @@ -740,7 +740,7 @@ public: /// AddRemoveMacroInstanceFix(int n, bool insert) : n_(n), insert_(insert) {} /// - void operator()(MathMacro * macro) + void operator()(InsetMathMacro * macro) { if (macro->folded()) { if (insert_) @@ -765,7 +765,7 @@ public: /// OptionalsMacroInstanceFix(int optionals) : optionals_(optionals) {} /// - void operator()(MathMacro * macro) + void operator()(InsetMathMacro * macro) { macro->setOptionals(optionals_); } @@ -781,7 +781,7 @@ class NullMacroInstanceFix { public: /// - void operator()(MathMacro * ) {} + void operator()(InsetMathMacro * ) {} }; @@ -813,8 +813,8 @@ void fixMacroInstances(Cursor & cur, DocIterator const & inset_pos, // only until a macro is redefined if (dit.inset().lyxCode() == MATHMACRO_CODE) { - MathMacroTemplate const & macroTemplate - = static_cast(dit.inset()); + InsetMathMacroTemplate const & macroTemplate + = static_cast(dit.inset()); if (macroTemplate.name() == name) break; } @@ -834,7 +834,7 @@ void fixMacroInstances(Cursor & cur, DocIterator const & inset_pos, hull = dit; } - MathMacro * macro = insetMath->asMacro(); + InsetMathMacro * macro = insetMath->asMacro(); if (macro && macro->name() == name && macro->folded()) { fix(macro); if (RenderPreview::previewMath()) @@ -857,7 +857,7 @@ void fixMacroInstances(Cursor & cur, DocIterator const & inset_pos, } -void MathMacroTemplate::commitEditChanges(Cursor & cur, +void InsetMathMacroTemplate::commitEditChanges(Cursor & cur, DocIterator const & inset_pos) { int args_in_def = maxArgumentInDefinition(); @@ -875,7 +875,7 @@ void MathMacroTemplate::commitEditChanges(Cursor & cur, } -void MathMacroTemplate::insertParameter(Cursor & cur, +void InsetMathMacroTemplate::insertParameter(Cursor & cur, DocIterator const & inset_pos, int pos, bool greedy, bool addarg) { if (pos <= numargs_ && pos >= optionals_ && numargs_ < 9) { @@ -885,9 +885,9 @@ void MathMacroTemplate::insertParameter(Cursor & cur, if (addarg) { shiftArguments(pos, 1); - cell(defIdx()).push_back(MathAtom(new MathMacroArgument(pos + 1))); + cell(defIdx()).push_back(MathAtom(new InsetMathMacroArgument(pos + 1))); if (!cell(displayIdx()).empty()) - cell(displayIdx()).push_back(MathAtom(new MathMacroArgument(pos + 1))); + cell(displayIdx()).push_back(MathAtom(new InsetMathMacroArgument(pos + 1))); } if (!greedy) { @@ -901,7 +901,7 @@ void MathMacroTemplate::insertParameter(Cursor & cur, } -void MathMacroTemplate::removeParameter(Cursor & cur, +void InsetMathMacroTemplate::removeParameter(Cursor & cur, DocIterator const & inset_pos, int pos, bool greedy) { if (pos < numargs_ && pos >= 0) { @@ -938,7 +938,7 @@ void MathMacroTemplate::removeParameter(Cursor & cur, } -void MathMacroTemplate::makeOptional(Cursor & cur, +void InsetMathMacroTemplate::makeOptional(Cursor & cur, DocIterator const & inset_pos) { if (numargs_ > 0 && optionals_ < numargs_) { @@ -958,7 +958,7 @@ void MathMacroTemplate::makeOptional(Cursor & cur, } -void MathMacroTemplate::makeNonOptional(Cursor & cur, +void InsetMathMacroTemplate::makeNonOptional(Cursor & cur, DocIterator const & inset_pos) { if (numargs_ > 0 && optionals_ > 0) { @@ -989,7 +989,7 @@ void MathMacroTemplate::makeNonOptional(Cursor & cur, } -void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd) +void InsetMathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd) { string const arg = to_utf8(cmd.argument()); switch (cmd.action()) { @@ -1095,7 +1095,7 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd) } -bool MathMacroTemplate::getStatus(Cursor & cur, FuncRequest const & cmd, +bool InsetMathMacroTemplate::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { bool ret = true; @@ -1160,7 +1160,7 @@ bool MathMacroTemplate::getStatus(Cursor & cur, FuncRequest const & cmd, } -void MathMacroTemplate::read(Lexer & lex) +void InsetMathMacroTemplate::read(Lexer & lex) { MathData ar(buffer_); mathed_parse_cell(ar, lex.getStream(), Parse::TRACKMACRO); @@ -1175,7 +1175,7 @@ void MathMacroTemplate::read(Lexer & lex) } -void MathMacroTemplate::write(ostream & os) const +void InsetMathMacroTemplate::write(ostream & os) const { odocstringstream oss; otexrowstream ots(oss); @@ -1186,13 +1186,13 @@ void MathMacroTemplate::write(ostream & os) const } -void MathMacroTemplate::write(WriteStream & os) const +void InsetMathMacroTemplate::write(WriteStream & os) const { write(os, false); } -int MathMacroTemplate::write(WriteStream & os, bool overwriteRedefinition) const +int InsetMathMacroTemplate::write(WriteStream & os, bool overwriteRedefinition) const { int num_lines = 0; @@ -1271,12 +1271,12 @@ int MathMacroTemplate::write(WriteStream & os, bool overwriteRedefinition) const } -docstring MathMacroTemplate::xhtml(XHTMLStream &, OutputParams const &) const +docstring InsetMathMacroTemplate::xhtml(XHTMLStream &, OutputParams const &) const { return docstring(); } -int MathMacroTemplate::plaintext(odocstringstream & os, +int InsetMathMacroTemplate::plaintext(odocstringstream & os, OutputParams const &, size_t) const { docstring const str = '[' + buffer().B_("math macro") + ']'; @@ -1286,7 +1286,7 @@ int MathMacroTemplate::plaintext(odocstringstream & os, } -bool MathMacroTemplate::validName() const +bool InsetMathMacroTemplate::validName() const { docstring n = name(); @@ -1311,13 +1311,13 @@ bool MathMacroTemplate::validName() const } -bool MathMacroTemplate::validMacro() const +bool InsetMathMacroTemplate::validMacro() const { return validName(); } -bool MathMacroTemplate::fixNameAndCheckIfValid() +bool InsetMathMacroTemplate::fixNameAndCheckIfValid() { // check all the characters/insets in the name cell size_t i = 0; @@ -1343,7 +1343,7 @@ bool MathMacroTemplate::fixNameAndCheckIfValid() } -void MathMacroTemplate::validate(LaTeXFeatures & features) const +void InsetMathMacroTemplate::validate(LaTeXFeatures & features) const { // we need global optional macro arguments. They are not available // with \def, and \newcommand does not support global macros. So we @@ -1352,7 +1352,7 @@ void MathMacroTemplate::validate(LaTeXFeatures & features) const features.require("xargs"); } -void MathMacroTemplate::getDefaults(vector & defaults) const +void InsetMathMacroTemplate::getDefaults(vector & defaults) const { defaults.resize(numargs_); for (int i = 0; i < optionals_; ++i) @@ -1360,43 +1360,43 @@ void MathMacroTemplate::getDefaults(vector & defaults) const } -docstring MathMacroTemplate::definition() const +docstring InsetMathMacroTemplate::definition() const { return asString(cell(defIdx())); } -docstring MathMacroTemplate::displayDefinition() const +docstring InsetMathMacroTemplate::displayDefinition() const { return asString(cell(displayIdx())); } -size_t MathMacroTemplate::numArgs() const +size_t InsetMathMacroTemplate::numArgs() const { return numargs_; } -size_t MathMacroTemplate::numOptionals() const +size_t InsetMathMacroTemplate::numOptionals() const { return optionals_; } -void MathMacroTemplate::infoize(odocstream & os) const +void InsetMathMacroTemplate::infoize(odocstream & os) const { os << bformat(_("Math Macro: \\%1$s"), name()); } -string MathMacroTemplate::contextMenuName() const +string InsetMathMacroTemplate::contextMenuName() const { return "context-math-macro-definition"; } -void MathMacroTemplate::addToToc(DocIterator const & pit, bool output_active, +void InsetMathMacroTemplate::addToToc(DocIterator const & pit, bool output_active, UpdateType, TocBackend & backend) const { docstring str; diff --git a/src/mathed/MathMacroTemplate.h b/src/mathed/InsetMathMacroTemplate.h similarity index 93% rename from src/mathed/MathMacroTemplate.h rename to src/mathed/InsetMathMacroTemplate.h index d67b8a27c7..ddcfe4df78 100644 --- a/src/mathed/MathMacroTemplate.h +++ b/src/mathed/InsetMathMacroTemplate.h @@ -24,12 +24,12 @@ class OutputParams; class XHTMLStream; /// This class contains the macro definition. -class MathMacroTemplate : public InsetMathNest { +class InsetMathMacroTemplate : public InsetMathNest { public: /// - MathMacroTemplate(Buffer * buf); + InsetMathMacroTemplate(Buffer * buf); /// - MathMacroTemplate(Buffer * buf, docstring const & name, int nargs, + InsetMathMacroTemplate(Buffer * buf, docstring const & name, int nargs, int optional, MacroType type, std::vector const & optionalValues = std::vector(), MathData const & def = MathData(), @@ -94,9 +94,9 @@ public: /// void metrics(MetricsInfo & mi, Dimension & dim) const; /// identifies macro templates - MathMacroTemplate * asMacroTemplate() { return this; } + InsetMathMacroTemplate * asMacroTemplate() { return this; } /// identifies macro templates - MathMacroTemplate const * asMacroTemplate() const { return this; } + InsetMathMacroTemplate const * asMacroTemplate() const { return this; } /// InsetCode lyxCode() const { return MATHMACRO_CODE; } /// @@ -115,7 +115,7 @@ protected: private: friend class InsetLabelBox; - friend class DisplayLabelBox; + friend class InsetDisplayLabelBox; /// virtual Inset * clone() const; diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp index 993b6fc0fe..f9c8813a01 100644 --- a/src/mathed/InsetMathNest.cpp +++ b/src/mathed/InsetMathNest.cpp @@ -32,8 +32,8 @@ #include "MathCompletionList.h" #include "MathData.h" #include "MathFactory.h" -#include "MathMacro.h" -#include "MathMacroArgument.h" +#include "InsetMathMacro.h" +#include "InsetMathMacroArgument.h" #include "MathParser.h" #include "MathStream.h" #include "MathSupport.h" @@ -1206,7 +1206,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) bool fold = act == LFUN_MATH_MACRO_FOLD; bool found = findMacroToFoldUnfold(it, fold); if (found) { - MathMacro * macro = it.nextInset()->asInsetMath()->asMacro(); + InsetMathMacro * macro = it.nextInset()->asInsetMath()->asMacro(); cur.recordUndoInset(); if (fold) macro->fold(cur); @@ -1302,7 +1302,7 @@ bool InsetMathNest::findMacroToFoldUnfold(Cursor & it, bool fold) const { // go backward through the current cell Inset * inset = it.nextInset(); while (inset && inset->asInsetMath()) { - MathMacro * macro = inset->asInsetMath()->asMacro(); + InsetMathMacro * macro = inset->asInsetMath()->asMacro(); if (macro) { // found the an macro to open/close? if (macro->folded() != fold) @@ -1637,7 +1637,7 @@ bool InsetMathNest::interpretChar(Cursor & cur, char_type const c) cur.backspace(); int n = c - '0'; if (n >= 1 && n <= 9) - cur.insert(new MathMacroArgument(n)); + cur.insert(new InsetMathMacroArgument(n)); return true; } diff --git a/src/mathed/InsetMathRef.cpp b/src/mathed/InsetMathRef.cpp index 22807f15b5..42151209e7 100644 --- a/src/mathed/InsetMathRef.cpp +++ b/src/mathed/InsetMathRef.cpp @@ -38,12 +38,12 @@ using namespace std; namespace lyx { InsetMathRef::InsetMathRef(Buffer * buf) - : CommandInset(buf, from_ascii("ref"), false) + : InsetMathCommand(buf, from_ascii("ref"), false) {} InsetMathRef::InsetMathRef(Buffer * buf, docstring const & data) - : CommandInset(buf, data, false) + : InsetMathCommand(buf, data, false) {} @@ -116,7 +116,7 @@ void InsetMathRef::doDispatch(Cursor & cur, FuncRequest & cmd) break; default: - CommandInset::doDispatch(cur, cmd); + InsetMathCommand::doDispatch(cur, cmd); break; } } @@ -136,7 +136,7 @@ bool InsetMathRef::getStatus(Cursor & cur, FuncRequest const & cmd, status.setEnabled(true); return true; default: - return CommandInset::getStatus(cur, cmd, status); + return InsetMathCommand::getStatus(cur, cmd, status); } } diff --git a/src/mathed/InsetMathRef.h b/src/mathed/InsetMathRef.h index 8011f9452c..d1046d9aba 100644 --- a/src/mathed/InsetMathRef.h +++ b/src/mathed/InsetMathRef.h @@ -13,14 +13,14 @@ #define REF_INSET_H -#include "CommandInset.h" +#include "InsetMathCommand.h" namespace lyx { class Buffer; // for \ref -class InsetMathRef : public CommandInset { +class InsetMathRef : public InsetMathCommand { public: /// InsetMathRef(Buffer * buf); diff --git a/src/mathed/MacroTable.cpp b/src/mathed/MacroTable.cpp index 2899e40c2e..d279bdb844 100644 --- a/src/mathed/MacroTable.cpp +++ b/src/mathed/MacroTable.cpp @@ -12,8 +12,8 @@ #include "InsetMathSqrt.h" #include "MacroTable.h" -#include "MathMacroTemplate.h" -#include "MathMacroArgument.h" +#include "InsetMathMacroTemplate.h" +#include "InsetMathMacroArgument.h" #include "MathParser.h" #include "MathStream.h" #include "MathSupport.h" @@ -55,7 +55,7 @@ MacroData::MacroData(Buffer * buf, DocIterator const & pos) } -MacroData::MacroData(Buffer * buf, MathMacroTemplate const & macro) +MacroData::MacroData(Buffer * buf, InsetMathMacroTemplate const & macro) : buffer_(buf), queried_(false), numargs_(0), sym_(0), optionals_(0), lockCount_(0), redefinition_(false), type_(MacroTypeNewcommand) { @@ -81,7 +81,7 @@ bool MacroData::expand(vector const & args, MathData & to) const continue; //it.cell().erase(it.pos()); //it.cell().insert(it.pos(), it.nextInset()->asInsetMath() - size_t n = static_cast(it.nextInset())->number(); + size_t n = static_cast(it.nextInset())->number(); if (n <= args.size()) { it.cell().erase(it.pos()); it.cell().insert(it.pos(), args[n - 1]); @@ -147,7 +147,7 @@ void MacroData::unlock() const } -void MacroData::queryData(MathMacroTemplate const & macro) const +void MacroData::queryData(InsetMathMacroTemplate const & macro) const { if (queried_) return; @@ -182,7 +182,7 @@ void MacroData::updateData() const } // query the data from the macro template - queryData(static_cast(*inset)); + queryData(static_cast(*inset)); } @@ -198,8 +198,8 @@ int MacroData::write(odocstream & os, bool overwriteRedefinition) const } // output template - MathMacroTemplate const & tmpl = - static_cast(*inset); + InsetMathMacroTemplate const & tmpl = + static_cast(*inset); otexrowstream ots(os); WriteStream wi(ots, false, true, WriteStream::wsDefault); return tmpl.write(wi, overwriteRedefinition); @@ -244,7 +244,7 @@ MacroTable::iterator MacroTable::insert(Buffer * buf, docstring const & def) { //lyxerr << "MacroTable::insert, def: " << to_utf8(def) << endl; - MathMacroTemplate mac(buf); + InsetMathMacroTemplate mac(buf); mac.fromString(def); MacroData data(buf, mac); return insert(mac.name(), data); diff --git a/src/mathed/MacroTable.h b/src/mathed/MacroTable.h index bc445d4397..eb613cae07 100644 --- a/src/mathed/MacroTable.h +++ b/src/mathed/MacroTable.h @@ -25,7 +25,7 @@ namespace lyx { class Buffer; class MathData; -class MathMacroTemplate; +class InsetMathMacroTemplate; class Paragraph; class latexkeys; @@ -43,7 +43,7 @@ public: /// Create lazy MacroData which only queries the macro template when needed MacroData(Buffer * buf, DocIterator const & pos); /// Create non-lazy MacroData which directly queries the macro template - MacroData(Buffer * buf, MathMacroTemplate const & macro); + MacroData(Buffer * buf, InsetMathMacroTemplate const & macro); /// docstring const & definition() const { updateData(); return definition_; } @@ -106,7 +106,7 @@ public: private: /// - void queryData(MathMacroTemplate const & macro) const; + void queryData(InsetMathMacroTemplate const & macro) const; /// void updateData() const; /// diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp index d6522ab3a3..beb1299b9a 100644 --- a/src/mathed/MathData.cpp +++ b/src/mathed/MathData.cpp @@ -17,7 +17,7 @@ #include "InsetMathFont.h" #include "InsetMathScript.h" #include "MacroTable.h" -#include "MathMacro.h" +#include "InsetMathMacro.h" #include "MathStream.h" #include "MathSupport.h" #include "MetricsInfo.h" @@ -373,18 +373,18 @@ void MathData::updateMacros(Cursor * cur, MacroContext const & mc, // If we are editing a macro, we cannot update it immediately, // otherwise wrong undo steps will be recorded (bug 6208). InsetMath const * inmath = cur ? cur->inset().asInsetMath() : 0; - MathMacro const * inmacro = inmath ? inmath->asMacro() : 0; + InsetMathMacro const * inmacro = inmath ? inmath->asMacro() : 0; docstring const edited_name = inmacro ? inmacro->name() : docstring(); // go over the array and look for macros for (size_t i = 0; i < size(); ++i) { - MathMacro * macroInset = operator[](i).nucleus()->asMacro(); + InsetMathMacro * macroInset = operator[](i).nucleus()->asMacro(); if (!macroInset || macroInset->macroName().empty() || macroInset->macroName()[0] == '^' || macroInset->macroName()[0] == '_' || (macroInset->name() == edited_name && macroInset->displayMode() == - MathMacro::DISPLAY_UNFOLDED)) + InsetMathMacro::DISPLAY_UNFOLDED)) continue; // get macro @@ -398,23 +398,23 @@ void MathData::updateMacros(Cursor * cur, MacroContext const & mc, } // store old and compute new display mode - MathMacro::DisplayMode newDisplayMode; - MathMacro::DisplayMode oldDisplayMode = macroInset->displayMode(); + InsetMathMacro::DisplayMode newDisplayMode; + InsetMathMacro::DisplayMode oldDisplayMode = macroInset->displayMode(); newDisplayMode = macroInset->computeDisplayMode(); // arity changed or other reason to detach? - if (oldDisplayMode == MathMacro::DISPLAY_NORMAL + if (oldDisplayMode == InsetMathMacro::DISPLAY_NORMAL && (macroInset->arity() != macroNumArgs || macroInset->optionals() != macroOptionals - || newDisplayMode == MathMacro::DISPLAY_UNFOLDED)) + || newDisplayMode == InsetMathMacro::DISPLAY_UNFOLDED)) detachMacroParameters(cur, i); // the macro could have been copied while resizing this macroInset = operator[](i).nucleus()->asMacro(); // Cursor in \label? - if (newDisplayMode != MathMacro::DISPLAY_UNFOLDED - && oldDisplayMode == MathMacro::DISPLAY_UNFOLDED) { + if (newDisplayMode != InsetMathMacro::DISPLAY_UNFOLDED + && oldDisplayMode == InsetMathMacro::DISPLAY_UNFOLDED) { // put cursor in front of macro if (cur) { int macroSlice = cur->find(macroInset); @@ -428,19 +428,19 @@ void MathData::updateMacros(Cursor * cur, MacroContext const & mc, macroInset->setDisplayMode(newDisplayMode); // arity changed? - if (newDisplayMode == MathMacro::DISPLAY_NORMAL + if (newDisplayMode == InsetMathMacro::DISPLAY_NORMAL && (macroInset->arity() != macroNumArgs || macroInset->optionals() != macroOptionals)) { // is it a virgin macro which was never attached to parameters? bool fromInitToNormalMode - = (oldDisplayMode == MathMacro::DISPLAY_INIT - || oldDisplayMode == MathMacro::DISPLAY_INTERACTIVE_INIT) - && newDisplayMode == MathMacro::DISPLAY_NORMAL; + = (oldDisplayMode == InsetMathMacro::DISPLAY_INIT + || oldDisplayMode == InsetMathMacro::DISPLAY_INTERACTIVE_INIT) + && newDisplayMode == InsetMathMacro::DISPLAY_NORMAL; // if the macro was entered interactively (i.e. not by paste or during // loading), it should not be greedy, but the cursor should // automatically jump into the macro when behind - bool interactive = (oldDisplayMode == MathMacro::DISPLAY_INTERACTIVE_INIT); + bool interactive = (oldDisplayMode == InsetMathMacro::DISPLAY_INTERACTIVE_INIT); // attach parameters attachMacroParameters(cur, i, macroNumArgs, macroOptionals, @@ -464,7 +464,7 @@ void MathData::updateMacros(Cursor * cur, MacroContext const & mc, void MathData::detachMacroParameters(DocIterator * cur, const size_type macroPos) { - MathMacro * macroInset = operator[](macroPos).nucleus()->asMacro(); + InsetMathMacro * macroInset = operator[](macroPos).nucleus()->asMacro(); // We store this now, because the inset pointer will be invalidated in the scond loop below size_t const optionals = macroInset->optionals(); @@ -595,7 +595,7 @@ void MathData::attachMacroParameters(Cursor * cur, const int macroOptionals, const bool fromInitToNormalMode, const bool interactiveInit, const size_t appetite) { - MathMacro * macroInset = operator[](macroPos).nucleus()->asMacro(); + InsetMathMacro * macroInset = operator[](macroPos).nucleus()->asMacro(); // start at atom behind the macro again, maybe with some new arguments // from the detach phase above, to add them back into the macro inset diff --git a/src/mathed/MathData.h b/src/mathed/MathData.h index f29d1e59dc..2f6ab22acd 100644 --- a/src/mathed/MathData.h +++ b/src/mathed/MathData.h @@ -38,7 +38,7 @@ class DocIterator; class LaTeXFeatures; class ReplaceData; class MacroContext; -class MathMacro; +class InsetMathMacro; class MetricsInfo; class PainterInfo; class ParIterator; diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp index 79ae676fc3..cebac7c9cc 100644 --- a/src/mathed/MathFactory.cpp +++ b/src/mathed/MathFactory.cpp @@ -50,8 +50,8 @@ #include "InsetMathXYMatrix.h" #include "InsetMathDiagram.h" #include "MacroTable.h" -#include "MathMacro.h" -#include "MathMacroArgument.h" +#include "InsetMathMacro.h" +#include "InsetMathMacroArgument.h" #include "MathParser.h" #include "MathStream.h" #include "MathSupport.h" @@ -394,7 +394,7 @@ bool ensureMath(WriteStream & os, bool needs_mathmode, bool macro, } os.textMode(true); } else if (macro && brace && !needs_mathmode && !textmode_macro) { - // This is a user defined macro, not a MathMacro, so we + // This is a user defined macro, not a InsetMathMacro, so we // cannot be sure what mode is needed. We leave it in the // same environment it was entered by closing either \lyxmathsym // or \ensuremath, whichever was opened. @@ -448,7 +448,7 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf) //lyxerr << "creating inset with name: '" << to_utf8(s) << '\'' << endl; if ((s == "ce" || s == "cf") && buf && buf->params().use_package("mhchem") == BufferParams::package_off) - return MathAtom(new MathMacro(buf, s)); + return MathAtom(new InsetMathMacro(buf, s)); latexkeys const * l = in_word_set(s); if (l) { @@ -490,10 +490,10 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf) } if (s.size() == 2 && s[0] == '#' && s[1] >= '1' && s[1] <= '9') - return MathAtom(new MathMacroArgument(s[1] - '0')); + return MathAtom(new InsetMathMacroArgument(s[1] - '0')); if (s.size() == 3 && s[0] == '\\' && s[1] == '#' && s[2] >= '1' && s[2] <= '9') - return MathAtom(new MathMacroArgument(s[2] - '0')); + return MathAtom(new InsetMathMacroArgument(s[2] - '0')); if (s == "boxed") return MathAtom(new InsetMathBoxed(buf)); if (s == "fbox") @@ -671,7 +671,7 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf) if (s == "regexp") return MathAtom(new InsetMathHull(buf, hullRegexp)); - return MathAtom(new MathMacro(buf, s)); + return MathAtom(new InsetMathMacro(buf, s)); } diff --git a/src/mathed/MathParser.cpp b/src/mathed/MathParser.cpp index b39f172fb7..35062caefe 100644 --- a/src/mathed/MathParser.cpp +++ b/src/mathed/MathParser.cpp @@ -51,7 +51,7 @@ following hack as starting point to write some macros: #include "InsetMathEnv.h" #include "InsetMathFrac.h" #include "InsetMathKern.h" -#include "MathMacro.h" +#include "InsetMathMacro.h" #include "InsetMathPar.h" #include "InsetMathRef.h" #include "InsetMathRoot.h" @@ -63,10 +63,10 @@ following hack as starting point to write some macros: #include "InsetMathStackrel.h" #include "InsetMathString.h" #include "InsetMathTabular.h" -#include "MathMacroTemplate.h" +#include "InsetMathMacroTemplate.h" #include "MathExtern.h" #include "MathFactory.h" -#include "MathMacroArgument.h" +#include "InsetMathMacroArgument.h" #include "MathSupport.h" #include "Buffer.h" @@ -932,7 +932,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, Token const & n = nextToken(); char_type c = n.character(); if (c && '0' < c && c <= '9') { - cell->push_back(MathAtom(new MathMacroArgument(c - '0'))); + cell->push_back(MathAtom(new InsetMathMacroArgument(c - '0'))); getToken(); } else cell->push_back(MathAtom(new InsetMathHash())); @@ -1082,7 +1082,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, if (nextToken().cat() == catBegin) parse(display, FLAG_ITEM, InsetMath::MATH_MODE); - cell->push_back(MathAtom(new MathMacroTemplate(buf, + cell->push_back(MathAtom(new InsetMathMacroTemplate(buf, name, nargs, 0, MacroTypeDef, vector(), def, display))); @@ -1130,7 +1130,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, if (nextToken().cat() == catBegin) parse(display, FLAG_ITEM, InsetMath::MATH_MODE); - cell->push_back(MathAtom(new MathMacroTemplate(buf, + cell->push_back(MathAtom(new InsetMathMacroTemplate(buf, name, nargs, optionals, MacroTypeNewcommand, optionalValues, def, display))); @@ -1251,7 +1251,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, if (nextToken().cat() == catBegin) parse(display, FLAG_ITEM, InsetMath::MATH_MODE); - cell->push_back(MathAtom(new MathMacroTemplate(buf, + cell->push_back(MathAtom(new InsetMathMacroTemplate(buf, name, nargs, optionals, MacroTypeNewcommandx, optionalValues, def, display))); @@ -1399,7 +1399,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, // parse the remaining contents into the "real" cell parse(*cell, FLAG_ITEM, mode); } else { - MathAtom at = MathAtom(new MathMacro(buf, t.cs())); + MathAtom at = MathAtom(new InsetMathMacro(buf, t.cs())); cell->push_back(at); cell->push_back(MathAtom(new InsetMathBrace(count))); } @@ -1787,7 +1787,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, break; } if (s.empty()) - cell->push_back(MathAtom(new MathMacro(buf, t.cs()))); + cell->push_back(MathAtom(new InsetMathMacro(buf, t.cs()))); else cell->push_back(MathAtom(new InsetMathKern(s))); } @@ -1897,7 +1897,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, else { // Since the Length class cannot use length variables // we must not create an InsetMathSpace. - cell->push_back(MathAtom(new MathMacro(buf, name))); + cell->push_back(MathAtom(new InsetMathMacro(buf, name))); MathData ar; mathed_parse_cell(ar, '{' + arg + '}', mode_); cell->append(ar); @@ -1916,7 +1916,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, parse(cell->back().nucleus()->cell(0), FLAG_ITEM, mode); } else { docstring const arg = parse_verbatim_item(); - cell->push_back(MathAtom(new MathMacro(buf, t.cs()))); + cell->push_back(MathAtom(new InsetMathMacro(buf, t.cs()))); MathData ar; mathed_parse_cell(ar, '[' + opt + ']', mode_); cell->append(ar); @@ -2098,7 +2098,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, } if (!is_unicode_symbol) { MathAtom at = is_user_macro ? - MathAtom(new MathMacro(buf, t.cs())) + MathAtom(new InsetMathMacro(buf, t.cs())) : createInsetMath(t.cs(), buf); InsetMath::mode_type m = mode; //if (m == InsetMath::UNDECIDED_MODE) diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h index 262fc6e8d6..19da27640a 100644 --- a/src/mathed/MathStream.h +++ b/src/mathed/MathStream.h @@ -178,7 +178,7 @@ int ensureMode(WriteStream & os, InsetMath::mode_type mode, bool locked, bool as * * A local variable of this type can be used to either ensure math mode * or delay the writing of a pending brace when outputting LaTeX. - * A LyX MathMacro is always assumed needing a math mode environment, while + * A LyX InsetMathMacro is always assumed needing a math mode environment, while * no assumption is made for macros defined through \newcommand or \def. * * Example 1: @@ -208,7 +208,7 @@ int ensureMode(WriteStream & os, InsetMath::mode_type mode, bool locked, bool as * to be specified. Only the following 3 different cases are handled. * * When the needs_mathmode parameter is true the behavior is as in Example 1. - * This is the case for a LyX MathMacro or a macro not tagged as textmode. + * This is the case for a LyX InsetMathMacro or a macro not tagged as textmode. * * When the needs_mathmode and textmode_macro parameters are both false the * macro is left in the same (text or math mode) environment it was entered.