From e80e7d84782a28f5a86a253b1f432725fb482771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sun, 4 Feb 2018 23:41:17 +0100 Subject: [PATCH 01/40] ru.po: translations from Yuriy --- po/ru.po | 772 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 394 insertions(+), 378 deletions(-) diff --git a/po/ru.po b/po/ru.po index 1565ff220b..1c7d89cb43 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: LyX 2.3\n" "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n" "POT-Creation-Date: 2018-01-28 21:42-0500\n" -"PO-Revision-Date: 2018-01-30 23:22+0200\n" +"PO-Revision-Date: 2018-02-04 20:42+0200\n" "Last-Translator: Yuriy Skalko \n" "Language-Team: Russian \n" "Language: ru\n" @@ -3145,7 +3145,7 @@ msgstr "Макет страницы" #: src/frontends/qt4/ui/PageLayoutUi.ui:171 msgid "Page &style:" -msgstr "Стиль &страницы:" +msgstr "Стиль &колонтитулов:" #: src/frontends/qt4/ui/PageLayoutUi.ui:187 msgid "Style used for the page header and footer" @@ -6476,12 +6476,12 @@ msgstr "Сноска автора" #: lib/layouts/IEEEtran-CompSoc.layout:61 #: lib/layouts/IEEEtran-TransMag.layout:39 msgid "Nontitle Abstract Index Text" -msgstr "" +msgstr "Текст индекса аннотации без заголовка" #: lib/layouts/IEEEtran-CompSoc.layout:66 #: lib/layouts/IEEEtran-TransMag.layout:44 msgid "NontitleAbstractIndexText" -msgstr "" +msgstr "Текст индекса аннотации без заголовка" #: lib/layouts/IEEEtran-TransMag.layout:3 msgid "IEEE Transactions on Magnetics" @@ -6628,7 +6628,7 @@ msgstr "Пометка автора" #: lib/layouts/IEEEtran.layout:198 msgid "Special Paper Notice" -msgstr "" +msgstr "Особое замечание к статье" #: lib/layouts/IEEEtran.layout:209 msgid "After Title Text" @@ -6644,7 +6644,7 @@ msgstr "Левая сторона" #: lib/layouts/IEEEtran.layout:229 msgid "Left side of the header line" -msgstr "" +msgstr "Левая сторона строки заголовка" #: lib/layouts/IEEEtran.layout:243 lib/layouts/ijmpc.layout:65 #: lib/layouts/ijmpd.layout:70 @@ -6708,11 +6708,11 @@ msgstr "Закл. часть" #: lib/layouts/IEEEtran.layout:323 msgid "Peer Review Title" -msgstr "" +msgstr "Заглавие рецензии" #: lib/layouts/IEEEtran.layout:328 msgid "PeerReviewTitle" -msgstr "" +msgstr "Заглавие рецензии" #: lib/layouts/IEEEtran.layout:332 lib/layouts/IEEEtran.layout:335 #: lib/layouts/aastex.layout:378 lib/layouts/aastex6.layout:95 @@ -6810,7 +6810,7 @@ msgstr "Биография без фото" #: lib/layouts/IEEEtran.layout:402 msgid "BiographyNoPhoto" -msgstr "" +msgstr "Биография без фото" #: lib/layouts/IEEEtran.layout:408 lib/layouts/acmart.layout:546 #: lib/layouts/beamer.layout:1220 lib/layouts/elsart.layout:273 @@ -6847,7 +6847,7 @@ msgstr "Доказательство." #: lib/layouts/InStar.module:2 msgid "Title and Preamble Hacks" -msgstr "" +msgstr "Хаки заглавия и преамбулы" #: lib/layouts/InStar.module:12 msgid "" @@ -6859,6 +6859,14 @@ msgid "" "in title-related material. (If you put these in a Standard layout, this " "signals to LyX to output \\maketitle, which may then come too early.)" msgstr "" +"Предоставляет два новых стиля: 1. Стиль \"В преамбуле\", который помещает " +"все, что вводится в него в преамбулу. Это можно использовать, если вы хотите " +"включить код преамбулы в тело документа LyX. 2. Стиль \"В заглавии\", " +"который помещает свое содержание в тело документа LaTeX до выдачи " +"\\maketitle. Это полезно для создания веток и заметок в материале, связанном " +"с заглавием. (Если вы поместите их в окружение \"Обычный\", то это будет " +"сигналом для LyX к выводу \\maketitle, что может тогда произойти слишком " +"рано.)" #: lib/layouts/InStar.module:16 msgid "In Preamble" @@ -7254,21 +7262,21 @@ msgstr "Принадлежность" #: lib/layouts/aastex.layout:176 msgid "Altaffilation" -msgstr "Altaffilation" +msgstr "ДопПринадлежность" #: lib/layouts/aastex.layout:185 lib/layouts/agutex.layout:124 #: src/mathed/InsetMathHull.cpp:1862 src/mathed/InsetMathHull.cpp:1871 msgid "Number" -msgstr "Нумерация" +msgstr "Номер" #: lib/layouts/aastex.layout:186 msgid "Consecutive number for the alternative affiliations" -msgstr "Последовательное количество для альтернативных организаций" +msgstr "Последовательный номер для дополнительных принадлежностей" # ? #: lib/layouts/aastex.layout:191 msgid "Alternative affiliation:" -msgstr "Alternative affiliation:" +msgstr "Дополнительная принадлежность:" #: lib/layouts/aastex.layout:217 msgid "And" @@ -7283,12 +7291,12 @@ msgstr "и" #: lib/layouts/aastex.layout:268 msgid "altaffilmark" -msgstr "altaffilmark" +msgstr "пометка дополнительной принадлежности" # ? #: lib/layouts/aastex.layout:272 msgid "altaffiliation mark" -msgstr "" +msgstr "пометка дополнительной принадлежности" #: lib/layouts/aastex.layout:303 msgid "Subject headings:" @@ -7377,7 +7385,7 @@ msgstr "Имя файла для идентификации соответств #: lib/layouts/aastex.layout:558 msgid "Facility" -msgstr "Средства" +msgstr "Учреждение" # ? #: lib/layouts/aastex.layout:570 @@ -7472,11 +7480,11 @@ msgstr "" #: lib/layouts/achemso.layout:115 msgid "Alt Affiliation" -msgstr "" +msgstr "Доп. принадлежность" #: lib/layouts/achemso.layout:121 msgid "Also Affiliation" -msgstr "" +msgstr "Ещё принадлежность" #: lib/layouts/achemso.layout:127 lib/layouts/europasscv.layout:116 #: lib/layouts/europecv.layout:93 lib/layouts/lettre.layout:46 @@ -7565,11 +7573,11 @@ msgstr "Графический пункт содержания" #: lib/layouts/achemso.layout:269 msgid "Bibnote" -msgstr "Bibnote" +msgstr "Библиографическая заметка" #: lib/layouts/achemso.layout:273 msgid "bibnote" -msgstr "bibnote" +msgstr "библиографическая заметка" #: lib/layouts/achemso.layout:292 msgid "Chemistry" @@ -7586,12 +7594,12 @@ msgstr "Латинский" #: lib/layouts/acm-sigs-alt.layout:3 msgid "ACM SIGS ('Alternate' Style, obsolete)" -msgstr "ACM SIGS ('Alternate' Style, устаревшая версия)" +msgstr "ACM SIGS (стиль 'Alternate', устаревшая версия)" #: lib/layouts/acm-sigs.inc:31 lib/layouts/acmart.layout:392 #: lib/layouts/sigplanconf.layout:180 msgid "Terms" -msgstr "Правила" +msgstr "Термины" #: lib/layouts/acm-sigs.inc:37 msgid "General terms:" @@ -7718,25 +7726,23 @@ msgstr "Почтовый индекс" #: lib/layouts/acmart.layout:286 msgid "TitleNote" -msgstr "" +msgstr "Заметка заглавия" #: lib/layouts/acmart.layout:296 msgid "Title Note: " -msgstr "Заметка названия: " +msgstr "Заметка заглавия: " #: lib/layouts/acmart.layout:302 -#, fuzzy msgid "SubtitleNote" -msgstr "Подзаголовок" +msgstr "Заметка подзаголовка" #: lib/layouts/acmart.layout:304 msgid "Subtitle Note: " msgstr "Заметка подзаголовка: " #: lib/layouts/acmart.layout:308 lib/layouts/apa6.layout:274 -#, fuzzy msgid "AuthorNote" -msgstr "Автор" +msgstr "Заметка автора" #: lib/layouts/acmart.layout:310 msgid "Note: " @@ -7824,19 +7830,19 @@ msgstr "ACM DOI: " #: lib/layouts/acmart.layout:374 msgid "ACM Badge R" -msgstr "" +msgstr "Эмблема ACM справа" #: lib/layouts/acmart.layout:376 msgid "ACM Badge R: " -msgstr "" +msgstr "Эмблема ACM справа: " #: lib/layouts/acmart.layout:380 msgid "ACM Badge L" -msgstr "" +msgstr "Эмблема ACM слева" #: lib/layouts/acmart.layout:382 msgid "ACM Badge L: " -msgstr "" +msgstr "Эмблема ACM слева: " #: lib/layouts/acmart.layout:386 msgid "Start Page" @@ -7848,7 +7854,7 @@ msgstr "Начальная страница: " #: lib/layouts/acmart.layout:394 msgid "Terms: " -msgstr "Условия: " +msgstr "Термины: " #: lib/layouts/acmart.layout:400 msgid "Keywords: " @@ -7893,14 +7899,14 @@ msgstr "Год копирайта: " # ? #: lib/layouts/acmart.layout:456 lib/layouts/acmart.layout:459 msgid "Teaser Figure" -msgstr "" +msgstr "Рисунок тизера" #: lib/layouts/acmart.layout:465 lib/layouts/agu_stdtitle.inc:199 #: lib/layouts/aguplus.inc:111 lib/layouts/egs.layout:423 #: lib/layouts/ijmpc.layout:173 lib/layouts/ijmpc.layout:177 #: lib/layouts/ijmpd.layout:163 lib/layouts/ijmpd.layout:167 msgid "Received" -msgstr "Получил" +msgstr "Получено" #: lib/layouts/acmart.layout:468 msgid "Stage" @@ -7912,11 +7918,11 @@ msgstr "Получено: " #: lib/layouts/acmart.layout:479 msgid "ShortAuthors" -msgstr "" +msgstr "СокрАвторы" #: lib/layouts/acmart.layout:487 msgid "Short authors: " -msgstr "" +msgstr "Сокращённо авторы: " #: lib/layouts/acmart.layout:501 msgid "Sidebar" @@ -7924,11 +7930,11 @@ msgstr "Боковая панель" #: lib/layouts/acmart.layout:505 msgid "Sidebar (sigchi-a only)" -msgstr "" +msgstr "Боковая панель (только sigchi-a)" #: lib/layouts/acmart.layout:515 msgid "Margin figure (sigchi-a only)" -msgstr "" +msgstr "Рисунок на полях (только sigchi-a)" #: lib/layouts/acmart.layout:520 lib/layouts/beamer.layout:1636 #: lib/layouts/powerdot.layout:530 lib/layouts/sciposter.layout:109 @@ -7938,7 +7944,7 @@ msgstr "Список рисунков" #: lib/layouts/acmart.layout:528 msgid "Margin table (sigchi-a only)" -msgstr "" +msgstr "Таблица на полях (только sigchi-a)" #: lib/layouts/acmart.layout:533 lib/layouts/beamer.layout:1623 #: lib/layouts/powerdot.layout:513 lib/layouts/sciposter.layout:123 @@ -8024,11 +8030,11 @@ msgstr "Версия только для экрана" #: lib/layouts/acmart.layout:644 msgid "Anonymous Suppression" -msgstr "" +msgstr "Подавление анонимных" #: lib/layouts/acmart.layout:647 msgid "Non anonymous only" -msgstr "" +msgstr "Только неанонимные" #: lib/layouts/acmart.layout:650 lib/layouts/acmart.layout:654 #: lib/layouts/acmsiggraph-0-92.layout:343 @@ -8061,15 +8067,15 @@ msgstr "ACM SIGGGRAPH 0.92 (устаревшая версия)" #: lib/layouts/acmsiggraph-0-92.layout:74 lib/layouts/acmsiggraph.layout:66 msgid "TOG online ID" -msgstr "" +msgstr "Онлайн-идентификатор TOG" #: lib/layouts/acmsiggraph-0-92.layout:85 lib/layouts/acmsiggraph.layout:77 msgid "Online ID:" -msgstr "" +msgstr "Онлайн-идентификатор:" #: lib/layouts/acmsiggraph-0-92.layout:93 lib/layouts/acmsiggraph.layout:85 msgid "TOG volume" -msgstr "" +msgstr "Том TOG" #: lib/layouts/acmsiggraph-0-92.layout:96 lib/layouts/acmsiggraph.layout:88 msgid "Volume number:" @@ -8077,45 +8083,39 @@ msgstr "Номер тома:" #: lib/layouts/acmsiggraph-0-92.layout:100 lib/layouts/acmsiggraph.layout:92 msgid "TOG number" -msgstr "" +msgstr "Номер TOG" #: lib/layouts/acmsiggraph-0-92.layout:103 lib/layouts/acmsiggraph.layout:95 msgid "Article number:" msgstr "Номер статьи:" #: lib/layouts/acmsiggraph-0-92.layout:107 -#, fuzzy msgid "Set copyright" -msgstr "Авторское право" +msgstr "Установить авторские права" #: lib/layouts/acmsiggraph-0-92.layout:110 -#, fuzzy msgid "Copyright type:" -msgstr "Авторское право" +msgstr "Тип авторских прав" #: lib/layouts/acmsiggraph-0-92.layout:114 -#, fuzzy msgid "Copyright year" -msgstr "Авторское право" +msgstr "Год авторских прав" #: lib/layouts/acmsiggraph-0-92.layout:117 msgid "Year of copyright:" -msgstr "Год авторского права:" +msgstr "Год авторских прав:" #: lib/layouts/acmsiggraph-0-92.layout:125 -#, fuzzy msgid "Conference info" -msgstr "Конференция" +msgstr "Информация о конференции" #: lib/layouts/acmsiggraph-0-92.layout:128 -#, fuzzy msgid "Conference info:" -msgstr "Конференция:" +msgstr "Информация о конференции:" #: lib/layouts/acmsiggraph-0-92.layout:132 -#, fuzzy msgid "Conference name" -msgstr "Конференция" +msgstr "Название конференции" #: lib/layouts/acmsiggraph-0-92.layout:137 msgid "ISBN" @@ -8136,7 +8136,7 @@ msgstr "DOI статьи:" #: lib/layouts/acmsiggraph-0-92.layout:151 lib/layouts/acmsiggraph.layout:99 msgid "TOG article DOI" -msgstr "" +msgstr "DOI статьи TOG" #: lib/layouts/acmsiggraph-0-92.layout:181 lib/layouts/acmsiggraph.layout:157 msgid "PDF author" @@ -8148,9 +8148,8 @@ msgstr "Автор PDF:" #: lib/layouts/acmsiggraph-0-92.layout:195 #: lib/layouts/acmsiggraph-0-92.layout:200 -#, fuzzy msgid "Keyword list" -msgstr "Ключевые слова" +msgstr "Список ключевых слов" #: lib/layouts/acmsiggraph-0-92.layout:204 #: lib/layouts/acmsiggraph-0-92.layout:207 @@ -8159,9 +8158,8 @@ msgstr "Список концепций" #: lib/layouts/acmsiggraph-0-92.layout:211 #: lib/layouts/acmsiggraph-0-92.layout:214 -#, fuzzy msgid "Print copyright" -msgstr "Авторское право" +msgstr "Распечатать авторские права" # ? #: lib/layouts/acmsiggraph-0-92.layout:218 lib/layouts/acmsiggraph.layout:175 @@ -8178,9 +8176,8 @@ msgid "CR categories" msgstr "CR категории" #: lib/layouts/acmsiggraph-0-92.layout:274 lib/layouts/acmsiggraph.layout:230 -#, fuzzy msgid "CR Categories:" -msgstr "CR категории" +msgstr "CR категории:" #: lib/layouts/acmsiggraph-0-92.layout:282 lib/layouts/acmsiggraph.layout:238 msgid "CRcat" @@ -8192,19 +8189,17 @@ msgstr "CR категория" #: lib/layouts/acmsiggraph-0-92.layout:304 lib/layouts/acmsiggraph.layout:260 msgid "CR-number" -msgstr "" +msgstr "CR-номер" #: lib/layouts/acmsiggraph-0-92.layout:305 lib/layouts/acmsiggraph.layout:261 -#, fuzzy msgid "Number of the category" -msgstr "Число уровней" +msgstr "Номер категории" #: lib/layouts/acmsiggraph-0-92.layout:310 #: lib/layouts/acmsiggraph-0-92.layout:311 lib/layouts/acmsiggraph.layout:266 #: lib/layouts/acmsiggraph.layout:267 -#, fuzzy msgid "Subcategory" -msgstr "CR категория" +msgstr "Подкатегория" #: lib/layouts/acmsiggraph-0-92.layout:316 lib/layouts/acmsiggraph.layout:272 msgid "Third-level" @@ -8215,27 +8210,25 @@ msgid "Third-level of the category" msgstr "Третий уровень категории" #: lib/layouts/acmsiggraph-0-92.layout:323 lib/layouts/acmsiggraph.layout:279 -#, fuzzy msgid "ShortCite" -msgstr "Короткое заглавие" +msgstr "Короткая ссылка" #: lib/layouts/acmsiggraph-0-92.layout:328 lib/layouts/acmsiggraph.layout:284 -#, fuzzy msgid "Short cite" -msgstr "Короткое заглавие" +msgstr "Короткая ссылка" #: lib/layouts/acmsiggraph-0-92.layout:336 lib/layouts/acmsiggraph.layout:292 #: lib/layouts/jss.layout:179 lib/layouts/jss.layout:181 msgid "E-mail" -msgstr "E-mail" +msgstr "Эл. почта" #: lib/layouts/acmsiggraph.layout:3 msgid "ACM SIGGRAPH (older than 0.91, obsolete)" -msgstr "ACM SIGGRAPH (older than 0.91, устаревшая версия)" +msgstr "ACM SIGGRAPH (старше версии 0.91, устаревшая версия)" #: lib/layouts/acmsiggraph.layout:106 msgid "TOG project URL" -msgstr "" +msgstr "URL проекта TOG" #: lib/layouts/acmsiggraph.layout:110 msgid "Project URL:" @@ -8243,7 +8236,7 @@ msgstr "URL проекта:" #: lib/layouts/acmsiggraph.layout:114 msgid "TOG video URL" -msgstr "" +msgstr "URL видео TOG" #: lib/layouts/acmsiggraph.layout:117 msgid "Video URL:" @@ -8251,7 +8244,7 @@ msgstr "URL видео:" #: lib/layouts/acmsiggraph.layout:121 msgid "TOG data URL" -msgstr "" +msgstr "URL данных TOG" #: lib/layouts/acmsiggraph.layout:124 msgid "Data URL:" @@ -8259,7 +8252,7 @@ msgstr "URL данных:" #: lib/layouts/acmsiggraph.layout:128 msgid "TOG code URL" -msgstr "" +msgstr "URL кода TOG" #: lib/layouts/acmsiggraph.layout:131 msgid "Code URL:" @@ -8267,7 +8260,7 @@ msgstr "URL кода:" #: lib/layouts/agu-dtd.layout:3 msgid "American Geophysical Union (AGU, SGML Article)" -msgstr "American Geophysical Union (AGU, SGML Article)" +msgstr "American Geophysical Union (AGU, статья SGML)" #: lib/layouts/agu-dtd.layout:4 lib/layouts/docbook.layout:4 msgid "Articles (DocBook)" @@ -8280,7 +8273,7 @@ msgstr "Имя" #: lib/layouts/agu_stdclass.inc:50 lib/layouts/agu_stdclass.inc:52 msgid "Fname" -msgstr "" +msgstr "Fname" #: lib/layouts/agu_stdclass.inc:66 lib/layouts/agu_stdclass.inc:68 #: lib/layouts/db_stdcharstyles.inc:49 lib/layouts/db_stdcharstyles.inc:51 @@ -8303,12 +8296,12 @@ msgstr "Выделение" #: lib/layouts/agu_stdclass.inc:131 lib/layouts/agu_stdclass.inc:133 msgid "Abbrev" -msgstr "" +msgstr "Сокращение" #: lib/layouts/agu_stdclass.inc:143 lib/layouts/agu_stdclass.inc:145 #: lib/layouts/agu_stdtitle.inc:56 msgid "Citation-number" -msgstr "" +msgstr "Номер-ссылки" #: lib/layouts/agu_stdclass.inc:155 lib/layouts/agu_stdclass.inc:157 #: lib/layouts/apa6.layout:332 @@ -8329,16 +8322,15 @@ msgstr "Год" #: lib/layouts/agu_stdclass.inc:203 lib/layouts/agu_stdclass.inc:205 msgid "Issue-number" -msgstr "" +msgstr "Номер-выпуска" #: lib/layouts/agu_stdclass.inc:215 lib/layouts/agu_stdclass.inc:217 -#, fuzzy msgid "Issue-day" -msgstr "День выпуска" +msgstr "День-выпуска" #: lib/layouts/agu_stdclass.inc:227 lib/layouts/agu_stdclass.inc:229 msgid "Issue-months" -msgstr "Месяцы выпуска" +msgstr "Месяцы-выпуска" #: lib/layouts/agu_stdsections.inc:12 lib/layouts/article.layout:20 #: lib/layouts/beamer.layout:202 lib/layouts/beamer.layout:231 @@ -8387,37 +8379,31 @@ msgstr "Подподабзац" #: lib/layouts/agu_stdtitle.inc:13 lib/layouts/moderncv.layout:317 msgid "Header" -msgstr "Шапка" +msgstr "Заголовок" #: lib/layouts/agu_stdtitle.inc:19 -#, fuzzy msgid "-- Header --" -msgstr "Шапка" +msgstr "-- Заголовок --" #: lib/layouts/agu_stdtitle.inc:31 -#, fuzzy msgid "Special-section" -msgstr "&Выделение:" +msgstr "Специальный-раздел" #: lib/layouts/agu_stdtitle.inc:37 -#, fuzzy msgid "Special-section:" -msgstr "&Выделение:" +msgstr "Специальный-раздел:" #: lib/layouts/agu_stdtitle.inc:47 -#, fuzzy msgid "AGU-journal" -msgstr "Журнал" +msgstr "AGU-журнал" #: lib/layouts/agu_stdtitle.inc:51 -#, fuzzy msgid "AGU-journal:" -msgstr "Журнал" +msgstr "AGU-журнал:" #: lib/layouts/agu_stdtitle.inc:59 -#, fuzzy msgid "Citation-number:" -msgstr "Ссылка на источник" +msgstr "Номер-ссылки:" #: lib/layouts/agu_stdtitle.inc:65 msgid "AGU-volume" @@ -8428,7 +8414,6 @@ msgid "AGU-volume:" msgstr "AGU-том:" #: lib/layouts/agu_stdtitle.inc:73 -#, fuzzy msgid "AGU-issue" msgstr "AGU-выпуск" @@ -8441,32 +8426,28 @@ msgid "Copyright:" msgstr "Авторское право:" #: lib/layouts/agu_stdtitle.inc:89 -#, fuzzy msgid "Index-terms" -msgstr "Запись в предметном указателе" +msgstr "Записи в предметном указателе" #: lib/layouts/agu_stdtitle.inc:93 -#, fuzzy msgid "Index-terms..." -msgstr "Слово в предметный указатель...|у" +msgstr "Записи в предметном указателе..." #: lib/layouts/agu_stdtitle.inc:102 -#, fuzzy msgid "Index-term" msgstr "Запись в предметном указателе" #: lib/layouts/agu_stdtitle.inc:106 -#, fuzzy msgid "Index-term:" -msgstr "Запись в предметном указателе" +msgstr "Записи в предметном указателе:" #: lib/layouts/agu_stdtitle.inc:111 msgid "Cross-term" -msgstr "" +msgstr "Cross-term" #: lib/layouts/agu_stdtitle.inc:115 msgid "Cross-term:" -msgstr "" +msgstr "Cross-term:" # ? #: lib/layouts/agu_stdtitle.inc:132 lib/layouts/apa.layout:172 @@ -8477,32 +8458,28 @@ msgid "Affiliation:" msgstr "Принадлежность:" #: lib/layouts/agu_stdtitle.inc:137 -#, fuzzy msgid "Supplementary" msgstr "Сводка" #: lib/layouts/agu_stdtitle.inc:141 msgid "Supplementary..." -msgstr "Дополнение..." +msgstr "Сводка..." #: lib/layouts/agu_stdtitle.inc:150 -#, fuzzy msgid "Supp-note" -msgstr "Заметка" +msgstr "Заметка к сводке" #: lib/layouts/agu_stdtitle.inc:154 msgid "Sup-mat-note:" -msgstr "" +msgstr "Sup-mat-note:" #: lib/layouts/agu_stdtitle.inc:159 -#, fuzzy msgid "Cite-other" -msgstr "По середине" +msgstr "Другие-ссылки" #: lib/layouts/agu_stdtitle.inc:163 -#, fuzzy msgid "Cite-other:" -msgstr "Также цитировать как:" +msgstr "Другие-ссылки:" #: lib/layouts/agu_stdtitle.inc:189 lib/layouts/europasscv.layout:84 #: lib/layouts/europecv.layout:40 lib/layouts/g-brief.layout:51 @@ -8536,28 +8513,24 @@ msgid "Accepted:" msgstr "Согласовано:" #: lib/layouts/agu_stdtitle.inc:223 -#, fuzzy msgid "Ident-line" -msgstr "&В строке" +msgstr "Строка-идентификации" #: lib/layouts/agu_stdtitle.inc:226 -#, fuzzy msgid "Ident-line:" -msgstr "&В строке" +msgstr "Строка-идентификации:" #: lib/layouts/agu_stdtitle.inc:231 -#, fuzzy msgid "Runhead" -msgstr "Красный" +msgstr "Колонтитул" #: lib/layouts/agu_stdtitle.inc:234 msgid "Runhead:" -msgstr "" +msgstr "Колонтитул:" #: lib/layouts/agu_stdtitle.inc:242 -#, fuzzy msgid "Published-online:" -msgstr "Опубликовано онлайн:" +msgstr "Опубликовано-онлайн:" #: lib/layouts/agu_stdtitle.inc:264 src/frontends/qt4/GuiCitation.cpp:94 msgid "Citation" @@ -8568,12 +8541,10 @@ msgid "Citation:" msgstr "Библиографическая ссылка:" #: lib/layouts/agu_stdtitle.inc:272 -#, fuzzy msgid "Posting-order" msgstr "Порядок отправки" #: lib/layouts/agu_stdtitle.inc:275 -#, fuzzy msgid "Posting-order:" msgstr "Порядок отправки:" @@ -8625,22 +8596,19 @@ msgstr "ISSN" #: lib/layouts/agu_stdtitle.inc:334 lib/layouts/agu_stdtitle.inc:336 msgid "CODEN" -msgstr "" +msgstr "CODEN" #: lib/layouts/agu_stdtitle.inc:347 lib/layouts/agu_stdtitle.inc:349 -#, fuzzy msgid "SS-Code" -msgstr "Код" +msgstr "SS-код" #: lib/layouts/agu_stdtitle.inc:359 lib/layouts/agu_stdtitle.inc:361 -#, fuzzy msgid "SS-Title" -msgstr "Заглавие" +msgstr "SS-заглавие" #: lib/layouts/agu_stdtitle.inc:372 lib/layouts/agu_stdtitle.inc:374 -#, fuzzy msgid "CCC-Code" -msgstr "Код" +msgstr "CCC-код" #: lib/layouts/agu_stdtitle.inc:386 lib/layouts/agu_stdtitle.inc:388 #: lib/layouts/db_lyxmacros.inc:11 lib/layouts/jss.layout:171 @@ -8651,7 +8619,7 @@ msgstr "Код" #: lib/layouts/agu_stdtitle.inc:398 lib/layouts/agu_stdtitle.inc:400 msgid "Dscr" -msgstr "" +msgstr "Опис." #: lib/layouts/agu_stdtitle.inc:411 lib/layouts/agu_stdtitle.inc:413 #: lib/layouts/ectaart.layout:123 lib/layouts/ectaart.layout:206 @@ -8662,11 +8630,11 @@ msgstr "Ключевое слово" #: lib/layouts/agu_stdtitle.inc:424 lib/layouts/agu_stdtitle.inc:426 msgid "Orgdiv" -msgstr "" +msgstr "Подразд. организации" #: lib/layouts/agu_stdtitle.inc:436 lib/layouts/agu_stdtitle.inc:438 msgid "Orgname" -msgstr "" +msgstr "Название организации" #: lib/layouts/agu_stdtitle.inc:448 lib/layouts/agu_stdtitle.inc:450 #: lib/layouts/g-brief.layout:67 @@ -8675,11 +8643,11 @@ msgstr "Улица" #: lib/layouts/agu_stdtitle.inc:484 lib/layouts/agu_stdtitle.inc:486 msgid "Postcode" -msgstr "" +msgstr "Почтовый код" #: lib/layouts/agums.layout:3 msgid "American Geophysical Union (AGUPLUS Manuscript)" -msgstr "American Geophysical Union (AGUPLUS Manuscript)" +msgstr "American Geophysical Union (рукопись AGUPLUS)" #: lib/layouts/aguplus.inc:37 lib/layouts/amsart.layout:75 #: lib/layouts/amsbook.layout:84 lib/layouts/beamer.layout:288 @@ -8732,12 +8700,11 @@ msgstr "CCC code:" #: lib/layouts/aguplus.inc:148 msgid "PaperId" -msgstr "" +msgstr "Id бумаги" #: lib/layouts/aguplus.inc:152 -#, fuzzy msgid "Paper Id:" -msgstr "Бумага" +msgstr "Id бумаги:" #: lib/layouts/aguplus.inc:156 msgid "AuthorAddr" @@ -8745,33 +8712,31 @@ msgstr "АдресАвтора" #: lib/layouts/aguplus.inc:160 msgid "Author Address:" -msgstr "АдресАвтора:" +msgstr "Адрес автора:" #: lib/layouts/aguplus.inc:164 msgid "SlugComment" -msgstr "" +msgstr "Комментарий" #: lib/layouts/aguplus.inc:168 -#, fuzzy msgid "Slug Comment:" -msgstr "Комментарий" +msgstr "Комментарий:" #: lib/layouts/aguplus.inc:182 msgid "Plates" -msgstr "" +msgstr "Plates" #: lib/layouts/aguplus.inc:183 -#, fuzzy msgid "Planotables" -msgstr "Размещение таблицы" +msgstr "Planotables" #: lib/layouts/aguplus.inc:187 msgid "Plate" -msgstr "" +msgstr "Plate" #: lib/layouts/aguplus.inc:198 msgid "Planotable" -msgstr "" +msgstr "Planotable" #: lib/layouts/aguplus.inc:209 lib/layouts/beamer.layout:1618 #: lib/layouts/powerdot.layout:506 lib/layouts/sciposter.layout:118 @@ -8794,7 +8759,7 @@ msgstr "Авторы" #: lib/layouts/agutex.layout:92 lib/layouts/agutex.layout:96 msgid "Affiliation Mark" -msgstr "Знак принадлежности" +msgstr "Пометка принадлежности" #: lib/layouts/agutex.layout:125 msgid "Consecutive number for the author affiliations" @@ -8802,9 +8767,8 @@ msgstr "Последовательный номер для принадлежн # ? #: lib/layouts/agutex.layout:130 -#, fuzzy msgid "Author affiliation:" -msgstr "Принадлежность:" +msgstr "Принадлежность автора:" #: lib/layouts/agutex.layout:197 msgid "Acknowledgments." @@ -8948,9 +8912,8 @@ msgid "Subjectclass" msgstr "Subjectclass" #: lib/layouts/amsdefs.inc:199 -#, fuzzy msgid "2000 Mathematics Subject Classification:" -msgstr "обновлённых спецификаций классов документов." +msgstr "2000 Mathematics Subject Classification:" #: lib/layouts/apa.layout:3 msgid "American Psychological Association (APA)" @@ -9071,11 +9034,11 @@ msgstr "Шесть авторов" #: lib/layouts/apa6.layout:127 msgid "LeftHeader" -msgstr "ЛеваяШапка" +msgstr "ЛевыйЗаголовок" #: lib/layouts/apa6.layout:136 msgid "Left header:" -msgstr "Левая шапка:" +msgstr "Левый заголовок:" #: lib/layouts/apa6.layout:191 msgid "FiveAffiliations" @@ -9112,9 +9075,8 @@ msgid "Note" msgstr "Заметка" #: lib/layouts/apa6.layout:293 -#, fuzzy msgid "Author Note:" -msgstr "Информация об авторе" +msgstr "Заметка об авторе:" #: lib/layouts/apa6.layout:307 lib/layouts/egs.layout:355 msgid "Journal" @@ -9298,12 +9260,12 @@ msgstr "\\arabic{section}.\\arabic{subsection}.\\arabic{subsubsection}" #: lib/layouts/beamer.layout:435 lib/layouts/beamer.layout:441 msgid "Frame" -msgstr "Рамка" +msgstr "Кадр" #: lib/layouts/beamer.layout:436 lib/layouts/beamer.layout:521 #: lib/layouts/beamer.layout:568 lib/layouts/beamer.layout:599 msgid "Frames" -msgstr "Рамки" +msgstr "Кадры" #: lib/layouts/beamer.layout:458 lib/layouts/beamer.layout:887 #: lib/layouts/beamer.layout:1241 lib/layouts/beamer.layout:1392 @@ -9330,7 +9292,7 @@ msgstr "Спецификации наложения по умолчанию вн #: lib/layouts/beamer.layout:473 lib/layouts/beamer.layout:502 #: lib/layouts/beamer.layout:513 lib/layouts/beamer.layout:541 msgid "Frame Options" -msgstr "Параметры рамки" +msgstr "Параметры кадра" #: lib/layouts/beamer.layout:474 lib/layouts/beamer.layout:503 #: lib/layouts/beamer.layout:514 lib/layouts/beamer.layout:542 @@ -9350,7 +9312,7 @@ msgstr "Параметры рамки (см. руководство beamer)" #: lib/layouts/beamer.layout:478 msgid "Frame Title" -msgstr "Заголовок рамки" +msgstr "Заголовок кадра" #: lib/layouts/beamer.layout:479 msgid "Enter the frame title here" @@ -9370,7 +9332,7 @@ msgstr "ХрупкийКадр" #: lib/layouts/beamer.layout:511 msgid "Frame (fragile)" -msgstr "Рамка (хрупкая)" +msgstr "Кадр (хрупкий)" #: lib/layouts/beamer.layout:520 msgid "AgainFrame" @@ -9388,7 +9350,7 @@ msgstr "Снова кадр с меткой" #: lib/layouts/beamer.layout:567 msgid "FrameTitle" -msgstr "Заголовок рамки" +msgstr "Заголовок кадра" #: lib/layouts/beamer.layout:586 lib/layouts/beamer.layout:616 #: lib/layouts/beamer.layout:826 lib/layouts/beamer.layout:855 @@ -9413,7 +9375,7 @@ msgstr "Короткая форма заголовка кадра, исполь #: lib/layouts/beamer.layout:598 msgid "FrameSubtitle" -msgstr "Подзаголовок рамки" +msgstr "Подзаголовок кадра" #: lib/layouts/beamer.layout:628 lib/layouts/moderncv.layout:305 #: lib/layouts/moderncv.layout:320 @@ -9428,23 +9390,23 @@ msgstr "Колонки" #: lib/layouts/beamer.layout:641 msgid "Start column (increase depth!), width:" -msgstr "Начать колонку (увеличить глубину!), ширина:" +msgstr "Начало колонки (увеличьте глубину!), ширина:" #: lib/layouts/beamer.layout:644 lib/layouts/powerdot.layout:457 msgid "Column Options" -msgstr "Настройки столбца" +msgstr "Настройки колонки" #: lib/layouts/beamer.layout:646 msgid "Column options (see beamer manual)" -msgstr "Параметры столбцов (см. руководство beamer)" +msgstr "Параметры колонок (см. руководство beamer)" #: lib/layouts/beamer.layout:669 msgid "Column Placement Options" -msgstr "Настройки размещения столбца" +msgstr "Настройки размещения колонки" #: lib/layouts/beamer.layout:670 msgid "Column placement options (t, T, c, b)" -msgstr "Варианты размещения столбцов (t ,T, c, b)" +msgstr "Варианты размещения колонки (t ,T, c, b)" #: lib/layouts/beamer.layout:687 msgid "ColumnsCenterAligned" @@ -9575,25 +9537,25 @@ msgstr "Введите заголовок блока" #: lib/layouts/beamer.layout:911 msgid "ExampleBlock" -msgstr "Пример" +msgstr "БлокПримера" #: lib/layouts/beamer.layout:914 msgid "Example Block:" -msgstr "Пример:" +msgstr "Блок примера:" #: lib/layouts/beamer.layout:920 msgid "AlertBlock" -msgstr "" +msgstr "БлокПредупреждения" #: lib/layouts/beamer.layout:923 msgid "Alert Block:" -msgstr "" +msgstr "Блок предупреждения:" #: lib/layouts/beamer.layout:935 lib/layouts/beamer.layout:968 #: lib/layouts/beamer.layout:993 lib/layouts/beamer.layout:1016 #: lib/layouts/beamer.layout:1060 lib/layouts/beamer.layout:1083 msgid "Titling" -msgstr "" +msgstr "Заголовки" #: lib/layouts/beamer.layout:949 msgid "Short title which appears in the sidebar/header" @@ -9625,7 +9587,7 @@ msgstr "Краткий институт, который появляется в #: lib/layouts/beamer.layout:1038 msgid "InstituteMark" -msgstr "" +msgstr "Пометка института" #: lib/layouts/beamer.layout:1072 msgid "Short Date|S" @@ -9735,7 +9697,7 @@ msgstr "Код LyX" #: lib/layouts/beamer.layout:1348 msgid "NoteItem" -msgstr "" +msgstr "NoteItem" #: lib/layouts/beamer.layout:1383 lib/layouts/beamer.layout:1385 #: src/Font.cpp:65 src/frontends/qt4/GuiCharacter.cpp:127 @@ -9791,7 +9753,7 @@ msgstr "Параметры заметки" #: lib/layouts/beamer.layout:1582 msgid "Specifiy note options (see beamer manual)" -msgstr "" +msgstr "Указажите параметры заметки (см. руководство по beamer)" #: lib/layouts/beamer.layout:1587 msgid "ArticleMode" @@ -9816,7 +9778,7 @@ msgstr "Рисунок" #: lib/layouts/beamerposter.layout:3 msgid "Beamerposter" -msgstr "" +msgstr "Плакат beamer" #: lib/layouts/bicaption.module:2 msgid "Multilingual Captions" @@ -9827,6 +9789,8 @@ msgid "" "Provides two styles to typeset multilingual captions. For a description see " "the file MultilingualCaptions.lyx in LyX's examples folder." msgstr "" +"Предоставляет два стиля для набора многоязычных подписей. Описание см. в " +"файле MultilingualCaptions.lyx в папке примеров LyX." #: lib/layouts/bicaption.module:10 msgid "Caption setup" @@ -9835,7 +9799,7 @@ msgstr "Настройка подписей" #: lib/layouts/bicaption.module:16 msgid "" "Language that should be affected, can be 'bi-first', 'bi-second' or 'bi-both'" -msgstr "" +msgstr "Изменяемый язык, может быть 'bi-first', 'bi-second' или 'bi-both'" #: lib/layouts/bicaption.module:29 msgid "Caption setup:" @@ -9895,51 +9859,51 @@ msgstr "Брайлевская печать (по умолчанию)" #: lib/layouts/braille.module:36 lib/layouts/braille.module:59 msgid "Braille:" -msgstr "" +msgstr "Брайль:" #: lib/layouts/braille.module:45 msgid "Braille (textsize)" -msgstr "" +msgstr "Брайль (размер текста)" #: lib/layouts/braille.module:68 msgid "Braille (dots on)" -msgstr "" +msgstr "Брайль (вкл. точки)" #: lib/layouts/braille.module:83 msgid "Braille_dots_on" -msgstr "" +msgstr "Braille_dots_on" #: lib/layouts/braille.module:92 msgid "Braille (dots off)" -msgstr "" +msgstr "Брайль (выкл. точки)" #: lib/layouts/braille.module:107 msgid "Braille_dots_off" -msgstr "" +msgstr "Braille_dots_off" #: lib/layouts/braille.module:116 msgid "Braille (mirror on)" -msgstr "" +msgstr "Брайль (вкл. отражение)" #: lib/layouts/braille.module:131 msgid "Braille_mirror_on" -msgstr "" +msgstr "Braille_mirror_on" #: lib/layouts/braille.module:140 msgid "Braille (mirror off)" -msgstr "" +msgstr "Брайль (выкл. отражение)" #: lib/layouts/braille.module:155 msgid "Braille_mirror_off" -msgstr "" +msgstr "Braille_mirror_off" #: lib/layouts/braille.module:163 msgid "Braillebox" -msgstr "" +msgstr "БлокБрайля" #: lib/layouts/braille.module:167 msgid "Braille box" -msgstr "" +msgstr "Блок Брайля" #: lib/layouts/broadway.layout:3 msgid "Broadway" @@ -9959,15 +9923,15 @@ msgstr "Повествование" #: lib/layouts/broadway.layout:61 msgid "ACT" -msgstr "ACT" +msgstr "АКТ" #: lib/layouts/broadway.layout:73 msgid "ACT \\arabic{act}" -msgstr "ДЕЙСТВИЕ \\arabic{act}" +msgstr "АКТ \\arabic{act}" #: lib/layouts/broadway.layout:77 lib/layouts/broadway.layout:104 msgid "SCENE" -msgstr "Сцена" +msgstr "СЦЕНА" #: lib/layouts/broadway.layout:89 msgid "SCENE \\arabic{scene}" @@ -9975,7 +9939,7 @@ msgstr "СЦЕНА \\arabic{scene}" #: lib/layouts/broadway.layout:93 msgid "SCENE*" -msgstr "Сцена*" +msgstr "СЦЕНА*" #: lib/layouts/broadway.layout:108 lib/layouts/broadway.layout:119 msgid "AT RISE:" @@ -10038,7 +10002,7 @@ msgstr "" #: lib/layouts/chess.layout:3 msgid "Chess" -msgstr "Шахматная доска" +msgstr "Шахматы" #: lib/layouts/chess.layout:36 msgid "Mainline" @@ -10046,7 +10010,7 @@ msgstr "Mainline" #: lib/layouts/chess.layout:43 msgid "Mainline:" -msgstr "" +msgstr "Mainline:" #: lib/layouts/chess.layout:62 msgid "Variation" @@ -10098,11 +10062,11 @@ msgstr "Подвариант(5):" #: lib/layouts/chess.layout:118 msgid "HideMoves" -msgstr "HideMoves" +msgstr "СкрытьХоды" #: lib/layouts/chess.layout:123 msgid "HideMoves:" -msgstr "" +msgstr "СкрытьХоды:" #: lib/layouts/chess.layout:128 msgid "ChessBoard" @@ -10114,7 +10078,7 @@ msgstr "[шахматная доска]" #: lib/layouts/chess.layout:141 msgid "BoardCentered" -msgstr "BoardCentered" +msgstr "Центрированная доска" #: lib/layouts/chess.layout:146 msgid "[centered board]" @@ -10122,7 +10086,7 @@ msgstr "[центрированная доска]" #: lib/layouts/chess.layout:156 msgid "HighLight" -msgstr "HighLight" +msgstr "Избранное" #: lib/layouts/chess.layout:161 msgid "Highlights:" @@ -10142,7 +10106,7 @@ msgstr "KnightMove" #: lib/layouts/chess.layout:192 msgid "KnightMove:" -msgstr "" +msgstr "KnightMove:" #: lib/layouts/cl2emult.layout:3 msgid "Springer cl2emult" @@ -10170,6 +10134,10 @@ msgid "" "module you must set the 'Headings style' in the menu Document Settings -> " "Page Layout to 'fancy'!" msgstr "" +"Добавляет окружения для задания строк верхнего и нижнего колонтитулов. " +"ПРИМЕЧАНИЕ: для использования этого модуля вы должны установить для " +"параметра 'Стиль колонтитулов' (меню Документ -> Настройки -> Макет " +"страницы) значение 'красивый'!" #: lib/layouts/customHeadersFooters.module:12 msgid "Header/Footer" @@ -10220,13 +10188,12 @@ msgid "Directory" msgstr "Каталог" #: lib/layouts/db_stdcharstyles.inc:91 lib/layouts/db_stdcharstyles.inc:93 -#, fuzzy msgid "KeyCombo" -msgstr "Клавиатура" +msgstr "КомбинацияКлавиш" #: lib/layouts/db_stdcharstyles.inc:106 lib/layouts/db_stdcharstyles.inc:108 msgid "KeyCap" -msgstr "" +msgstr "Клавиша" #: lib/layouts/db_stdcharstyles.inc:121 lib/layouts/db_stdcharstyles.inc:123 msgid "GuiMenu" @@ -10234,15 +10201,15 @@ msgstr "МенюИнтерфейса" #: lib/layouts/db_stdcharstyles.inc:136 lib/layouts/db_stdcharstyles.inc:138 msgid "GuiMenuItem" -msgstr "" +msgstr "ПунктМенюИнтерфейса" #: lib/layouts/db_stdcharstyles.inc:151 lib/layouts/db_stdcharstyles.inc:153 msgid "GuiButton" -msgstr "" +msgstr "КнопкаИнтерфейса" #: lib/layouts/db_stdcharstyles.inc:166 lib/layouts/db_stdcharstyles.inc:168 msgid "MenuChoice" -msgstr "" +msgstr "ВыборМеню" #: lib/layouts/db_stdlayouts.inc:31 msgid "SGML" @@ -10283,7 +10250,7 @@ msgstr "Имя" #: lib/layouts/dinbrief.layout:3 msgid "DIN-Brief" -msgstr "" +msgstr "DIN-Brief" #: lib/layouts/dinbrief.layout:4 lib/layouts/extletter.layout:4 #: lib/layouts/frletter.layout:4 lib/layouts/g-brief2.layout:4 @@ -10294,7 +10261,7 @@ msgstr "Письма" #: lib/layouts/dinbrief.layout:30 msgid "DinBrief" -msgstr "" +msgstr "DinBrief" #: lib/layouts/dinbrief.layout:31 lib/layouts/dinbrief.layout:359 #: lib/layouts/g-brief.layout:22 lib/layouts/g-brief.layout:41 @@ -10317,7 +10284,7 @@ msgstr "Адреса" #: lib/layouts/lettre.layout:145 lib/layouts/stdletter.inc:26 #: lib/layouts/stdletter.inc:38 msgid "Postal Data" -msgstr "" +msgstr "Почтовые данные" #: lib/layouts/dinbrief.layout:55 lib/layouts/frletter.layout:17 #: lib/layouts/heb-letter.layout:16 lib/layouts/lettre.layout:60 @@ -10346,19 +10313,19 @@ msgstr "Обратный адрес:" #: lib/layouts/dinbrief.layout:89 msgid "Postal comment" -msgstr "" +msgstr "Почтовый комментарий" #: lib/layouts/dinbrief.layout:91 msgid "Postal Remark:" -msgstr "" +msgstr "Почтовое замечание:" #: lib/layouts/dinbrief.layout:96 msgid "Handling" -msgstr "" +msgstr "Обработка" #: lib/layouts/dinbrief.layout:98 msgid "Handling:" -msgstr "" +msgstr "Обработка:" #: lib/layouts/dinbrief.layout:102 lib/layouts/g-brief.layout:109 #: lib/layouts/g-brief2.layout:50 lib/layouts/g-brief2.layout:819 @@ -10369,18 +10336,18 @@ msgstr "Ваша ссылка" #: lib/layouts/dinbrief.layout:104 lib/layouts/scrlettr.layout:211 #: lib/layouts/scrlttr2.layout:297 msgid "Your ref.:" -msgstr "" +msgstr "Ваша ссылка:" #: lib/layouts/dinbrief.layout:108 lib/layouts/g-brief.layout:102 #: lib/layouts/g-brief2.layout:48 lib/layouts/g-brief2.layout:798 #: lib/layouts/lettre.layout:66 lib/layouts/lettre.layout:472 msgid "MyRef" -msgstr "MyRef" +msgstr "Моя ссылка" #: lib/layouts/dinbrief.layout:110 lib/layouts/scrlettr.layout:232 #: lib/layouts/scrlttr2.layout:321 msgid "Our ref.:" -msgstr "" +msgstr "Наша ссылка:" #: lib/layouts/dinbrief.layout:114 msgid "Writer" @@ -10415,9 +10382,8 @@ msgid "Signature:" msgstr "Подпись:" #: lib/layouts/dinbrief.layout:128 -#, fuzzy msgid "Bottomtext" -msgstr "Левый нижний" +msgstr "Нижний текст" #: lib/layouts/dinbrief.layout:130 msgid "Bottom text:" @@ -10425,11 +10391,11 @@ msgstr "Нижний текст:" #: lib/layouts/dinbrief.layout:138 msgid "Area code" -msgstr "" +msgstr "Код области" #: lib/layouts/dinbrief.layout:140 msgid "Area Code:" -msgstr "" +msgstr "Код области:" #: lib/layouts/dinbrief.layout:144 lib/layouts/europasscv.layout:106 #: lib/layouts/europecv.layout:77 lib/layouts/lettre.layout:42 @@ -10502,18 +10468,18 @@ msgstr "Подпись" #: lib/layouts/dinbrief.layout:207 msgid "Here you can insert a signature scan" -msgstr "" +msgstr "Здесь можно вставить отсканированную подпись" #: lib/layouts/dinbrief.layout:212 lib/layouts/lettre.layout:74 #: lib/layouts/lettre.layout:611 lib/layouts/stdletter.inc:116 msgid "encl" -msgstr "encl" +msgstr "включ." #: lib/layouts/dinbrief.layout:215 lib/layouts/lettre.layout:616 #: lib/layouts/scrlettr.layout:112 lib/layouts/scrlttr2.layout:145 #: lib/layouts/stdletter.inc:119 msgid "encl:" -msgstr "encl:" +msgstr "включ.:" #: lib/layouts/dinbrief.layout:228 lib/layouts/g-brief.layout:228 #: lib/layouts/g-brief2.layout:997 lib/layouts/lettre.layout:76 @@ -10548,23 +10514,23 @@ msgstr "Обратный адрес" #: lib/layouts/dinbrief.layout:259 msgid "RetourAdresse" -msgstr "" +msgstr "RetourAdresse" #: lib/layouts/dinbrief.layout:269 msgid "Adresse" -msgstr "" +msgstr "Adresse" #: lib/layouts/dinbrief.layout:274 msgid "Postvermerk" -msgstr "" +msgstr "Postvermerk" #: lib/layouts/dinbrief.layout:279 msgid "Zusatz" -msgstr "" +msgstr "Zusatz" #: lib/layouts/dinbrief.layout:284 msgid "IhrZeichen" -msgstr "" +msgstr "IhrZeichen" #: lib/layouts/dinbrief.layout:289 lib/layouts/g-brief.layout:116 #: lib/layouts/g-brief2.layout:52 lib/layouts/g-brief2.layout:841 @@ -10573,19 +10539,19 @@ msgstr "Ваш почтовый адрес" #: lib/layouts/dinbrief.layout:294 msgid "IhrSchreiben" -msgstr "" +msgstr "IhrSchreiben" #: lib/layouts/dinbrief.layout:299 msgid "MeinZeichen" -msgstr "" +msgstr "MeinZeichen" #: lib/layouts/dinbrief.layout:304 msgid "Unterschrift" -msgstr "" +msgstr "Unterschrift" #: lib/layouts/dinbrief.layout:314 msgid "Telefon" -msgstr "" +msgstr "Telefon" #: lib/layouts/dinbrief.layout:319 lib/layouts/lettre.layout:52 #: lib/layouts/lettre.layout:163 lib/layouts/scrlettr.layout:158 @@ -10595,7 +10561,7 @@ msgstr "Размещение" #: lib/layouts/dinbrief.layout:324 msgid "Stadt" -msgstr "" +msgstr "Stadt" #: lib/layouts/dinbrief.layout:329 lib/layouts/g-brief.layout:81 msgid "Town" @@ -10603,7 +10569,7 @@ msgstr "Город" #: lib/layouts/dinbrief.layout:334 msgid "Ort" -msgstr "" +msgstr "Ort" #: lib/layouts/dinbrief.layout:339 msgid "Datum" @@ -10617,41 +10583,41 @@ msgstr "Ссылка" #: lib/layouts/dinbrief.layout:349 msgid "Betreff" -msgstr "" +msgstr "Betreff" #: lib/layouts/dinbrief.layout:354 msgid "Anrede" -msgstr "" +msgstr "Anrede" #: lib/layouts/dinbrief.layout:364 msgid "Brieftext" -msgstr "" +msgstr "Краткий текст" #: lib/layouts/dinbrief.layout:369 msgid "Gruss" -msgstr "" +msgstr "Gruss" #: lib/layouts/dinbrief.layout:373 msgid "ps" -msgstr "" +msgstr "ps" #: lib/layouts/dinbrief.layout:378 lib/layouts/g-brief.layout:220 #: lib/layouts/g-brief2.layout:975 msgid "Encl." -msgstr "" +msgstr "Включ." #: lib/layouts/dinbrief.layout:383 msgid "Anlagen" -msgstr "" +msgstr "Anlagen" #: lib/layouts/dinbrief.layout:388 lib/layouts/scrlettr.layout:95 #: lib/layouts/scrlttr2.layout:134 msgid "CC" -msgstr "" +msgstr "CC" #: lib/layouts/dinbrief.layout:393 msgid "Verteiler" -msgstr "" +msgstr "Verteiler" #: lib/layouts/docbook-book.layout:3 msgid "DocBook Book (SGML)" @@ -10676,11 +10642,11 @@ msgstr "DocBook Article (SGML)" #: lib/layouts/doublecol-new.layout:3 msgid "Inderscience A4 Journals" -msgstr "" +msgstr "Журналы Inderscience A4" #: lib/layouts/dtk.layout:3 msgid "Die TeXnische Komoedie" -msgstr "" +msgstr "Die TeXnische Komoedie" #: lib/layouts/ectaart.layout:3 msgid "Econometrica" @@ -10692,7 +10658,7 @@ msgstr "RunTitle" #: lib/layouts/ectaart.layout:29 lib/layouts/llncs.layout:166 msgid "Running Title:" -msgstr "" +msgstr "Running Title:" #: lib/layouts/ectaart.layout:36 msgid "RunAuthor" @@ -10700,15 +10666,15 @@ msgstr "RunAuthor" #: lib/layouts/ectaart.layout:40 msgid "Running Author:" -msgstr "" +msgstr "Running Author:" #: lib/layouts/ectaart.layout:67 lib/layouts/elsart.layout:148 msgid "Address Option" -msgstr "" +msgstr "Параметр адреса" #: lib/layouts/ectaart.layout:68 lib/layouts/elsart.layout:149 msgid "Optional argument for the address" -msgstr "" +msgstr "Необязательный аргумент адреса" #: lib/layouts/ectaart.layout:78 msgid "E-Mail Option" @@ -10716,7 +10682,7 @@ msgstr "Параметры эл. почты" #: lib/layouts/ectaart.layout:79 msgid "Optional argument for the e-mail" -msgstr "" +msgstr "Необязательный аргумент эл. почты" #: lib/layouts/ectaart.layout:84 lib/layouts/europasscv.layout:125 #: lib/layouts/europecv.layout:74 lib/layouts/latex8.layout:78 @@ -10745,27 +10711,27 @@ msgstr "Текст благодарности" #: lib/layouts/ectaart.layout:140 msgid "Thanks \\theThanks:" -msgstr "" +msgstr "Благодарность \\theThanks:" #: lib/layouts/ectaart.layout:159 msgid "Thanks Reference" -msgstr "" +msgstr "Ссылка благодарности" #: lib/layouts/ectaart.layout:166 msgid "Thanks Ref" -msgstr "" +msgstr "Ссылка благодарности" #: lib/layouts/ectaart.layout:172 msgid "Internet Address Reference" -msgstr "" +msgstr "Ссылка на интернет-адрес" #: lib/layouts/ectaart.layout:175 msgid "Internet Addess Ref" -msgstr "" +msgstr "Ссылка на интернет-адрес" #: lib/layouts/ectaart.layout:178 lib/layouts/ectaart.layout:181 msgid "Corresponding Author" -msgstr "" +msgstr "Автор для корреспонденции" #: lib/layouts/ectaart.layout:192 msgid "Name (First Name)" @@ -10781,11 +10747,11 @@ msgstr "Фамилия" #: lib/layouts/ectaart.layout:212 msgid "By Same Author (bib)" -msgstr "" +msgstr "Того же автора (bib)" #: lib/layouts/ectaart.layout:215 msgid "bysame" -msgstr "" +msgstr "того же" #: lib/layouts/egs.layout:3 msgid "European Geophysical Society (EGS)" @@ -10841,11 +10807,11 @@ msgstr "Elsevier (устаревшая версия)" #: lib/layouts/elsart.layout:129 msgid "Author Option" -msgstr "" +msgstr "Параметр автора" #: lib/layouts/elsart.layout:130 msgid "Optional argument for the author" -msgstr "" +msgstr "Необязательный аргумент автора" #: lib/layouts/elsart.layout:138 msgid "Author Address" @@ -10868,11 +10834,11 @@ msgstr "URL автора" #: lib/layouts/elsart.layout:207 msgid "Thanks Option" -msgstr "" +msgstr "Параметр благодарности" #: lib/layouts/elsart.layout:208 msgid "Optional argument for the thanks statement" -msgstr "" +msgstr "Необязательный аргумент выражения благодарности" #: lib/layouts/elsart.layout:289 msgid "Theorem \\arabic{theorem}" @@ -10976,7 +10942,7 @@ msgstr "Метка сноски" #: lib/layouts/elsarticle.layout:134 msgid "Label you refer to in the title" -msgstr "" +msgstr "Метка, к которой вы ссылаетесь в заглавии" #: lib/layouts/elsarticle.layout:141 lib/layouts/revtex4-1.layout:196 msgid "Title footnote:" @@ -10988,11 +10954,11 @@ msgstr "Метка автора" #: lib/layouts/elsarticle.layout:156 msgid "Label you will reference in the address" -msgstr "" +msgstr "Метка для ссылок в адресе" #: lib/layouts/elsarticle.layout:172 msgid "Authormark" -msgstr "" +msgstr "Пометка автора" #: lib/layouts/elsarticle.layout:195 msgid "Author footnote" @@ -11073,13 +11039,16 @@ msgstr "Ключевые слова:" #: lib/layouts/enumitem.module:2 msgid "Customisable Lists (enumitem)" -msgstr "" +msgstr "Настраиваемые списки (enumitem)" #: lib/layouts/enumitem.module:6 msgid "" "Controls the layout of enumerate, itemize, description, and list/labeling. " "See section Customized Lists of the User's Guide for a detailed description." msgstr "" +"Управляет макетами для списков маркировки, перечисления, нумерации и " +"описания. См. подробное описание в разделе \"Настраиваемые списки\" " +"руководства пользователя." #: lib/layouts/enumitem.module:58 lib/layouts/paralist.module:29 #: lib/layouts/powerdot.layout:276 @@ -11090,7 +11059,7 @@ msgstr "Параметры ненумерованного списка" #: lib/layouts/enumitem.module:75 lib/layouts/enumitem.module:112 #: lib/layouts/powerdot.layout:277 lib/layouts/powerdot.layout:328 msgid "Optional arguments for this list (see enumitem manual)" -msgstr "" +msgstr "Необязательные аргументы для этого списка (см. руководство enumitem)" #: lib/layouts/enumitem.module:66 lib/layouts/enumitem.module:111 #: lib/layouts/paralist.module:36 lib/layouts/powerdot.layout:327 @@ -23590,339 +23559,339 @@ msgstr "bindnasrepma" #: lib/ui/stdtoolbars.inc:1270 msgid "Voiceless bilabial plosive" -msgstr "" +msgstr "Глухой губно-губной взрывной" #: lib/ui/stdtoolbars.inc:1271 msgid "Voiced bilabial plosive" -msgstr "" +msgstr "Звонкий губно-губной взрывной" #: lib/ui/stdtoolbars.inc:1272 msgid "Voiceless alveolar plosive" -msgstr "" +msgstr "Глухой альвеолярный взрывной" #: lib/ui/stdtoolbars.inc:1273 msgid "Voiced alveolar plosive" -msgstr "" +msgstr "Звонкий альвеолярный взрывной" #: lib/ui/stdtoolbars.inc:1274 msgid "Voiceless retroflex plosive" -msgstr "" +msgstr "Глухой ретрофлексный взрывной" #: lib/ui/stdtoolbars.inc:1275 msgid "Voiced retroflex plosive" -msgstr "" +msgstr "Звонкий ретрофлексный взрывной" #: lib/ui/stdtoolbars.inc:1276 msgid "Voiceless palatal plosive" -msgstr "" +msgstr "Глухой палатальный взрывной" #: lib/ui/stdtoolbars.inc:1277 msgid "Voiced palatal plosive" -msgstr "" +msgstr "Звонкий палатальный взрывной" #: lib/ui/stdtoolbars.inc:1278 msgid "Voiceless velar plosive" -msgstr "" +msgstr "Глухой велярный взрывной" #: lib/ui/stdtoolbars.inc:1279 msgid "Voiced velar plosive" -msgstr "" +msgstr "Звонкий велярный взрывной" #: lib/ui/stdtoolbars.inc:1280 msgid "Voiceless uvular plosive" -msgstr "" +msgstr "Глухой увулярный взрывной" #: lib/ui/stdtoolbars.inc:1281 msgid "Voiced uvular plosive" -msgstr "" +msgstr "Звонкий увулярный взрывной" #: lib/ui/stdtoolbars.inc:1282 msgid "Glottal plosive" -msgstr "" +msgstr "Гортанная смычка" #: lib/ui/stdtoolbars.inc:1283 msgid "Voiced bilabial nasal" -msgstr "" +msgstr "Звонкий губно-губной носовой" #: lib/ui/stdtoolbars.inc:1284 msgid "Voiced labiodental nasal" -msgstr "" +msgstr "Звонкий губно-зубной носовой" #: lib/ui/stdtoolbars.inc:1285 msgid "Voiced alveolar nasal" -msgstr "" +msgstr "Звонкий альвеолярный носовой" #: lib/ui/stdtoolbars.inc:1286 msgid "Voiced retroflex nasal" -msgstr "" +msgstr "Звонкий ретрофлексный носовой" #: lib/ui/stdtoolbars.inc:1287 msgid "Voiced palatal nasal" -msgstr "" +msgstr "Звонкий палатальный носовой" #: lib/ui/stdtoolbars.inc:1288 msgid "Voiced velar nasal" -msgstr "" +msgstr "Звонкий велярный носовой" #: lib/ui/stdtoolbars.inc:1289 msgid "Voiced uvular nasal" -msgstr "" +msgstr "Звонкий увулярный носовой" #: lib/ui/stdtoolbars.inc:1290 msgid "Voiced bilabial trill" -msgstr "" +msgstr "Звонкий губно-губной дрожащий" #: lib/ui/stdtoolbars.inc:1291 msgid "Voiced alveolar trill" -msgstr "" +msgstr "Звонкий альвеолярный дрожащий" #: lib/ui/stdtoolbars.inc:1292 msgid "Voiced uvular trill" -msgstr "" +msgstr "Звонкий увулярный дрожащий" #: lib/ui/stdtoolbars.inc:1294 msgid "Voiced alveolar tap" -msgstr "" +msgstr "Звонкий альвеолярный удар" #: lib/ui/stdtoolbars.inc:1295 msgid "Voiced retroflex flap" -msgstr "" +msgstr "Звонкий ретрофлексный удар" #: lib/ui/stdtoolbars.inc:1296 msgid "Voiceless bilabial fricative" -msgstr "" +msgstr "Глухой губно-губной фрикативный" #: lib/ui/stdtoolbars.inc:1297 msgid "Voiced bilabial fricative" -msgstr "" +msgstr "Звонкий губно-губной фрикативный" #: lib/ui/stdtoolbars.inc:1298 msgid "Voiceless labiodental fricative" -msgstr "" +msgstr "Глухой губно-зубной фрикативный" #: lib/ui/stdtoolbars.inc:1299 msgid "Voiced labiodental fricative" -msgstr "" +msgstr "Звонкий губно-зубной фрикативный" #: lib/ui/stdtoolbars.inc:1300 msgid "Voiceless dental fricative" -msgstr "" +msgstr "Глухой зубной фрикативный" #: lib/ui/stdtoolbars.inc:1301 msgid "Voiced dental fricative" -msgstr "" +msgstr "Звонкий зубной фрикативный" #: lib/ui/stdtoolbars.inc:1302 msgid "Voiceless alveolar fricative" -msgstr "" +msgstr "Глухой альвеолярный фрикативный" #: lib/ui/stdtoolbars.inc:1303 msgid "Voiced alveolar fricative" -msgstr "" +msgstr "Звонкий альвеолярный фрикативный" #: lib/ui/stdtoolbars.inc:1304 msgid "Voiceless postalveolar fricative" -msgstr "" +msgstr "Глухой постальвеолярный фрикативный" #: lib/ui/stdtoolbars.inc:1305 msgid "Voiced postalveolar fricative" -msgstr "" +msgstr "Звонкий постальвеолярный фрикативный" #: lib/ui/stdtoolbars.inc:1306 msgid "Voiceless retroflex fricative" -msgstr "" +msgstr "Глухой ретрофлексный фрикативный" #: lib/ui/stdtoolbars.inc:1307 msgid "Voiced retroflex fricative" -msgstr "" +msgstr "Звонкий ретрофлексный фрикативный" #: lib/ui/stdtoolbars.inc:1308 msgid "Voiceless palatal fricative" -msgstr "" +msgstr "Глухой палатальный фрикативный" #: lib/ui/stdtoolbars.inc:1309 msgid "Voiced palatal fricative" -msgstr "" +msgstr "Звонкий палатальный фрикативный" #: lib/ui/stdtoolbars.inc:1310 msgid "Voiceless velar fricative" -msgstr "" +msgstr "Глухой велярный фрикативный" #: lib/ui/stdtoolbars.inc:1311 msgid "Voiced velar fricative" -msgstr "" +msgstr "Звонкий велярный фрикативный" #: lib/ui/stdtoolbars.inc:1312 msgid "Voiceless uvular fricative" -msgstr "" +msgstr "Глухой увулярный фрикативный" #: lib/ui/stdtoolbars.inc:1313 msgid "Voiced uvular fricative" -msgstr "" +msgstr "Звонкий увулярный фрикативный" #: lib/ui/stdtoolbars.inc:1314 msgid "Voiceless pharyngeal fricative" -msgstr "" +msgstr "Глухой фарингальный фрикативный" #: lib/ui/stdtoolbars.inc:1315 msgid "Voiced pharyngeal fricative" -msgstr "" +msgstr "Звонкий фарингальный фрикативный" #: lib/ui/stdtoolbars.inc:1316 msgid "Voiceless glottal fricative" -msgstr "" +msgstr "Глухой глоттальный фрикативный" #: lib/ui/stdtoolbars.inc:1317 msgid "Voiced glottal fricative" -msgstr "" +msgstr "Звонкий глоттальный фрикативный" #: lib/ui/stdtoolbars.inc:1318 msgid "Voiceless alveolar lateral fricative" -msgstr "" +msgstr "Глухой альвеолярный латеральный фрикативный" #: lib/ui/stdtoolbars.inc:1319 msgid "Voiced alveolar lateral fricative" -msgstr "" +msgstr "Звонкий альвеолярный латеральный фрикативный" #: lib/ui/stdtoolbars.inc:1320 msgid "Voiced labiodental approximant" -msgstr "" +msgstr "Звонкий губно-зубной аппроксимант" #: lib/ui/stdtoolbars.inc:1321 msgid "Voiced alveolar approximant" -msgstr "" +msgstr "Звонкий альвеолярный аппроксимант" #: lib/ui/stdtoolbars.inc:1322 msgid "Voiced retroflex approximant" -msgstr "" +msgstr "Звонкий ретрофлексный аппроксимант" #: lib/ui/stdtoolbars.inc:1323 msgid "Voiced palatal approximant" -msgstr "" +msgstr "Звонкий палатальный аппроксимант" #: lib/ui/stdtoolbars.inc:1324 msgid "Voiced velar approximant" -msgstr "" +msgstr "Звонкий велярный аппроксимант" #: lib/ui/stdtoolbars.inc:1325 msgid "Voiced alveolar lateral approximant" -msgstr "" +msgstr "Звонкий альвеолярный латеральный аппроксимант" #: lib/ui/stdtoolbars.inc:1326 msgid "Voiced retroflex lateral approximant" -msgstr "" +msgstr "Звонкий ретрофлексный латеральный аппроксимант" #: lib/ui/stdtoolbars.inc:1327 msgid "Voiced palatal lateral approximant" -msgstr "" +msgstr "Звонкий палатальный латеральный аппроксимант" #: lib/ui/stdtoolbars.inc:1328 msgid "Voiced velar lateral approximant" -msgstr "" +msgstr "Звонкий велярный латеральный аппроксимант" #: lib/ui/stdtoolbars.inc:1332 msgid "Bilabial click" -msgstr "" +msgstr "Губно-губной щёлкающий" #: lib/ui/stdtoolbars.inc:1333 msgid "Dental click" -msgstr "" +msgstr "Зубной щёлкающий" #: lib/ui/stdtoolbars.inc:1334 msgid "(Post)alveolar click" -msgstr "" +msgstr "(Пост)альвеолярный щёлкающий" #: lib/ui/stdtoolbars.inc:1335 msgid "Palatoalveolar click" -msgstr "" +msgstr "Палатоальвеолярный щёлкающий" #: lib/ui/stdtoolbars.inc:1336 msgid "Alveolar lateral click" -msgstr "" +msgstr "Альвеолярный латеральный щёлкающий" #: lib/ui/stdtoolbars.inc:1337 msgid "Voiced bilabial implosive" -msgstr "" +msgstr "Звонкий губно-губной имплозивный" #: lib/ui/stdtoolbars.inc:1338 msgid "Voiced dental/alveolar implosive" -msgstr "" +msgstr "Звонкий зубной/альвеолярный имплозивный" #: lib/ui/stdtoolbars.inc:1339 msgid "Voiced palatal implosive" -msgstr "" +msgstr "Звонкий палатальный имплозивный" #: lib/ui/stdtoolbars.inc:1340 msgid "Voiced velar implosive" -msgstr "" +msgstr "Звонкий велярный имплозивный" #: lib/ui/stdtoolbars.inc:1341 msgid "Voiced uvular implosive" -msgstr "" +msgstr "Звонкий увулярный имплозивный" #: lib/ui/stdtoolbars.inc:1342 msgid "Ejective mark" -msgstr "" +msgstr "Абруптивный" #: lib/ui/stdtoolbars.inc:1346 msgid "Close front unrounded vowel" -msgstr "" +msgstr "Неогублённый гласный переднего ряда" #: lib/ui/stdtoolbars.inc:1347 msgid "Close front rounded vowel" -msgstr "" +msgstr "Огублённый гласный переднего ряда" #: lib/ui/stdtoolbars.inc:1348 msgid "Close central unrounded vowel" -msgstr "" +msgstr "Неогублённый гласный среднего ряда" #: lib/ui/stdtoolbars.inc:1349 msgid "Close central rounded vowel" -msgstr "" +msgstr "Огублённый гласный среднего ряда" #: lib/ui/stdtoolbars.inc:1350 msgid "Close back unrounded vowel" -msgstr "" +msgstr "Неогублённый гласный заднего ряда" #: lib/ui/stdtoolbars.inc:1351 msgid "Close back rounded vowel" -msgstr "" +msgstr "Огублённый гласный заднего ряда" #: lib/ui/stdtoolbars.inc:1352 msgid "Near-close near-front unrounded vowel" -msgstr "" +msgstr "Ненапряжённый неогублённый гласный переднего ряда" #: lib/ui/stdtoolbars.inc:1353 msgid "Near-close near-front rounded vowel" -msgstr "" +msgstr "Ненапряжённый огублённый гласный переднего ряда" #: lib/ui/stdtoolbars.inc:1354 msgid "Near-close near-back rounded vowel" -msgstr "" +msgstr "Ненапряжённый огублённый гласный заднего ряда" #: lib/ui/stdtoolbars.inc:1355 msgid "Close-mid front unrounded vowel" -msgstr "" +msgstr "Неогублённый гласный переднего ряда средне-верхнего подъёма" #: lib/ui/stdtoolbars.inc:1356 msgid "Close-mid front rounded vowel" -msgstr "" +msgstr "Огублённый гласный переднего ряда средне-верхнего подъёма" #: lib/ui/stdtoolbars.inc:1357 msgid "Close-mid central unrounded vowel" -msgstr "" +msgstr "Неогублённый гласный среднего ряда средне-верхнего подъёма" #: lib/ui/stdtoolbars.inc:1358 msgid "Close-mid central rounded vowel" -msgstr "" +msgstr "Огублённый гласный среднего ряда средне-верхнего подъёма" #: lib/ui/stdtoolbars.inc:1359 msgid "Close-mid back unrounded vowel" -msgstr "" +msgstr "Неогублённый гласный заднего ряда средне-верхнего подъёма" #: lib/ui/stdtoolbars.inc:1360 msgid "Close-mid back rounded vowel" -msgstr "" +msgstr "Огублённый гласный заднего ряда средне-верхнего подъёма" #: lib/ui/stdtoolbars.inc:1361 msgid "Mid-central vowel (Schwa)" @@ -23930,27 +23899,27 @@ msgstr "" #: lib/ui/stdtoolbars.inc:1362 msgid "Open-mid front unrounded vowel" -msgstr "" +msgstr "Неогублённый гласный переднего ряда средне-нижнего подъёма" #: lib/ui/stdtoolbars.inc:1363 msgid "Open-mid front rounded vowel" -msgstr "" +msgstr "Огублённый гласный переднего ряда средне-нижнего подъёма" #: lib/ui/stdtoolbars.inc:1364 msgid "Open-mid central unrounded vowel" -msgstr "" +msgstr "Неогублённый гласный среднего ряда средне-нижнего подъёма" #: lib/ui/stdtoolbars.inc:1365 msgid "Open-mid central rounded vowel" -msgstr "" +msgstr "Огублённый гласный среднего ряда средне-нижнего подъёма" #: lib/ui/stdtoolbars.inc:1366 msgid "Open-mid back unrounded vowel" -msgstr "" +msgstr "Неогублённый гласный заднего ряда средне-нижнего подъёма" #: lib/ui/stdtoolbars.inc:1367 msgid "Open-mid back rounded vowel" -msgstr "" +msgstr "Огублённый гласный заднего ряда средне-нижнего подъёма" #: lib/ui/stdtoolbars.inc:1368 msgid "Near-open front unrounded vowel" @@ -24286,11 +24255,11 @@ msgstr "Глобальное падение" #: lib/xtemplates/chess.xtemplate:14 msgid "ChessDiagram" -msgstr "Шахматная доска" +msgstr "ШахматнаяДиаграмма" #: lib/xtemplates/chess.xtemplate:15 lib/xtemplates/chess.xtemplate:34 msgid "Chess diagram" -msgstr "Шахматная доска" +msgstr "Шахматная диаграмма" #: lib/xtemplates/chess.xtemplate:17 msgid "" @@ -24395,6 +24364,10 @@ msgid "" "Using .eps requires at least lilypond 2.6\n" "Using .pdf requires at least lilypond 2.9\n" msgstr "" +"Вёрстка нотной записи в GNU LilyPond,\n" +"преобразованная в формат .pdf или .eps для включения.\n" +"Использование .eps требует, по крайней мере, lilypond 2.6.\n" +"Использование .pdf требует, по крайней мере, lilypond 2.9.\n" #: lib/xtemplates/pdfpages.xtemplate:13 msgid "PDFPages" @@ -24443,6 +24416,8 @@ msgid "" "A bitmap file.\n" "Use this template to include bitmap images of any kind.\n" msgstr "" +"Растровый файл.\n" +"Используйте этот шаблон для включения растровых изображений любого вида.\n" #: lib/xtemplates/vector_graphics.xtemplate:14 msgid "VectorGraphics" @@ -24463,6 +24438,15 @@ msgid "" "The specialized templates allow to automatically use the document font in\n" "the figures, which is not possible with this general template.\n" msgstr "" +"Файл векторной графики.\n" +"Используйте этот шаблон для включения векторной графики любого вида.\n" +"LyX попытается сохранить векторные свойства изображения для\n" +"окончательного результата.\n" +"Обратите внимание, что существуют специализированные шаблоны для рисунков " +"Xfig и диаграмм Dia.\n" +"Специализированные шаблоны позволяют автоматически использовать шрифт " +"документа на\n" +"рисунках, что невозможно с этим общим шаблоном.\n" #: lib/xtemplates/xfig.xtemplate:33 msgid "XFig" @@ -25877,6 +25861,7 @@ msgstr "Статистика" msgid "" "`inset-forall' interrupted because number of actions is larger than %1$d" msgstr "" +"`inset-forall' прерывается, так как количество действий больше, чем %1$d" #: src/BufferView.cpp:1885 #, c-format @@ -26422,12 +26407,17 @@ msgid "" "

Should LaTeX backends be allowed to run external programs?

Allow " "them only if you trust the origin/sender of the LyX document!

" msgstr "" +"

Разрешать ли LaTeX-бэкэндам запускать внешние программы?

Разрешайте их только в том случае, если вы доверяете происхождению/" +"отправителю документа LyX!

" #: src/Converter.cpp:351 msgid "" "

Would you like to run this converter?

Only run if you trust the " "origin/sender of the LyX document!

" msgstr "" +"

Хотите запустить этот конвертер?

Запускайте только в том случае, " +"если вы доверяете источнику/отправителю документа LyX!

" #: src/Converter.cpp:355 msgid "Do ¬ allow" @@ -26483,6 +26473,15 @@ msgid "" "\n" "where 'driver' is name of the driver command." msgstr "" +"Команда драйвера, необходимая для использования пакета minted\n" +"(pygmentize) не была найдена. Убедитесь, что у вас\n" +"установлен модуль python-pygments или, если драйвер\n" +"имеет другое имя, добавьте следующую строку в\n" +"преамбулу документа:\n" +"\n" +"\\AtBeginDocument{\\renewcommand{\\MintedPygmentize}{driver}}\n" +"\n" +"где 'driver' - это имя команды драйвера." #: src/Converter.cpp:630 src/Format.cpp:722 src/Format.cpp:793 msgid "Executing command: " @@ -27355,10 +27354,12 @@ msgstr "" msgid "" "The default format used with LFUN_BUFFER_[VIEW|UPDATE] with non-TeX fonts." msgstr "" +"Формат по умолчанию, используемый с LFUN_BUFFER_[VIEW|UPDATE] с не-TeX " +"шрифтами." #: src/LyXRC.cpp:3173 msgid "The default format used with LFUN_BUFFER_[VIEW|UPDATE]." -msgstr "" +msgstr "Формат по умолчанию, используемый с LFUN_BUFFER_[VIEW|UPDATE]." #: src/LyXRC.cpp:3177 msgid "" @@ -27836,6 +27837,11 @@ msgid "" "fix the merge, or have this information missing until the corresponding " "tracked changes are merged or this user edits the file again.\n" msgstr "" +"Сведения об авторе системы отслеживания изменений для индекса %1$d " +"отсутствуют. Это может произойти после неправильного слияния системой " +"управления версиями. В этом случае либо исправьте слияние, либо эта " +"информация будет отсутствовать, пока соответствующие отслеживаемые изменения " +"не будут объединены или этот пользователь не изменит файл снова.\n" #: src/Text.cpp:550 msgid "Unknown token" @@ -28158,11 +28164,11 @@ msgstr "Локально добавлен" #: src/VCBackend.cpp:642 msgid "Needs Merge" -msgstr "Нуждается в слиянии" +msgstr "Требуется слияние" #: src/VCBackend.cpp:644 msgid "Needs Checkout" -msgstr "" +msgstr "Требуется загрузка" #: src/VCBackend.cpp:646 msgid "No CVS file" @@ -28177,6 +28183,8 @@ msgid "" "The repository version is newer then the current check out.\n" "You have to update from repository first or revert your changes." msgstr "" +"Версия репозитория новее текущей загруженной копии.\n" +"Вы должны сначала обновиться из репозитория или отменить свои изменения." #: src/VCBackend.cpp:879 #, c-format @@ -28186,6 +28194,10 @@ msgid "" "'%1$s'\n" "\n" msgstr "" +"Ошибочное состояние при загрузке изменений.\n" +"\n" +"'%1$s'\n" +"\n" #: src/VCBackend.cpp:928 src/VCBackend.cpp:1486 #, c-format @@ -28240,7 +28252,7 @@ msgid "" "After pressing OK, LyX will try to reopen the resolved document." msgstr "" "Ошибка при обновлении документа %1$s из репозитория.\n" -"Вам нужно вручную разрешить конфликты СЕЙЧАС!\n" +"Вам нужно вручную разрешить конфликты прямо СЕЙЧАС!\n" "'%2$s'.\n" "\n" "После нажатия OK, LyX попробует заново открыть этот документ." @@ -28251,6 +28263,8 @@ msgid "" "The document %1$s is not in repository.\n" "You have to check in the first revision before you can revert." msgstr "" +"Документа %1$s нет в репозитории.\n" +"Вы должны загрузить первую ревизию, прежде чем сможете выполнить возврат." #: src/VCBackend.cpp:1054 #, c-format @@ -28258,6 +28272,8 @@ msgid "" "Cannot revert document %1$s to repository version.\n" "The status '%2$s' is unexpected." msgstr "" +"Невозможно вернуть документ %1$s к версии репозитория.\n" +"Состояние \"%2$s\" является неожиданным." #: src/VCBackend.cpp:1339 src/VCBackend.cpp:1475 src/VCBackend.cpp:1512 #: src/VCBackend.cpp:1566 src/VCBackend.cpp:1956 @@ -30782,7 +30798,7 @@ msgstr "Символы валюты" #: src/frontends/qt4/GuiSymbols.cpp:85 msgid "Combining Diacritical Marks for Symbols" -msgstr "" +msgstr "Комбинирующие диакритические знаки для символов" #: src/frontends/qt4/GuiSymbols.cpp:86 msgid "Letterlike Symbols" @@ -30854,7 +30870,7 @@ msgstr "Чжуинь" #: src/frontends/qt4/GuiSymbols.cpp:104 msgid "Hangul Compatibility Jamo" -msgstr "" +msgstr "Хангыль-совместимый Jamo" #: src/frontends/qt4/GuiSymbols.cpp:105 msgid "Kanbun" @@ -30862,7 +30878,7 @@ msgstr "Камбун" #: src/frontends/qt4/GuiSymbols.cpp:106 msgid "Enclosed CJK Letters and Months" -msgstr "" +msgstr "Иероглифы и названия месяцев в кружке" #: src/frontends/qt4/GuiSymbols.cpp:107 msgid "CJK Compatibility" @@ -32747,7 +32763,7 @@ msgstr "Двойной чистый лист" #: src/insets/InsetNomencl.cpp:82 msgid "Nom: " -msgstr "Имя: " +msgstr "Обозначение: " #: src/insets/InsetNomencl.cpp:90 msgid "Nomenclature Symbol: " From 6236bcb653f36336b62d4c48769b2d60ec13a0dc Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Tue, 6 Feb 2018 12:45:22 +0100 Subject: [PATCH 02/40] Add missing connection. This activates the OK/Apply when a biblatex style file is changed manually --- src/frontends/qt4/GuiDocument.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index e1e11d2540..89437d1d06 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -1155,10 +1155,14 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(updateResetDefaultBiblio())); connect(biblioModule->biblatexBbxCO, SIGNAL(activated(int)), this, SLOT(biblioChanged())); + connect(biblioModule->biblatexBbxCO, SIGNAL(editTextChanged(QString)), + this, SLOT(biblioChanged())); connect(biblioModule->biblatexBbxCO, SIGNAL(editTextChanged(QString)), this, SLOT(updateResetDefaultBiblio())); connect(biblioModule->biblatexCbxCO, SIGNAL(activated(int)), this, SLOT(biblioChanged())); + connect(biblioModule->biblatexCbxCO, SIGNAL(editTextChanged(QString)), + this, SLOT(biblioChanged())); connect(biblioModule->biblatexCbxCO, SIGNAL(editTextChanged(QString)), this, SLOT(updateResetDefaultBiblio())); connect(biblioModule->rescanBibliosPB, SIGNAL(clicked()), From e85704020ba613594a38e6f016ca7905c8f84c94 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Tue, 6 Feb 2018 13:20:45 +0100 Subject: [PATCH 03/40] Do not use English, but the context language, when pasting from LaTeX Fixes: #9199 --- src/CutAndPaste.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 582875aa3b..be3197cd8c 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -1233,6 +1233,10 @@ bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, Buffer buffer("", false); buffer.setUnnamed(true); available = buffer.importString(names[i], text, errorList); + // TeX2lyx (also used in the HTML chain) assumes English as document language + // if no language is explicitly set (as is the case here). + // We thus reset the temp buffer's language to the context language + buffer.changeLanguage(buffer.language(), cur.getFont().language()); if (available) available = !buffer.paragraphs().empty(); if (available && !buffer.paragraphs()[0].empty()) { From 92990adc236b19277a80c82ffa0580f5d1555bb0 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Tue, 6 Feb 2018 14:10:12 +0100 Subject: [PATCH 04/40] Do not use English, but the context language, when pasting from math Fixes: #2596 --- src/CutAndPaste.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index be3197cd8c..0f6b18d257 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -1048,7 +1048,10 @@ void copySelectionToStack(CursorData const & cur, CutStack & cutstack) BufferParams const & bp = cur.buffer()->params(); // FIXME This should be the plain layout...right? par.setLayout(bp.documentClass().plainLayout()); - par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED)); + // For pasting into text, we set the language to the paragraph language + // (rather than the default_language which is always English; see #2596) + par.insert(0, grabSelection(cur), Font(sane_font, par.getParLanguage(bp)), + Change(Change::UNCHANGED)); pars.push_back(par); cutstack.push(make_pair(pars, bp.documentClassPtr())); } From 9b23b49d41a17054050e9b98d8cc9bf642026448 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Tue, 6 Feb 2018 18:39:00 +0100 Subject: [PATCH 05/40] Do not show "Abstract" label in KOMA classes This is not output by those classes (per default). --- lib/layouts/scrclass.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc index bb8e02e4fa..d9f45894cd 100644 --- a/lib/layouts/scrclass.inc +++ b/lib/layouts/scrclass.inc @@ -261,9 +261,7 @@ End Input stdstruct.inc Style Abstract - LabelFont - Family Sans - EndFont + LabelType No_Label End From c6861923f055efde70fe181dd280981abb961ceb Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Wed, 7 Feb 2018 10:16:05 +0100 Subject: [PATCH 06/40] Add missing break and polish formatting. --- src/BufferView.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 63a8e2ba6c..b2e3186b17 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -1619,11 +1619,12 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) } case LFUN_BUFFER_ANONYMIZE: { - for(char c = '0'; c <='Z'; c++) { - odocstringstream ss; - ss << "a\n" << c << "\n0 0 1 1 0"; - lyx::dispatch(FuncRequest(LFUN_WORD_REPLACE, ss.str())); + for (char c = '0'; c <= 'Z'; c++) { + odocstringstream ss; + ss << "a\n" << c << "\n0 0 1 1 0"; + lyx::dispatch(FuncRequest(LFUN_WORD_REPLACE, ss.str())); } + break; } case LFUN_WORD_FINDADV: { From 2ddaa0a59b220436ee4f907672ae0dfd6b01f296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Milde?= Date: Mon, 5 Feb 2018 23:19:43 +0100 Subject: [PATCH 07/40] New lyx2lyx parser tools find_substring() and set_bool_value(). --- lib/lyx2lyx/parser_tools.py | 74 +++++++++++++++++++++++++++----- lib/lyx2lyx/test_parser_tools.py | 57 ++++++++++++++++++++++-- 2 files changed, 117 insertions(+), 14 deletions(-) diff --git a/lib/lyx2lyx/parser_tools.py b/lib/lyx2lyx/parser_tools.py index f36cd42b94..c53dbfa1ab 100644 --- a/lib/lyx2lyx/parser_tools.py +++ b/lib/lyx2lyx/parser_tools.py @@ -49,6 +49,9 @@ find_tokens_backwards(lines, tokens, start): As before, but look backwards. +find_substring(lines, sub[, start[, end]]) -> int + As find_token, but sub may be anywhere in the line. + find_re(lines, rexp, start[, end]): As find_token, but rexp is a regular expression object, so it has to be passed as e.g.: re.compile(r'...'). @@ -77,7 +80,11 @@ get_bool_value(lines, token[, start[, end[, default, delete]]]]): Like get_value, but returns a boolean. -del_token(lines, token, start[, end]): +set_bool_value(lines, token, value[, start[, end]]): + Find `token` in `lines[start:end]` and set to boolean value bool(`value`). + Return old value. Raise ValueError if token is not in lines. + +del_token(lines, token[, start[, end]]): Like find_token, but deletes the line if it finds one. Returns True if a line got deleted, otherwise False. @@ -187,6 +194,8 @@ def find_token(lines, token, start=0, end=0, ignorews=False): whitespace are ignored, but there must be whitespace following token itself. + Use find_substring(lines, sub) to find a substring anywhere in `lines`. + Return -1 on failure.""" if end == 0 or end > len(lines): @@ -239,14 +248,32 @@ def find_tokens_exact(lines, tokens, start=0, end=0): return find_tokens(lines, tokens, start, end, True) -def find_re(lines, rexp, start=0, end=0): - """ find_re(lines, rexp, start[, end]) -> int +def find_substring(lines, sub, start=0, end=0): + """ find_substring(lines, sub[, start[, end]]) -> int - Return the lowest line where rexp, a regular expression, is found - in lines[start, end]. + Return the lowest line number `i` in [start, end] where + `sub` is a substring of line[i]. Return -1 on failure.""" + if end == 0 or end > len(lines): + end = len(lines) + for i in range(start, end): + if sub in lines[i]: + return i + return -1 + + +def find_re(lines, rexp, start=0, end=0): + """ find_re(lines, rexp[, start[, end]]) -> int + + Return the lowest line number `i` in [start, end] where the regular + expression object `rexp` matches at the beginning of line[i]. + Return -1 on failure. + + Start your pattern with the wildcard ".*" to find a match anywhere in a + line. Use find_substring() to find a substring anywhere in the lines. + """ if end == 0 or end > len(lines): end = len(lines) for i in range(start, end): @@ -398,26 +425,51 @@ def get_quoted_value(lines, token, start=0, end=0, default="", delete=False): return default return val.strip('"') +bool_values = {True: ("true", "1"), + False: ("false", "0")} def get_bool_value(lines, token, start=0, end=0, default=None, delete=False): """ get_bool_value(lines, token, start[[, end], default]) -> string Find the next line that looks like: - token bool_value + token - Returns True if bool_value is 1 or true and - False if bool_value is 0 or false + Return True if is 1 or "true", False if bool_value + is 0 or "false", else `default`. """ val = get_quoted_value(lines, token, start, end, default, delete) - - if val == "1" or val == "true": + if val in bool_values[True]: return True - if val == "0" or val == "false": + if val in bool_values[False]: return False return default +def set_bool_value(lines, token, value, start=0, end=0): + """Find `token` in `lines` and set to bool(`value`). + + Return previous value. Raise `ValueError` if `token` is not in lines. + + Cf. find_token(), get_bool_value(). + """ + i = find_token(lines, token, start, end) + if i == -1: + raise ValueError + oldvalue = get_bool_value(lines, token, i, i+1) + if oldvalue is value: + return oldvalue + # Use 0/1 or true/false? + if get_quoted_value(lines, token, i, i+1) in ('0', '1'): + value_string = bool_values[value][1] + else: + value_string = bool_values[value][0] + # set to new value + lines[i] = "%s %s" % (token, value_string) + + return oldvalue + + def get_option_value(line, option): rx = option + '\s*=\s*"([^"]+)"' rx = re.compile(rx) diff --git a/lib/lyx2lyx/test_parser_tools.py b/lib/lyx2lyx/test_parser_tools.py index a9d4faee82..55d6d89e05 100644 --- a/lib/lyx2lyx/test_parser_tools.py +++ b/lib/lyx2lyx/test_parser_tools.py @@ -22,7 +22,7 @@ import unittest -ug = r""" +lines = r""" \begin_layout Standard The \begin_inset Quotes eld @@ -56,9 +56,26 @@ describes that, too. \end_layout -""" +""".splitlines() + +header = r"""\begin_header +\origin unavailable +\paperpagestyle default +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict fallse +\end_header""".splitlines() + +newheader = r"""\begin_header +\origin unavailable +\paperpagestyle default +\output_changes true +\html_math_output 0 +\html_css_as_file 1 +\html_be_strict false +\end_header""".splitlines() -lines = ug.splitlines() class TestParserTools(unittest.TestCase): @@ -100,6 +117,23 @@ def test_find_tokens(self): self.assertEqual(find_tokens(lines, tokens, 0, 4), -1) + def test_find_substring(self): + # Quotes is not a "token" (substring at the start of any line): + self.assertEqual(find_token(lines, "Quotes", 0), -1) + self.assertEqual(find_substring(lines, "Quotes", 0), 3) + # return -1 on failure: + self.assertEqual(find_substring(lines, "Qualen", 0), -1) + + + def test_find_re(self): + regexp_object = re.compile(r'\\begin.*Quote') + # matching starts with line[start] (default: start=0) + self.assertEqual(find_re(lines, regexp_object), 3) + self.assertEqual(find_re(lines, regexp_object, start=3), 3) + # matching ends one line *before* line[end]: + self.assertEqual(find_re(lines, regexp_object, start=4), 11) + self.assertEqual(find_re(lines, regexp_object, start=4, end=11), -1) + def test_find_complete_lines(self): sublines = ["\\begin_inset Quotes eld", "\\end_inset"] @@ -163,6 +197,23 @@ def test_get_value(self): # or emtpy string if token is found but has no value: # self.assertEqual(get_value(lines, "\\end_inset", default=None), "") + def test_get_bool_value(self): + self.assertEqual(get_bool_value(header, "\\output_changes"), False) + self.assertEqual(get_bool_value(newheader, "\\output_changes"), True) + self.assertEqual(get_bool_value(header, "\\html_css_as_file"), False) + self.assertEqual(get_bool_value(newheader, "\\html_css_as_file"), True) + self.assertEqual(get_bool_value(header, "\\something"), None) + self.assertEqual(get_bool_value(header, "\\output_changes", 4), None) + + def test_set_bool_value(self): + # set to new value, return old value + self.assertEqual(set_bool_value(header, "\\output_changes", True), False) + self.assertEqual(set_bool_value(header, "\\html_css_as_file", True), False) + # return default if misspelled: + self.assertEqual(set_bool_value(header, "\\html_be_strict", False), None) + # catch error and insert new setting: + self.assertRaises(ValueError, set_bool_value, header, "\\something", 0) + self.assertEqual(header, newheader) def test_del_complete_lines(self): l = lines[:] From fbfa82b313bf0f73c076bf5f26b8aac0e7d041e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Milde?= Date: Tue, 6 Feb 2018 14:32:08 +0100 Subject: [PATCH 08/40] ctests: Update dedicated lyx2lyx tests. --- autotests/export/lyx2lyx/lyx_2_2_test.lyx | 102 ++++--- autotests/export/lyx2lyx/lyx_2_3_test.lyx | 220 +++++++++------ autotests/export/lyx2lyx/lyx_2_3_test2.lyx | 299 +++++++++++++++++++++ development/autotests/invertedTests | 4 +- 4 files changed, 501 insertions(+), 124 deletions(-) create mode 100644 autotests/export/lyx2lyx/lyx_2_3_test2.lyx diff --git a/autotests/export/lyx2lyx/lyx_2_2_test.lyx b/autotests/export/lyx2lyx/lyx_2_2_test.lyx index 4e8e0d537c..9a652f1b8a 100644 --- a/autotests/export/lyx2lyx/lyx_2_2_test.lyx +++ b/autotests/export/lyx2lyx/lyx_2_2_test.lyx @@ -25,7 +25,7 @@ logicalmkup \font_sf_scale 100 100 \font_tt_scale 100 100 \use_microtype false -\use_dash_ligatures true +\use_dash_ligatures false \graphics default \default_output_format default \output_sync 0 @@ -94,11 +94,15 @@ Test reversion/conversion between 2.2 and 2.1 formats with lyx2lyx \end_layout \begin_layout Description +BoxFeatures, +\begin_inset space ~ +\end_inset + colorbox: The word \begin_inset Newline newline \end_inset -shadowsize at start of a line did trigger insertion of box options. +shadowsize at start of a line must not trigger insertion of box options. \end_layout @@ -123,7 +127,7 @@ backgroundcolor "orange" status open \begin_layout Plain Layout -simple green frame around orange box +framecolor "green" around orange box \end_layout \end_inset @@ -173,24 +177,41 @@ thickness "0.4pt" separation "3pt" shadowsize "4pt" framecolor "black" -backgroundcolor "none" +backgroundcolor "cyan" status open \begin_layout Plain Layout -no frame around cyan box +framecolor "black" around cyan box +\begin_inset Note Note +status open + +\begin_layout Plain Layout +nested inset +\end_layout + +\end_inset + + \end_layout \end_inset +\end_layout + +\begin_layout Standard +Fancy boxes have the colour chooser greyed out: +\end_layout + +\begin_layout Standard \begin_inset Box ovalbox -position "t" +position "b" hor_pos "c" has_inner_box 1 inner_pos "t" use_parbox 0 use_makebox 0 -width "40col%" +width "20col%" special "none" height "1in" height_special "totalheight" @@ -202,16 +223,12 @@ backgroundcolor "none" status open \begin_layout Plain Layout -no frame around cyan box +framecolor at bol must not trigger replacement \end_layout \end_inset -\begin_inset Newline newline -\end_inset - - \begin_inset Box Shadowbox position "t" hor_pos "c" @@ -219,7 +236,7 @@ has_inner_box 1 inner_pos "t" use_parbox 0 use_makebox 0 -width "40col%" +width "30col%" special "none" height "1in" height_special "totalheight" @@ -231,7 +248,7 @@ backgroundcolor "none" status open \begin_layout Plain Layout -no frame around cyan box +shadowsize at bol must not trigger insertion of box options \end_layout \end_inset @@ -244,7 +261,7 @@ has_inner_box 1 inner_pos "t" use_parbox 0 use_makebox 0 -width "40col%" +width "12col%" special "none" height "1in" height_special "totalheight" @@ -256,24 +273,20 @@ backgroundcolor "none" status open \begin_layout Plain Layout -no frame around cyan box +oval, thick \end_layout \end_inset -\begin_inset Newline newline -\end_inset - - -\begin_inset Box Shaded +\begin_inset Box Doublebox position "t" hor_pos "c" has_inner_box 1 inner_pos "t" use_parbox 0 use_makebox 0 -width "40col%" +width "30col%" special "none" height "1in" height_special "totalheight" @@ -284,21 +297,25 @@ framecolor "black" backgroundcolor "none" status open -\begin_layout Plain Layout -no frame around cyan box +\begin_layout LyX-Code +double frame \end_layout \end_inset - -\begin_inset Box Doublebox + +\end_layout + +\begin_layout Standard +The background of +\begin_inset Box Shaded position "t" hor_pos "c" has_inner_box 1 inner_pos "t" use_parbox 0 use_makebox 0 -width "40col%" +width "30col%" special "none" height "1in" height_special "totalheight" @@ -310,20 +327,16 @@ backgroundcolor "none" status open \begin_layout Plain Layout -no frame around cyan box +shaded boxes \end_layout \end_inset - + is set in Document>Settings>Colors \end_layout \begin_layout Standard -The conversion must not change LyX code examples, e. -\begin_inset space \thinspace{} -\end_inset - -g., for fancy frames: +The problem was detected in a LyX-Code example for fancy frames: \end_layout \begin_layout LyX-Code @@ -352,8 +365,15 @@ shadowsize}{1pt}]{shadow} \end_deeper \begin_layout Description -Hyphens vs. - dashes in different context +Hyphens +\begin_inset space ~ +\end_inset + +vs. +\begin_inset space ~ +\end_inset + +dashes in different context \end_layout \begin_deeper @@ -440,6 +460,7 @@ LyX-Code hyphens -- ---; en–dash, em—dash; \end_layout +\end_deeper \end_deeper \begin_layout Subsubsection ligature breaks inserted by lyx2lyx @@ -458,11 +479,7 @@ Rows of hyphens on subsequent lines -- ---; en–dash, em—dash and more hyphen \end_layout \begin_layout Standard - -\bar under -H -\bar default -yphens with explicit ligature breaks -\SpecialChar ligaturebreak +Hyphens with explicit ligature breaks -\SpecialChar ligaturebreak - -\SpecialChar ligaturebreak -\SpecialChar ligaturebreak -; en–dash, em—dash. @@ -516,7 +533,7 @@ literal "false" \end_inset -\begin_inset Formula $\ @{-->>}[r]$ +\begin_inset Formula $math--formula>>$ \end_inset @@ -550,6 +567,5 @@ set_width "auto" \end_layout -\end_deeper \end_body \end_document diff --git a/autotests/export/lyx2lyx/lyx_2_3_test.lyx b/autotests/export/lyx2lyx/lyx_2_3_test.lyx index dbed95330e..46d28cfbb9 100644 --- a/autotests/export/lyx2lyx/lyx_2_3_test.lyx +++ b/autotests/export/lyx2lyx/lyx_2_3_test.lyx @@ -14,9 +14,9 @@ logicalmkup \language_package default \inputencoding auto \fontencoding global -\font_roman "lmodern" "default" -\font_sans "default" "default" -\font_typewriter "default" "default" +\font_roman "NotoSerif-TLF" "default" +\font_sans "NotoSans-TLF" "default" +\font_typewriter "NotoMono-TLF" "default" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false @@ -73,8 +73,9 @@ logicalmkup \tocdepth 2 \paragraph_separation skip \defskip medskip -\is_math_indent 0 -\math_numbering_side default +\is_math_indent 1 +\math_indentation 3em +\math_numbering_side right \quotes_style english \dynamic_quotes 0 \papercolumns 1 @@ -93,84 +94,12 @@ logicalmkup Test reversion/conversion between 2.3 and 2.2 formats with lyx2lyx. \end_layout -\begin_layout Description -allowbreak: -\bar under - -\begin_inset Box Boxed -position "t" -hor_pos "c" -has_inner_box 1 -inner_pos "t" -use_parbox 0 -use_makebox 0 -width "11em" -special "none" -height "1in" -height_special "totalheight" -thickness "0.4pt" -separation "3pt" -shadowsize "4pt" -framecolor "black" -backgroundcolor "none" -status open - -\begin_layout Plain Layout - -\emph on -simple -\end_layout - -\begin_layout Plain Layout -The em-dash is used—mainly in American english—without spaces. -\end_layout - -\end_inset - - -\bar default - -\bar under - -\begin_inset Box Boxed -position "t" -hor_pos "c" -has_inner_box 1 -inner_pos "t" -use_parbox 0 -use_makebox 0 -width "11em" -special "none" -height "1in" -height_special "totalheight" -thickness "0.4pt" -separation "3pt" -shadowsize "4pt" -framecolor "black" -backgroundcolor "none" -status open - -\begin_layout Plain Layout - -\emph on -with optional line break -\emph default -: -\end_layout - -\begin_layout Plain Layout -The em-dash is used—\SpecialChar allowbreak -mainly in American english—\SpecialChar allowbreak -without spaces. -\end_layout - -\end_inset - - +\begin_layout Standard +Part 1: Fonts: NoTo \end_layout \begin_layout Description -baselineskip%: +baselineskip%: Box and rule with dimensions set to baselineskip% \begin_inset Box Boxed position "t" hor_pos "c" @@ -233,5 +162,136 @@ horizontal space insets using baselineskip. \end_layout \end_deeper +\begin_layout Description +rotated +\begin_inset space ~ +\end_inset + +floats: (sideways environment) +\end_layout + +\begin_deeper +\begin_layout Standard +sideways true at the beginning of a line must not confuse conversion +\end_layout + +\begin_layout Standard +\begin_inset Float figure +placement !ph +wide false +sideways true +status open + +\begin_layout Plain Layout +\noindent +\align center +[figure 1 stub] +\end_layout + +\begin_layout Plain Layout +\begin_inset Caption Standard + +\begin_layout Plain Layout +rotated float 1 +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\end_deeper +\begin_layout Description +rotated +\begin_inset space ~ +\end_inset + +float insets can be defined in a list: +\begin_inset Float figure +placement !ph +wide false +sideways true +status open + +\begin_layout Plain Layout +\noindent +\align center +[figure 2 stub] +\end_layout + +\begin_layout Plain Layout +\begin_inset Caption Standard + +\begin_layout Plain Layout +rotated float 2 +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Description +new +\begin_inset space ~ +\end_inset + +Babel +\begin_inset space ~ +\end_inset + +languages: text parts in +\lang bosnian +Bosnian +\lang english +, +\lang friulan +Friulian +\lang english +, +\lang macedonian +Macedonian +\lang english +, +\lang piedmontese +Piedmontese +\lang english +, +\lang romansh +Romansh +\lang english +. +\end_layout + +\begin_layout Description +Indent +\begin_inset space ~ +\end_inset + +Formulas/formula +\begin_inset space ~ +\end_inset + +numbering: 3em/right +\begin_inset Formula +\begin{equation} +y=x^{2} +\end{equation} + +\end_inset + + +\end_layout + \end_body \end_document diff --git a/autotests/export/lyx2lyx/lyx_2_3_test2.lyx b/autotests/export/lyx2lyx/lyx_2_3_test2.lyx new file mode 100644 index 0000000000..1d19f2fb33 --- /dev/null +++ b/autotests/export/lyx2lyx/lyx_2_3_test2.lyx @@ -0,0 +1,299 @@ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 544 +\begin_document +\begin_header +\save_transient_properties true +\origin unavailable +\textclass scrartcl +\use_default_options false +\begin_modules +logicalmkup +\end_modules +\maintain_unincluded_children false +\language bosnian +\language_package default +\inputencoding auto +\fontencoding global +\font_roman "cochineal" "DejaVu Serif" +\font_sans "lmss" "default" +\font_typewriter "lmtt" "default" +\font_math "auto" "auto" +\font_default_family default +\use_non_tex_fonts false +\font_sc false +\font_osf true +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype true +\use_dash_ligatures false +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize 12 +\spacing single +\use_hyperref true +\pdf_bookmarks false +\pdf_bookmarksnumbered true +\pdf_bookmarksopen false +\pdf_bookmarksopenlevel 1 +\pdf_breaklinks false +\pdf_pdfborder false +\pdf_colorlinks true +\pdf_backref false +\pdf_pdfusetitle false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 0 +\use_package mathtools 1 +\use_package mhchem 1 +\use_package stackrel 1 +\use_package stmaryrd 1 +\use_package undertilde 1 +\cite_engine basic +\cite_engine_type default +\biblio_style plain +\use_bibtopic false +\use_indices false +\paperorientation portrait +\suppress_date false +\justification true +\use_refstyle 0 +\use_minted 0 +\branch branch1 +\selected 0 +\filename_suffix 0 +\color #faf0e6 +\end_branch +\branch branch2 +\selected 1 +\filename_suffix 0 +\color #faf0e6 +\end_branch +\index Index +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 2 +\paragraph_separation skip +\defskip medskip +\is_math_indent 0 +\math_numbering_side left +\quotes_style polish +\dynamic_quotes 0 +\papercolumns 1 +\papersides 2 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Subsection* +Test reversion/conversion between 2.3 and 2.2 formats with lyx2lyx. +\end_layout + +\begin_layout Standard +Part 2: +\end_layout + +\begin_layout Itemize +Fonts: Crimson +\end_layout + +\begin_layout Itemize +microtype true +\end_layout + +\begin_layout Description +language +\begin_inset space ~ +\end_inset + +bosnian: +\begin_inset Float table +wide false +sideways false +status open + +\begin_layout Plain Layout +\begin_inset Caption Standard + +\begin_layout Plain Layout +table caption with bosnian prefix +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Description +allowbreak: +\bar under + +\begin_inset Box Boxed +position "t" +hor_pos "c" +has_inner_box 1 +inner_pos "t" +use_parbox 0 +use_makebox 0 +width "11em" +special "none" +height "1in" +height_special "totalheight" +thickness "0.4pt" +separation "3pt" +shadowsize "4pt" +framecolor "black" +backgroundcolor "none" +status open + +\begin_layout Plain Layout + +\emph on +literal dashes +\end_layout + +\begin_layout Plain Layout + +\lang english +The em-dash is used—mainly in American english—without spaces. +\end_layout + +\end_inset + + +\bar default + +\bar under + +\begin_inset Box Boxed +position "t" +hor_pos "c" +has_inner_box 1 +inner_pos "t" +use_parbox 0 +use_makebox 0 +width "11em" +special "none" +height "1in" +height_special "totalheight" +thickness "0.4pt" +separation "3pt" +shadowsize "4pt" +framecolor "black" +backgroundcolor "none" +status open + +\begin_layout Plain Layout ++ +\emph on +optional line break +\emph default +: +\end_layout + +\begin_layout Plain Layout + +\lang english +The em-dash is used—\SpecialChar allowbreak +mainly in American english—\SpecialChar allowbreak +without spaces. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Description +inverted +\begin_inset space ~ +\end_inset + +branches: branch1 is off, branch 2 is active +\begin_inset Branch branch1 +inverted 0 +status open + +\begin_layout Standard +normal branch1 +\end_layout + +\end_inset + + +\begin_inset Branch branch1 +inverted 1 +status open + +\begin_layout Standard +inverted branch1 +\end_layout + +\end_inset + + +\begin_inset Branch branch2 +inverted 0 +status open + +\begin_layout Standard +normal branch2 +\end_layout + +\end_inset + + +\begin_inset Branch branch2 +inverted 1 +status open + +\begin_layout Standard +inverted branch2 +\end_layout + +\end_inset + +. +\end_layout + +\begin_layout Description +Indent +\begin_inset space ~ +\end_inset + +Formulas/formula +\begin_inset space ~ +\end_inset + +numbering: false/left +\begin_inset Formula +\begin{equation} +y=x^{2} +\end{equation} + +\end_inset + + +\end_layout + +\end_body +\end_document diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 3105523792..6d925d104c 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -94,7 +94,6 @@ export/export/latex/unicodesymbols/.*_jis-platex_pdf2 export/export/latex/unicodesymbols/.*_shift-jis-platex_pdf2 export/export/latex/unicodesymbols/.*_utf8-platex_pdf2 - # Arabic # If we want to try to get it to work with pdfTeX: # - set all non-Arab text parts to a different language (e.g. English) @@ -120,6 +119,9 @@ export/templates/RJournal_(dvi3|pdf[45])_systemF export/templates/aa_(dvi3|pdf[45])_.* export/templates/kluwer_.*_systemF +# lyx2lyx tests: +# back-conversion fails for rotated float inset in a list +export/export/lyx2lyx/lyx_2_3_test_lyx.* # ================================================ Sublabel: lyxbugs From e4f90cdf65446de8f6fdb2599abf4d8a94fe85d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Milde?= Date: Wed, 7 Feb 2018 18:46:24 +0100 Subject: [PATCH 09/40] lyx2lyx refactoring. Avoid duplicate code. Fix some corner-cases. --- lib/lyx2lyx/lyx_2_2.py | 77 ++++---- lib/lyx2lyx/lyx_2_3.py | 434 +++++++++++++++++------------------------ 2 files changed, 216 insertions(+), 295 deletions(-) diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py index 3ba32b31e5..342bb06119 100644 --- a/lib/lyx2lyx/lyx_2_2.py +++ b/lib/lyx2lyx/lyx_2_2.py @@ -37,7 +37,8 @@ from parser_tools import (check_token, del_complete_lines, find_end_of_inset, find_end_of_layout, find_nonempty_line, find_re, find_token, find_token_backwards, get_containing_layout, - get_containing_inset, get_value, is_in_inset) + get_containing_inset, get_quoted_value, get_value, is_in_inset, + get_bool_value, set_bool_value) #################################################################### @@ -1271,55 +1272,47 @@ def convert_colorbox(document): def revert_colorbox(document): - " outputs color settings for boxes as TeX code " + """Change box color settings to LaTeX code.""" i = 0 - defaultframecolor = "black" - defaultbackcolor = "none" while True: - i = find_token(document.body, "framecolor", i) + i = find_token(document.body, "\\begin_inset Box", i+1) if i == -1: return - binset = find_token(document.body, "\\begin_inset Box", i - 14) - if binset == -1: - return - einset = find_end_of_inset(document.body, binset) + # Get and delete colour settings: + framecolor = get_quoted_value(document.body, "framecolor", i+14, i+15, delete=True) + backcolor = get_quoted_value(document.body, "backgroundcolor", i+14, i+15, delete=True) + if not framecolor or not backcolor: + document.warning("Malformed LyX document: color options not found in Box inset!") + continue + if framecolor == "black" and backcolor == "none": # default values + i += 15 # skip box option lines + continue + + # Emulate non-default colours with LaTeX code: + einset = find_end_of_inset(document.body, i) if einset == -1: document.warning("Malformed LyX document: Can't find end of box inset!") continue - # read out the values - beg = document.body[i].find('"'); - end = document.body[i].rfind('"'); - framecolor = document.body[i][beg+1:end]; - beg = document.body[i + 1].find('"'); - end = document.body[i + 1].rfind('"'); - backcolor = document.body[i+1][beg+1:end]; - # delete the specification - del document.body[i:i + 2] - # output ERT - # first output the closing brace - if framecolor != defaultframecolor or backcolor != defaultbackcolor: - add_to_preamble(document, ["\\@ifundefined{rangeHsb}{\\usepackage{xcolor}}{}"]) - document.body[einset : einset] = put_cmd_in_ert("}") - # determine the box type - isBox = find_token(document.body, "\\begin_inset Box Boxed", binset) - # now output the box commands - if (framecolor != defaultframecolor and isBox == binset) or (backcolor != defaultbackcolor and isBox == binset): - document.body[i - 14 : i - 14] = put_cmd_in_ert("\\fcolorbox{" + framecolor + "}{" + backcolor + "}{") - # in the case we must also change the box type because the ERT code adds a frame - document.body[i - 4] = "\\begin_inset Box Frameless" - # if has_inner_box 0 we must set it and use_makebox to 1 - ibox = find_token(document.body, "has_inner_box", i - 4) - if ibox == -1 or ibox != i - 1: - document.warning("Malformed LyX document: Can't find has_inner_box statement!") - continue - # read out the value - innerbox = document.body[ibox][-1:]; - if innerbox == "0": - document.body[ibox] = "has_inner_box 1" - document.body[ibox + 3] = "use_makebox 1" - if backcolor != defaultbackcolor and isBox != binset: - document.body[i - 14 : i - 14] = put_cmd_in_ert("\\colorbox{" + backcolor + "}{") + add_to_preamble(document, ["\\@ifundefined{rangeHsb}{\\usepackage{xcolor}}{}"]) + # insert the closing brace first (keeps indices 'i' and 'einset' valid) + document.body[einset+1:einset+1] = put_cmd_in_ert("}") + [""] + # now insert the (f)color box command + if ("Box Boxed" in document.body[i]): # framed box, use \fcolorbox + # change the box type (frame added by \fcolorbox) + document.body[i] = "\\begin_inset Box Frameless" + # ensure an inner box: + try: + if not set_bool_value(document.body, "has_inner_box", True, i+3, i+4): + set_bool_value(document.body, "use_makebox", True, i+6, i+7) + except ValueError: + document.warning("Malformed LyX document: 'has_inner_box' or " + "'use_makebox' option not found in box inset!") + ertinset = put_cmd_in_ert("\\fcolorbox{%s}{%s}{"% (framecolor, backcolor)) + else: + ertinset = put_cmd_in_ert("\\colorbox{%s}{" % backcolor) + document.body[i:i] = ertinset + [""] + i = einset # skip inset def revert_mathmulticol(document): diff --git a/lib/lyx2lyx/lyx_2_3.py b/lib/lyx2lyx/lyx_2_3.py index 6551175515..7f4ceef6bd 100644 --- a/lib/lyx2lyx/lyx_2_3.py +++ b/lib/lyx2lyx/lyx_2_3.py @@ -26,9 +26,9 @@ from parser_tools import (del_token, del_value, del_complete_lines, find_complete_lines, find_end_of, find_end_of_layout, find_end_of_inset, - find_re, find_token, find_token_backwards, get_containing_inset, - get_containing_layout, get_bool_value, get_value, get_quoted_value, - is_in_inset) + find_re, find_substring, find_token, find_token_backwards, + get_containing_inset, get_containing_layout, get_bool_value, get_value, + get_quoted_value, is_in_inset, set_bool_value) # find_tokens, find_token_exact, check_token, get_option_value from lyx2lyx_tools import (add_to_preamble, put_cmd_in_ert, revert_font_attrs, @@ -49,26 +49,20 @@ def convert_microtype(document): " Add microtype settings. " - i = find_token(document.header, "\\font_tt_scale" , 0) - if i == -1: - document.warning("Malformed LyX document: Can't find \\font_tt_scale.") - i = len(document.header) - 1 - - j = find_token(document.preamble, "\\usepackage{microtype}", 0) + i = find_token(document.header, "\\font_tt_scale") + j = find_token(document.preamble, "\\usepackage{microtype}") if j == -1: document.header.insert(i + 1, "\\use_microtype false") else: document.header.insert(i + 1, "\\use_microtype true") del document.preamble[j] + if j and document.preamble[j-1] == "% Added by lyx2lyx": + del document.preamble[j-1] def revert_microtype(document): " Remove microtype settings. " - i = find_token(document.header, "\\use_microtype", 0) - if i == -1: - return - use_microtype = get_bool_value(document.header, "\\use_microtype" , i) - del document.header[i] + use_microtype = get_bool_value(document.header, "\\use_microtype", delete=True) if use_microtype: add_to_preamble(document, ["\\usepackage{microtype}"]) @@ -77,25 +71,22 @@ def convert_dateinset(document): ' Convert date external inset to ERT ' i = 0 while True: - i = find_token(document.body, "\\begin_inset External", i) + i = find_token(document.body, "\\begin_inset External", i+1) if i == -1: return j = find_end_of_inset(document.body, i) if j == -1: document.warning("Malformed lyx document: Missing '\\end_inset' in convert_dateinset.") - i += 1 continue if get_value(document.body, 'template', i, j) == "Date": document.body[i : j + 1] = put_cmd_in_ert("\\today ") - i = j+1 # skip inset + i = j # skip inset def convert_inputenc(document): - " Replace no longer supported input encoding settings. " - i = find_token(document.header, "\\inputenc") - if i == -1: - return - if get_value(document.header, "\\inputencoding", i) == "pt254": + """Replace no longer supported input encoding setting.""" + i = find_token(document.header, "\\inputencoding pt254") + if i != -1: document.header[i] = "\\inputencoding pt154" @@ -103,11 +94,10 @@ def convert_ibranches(document): ' Add "inverted 0" to branch insets' i = 0 while True: - i = find_token(document.body, "\\begin_inset Branch", i) + i = find_token(document.body, "\\begin_inset Branch", i+1) if i == -1: return document.body.insert(i + 1, "inverted 0") - i += 1 def revert_ibranches(document): @@ -116,56 +106,45 @@ def revert_ibranches(document): ourbranches = {} i = 0 while True: - i = find_token(document.header, "\\branch", i) + i = find_token(document.header, "\\branch", i+1) if i == -1: break branch = document.header[i][8:].strip() - if document.header[i+1].startswith("\\selected "): - #document.warning(document.header[i+1]) - #document.warning(document.header[i+1][10]) - selected = int(document.header[i+1][10]) - else: - document.warning("Malformed LyX document: No selection indicator for branch " + branch) - selected = 1 - + selected = get_bool_value(document.header, "\\selected", i+1, i+2) + if selected is None: + document.warning("Malformed LyX document: No selection indicator " + "for branch %s." % branch) + selected = True # the value tells us whether the branch is selected - ourbranches[document.header[i][8:].strip()] = selected - i += 1 + ourbranches[branch] = selected - # Figure out what inverted branches, if any, have been used - # and convert them to "Anti-OldBranch" - ibranches = {} + # Find branch insets, remove "inverted" tag and + # convert inverted insets to "Anti-OldBranch" insets + antibranches = {} i = 0 while True: - i = find_token(document.body, "\\begin_inset Branch", i) + i = find_token(document.body, "\\begin_inset Branch", i+1) if i == -1: break - if not document.body[i+1].startswith("inverted "): - document.warning("Malformed LyX document: Missing 'inverted' tag!") - i += 1 + inverted = get_bool_value(document.body, "inverted", i+1, i+2, delete=True) + if inverted is None: + document.warning("Malformed LyX document: Missing 'inverted' tag in branch inset.") continue - inverted = document.body[i+1][9] - #document.warning(document.body[i+1]) - - if inverted == "1": + if inverted: branch = document.body[i][20:].strip() #document.warning(branch) - if not branch in ibranches: + if not branch in antibranches: antibranch = "Anti-" + branch - while antibranch in ibranches: + while antibranch in antibranches: antibranch = "x" + antibranch - ibranches[branch] = antibranch + antibranches[branch] = antibranch else: - antibranch = ibranches[branch] + antibranch = antibranches[branch] #document.warning(antibranch) document.body[i] = "\\begin_inset Branch " + antibranch - # remove "inverted" key - del document.body[i+1] - i += 1 - # now we need to add the new branches to the header - for old, new in ibranches.items(): + for old, new in antibranches.items(): i = find_token(document.header, "\\branch " + old, 0) if i == -1: document.warning("Can't find branch %s even though we found it before!" % (old)) @@ -268,100 +247,41 @@ def convert_beamer_article_styles(document): document.header[k : l + 1] = [] -def revert_bosnian(document): - "Set the document language to English but assure Bosnian output" - - if document.language == "bosnian": - document.language = "english" - i = find_token(document.header, "\\language bosnian", 0) - if i != -1: - document.header[i] = "\\language english" - j = find_token(document.header, "\\language_package default", 0) - if j != -1: - document.header[j] = "\\language_package babel" - k = find_token(document.header, "\\options", 0) - if k != -1: - document.header[k] = document.header[k].replace("\\options", "\\options bosnian,") - else: - l = find_token(document.header, "\\use_default_options", 0) - document.header.insert(l + 1, "\\options bosnian") - - -def revert_friulan(document): - "Set the document language to English but assure Friulan output" +def revert_new_babel_languages(document): + """Revert "bosnian", "friulan", "macedonian", "piedmontese", "romansh". - if document.language == "friulan": - document.language = "english" - i = find_token(document.header, "\\language friulan", 0) - if i != -1: - document.header[i] = "\\language english" - j = find_token(document.header, "\\language_package default", 0) - if j != -1: - document.header[j] = "\\language_package babel" - k = find_token(document.header, "\\options", 0) - if k != -1: - document.header[k] = document.header[k].replace("\\options", "\\options friulan,") - else: - l = find_token(document.header, "\\use_default_options", 0) - document.header.insert(l + 1, "\\options friulan") - - -def revert_macedonian(document): - "Set the document language to English but assure Macedonian output" - - if document.language == "macedonian": - document.language = "english" - i = find_token(document.header, "\\language macedonian", 0) - if i != -1: - document.header[i] = "\\language english" - j = find_token(document.header, "\\language_package default", 0) - if j != -1: - document.header[j] = "\\language_package babel" - k = find_token(document.header, "\\options", 0) - if k != -1: - document.header[k] = document.header[k].replace("\\options", "\\options macedonian,") - else: - l = find_token(document.header, "\\use_default_options", 0) - document.header.insert(l + 1, "\\options macedonian") - - -def revert_piedmontese(document): - "Set the document language to English but assure Piedmontese output" - - if document.language == "piedmontese": - document.language = "english" - i = find_token(document.header, "\\language piedmontese", 0) - if i != -1: - document.header[i] = "\\language english" - j = find_token(document.header, "\\language_package default", 0) - if j != -1: - document.header[j] = "\\language_package babel" - k = find_token(document.header, "\\options", 0) - if k != -1: - document.header[k] = document.header[k].replace("\\options", "\\options piedmontese,") - else: - l = find_token(document.header, "\\use_default_options", 0) - document.header.insert(l + 1, "\\options piedmontese") - - -def revert_romansh(document): - "Set the document language to English but assure Romansh output" + Set the document language to English but use correct babel setting. + """ + # TODO: currently, text parts in these languages are kept as-is + # and are converted to the document language by LyX 2.2 with warnings like + # LyX: Unknown language `romansh' [around line 273 of file lyx_2_3_test.22.lyx current token: 'romansh' context: 'InsetSpaceParams::read'] - if document.language == "romansh": - document.language = "english" - i = find_token(document.header, "\\language romansh", 0) - if i != -1: - document.header[i] = "\\language english" - j = find_token(document.header, "\\language_package default", 0) - if j != -1: - document.header[j] = "\\language_package babel" - k = find_token(document.header, "\\options", 0) - if k != -1: - document.header[k] = document.header[k].replace("\\options", "\\options romansh,") - else: - l = find_token(document.header, "\\use_default_options", 0) - document.header.insert(l + 1, "\\options romansh") + if document.language not in ["bosnian", "friulan", "macedonian", + "piedmontese", "romansh"]: + return + i = find_token(document.header, "\\language") + if i != -1: + document.header[i] = "\\language english" + # ensure we use Babel: + # TODO: Polyglossia supports friulan, piedmontese, romansh + # but requires "\resetdefaultlanguage{...}" at begin of document. + j = find_token(document.header, "\\language_package default") + if j != -1: + document.header[j] = "\\language_package babel" + k = find_token(document.header, "\\options") + if k != -1: + document.header[k] = document.header[k].replace("\\options", + "\\options %s," % document.language) + else: + l = find_token(document.header, "\\use_default_options") + document.header.insert(l + 1, "\\options " + document.language) + document.language = "english" +# TODO: +# def convert_new_babel_languages(document) +# set to native support if get_value(document.header, "\\options") in +# ["bosnian", "friulan", "macedonian", "piedmontese", "romansh"] +# and "\\language_package babel". def revert_amharic(document): "Set the document language to English but assure Amharic output" @@ -1028,24 +948,57 @@ def revert_cjkquotes(document): i = l +def convert_crimson(document): + """Transform preamble code to native font setting.""" + # Quick-check: + i = find_substring(document.preamble, "{cochineal}") + if i == -1: + return + # Find and delete user-preamble code: + if document.preamble[i] == "\\usepackage[proportional,osf]{cochineal}": + osf = True + elif document.preamble[i] == "\\usepackage{cochineal}": + osf = False + else: + return + del document.preamble[i] + if i and document.preamble[i-1] == "% Added by lyx2lyx": + del document.preamble[i-1] + + # Convert to native font setting: + j = find_token(document.header, '\\font_roman') + if j == -1: + romanfont = ['\font_roman', '"cochineal"', '"default"'] + else: + romanfont = document.header[j].split() + romanfont[1] = '"cochineal"' + document.header[j] = " ".join(romanfont) + try: + set_bool_value(document.header, '\\font_osf', osf) + except ValueError: # no \\font_osf setting in document.header + if osf: + document.header.insert(-1, "\\font_osf true") + + def revert_crimson(document): " Revert native Cochineal/Crimson font definition to LaTeX " - if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1: - preamble = "" - i = find_token(document.header, "\\font_roman \"cochineal\"", 0) - if i != -1: - osf = False - j = find_token(document.header, "\\font_osf true", 0) - if j != -1: - osf = True - preamble = "\\usepackage" - if osf: - document.header[j] = "\\font_osf false" - preamble += "[proportional,osf]" - preamble += "{cochineal}" - add_to_preamble(document, [preamble]) - document.header[i] = document.header[i].replace("cochineal", "default") + i = find_token(document.header, '\\font_roman "cochineal"') + if i == -1: + return + # replace unsupported font setting + document.header[i] = document.header[i].replace("cochineal", "default") + # no need for preamble code with system fonts + if get_bool_value(document.header, "\\use_non_tex_fonts"): + return + # transfer old style figures setting to package options + j = find_token(document.header, "\\font_osf true") + if j != -1: + options = "[proportional,osf]" + document.header[j] = "\\font_osf false" + else: + options = "" + add_to_preamble(document, ["\\usepackage%s{cochineal}"%options]) def revert_cochinealmath(document): @@ -1294,14 +1247,14 @@ def revert_biblatex(document): } # All commands accepted by LyX < 2.3. Everything else throws an error. - old_citations = [ "cite", "nocite", "citet", "citep", "citealt", "citealp",\ - "citeauthor", "citeyear", "citeyearpar", "citet*", "citep*",\ - "citealt*", "citealp*", "citeauthor*", "Citet", "Citep",\ - "Citealt", "Citealp", "Citeauthor", "Citet*", "Citep*",\ - "Citealt*", "Citealp*", "Citeauthor*", "fullcite", "footcite",\ - "footcitet", "footcitep", "footcitealt", "footcitealp",\ - "footciteauthor", "footciteyear", "footciteyearpar",\ - "citefield", "citetitle", "cite*" ] + old_citations = ["cite", "nocite", "citet", "citep", "citealt", "citealp", + "citeauthor", "citeyear", "citeyearpar", "citet*", "citep*", + "citealt*", "citealp*", "citeauthor*", "Citet", "Citep", + "Citealt", "Citealp", "Citeauthor", "Citet*", "Citep*", + "Citealt*", "Citealp*", "Citeauthor*", "fullcite", "footcite", + "footcitet", "footcitep", "footcitealt", "footcitealp", + "footciteauthor", "footciteyear", "footciteyearpar", + "citefield", "citetitle", "cite*" ] i = 0 while (True): @@ -1570,7 +1523,6 @@ def convert_literalparam(document): document.body.insert(i, "literal \"true\"") - def revert_literalparam(document): " Remove param literal " @@ -1592,7 +1544,6 @@ def revert_literalparam(document): del document.body[k] - def revert_multibib(document): " Revert multibib support " @@ -1840,7 +1791,8 @@ def revert_chapterbib(document): def convert_dashligatures(document): - "Set 'use_dash_ligatures' according to content." + """Set 'use_dash_ligatures' according to content. + """ # Look for and remove dashligatures workaround from 2.3->2.2 reversion, # set use_dash_ligatures to True if found, to None else. use_dash_ligatures = del_complete_lines(document.preamble, @@ -1853,13 +1805,14 @@ def convert_dashligatures(document): # or "\threehyphens\n" as interim representation for -- an ---.) lines = document.body has_literal_dashes = has_ligature_dashes = False + dash_pattern = re.compile(u"[\u2013\u2014]|\\twohyphens|\\threehyphens") i = j = 0 - while i+1 < len(lines): - i += 1 - line = lines[i] + while True: # skip lines without dashes: - if not re.search(u"[\u2013\u2014]|\\twohyphens|\\threehyphens", line): - continue + i = find_re(lines, dash_pattern, i+1) + if i == -1: + break + line = lines[i] # skip label width string (see bug 10243): if line.startswith("\\labelwidthstring"): continue @@ -1905,9 +1858,10 @@ def convert_dashligatures(document): use_dash_ligatures = True # insert the setting if there is a preferred value - if use_dash_ligatures is not None: - document.header.insert(-1, "\\use_dash_ligatures %s" - % str(use_dash_ligatures).lower()) + if use_dash_ligatures is True: + document.header.insert(-1, "\\use_dash_ligatures true") + elif use_dash_ligatures is False: + document.header.insert(-1, "\\use_dash_ligatures false") def revert_dashligatures(document): @@ -2021,10 +1975,8 @@ def revert_mathindent(document): def revert_baselineskip(document): " Revert baselineskips to TeX code " i = 0 - regexp = re.compile(r'.*baselineskip%.*') while True: - i = i + 1 - i = find_re(document.body, regexp, i) + i = find_substring(document.body, "baselineskip%", i+1) if i == -1: return if document.body[i].startswith("\\begin_inset VSpace"): @@ -2059,16 +2011,11 @@ def revert_rotfloat(document): k = 0 while True: i = find_token(document.body, "sideways true", i) - if i != -1: - regexp = re.compile(r'^.*placement.*$') - j = find_re(document.body, regexp, i-2) - if j == -1: - return - if j != i-2: - i = i + 1 - continue - else: + if i == -1: return + if not document.body[i-2].startswith('placement '): + i = i + 1 + continue # we found a sideways float with placement options # at first store the placement beg = document.body[i-2].rfind(" "); @@ -2108,7 +2055,7 @@ def convert_allowbreak(document): i = find_complete_lines(lines, allowbreak_emulation, 2) while i != -1: lines[i-1:i+4] = [lines[i-1] + r"\SpecialChar allowbreak"] - i = find_complete_lines(lines, allowbreak_emulation, i) + i = find_complete_lines(lines, allowbreak_emulation, i+3) def revert_allowbreak(document): @@ -2127,18 +2074,15 @@ def revert_allowbreak(document): def convert_mathnumberpos(document): " add the \\math_number_before tag " # check if the document uses the class option "leqno" - k = find_token(document.header, "\\quotes_style", 0) - m = find_token(document.header, "\\options", 0) - regexp = re.compile(r'^.*leqno.*') - i = find_re(document.header, regexp, 0) - if i != -1 and i == m: + i = find_token(document.header, "\\options") + k = find_token(document.header, "\\quotes_style") + if 'leqno' in document.header[i]: document.header.insert(k, "\\math_number_before 1") # delete the found option document.header[i] = document.header[i].replace(",leqno", "") document.header[i] = document.header[i].replace(", leqno", "") document.header[i] = document.header[i].replace("leqno,", "") - j = find_re(document.header, regexp, 0) - if i == j: + if 'leqno' in document.header[i]: # then we have leqno as the only option del document.header[i] else: @@ -2146,73 +2090,59 @@ def convert_mathnumberpos(document): def revert_mathnumberpos(document): - " add the document class option leqno" - regexp = re.compile(r'(\\math_number_before 1)') - i = find_re(document.header, regexp, 0) - if i == -1: - regexp = re.compile(r'(\\math_number_before)') - j = find_re(document.header, regexp, 0) - del document.header[j] - else: - k = find_token(document.header, "\\options", 0) - if k != -1: - document.header[k] = document.header[k].replace("\\options", "\\options leqno,") - del document.header[i] + """Remove \\math_number_before tag, + add the document class option leqno if required. + """ + math_number_before = get_bool_value(document.header, + '\\math_number_before', delete=True) + if math_number_before: + i = find_token(document.header, "\\options") + if i != -1 and 'leqno' not in document.header[i]: + document.header[i] = document.header[i].replace("\\options", "\\options leqno,") else: - l = find_token(document.header, "\\use_default_options", 0) - document.header.insert(l, "\\options leqno") - del document.header[i + 1] + i = find_token(document.header, "\\use_default_options") + document.header.insert(i, "\\options leqno") def convert_mathnumberingname(document): " rename the \\math_number_before tag to \\math_numbering_side " - regexp = re.compile(r'(\\math_number_before 1)') - i = find_re(document.header, regexp, 0) - if i != -1: + i = find_token(document.header, "\\math_number_before") + math_number_before = get_bool_value(document.header, '\\math_number_before', i) + if math_number_before: document.header[i] = "\\math_numbering_side left" - regexp = re.compile(r'(\\math_number_before 0)') - i = find_re(document.header, regexp, 0) - if i != -1: - document.header[i] = "\\math_numbering_side default" + return # check if the document uses the class option "reqno" - k = find_token(document.header, "\\math_numbering_side", 0) - m = find_token(document.header, "\\options", 0) - regexp = re.compile(r'^.*reqno.*') - i = find_re(document.header, regexp, 0) - if i != -1 and i == m: - document.header[k] = "\\math_numbering_side right" + k = find_token(document.header, "\\options") + if 'reqno' in document.header[k]: + document.header[i] = "\\math_numbering_side right" # delete the found option - document.header[i] = document.header[i].replace(",reqno", "") - document.header[i] = document.header[i].replace(", reqno", "") - document.header[i] = document.header[i].replace("reqno,", "") - j = find_re(document.header, regexp, 0) - if i == j: + document.header[k] = document.header[k].replace(",reqno", "") + document.header[k] = document.header[k].replace(", reqno", "") + document.header[k] = document.header[k].replace("reqno,", "") + if 'reqno' in document.header[k]: # then we have reqno as the only option - del document.header[i] + del document.header[k] + else: + document.header[i] = "\\math_numbering_side default" def revert_mathnumberingname(document): " rename the \\math_numbering_side tag back to \\math_number_before " - # just rename - regexp = re.compile(r'(\\math_numbering_side left)') - i = find_re(document.header, regexp, 0) - if i != -1: + i = find_token(document.header, "\\math_numbering_side") + math_numbering_side = get_value(document.header, '\\math_numbering_side', i) + # rename tag and set boolean value: + if math_numbering_side == "left": document.header[i] = "\\math_number_before 1" - # add the option reqno and delete the tag - regexp = re.compile(r'(\\math_numbering_side right)') - i = find_re(document.header, regexp, 0) - if i != -1: + elif math_numbering_side == "right": + # also add the option reqno: document.header[i] = "\\math_number_before 0" - k = find_token(document.header, "\\options", 0) - if k != -1: + k = find_token(document.header, "\\options") + if k != -1 and 'reqno' not in document.header[k]: document.header[k] = document.header[k].replace("\\options", "\\options reqno,") else: l = find_token(document.header, "\\use_default_options", 0) document.header.insert(l, "\\options reqno") - # add the math_number_before tag - regexp = re.compile(r'(\\math_numbering_side default)') - i = find_re(document.header, regexp, 0) - if i != -1: + else: document.header[i] = "\\math_number_before 0" @@ -2224,9 +2154,7 @@ def convert_minted(document): def revert_minted(document): " remove the \\use_minted tag " - i = find_token(document.header, "\\use_minted", 0) - if i != -1: - document.header.pop(i) + del_token(document.header, "\\use_minted") ## @@ -2250,7 +2178,7 @@ def revert_minted(document): [521, [convert_frenchquotes]], [522, []], [523, []], - [524, []], + [524, [convert_crimson]], [525, []], [526, []], [527, []], @@ -2305,7 +2233,7 @@ def revert_minted(document): [515, []], [514, [revert_urdu, revert_syriac]], [513, [revert_amharic, revert_asturian, revert_kannada, revert_khmer]], - [512, [revert_bosnian, revert_friulan, revert_macedonian, revert_piedmontese, revert_romansh]], + [512, [revert_new_babel_languages]], [511, [revert_beamer_article_styles]], [510, [revert_ibranches]], [509, []], From 1e5b471d5802dff4e38cb2a08080f4fb1eb14909 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Wed, 7 Feb 2018 23:19:20 +0100 Subject: [PATCH 10/40] * comment --- src/DocIterator.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/DocIterator.h b/src/DocIterator.h index 9582ea30f9..f4e336c981 100644 --- a/src/DocIterator.h +++ b/src/DocIterator.h @@ -126,6 +126,7 @@ class DocIterator /// return the last column of the top grid col_type lastcol() const { return ncols() - 1; } /// the inset just behind the cursor + /// returns 0 if there is no inset (e.g. normal text) Inset * nextInset() const; /// the inset just in front of the cursor Inset * prevInset() const; From 41f59527d1df71cc562008f6980e353772e2960d Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Wed, 7 Feb 2018 23:24:05 +0100 Subject: [PATCH 11/40] * comment --- src/DocIterator.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DocIterator.h b/src/DocIterator.h index f4e336c981..4d2dfa00f7 100644 --- a/src/DocIterator.h +++ b/src/DocIterator.h @@ -208,7 +208,7 @@ class DocIterator void forwardChar(); /// move on one paragraph void forwardPar(); - /// move on one inset + /// move on to the next closest inset void forwardInset(); /// move backward one logical position void backwardPos(); From 9e2928be68992161a54287d153e1e9431e30bb4c Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Thu, 8 Feb 2018 11:31:23 +0100 Subject: [PATCH 12/40] Re-add method to get a temporary file name without persistent QTemporaryFile object MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is needed for cases where the temp file has to be manually removed at some point (e.g., if temp files are used as conversion target, and the initial file only serves as a placeholder), since QTemporaryFile objects cannot be manually removed at least on Windows (they are always kept open internally even after close()). See ​http://lists.qt-project.org/pipermail/interest/2013-August/008352.html In order to avoid race conditions due to duplicate names (the issue why the old method was removed), we record all used temp file names. Fixes: #9139 --- src/Buffer.cpp | 16 ++++++------- src/support/filetools.cpp | 49 ++++++++++++++++++++++++++++++++++++++- src/support/filetools.h | 23 ++++++++++++++++++ 3 files changed, 79 insertions(+), 9 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index ff85f2232c..462094f960 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -1075,8 +1075,7 @@ bool Buffer::importString(string const & format, docstring const & contents, Err return false; // It is important to use the correct extension here, since some // converters create a wrong output file otherwise (e.g. html2latex) - TempFile const tempfile("Buffer_importStringXXXXXX." + fmt->extension()); - FileName const name(tempfile.name()); + FileName const name = tempFileName("Buffer_importStringXXXXXX." + fmt->extension()); ofdocstream os(name.toFilesystemEncoding().c_str()); // Do not convert os implicitly to bool, since that is forbidden in C++11. bool const success = !(os << contents).fail(); @@ -1092,8 +1091,7 @@ bool Buffer::importString(string const & format, docstring const & contents, Err converted = importFile(format, name, errorList); } - if (name.exists()) - name.removeFile(); + removeTempFile(name); return converted; } @@ -1103,10 +1101,12 @@ bool Buffer::importFile(string const & format, FileName const & name, ErrorList if (!theConverters().isReachable(format, "lyx")) return false; - TempFile const tempfile("Buffer_importFileXXXXXX.lyx"); - FileName const lyx(tempfile.name()); - if (theConverters().convert(0, name, lyx, name, format, "lyx", errorList)) - return readFile(lyx) == ReadSuccess; + FileName const lyx = tempFileName("Buffer_importFileXXXXXX.lyx"); + if (theConverters().convert(0, name, lyx, name, format, "lyx", errorList)) { + bool const success = readFile(lyx) == ReadSuccess; + removeTempFile(lyx); + return success; + } return false; } diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp index 12457cb3ae..bcfd1b6c9e 100644 --- a/src/support/filetools.cpp +++ b/src/support/filetools.cpp @@ -26,6 +26,7 @@ #include "support/filetools.h" +#include "support/convert.h" #include "support/debug.h" #include "support/environment.h" #include "support/gettext.h" @@ -36,6 +37,7 @@ #include "support/PathChanger.h" #include "support/Systemcall.h" #include "support/qstring_helpers.h" +#include "support/TempFile.h" #include #include @@ -458,6 +460,51 @@ string const commandPrep(string const & command_in) } +FileName const tempFileName(string const & mask) +{ + FileName tempfile = TempFile(mask).name(); + // Since the QTemporaryFile object is destroyed at function return + // (which is what is intended here), the next call to this function + // may return the same file name again. + // Thus, in order to prevent race conditions, we track returned names + // and create our own unique names if QTemporaryFile returns a name again. + if (tmp_names_.find(tempfile.absFileName()) == tmp_names_.end()) { + tmp_names_.insert(tempfile.absFileName()); + return tempfile; + } + + // OK, we need another name. Simply append digits. + FileName tmp = tempfile; + tmp.changeExtension(""); + for (int i = 1; i < INT_MAX ;++i) { + // Append digit to filename and re-add extension + string const new_fn = tmp.absFileName() + convert(i) + + "." + tempfile.extension(); + if (tmp_names_.find(new_fn) == tmp_names_.end()) { + tmp_names_.insert(new_fn); + tempfile.set(new_fn); + return tempfile; + } + } + + // This should not happen! + LYXERR0("tempFileName(): Could not create unique temp file name!"); + return tempfile; +} + + +void removeTempFile(FileName const & fn) +{ + if (!fn.exists()) + return; + + string const abs = fn.absFileName(); + if (tmp_names_.find(abs) != tmp_names_.end()) + tmp_names_.erase(abs); + fn.removeFile(); +} + + static string createTempFile(QString const & mask) { // FIXME: This is not safe. QTemporaryFile creates a file in open(), @@ -466,7 +513,7 @@ static string createTempFile(QString const & mask) // same file again. To make this safe the QTemporaryFile object // needs to be kept for the whole life time of the temp file name. // This could be achieved by creating a class TempDir (like - // TempFile, but using a currentlky non-existing + // TempFile, but using a currently non-existing // QTemporaryDirectory object). QTemporaryFile qt_tmp(mask + ".XXXXXXXXXXXX"); if (qt_tmp.open()) { diff --git a/src/support/filetools.h b/src/support/filetools.h index 0146474d07..3a4c2c566d 100644 --- a/src/support/filetools.h +++ b/src/support/filetools.h @@ -16,12 +16,35 @@ #include #include +#include namespace lyx { namespace support { class FileName; +/// Record used temp file names +static std::set tmp_names_; + +/// Get a temporary file name. +/** +* The actual temp file (QTemporaryFile object) is immediately +* destroyed after the name has been generated, so a new file +* has to be created manually from the name. +* This is needed if the temp file has to be manually removed +* (e.g., when temp files are used as conversion target, and the initial +* file only serves as a placeholder), since QTemporaryFile objects +* cannot be manually removed at least on Windows (they are always +* kept open internally even after close()). +* In order to avoid race conditions due to duplicate names, we record +* all used temp file names. +* If you don't have to remove the temp file manually, use TempFile instead! +*/ +FileName const tempFileName(std::string const &); + +/// Remove and unregister a temporary file. +void removeTempFile(FileName const &); + /** Creates the global LyX temp dir. \p deflt can be an existing directory name. In this case a new directory inside \p deflt is created. If \p deflt does not exist yet, \p deflt is From 84658d37e2eb1358c054ad41f3032f2b3684497f Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Thu, 8 Feb 2018 12:16:30 +0100 Subject: [PATCH 13/40] Remove createTempFile method and use the new and safer tempFileName() method instead for the creation of temporary directories --- src/support/filetools.cpp | 39 +++++++++++---------------------------- src/support/filetools.h | 2 +- 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp index bcfd1b6c9e..7bff99dcd1 100644 --- a/src/support/filetools.cpp +++ b/src/support/filetools.cpp @@ -40,7 +40,6 @@ #include "support/TempFile.h" #include -#include #include "support/lassert.h" #include "support/regex.h" @@ -460,7 +459,7 @@ string const commandPrep(string const & command_in) } -FileName const tempFileName(string const & mask) +FileName const tempFileName(string const & mask, bool const dir) { FileName tempfile = TempFile(mask).name(); // Since the QTemporaryFile object is destroyed at function return @@ -475,11 +474,16 @@ FileName const tempFileName(string const & mask) // OK, we need another name. Simply append digits. FileName tmp = tempfile; - tmp.changeExtension(""); + string ext; + if (!dir) { + // Store and remove extensions + ext = "." + tempfile.extension(); + tmp.changeExtension(""); + } for (int i = 1; i < INT_MAX ;++i) { // Append digit to filename and re-add extension - string const new_fn = tmp.absFileName() + convert(i) - + "." + tempfile.extension(); + string const new_fn = + tmp.absFileName() + convert(i) + ext; if (tmp_names_.find(new_fn) == tmp_names_.end()) { tmp_names_.insert(new_fn); tempfile.set(new_fn); @@ -505,35 +509,14 @@ void removeTempFile(FileName const & fn) } -static string createTempFile(QString const & mask) -{ - // FIXME: This is not safe. QTemporaryFile creates a file in open(), - // but the file is deleted when qt_tmp goes out of scope. - // Therefore the next call to createTempFile() may create the - // same file again. To make this safe the QTemporaryFile object - // needs to be kept for the whole life time of the temp file name. - // This could be achieved by creating a class TempDir (like - // TempFile, but using a currently non-existing - // QTemporaryDirectory object). - QTemporaryFile qt_tmp(mask + ".XXXXXXXXXXXX"); - if (qt_tmp.open()) { - string const temp_file = fromqstr(qt_tmp.fileName()); - LYXERR(Debug::FILES, "Temporary file `" << temp_file << "' created."); - return temp_file; - } - LYXERR(Debug::FILES, "Unable to create temporary file with following template: " - << qt_tmp.fileTemplate()); - return string(); -} - - static FileName createTmpDir(FileName const & tempdir, string const & mask) { LYXERR(Debug::FILES, "createTmpDir: tempdir=`" << tempdir << "'\n" << "createTmpDir: mask=`" << mask << '\''); QFileInfo tmp_fi(QDir(toqstr(tempdir.absFileName())), toqstr(mask)); - FileName const tmpfl(createTempFile(tmp_fi.absoluteFilePath())); + FileName const tmpfl = + tempFileName(fromqstr(tmp_fi.absoluteFilePath()) + ".XXXXXXXXXXXX", true); if (tmpfl.empty() || !tmpfl.createDirectory(0700)) { LYXERR0("LyX could not create temporary directory in " << tempdir diff --git a/src/support/filetools.h b/src/support/filetools.h index 3a4c2c566d..6a9abc1eeb 100644 --- a/src/support/filetools.h +++ b/src/support/filetools.h @@ -40,7 +40,7 @@ static std::set tmp_names_; * all used temp file names. * If you don't have to remove the temp file manually, use TempFile instead! */ -FileName const tempFileName(std::string const &); +FileName const tempFileName(std::string const &, bool const dir = false); /// Remove and unregister a temporary file. void removeTempFile(FileName const &); From 2f6ada6644614df5f402efc7cbc1d27911b45376 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Thu, 8 Feb 2018 13:25:19 +0100 Subject: [PATCH 14/40] Consider class-provided citation engines Do not attempt to load, nor allow to set, a different engine in this case. Fixes: #11022 --- src/BufferParams.cpp | 6 +++++- src/LaTeXFeatures.cpp | 12 ++++++++++-- src/frontends/qt4/GuiDocument.cpp | 24 ++++++++++++++++++++++++ src/frontends/qt4/GuiDocument.h | 2 ++ 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 8cb0c2cae6..15de3388d6 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -2322,7 +2322,11 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, } // ... but before biblatex (see #7065) - if (features.mustProvide("biblatex")) { + if (features.mustProvide("biblatex") + && !features.isProvided("biblatex-natbib") + && !features.isProvided("natbib-internal") + && !features.isProvided("natbib") + && !features.isProvided("jurabib")) { string delim = ""; string opts; os << "\\usepackage"; diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp index 78c3e5a5e8..281d30df86 100644 --- a/src/LaTeXFeatures.cpp +++ b/src/LaTeXFeatures.cpp @@ -1231,7 +1231,11 @@ string const LaTeXFeatures::getPackages() const // Some classes load natbib themselves, but still allow (or even require) // plain numeric citations (ReVTeX is such a case, see bug 5182). // This special case is indicated by the "natbib-internal" key. - if (mustProvide("natbib") && !isProvided("natbib-internal")) { + if (mustProvide("natbib") + && !isProvided("natbib-internal") + && !isProvided("biblatex") + && !isProvided("biblatex-natbib") + && !isProvided("jurabib")) { packages << "\\usepackage["; if (params_.citeEngineType() == ENGINE_TYPE_NUMERICAL) packages << "numbers"; @@ -1250,7 +1254,11 @@ string const LaTeXFeatures::getPackages() const } // jurabib -- we need version 0.6 at least. - if (mustProvide("jurabib")) { + if (mustProvide("jurabib") + && !isProvided("natbib-internal") + && !isProvided("natbib") + && !isProvided("biblatex") + && !isProvided("biblatex-natbib")) { packages << "\\usepackage"; if (!params_.biblio_opts.empty()) packages << '[' << params_.biblio_opts << ']'; diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index 89437d1d06..85318bc7f0 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -2445,6 +2445,28 @@ void GuiDocument::biblioChanged() } +void GuiDocument::checkPossibleCiteEngines() +{ + // Check if the class provides a specific engine, + // and if so, enforce this. + string force_engine; + if (documentClass().provides("natbib") + || documentClass().provides("natbib-internal")) + force_engine = "natbib"; + else if (documentClass().provides("jurabib")) + force_engine = "jurabib"; + else if (documentClass().provides("biblatex")) + force_engine = "biblatex"; + else if (documentClass().provides("biblatex-natbib")) + force_engine = "biblatex-natbib"; + + if (!force_engine.empty()) + biblioModule->citeEngineCO->setCurrentIndex( + biblioModule->citeEngineCO->findData(toqstr(force_engine))); + biblioModule->citeEngineCO->setEnabled(force_engine.empty()); +} + + void GuiDocument::rescanBibFiles() { if (isBiblatex()) @@ -3326,6 +3348,8 @@ void GuiDocument::paramsToDialog() updateEngineType(documentClass().opt_enginetype(), bp_.citeEngineType()); + checkPossibleCiteEngines(); + biblioModule->citeStyleCO->setCurrentIndex( biblioModule->citeStyleCO->findData(bp_.citeEngineType())); diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h index be1b7e489f..1fe1dc74a1 100644 --- a/src/frontends/qt4/GuiDocument.h +++ b/src/frontends/qt4/GuiDocument.h @@ -296,6 +296,8 @@ private Q_SLOTS: /// bool isBiblatex() const; /// + void checkPossibleCiteEngines(); + /// BufferParams bp_; /// List of names of available modules std::list moduleNames_; From 9987adb2a76413d819efc2a113745ceb5e272f6f Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Thu, 8 Feb 2018 17:00:41 +0100 Subject: [PATCH 15/40] Revert "Mark follow-up paragraphs in a paragraph group as nested." This reverts commit 761a542551bc944c0efef0d123c2b71631d2652a. --- src/RowPainter.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp index d2dc86a839..f093805213 100644 --- a/src/RowPainter.cpp +++ b/src/RowPainter.cpp @@ -273,13 +273,7 @@ void RowPainter::paintAppendix() const void RowPainter::paintDepthBar() const { - depth_type depth = par_.getDepth(); - - // We also mark follow-up paragraphs in a paragraph group - if (par_.layout().isParagraphGroup() - && par_.layout().labeltype == LABEL_STATIC - && !text_.isFirstInSequence(row_.pit())) - ++depth; + depth_type const depth = par_.getDepth(); if (depth <= 0) return; @@ -290,11 +284,6 @@ void RowPainter::paintDepthBar() const if (row_.pos() == 0) --pit2; prev_depth = pars_[pit2].getDepth(); - // We also mark follow-up paragraphs in a paragraph group - if (pars_[pit2].layout().isParagraphGroup() - && pars_[pit2].layout().labeltype == LABEL_STATIC - && !text_.isFirstInSequence(pit2)) - ++prev_depth; } depth_type next_depth = 0; @@ -303,11 +292,6 @@ void RowPainter::paintDepthBar() const if (row_.endpos() >= pars_[pit2].size()) ++pit2; next_depth = pars_[pit2].getDepth(); - // We also mark follow-up paragraphs in a paragraph group - if (pars_[pit2].layout().isParagraphGroup() - && pars_[pit2].layout().labeltype == LABEL_STATIC - && !text_.isFirstInSequence(pit2)) - ++next_depth; } for (depth_type i = 1; i <= depth; ++i) { From 6e4e0869006aa4c225162164aaa14a70d041facf Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Thu, 8 Feb 2018 19:06:35 +0100 Subject: [PATCH 16/40] Reset cur.pit() when pasting into tables. The number of paragraphs can change here, so pit() can become invalid. Fixes: #9983 --- src/insets/InsetTabular.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index bc0d0ae3c6..f9503c7124 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -6174,6 +6174,7 @@ bool InsetTabular::pasteClipboard(Cursor & cur) inset->setChange(Change(buffer().params().track_changes ? Change::INSERTED : Change::UNCHANGED)); cur.pos() = 0; + cur.pit() = 0; } } return true; From b88ed81e7f1d2f59bb606351d95e093380b4eead Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Thu, 8 Feb 2018 21:33:37 +0100 Subject: [PATCH 17/40] Unify graphics-groups inside marked block functionality. Fixes #11026. https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg203683.html --- lib/ui/stdcontext.inc | 1 + src/BufferView.cpp | 45 +++++++++++++++++++++++++++++++++++++++++++ src/FuncCode.h | 3 ++- src/LyXAction.cpp | 11 +++++++++++ 4 files changed, 59 insertions(+), 1 deletion(-) diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc index 3e490927be..9acf334562 100644 --- a/lib/ui/stdcontext.inc +++ b/lib/ui/stdcontext.inc @@ -358,6 +358,7 @@ Menuset Item "Apply Last Text Style|A" "textstyle-apply" Submenu "Text Style|x" "edit_textstyles" Item "Paragraph Settings...|P" "layout-paragraph" + OptItem "Unify Graphics Groups|U" "graphics-unify" LanguageSelector Separator Item "Fullscreen Mode" "ui-toggle fullscreen" diff --git a/src/BufferView.cpp b/src/BufferView.cpp index b2e3186b17..ad8ed46e58 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -1151,6 +1151,10 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag) flag.setEnabled(true); break; + case LFUN_GRAPHICS_UNIFY: + flag.setEnabled(cur.selection()); + break; + case LFUN_WORD_FINDADV: { FindAndReplaceOptions opt; istringstream iss(to_utf8(cmd.argument())); @@ -1697,6 +1701,47 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) break; } + case LFUN_GRAPHICS_UNIFY: { + + cur.recordUndoFullBuffer(); + + DocIterator from, to; + from = cur.selectionBegin(); + to = cur.selectionEnd(); + + string newId = cmd.getArg(0); + bool fetchId=newId.empty(); //if we wait for groupId from first graphics inset + + InsetGraphicsParams grp_par; + InsetGraphics::string2params(graphics::getGroupParams(buffer_, newId), buffer_, grp_par); + + if (!from.nextInset()) //move to closest inset + from.forwardInset(); + + while (!from.empty() && from < to) { + Inset * inset = from.nextInset(); + if (!inset) + break; + if (inset->lyxCode() == GRAPHICS_CODE) { + InsetGraphics * ig = inset->asInsetGraphics(); + if (!ig) + break; + InsetGraphicsParams inspar = ig->getParams(); + if (fetchId) { + grp_par = inspar; + fetchId = false; + + } else { + grp_par.filename = inspar.filename; + ig->setParams(grp_par); + } + } + from.forwardInset(); + } + dr.screenUpdate(Update::Force); //needed if triggered from context menu + break; + } + case LFUN_STATISTICS: { DocIterator from, to; if (cur.selection()) { diff --git a/src/FuncCode.h b/src/FuncCode.h index 4a5983147d..cce61f0df5 100644 --- a/src/FuncCode.h +++ b/src/FuncCode.h @@ -476,7 +476,8 @@ enum FuncCode LFUN_DEVEL_MODE_TOGGLE, // lasgouttes 20170723 //370 LFUN_EXPORT_CANCEL, // rgh, 20171227 - LFUN_BUFFER_ANONYMIZE, // sanda, 20180201 + LFUN_BUFFER_ANONYMIZE, // sanda, 20180201 + LFUN_GRAPHICS_UNIFY, // sanda, 20180207 LFUN_LASTACTION // end of the table }; diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index 193c822cd2..a4bc7d1fad 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -3555,6 +3555,17 @@ void LyXAction::init() */ { LFUN_SET_GRAPHICS_GROUP, "set-graphics-group", Noop, Edit }, +/*! + * \var lyx::FuncCode lyx::LFUN_GRAPHICS_UNIFY + * \li Action: Set the same group for all graphics insets in the marked block. + * \li Syntax: graphics-unify [] + * \li Params: : Id for an existing group. In case the Id is an empty string, + the group Id from the first graphics inset will be used. + * \li Origin: sanda, 7 Feb 2018 + * \endvar + */ + { LFUN_GRAPHICS_UNIFY, "graphics-unify", Noop, Edit }, + /*! * \var lyx::FuncCode lyx::LFUN_SPACE_INSERT From 6e1ca3a4f203bba6141dfdf639ea618fbcee4808 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Thu, 8 Feb 2018 21:53:08 +0100 Subject: [PATCH 18/40] Group similar lfuns. --- src/LyXAction.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index a4bc7d1fad..5df0790182 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -1854,15 +1854,6 @@ void LyXAction::init() */ { LFUN_FORWARD_SEARCH, "forward-search", ReadOnly, System }, -/*! - * \var lyx::FuncCode lyx::LFUN_GRAPHICS_RELOAD - * \li Action: Reloads the image if necessary. - * \li Syntax: graphics-reload - * \li Origin: vfr, 10 Aug 2009 - * \endvar - */ - { LFUN_GRAPHICS_RELOAD, "graphics-reload", ReadOnly | AtPoint, Edit }, - /*! * \var lyx::FuncCode lyx::LFUN_HELP_OPEN * \li Action: Open the given help file according to the language setting. @@ -3566,6 +3557,14 @@ void LyXAction::init() */ { LFUN_GRAPHICS_UNIFY, "graphics-unify", Noop, Edit }, +/*! + * \var lyx::FuncCode lyx::LFUN_GRAPHICS_RELOAD + * \li Action: Reloads the image if necessary. + * \li Syntax: graphics-reload + * \li Origin: vfr, 10 Aug 2009 + * \endvar + */ + { LFUN_GRAPHICS_RELOAD, "graphics-reload", ReadOnly | AtPoint, Edit }, /*! * \var lyx::FuncCode lyx::LFUN_SPACE_INSERT From b7caaf61961db2ab76c7f572b4a51ad730eb422e Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Thu, 8 Feb 2018 21:59:41 +0100 Subject: [PATCH 19/40] Proper naming of LFUN_SET_GRAPHICS_GROUP. --- lib/RELEASE-NOTES | 2 ++ src/FuncCode.h | 2 +- src/LyXAction.cpp | 6 +++--- src/Text3.cpp | 4 ++-- src/frontends/qt4/Menus.cpp | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES index e4dcd2401b..66aa5615f5 100644 --- a/lib/RELEASE-NOTES +++ b/lib/RELEASE-NOTES @@ -33,6 +33,8 @@ LFUN_EXPORT_CANCEL: Used to cancel background export processes. !!!The following LyX functions have been changed in 2.4: +- LFUN_SET_GRAPHICS_GROUP was renamed into LFUN_GRAPHICS_SET_GROUP. + !!!The following LyX documents have been moved in 2.4: diff --git a/src/FuncCode.h b/src/FuncCode.h index cce61f0df5..6d2839ab07 100644 --- a/src/FuncCode.h +++ b/src/FuncCode.h @@ -404,7 +404,7 @@ enum FuncCode LFUN_COMPLETE, // 310 LFUN_COMPLETION_COMPLETE, - LFUN_SET_GRAPHICS_GROUP, + LFUN_GRAPHICS_SET_GROUP, LFUN_COMPLETION_CANCEL, LFUN_COMPLETION_ACCEPT, LFUN_COMMAND_ALTERNATIVES, diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index 5df0790182..dc930568cd 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -3536,15 +3536,15 @@ void LyXAction::init() { LFUN_SET_COLOR, "set-color", ReadOnly | NoBuffer, System }, /*! - * \var lyx::FuncCode lyx::LFUN_SET_GRAPHICS_GROUP + * \var lyx::FuncCode lyx::LFUN_GRAPHICS_SET_GROUP * \li Action: Set the group for the graphics inset on the cursor position. - * \li Syntax: set-graphics-group [] + * \li Syntax: graphics-set-group [] * \li Params: : Id for an existing group. In case the Id is an empty string, the graphics inset is removed from the current group. * \li Origin: sanda, 6 May 2008 * \endvar */ - { LFUN_SET_GRAPHICS_GROUP, "set-graphics-group", Noop, Edit }, + { LFUN_GRAPHICS_SET_GROUP, "graphics-set-group", Noop, Edit }, /*! * \var lyx::FuncCode lyx::LFUN_GRAPHICS_UNIFY diff --git a/src/Text3.cpp b/src/Text3.cpp index 04b00e7dc6..d811616eaa 100644 --- a/src/Text3.cpp +++ b/src/Text3.cpp @@ -1312,7 +1312,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) break; } - case LFUN_SET_GRAPHICS_GROUP: { + case LFUN_GRAPHICS_SET_GROUP: { InsetGraphics * ins = graphics::getCurrentGraphicsInset(cur); if (!ins) break; @@ -3254,7 +3254,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, enable = cur.paragraph().isPassThru(); break; - case LFUN_SET_GRAPHICS_GROUP: { + case LFUN_GRAPHICS_SET_GROUP: { InsetGraphics * ins = graphics::getCurrentGraphicsInset(cur); if (!ins) enable = false; diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp index d08517f00b..eac4f578c3 100644 --- a/src/frontends/qt4/Menus.cpp +++ b/src/frontends/qt4/Menus.cpp @@ -803,10 +803,10 @@ void MenuDefinition::expandGraphicsGroups(BufferView const * bv) set::const_iterator it = grp.begin(); set::const_iterator end = grp.end(); add(MenuItem(MenuItem::Command, qt_("No Group"), - FuncRequest(LFUN_SET_GRAPHICS_GROUP))); + FuncRequest(LFUN_GRAPHICS_SET_GROUP))); for (; it != end; ++it) { addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(*it) + '|', - FuncRequest(LFUN_SET_GRAPHICS_GROUP, *it))); + FuncRequest(LFUN_GRAPHICS_SET_GROUP, *it))); } } From f15cb2c40dd84f3470e8f64f7062fb72068fb11d Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Thu, 8 Feb 2018 23:33:54 +0100 Subject: [PATCH 20/40] Update sk.po --- po/sk.po | 164 +++++++++++++++++++++++++++---------------------------- 1 file changed, 79 insertions(+), 85 deletions(-) diff --git a/po/sk.po b/po/sk.po index fa74269194..4265c1db04 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX-2.4\n" "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n" -"POT-Creation-Date: 2018-01-01 14:08+0100\n" -"PO-Revision-Date: 2018-01-01 13:14+0000\n" +"POT-Creation-Date: 2018-02-08 23:23+0100\n" +"PO-Revision-Date: 2018-02-08 22:31+0000\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -1093,6 +1093,11 @@ msgstr "" "Vynúti veľké prvé písmená v menách (\"Del Piero\", miesto \"del Piero\"), " "keď to aktuálny štýl citácie podporuje." +#: src/frontends/qt4/GuiCitation.cpp:314 +msgid "Force upper case in names (\"Del Piero\", not \"del Piero\")." +msgstr "" +"Vynúti veľké prvé písmená v menách (\"Del Piero\", miesto \"del Piero\")." + #: src/frontends/qt4/ui/CitationUi.ui:391 msgid "Force upcas&ing" msgstr "Vynútiť v&eľké písmo" @@ -5530,30 +5535,6 @@ msgstr "Vnútiť plný titul" msgid "Use full title even if shorttitle exists" msgstr "Použiť plný titul aj keď krátky titul existuje" -#: lib/citeengines/biblatex-natbib.citeengine:152 -#: lib/citeengines/biblatex.citeengine:144 -#: lib/citeengines/jurabib.citeengine:129 lib/citeengines/natbib.citeengine:123 -msgid " et al." -msgstr " a kol." - -#: lib/citeengines/biblatex-natbib.citeengine:153 -#: lib/citeengines/biblatex.citeengine:145 -#: lib/citeengines/natbib.citeengine:124 lib/layouts/stdciteformats.inc:27 -msgid ", [[separate author names in citation, except for last name]]" -msgstr ", " - -#: lib/citeengines/biblatex-natbib.citeengine:154 -#: lib/citeengines/biblatex.citeengine:146 -#: lib/citeengines/natbib.citeengine:125 lib/layouts/stdciteformats.inc:28 -msgid ", and [[separate name of last author in citation]]" -msgstr ", a " - -#: lib/citeengines/biblatex-natbib.citeengine:155 -#: lib/citeengines/biblatex.citeengine:147 -#: lib/citeengines/natbib.citeengine:126 lib/layouts/stdciteformats.inc:29 -msgid " and [[separate two authors in citation]]" -msgstr " a " - #: lib/citeengines/biblatex-natbib.citeengine:299 #: lib/citeengines/biblatex.citeengine:283 msgid "Super" @@ -5615,12 +5596,6 @@ msgstr "pred" msgid "short title" msgstr "krátky titul" -#: lib/citeengines/jurabib.citeengine:130 -#: lib/citeengines/jurabib.citeengine:131 -#: lib/citeengines/jurabib.citeengine:132 -msgid "/" -msgstr "/" - #: lib/citeengines/natbib.citeengine:2 msgid "Natbib (BibTeX)" msgstr "Natbib (BibTeX)" @@ -9177,12 +9152,12 @@ msgstr "Členenie" msgid "Mode" msgstr "Mód" -#: lib/layouts/beamer.layout:209 lib/layouts/beamer.layout:263 -#: lib/layouts/beamer.layout:295 lib/layouts/beamer.layout:324 -#: lib/layouts/beamer.layout:356 lib/layouts/beamer.layout:385 -#: lib/layouts/beamer.layout:417 +#: lib/layouts/beamer.layout:209 lib/layouts/beamer.layout:264 +#: lib/layouts/beamer.layout:297 lib/layouts/beamer.layout:326 +#: lib/layouts/beamer.layout:359 lib/layouts/beamer.layout:388 +#: lib/layouts/beamer.layout:421 msgid "Mode Specification|S" -msgstr "Špecifikácie Módu|k" +msgstr "Špecifikácie Módu|f" #: lib/layouts/beamer.layout:210 lib/layouts/beamer.layout:264 #: lib/layouts/beamer.layout:296 lib/layouts/beamer.layout:325 @@ -15265,30 +15240,6 @@ msgstr "POĎAKOVANIA" msgid "UNDEFINED" msgstr "NEDEFINOVANÉ" -#: lib/layouts/stdciteformats.inc:20 -msgid "pp." -msgstr "str." - -#: lib/layouts/stdciteformats.inc:21 -msgid "ed." -msgstr "vyd." - -#: lib/layouts/stdciteformats.inc:22 -msgid "eds." -msgstr "eds." - -#: lib/layouts/stdciteformats.inc:23 -msgid "vol." -msgstr "diel" - -#: lib/layouts/stdciteformats.inc:24 -msgid "no." -msgstr "č." - -#: lib/layouts/stdciteformats.inc:25 -msgid "in" -msgstr "v" - #: lib/layouts/stdcounters.inc:9 msgid "\\Roman{part}" msgstr "\\Roman{part}" @@ -17473,6 +17424,10 @@ msgstr "Times Roman (New TX)" msgid "Unicode (utf8)" msgstr "Unicode (utf8)" +#: lib/ui/stdcontext.inc:361 +msgid "Unify Graphics Groups|U" +msgstr "Zjednotiť Skupinu Obrázkov|Z" + #: lib/encodings:55 msgid "Unicode (ucs-extended) (utf8x)" msgstr "Unicode (ucs-rozšírenie) (utf8x)" @@ -18546,7 +18501,7 @@ msgstr "Nový|N" #: lib/ui/stdmenus.inc:46 msgid "New from Template...|m" -msgstr "Nový zo šablóny…|b" +msgstr "Nový zo Šablóny…|b" #: lib/ui/stdmenus.inc:47 msgid "Open...|O" @@ -18554,7 +18509,7 @@ msgstr "Otvoriť…|O" #: lib/ui/stdmenus.inc:48 msgid "Open Recent|t" -msgstr "Otvoriť nedávne|d" +msgstr "Otvoriť Nedávne|d" #: lib/ui/stdmenus.inc:50 msgid "Close|C" @@ -18562,7 +18517,7 @@ msgstr "Zavrieť|Z" #: lib/ui/stdmenus.inc:51 msgid "Close All" -msgstr "Zavrieť všetko" +msgstr "Zavrieť Všetko" #: lib/ui/stdmenus.inc:52 msgid "Save|S" @@ -18570,15 +18525,15 @@ msgstr "Uložiť|l" #: lib/ui/stdmenus.inc:53 msgid "Save As...|A" -msgstr "Uložiť ako…|a" +msgstr "Uložiť Ako…|A" #: lib/ui/stdmenus.inc:54 msgid "Save All|l" -msgstr "Uložiť všetko|v" +msgstr "Uložiť Všetko|V" #: lib/ui/stdmenus.inc:55 msgid "Revert to Saved|R" -msgstr "Vrátiť na uložené|t" +msgstr "Vrátiť na Uložené|t" #: lib/ui/stdmenus.inc:56 msgid "Version Control|V" @@ -18598,11 +18553,11 @@ msgstr "Fax…|F" #: lib/ui/stdmenus.inc:62 msgid "New Window|W" -msgstr "Nové okno|é" +msgstr "Nové Okno|k" #: lib/ui/stdmenus.inc:63 msgid "Close Window|d" -msgstr "Zavrieť okno|r" +msgstr "Zavrieť Okno|r" #: lib/ui/stdmenus.inc:65 msgid "Exit|x" @@ -19716,6 +19671,14 @@ msgstr "Vložiť plávajúcu tabuľku" msgid "Insert label" msgstr "Vložiť značku" +#: lib/ui/stdtoolbars.inc:471 +msgid "Insert left side scripts (sidesetl)" +msgstr "Vložiť skripty na ľavej strane (sidesetl)" + +#: lib/ui/stdtoolbars.inc:469 +msgid "Insert left/right side scripts (sideset)" +msgstr "Vložiť skripty na ľavej/pravej strane (sideset)" + #: lib/ui/stdtoolbars.inc:124 msgid "Insert cross-reference" msgstr "Vložiť krížovú referenciu" @@ -19896,6 +19859,10 @@ msgstr "Vložiť druhú odmocninu" msgid "Insert root" msgstr "Vložiť odmocninu" +#: lib/ui/stdtoolbars.inc:472 +msgid "Insert side scripts (sidesetn)" +msgstr "Vložiť skripty na boku (sidesetn)" + #: lib/ui/stdtoolbars.inc:183 msgid "Insert standard fraction" msgstr "Vložiť zlomok" @@ -19912,6 +19879,10 @@ msgstr "Vložiť integrál" msgid "Insert product" msgstr "Vložiť súčin" +#: lib/ui/stdtoolbars.inc:470 +msgid "Insert right side scripts (sidesetr)" +msgstr "Vložiť skripty na pravej strane (sidesetr)" + #: lib/ui/stdtoolbars.inc:188 msgid "Insert ( )" msgstr "Vložiť ( )" @@ -20706,22 +20677,6 @@ msgstr "preškrtnúť (s 'X')" msgid "cancelto" msgstr "preškrtnúť až po" -#: lib/ui/stdtoolbars.inc:468 -msgid "Insert left/right side scripts" -msgstr "Vložiť bočné formuly" - -#: lib/ui/stdtoolbars.inc:469 -msgid "Insert right side scripts" -msgstr "Pridať formuly na pravej strane" - -#: lib/ui/stdtoolbars.inc:470 -msgid "Insert left side scripts" -msgstr "Pridať formuly na ľavej strane" - -#: lib/ui/stdtoolbars.inc:471 -msgid "Insert side scripts" -msgstr "Vložiť bočné formuly" - #: lib/ui/stdtoolbars.inc:472 msgid "overset" msgstr "overset" @@ -33659,6 +33614,33 @@ msgstr "" msgid "Unknown user" msgstr "Neznámy používateľ" +#~ msgid " et al." +#~ msgstr " a kol." + +#~ msgid ", [[separate author names in citation, except for last name]]" +#~ msgstr ", " + +#~ msgid ", and [[separate name of last author in citation]]" +#~ msgstr ", a " + +#~ msgid " and [[separate two authors in citation]]" +#~ msgstr " a " + +#~ msgid "pp." +#~ msgstr "str." + +#~ msgid "ed." +#~ msgstr "vyd." + +#~ msgid "vol." +#~ msgstr "diel" + +#~ msgid "no." +#~ msgstr "č." + +#~ msgid "in" +#~ msgstr "v" + #~ msgid "Use the minted package instead of the listings one" #~ msgstr "Použiť minted balík namiesto balíka listings" @@ -38098,3 +38080,15 @@ msgstr "Neznámy používateľ" #~ "vykonávať v mene užívateľa ľubovoľné akcie, vrátane nebezpečné ako napr. " #~ "zmazanie súborov. Keď je napr. inštruovaný robiť to zlovoľne vyrobeným " #~ "lyx dokumentom.

" + +#~ msgid "Insert left/right side scripts" +#~ msgstr "Vložiť bočné formuly" + +#~ msgid "Insert right side scripts" +#~ msgstr "Pridať formuly na pravej strane" + +#~ msgid "Insert left side scripts" +#~ msgstr "Pridať formuly na ľavej strane" + +#~ msgid "Insert side scripts" +#~ msgstr "Vložiť bočné formuly" From 398e026250f6d7d1687bdf04a8a27a61946d088f Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Fri, 9 Feb 2018 11:42:18 +0100 Subject: [PATCH 21/40] Fix child document regex in scanLogFile Several problems: * The regex failed at names such as 1_text_2_text.tex (returned "2_text.tex) * The regex failed at names such as 12_text.tex (returned "2_text.tex) * Masters with digits in the name (2018_text.tex) were tracked as their own children --- src/LaTeX.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp index f92d7be678..d7e1c3cdae 100644 --- a/src/LaTeX.cpp +++ b/src/LaTeX.cpp @@ -697,7 +697,7 @@ int LaTeX::scanLogFile(TeXErrors & terr) ifstream ifs(fn.toFilesystemEncoding().c_str()); bool fle_style = false; static regex const file_line_error(".+\\.\\D+:[0-9]+: (.+)"); - static regex const child_file(".*([0-9]+[A-Za-z]*_.+\\.tex).*"); + static regex const child_file("[^0-9]*([0-9]+[A-Za-z]*_.+\\.tex).*"); // Flag for 'File ended while scanning' message. // We need to wait for subsequent processing. string wait_for_error; @@ -732,8 +732,12 @@ int LaTeX::scanLogFile(TeXErrors & terr) string const substr = token.substr(i + 1, len); if (regex_match(substr, sub, child_file)) { string const name = sub.str(1); - child.push(make_pair(name, pnest)); - children.push_back(name); + // Sometimes also masters have a name that matches + // (if their name starts with a number and _) + if (name != file.onlyFileName()) { + child.push(make_pair(name, pnest)); + children.push_back(name); + } i += len; } } else if (token[i] == ')') { From 3cc98a9bf6ed506d04b502863d6424d36cb778b5 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Fri, 9 Feb 2018 13:23:50 +0100 Subject: [PATCH 22/40] tex2lyx: normalize bib and bst paths Fixes: #7637 --- src/tex2lyx/text.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp index f55053200b..036156927f 100644 --- a/src/tex2lyx/text.cpp +++ b/src/tex2lyx/text.cpp @@ -4414,7 +4414,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, // \nocite{*} option btprint.clear(); } - os << "bibfiles " << '"' << p.verbatim_item() << '"' << "\n"; + os << "bibfiles " << '"' << normalize_filename(p.verbatim_item()) << '"' << "\n"; // Do we have addcontentsline? if (contentslineContent == "\\refname") { BibOpts = "bibtotoc"; @@ -4424,9 +4424,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, // Do we have a bibliographystyle set? if (!bibliographystyle.empty()) { if (BibOpts.empty()) - BibOpts = bibliographystyle; + BibOpts = normalize_filename(bibliographystyle); else - BibOpts = BibOpts + ',' + bibliographystyle; + BibOpts = BibOpts + ',' + normalize_filename(bibliographystyle); // clear it because each bibtex entry has its style // and we need an empty string to handle \phantomsection bibliographystyle.clear(); From 8f86b72cf4b88ae74adc5d94f6cbb60b64b8fb28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Milde?= Date: Fri, 9 Feb 2018 16:49:23 +0100 Subject: [PATCH 23/40] lyx2lyx fixes and cleanup. Don't insert empty line when translating QuoteInsets to literal quotes. Fix regexp pattern in re/convert_dashligatures. Adjust logic in re/convert_dash(ligatur)es. --- autotests/export/lyx2lyx/lyx_2_3_test2.lyx | 50 ++++++++++++- lib/lyx2lyx/lyx_2_2.py | 56 ++++++++------- lib/lyx2lyx/lyx_2_3.py | 81 ++++++++++++---------- 3 files changed, 119 insertions(+), 68 deletions(-) diff --git a/autotests/export/lyx2lyx/lyx_2_3_test2.lyx b/autotests/export/lyx2lyx/lyx_2_3_test2.lyx index 1d19f2fb33..2740775a5a 100644 --- a/autotests/export/lyx2lyx/lyx_2_3_test2.lyx +++ b/autotests/export/lyx2lyx/lyx_2_3_test2.lyx @@ -12,7 +12,7 @@ logicalmkup \maintain_unincluded_children false \language bosnian \language_package default -\inputencoding auto +\inputencoding utf8 \fontencoding global \font_roman "cochineal" "DejaVu Serif" \font_sans "lmss" "default" @@ -295,5 +295,53 @@ y=x^{2} \end_layout +\begin_layout Description +Quote +\begin_inset space ~ +\end_inset + +insets: Plain quote insets +\begin_inset Quotes qld +\end_inset + + +\begin_inset Quotes qrd +\end_inset + + vs. + literal quotes "". +\end_layout + +\begin_deeper +\begin_layout Verbatim + +Quote insets in Verbatim: +\begin_inset Quotes cld +\end_inset + +foo +\begin_inset Quotes frd +\end_inset + + and +\begin_inset Quotes pls +\end_inset + +bar +\begin_inset Quotes prs +\end_inset + + +\end_layout + +\end_deeper \end_body \end_document diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py index 342bb06119..cb1731304e 100644 --- a/lib/lyx2lyx/lyx_2_2.py +++ b/lib/lyx2lyx/lyx_2_2.py @@ -36,7 +36,7 @@ from parser_tools import (check_token, del_complete_lines, find_end_of_inset, find_end_of_layout, find_nonempty_line, find_re, - find_token, find_token_backwards, get_containing_layout, + find_substring, find_token, find_token_backwards, get_containing_layout, get_containing_inset, get_quoted_value, get_value, is_in_inset, get_bool_value, set_bool_value) @@ -618,19 +618,18 @@ def convert_dashes(document): if document.backend != "latex": return - lines = document.body i = 0 - while i+1 < len(lines): - i += 1 - line = lines[i] - if "--" not in line: - continue + while True: + i = find_substring(document.body, "--", i+1) + if i == -1: + break + line = document.body[i] # skip label width string (bug 10243): if line.startswith("\\labelwidthstring"): continue # Do not touch hyphens in some insets: try: - value, start, end = get_containing_inset(lines, i) + value, start, end = get_containing_inset(document.body, i) except TypeError: # False means no (or malformed) containing inset value, start, end = "no inset", -1, -1 @@ -644,7 +643,7 @@ def convert_dashes(document): i = end continue try: - layout, start, end, j = get_containing_layout(lines, i) + layout, start, end, j = get_containing_layout(document.body, i) except TypeError: # no (or malformed) containing layout document.warning("Malformed LyX document: " "Can't find layout at line %d" % i) @@ -656,18 +655,18 @@ def convert_dashes(document): # Replace as LaTeX does: First try emdash, then endash line = line.replace("---", "\\threehyphens\n") line = line.replace("--", "\\twohyphens\n") - lines[i:i+1] = line.splitlines() + document.body[i:i+1] = line.split('\n') # remove ligature breaks between dashes - i = 1 - while i < len(lines): - line = lines[i] - if (line.endswith(r"-\SpecialChar \textcompwordmark{}") and - lines[i+1].startswith("-")): - lines[i] = line.replace(r"\SpecialChar \textcompwordmark{}", - lines.pop(i+1)) - else: - i += 1 + i = 0 + while True: + i = find_substring(document.body, + r"-\SpecialChar \textcompwordmark{}", i+1) + if i == -1: + break + if document.body[i+1].startswith("-"): + document.body[i] = document.body[i].replace( + r"\SpecialChar \textcompwordmark{}", document.body.pop(i+1)) def revert_dashes(document): @@ -682,19 +681,18 @@ def revert_dashes(document): r'\renewcommand{\textemdash}{---}']) # Insert ligature breaks to prevent ligation of hyphens to dashes: - lines = document.body i = 0 - while i+1 < len(lines): - i += 1 - line = lines[i] - if "--" not in line: - continue + while True: + i = find_substring(document.body, "--", i+1) + if i == -1: + break + line = document.body[i] # skip label width string (bug 10243): if line.startswith("\\labelwidthstring"): continue # do not touch hyphens in some insets (cf. convert_dashes): try: - value, start, end = get_containing_inset(lines, i) + value, start, end = get_containing_inset(document.body, i) except TypeError: # False means no (or malformed) containing inset value, start, end = "no inset", -1, -1 @@ -708,14 +706,14 @@ def revert_dashes(document): # Revert \twohyphens and \threehyphens: i = 1 - while i < len(lines): - line = lines[i] + while i < len(document.body): + line = document.body[i] if not line.endswith("hyphens"): i +=1 elif line.endswith("\\twohyphens") or line.endswith("\\threehyphens"): line = line.replace("\\twohyphens", "--") line = line.replace("\\threehyphens", "---") - lines[i] = line + lines.pop(i+1) + document.body[i] = line + document.body.pop(i+1) else: i += 1 diff --git a/lib/lyx2lyx/lyx_2_3.py b/lib/lyx2lyx/lyx_2_3.py index 7f4ceef6bd..815ac2b508 100644 --- a/lib/lyx2lyx/lyx_2_3.py +++ b/lib/lyx2lyx/lyx_2_3.py @@ -132,7 +132,6 @@ def revert_ibranches(document): continue if inverted: branch = document.body[i][20:].strip() - #document.warning(branch) if not branch in antibranches: antibranch = "Anti-" + branch while antibranch in antibranches: @@ -140,7 +139,6 @@ def revert_ibranches(document): antibranches[branch] = antibranch else: antibranch = antibranches[branch] - #document.warning(antibranch) document.body[i] = "\\begin_inset Branch " + antibranch # now we need to add the new branches to the header @@ -420,6 +418,7 @@ def revert_quotes(document): if len(words) > 1 and words[0] == "\\begin_inset" and \ ( words[1] in ["ERT", "listings"] or ( len(words) > 2 and words[2] in ["URL", "Chunk", "Sweave", "S/R"]) ): j = find_end_of_inset(document.body, i) + if j == -1: document.warning("Malformed LyX document: Can't find end of " + words[1] + " inset at line " + str(i)) i += 1 @@ -434,10 +433,10 @@ def revert_quotes(document): document.warning("Malformed LyX document: Can't find end of Quote inset at line " + str(k)) i = k continue - replace = "\"" + replace = '"' if document.body[k].endswith("s"): replace = "'" - document.body[k:l+1] = [replace] + document.body[k:l+2] = [replace] else: i += 1 continue @@ -467,7 +466,7 @@ def revert_quotes(document): replace = "\"" if document.body[k].endswith("s"): replace = "'" - document.body[k:l+1] = [replace] + document.body[k:l+2] = [replace] else: i += 1 continue @@ -498,7 +497,7 @@ def revert_quotes(document): replace = "\"" if document.body[k].endswith("s"): replace = "'" - document.body[k:l+1] = [replace] + document.body[k:l+2] = [replace] i = l @@ -602,7 +601,7 @@ def revert_plainquote(document): replace = "\"" if document.body[k].endswith("s"): replace = "'" - document.body[k:l+1] = [replace] + document.body[k:l+2] = [replace] i = l @@ -1799,13 +1798,13 @@ def convert_dashligatures(document): ['% Added by lyx2lyx', r'\renewcommand{\textendash}{--}', r'\renewcommand{\textemdash}{---}']) or None - + if use_dash_ligatures is None: # Look for dashes (Documents by LyX 2.1 or older have "\twohyphens\n" # or "\threehyphens\n" as interim representation for -- an ---.) lines = document.body has_literal_dashes = has_ligature_dashes = False - dash_pattern = re.compile(u"[\u2013\u2014]|\\twohyphens|\\threehyphens") + dash_pattern = re.compile(u".*[\u2013\u2014]|\\twohyphens|\\threehyphens") i = j = 0 while True: # skip lines without dashes: @@ -1837,13 +1836,13 @@ def convert_dashligatures(document): i = end continue - # literal dash followed by a word or no-break space: - if re.search(u"[\u2013\u2014]([\w\u00A0]|$)", + # literal dash followed by a non-white-character or no-break space: + if re.search(u"[\u2013\u2014]([\S\u00A0\u202F\u2060]|$)", line, flags=re.UNICODE): has_literal_dashes = True - # ligature dash followed by word or no-break space on next line: + # ligature dash followed by non-white-char or no-break space on next line: if (re.search(r"(\\twohyphens|\\threehyphens)", line) and - re.match(u"[\w\u00A0]", lines[i+1], flags=re.UNICODE)): + re.match(u"[\S\u00A0\u202F\u2060]", lines[i+1], flags=re.UNICODE)): has_ligature_dashes = True if has_literal_dashes and has_ligature_dashes: # TODO: insert a warning note in the document? @@ -1866,40 +1865,46 @@ def convert_dashligatures(document): def revert_dashligatures(document): """Remove font ligature settings for en- and em-dashes. - Revert conversion of \twodashes or \threedashes to literal dashes.""" + Revert conversion of \twodashes or \threedashes to literal dashes. + """ use_dash_ligatures = del_value(document.header, "\\use_dash_ligatures") if use_dash_ligatures != "true" or document.backend != "latex": return - j = 0 - new_body = [] - for i, line in enumerate(document.body): - # Skip some document parts where dashes are not converted - if (i < j) or line.startswith("\\labelwidthstring"): - new_body.append(line) + i = 0 + dash_pattern = re.compile(u".*[\u2013\u2014]") + while True: + # skip lines without dashes: + i = find_re(document.body, dash_pattern, i+1) + if i == -1: + break + line = document.body[i] + # skip label width string (see bug 10243): + if line.startswith("\\labelwidthstring"): continue - if (line.startswith("\\begin_inset ") and - line[13:].split()[0] in ["CommandInset", "ERT", "External", - "Formula", "FormulaMacro", "Graphics", "IPA", "listings"] - or line == "\\begin_inset Flex Code"): - j = find_end_of_inset(document.body, i) - if j == -1: - document.warning("Malformed LyX document: Can't find end of " - + words[1] + " inset at line " + str(i)) - new_body.append(line) + # do not touch hyphens in some insets (cf. lyx_2_2.convert_dashes): + try: + inset_type, start, end = get_containing_inset(document.body, i) + except TypeError: # no containing inset + inset_type, start, end = "no inset", -1, -1 + if (inset_type.split()[0] in + ["CommandInset", "ERT", "External", "Formula", + "FormulaMacro", "Graphics", "IPA", "listings"] + or inset_type == "Flex Code"): + i = end continue - if line == "\\begin_layout LyX-Code": - j = find_end_of_layout(document.body, i) - if j == -1: - document.warning("Malformed LyX document: " - "Can't find end of %s layout at line %d" % (words[1],i)) - new_body.append(line) + try: + layoutname, start, end, j = get_containing_layout(document.body, i) + except TypeError: # no (or malformed) containing layout + document.warning("Malformed LyX document: " + "Can't find layout at body line %d" % i) + continue + if layoutname == "LyX-Code": + i = end continue # TODO: skip replacement in typewriter fonts line = line.replace(u'\u2013', '\\twohyphens\n') line = line.replace(u'\u2014', '\\threehyphens\n') - lines = line.split('\n') - new_body.extend(line.split('\n')) - document.body = new_body + document.body[i:i+1] = line.split('\n') # redefine the dash LICRs to use ligature dashes: add_to_preamble(document, [r'\renewcommand{\textendash}{--}', r'\renewcommand{\textemdash}{---}']) From 8e8b3f610495493f4f1bff3f4a0ff48f4eab4539 Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Fri, 9 Feb 2018 23:35:33 +0100 Subject: [PATCH 24/40] Avoid an infinite loop When pasting "\big" without any following delimiter, avoid processing the same token again and again. For unknown reasons, the delim docstring turns out to always be not empty: even when it simply contains a '0' (no delimiter follows), its length is 1. Fixes bug #11027. --- src/mathed/MathParser.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mathed/MathParser.cpp b/src/mathed/MathParser.cpp index aaf8b229f8..112e62d1b2 100644 --- a/src/mathed/MathParser.cpp +++ b/src/mathed/MathParser.cpp @@ -2000,7 +2000,10 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, new InsetMathBig(t.cs(), delim))); else { cell->push_back(createInsetMath(t.cs(), buf)); - putback(); + // For some reason delim.empty() + // is always false here + if (delim.at(0)) + putback(); } } From a3ad39c770e1512c6327f537dae971bfc738ebc4 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Fri, 9 Feb 2018 23:46:14 +0100 Subject: [PATCH 25/40] Cosmetics per JMarc's suggestions. --- src/BufferView.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/BufferView.cpp b/src/BufferView.cpp index ad8ed46e58..0f4b6346d0 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -1709,11 +1709,12 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) from = cur.selectionBegin(); to = cur.selectionEnd(); - string newId = cmd.getArg(0); - bool fetchId=newId.empty(); //if we wait for groupId from first graphics inset + string const newId = cmd.getArg(0); + bool fetchId = newId.empty(); //if we wait for groupId from first graphics inset InsetGraphicsParams grp_par; - InsetGraphics::string2params(graphics::getGroupParams(buffer_, newId), buffer_, grp_par); + if (!fetchId) + InsetGraphics::string2params(graphics::getGroupParams(buffer_, newId), buffer_, grp_par); if (!from.nextInset()) //move to closest inset from.forwardInset(); @@ -1722,15 +1723,12 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) Inset * inset = from.nextInset(); if (!inset) break; - if (inset->lyxCode() == GRAPHICS_CODE) { - InsetGraphics * ig = inset->asInsetGraphics(); - if (!ig) - break; + InsetGraphics * ig = inset->asInsetGraphics(); + if (ig) { InsetGraphicsParams inspar = ig->getParams(); if (fetchId) { grp_par = inspar; fetchId = false; - } else { grp_par.filename = inspar.filename; ig->setParams(grp_par); From cc193e58209c68a428b868d70a47dd1dac260eda Mon Sep 17 00:00:00 2001 From: Guillaume MM Date: Sat, 10 Feb 2018 01:20:47 +0100 Subject: [PATCH 26/40] Properly clear selection when inputting a composed character We use the standard way to input chars, which may solve other problems if any. Properly handle surrogate pairs. --- README.md | 1 + src/frontends/qt4/GuiWorkArea.cpp | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index dae097d881..cf836b5ee9 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,7 @@ For a complete list of changes try * Properly enforce scrolling boundaries. * Properly reset references and counters when updating citations. * Fix visual ambiguity between nested pars and continues environments. (#10978) +* Properly reset selection when inputting a composed character. ## Minor enhancements diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp index 7e7f74e1be..1c29033a83 100644 --- a/src/frontends/qt4/GuiWorkArea.cpp +++ b/src/frontends/qt4/GuiWorkArea.cpp @@ -1312,21 +1312,24 @@ void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e) LYXERR(Debug::KEY, "preeditString: " << e->preeditString() << " commitString: " << e->commitString()); - // insert the processed text in the document (handles undo) + // insert the processed text in the document asynchronously if (!e->commitString().isEmpty()) { - d->buffer_view_->cursor().beginUndoGroup(); - d->buffer_view_->cursor().insert(qstring_to_ucs4(e->commitString())); - d->buffer_view_->updateMetrics(); - d->buffer_view_->cursor().endUndoGroup(); - viewport()->update(); + QVector input = e->commitString().toUcs4(); + for (int i = 0; i < input.size(); i++) { + QKeyEvent const ev(QEvent::KeyPress, 0, Qt::NoModifier, + QString::fromUcs4(input.data() + i, 1)); + KeySymbol sym; + setKeySymbol(&sym, &ev); + Q_EMIT compressKeySym(sym, NoModifier, false); + } + } else { + // Hide the caret during the test transformation. + if (e->preeditString().isEmpty()) + startBlinkingCaret(); + else + stopBlinkingCaret(); } - // Hide the caret during the test transformation. - if (e->preeditString().isEmpty()) - startBlinkingCaret(); - else - stopBlinkingCaret(); - if (d->preedit_string_.empty() && e->preeditString().isEmpty()) { // Nothing to do e->accept(); From 4311571b9de840cf91adcb8b96cda35b20a0bdfd Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sat, 10 Feb 2018 08:21:48 +0100 Subject: [PATCH 27/40] Fix Windows compiler warning about double declaration of "it" See #10912 --- src/CutAndPaste.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 0f6b18d257..92d6d95789 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -816,11 +816,11 @@ void switchBetweenClasses(DocumentClassConstPtr oldone, // character styles and hidden table cells InsetIterator const i_end = inset_iterator_end(in); - for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) { - InsetCode const code = it->lyxCode(); + for (InsetIterator iit = inset_iterator_begin(in); iit != i_end; ++iit) { + InsetCode const code = iit->lyxCode(); if (code == FLEX_CODE) { // FIXME: Should we verify all InsetCollapsible? - docstring const layoutName = it->layoutName(); + docstring const layoutName = iit->layoutName(); docstring const & n = newone->insetLayout(layoutName).name(); bool const is_undefined = n.empty() || n == DocumentClass::plainInsetLayout().name(); @@ -841,14 +841,14 @@ void switchBetweenClasses(DocumentClassConstPtr oldone, // To warn the user that something had to be done. errorlist.push_back(ErrorItem( _("Undefined flex inset"), s, - {it.paragraph().id(), it.pos()}, - {it.paragraph().id(), it.pos()+1})); + {iit.paragraph().id(), iit.pos()}, + {iit.paragraph().id(), iit.pos() + 1})); } else if (code == TABULAR_CODE) { // The recursion above does not catch paragraphs in "hidden" cells, // i.e., ones that are part of a multirow or multicolum. So we need // to handle those separately. // This is the cause of bug #9049. - InsetTabular * table = it->asInsetTabular(); + InsetTabular * table = iit->asInsetTabular(); table->setLayoutForHiddenCells(newtc); } } From 454f56b5f22e6a6e8d2f3ee41a33d1fdee034e4e Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sat, 10 Feb 2018 11:21:08 +0100 Subject: [PATCH 28/40] Cmake build: Allow cross-compiling with mingw again 1.) The check for "QT_USES_X11" expects the created application to run, but the '.exe' file does not run on linux. 2.) Don't use megered build anymore, it is not faster on multi-processor machines anyway --- development/cmake/ConfigureChecks.cmake | 39 +++++++++++++++---------- development/cmake/scripts/xmingw | 2 +- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake index d2695b041a..d998e5b826 100644 --- a/development/cmake/ConfigureChecks.cmake +++ b/development/cmake/ConfigureChecks.cmake @@ -240,22 +240,29 @@ if(LYX_USE_QT MATCHES "QT5") else() set(lyx_qt5_config "QtCore/qconfig.h") endif() - check_cxx_source_runs( - " - #include <${lyx_qt5_config}> - #include - using namespace std; - string a(QT_QPA_DEFAULT_PLATFORM_NAME); - int main(int argc, char **argv) - { - if (a.compare(\"xcb\") == 0) - return(0); - else - return 1; - } - " - QT_USES_X11) - set(QPA_XCB ${QT_USES_X11}) + if(WIN32) + set(QT_USES_X11 CACHE "Win32 compiled without X11" 0) + # The try_run for minngw would not work here anyway + else() + check_cxx_source_runs( + " + #include <${lyx_qt5_config}> + #include + using namespace std; + string a(QT_QPA_DEFAULT_PLATFORM_NAME); + int main(int argc, char **argv) + { + if (a.compare(\"xcb\") == 0) + return(0); + else + return 1; + } + " + QT_USES_X11) + if(QT_USES_X11) + set(QPA_XCB ${QT_USES_X11}) + endif() + endif() if (Qt5X11Extras_FOUND) get_target_property(_x11extra_prop Qt5::X11Extras IMPORTED_CONFIGURATIONS) diff --git a/development/cmake/scripts/xmingw b/development/cmake/scripts/xmingw index 3051a27ff9..ec287da7c9 100755 --- a/development/cmake/scripts/xmingw +++ b/development/cmake/scripts/xmingw @@ -98,7 +98,7 @@ checkExitCode # build LyX # -mergefile=-DLYX_MERGE_FILES=1 +mergefile=-DLYX_MERGE_FILES=0 #pch=-DLYX_PCH=1 cmake $lyxsrcdir \ From dadec50a18d92d24d42e1ccf7474f07a2a66b5b4 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sat, 10 Feb 2018 15:35:12 +0100 Subject: [PATCH 29/40] Fix race condition in processFuncRequestQueue The issue here was that the element was only removed from the queue after the func request was processed, but within that process, other function could access the queue, so the queue could even be empty when this function finally wanted to remove the item. Fixes: #10406. --- src/frontends/qt4/GuiApplication.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index 67643d5d8f..fbd0f5405c 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -2271,8 +2271,12 @@ void GuiApplication::processFuncRequestAsync(FuncRequest const & func) void GuiApplication::processFuncRequestQueue() { while (!d->func_request_queue_.empty()) { - processFuncRequest(d->func_request_queue_.front()); + // take the item from the stack _before_ processing the + // request in order to avoid race conditions from nested + // or parallel requests (see #10406) + FuncRequest const fr(d->func_request_queue_.front()); d->func_request_queue_.pop(); + processFuncRequest(fr); } } From 71fea6332667e1a9fe99c38624e4dcaf1129d6c5 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sat, 10 Feb 2018 18:18:43 +0100 Subject: [PATCH 30/40] Disable CheckTeX while buffer is processed Since CheckTeX itself processes the tex file, a synchronous run with a TeX process can lead to all sorts of conflicts, including crashes. Fixes: #7434. --- lib/ui/stdmenus.inc | 2 +- src/Buffer.cpp | 8 -------- src/frontends/qt4/GuiView.cpp | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index 57077ed4b8..1bed2393ae 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -595,7 +595,7 @@ Menuset Item "Spellchecker...|S" "dialog-show spellchecker" OptItem "Thesaurus...|T" "thesaurus-entry" Item "Statistics...|a" "statistics" - OptItem "Check TeX|h" "buffer-chktex" + Item "Check TeX|h" "buffer-chktex" Item "TeX Information|I" "dialog-show texinfo" Item "Compare...|C" "dialog-show compare" Separator diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 462094f960..f42233f60c 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -2528,10 +2528,6 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag) break; } - case LFUN_BUFFER_CHKTEX: - enable = params().isLatex() && !lyxrc.chktex_command.empty(); - break; - case LFUN_BUILD_PROGRAM: enable = params().isExportable("program", false); break; @@ -2644,10 +2640,6 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr) break; } - case LFUN_BUFFER_CHKTEX: - runChktex(); - break; - case LFUN_BUFFER_EXPORT_CUSTOM: { string format_name; string command = split(argument, format_name, ' '); diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 9086464ec8..7090c3c8ad 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1931,6 +1931,19 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag) enable = theBufferList().last() != theBufferList().first(); break; + case LFUN_BUFFER_CHKTEX: { + if (!doc_buffer || !doc_buffer->params().isLatex() + || d.processing_thread_watcher_.isRunning()) { + // grey out, don't hide + enable = false; + break; + } + // hide if we have no checktex command + enable = !lyxrc.chktex_command.empty(); + flag.setUnknown(!enable); + break; + } + case LFUN_VIEW_SPLIT: if (cmd.getArg(0) == "vertical") enable = doc_buffer && (d.splitter_->count() == 1 || @@ -3794,6 +3807,11 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr) gotoNextOrPreviousBuffer(PREVBUFFER, true); break; + case LFUN_BUFFER_CHKTEX: + LASSERT(doc_buffer, break); + doc_buffer->runChktex(); + break; + case LFUN_COMMAND_EXECUTE: { command_execute_ = true; minibuffer_focus_ = true; From be4d49ebd107cb4b91844a555302a6052457c483 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sat, 10 Feb 2018 19:02:35 +0100 Subject: [PATCH 31/40] amend 71fea633266 --- src/frontends/qt4/GuiView.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 7090c3c8ad..6f5441ceee 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1932,15 +1932,19 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag) break; case LFUN_BUFFER_CHKTEX: { + // hide if we have no checktex command + if (lyxrc.chktex_command.empty()) { + flag.setUnknown(true); + enable = false; + break; + } if (!doc_buffer || !doc_buffer->params().isLatex() || d.processing_thread_watcher_.isRunning()) { // grey out, don't hide enable = false; break; } - // hide if we have no checktex command - enable = !lyxrc.chktex_command.empty(); - flag.setUnknown(!enable); + enable = true; break; } From 338dc16d767da7b3e6c19f71c5f03e44de5656a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sat, 10 Feb 2018 19:34:42 +0100 Subject: [PATCH 32/40] ru.po: is now 100% translated big respect to Yuriy! --- po/ru.po | 954 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 503 insertions(+), 451 deletions(-) diff --git a/po/ru.po b/po/ru.po index 1c7d89cb43..9e0642d55f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: LyX 2.3\n" "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n" "POT-Creation-Date: 2018-01-28 21:42-0500\n" -"PO-Revision-Date: 2018-02-04 20:42+0200\n" +"PO-Revision-Date: 2018-02-09 17:11+0200\n" "Last-Translator: Yuriy Skalko \n" "Language-Team: Russian \n" "Language: ru\n" @@ -5501,6 +5501,11 @@ msgid "" "than normal Biblatex. As with normal Biblatex, the use of 'biber' as " "Bibliography processor is advised." msgstr "" +"Эта вариация Biblatex эмулирует команды цитирования Natbib и поэтому " +"наилучшим образом подходит для перехода от Natbib (или обходного решения в " +"LyX до версии 2.3) к Biblatex. Режим natbib поддерживает несколько больше " +"стилей, чем обычный Biblatex. Как и для обычного Biblatex рекомендуется " +"использование 'biber' в качестве процессора библиографии." #: lib/citeengines/biblatex-natbib.citeengine:142 #: lib/citeengines/biblatex.citeengine:132 @@ -5590,6 +5595,11 @@ msgid "" "many features that are not possible with BibTeX. The use of 'biber' as " "bibliography processor is advised." msgstr "" +"Biblatex поддерживает множество стилей типа автор-год и численных стилей, " +"что в основном ориентировано на использование в гуманитарных науках. Он " +"широко настраиваемый, полностью локализованный и предоставляет множество " +"функций, которые невозможны в BibTeX. Рекомендуется использование 'biber' в " +"качестве процессора библиографии." #: lib/citeengines/biblatex.citeengine:139 msgid "S&horten author list[[Possible substitute to All aut&hors]]" @@ -5609,6 +5619,10 @@ msgid "" "studies and the Humanities. It includes localizations for English, German, " "French, Dutch, Spanish and Italian." msgstr "" +"Jurabib поддерживает ряд стилей автор-год и в первую очередь подходит для " +"юридических и гуманитарных наук. Он включает в себя локализации для " +"английского, немецкого, французского, голландского, испанского и " +"итальянского языков." #: lib/citeengines/jurabib.citeengine:125 msgid "Bibliography entry." @@ -5639,6 +5653,10 @@ msgid "" "numerical citations, annotations, capitalization of the `van' part of author " "names, shortened and full author lists, and more." msgstr "" +"Natbib поддерживает целый ряд стилей автор-год и численных стилей, главным " +"образом направленных на гуманитарные науки. Он имеет автоматическую " +"сортировку и слияние числовых цитирований, аннотаций, капитализацию части " +"имен авторов, сокращенные и полные списки авторов и многое другое." #: lib/layouts/AEA.layout:3 msgid "American Economic Association (AEA)" @@ -10910,27 +10928,27 @@ msgstr "Elsevier" #: lib/layouts/elsarticle.layout:57 msgid "BeginFrontmatter" -msgstr "" +msgstr "Начало вступ. части" #: lib/layouts/elsarticle.layout:67 msgid "Begin frontmatter" -msgstr "" +msgstr "Начало вступ. части" #: lib/layouts/elsarticle.layout:75 msgid "EndFrontmatter" -msgstr "" +msgstr "Конец вступ. части" #: lib/layouts/elsarticle.layout:78 msgid "End frontmatter" -msgstr "" +msgstr "Конец вступ. части" #: lib/layouts/elsarticle.layout:103 msgid "Titlenotemark" -msgstr "" +msgstr "Пометка заглавия" #: lib/layouts/elsarticle.layout:108 msgid "Titlenote mark" -msgstr "" +msgstr "Пометка заглавия" #: lib/layouts/elsarticle.layout:126 msgid "Title footnote" @@ -10974,24 +10992,23 @@ msgstr "Метка сноски автора" #: lib/layouts/elsarticle.layout:201 msgid "Label you refer to for an author" -msgstr "" +msgstr "Метка, на которую вы ссылаетесь для автора" #: lib/layouts/elsarticle.layout:206 -#, fuzzy msgid "CorAuthormark" -msgstr "Автор-год" +msgstr "Пометка отвечающего автора" #: lib/layouts/elsarticle.layout:209 msgid "CorAuthor mark" -msgstr "" +msgstr "Пометка отвечающего автора" #: lib/layouts/elsarticle.layout:216 msgid "Corresponding author" -msgstr "" +msgstr "Отвечающий автор" #: lib/layouts/elsarticle.layout:219 msgid "Corresponding author text:" -msgstr "" +msgstr "Текст отвечающего автора:" #: lib/layouts/elsarticle.layout:230 msgid "Address Label" @@ -10999,7 +11016,7 @@ msgstr "Метка адреса" #: lib/layouts/elsarticle.layout:231 msgid "Label of the author you refer to" -msgstr "" +msgstr "Метка автора, на которую вы ссылаетесь" #: lib/layouts/elsarticle.layout:248 msgid "Internet" @@ -11008,6 +11025,7 @@ msgstr "Интернет" #: lib/layouts/elsarticle.layout:249 msgid "If content is 'url', email becomes an Internet address" msgstr "" +"Если содержимое это 'url', то электронная почта становится интернет-адресом" #: lib/layouts/endnotes.module:2 lib/layouts/endnotes.module:13 msgid "Endnote" @@ -11023,7 +11041,7 @@ msgstr "" #: lib/layouts/endnotes.module:10 msgid "Endnote ##" -msgstr "" +msgstr "Примечание ##" #: lib/layouts/endnotes.module:23 msgid "endnote" @@ -11106,14 +11124,12 @@ msgid "Curricula Vitae" msgstr "Резюме" #: lib/layouts/europasscv.layout:94 lib/layouts/europecv.layout:47 -#, fuzzy msgid "FooterName" -msgstr "Подвал:" +msgstr "НазваниеПодвала" #: lib/layouts/europasscv.layout:97 -#, fuzzy msgid "Name (footer):" -msgstr "Последний подвал:" +msgstr "Имя (подвал):" #: lib/layouts/europasscv.layout:111 lib/layouts/moderncv.layout:166 msgid "Mobile:" @@ -11134,7 +11150,7 @@ msgstr "Домашняя страница:" #: lib/layouts/europasscv.layout:134 msgid "InstantMessaging" -msgstr "" +msgstr "Мгновенный обмен сообщениями" #: lib/layouts/europasscv.layout:137 msgid "Instant Messaging:" @@ -11179,7 +11195,7 @@ msgstr "ДоИзображения" #: lib/layouts/europasscv.layout:167 lib/layouts/europecv.layout:102 msgid "Space before picture:" -msgstr "" +msgstr "Пространство перед изображением:" #: lib/layouts/europasscv.layout:170 lib/layouts/europecv.layout:105 msgid "Picture" @@ -11199,7 +11215,7 @@ msgstr "ПослеИзображения" #: lib/layouts/europasscv.layout:184 lib/layouts/europecv.layout:120 msgid "Space after picture:" -msgstr "" +msgstr "Пространство после изображения:" #: lib/layouts/europasscv.layout:195 lib/layouts/europasscv.layout:218 #: lib/layouts/europasscv.layout:254 lib/layouts/europecv.layout:162 @@ -11221,7 +11237,7 @@ msgstr "Пункт" #: lib/layouts/europasscv.layout:225 lib/layouts/europasscv.layout:261 msgid "Summary of the item, can also be the time span" -msgstr "" +msgstr "Сводка элемента, также может быть временным интервалом" #: lib/layouts/europasscv.layout:231 lib/layouts/europecv.layout:176 #: lib/layouts/moderncv.layout:388 @@ -11234,67 +11250,59 @@ msgstr "ПунктВставки" #: lib/layouts/europasscv.layout:263 msgid "Subitems" -msgstr "" +msgstr "Подпункты" #: lib/layouts/europasscv.layout:270 -#, fuzzy msgid "TitleItem" -msgstr "Заметка в подвал" +msgstr "Элемент заглавия" #: lib/layouts/europasscv.layout:274 -#, fuzzy msgid "Title item:" -msgstr "Название:" +msgstr "Элемент заглавия:" #: lib/layouts/europasscv.layout:277 -#, fuzzy msgid "TitleLevel" -msgstr "Заглавие" +msgstr "Уровень заглавия" #: lib/layouts/europasscv.layout:281 -#, fuzzy msgid "Title level:" -msgstr "Название:" +msgstr "Уровень заглавия:" #: lib/layouts/europasscv.layout:285 lib/layouts/europasscv.layout:286 msgid "Text (right side)" -msgstr "" +msgstr "Текст (справа)" #: lib/layouts/europasscv.layout:290 -#, fuzzy msgid "BlueItem" -msgstr "Маркеры" +msgstr "Голубой элемент" #: lib/layouts/europasscv.layout:293 msgid "Blue item:" -msgstr "" +msgstr "Голубой элемент:" #: lib/layouts/europasscv.layout:296 msgid "BlueItemInset" -msgstr "Пользовательские вставки" +msgstr "Вставка голубого элемента" #: lib/layouts/europasscv.layout:299 msgid "Blue subitems" -msgstr "" +msgstr "Голубые подэлементы" #: lib/layouts/europasscv.layout:306 -#, fuzzy msgid "BigItem" -msgstr "Перечисление" +msgstr "Большой элемент" #: lib/layouts/europasscv.layout:309 -#, fuzzy msgid "Big Item:" -msgstr "Элемент Списка:" +msgstr "Большой элемент:" #: lib/layouts/europasscv.layout:312 -#, fuzzy msgid "EcvItemize" -msgstr "Перечисление" +msgstr "Ecv-Перечисление" #: lib/layouts/europasscv.layout:336 lib/layouts/europecv.layout:216 msgid "MotherTongue" -msgstr "" +msgstr "Родной язык" #: lib/layouts/europasscv.layout:345 lib/layouts/europecv.layout:230 msgid "Mother Tongue:" @@ -11302,11 +11310,11 @@ msgstr "Родной язык:" #: lib/layouts/europasscv.layout:355 lib/layouts/europecv.layout:240 msgid "LangHeader" -msgstr "" +msgstr "Заголовок языка" #: lib/layouts/europasscv.layout:359 lib/layouts/europecv.layout:244 msgid "Language Header:" -msgstr "" +msgstr "Заголовок языка:" #: lib/layouts/europasscv.layout:376 lib/layouts/europecv.layout:250 msgid "Language:" @@ -11322,7 +11330,7 @@ msgstr "Прослушивание" #: lib/layouts/europasscv.layout:387 lib/layouts/europecv.layout:259 msgid "Level how good you think you can listen" -msgstr "" +msgstr "Уровень (как вы думаете) насколько хорошо вы можете слушать" #: lib/layouts/europasscv.layout:392 lib/layouts/europecv.layout:263 msgid "Reading" @@ -11330,23 +11338,23 @@ msgstr "Чтение" #: lib/layouts/europasscv.layout:393 lib/layouts/europecv.layout:264 msgid "Level how good you think you can read" -msgstr "" +msgstr "Уровень (как вы думаете) насколько хорошо вы можете читать" #: lib/layouts/europasscv.layout:398 lib/layouts/europecv.layout:268 msgid "Interaction" -msgstr "" +msgstr "Взаимодействие" #: lib/layouts/europasscv.layout:399 lib/layouts/europecv.layout:269 msgid "Level how good you think you can conversate" -msgstr "" +msgstr "Уровень (как вы думаете) насколько хорошо вы можете вести переговоры" #: lib/layouts/europasscv.layout:404 lib/layouts/europecv.layout:273 msgid "Production" -msgstr "" +msgstr "Производство" #: lib/layouts/europasscv.layout:405 lib/layouts/europecv.layout:274 msgid "Level how good you think you can freely talk" -msgstr "" +msgstr "Уровень (как вы думаете) насколько хорошо вы можете свободно говорить" #: lib/layouts/europasscv.layout:409 lib/layouts/europecv.layout:278 msgid "LastLanguage" @@ -11357,14 +11365,12 @@ msgid "Last Language:" msgstr "Последний язык:" #: lib/layouts/europasscv.layout:415 lib/layouts/europecv.layout:284 -#, fuzzy msgid "LangFooter" -msgstr "Подвал:" +msgstr "ПодвалЯзыка" #: lib/layouts/europasscv.layout:418 lib/layouts/europecv.layout:287 -#, fuzzy msgid "Language Footer:" -msgstr "Подвал:" +msgstr "Подвал языка:" #: lib/layouts/europasscv.layout:421 lib/layouts/europecv.layout:290 msgid "End" @@ -11396,7 +11402,7 @@ msgstr "Размер" #: lib/layouts/europecv.layout:112 msgid "Size the photo is resized to" -msgstr "" +msgstr "Размер фотографии изменяет размер на" #: lib/layouts/europecv.layout:123 src/frontends/qt4/GuiDocument.cpp:135 msgid "Page" @@ -11408,16 +11414,15 @@ msgstr "Заглавие, как оно будет показываться в #: lib/layouts/europecv.layout:170 msgid "Summary of the item, can also be the time" -msgstr "" +msgstr "Сводная информация о предмете, также может быть временем" #: lib/layouts/europecv.layout:183 -#, fuzzy msgid "BulletedItem" -msgstr "Маркеры" +msgstr "Маркированный элемент" #: lib/layouts/europecv.layout:186 msgid "Bulleted Item:" -msgstr "" +msgstr "Маркированный элемент:" #: lib/layouts/europecv.layout:189 msgid "Begin" @@ -11429,7 +11434,7 @@ msgstr "Начало резюме" #: lib/layouts/europecv.layout:208 msgid "PersonalInfo" -msgstr "PersonalInfo" +msgstr "Персональные данные" #: lib/layouts/europecv.layout:213 msgid "Personal Info" @@ -11481,6 +11486,9 @@ msgid "" "available with arbitrary sizes. For details see the documentation of the fix-" "cm.sty package: http://tug.org/texmf-dist/doc/latex/base/fixltx2e.pdf" msgstr "" +"Fix-cm улучшает внешний вид шрифтов Computer Modern и делает их доступными с " +"произвольными размерами. Дополнительные сведения см. в документации по пакет " +"fix-cm.sty: http://tug.org/texmf-dist/doc/latex/base/fixltx2e.pdf" #: lib/layouts/fixltx2e.module:2 msgid "Fix LaTeX" @@ -11496,6 +11504,13 @@ msgid "" "functionality of fixltx2e, so the fixltx2e module becomes obsolete with " "newer LaTeX distributions." msgstr "" +"Загружает пакет LaTeX fixltx2e, который содержит некоторые исправления " +"ошибок для LaTeX. Эти исправления не были частью старых ядер LaTeX из-за " +"обратной совместимости. Если вы используете этот модуль ваш свёрстанный " +"документ может выглядеть по-разному на разных версиях LaTeX, в зависимости " +"от версии fixltx2e. Примечание: последние ядра LaTeX (по состоянию на " +"01-01-2015) включают в себя функции fixltx2e, поэтому модуль fixltx2e " +"становится устаревшим при использовании новых дистрибутивов LaTeX." #: lib/layouts/fixme.module:2 msgid "FiXme" @@ -11512,6 +11527,15 @@ msgid "" "them always, insert \\fxsetup{draft} to Document > Settings > Preamble. NOTE " "also that you need version 4 or later of the FiXme package for some features." msgstr "" +"Предоставляет аннотации \"FiXme\" (на полях) для целей пересмотра документа. " +"Список аннотаций можно создать с помощью стиля абзаца \"Список FIXME\". " +"Аннотации настраиваются с помощью преамбулы LaTeX. Подробности см. в " +"документации FIXme. Примечание: по умолчанию заметки отображаются только в " +"режиме черновика (если опция \"draft\" вставлена в Документ > Настройки > " +"Класс документа > Параметры класса > Пользовательские). Чтобы отобразить их " +"всегда, вставьте \\fxsetup{draft} в Документ > Настройки > Преамбула. " +"Обратите внимание также, что для некоторых функций требуется версия 4 или " +"более поздняя пакета FiXme." #: lib/layouts/fixme.module:17 lib/layouts/fixme.module:55 msgid "Fixme" @@ -11531,14 +11555,13 @@ msgstr "Заметка Fixme" #: lib/layouts/fixme.module:68 lib/layouts/fixme.module:103 #: lib/layouts/fixme.module:146 lib/layouts/fixme.module:188 -#, fuzzy msgid "Fixme Note Options|s" -msgstr "Параметры математики" +msgstr "Параметры заметок Fixme" #: lib/layouts/fixme.module:69 lib/layouts/fixme.module:104 #: lib/layouts/fixme.module:147 lib/layouts/fixme.module:189 msgid "Consult the fixme package documentation for options" -msgstr "" +msgstr "Обратитесь к документации пакета fixme для вариантов" #: lib/layouts/fixme.module:74 msgid "Fixme Warning" @@ -11569,52 +11592,51 @@ msgstr "Фатальная ошибка" #: lib/layouts/fixme.module:97 msgid "Fixme Note (Targeted)" -msgstr "" +msgstr "Заметка Fixme (нацеленная)" #: lib/layouts/fixme.module:99 msgid "Fixme (Targeted)" -msgstr "" +msgstr "Fixme (нацеленная)" #: lib/layouts/fixme.module:109 msgid "Fixme Note|x" -msgstr "" +msgstr "Заметка Fixme" #: lib/layouts/fixme.module:111 -#, fuzzy msgid "Insert the FIXME note here" -msgstr "Вставить заметку" +msgstr "Вставить заметку FIXME здесь" #: lib/layouts/fixme.module:116 msgid "Fixme Warning (Targeted)" -msgstr "" +msgstr "Предупреждение Fixme (нацеленное)" #: lib/layouts/fixme.module:118 msgid "Warning (Targeted)" -msgstr "" +msgstr "Предупреждение (нацеленное)" #: lib/layouts/fixme.module:122 msgid "Fixme Error (Targeted)" -msgstr "" +msgstr "Ошибка Fixme (нацеленная)" #: lib/layouts/fixme.module:124 msgid "Error (Targeted)" -msgstr "" +msgstr "Ошибка (нацеленная)" #: lib/layouts/fixme.module:128 msgid "Fixme Fatal (Targeted)" -msgstr "" +msgstr "Фатальная ошибка Fixme (нацеленная)" #: lib/layouts/fixme.module:130 msgid "Fatal (Targeted)" -msgstr "" +msgstr "Фатальная ошибка (нацеленная)" #: lib/layouts/fixme.module:139 msgid "Fixme Note (Multipar)" -msgstr "" +msgstr "Заметка Fixme (Multipar)" #: lib/layouts/fixme.module:141 msgid "Fixme (Multipar)" -msgstr "" +msgstr "Fixme (Multipar)" #: lib/layouts/fixme.module:153 lib/layouts/fixme.module:195 msgid "Fixme Summary" @@ -11622,39 +11644,39 @@ msgstr "Сводка Fixme" #: lib/layouts/fixme.module:154 lib/layouts/fixme.module:196 msgid "Insert a summary of the FIXME note here" -msgstr "" +msgstr "Вставьте сводку заметки FIXME здесь" #: lib/layouts/fixme.module:159 msgid "Fixme Warning (Multipar)" -msgstr "" +msgstr "Предупреждение Fixme (Multipar)" #: lib/layouts/fixme.module:161 msgid "Warning (Multipar)" -msgstr "" +msgstr "Предупреждение (Multipar)" #: lib/layouts/fixme.module:165 msgid "Fixme Error (Multipar)" -msgstr "" +msgstr "Ошибка Fixme (Multipar)" #: lib/layouts/fixme.module:167 msgid "Error (Multipar)" -msgstr "" +msgstr "Ошибка (Multipar)" #: lib/layouts/fixme.module:171 msgid "Fixme Fatal (Multipar)" -msgstr "" +msgstr "Фатальная ошибка Fixme (Multipar)" #: lib/layouts/fixme.module:173 msgid "Fatal (Multipar)" -msgstr "" +msgstr "Фатальная ошибка (Multipar)" #: lib/layouts/fixme.module:182 msgid "Fixme Note (Multipar Targeted)" -msgstr "" +msgstr "Заметка Fixme (Multipar Targeted)" #: lib/layouts/fixme.module:184 msgid "Fixme (MP Targ.)" -msgstr "" +msgstr "Fixme (MP Targ.)" #: lib/layouts/fixme.module:200 msgid "Annotated Text" @@ -11670,27 +11692,27 @@ msgstr "Вставьте сюда текст для аннотации" #: lib/layouts/fixme.module:208 msgid "Fixme Warning (Multipar Targeted)" -msgstr "" +msgstr "Предупреждение Fixme (Multipar Targeted)" #: lib/layouts/fixme.module:210 msgid "Warning (MP Targ.)" -msgstr "" +msgstr "Предупреждение (MP Targ.)" #: lib/layouts/fixme.module:214 msgid "Fixme Error (Multipar Targeted)" -msgstr "" +msgstr "Ошибка Fixme (Multipar Targeted)" #: lib/layouts/fixme.module:216 msgid "Error (MP Targ.)" -msgstr "" +msgstr "Ошибка (MP Targ.)" #: lib/layouts/fixme.module:220 msgid "Fixme Fatal (Multipar Targeted)" -msgstr "" +msgstr "Фатальная ошибка Fixme (Multipar Targeted)" #: lib/layouts/fixme.module:222 msgid "Fatal (MP Targ.)" -msgstr "" +msgstr "Фатальная ошибка (MP Targ.)" #: lib/layouts/fixme.module:232 msgid "FxNote" @@ -11843,7 +11865,7 @@ msgstr "" #: lib/layouts/frletter.layout:3 msgid "French Letter (frletter)" -msgstr "" +msgstr "French Letter (frletter)" #: lib/layouts/g-brief.layout:3 msgid "G-Brief (V. 1, Obsolete)" @@ -11954,11 +11976,11 @@ msgstr "Банковский счёт:" #: lib/layouts/g-brief.layout:179 lib/layouts/g-brief2.layout:42 #: lib/layouts/g-brief2.layout:753 msgid "PostalComment" -msgstr "PostalComment" +msgstr "Почтовый комментарий" #: lib/layouts/g-brief.layout:182 lib/layouts/g-brief2.layout:765 msgid "PostalComment:" -msgstr "" +msgstr "Почтовый комментарий:" #: lib/layouts/g-brief.layout:207 lib/layouts/g-brief2.layout:894 msgid "Reference:" @@ -11970,7 +11992,7 @@ msgstr "Влож.:" #: lib/layouts/g-brief2.layout:3 msgid "G-Brief (V. 2)" -msgstr "" +msgstr "G-Brief (V. 2)" #: lib/layouts/g-brief2.layout:103 msgid "NameRowA" @@ -12222,15 +12244,15 @@ msgstr "BankRowF:" #: lib/layouts/graphicboxes.module:2 msgid "GraphicBoxes" -msgstr "" +msgstr "Графические блоки" #: lib/layouts/graphicboxes.module:5 msgid "Boxes to scale and rotate its contents" -msgstr "" +msgstr "Блоки для масштабирования и поворота содержимого" #: lib/layouts/graphicboxes.module:11 lib/layouts/graphicboxes.module:14 msgid "Reflectbox" -msgstr "" +msgstr "Блок отражения" #: lib/layouts/graphicboxes.module:26 lib/layouts/graphicboxes.module:28 msgid "Scalebox" @@ -12242,7 +12264,7 @@ msgstr "H-Factor" #: lib/layouts/graphicboxes.module:32 msgid "Insert horizontal scale factor (1 = 100%)" -msgstr "" +msgstr "Вставить горизонтальный масштаб (1 = 100%)" #: lib/layouts/graphicboxes.module:38 msgid "V-Factor" @@ -12254,7 +12276,7 @@ msgstr "Вставить вертикальный масштаб (1 = 100%)" #: lib/layouts/graphicboxes.module:43 lib/layouts/graphicboxes.module:45 msgid "Resizebox" -msgstr "" +msgstr "Блок изменения размера" #: lib/layouts/graphicboxes.module:49 msgid "Width of the box" @@ -12262,7 +12284,7 @@ msgstr "Ширина блока" #: lib/layouts/graphicboxes.module:56 msgid "Height of the box, can also be '!' to keep aspect ratio" -msgstr "" +msgstr "Высота блока, также может быть \"!\" для сохранения пропорций" #: lib/layouts/graphicboxes.module:63 lib/layouts/graphicboxes.module:65 msgid "Rotatebox" @@ -12275,7 +12297,7 @@ msgstr "Начало" #: lib/layouts/graphicboxes.module:69 msgid "Rotation origin; syntax: 'origin=lt' (for top left corner)" -msgstr "" +msgstr "Центр вращения; синтаксис: 'origin=lt' (для верхнего левого угла)" #: lib/layouts/graphicboxes.module:72 msgid "Angle" @@ -12283,11 +12305,11 @@ msgstr "Угол" #: lib/layouts/graphicboxes.module:73 msgid "Rotation angle in degrees (counterclockwise)" -msgstr "" +msgstr "Угол поворота в градусах (против часовой стрелки)" #: lib/layouts/hanging.module:2 lib/layouts/hanging.module:16 msgid "Hanging" -msgstr "Висящие абзацы" +msgstr "Висячие абзацы" #: lib/layouts/hanging.module:6 msgid "" @@ -12295,7 +12317,7 @@ msgid "" "in which the first line is set to the left margin, but all subsequent lines " "are indented." msgstr "" -"Добавляет окружение для висящих абзацев. В таком абзаце первая строка " +"Добавляет окружение для висячих абзацев. В таком абзаце первая строка " "начинается с левой границы, а все последующие строки имеют отступы." #: lib/layouts/heb-article.layout:3 @@ -12389,23 +12411,25 @@ msgid "" "precautionary statements. For a description see the file H-P-statements.lyx " "in LyX's examples folder." msgstr "" +"Обеспечивает две вставки для вёрстки номеров и фраза о химической опасности " +"и мерах предосторожности. Описание см. в файле H-P-statements.lyx в папке " +"примеров LyX." #: lib/layouts/hpstatement.module:11 lib/layouts/hpstatement.module:16 msgid "H-P number" -msgstr "" +msgstr "Номер H-P" #: lib/layouts/hpstatement.module:35 lib/layouts/hpstatement.module:38 msgid "H-P statement" -msgstr "" +msgstr "Заявление H-P" #: lib/layouts/hpstatement.module:40 -#, fuzzy msgid "Statement Text" -msgstr "Ссылка+Текст:" +msgstr "Текст заявления" #: lib/layouts/hpstatement.module:41 msgid "Text for statements that require some information" -msgstr "" +msgstr "Текст для заявлений, требующих некоторой информации" #: lib/layouts/ijmpc.layout:3 msgid "Int. Journal of Modern Physics C" @@ -12443,22 +12467,19 @@ msgstr "Название таблицы" #: lib/layouts/ijmpc.layout:265 lib/layouts/ijmpd.layout:268 msgid "Refcite" -msgstr "" +msgstr "Ссылка" #: lib/layouts/ijmpc.layout:269 lib/layouts/ijmpd.layout:272 -#, fuzzy msgid "Cite reference" -msgstr "все процитированные ссылки" +msgstr "Ссылка" #: lib/layouts/ijmpc.layout:283 lib/layouts/ijmpd.layout:286 -#, fuzzy msgid "ItemList" -msgstr "Перечисление" +msgstr "ItemList" #: lib/layouts/ijmpc.layout:304 lib/layouts/ijmpd.layout:307 -#, fuzzy msgid "RomanList" -msgstr "С засечками" +msgstr "RomanList" #: lib/layouts/ijmpc.layout:310 lib/layouts/ijmpd.layout:313 msgid "Numbering Scheme" @@ -12469,6 +12490,8 @@ msgid "" "Use the largest item number in your list, e.g. '(iv)' for 4 Roman numbered " "items" msgstr "" +"Используйте самый большой номер пункта в списке, например, '(iv)' для 4 при " +"римской нумерации" #: lib/layouts/ijmpc.layout:372 lib/layouts/ijmpd.layout:384 #: lib/layouts/theorems-ams-bytype.inc:106 lib/layouts/theorems-bytype.inc:75 @@ -12541,7 +12564,6 @@ msgid "Int. Journal of Modern Physics D" msgstr "Int. Journal of Modern Physics D" #: lib/layouts/ijmpd.layout:199 lib/layouts/ijmpd.layout:203 -#, fuzzy msgid "Comby" msgstr "Клавиатура" @@ -12565,19 +12587,19 @@ msgstr "Буквица" #: lib/layouts/initials.module:35 msgid "Option(s) for the initial" -msgstr "" +msgstr "Настройки для буквицы" #: lib/layouts/initials.module:40 msgid "Initial letter(s)" -msgstr "" +msgstr "Литера буквицы" #: lib/layouts/initials.module:44 msgid "Rest of Initial" -msgstr "" +msgstr "Остальная часть начального слова" #: lib/layouts/initials.module:45 msgid "Rest of initial word or text" -msgstr "" +msgstr "Остальная часть исходного слова или текста" #: lib/layouts/iopart.layout:3 msgid "Institute of Physics (IOP)" @@ -12585,16 +12607,15 @@ msgstr "Institute of Physics (IOP)" #: lib/layouts/iopart.layout:67 lib/layouts/jasatex.layout:75 msgid "Short title that will appear in header line" -msgstr "" +msgstr "Короткий Заголовок, который появится в строке заголовка" #: lib/layouts/iopart.layout:84 msgid "Review" msgstr "Рецензирование" #: lib/layouts/iopart.layout:90 -#, fuzzy msgid "Topical" -msgstr "Тема обсуждения" +msgstr "Тематический" #: lib/layouts/iopart.layout:96 lib/layouts/pdfcomment.module:127 #: lib/layouts/pdfcomment.module:164 lib/layouts/stdinsets.inc:133 @@ -12606,9 +12627,8 @@ msgid "Paper" msgstr "Бумага" #: lib/layouts/iopart.layout:114 -#, fuzzy msgid "Prelim" -msgstr "Утверждение" +msgstr "Предв." #: lib/layouts/iopart.layout:120 msgid "Rapid" @@ -12629,9 +12649,8 @@ msgid "MSC" msgstr "MSC" #: lib/layouts/iopart.layout:235 -#, fuzzy msgid "Mathematics Subject Classification number:" -msgstr "обновлённых спецификаций классов документов." +msgstr "Классификационный номер предмета математики:" #: lib/layouts/iopart.layout:239 msgid "submitto" @@ -12651,7 +12670,7 @@ msgstr "Заголовок библиографии" #: lib/layouts/isprs.layout:3 msgid "Int. Society f. Photogrammetry and Remote Sensing (ISPRS)" -msgstr "" +msgstr "Int. Society f. Photogrammetry and Remote Sensing (ISPRS)" #: lib/layouts/isprs.layout:39 msgid "ABSTRACT:" @@ -12671,7 +12690,7 @@ msgstr "БЛАГОДАРНОСТИ" #: lib/layouts/iucr.layout:3 msgid "International Union of Crystallography (IUCr)" -msgstr "" +msgstr "International Union of Crystallography (IUCr)" #: lib/layouts/iucr.layout:47 lib/layouts/jss.layout:26 msgid "\\thesection." @@ -12696,11 +12715,11 @@ msgstr "Основной автор" #: lib/layouts/iucr.layout:117 lib/layouts/iucr.layout:150 #: lib/layouts/iucr.layout:181 msgid "Affiliation Key" -msgstr "" +msgstr "Ключ принадлежности" #: lib/layouts/iucr.layout:118 msgid "Affiliation key of the author" -msgstr "" +msgstr "Ключ принадлежности автора" #: lib/layouts/iucr.layout:122 lib/layouts/iucr.layout:123 #: lib/layouts/iucr.layout:155 lib/layouts/iucr.layout:156 @@ -12717,19 +12736,19 @@ msgstr "Соавтор" #: lib/layouts/iucr.layout:151 msgid "Affiliation key of the co-author" -msgstr "" +msgstr "Ключ принадлежности соавтора" #: lib/layouts/iucr.layout:160 msgid "Short Author" -msgstr "" +msgstr "Краткий автор" #: lib/layouts/iucr.layout:163 msgid "Short author:" -msgstr "" +msgstr "Краткий автор:" #: lib/layouts/iucr.layout:182 msgid "Affiliation key" -msgstr "" +msgstr "Ключ принадлежности" #: lib/layouts/iucr.layout:197 msgid "Keyword:" @@ -12737,19 +12756,19 @@ msgstr "Ключевое слово:" #: lib/layouts/iucr.layout:200 msgid "Vita" -msgstr "" +msgstr "Краткая биография" #: lib/layouts/iucr.layout:203 msgid "Vita:" -msgstr "" +msgstr "Краткая биография:" #: lib/layouts/iucr.layout:206 msgid "PDB reference" -msgstr "" +msgstr "Ссылка PDB" #: lib/layouts/iucr.layout:209 msgid "PDB reference:" -msgstr "" +msgstr "Ссылка PDB:" #: lib/layouts/iucr.layout:212 msgid "Optional name" @@ -12757,11 +12776,11 @@ msgstr "Необязательное имя" #: lib/layouts/iucr.layout:216 msgid "NDB reference" -msgstr "" +msgstr "Ссылка NDB" #: lib/layouts/iucr.layout:219 msgid "NDB reference:" -msgstr "" +msgstr "Ссылка NDB:" #: lib/layouts/iucr.layout:222 lib/layouts/iucr.layout:225 msgid "Synopsis" @@ -12802,7 +12821,7 @@ msgstr "Номер препринта:" #: lib/layouts/jasatex.layout:247 lib/layouts/jasatex.layout:251 msgid "Online citation" -msgstr "" +msgstr "Онлайн-цитата" #: lib/layouts/jbook.layout:3 msgid "Japanese Book (Standard Class)" @@ -12865,13 +12884,12 @@ msgid "pkg" msgstr "пакет" #: lib/layouts/jss.layout:156 -#, fuzzy msgid "Proglang" -msgstr "Программа" +msgstr "Язык программирования" #: lib/layouts/jss.layout:158 msgid "proglang" -msgstr "proglang" +msgstr "язык программирования" #: lib/layouts/jss.layout:174 lib/layouts/logicalmkup.module:65 msgid "code" @@ -12898,9 +12916,8 @@ msgid "AddressForOffprints" msgstr "Адрес для оттиска" #: lib/layouts/kluwer.layout:210 -#, fuzzy msgid "Address for Offprints:" -msgstr "Адрес не для печати" +msgstr "Адрес для оттисков:" #: lib/layouts/kluwer.layout:220 msgid "RunningTitle" @@ -12908,7 +12925,7 @@ msgstr "Заголовок в колонтитуле" #: lib/layouts/kluwer.layout:228 lib/layouts/svcommon.inc:405 msgid "Running title:" -msgstr "" +msgstr "Заголовок в колонтитуле:" #: lib/layouts/kluwer.layout:242 msgid "RunningAuthor" @@ -12916,7 +12933,7 @@ msgstr "Автор в колонтитуле" #: lib/layouts/kluwer.layout:249 lib/layouts/svcommon.inc:411 msgid "Running author:" -msgstr "" +msgstr "Автор в колонтитуле:" #: lib/layouts/knitr.module:2 lib/configure.py:652 msgid "Rnw (knitr)" @@ -12928,6 +12945,10 @@ msgid "" "has to be installed for this module to work: install.packages('knitr'). Note " "it depends on R >= 2.14.1. For more info see http://yihui.name/knitr" msgstr "" +"Использует пакет knitr в R для создания динамических отчетов. Этот пакет R " +"должен быть установлен, чтобы этот модуль заработал: install." +"packages('knitr'). Обратите внимание, что он зависит от R >= 2.14.1. Для " +"получения дополнительной информации см. http://yihui.name/knitr" #: lib/layouts/knitr.module:6 lib/layouts/noweb.module:5 #: lib/layouts/sweave.module:6 @@ -13038,6 +13059,9 @@ msgid "" "This module adds an inset to enter LilyPond code directly into LyX. It will " "be processed in the output. See the lilypond.lyx example file." msgstr "" +"Этот модуль добавляет вставку для ввода кода LilyPond непосредственно в LyX. " +"Он будет обработан при создании выходного файла. См. файл примера lilypond." +"lyx." #: lib/layouts/lilypond.module:13 lib/layouts/lilypond.module:14 #: lib/xtemplates/lilypond.xtemplate:14 @@ -13053,6 +13077,8 @@ msgid "" "A comma-separated option list (see the LilyPond documentation for available " "options)." msgstr "" +"Список параметров, разделенных запятыми (доступные параметры см. в " +"документации LilyPond)." #: lib/layouts/linguistics.module:2 lib/layouts/linguistics.module:62 msgid "Linguistics" @@ -13118,16 +13144,15 @@ msgstr "Перевод" #: lib/layouts/linguistics.module:135 lib/layouts/linguistics.module:170 msgid "Glosse Translation|s" -msgstr "" +msgstr "Перевод glosse" #: lib/layouts/linguistics.module:136 lib/layouts/linguistics.module:171 -#, fuzzy msgid "Add a translation for the glosse" -msgstr "Добавить новую ветку к списку" +msgstr "Добавить перевод в glosse" #: lib/layouts/linguistics.module:142 lib/layouts/linguistics.module:144 msgid "Tri-Glosse" -msgstr "" +msgstr "Tri-Glosse" #: lib/layouts/linguistics.module:177 msgid "Structure Tree" @@ -13163,7 +13188,7 @@ msgstr "значение" #: lib/layouts/linguistics.module:250 msgid "GroupGlossedWords" -msgstr "" +msgstr "GroupGlossedWords" #: lib/layouts/linguistics.module:252 msgid "Group" @@ -13195,7 +13220,7 @@ msgstr "Lecture Notes in Comp. Science (LNCS)" #: lib/layouts/llncs.layout:152 msgid "Running LaTeX Title" -msgstr "" +msgstr "Заглавие LaTeX в колонтитуле" #: lib/layouts/llncs.layout:175 lib/layouts/svcommon.inc:377 msgid "TOC Title" @@ -13207,11 +13232,11 @@ msgstr "Заголовок содержания:" #: lib/layouts/llncs.layout:204 msgid "Author Running" -msgstr "" +msgstr "Автор в колонтитуле" #: lib/layouts/llncs.layout:208 msgid "Author Running:" -msgstr "" +msgstr "Автор в колонтитуле:" # TOC - Table of Contents # Автор содержания? @@ -13407,12 +13432,11 @@ msgstr "НазваниеПоэмы" #: lib/layouts/memoir.layout:225 lib/layouts/memoir.layout:246 msgid "The poem title as it appears in the table of contents" -msgstr "Название стиха, как он отображается в содержании" +msgstr "Название стиха, как оно отображается в содержании" #: lib/layouts/memoir.layout:230 -#, fuzzy msgid "The poem title as it appears in the running headers" -msgstr "Метка, как она будет показываться в документе" +msgstr "Название стиха, как оно отображается в колонтитулах" #: lib/layouts/memoir.layout:240 msgid "Poemtitle*" @@ -13436,13 +13460,12 @@ msgid "Modern CV" msgstr "Современное резюме" #: lib/layouts/moderncv.layout:37 -#, fuzzy msgid "CVStyle" -msgstr "Стиль" +msgstr "Стиль CV" #: lib/layouts/moderncv.layout:46 msgid "CV Style:" -msgstr "" +msgstr "Стиль CV:" #: lib/layouts/moderncv.layout:52 msgid "Style Options" @@ -13454,24 +13477,24 @@ msgstr "Настройки для стиля CV" #: lib/layouts/moderncv.layout:57 msgid "CVColor" -msgstr "" +msgstr "Цвет CV" #: lib/layouts/moderncv.layout:60 msgid "CV Color Scheme:" -msgstr "" +msgstr "Цветовая схема CV:" #: lib/layouts/moderncv.layout:63 msgid "CVIcons" -msgstr "" +msgstr "Значки CV" # ? #: lib/layouts/moderncv.layout:66 msgid "CV Icon Set:" -msgstr "" +msgstr "Набор значков CV:" #: lib/layouts/moderncv.layout:69 msgid "CVColumnWidth" -msgstr "" +msgstr "Ширина колонки CV" #: lib/layouts/moderncv.layout:72 msgid "Column Width:" @@ -13479,25 +13502,23 @@ msgstr "Ширина колонки:" #: lib/layouts/moderncv.layout:75 msgid "PDF Page Mode" -msgstr "" +msgstr "Режим страницы PDF" #: lib/layouts/moderncv.layout:78 msgid "PDF Page Mode:" -msgstr "" +msgstr "Режим страницы PDF:" #: lib/layouts/moderncv.layout:94 msgid "First name" msgstr "Имя" #: lib/layouts/moderncv.layout:106 -#, fuzzy msgid "FamilyName" -msgstr "&Семейство:" +msgstr "Фамилия" #: lib/layouts/moderncv.layout:110 -#, fuzzy msgid "Family Name:" -msgstr "&Семейство:" +msgstr "Фамилия:" #: lib/layouts/moderncv.layout:142 msgid "Line 1" @@ -13505,7 +13526,7 @@ msgstr "Строка 1" #: lib/layouts/moderncv.layout:143 lib/layouts/moderncv.layout:148 msgid "Optional address line" -msgstr "" +msgstr "Необязательная строка адреса" #: lib/layouts/moderncv.layout:147 msgid "Line 2" @@ -13517,29 +13538,27 @@ msgstr "Тип телефона" #: lib/layouts/moderncv.layout:159 msgid "can be fixed, mobile or fax" -msgstr "" +msgstr "могут быть стационарным, мобильным или факсом" #: lib/layouts/moderncv.layout:189 msgid "Social" -msgstr "" +msgstr "Соцсеть" #: lib/layouts/moderncv.layout:192 msgid "Social:" -msgstr "" +msgstr "Соцсеть:" #: lib/layouts/moderncv.layout:195 msgid "Name of the social network" -msgstr "" +msgstr "Название социальной сети" #: lib/layouts/moderncv.layout:199 -#, fuzzy msgid "ExtraInfo" msgstr "Дополнительно" #: lib/layouts/moderncv.layout:202 -#, fuzzy msgid "Extra Info:" -msgstr "&Дополнительно:" +msgstr "Дополнительно:" #: lib/layouts/moderncv.layout:208 msgid "Photo:" @@ -13571,7 +13590,7 @@ msgstr "Закрыть раздел" #: lib/layouts/moderncv.layout:296 msgid "Columns:" -msgstr "&Столбцов:" +msgstr "Столбцов:" #: lib/layouts/moderncv.layout:311 msgid "Optional width" @@ -13598,14 +13617,12 @@ msgid "Entry:" msgstr "Элемент:" #: lib/layouts/moderncv.layout:395 -#, fuzzy msgid "ItemWithComment" -msgstr "Комментарий" +msgstr "Элемент с комментарием" #: lib/layouts/moderncv.layout:398 -#, fuzzy msgid "Item with Comment:" -msgstr "Комментарий" +msgstr "Элемент с комментарием:" #: lib/layouts/moderncv.layout:408 lib/layouts/moderncv.layout:409 msgid "Text" @@ -13652,14 +13669,12 @@ msgid "Right summary" msgstr "Правая сводка" #: lib/layouts/moderncv.layout:454 -#, fuzzy msgid "DoubleListItem" -msgstr "Двойной" +msgstr "Пункт двойного списка" #: lib/layouts/moderncv.layout:457 -#, fuzzy msgid "Double List Item:" -msgstr "Двойной" +msgstr "Пункт двойного списка:" #: lib/layouts/moderncv.layout:462 msgid "First Item" @@ -13675,28 +13690,27 @@ msgstr "Компьютер" #: lib/layouts/moderncv.layout:475 msgid "MakeCVtitle" -msgstr "" +msgstr "Сделать заглавие CV" #: lib/layouts/moderncv.layout:478 msgid "Make CV Title" -msgstr "" +msgstr "Сделать заглавие CV" #: lib/layouts/moderncv.layout:485 msgid "MakeLetterTitle" -msgstr "" +msgstr "Сделать заглавие письма" #: lib/layouts/moderncv.layout:488 msgid "Make Letter Title" -msgstr "" +msgstr "Сделать заглавие письма" #: lib/layouts/moderncv.layout:492 msgid "MakeLetterClosing" -msgstr "" +msgstr "Сделать завершение письма" #: lib/layouts/moderncv.layout:495 -#, fuzzy msgid "Close Letter" -msgstr "Письмо" +msgstr "Завершение письма" #: lib/layouts/moderncv.layout:524 msgid "Recipient" @@ -13717,11 +13731,11 @@ msgstr "Эпилог" #: lib/layouts/moderncv.layout:581 lib/layouts/svcommon.inc:520 msgid "Alternative Name" -msgstr "" +msgstr "Альтернативное название" #: lib/layouts/moderncv.layout:582 msgid "Alternative instead of 'Enclosure'" -msgstr "" +msgstr "Альтернатива вместо 'Вложение'" #: lib/layouts/moderncv.layout:586 msgid "Enclosing:" @@ -13737,6 +13751,9 @@ msgid "" "default). See the Additional manual, section 'Multiple Text Columns', for a " "detailed description of multiple columns." msgstr "" +"Добавляет пользовательскую вставку, содержимое которой задается несколькими " +"столбцами (по умолчанию 2). Подробное описание нескольких столбцов см. в " +"дополнительном руководстве, раздел \"Несколько текстовых столбцов\"." #: lib/layouts/multicol.module:19 msgid "Number of Columns" @@ -13764,6 +13781,8 @@ msgid "" "Free space that needs to be on the page to start the multiple columns on " "this page" msgstr "" +"Свободное пространство, которое должно быть на странице, чтобы начать " +"несколько столбцов на этой странице" #: lib/layouts/mwart.layout:3 msgid "Polish Article (MW Bundle)" @@ -13787,6 +13806,10 @@ msgid "" "bibliography style need not be apacite--it could be apacite, apacitex, or " "any bibliography that works with both the natbib and apacite packages.)" msgstr "" +"Этот модуль добавляет возможность использования natbib вместе с apacite " +"(стиль библиографии не должен быть apacite - это может быть apacite, " +"apacitex или другая библиография, которая работает с natbib и пакетами " +"apacite.)" #: lib/layouts/noweb.module:2 msgid "Noweb" @@ -13795,6 +13818,7 @@ msgstr "Noweb" #: lib/layouts/noweb.module:5 msgid "Allows to use Noweb as a literate programming tool." msgstr "" +"Позволяет использовать Noweb как инструмент грамотного программирования." #: lib/layouts/numarticle.inc:9 lib/layouts/powerdot.layout:240 msgid "\\arabic{section}" @@ -13860,6 +13884,12 @@ msgid "" "labels. Additionally, the LaTeX environments itemize and enumerate are " "extended to use a similar optional argument." msgstr "" +"Пакет paralist обеспечивает некоторые новые окружения списков. Нумерованные " +"и ненумерованные списки могут быть набраны внутри абзацев, как абзацы, а " +"также в компактном варианте. Большинство окружений имеют необязательные " +"аргументы для форматирования меток. Кроме того, окружения LaTeX " +"'Перечисление' и 'Нумерация' расширяются, чтобы использовать подобные " +"дополнительные аргументы." #: lib/layouts/paralist.module:30 lib/layouts/paralist.module:37 #: lib/layouts/paralist.module:52 lib/layouts/paralist.module:61 @@ -13868,80 +13898,80 @@ msgstr "" #: lib/layouts/paralist.module:112 lib/layouts/paralist.module:121 #: lib/layouts/paralist.module:133 msgid "Optional arguments for this list (see paralist manual)" -msgstr "" +msgstr "Необязательные аргументы для этого списка (см. руководство paralist)" #: lib/layouts/paralist.module:47 msgid "AsParagraphItem" -msgstr "" +msgstr "Как абзац" #: lib/layouts/paralist.module:51 msgid "As Paragraph Itemize Options" -msgstr "" +msgstr "Аргументы перечисления в виде абзаца" #: lib/layouts/paralist.module:56 msgid "InParagraphItem" -msgstr "" +msgstr "В абзаце" #: lib/layouts/paralist.module:60 msgid "In Paragraph Itemize Options" -msgstr "" +msgstr "Аргументы перечисления внутри абзаца" #: lib/layouts/paralist.module:65 msgid "CompactItem" -msgstr "" +msgstr "Компактный" #: lib/layouts/paralist.module:72 msgid "Compact Itemize Options" -msgstr "" +msgstr "Аргументы компактного перечисления" #: lib/layouts/paralist.module:77 msgid "AsParagraphEnum" -msgstr "" +msgstr "Как абзац (нумер.)" #: lib/layouts/paralist.module:81 msgid "As Paragraph Enumerate Options" -msgstr "" +msgstr "Аргументы нумерации в виде абзаца" #: lib/layouts/paralist.module:86 msgid "InParagraphEnum" -msgstr "" +msgstr "В абзаце (нумер.)" #: lib/layouts/paralist.module:90 msgid "In Paragraph Enumerate Options" -msgstr "" +msgstr "Аргументы нумерации внутри абзаца" # ? #: lib/layouts/paralist.module:95 msgid "CompactEnum" -msgstr "" +msgstr "Компактный (нумер.)" #: lib/layouts/paralist.module:102 msgid "Compact Enumerate Options" -msgstr "" +msgstr "Аргументы компактной нумерации" #: lib/layouts/paralist.module:107 msgid "AsParagraphDescr" -msgstr "" +msgstr "Как абзац (опис.)" #: lib/layouts/paralist.module:111 msgid "As Paragraph Description Options" -msgstr "" +msgstr "Аргументы описания в виде абзаца" #: lib/layouts/paralist.module:116 msgid "InParagraphDescr" -msgstr "" +msgstr "В абзаце (опис.)" #: lib/layouts/paralist.module:120 msgid "In Paragraph Description Options" -msgstr "" +msgstr "Аргументы описания внутри абзаца" #: lib/layouts/paralist.module:125 msgid "CompactDescr" -msgstr "" +msgstr "Компактный (опис.)" #: lib/layouts/paralist.module:132 msgid "Compact Description Options" -msgstr "" +msgstr "Аргументы компактного описания" #: lib/layouts/pdfcomment.module:2 msgid "PDF Comments" @@ -13953,6 +13983,9 @@ msgid "" "the pdfcomment package. Please consult the LyX example file PDF-comment.lyx " "and the package documentation for details." msgstr "" +"Предоставляет различные виды аннотаций для вывода PDF. Модуль использует " +"пакет pdfcomment. Пожалуйста, обратитесь к файлу примера PDF-comment.lyx и " +"документации пакета." #: lib/layouts/pdfcomment.module:19 msgid "Define Avatar" @@ -13964,19 +13997,19 @@ msgstr "PDF-комментарий" #: lib/layouts/pdfcomment.module:27 msgid "PDF-comment avatar:" -msgstr "" +msgstr "Аватар PDF-комментария:" #: lib/layouts/pdfcomment.module:30 msgid "Name of the Avatar" -msgstr "" +msgstr "Имя аватара" #: lib/layouts/pdfcomment.module:41 msgid "Define PDF-Comment Style" -msgstr "" +msgstr "Определить стиль PDF-комментариев" #: lib/layouts/pdfcomment.module:44 msgid "PDF-comment style:" -msgstr "" +msgstr "Стиль PDF-комментариев:" #: lib/layouts/pdfcomment.module:47 msgid "Name of the style" @@ -13984,11 +14017,11 @@ msgstr "Название стиля" #: lib/layouts/pdfcomment.module:52 msgid "Define PDF-Comment List Style" -msgstr "" +msgstr "Определить стиль списка PDF-комментариев" #: lib/layouts/pdfcomment.module:55 msgid "Definition of PDF-comment list style:" -msgstr "" +msgstr "Определение стиля списка PDF-комментариев:" #: lib/layouts/pdfcomment.module:58 msgid "Name of the list style" @@ -13996,15 +14029,15 @@ msgstr "Название стиля списка" #: lib/layouts/pdfcomment.module:63 msgid "Set PDF-Comment List Style" -msgstr "" +msgstr "Установить стиль списка PDF-комментариев" #: lib/layouts/pdfcomment.module:66 msgid "PDF-comment list style:" -msgstr "" +msgstr "Стиль списка PDF-комментариев:" #: lib/layouts/pdfcomment.module:70 msgid "PDF-Comment-Setup" -msgstr "" +msgstr "Настройка PDF-комментариев" #: lib/layouts/pdfcomment.module:74 msgid "PDF (Setup)" @@ -14012,16 +14045,18 @@ msgstr "PDF (настройка)" #: lib/layouts/pdfcomment.module:82 msgid "PDF-Comment setup options" -msgstr "" +msgstr "Настройка PDF-комментариев" #: lib/layouts/pdfcomment.module:83 lib/layouts/pdfcomment.module:106 #: lib/layouts/pdfcomment.module:222 msgid "Opts" -msgstr "" +msgstr "Настройки" #: lib/layouts/pdfcomment.module:84 msgid "Insert PDF-Comment setup options here (see the pdfcomment manual)" msgstr "" +"Вставьте параметры настройки PDF-комментариев здесь (см. руководство " +"pdfcomment)" #: lib/layouts/pdfcomment.module:93 msgid "PDF-Annotation" @@ -14033,11 +14068,11 @@ msgstr "PDF" #: lib/layouts/pdfcomment.module:105 msgid "PDFComment Options" -msgstr "" +msgstr "Настройки PDFComment" #: lib/layouts/pdfcomment.module:107 msgid "Insert PDFComment options here (see pdfcomment manual)" -msgstr "" +msgstr "Вставьте параметры PDFComment здесь (см. руководство pdfcomment)" #: lib/layouts/pdfcomment.module:112 msgid "PDF-Margin" @@ -14093,11 +14128,11 @@ msgstr "PDF (Линия)" #: lib/layouts/pdfcomment.module:157 msgid "PDF-Sideline" -msgstr "" +msgstr "PDF-Боковая линия" #: lib/layouts/pdfcomment.module:159 msgid "PDF (Sideline)" -msgstr "" +msgstr "PDF (Боковая линия)" #: lib/layouts/pdfcomment.module:166 msgid "Insert the comment here" @@ -14105,19 +14140,19 @@ msgstr "Вставьте комментарий здесь" #: lib/layouts/pdfcomment.module:170 msgid "PDF-Reply" -msgstr "" +msgstr "PDF-Ответ" #: lib/layouts/pdfcomment.module:172 msgid "PDF (Reply)" -msgstr "" +msgstr "PDF (Ответ)" #: lib/layouts/pdfcomment.module:180 msgid "PDF-Tooltip" -msgstr "" +msgstr "PDF-Всплывающая подсказка" #: lib/layouts/pdfcomment.module:182 msgid "PDF (Tooltip)" -msgstr "" +msgstr "PDF (Всплывающая подсказка)" #: lib/layouts/pdfcomment.module:189 msgid "Tooltip Text" @@ -14157,10 +14192,13 @@ msgid "" "hyperref. Please consult the LyX example file PDF-form.lyx and the " "documentation of hyperref for details." msgstr "" +"Обеспечивает поля и кнопки для форм PDF. Модуль использует пакет LaTeX " +"hyperref. Пожалуйста, ознакомьтесь с файлом примера PDF-form.lyx и " +"документацией пакета hyperref." #: lib/layouts/pdfform.module:15 lib/layouts/pdfform.module:26 msgid "Begin PDF Form" -msgstr "Начать форму PDF" +msgstr "Начало формы PDF" #: lib/layouts/pdfform.module:19 msgid "PDF form" @@ -14176,31 +14214,31 @@ msgstr "Параметры" #: lib/layouts/pdfform.module:30 lib/layouts/pdfform.module:67 msgid "Insert PDF form parameters here" -msgstr "" +msgstr "Вставить параметры формы PDF здесь" #: lib/layouts/pdfform.module:40 lib/layouts/pdfform.module:43 msgid "End PDF Form" -msgstr "" +msgstr "Конец формы PDF" #: lib/layouts/pdfform.module:47 msgid "PDF Link Setup" -msgstr "" +msgstr "Настройки ссылок PDF" #: lib/layouts/pdfform.module:50 msgid "PDF link setup" -msgstr "" +msgstr "Настройки ссылок PDF" #: lib/layouts/pdfform.module:58 lib/layouts/pdfform.module:63 msgid "TextField" -msgstr "Текст" +msgstr "Поле текста" #: lib/layouts/pdfform.module:78 lib/layouts/pdfform.module:81 msgid "CheckBox" -msgstr "" +msgstr "Флажок" #: lib/layouts/pdfform.module:84 lib/layouts/pdfform.module:87 msgid "ChoiceMenu" -msgstr "" +msgstr "Меню выбора" #: lib/layouts/pdfform.module:89 msgid "Label" @@ -14212,23 +14250,23 @@ msgstr "Вставить метку здесь" #: lib/layouts/pdfform.module:96 lib/layouts/pdfform.module:99 msgid "PushButton" -msgstr "" +msgstr "Кнопка" #: lib/layouts/pdfform.module:102 lib/layouts/pdfform.module:105 msgid "SubmitButton" -msgstr "" +msgstr "Кнопка отправки" #: lib/layouts/pdfform.module:108 lib/layouts/pdfform.module:111 msgid "ResetButton" -msgstr "" +msgstr "Кнопка сброса" #: lib/layouts/pdfform.module:118 lib/layouts/pdfform.module:121 msgid "PDFAction" -msgstr "" +msgstr "PDFAction" #: lib/layouts/pdfform.module:126 msgid "The name of the PDF action" -msgstr "" +msgstr "Имя действия PDF" #: lib/layouts/pdfform.module:134 msgid "Text Field Style" @@ -14236,71 +14274,71 @@ msgstr "Стиль текстового поля" #: lib/layouts/pdfform.module:137 msgid "Default text field style" -msgstr "" +msgstr "Стиль текстового поля по умолчанию" #: lib/layouts/pdfform.module:141 msgid "Submit Button Style" -msgstr "" +msgstr "Стиль кнопки отправки" #: lib/layouts/pdfform.module:144 msgid "Default submit button style" -msgstr "" +msgstr "Стиль кнопки отправки по умолчанию" #: lib/layouts/pdfform.module:147 msgid "Push Button Style" -msgstr "" +msgstr "Стиль кнопки" #: lib/layouts/pdfform.module:150 msgid "Default push button style" -msgstr "" +msgstr "Стиль кнопки по умолчанию" #: lib/layouts/pdfform.module:153 msgid "Check Box Style" -msgstr "" +msgstr "Стиль флажка" #: lib/layouts/pdfform.module:156 msgid "Default check box style" -msgstr "" +msgstr "Стиль флажка по умолчанию" #: lib/layouts/pdfform.module:159 msgid "Reset Button Style" -msgstr "" +msgstr "Стиль кнопки сброса" #: lib/layouts/pdfform.module:162 msgid "Default reset button style" -msgstr "" +msgstr "Стиль кнопки сброса по умолчанию" #: lib/layouts/pdfform.module:165 msgid "List Box Style" -msgstr "" +msgstr "Стиль списка" #: lib/layouts/pdfform.module:168 msgid "Default list box style" -msgstr "" +msgstr "Стиль списка по умолчанию" #: lib/layouts/pdfform.module:171 msgid "Combo Box Style" -msgstr "" +msgstr "Стиль комбобокса" #: lib/layouts/pdfform.module:174 msgid "Default combo box style" -msgstr "" +msgstr "Стиль комбобокса по умолчанию" #: lib/layouts/pdfform.module:177 msgid "Popdown Box Style" -msgstr "" +msgstr "Стиль выпадающего списка" #: lib/layouts/pdfform.module:180 msgid "Default popdown box style" -msgstr "" +msgstr "Стиль выпадающего списка по умолчанию" #: lib/layouts/pdfform.module:183 msgid "Radio Box Style" -msgstr "" +msgstr "Стиль радиокнопки" #: lib/layouts/pdfform.module:186 msgid "Default radio box style" -msgstr "" +msgstr "Стиль радиокнопки по умолчанию" #: lib/layouts/powerdot.layout:3 msgid "Powerdot" @@ -14323,7 +14361,7 @@ msgstr "Параметры слайда" #: lib/layouts/powerdot.layout:143 msgid "Optional arguments to the slide command (see powerdot manual)" -msgstr "" +msgstr "Необязательные аргументы к команде slide (см. инструкцию powerdot)" #: lib/layouts/powerdot.layout:152 msgid "EndSlide" @@ -14351,7 +14389,7 @@ msgstr "Настройки раздела" #: lib/layouts/powerdot.layout:248 msgid "Optional arguments to the section command (see powerdot manual)" -msgstr "" +msgstr "Необязательные аргументы к команде section (см. инструкцию powerdot)" #: lib/layouts/powerdot.layout:272 lib/layouts/powerdot.layout:295 msgid "Itemize Type" @@ -14362,9 +14400,8 @@ msgid "Itemize type specification (see powerdot manual)" msgstr "Спецификация типов ненумерованных списков (см. руководство powerdot)" #: lib/layouts/powerdot.layout:292 -#, fuzzy msgid "ItemizeType1" -msgstr "Перечисление" +msgstr "Перечисление тип 1" #: lib/layouts/powerdot.layout:323 lib/layouts/powerdot.layout:347 msgid "Enumerate Type" @@ -14375,9 +14412,8 @@ msgid "Enumerate type specification (see powerdot manual)" msgstr "Спецификация типов нумерованных списков (см. руководство powerdot)" #: lib/layouts/powerdot.layout:344 -#, fuzzy msgid "EnumerateType1" -msgstr "Нумерация" +msgstr "Нумерация тип 1" #: lib/layouts/powerdot.layout:443 msgid "Twocolumn" @@ -14393,7 +14429,7 @@ msgstr "Левая колонка" #: lib/layouts/powerdot.layout:462 msgid "Enter the text of the left column here (right column in main paragraph)" -msgstr "" +msgstr "Введите текст левого столбца здесь (правый столбец в главном абзаце)" #: lib/layouts/powerdot.layout:587 msgid "Onslide" @@ -14405,11 +14441,11 @@ msgstr "На слайдах" #: lib/layouts/powerdot.layout:594 msgid "Overlay Specification|S" -msgstr "" +msgstr "Спецификация наложения" #: lib/layouts/powerdot.layout:595 msgid "Specify the overlay settings (see powerdot manual)" -msgstr "" +msgstr "Укажите настройки наложения (см. руководство powerdot)" #: lib/layouts/powerdot.layout:602 msgid "Onslide+" @@ -14441,11 +14477,11 @@ msgstr "Ингредиенты" #: lib/layouts/recipebook.layout:118 msgid "Ingredients Header" -msgstr "" +msgstr "Заголовок ингредиентов" #: lib/layouts/recipebook.layout:119 msgid "Specify an optional ingredients header" -msgstr "" +msgstr "Укажите необязательный заголовок ингредиентов" #: lib/layouts/recipebook.layout:127 msgid "Ingredients:" @@ -14465,20 +14501,20 @@ msgstr "REVTeX (V. 4.1)" #: lib/layouts/revtex4-1.layout:88 lib/layouts/revtex4.layout:155 msgid "Affiliation (alternate)" -msgstr "" +msgstr "Принадлежность (альтернатива)" #: lib/layouts/revtex4-1.layout:91 lib/layouts/revtex4.layout:164 msgid "Affiliation (alternate):" -msgstr "" +msgstr "Принадлежность (альтернатива):" # ? #: lib/layouts/revtex4-1.layout:93 lib/layouts/revtex4.layout:161 msgid "Alternate Affiliation Option" -msgstr "" +msgstr "Насторйка альтернативной принадлежности" #: lib/layouts/revtex4-1.layout:94 lib/layouts/revtex4.layout:162 msgid "Optional argument to the altaffiliation command" -msgstr "" +msgstr "Необязательный аргумент для команды altaffiliation" #: lib/layouts/revtex4-1.layout:100 lib/layouts/revtex4.layout:168 msgid "Affiliation (none)" @@ -14494,7 +14530,7 @@ msgstr "Электронный адрес:" #: lib/layouts/revtex4-1.layout:122 lib/layouts/revtex4.layout:210 msgid "Electronic Address Option|s" -msgstr "" +msgstr "Насторйка электронного адреса" #: lib/layouts/revtex4-1.layout:123 lib/layouts/revtex4.layout:211 msgid "Optional argument to the email command" @@ -14530,12 +14566,12 @@ msgstr "благодарности" #: lib/layouts/revtex4-1.layout:234 msgid "Ruled Table" -msgstr "" +msgstr "Разлинованная таблица" #: lib/layouts/revtex4-1.layout:236 lib/layouts/revtex4-1.layout:244 #: lib/layouts/revtex4-1.layout:252 src/frontends/qt4/GuiSymbols.cpp:122 msgid "Specials" -msgstr "Особенный" +msgstr "Особенности" #: lib/layouts/revtex4-1.layout:242 msgid "Turn Page" @@ -14559,11 +14595,11 @@ msgstr "Видео" #: lib/layouts/revtex4-1.layout:295 msgid "Float Link" -msgstr "" +msgstr "Плавающая ссылка" #: lib/layouts/revtex4-1.layout:297 msgid "Float link" -msgstr "" +msgstr "Плавающая ссылка" #: lib/layouts/revtex4-1.layout:308 msgid "lowercase text" @@ -14571,15 +14607,15 @@ msgstr "строчные|с" #: lib/layouts/revtex4-1.layout:320 msgid "Online cite" -msgstr "" +msgstr "Онлайн-цитата" #: lib/layouts/revtex4-1.layout:324 msgid "online cite" -msgstr "" +msgstr "онлайн-цитата" #: lib/layouts/revtex4-1.layout:326 msgid "Text behind" -msgstr "" +msgstr "Текст за" #: lib/layouts/revtex4-1.layout:327 msgid "text behind the cite" @@ -14591,7 +14627,7 @@ msgstr "REVTeX (V. 4)" #: lib/layouts/revtex4.layout:176 msgid "AltAffiliation" -msgstr "" +msgstr "AltAffiliation" #: lib/layouts/revtex4.layout:270 msgid "PACS number:" @@ -14613,11 +14649,11 @@ msgstr "" #: lib/layouts/rsphrase.module:11 lib/layouts/rsphrase.module:16 msgid "R-S number" -msgstr "R-S number" +msgstr "Номер R-S" #: lib/layouts/rsphrase.module:33 lib/layouts/rsphrase.module:36 msgid "R-S phrase" -msgstr "R-S phrase" +msgstr "Фразы R-S" #: lib/layouts/rsphrase.module:39 msgid "Safety phrase" @@ -14800,11 +14836,11 @@ msgstr "Размещение:" #: lib/layouts/scrlettr.layout:179 lib/layouts/scrlttr2.layout:260 msgid "Specialmail" -msgstr "Specialmail" +msgstr "Спецпочта" #: lib/layouts/scrlettr.layout:182 lib/layouts/scrlttr2.layout:264 msgid "Specialmail:" -msgstr "" +msgstr "Спецпочта:" #: lib/layouts/scrlettr.layout:196 lib/layouts/scrlttr2.layout:280 msgid "Title:" @@ -14896,63 +14932,58 @@ msgstr "KOMA-Script Report" #: lib/layouts/sectionbox.module:2 msgid "Section Boxes" -msgstr "" +msgstr "Блоки разделов" #: lib/layouts/sectionbox.module:6 msgid "" "Defines Boxes with section header. Mainly intended for the SciPoster class." msgstr "" +"Определяет блоки с заголовком раздела. В основном предназначен для класса " +"SciPoster." #: lib/layouts/sectionbox.module:11 msgid "SectionBox" -msgstr "" +msgstr "Блок раздела" #: lib/layouts/sectionbox.module:13 msgid "Section Box" -msgstr "" +msgstr "Блок раздела" #: lib/layouts/sectionbox.module:22 msgid "Section Box Width|S" -msgstr "" +msgstr "Ширина блока раздела" #: lib/layouts/sectionbox.module:23 -#, fuzzy msgid "Width of the section Box" -msgstr "Ширина изображения в выводе" +msgstr "Ширина блока раздела" #: lib/layouts/sectionbox.module:26 lib/layouts/todonotes.module:46 msgid "Heading" msgstr "Заголовок" #: lib/layouts/sectionbox.module:27 -#, fuzzy msgid "Section Box Heading" -msgstr "Раздел" +msgstr "Заголовок блока раздела" #: lib/layouts/sectionbox.module:31 -#, fuzzy msgid "Insert the section box header here" -msgstr "Вставить промежуток даже после разрыва строки" +msgstr "Вставьте заголовок блока раздела здесь" #: lib/layouts/sectionbox.module:40 -#, fuzzy msgid "SubsectionBox" -msgstr "Подраздел" +msgstr "Блок подраздела" #: lib/layouts/sectionbox.module:42 -#, fuzzy msgid "Subsection Box" -msgstr "Подраздел" +msgstr "Блок подраздела" #: lib/layouts/sectionbox.module:46 -#, fuzzy msgid "SubsubsectionBox" -msgstr "Подподраздел" +msgstr "Блок подподраздела" #: lib/layouts/sectionbox.module:48 -#, fuzzy msgid "Subsubsection Box" -msgstr "Подподраздел" +msgstr "Блок подподраздела" #: lib/layouts/seminar.layout:3 msgid "Seminar" @@ -14960,7 +14991,7 @@ msgstr "Семинар" #: lib/layouts/seminar.layout:26 lib/layouts/seminar.layout:89 msgid "LandscapeSlide" -msgstr "LandscapeSlide" +msgstr "Ландшафтный слайд" #: lib/layouts/seminar.layout:27 msgid "Landscape Slide" @@ -14968,7 +14999,7 @@ msgstr "Ландшафтный слайд" #: lib/layouts/seminar.layout:40 lib/layouts/seminar.layout:115 msgid "PortraitSlide" -msgstr "Слайд портрет" +msgstr "Портретный слайд" #: lib/layouts/seminar.layout:42 msgid "Portrait Slide" @@ -14984,7 +15015,7 @@ msgstr "Подзаголовок слайда" #: lib/layouts/seminar.layout:61 lib/layouts/seminar.layout:124 msgid "ListOfSlides" -msgstr "Перечень слайдов" +msgstr "Список слайдов" #: lib/layouts/seminar.layout:63 msgid "List of Slides" @@ -15000,7 +15031,7 @@ msgstr "Содержимое слайда" #: lib/layouts/seminar.layout:78 lib/layouts/seminar.layout:151 msgid "ProgressContents" -msgstr "ProgressContents" +msgstr "Содержание прогресса" #: lib/layouts/seminar.layout:80 msgid "Progress Contents" @@ -15090,11 +15121,11 @@ msgstr "Свеча" #: lib/layouts/shapepar.module:81 msgid "Drop down" -msgstr "" +msgstr "Выпадение вниз" #: lib/layouts/shapepar.module:86 msgid "Drop up" -msgstr "" +msgstr "Выпадение вверх" #: lib/layouts/shapepar.module:91 src/mathed/InsetMathMacroTemplate.cpp:544 msgid "TeX" @@ -15122,7 +15153,7 @@ msgstr "shapepar" #: lib/layouts/shapepar.module:123 msgid "For scaling the to positions on the page" -msgstr "" +msgstr "Для масштабирования по позициям на странице" #: lib/layouts/shapepar.module:127 msgid "Shape specification" @@ -15157,9 +15188,8 @@ msgid "AMS" msgstr "AMS" #: lib/layouts/siamltex.layout:206 -#, fuzzy msgid "The title as it appears in the running headers" -msgstr "Метка, как она будет показываться в документе" +msgstr "Заголовок, как он отображается в верхнем колонтитуле" #: lib/layouts/siamltex.layout:322 msgid "AMS subject classifications:" @@ -15195,19 +15225,19 @@ msgstr "Данные об авторских правах:" #: lib/layouts/sigplanconf.layout:112 msgid "TitleBanner" -msgstr "" +msgstr "Баннер заглавия" #: lib/layouts/sigplanconf.layout:115 msgid "Title banner:" -msgstr "" +msgstr "Баннер заглавия:" #: lib/layouts/sigplanconf.layout:119 msgid "PreprintFooter" -msgstr "" +msgstr "Препринт нижнего колонтитула" #: lib/layouts/sigplanconf.layout:122 msgid "Preprint footer:" -msgstr "" +msgstr "Препринт нижнего колонтитула:" #: lib/layouts/sigplanconf.layout:129 msgid "Digital Object Identifier:" @@ -15518,19 +15548,16 @@ msgid "Title of this part" msgstr "Заглавие этой части" #: lib/layouts/svcommon.inc:156 lib/layouts/svmult.layout:123 -#, fuzzy msgid "ChapSubtitle" -msgstr "Подзаголовок" +msgstr "Подзаголовок главы" #: lib/layouts/svcommon.inc:169 lib/layouts/svmult.layout:119 -#, fuzzy msgid "ChapAuthor" -msgstr "Автор" +msgstr "Автор главы" #: lib/layouts/svcommon.inc:181 lib/layouts/svmult.layout:155 -#, fuzzy msgid "ChapMotto" -msgstr "Глава" +msgstr "Девиз главы" #: lib/layouts/svcommon.inc:289 msgid "Run-in headings" @@ -15636,7 +15663,6 @@ msgstr "Заметка в шапке" #: lib/layouts/svglobal.layout:81 lib/layouts/svjog.layout:85 #: lib/layouts/svprobth.layout:115 -#, fuzzy msgid "Headnote (optional):" msgstr "Вступительное замечание (необязательное):" @@ -15659,7 +15685,7 @@ msgstr "Институт #" #: lib/layouts/svglobal.layout:135 lib/layouts/svjog.layout:139 #: lib/layouts/svprobth.layout:169 msgid "Corr Author:" -msgstr "" +msgstr "Корр. автор:" #: lib/layouts/svglobal.layout:139 lib/layouts/svjog.layout:143 #: lib/layouts/svprobth.layout:173 @@ -15680,9 +15706,8 @@ msgid "Subclass" msgstr "Подкласс" #: lib/layouts/svglobal3.layout:76 -#, fuzzy msgid "Mathematics Subject Classification" -msgstr "обновлённых спецификаций классов документов." +msgstr "Классификация предмета математики" #: lib/layouts/svglobal3.layout:79 msgid "CRSC" @@ -15781,13 +15806,15 @@ msgstr "Japanese Book (стандартный класс: вертикально #: lib/layouts/tcolorbox.module:2 msgid "Fancy Colored Boxes" -msgstr "" +msgstr "Красивые цветные блоки" #: lib/layouts/tcolorbox.module:6 msgid "" "Adds custom insets that support colored boxes via the tcolorbox package. See " "the tcolorbox documentation for details." msgstr "" +"Добавляет пользовательские вставки, которые поддерживают цветные блоки с " +"помощью пакета tcolorbox. Подробности см. в документации tcolorbox." #: lib/layouts/tcolorbox.module:11 lib/layouts/tcolorbox.module:14 msgid "Color Box" @@ -15799,7 +15826,7 @@ msgstr "Настройки цветного блока" #: lib/layouts/tcolorbox.module:20 msgid "Insert the color box options here (see tcolorbox manual)" -msgstr "" +msgstr "Вставьте параметры цветоного блока здесь (см. руководство tcolorbox)" #: lib/layouts/tcolorbox.module:26 msgid "Dynamic Color Box" @@ -15807,19 +15834,19 @@ msgstr "Динамический цветной блок" #: lib/layouts/tcolorbox.module:29 msgid "Color Box (Dynamic)" -msgstr "" +msgstr "Цветной блок (динамический)" #: lib/layouts/tcolorbox.module:33 msgid "Fit Color Box" -msgstr "" +msgstr "Поместить цветной блок" #: lib/layouts/tcolorbox.module:35 msgid "Color Box (Fit Contents)" -msgstr "" +msgstr "Цветной блок (подгонка содержимого)" #: lib/layouts/tcolorbox.module:39 lib/layouts/tcolorbox.module:41 msgid "Raster Color Box" -msgstr "" +msgstr "Растровый цветной блок" #: lib/layouts/tcolorbox.module:50 msgid "Subtitle Options" @@ -15843,15 +15870,15 @@ msgstr "-----" #: lib/layouts/tcolorbox.module:81 msgid "Color Box Line" -msgstr "" +msgstr "Линия цветного блока" #: lib/layouts/tcolorbox.module:90 lib/layouts/tcolorbox.module:105 msgid "Color Box Setup" -msgstr "" +msgstr "Настройка цветного блока" #: lib/layouts/tcolorbox.module:118 lib/layouts/tcolorbox.module:121 msgid "New Color Box Type" -msgstr "" +msgstr "Новый тип цветного блока" #: lib/layouts/tcolorbox.module:129 msgid "New Box Options" @@ -15887,11 +15914,11 @@ msgstr "Пользовательский цветной блок 1" #: lib/layouts/tcolorbox.module:159 msgid "More Color Box Options" -msgstr "" +msgstr "Больше настроек цветных блоков" #: lib/layouts/tcolorbox.module:160 msgid "Insert more color box options here" -msgstr "" +msgstr "Вставьте больше настроек цветных блоков здесь" #: lib/layouts/tcolorbox.module:165 lib/layouts/tcolorbox.module:167 msgid "Custom Color Box 2" @@ -16656,6 +16683,10 @@ msgid "" "provides a paragraph style. Passing 'final' as document class option " "suppresses the output of TODO notes." msgstr "" +"Предоставляет настраиваемые вставки для добавления элементов TODO в документ " +"(с помощью пакета todonotes). Для создания 'Списка TODO' модуль " +"предоставляет стиль абзаца. Добавление параметра 'final' в параметры класса " +"подавляет вывод списка TODO." #: lib/layouts/todonotes.module:14 lib/layouts/todonotes.module:119 msgid "TODO" @@ -16675,7 +16706,7 @@ msgstr "Список заголовков TODO" #: lib/layouts/todonotes.module:48 msgid "Enter a custom header for the List of TODOs here" -msgstr "" +msgstr "Введите пользовательский заголовок для списка TODO здесь" #: lib/layouts/todonotes.module:58 msgid "TODO Note (Margin)" @@ -16703,20 +16734,19 @@ msgstr "TODO (Встроенный)" #: lib/layouts/todonotes.module:101 lib/layouts/todonotes.module:103 msgid "Missing Figure" -msgstr "Отсутствует рисунок" +msgstr "Отсутствующий рисунок" #: lib/layouts/todonotes.module:108 msgid "Missing Figure Note Options|s" -msgstr "" +msgstr "Настройки заметки отсутствующего рисунка" #: lib/layouts/todonotes.module:123 msgid "Todo[Inline]" msgstr "Todo[Встроенный]" #: lib/layouts/todonotes.module:127 -#, fuzzy msgid "Todo[margin]" -msgstr "примечание на полях" +msgstr "Заметка Todo [на полях]" #: lib/layouts/todonotes.module:131 msgid "MissingFigure" @@ -16802,14 +16832,20 @@ msgid "" "width). The inset has two optional arguments: vertical adjustment (c|t|b) " "and maximum width (defaults to \\linewidth)." msgstr "" +"Добавляет вставку 'Minipage (пер. ширина)' с использованием пакета varwidth. " +"Пакет varwidth предоставляет minipage переменной ширины, результирующей " +"шириной которого является ширина его содержимого (если она не превышает " +"заданной максимальной ширины). Вставка имеет два необязательных аргумента: " +"вертикальное выравнивание (c|t|b) и максимальная ширина (по умолчанию " +"\\linewidth)." #: lib/layouts/varwidth.module:17 msgid "Minipage (Var. Width)" -msgstr "Мини-страница (пер. ширина)" +msgstr "Minipage (пер. ширина)" #: lib/layouts/varwidth.module:19 msgid "Minipage (var.)" -msgstr "Мини-страница (пер.)" +msgstr "Minipage (пер.)" #: lib/layouts/varwidth.module:31 msgid "Vert. Adjustment" @@ -20735,19 +20771,19 @@ msgstr "cancelto" #: lib/ui/stdtoolbars.inc:468 msgid "Insert left/right side scripts" -msgstr "" +msgstr "Вставка левых/правых боковых скриптов" #: lib/ui/stdtoolbars.inc:469 msgid "Insert right side scripts" -msgstr "" +msgstr "Вставка правых скриптов" #: lib/ui/stdtoolbars.inc:470 msgid "Insert left side scripts" -msgstr "" +msgstr "Вставка левых скриптов" #: lib/ui/stdtoolbars.inc:471 msgid "Insert side scripts" -msgstr "" +msgstr "Вставка боковых скриптов" #: lib/ui/stdtoolbars.inc:472 msgid "overset" @@ -23895,7 +23931,7 @@ msgstr "Огублённый гласный заднего ряда средне #: lib/ui/stdtoolbars.inc:1361 msgid "Mid-central vowel (Schwa)" -msgstr "" +msgstr "Ненапряжённый гласный среднего ряда среднего подъёма (Шва)" #: lib/ui/stdtoolbars.inc:1362 msgid "Open-mid front unrounded vowel" @@ -23923,211 +23959,211 @@ msgstr "Огублённый гласный заднего ряда средне #: lib/ui/stdtoolbars.inc:1368 msgid "Near-open front unrounded vowel" -msgstr "" +msgstr "Ненапряжённый неогублённый гласный переднего ряда нижнего подъёма" #: lib/ui/stdtoolbars.inc:1369 msgid "Near-open vowel" -msgstr "" +msgstr "Ненапряжённый гласный нижнего подъёма" #: lib/ui/stdtoolbars.inc:1370 msgid "Open front unrounded vowel" -msgstr "" +msgstr "Неогублённый гласный переднего ряда нижнего подъёма" #: lib/ui/stdtoolbars.inc:1371 msgid "Open front rounded vowel" -msgstr "" +msgstr "Огублённый гласный переднего ряда нижнего подъёма" #: lib/ui/stdtoolbars.inc:1372 msgid "Open back unrounded vowel" -msgstr "" +msgstr "Неогублённый гласный заднего ряда нижнего подъёма" #: lib/ui/stdtoolbars.inc:1373 msgid "Open back rounded vowel" -msgstr "" +msgstr "Огублённый гласный заднего ряда нижнего подъёма" #: lib/ui/stdtoolbars.inc:1377 msgid "Voiceless labial-velar fricative" -msgstr "" +msgstr "Глухой лабиовелярный фрикативный" #: lib/ui/stdtoolbars.inc:1378 msgid "Voiced labial-velar approximant" -msgstr "" +msgstr "Звонкий лабиовелярный аппроксимант" #: lib/ui/stdtoolbars.inc:1379 msgid "Voiced labial-palatal approximant" -msgstr "" +msgstr "Звонкий лабиопалатальный аппроксимант" #: lib/ui/stdtoolbars.inc:1380 msgid "Voiceless epiglottal fricative" -msgstr "" +msgstr "Глухой эпиглоттальный фрикативный" #: lib/ui/stdtoolbars.inc:1381 msgid "Voiced epiglottal fricative" -msgstr "" +msgstr "Звонкий эпиглоттальный фрикативный" #: lib/ui/stdtoolbars.inc:1382 msgid "Epiglottal plosive" -msgstr "" +msgstr "Эпиглоттальный взрывной" #: lib/ui/stdtoolbars.inc:1383 msgid "Voiceless alveolo-palatal fricative" -msgstr "" +msgstr "Глухой альвео-палатальный фрикативный" #: lib/ui/stdtoolbars.inc:1384 msgid "Voiced alveolo-palatal fricative" -msgstr "" +msgstr "Звонкий альвео-палатальный фрикативный" #: lib/ui/stdtoolbars.inc:1385 msgid "Voiced alveolar lateral flap" -msgstr "" +msgstr "Звонкий альвеолярный латеральный удар" #: lib/ui/stdtoolbars.inc:1386 msgid "Simultaneous voiceless postalveolar and velar fricative" -msgstr "" +msgstr "Одновременный глухой постальвеолярный и велярный фрикативный" #: lib/ui/stdtoolbars.inc:1387 src/insets/InsetIPAMacro.cpp:55 msgid "Top tie bar" -msgstr "Посередине сверху" +msgstr "Верхняя перемычка" #: lib/ui/stdtoolbars.inc:1388 src/insets/InsetIPAMacro.cpp:56 msgid "Bottom tie bar" -msgstr "Посередине снизу" +msgstr "Нижняя перемычка" #: lib/ui/stdtoolbars.inc:1392 msgid "Long" -msgstr "" +msgstr "Долгий" #: lib/ui/stdtoolbars.inc:1393 msgid "Half-long" -msgstr "" +msgstr "Полудолгий" #: lib/ui/stdtoolbars.inc:1394 msgid "Extra short" -msgstr "" +msgstr "Очень короткий" #: lib/ui/stdtoolbars.inc:1395 msgid "Primary stress" -msgstr "" +msgstr "Основное ударение" #: lib/ui/stdtoolbars.inc:1396 msgid "Secondary stress" -msgstr "" +msgstr "Дополнительное ударение" #: lib/ui/stdtoolbars.inc:1397 msgid "Minor (foot) group" -msgstr "" +msgstr "Незначительный разрыв" #: lib/ui/stdtoolbars.inc:1398 msgid "Major (intonation) group" -msgstr "" +msgstr "Значительный разрыв" #: lib/ui/stdtoolbars.inc:1399 msgid "Syllable break" -msgstr "" +msgstr "Разрыв слога" #: lib/ui/stdtoolbars.inc:1400 msgid "Linking (absence of a break)" -msgstr "" +msgstr "Связывание (нет разрыва)" #: lib/ui/stdtoolbars.inc:1404 msgid "Voiceless" -msgstr "" +msgstr "Глухой" #: lib/ui/stdtoolbars.inc:1405 msgid "Voiceless (above)" -msgstr "" +msgstr "Глухой (верхний)" #: lib/ui/stdtoolbars.inc:1406 msgid "Voiced" -msgstr "" +msgstr "Звонкий" #: lib/ui/stdtoolbars.inc:1407 msgid "Breathy voiced" -msgstr "" +msgstr "Придыхательный голос" #: lib/ui/stdtoolbars.inc:1408 msgid "Creaky voiced" -msgstr "" +msgstr "Скрипучий голос" #: lib/ui/stdtoolbars.inc:1409 msgid "Linguolabial" -msgstr "" +msgstr "Язычногубной" #: lib/ui/stdtoolbars.inc:1410 msgid "Dental" -msgstr "" +msgstr "Дентальный" #: lib/ui/stdtoolbars.inc:1411 msgid "Apical" -msgstr "" +msgstr "Апикальный" #: lib/ui/stdtoolbars.inc:1412 msgid "Laminal" -msgstr "" +msgstr "Ламинальный" #: lib/ui/stdtoolbars.inc:1413 msgid "Aspirated" -msgstr "" +msgstr "Аспирированный" #: lib/ui/stdtoolbars.inc:1414 msgid "More rounded" -msgstr "" +msgstr "Более огубленный" #: lib/ui/stdtoolbars.inc:1415 msgid "Less rounded" -msgstr "" +msgstr "Более огубленный" #: lib/ui/stdtoolbars.inc:1416 msgid "Advanced" -msgstr "" +msgstr "Продвинутый" #: lib/ui/stdtoolbars.inc:1417 msgid "Retracted" -msgstr "" +msgstr "Отодвинутый" #: lib/ui/stdtoolbars.inc:1418 msgid "Centralized" -msgstr "" +msgstr "Централизованный" #: lib/ui/stdtoolbars.inc:1419 msgid "Mid-centralized" -msgstr "" +msgstr "Средне-централизованный" #: lib/ui/stdtoolbars.inc:1420 msgid "Syllabic" -msgstr "" +msgstr "Слоговой" #: lib/ui/stdtoolbars.inc:1421 msgid "Non-syllabic" -msgstr "" +msgstr "Неслоговой" #: lib/ui/stdtoolbars.inc:1422 msgid "Rhoticity" -msgstr "" +msgstr "Эризованный" #: lib/ui/stdtoolbars.inc:1423 msgid "Labialized" -msgstr "" +msgstr "Лабиализованный" #: lib/ui/stdtoolbars.inc:1424 msgid "Palatized" -msgstr "" +msgstr "Палатализованный" #: lib/ui/stdtoolbars.inc:1425 msgid "Velarized" -msgstr "" +msgstr "Веляризованный" #: lib/ui/stdtoolbars.inc:1426 msgid "Pharyngialized" -msgstr "" +msgstr "Фарингализованный" #: lib/ui/stdtoolbars.inc:1427 msgid "Velarized or pharyngialized" -msgstr "" +msgstr "Веляризованный или фарингализованный" #: lib/ui/stdtoolbars.inc:1428 msgid "Raised" -msgstr "Приподнятый" +msgstr "Поднятый" #: lib/ui/stdtoolbars.inc:1429 msgid "Lowered" @@ -24135,11 +24171,11 @@ msgstr "Опущенный" #: lib/ui/stdtoolbars.inc:1430 msgid "Advanced tongue root" -msgstr "" +msgstr "Прогрессивный корень языка" #: lib/ui/stdtoolbars.inc:1431 msgid "Retracted tongue root" -msgstr "" +msgstr "Оттянутый корень языка" #: lib/ui/stdtoolbars.inc:1432 msgid "Nasalized" @@ -24159,99 +24195,99 @@ msgstr "Невнятный отпуск" #: lib/ui/stdtoolbars.inc:1439 msgid "Extra high (accent)" -msgstr "" +msgstr "Верхний (ударение)" #: lib/ui/stdtoolbars.inc:1440 msgid "Extra high (tone letter)" -msgstr "" +msgstr "Верхний (литера)" #: lib/ui/stdtoolbars.inc:1441 msgid "High (accent)" -msgstr "" +msgstr "Высокий (ударение)" #: lib/ui/stdtoolbars.inc:1442 msgid "High (tone letter)" -msgstr "" +msgstr "Высокий (литера)" #: lib/ui/stdtoolbars.inc:1443 msgid "Mid (accent)" -msgstr "" +msgstr "Средний (ударение)" #: lib/ui/stdtoolbars.inc:1444 msgid "Mid (tone letter)" -msgstr "" +msgstr "Средний (литера)" #: lib/ui/stdtoolbars.inc:1445 msgid "Low (accent)" -msgstr "" +msgstr "Низкий (ударение)" #: lib/ui/stdtoolbars.inc:1446 msgid "Low (tone letter)" -msgstr "" +msgstr "Низкий (литера)" #: lib/ui/stdtoolbars.inc:1447 msgid "Extra low (accent)" -msgstr "" +msgstr "Нижний (ударение)" #: lib/ui/stdtoolbars.inc:1448 msgid "Extra low (tone letter)" -msgstr "" +msgstr "Нижний (литера)" #: lib/ui/stdtoolbars.inc:1449 msgid "Downstep" -msgstr "Вниз" +msgstr "Снижение тона на шаг" #: lib/ui/stdtoolbars.inc:1450 msgid "Upstep" -msgstr "" +msgstr "Подъём тона на шаг" #: lib/ui/stdtoolbars.inc:1451 msgid "Rising (accent)" -msgstr "" +msgstr "Восходящий (ударение)" #: lib/ui/stdtoolbars.inc:1452 msgid "Rising (tone letter)" -msgstr "" +msgstr "Восходящий (ударение)" #: lib/ui/stdtoolbars.inc:1453 msgid "Falling (accent)" -msgstr "" +msgstr "Нисходящий (ударение)" #: lib/ui/stdtoolbars.inc:1454 msgid "Falling (tone letter)" -msgstr "" +msgstr "Нисходящий (ударение)" #: lib/ui/stdtoolbars.inc:1455 msgid "High rising (accent)" -msgstr "" +msgstr "Высокий восходящий (ударение)" #: lib/ui/stdtoolbars.inc:1456 msgid "High rising (tone letter)" -msgstr "" +msgstr "Высокий восходящий (ударение)" #: lib/ui/stdtoolbars.inc:1457 msgid "Low rising (accent)" -msgstr "" +msgstr "Низкий восходящий (ударение)" #: lib/ui/stdtoolbars.inc:1458 msgid "Low rising (tone letter)" -msgstr "" +msgstr "Низкий восходящий (ударение)" #: lib/ui/stdtoolbars.inc:1459 msgid "Rising-falling (accent)" -msgstr "" +msgstr "Восходяще-нисходящий (ударение)" #: lib/ui/stdtoolbars.inc:1460 msgid "Rising-falling (tone letter)" -msgstr "" +msgstr "Восходяще-нисходящий (ударение)" #: lib/ui/stdtoolbars.inc:1461 msgid "Global rise" -msgstr "Глобальный рост" +msgstr "Общий подъём" #: lib/ui/stdtoolbars.inc:1462 msgid "Global fall" -msgstr "Глобальное падение" +msgstr "Общее снижение" #: lib/xtemplates/chess.xtemplate:14 msgid "ChessDiagram" @@ -26359,6 +26395,11 @@ msgid "" "support offered by LyX for allowing this privilege only to documents that " "actually need it, instead.

" msgstr "" +"

Следующая серверная часть LaTeX настроена так, чтобы разрешить выполнение " +"внешних программ для любого документа:

%1$s

Это опасная конфигурация. Пожалуйста, рассмотрите возможность " +"использования поддержки, предлагаемой LyX для разрешения этой привилегии " +"только для документов, которые действительно в ней нуждаются.

" #: src/Converter.cpp:303 msgid "Security Warning" @@ -26372,6 +26413,10 @@ msgid "" "programs can execute arbitrary commands on your system, including dangerous " "ones, if instructed to do so by a maliciously crafted LyX document.

" msgstr "" +"

Следующая серверная часть LaTeX была предложена для выполнения внешних " +"программ:

%1$s

Внешние программы могут " +"выполнять произвольные команды на вашей системе, в том числе опасные, если " +"они будут проинструктированы вредоносным документом LyX.

" #: src/Converter.cpp:323 #, c-format @@ -26381,6 +26426,10 @@ msgid "" "can execute arbitrary commands on your system, including dangerous ones, if " "instructed to do so by a maliciously crafted LyX document.

" msgstr "" +"

Запрошенная операция требует использования конвертера из %2$s в %3$s:

%1$s

Эта внешняя программа " +"может выполнять произвольные команды на вашей системе, в том числе опасные, " +"если это будет проинструктировано вредоносным документом LyX.

" #: src/Converter.cpp:333 msgid "An external converter is disabled for security reasons" @@ -26393,6 +26442,10 @@ msgid "" "Converters and uncheck Security ▹ Forbid needauth converters.)" msgstr "" +"

Текущие настройки настроек запрещают его выполнение.

(Для " +"измерения этой настройки зайдите в Настройки ▹ Обработка файлов " +"▹ Конвертеры и уберите Security ▹ Forbid needauth " +"converters.)" #: src/Converter.cpp:344 msgid "A LaTeX backend requires your authorization" @@ -30942,11 +30995,11 @@ msgstr "Полные и неполные формы" #: src/frontends/qt4/GuiSymbols.cpp:123 msgid "Linear B Syllabary" -msgstr "" +msgstr "Линейные-B слоги" #: src/frontends/qt4/GuiSymbols.cpp:124 msgid "Linear B Ideograms" -msgstr "" +msgstr "Линейные-B иероглифы" #: src/frontends/qt4/GuiSymbols.cpp:125 msgid "Aegean Numbers" @@ -31014,12 +31067,11 @@ msgstr "Математические буквенно-цифровые симв #: src/frontends/qt4/GuiSymbols.cpp:141 msgid "CJK Unified Ideographs Extension B" -msgstr "" +msgstr "Расширение B иероглифов CJK" #: src/frontends/qt4/GuiSymbols.cpp:142 -#, fuzzy msgid "CJK Compatibility Ideographs Supplement" -msgstr "CJK совместимость" +msgstr "Дополнение совместимости иероглифов CJK" #: src/frontends/qt4/GuiSymbols.cpp:143 msgid "Tags" @@ -31027,7 +31079,7 @@ msgstr "Теги" #: src/frontends/qt4/GuiSymbols.cpp:144 msgid "Variation Selectors Supplement" -msgstr "" +msgstr "Дополнение селекторов вариантов" #: src/frontends/qt4/GuiSymbols.cpp:145 msgid "Supplementary Private Use Area-A" @@ -32333,7 +32385,7 @@ msgstr "" #: src/insets/InsetInclude.cpp:745 msgid "Different use-non-TeX-fonts settings" -msgstr "" +msgstr "Другие настройки использования не-TeX шрифтов" #: src/insets/InsetInclude.cpp:760 #, c-format @@ -32650,7 +32702,7 @@ msgstr "" #: src/insets/InsetListingsParams.cpp:689 msgid "default: _minted-" -msgstr "" +msgstr "default: _minted-" #: src/insets/InsetListingsParams.cpp:768 msgid "Sets encoding expected by Pygments" From 1437ae3f9cf78ffd5c639cb4e70a0b1fba9f600e Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 11 Feb 2018 09:50:38 +0100 Subject: [PATCH 33/40] Disable BUFFER_EXPORT and BUFFER_EXPORT_AS while buffer is processed I am rather irritated we didn't do this already, since synchronous runs with BUFFER_VIEW or BUFFER_UPDATE leads to all sorts of problems, including crashes. Fixes the crash in #8338 (but not the bug itself). --- src/frontends/qt4/GuiView.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 6f5441ceee..cc5a3df44b 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1913,8 +1913,22 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag) enable = doc_buffer && doc_buffer->notifiesExternalModification(); break; - case LFUN_BUFFER_WRITE_AS: + case LFUN_BUFFER_EXPORT: { + if (!doc_buffer || d.processing_thread_watcher_.isRunning()) { + enable = false; + break; + } + return doc_buffer->getStatus(cmd, flag); + break; + } + case LFUN_BUFFER_EXPORT_AS: + if (!doc_buffer || d.processing_thread_watcher_.isRunning()) { + enable = false; + break; + } + // fall through + case LFUN_BUFFER_WRITE_AS: enable = doc_buffer != 0; break; From b0ecfebad438358b09d239bd634b2ebac7985221 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 11 Feb 2018 16:43:14 +0100 Subject: [PATCH 34/40] biblatex-natbib.citeengine: Remove erroneous blank --- lib/citeengines/biblatex-natbib.citeengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/citeengines/biblatex-natbib.citeengine b/lib/citeengines/biblatex-natbib.citeengine index d994add5c0..7bcebae9fd 100644 --- a/lib/citeengines/biblatex-natbib.citeengine +++ b/lib/citeengines/biblatex-natbib.citeengine @@ -255,7 +255,7 @@ CiteFormat authoryear # "Author et al. (cf. Year..." !makecitet %!startlink%%!makeauthor%%!endlink% %!open%%!textbefore%%!makeyear%%!nextcitet% # "cf. Author et al. Year..." - !makecitealt %!textbefore%%!startlink%%!makeauthor% %!makeyear%%!endlink%%!nextcitealt% + !makecitealt %!textbefore%%!startlink%%!makeauthor% %!makeyear%%!endlink%%!nextcitealt% # "Author et al., Year..." !makecitealp %!startlink%%!makeauthor%, %!makeyear%%!endlink%%!nextcitealp% From 6f1f8fe7a21ea991fdac137b24cfdd9e8aafafd2 Mon Sep 17 00:00:00 2001 From: Guillaume MM Date: Sat, 10 Feb 2018 23:31:42 +0100 Subject: [PATCH 35/40] New LFUN inset-split to split an inset --- lib/bind/menus.bind | 2 +- lib/ui/stdcontext.inc | 1 + lib/ui/stdmenus.inc | 1 + src/FuncCode.h | 1 + src/LyXAction.cpp | 9 +++++++ src/insets/InsetText.cpp | 58 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 71 insertions(+), 1 deletion(-) diff --git a/lib/bind/menus.bind b/lib/bind/menus.bind index a27fab842d..d4a86b6254 100644 --- a/lib/bind/menus.bind +++ b/lib/bind/menus.bind @@ -127,7 +127,7 @@ Format 4 \bind "M-p Down" "outline-down" \bind "M-p Return" "command-alternatives environment-split ; environment-split previous" -\bind "M-p S-Return" "environment-split outer" +\bind "M-p S-Return" "inset-split" # These are kept for backwards compatibility (only make sense on US keyboard) diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc index 18e833ee89..6aec3b5ea1 100644 --- a/lib/ui/stdcontext.inc +++ b/lib/ui/stdcontext.inc @@ -344,6 +344,7 @@ Menuset Item "Move Paragraph Down|v" "paragraph-move-down" Separator EnvironmentSeparatorsContext + OptItem "Split inset|s" "inset-split" Separator OptItem "Promote Section|r" "outline-out" OptItem "Demote Section|m" "outline-in" diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index 57077ed4b8..b9af820225 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -135,6 +135,7 @@ Menuset OptItem "Increase List Depth|I" "depth-increment" OptItem "Decrease List Depth|D" "depth-decrement" OptItem "Dissolve Inset" "inset-dissolve" + OptItem "Split Inset" "inset-split" OptItem "TeX Code Settings...|C" "inset-settings ert" # 'a' shortcut to match Insert entry, shouldn't clash with Table Settings OptItem "Float Settings...|a" "inset-settings float" diff --git a/src/FuncCode.h b/src/FuncCode.h index 4a5983147d..3afc6e1b4c 100644 --- a/src/FuncCode.h +++ b/src/FuncCode.h @@ -477,6 +477,7 @@ enum FuncCode //370 LFUN_EXPORT_CANCEL, // rgh, 20171227 LFUN_BUFFER_ANONYMIZE, // sanda, 20180201 + LFUN_INSET_SPLIT, // gm, 20180210 LFUN_LASTACTION // end of the table }; diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index 193c822cd2..6fab464b6d 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -2016,6 +2016,15 @@ void LyXAction::init() */ { LFUN_INSET_DISSOLVE, "inset-dissolve", AtPoint, Edit }, +/*! + * \var lyx::FuncCode lyx::LFUN_INSET_SPLIT + * \li Action: Split the current inset in two. + * \li Syntax: inset-split + * \li Origin: gm, 10 Feb 2018 + * \endvar + */ + { LFUN_INSET_SPLIT, "inset-split", Noop, Edit }, + /*! * \var lyx::FuncCode lyx::LFUN_INSET_EDIT * \li Action: Edit the inset at cursor with an external application, diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp index 24b8fbcf5e..9da93aa205 100644 --- a/src/insets/InsetText.cpp +++ b/src/insets/InsetText.cpp @@ -337,6 +337,61 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd) break; } + case LFUN_INSET_SPLIT: { + Cursor new_cur = cur; + // Ensure we are directly in an InsetText but not the main one. + while (&new_cur.inset() != this && new_cur.depth() > 1) + new_cur.popBackward(); + if (text_.isMainText() || &new_cur.inset() != this) { + cur.undispatched(); + break; + } + cur.beginUndoGroup(); + cur.recordUndoInset(); + // Break paragraphs + FuncRequest par_break(LFUN_PARAGRAPH_BREAK); + FuncRequest depth_decrement(LFUN_DEPTH_DECREMENT); + bool enter_second = true; + if (new_cur.pos() == new_cur.lastpos() + && new_cur.pit() != new_cur.lastpit()) + // when at the end of a paragraph but not the last one + new_cur.top().forwardPos(); + if (new_cur.pos()) + // when not at the beginning of a paragraph + text_.dispatch(new_cur, par_break); + else if (!new_cur.pit()) { + // if at the beginning of the first paragraph + text_.dispatch(new_cur, par_break); + new_cur.top().forwardPos(); + enter_second = false; + } + // set the location of the split to zero depth + while (new_cur.paragraph().params().depth() > 0) + text_.dispatch(new_cur, depth_decrement); + pit_type par = new_cur.pit(); + // Go after the inset + new_cur.popForward(); + // Clone the inset + InsetText * cloned = dynamic_cast(clone()); + LASSERT(cloned, break); + // Trim each inset + new_cur.recordUndo(); + ParagraphList const & pars = text_.paragraphs(); + cloned->text_.paragraphs().assign(pars.constIterator(par), pars.end()); + text_.paragraphs().assign(pars.begin(), pars.constIterator(par)); + // insert and enter the inset + new_cur.insert(cloned); + if (enter_second) + new_cur.forwardPos(); + else + new_cur.backwardPos(); + // finish up + cur.setCursor(new_cur); + cur.endUndoGroup(); + cur.forceBufferUpdate(); + break; + } + default: text_.dispatch(cur, cmd); } @@ -362,6 +417,9 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd, return target_inset; } + case LFUN_INSET_SPLIT: + return !text_.isMainText(); + case LFUN_ARGUMENT_INSERT: { string const arg = cmd.getArg(0); if (arg.empty()) { From 5aa07260bd7e6d8c53e154036b3eda7e1d1c8344 Mon Sep 17 00:00:00 2001 From: Guillaume MM Date: Sun, 11 Feb 2018 00:00:42 +0100 Subject: [PATCH 36/40] README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cf836b5ee9..f190fa8c1f 100644 --- a/README.md +++ b/README.md @@ -58,9 +58,10 @@ For a complete list of changes try * Beamer-flex: Layout and examples for beamer that uses flex insets instead of environments for frames and similar insets. (Also available from .) +* Custom insets are now available from the toolbar. +* New command to split an inset (inset-split). * Layout and templates for easychair.cls. (Also available from .) -* Custom insets are now available from the toolbar. * Improved default parameters and shortcuts. * Open hyperlinks in application from the contextual menu in a secure way. (#9906) @@ -80,7 +81,6 @@ For a complete list of changes try * Fix automatically loaded packages with acmart. * Properly enforce scrolling boundaries. * Properly reset references and counters when updating citations. -* Fix visual ambiguity between nested pars and continues environments. (#10978) * Properly reset selection when inputting a composed character. ## Minor enhancements From 8e2cf38abf51f66cbeca53f1fa683e41a2542c9f Mon Sep 17 00:00:00 2001 From: Guillaume MM Date: Sun, 11 Feb 2018 18:56:24 +0100 Subject: [PATCH 37/40] Convert beamer doc, examples and templates to beamer-flex. Mark the old one as obsolete. --- README.md | 19 +- lib/Makefile.am | 17 +- lib/doc/Beamer-flex.lyx | 4376 +++++++++++++++++ lib/doc/Makefile.am | 1 + lib/examples/beamer-article.lyx | 4 +- lib/examples/beamer-flex.lyx | 1351 ----- ...xample1.lyx => beamerlyxexample1-flex.lyx} | 713 ++- lib/examples/de/beamer-article.lyx | 17 +- lib/examples/de/beamer.lyx | 17 +- lib/examples/fr/beamer-article.lyx | 12 +- lib/examples/fr/beamer.lyx | 15 +- lib/examples/ja/beamer.lyx | 17 +- lib/layouts/article-beamer.layout | 4 +- lib/layouts/beamer-flex.inc | 2 +- lib/layouts/beamer.layout | 4 +- lib/layouts/beamerposter.layout | 4 +- lib/layouts/scrarticle-beamer.layout | 4 +- .../beamer-conference-ornate-20min.lyx | 206 +- .../de_beamer-conference-ornate-20min.lyx | 19 +- .../es_beamer-conference-ornate-20min.lyx | 19 +- .../fr_beamer-conference-ornate-20min.lyx | 14 +- .../ja_beamer-conference-ornate-20min.lyx | 19 +- lib/templates/poster-beamerposter.lyx | 226 +- lib/ui/stdmenus.inc | 2 +- 24 files changed, 5313 insertions(+), 1769 deletions(-) create mode 100644 lib/doc/Beamer-flex.lyx delete mode 100644 lib/examples/beamer-flex.lyx rename lib/examples/{beamerlyxexample1.lyx => beamerlyxexample1-flex.lyx} (92%) rename lib/templates/{ => obsolete}/de_beamer-conference-ornate-20min.lyx (98%) rename lib/templates/{ => obsolete}/es_beamer-conference-ornate-20min.lyx (98%) rename lib/templates/{ => obsolete}/fr_beamer-conference-ornate-20min.lyx (98%) rename lib/templates/{ => obsolete}/ja_beamer-conference-ornate-20min.lyx (98%) diff --git a/README.md b/README.md index f190fa8c1f..a510befbd6 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ For Ubuntu this is distributed as part of LyX unstable on the PPA: # What is LyX? LyX is a document processor and equation editor that encourages an approach to -writing based on the structure of your documents, rather than their -appearance. It is released under a Free Software / Open Source license. +writing based on the structure of your documents, rather than their appearance. +It is released under a Free Software / Open Source license. LyX is for people who write and want their writing to look great, right out of the box. No more endless tinkering with formatting details, “finger painting” @@ -55,14 +55,17 @@ For a complete list of changes try * Better display for High-dpi screens: lines and drawings are now proportional to the zoom level. * Better display for Low-dpi screens: lines and drawings are now antialiased. -* Beamer-flex: Layout and examples for beamer that uses flex insets instead of - environments for frames and similar insets. (Also available from - .) -* Custom insets are now available from the toolbar. -* New command to split an inset (inset-split). +* Beamer-flex: Layout for beamer that uses flex insets instead of environments + for frames and similar environments, complete with documentation, templates + and examples. This solves common issues reported by Beamer users. (The layout + is available from for backwards- + compatibility.) +* A new Custom insets menu is available from the toolbar, useful for Beamer-flex. + The button remembers which inset was entered last. +* New command to split an inset (inset-split), useful for Beamer-flex. * Layout and templates for easychair.cls. (Also available from .) -* Improved default parameters and shortcuts. +* Improved default parameters and shortcuts, more beginner-friendly. * Open hyperlinks in application from the contextual menu in a secure way. (#9906) diff --git a/lib/Makefile.am b/lib/Makefile.am index 4d6a4d67dd..0386f099d8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -311,7 +311,6 @@ dist_examples_DATA = \ examples/addressExample.adr \ examples/amsart-test.lyx \ examples/amsbook-test.lyx \ - examples/beamer-flex.lyx \ examples/beamer-article.lyx \ examples/beamer-g4.jpg \ examples/beamer-g4-mask.jpg \ @@ -324,7 +323,7 @@ dist_examples_DATA = \ examples/beamer-knight3.png \ examples/beamer-knight4-mask.png \ examples/beamer-knight4.png \ - examples/beamerlyxexample1.lyx \ + examples/beamerlyxexample1-flex.lyx \ examples/beamerposter.lyx \ examples/biblioExample.bib \ examples/chess-article.lyx \ @@ -2141,11 +2140,13 @@ dist_layouts_DATA =\ layouts/arab-article.layout \ layouts/article.layout \ layouts/article-beamer.layout \ + layouts/article-beamer-flex.layout \ layouts/beamer.layout \ layouts/beamer-flex.inc \ layouts/beamer-flex.layout \ layouts/beamer-flex.module \ layouts/beamerposter.layout \ + layouts/beamerposter-flex.layout \ layouts/bicaption.module \ layouts/book.layout \ layouts/braille.module \ @@ -2267,6 +2268,7 @@ dist_layouts_DATA =\ layouts/sciposter.layout \ layouts/scrartcl.layout \ layouts/scrarticle-beamer.layout \ + layouts/scrarticle-beamer-flex.layout \ layouts/scrbook.layout \ layouts/scrclass.inc \ layouts/scrlettr.layout \ @@ -2401,15 +2403,12 @@ dist_templates_DATA = \ templates/APA6.lyx \ templates/beamer-conference-ornate-20min.lyx \ templates/ctex.lyx \ - templates/de_beamer-conference-ornate-20min.lyx \ templates/dinbrief.lyx \ templates/DocBook_article.lyx \ templates/easychair-article.lyx \ templates/ectaart.lyx \ templates/elsarticle.lyx \ templates/EPS-cropped.lyx \ - templates/es_beamer-conference-ornate-20min.lyx \ - templates/fr_beamer-conference-ornate-20min.lyx \ templates/frletter.lyx \ templates/g-brief2.lyx \ templates/hollywood.lyx \ @@ -2421,7 +2420,6 @@ dist_templates_DATA = \ templates/IJMPD.lyx \ templates/IOP-article.lyx \ templates/IUCr-article.lyx \ - templates/ja_beamer-conference-ornate-20min.lyx \ templates/JASA.lyx \ templates/JSS-article.lyx \ templates/kluwer.lyx \ @@ -2444,8 +2442,13 @@ dist_obsoletetemplates_DATA = \ templates/obsolete/ACM-siggraph.lyx \ templates/obsolete/ACM-sigplan.lyx \ templates/obsolete/ACM-SIGS.lyx \ + templates/obsolete/de_beamer-conference-ornate-20min.lyx \ + templates/obsolete/es_beamer-conference-ornate-20min.lyx \ + templates/obsolete/fr_beamer-conference-ornate-20min.lyx \ templates/obsolete/g-brief-de.lyx \ - templates/obsolete/g-brief-en.lyx + templates/obsolete/g-brief-en.lyx \ + templates/obsolete/ja_beamer-conference-ornate-20min.lyx + springertemplatesdir = $(pkgdatadir)/templates/springer dist_springertemplates_DATA = \ diff --git a/lib/doc/Beamer-flex.lyx b/lib/doc/Beamer-flex.lyx new file mode 100644 index 0000000000..0db50f38a7 --- /dev/null +++ b/lib/doc/Beamer-flex.lyx @@ -0,0 +1,4376 @@ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 544 +\begin_document +\begin_header +\save_transient_properties true +\origin /systemlyxdir/doc/ +\textclass beamer-flex +\begin_preamble +% We use the "Berkeley" theme with a 3.45em-wide side bar on the left +\usetheme[left,width=3.45em]{Berkeley} +\end_preamble +\use_default_options true +\maintain_unincluded_children false +\language english +\language_package default +\inputencoding auto +\fontencoding global +\font_roman "lmodern" "default" +\font_sans "lmss" "default" +\font_typewriter "lmtt" "default" +\font_math "auto" "auto" +\font_default_family default +\use_non_tex_fonts false +\font_sc false +\font_osf false +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype false +\use_dash_ligatures false +\graphics default +\default_output_format pdf2 +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry true +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 1 +\use_package mathtools 1 +\use_package mhchem 1 +\use_package stackrel 1 +\use_package stmaryrd 1 +\use_package undertilde 1 +\cite_engine basic +\cite_engine_type default +\biblio_style plain +\use_bibtopic false +\use_indices false +\paperorientation portrait +\suppress_date false +\justification true +\use_refstyle 1 +\use_minted 0 +\index Index +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\is_math_indent 0 +\math_numbering_side default +\quotes_style english +\dynamic_quotes 0 +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Title +Presentations with Beamer and \SpecialChar LyX + +\end_layout + +\begin_layout Subtitle +An Introduction to the Basics +\end_layout + +\begin_layout Author +The \SpecialChar LyX + Team +\end_layout + +\begin_layout Date +Version +\begin_inset space ~ +\end_inset + +2.3 +\end_layout + +\begin_layout TitleGraphic +\begin_inset Graphics + filename clipart/3D-structure-distort.pdf + lyxscale 30 + scale 10 + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout FrameTitle +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +presentation +\end_layout + +\end_inset + +Contents +\end_layout + +\begin_layout Plain Layout +\begin_inset CommandInset toc +LatexCommand tableofcontents + +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Section +Purposes +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout + ++- +\end_layout + +\end_inset + + +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Purpose of the Beamer class +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +With the +\begin_inset Flex Structure +status open + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + class, you can produce presentation slides, which +\end_layout + +\begin_layout Itemize +are visually highly customizable +\end_layout + +\begin_layout Itemize +can be very well structured +\end_layout + +\begin_layout Itemize +can be constructed step-by-step ( +\begin_inset Quotes eld +\end_inset + +overlay +\begin_inset Quotes erd +\end_inset + + concept) +\end_layout + +\begin_layout Itemize +may contain different navigation paths (note that the slides contain all + sorts of hyperlinks) +\end_layout + +\begin_layout Itemize +use \SpecialChar LaTeX +'s superb output quality +\end_layout + +\begin_layout Itemize +might embed multimedia content (audio, video) +\end_layout + +\begin_layout Itemize +can easily be transformed to accompanying material (such as an article-like + handout) +\end_layout + +\begin_layout Itemize +and much more \SpecialChar ldots + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Purpose of this presentation +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +This presentation +\end_layout + +\begin_layout Itemize +describes some basic features of +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Itemize +especially how they can be used with \SpecialChar LyX + +\end_layout + +\begin_layout Plain Layout +For more general and comprehensive information on +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + itself, please refer to the extensive class manual +\begin_inset CommandInset citation +LatexCommand cite +key "beamer-ug" +literal "true" + +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Section +Segments of a presentation +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +The global structure +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +A presentation usually consists of +\end_layout + +\begin_layout Itemize +a title page, +\end_layout + +\begin_layout Itemize +slides that might be grouped to sections/parts, +\end_layout + +\begin_layout Itemize +an appendix with additional information, such as a bibliography. +\end_layout + +\begin_layout Plain Layout +We describe these global segments in what follows. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +The title page +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +Within \SpecialChar LyX +, a title page is constructed by the layouts +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Title +\end_layout + +\end_inset + +, +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Subtitle +\end_layout + +\end_inset + +, +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Author +\end_layout + +\end_inset + +, +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Institute +\end_layout + +\end_inset + +, +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Date +\end_layout + +\end_inset + + and +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +TitleGraphic +\end_layout + +\end_inset + +. + +\end_layout + +\begin_layout Itemize +None of these elements is mandatory, but at least one must be given. +\end_layout + +\begin_layout Itemize +The order of insertion does not matter (the real order is defined in the + +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + theme). +\end_layout + +\begin_layout Itemize +For +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Title +\end_layout + +\end_inset + +, +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Subtitle +\end_layout + +\end_inset + +, +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Author +\end_layout + +\end_inset + +, +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Institute +\end_layout + +\end_inset + + and +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Date +\end_layout + +\end_inset + +, you can define +\begin_inset Quotes eld +\end_inset + +short +\begin_inset Quotes erd +\end_inset + + forms via +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Insert\SpecialChar menuseparator +Short Title\SpecialChar breakableslash +Date\SpecialChar breakableslash +\SpecialChar ldots + +\end_layout + +\end_inset + + These are used in the sidebar\SpecialChar breakableslash +heading (given the theme actually provides + a sidebar\SpecialChar breakableslash +heading). +\end_layout + +\begin_layout Itemize +If you select +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Title (Plain Frame) +\end_layout + +\end_inset + + instead of +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Title +\end_layout + +\end_inset + +, the title page will have no sidebar or heading. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Slides/Frames +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +Slides are called +\begin_inset Quotes eld +\end_inset + +frames +\begin_inset Quotes erd +\end_inset + + in +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + +. + Everything inside a frame is put on one slide (which itself might consist + of sub-slides). +\end_layout + +\begin_layout Itemize +Select the +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Frame +\end_layout + +\end_inset + + inset to start a frame. + All Beamer insets are available from the +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Custom insets +\end_layout + +\end_inset + + menu ( +\begin_inset Info +type "icon" +arg "custom-insets" +\end_inset + +). +\end_layout + +\begin_layout Itemize +The frame title is to be inserted in the +\begin_inset Quotes eld +\end_inset + +Frame title +\begin_inset Quotes erd +\end_inset + + inset, which is automatically inserted for new frames or can be manually + inserted via +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Insert\SpecialChar menuseparator +Frame Title +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Itemize +Alternatively, you can also use the +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +FrameTitle +\end_layout + +\end_inset + + layout, which additionally offers a (rarely used) short frame title option, + and, more importantly, overlay options. +\end_layout + +\begin_layout Itemize +A subtitle can be added via the +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +FrameSubtitle +\end_layout + +\end_inset + + layout. +\end_layout + +\begin_layout Itemize +Frame options (see +\begin_inset CommandInset citation +LatexCommand cite +key "beamer-ug" +literal "true" + +\end_inset + + for the diverse options) are inserted via +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Insert\SpecialChar menuseparator +Frame Options +\end_layout + +\end_inset + +, overlay options via +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Insert\SpecialChar menuseparator +Overlay Specifications +\end_layout + +\end_inset + + and +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Insert\SpecialChar menuseparator +Default Overlay Specifications +\end_layout + +\end_inset + + (we explain later what this is). +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +1-2 +\end_layout + +\end_inset + + +\begin_inset Argument 3 +status open + +\begin_layout Plain Layout +label=myframe +\end_layout + +\end_inset + + +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Frames can be repeated +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +Frames can be repeated fully or only in terms of selected sub-slides, multiple + times at any later point of the presentation. +\end_layout + +\begin_layout Plain Layout +You just need to give the respective frame a label name via the frame option + +\begin_inset Quotes eld +\end_inset + +label +\begin_inset Quotes erd +\end_inset + + (as done here). +\end_layout + +\begin_layout Pause + +\end_layout + +\begin_layout Plain Layout +Then you can repeat this frame by means of the +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +AgainFrame +\end_layout + +\end_inset + + layout later in the presentation. + Just enter the label name in the +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +AgainFrame +\end_layout + +\end_inset + + layout and specify, if required, which sub-slides you want to be repeated + via +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Insert\SpecialChar menuseparator +Overlay Specifications +\end_layout + +\end_inset + + (again, see below for the concept of +\begin_inset Quotes eld +\end_inset + +overlays +\begin_inset Quotes erd +\end_inset + +). +\end_layout + +\begin_layout Proof +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +3 +\end_layout + +\end_inset + + +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Here's the proof! +\end_layout + +\end_inset + + (This text is only shown on sub-slide 3 which is itself only shown when + this frame is repeated later on) +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Splitting a frame +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout +Tips +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Itemize +Frames (or groups thereof) can easily be rearranged with cut & paste. +\end_layout + +\begin_layout Itemize +There is a simple way to split a frame: Issue +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Edit\SpecialChar menuseparator +Split inset +\end_layout + +\end_inset + + ( +\begin_inset Info +type "shortcut" +arg "inset-split" +\end_inset + +). +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout AgainFrame +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +3 +\end_layout + +\end_inset + +myframe +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame (plain) +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Special frame types +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\SpecialChar LyX + provides two special frame types: +\end_layout + +\begin_layout Enumerate +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Frame (plain) +\end_layout + +\end_inset + + is a frame without a sidebar/header (such as this one). + This is useful for slides with much content\SpecialChar breakableslash +wide tables +\end_layout + +\begin_layout Enumerate +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Frame (fragile) +\end_layout + +\end_inset + + is to be used if the frame consists of +\begin_inset Quotes eld +\end_inset + +fragile +\begin_inset Quotes erd +\end_inset + + content, especially verbatim stuff such as program listings +\end_layout + +\begin_layout Plain Layout +If you want a fragile plain frame, pass the option +\begin_inset Quotes eld +\end_inset + +plain +\begin_inset Quotes erd +\end_inset + + to a fragile frame or the option +\begin_inset Quotes eld +\end_inset + +fragile +\begin_inset Quotes erd +\end_inset + + to a plain frame. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Sectioning a presentation +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Itemize +To group frames, you can use the usual sectioning commands ( +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Section +\end_layout + +\end_inset + +, +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Subsection +\end_layout + +\end_inset + + etc.) +\end_layout + +\begin_layout Itemize +These are shown in the table of contents, the sidebar\SpecialChar breakableslash +header (depending on + the theme) and the article output (for +\begin_inset Quotes eld +\end_inset + +article +\begin_inset Quotes erd +\end_inset + + see below, the section on +\begin_inset Quotes eld +\end_inset + +modes +\begin_inset Quotes erd +\end_inset + +) +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Parts have special meaning +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Itemize +You can also divide your presentation into +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Parts +\end_layout + +\end_inset + +. + Note, however, that parts behave differently in +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + than in other document classes: a part is considered to be +\begin_inset Quotes eld +\end_inset + +a little +\begin_inset Quotes els +\end_inset + +talk of its own +\begin_inset Quotes ers +\end_inset + + with its own table of contents, its own navigation bars, and so on. +\begin_inset Quotes erd +\end_inset + + +\begin_inset CommandInset citation +LatexCommand cite +after "sec.~10.3" +key "beamer-ug" +literal "true" + +\end_inset + + +\end_layout + +\begin_layout Itemize +This means, for instance, that if you use parts, the table of contents will + only list the sections and subsections of the part that contains this table + of contents, and the sidebar\SpecialChar breakableslash +header will also only show the sections of + the current part. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +The appendix +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Itemize +Appendices might be useful for additional\SpecialChar breakableslash +reserve material. + The appendix is part of the presentation, but not shown in the table of + contents\SpecialChar breakableslash +sidebar\SpecialChar breakableslash +header +\end_layout + +\begin_layout Itemize +An appendix is inserted as usual in \SpecialChar LyX +: +\end_layout + +\begin_deeper +\begin_layout Itemize +Use +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Document\SpecialChar menuseparator +Start Appendix Here +\end_layout + +\end_inset + + at the position where the appendix should begin +\end_layout + +\end_deeper +\begin_layout Itemize +Typical content of the appendix is the bibliography +\end_layout + +\begin_deeper +\begin_layout Itemize +You insert it as in all other \SpecialChar LyX + classes, via the +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Bibliography +\end_layout + +\end_inset + + style (see the bibliography at the end of this presentation as an example) +\end_layout + +\begin_layout Itemize +Note that you can also use Bib\SpecialChar TeX +, although not all Bib\SpecialChar TeX + styles are prepared + to work with +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + +\end_layout + +\end_deeper +\end_inset + + +\end_layout + +\begin_layout Section +The overlay concept +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +What are overlays? +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +Basically, the overlay concept allows to change the slide content dynamically. + You can uncover things/text piecewise, fade out content, highlight things, + replace text, images etc. +\end_layout + +\begin_layout Pause + +\end_layout + +\begin_layout Itemize +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + ++- +\end_layout + +\end_inset + +Overlays are useful to build up slides as you speak +\end_layout + +\begin_layout Itemize +They help you to shift your audience's focus on specific things +\end_layout + +\begin_layout Itemize +And they help your audience to follow you +\end_layout + +\begin_layout Itemize +So use overlays! +\begin_inset Flex Alert +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +6 +\end_layout + +\end_inset + +Really, use them! +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Overlay types +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + provides many different overlay types. + The most important ones are: +\end_layout + +\begin_layout Description +Hidden +\begin_inset space ~ +\end_inset + +content: Stuff that is completely invisible up to a point +\end_layout + +\begin_layout Description +Covered +\begin_inset space ~ +\end_inset + +content: Stuff that is faded out (not completely invisible) +\end_layout + +\begin_layout Description +Highlighted +\begin_inset space ~ +\end_inset + +content: Stuff that is somehow emphasized at a certain point +\end_layout + +\begin_layout Plain Layout +We give examples for these types in what follows, but begin with some general + remarks on overlay possibilities +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +General overlay/action possibilities +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +Many +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + elements provide overlay settings. + Basically, you can define on which sub-slide(s) a given content appears + ( +\begin_inset Quotes eld +\end_inset + +2 +\begin_inset Quotes erd +\end_inset + +, +\begin_inset Quotes eld +\end_inset + +2-4 +\begin_inset Quotes erd +\end_inset + +, +\begin_inset Quotes eld +\end_inset + +3- +\begin_inset Quotes erd +\end_inset + +, +\begin_inset Quotes eld +\end_inset + +1,3 +\begin_inset Quotes erd +\end_inset + + etc.), or in which output mode ( +\begin_inset Quotes eld +\end_inset + +presentation +\begin_inset Quotes erd +\end_inset + +, +\begin_inset Quotes eld +\end_inset + +article +\begin_inset Quotes erd +\end_inset + + etc.) +\end_layout + +\begin_layout Itemize +In \SpecialChar LyX +, these settings are generally accessible via +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Insert\SpecialChar menuseparator +Overlay Specifications +\end_layout + +\end_inset + + or +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Insert\SpecialChar menuseparator +Action Specifications +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Overprint +\begin_inset Argument item:1 +status open + +\begin_layout Plain Layout + +2 +\end_layout + +\end_inset + + +\end_layout + +\begin_deeper +\begin_layout Definition +\begin_inset Quotes eld +\end_inset + +Action +\begin_inset Quotes erd +\end_inset + + is a more general concept, which does not only include what we have called + +\begin_inset Quotes eld +\end_inset + +overlays +\begin_inset Quotes erd +\end_inset + + ( +\begin_inset Quotes eld +\end_inset + +on which sub-slide[s] is this to be shown\SpecialChar breakableslash +hidden\SpecialChar breakableslash +highlighted +\begin_inset Quotes erd +\end_inset + +), but also tasks such as +\begin_inset Quotes eld +\end_inset + +only show this in the presentation, not on the handout +\begin_inset Quotes erd +\end_inset + + or +\begin_inset Quotes eld +\end_inset + +show this on the second screen only +\begin_inset Quotes erd +\end_inset + + (so-called +\begin_inset Quotes eld +\end_inset + +modes +\begin_inset Quotes erd +\end_inset + +). +\end_layout + +\end_deeper +\begin_layout Overprint +\begin_inset Argument item:1 +status open + +\begin_layout Plain Layout + +3 +\end_layout + +\end_inset + + +\begin_inset Flex Alert Block +status open + +\begin_layout Plain Layout +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout +Note to the \SpecialChar LaTeX + aficionados +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +The mentioned overlay/action settings conform to those command/environment + options embraced by +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +\begin_inset space \space{} +\end_inset + +<\SpecialChar ldots +> +\end_layout + +\end_inset + + and +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +[<\SpecialChar ldots +>] +\end_layout + +\end_inset + + in the \SpecialChar LaTeX + output. +\end_layout + +\begin_layout Plain Layout +Note that \SpecialChar LyX + adds those braces on export, so you must not enter them yourself. + In other words, enter +\begin_inset Quotes eld +\end_inset + +1 +\begin_inset Quotes erd +\end_inset + + or +\begin_inset Quotes eld +\end_inset + ++- +\begin_inset Quotes erd +\end_inset + + to the overlay/action insets, not +\begin_inset Quotes eld +\end_inset + +<1> +\begin_inset Quotes erd +\end_inset + + or +\begin_inset Quotes eld +\end_inset + +[<+->] +\begin_inset Quotes erd +\end_inset + +! +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +An example +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +Take for example a quote. + In a +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Quote +\end_layout + +\end_inset + + environment, you can specify the overlay settings via +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Insert\SpecialChar menuseparator +Overlay Specifications +\end_layout + +\end_inset + +. + If you do this and enter +\begin_inset Quotes eld +\end_inset + +2 +\begin_inset Quotes erd +\end_inset + +, the quote will only appear on (sub-)slide 2: +\end_layout + +\begin_layout Quote +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +2 +\end_layout + +\end_inset + +Fear no more the heat o’ the sun +\end_layout + +\begin_layout Quote +Nor the furious winter’s rages +\end_layout + +\begin_layout Quote +Thou thy worldly task hast done +\end_layout + +\begin_layout Quote +Home art gone, and ta’en thy wages +\end_layout + +\begin_layout Plain Layout +This is how the concept works, basically. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Covering vs. + hiding +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +The difference between +\begin_inset Quotes eld +\end_inset + +covering +\begin_inset Quotes erd +\end_inset + + and +\begin_inset Quotes eld +\end_inset + +hiding +\begin_inset Quotes erd +\end_inset + + is that hidden content is treated as if it isn't there, while covered content + is just covered (and the space is reserved). + If we would have hidden the quote on the last slide and not covered, it + would only have taken space on appearance: +\end_layout + +\begin_layout Quote +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +only@2 +\end_layout + +\end_inset + +Fear no more the heat o’ the sun +\end_layout + +\begin_layout Quote +Nor the furious winter’s rages +\end_layout + +\begin_layout Quote +Thou thy worldly task hast done +\end_layout + +\begin_layout Quote +Home art gone, and ta’en thy wages +\end_layout + +\begin_layout Plain Layout +You can see how this text moves when the quote is un-hidden. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Coverage degrees +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset ERT +status open + +\begin_layout Plain Layout + + +\backslash +setbeamercovered{transparent} +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + offers several degrees of +\begin_inset Quotes eld +\end_inset + +coverage +\begin_inset Quotes erd +\end_inset + +, which can be set via the command +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout + +\backslash +setbeamercovered +\end_layout + +\end_inset + + either globally (for the whole presentation) or locally (e. +\begin_inset space \thinspace{} +\end_inset + +g. + for a single frame, as here). + By default, content is completely covered. + In +\begin_inset Quotes eld +\end_inset + +transparent +\begin_inset Quotes erd +\end_inset + + mode, you can see covered text greyed-out: +\end_layout + +\begin_layout Quote +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +2 +\end_layout + +\end_inset + +Fear no more the heat o’ the sun +\end_layout + +\begin_layout Quote +Nor the furious winter’s rages +\end_layout + +\begin_layout Quote +Thou thy worldly task hast done +\end_layout + +\begin_layout Quote +Home art gone, and ta’en thy wages +\end_layout + +\begin_layout Plain Layout +Check the +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + manual for more possibilities. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Default overlay/action specifications vs. +\begin_inset Newline newline +\end_inset + +(normal) overlay/action specifications +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Itemize +For some environments (such as lists and also frames), you can set +\begin_inset Quotes eld +\end_inset + +default specifications +\begin_inset Quotes erd +\end_inset + + additionally to normal overlay/action specifications (or in the case of + lists: +\begin_inset Quotes eld +\end_inset + +overlay specifications +\begin_inset Quotes erd +\end_inset + + for the whole list and +\begin_inset Quotes eld +\end_inset + +item overlay specifications +\begin_inset Quotes erd +\end_inset + + for singular items) +\end_layout + +\begin_layout Itemize +Default specifications apply to all content of the given environment, if + not individually specified otherwise +\end_layout + +\begin_layout Itemize +They use a placeholder syntax. + E. +\begin_inset space \thinspace{} +\end_inset + +g., +\begin_inset Quotes eld +\end_inset + ++(1)- +\begin_inset Quotes erd +\end_inset + + will uncover all items in a list step by step (with a start offset of 1) + if they have no individual item specification: +\end_layout + +\begin_deeper +\begin_layout Itemize +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + ++(1)- +\end_layout + +\end_inset + +One +\end_layout + +\begin_layout Itemize +Two +\end_layout + +\begin_layout Itemize +Three +\end_layout + +\begin_layout Itemize +\begin_inset Argument item:2 +status open + +\begin_layout Plain Layout + +1- +\end_layout + +\end_inset + +Always +\end_layout + +\end_deeper +\begin_layout Plain Layout +Please consult the +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + manual for details on this syntax. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout + ++- +\end_layout + +\end_inset + + +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Default overlay/action specifications vs. +\begin_inset Newline newline +\end_inset + +(normal) overlay/action specifications +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\noindent +This frame uses a specific default overlay specification +\end_layout + +\begin_layout Plain Layout +which causes each overlay-aware paragraph \SpecialChar ldots + +\end_layout + +\begin_layout Itemize +\SpecialChar ldots + or list item \SpecialChar ldots + +\end_layout + +\begin_layout Itemize +\SpecialChar ldots + to appear \SpecialChar ldots + +\end_layout + +\begin_layout Itemize +\SpecialChar ldots + on a subsequent sub-slide \SpecialChar ldots + +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout +A block +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\SpecialChar ldots + one after the other +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout + +alert@+ +\end_layout + +\end_inset + + +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Default overlay/action specifications vs. +\begin_inset Newline newline +\end_inset + +(normal) overlay/action specifications +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\noindent +And this frame uses a specific default overlay specification \SpecialChar ldots + +\end_layout + +\begin_layout Itemize +\SpecialChar ldots + which causes each overlay-aware list item \SpecialChar ldots + +\end_layout + +\begin_layout Itemize +\SpecialChar ldots + to be highlighted \SpecialChar ldots + +\end_layout + +\begin_layout Itemize +\SpecialChar ldots + on respective sub-slides +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Pause +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +The +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Pause +\end_layout + +\end_inset + + layout lets you mark a point where all following content will be covered + (by default for one slide, with regard to the content preceding the pause): +\end_layout + +\begin_layout Pause + +\end_layout + +\begin_layout Plain Layout +After first pause +\end_layout + +\begin_layout Pause + +\end_layout + +\begin_layout Plain Layout +After second pause +\end_layout + +\begin_layout Pause +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout +2 +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +By default, consecutive pauses also end consecutively. + +\end_layout + +\begin_layout Plain Layout +Via +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Insert\SpecialChar menuseparator +Pause Number +\end_layout + +\end_inset + +, however, you can specify a specific sub-slide at which the given pause + ends, independent from the number of pauses inserted before this one. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Paragraph-wide overlays +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + and \SpecialChar LyX + provide you with paragraph layouts whose purpose it is to show/hide + whole paragraphs or sequences of paragraphs on specific slides. + These are particularly: +\end_layout + +\begin_layout Uncover +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +2- +\end_layout + +\end_inset + +The +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Uncovered +\end_layout + +\end_inset + + layout which uncovers all content on the specified slides \SpecialChar ldots + +\end_layout + +\begin_deeper +\begin_layout Itemize +\SpecialChar ldots + including nested paragraphs of other layout. +\end_layout + +\end_deeper +\begin_layout Only +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +3- +\end_layout + +\end_inset + +The +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Only +\end_layout + +\end_inset + + layout which un-hides content (note again how the surrounding text +\begin_inset Quotes eld +\end_inset + +moves +\begin_inset Quotes erd +\end_inset + + when this gets visible). +\end_layout + +\begin_layout Overprint +\begin_inset Argument item:1 +status open + +\begin_layout Plain Layout + +4 +\end_layout + +\end_inset + +And the +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Overprint +\end_layout + +\end_inset + + environment which lets you enter \SpecialChar ldots + +\end_layout + +\begin_layout Overprint +\begin_inset Argument item:1 +status open + +\begin_layout Plain Layout + +5 +\end_layout + +\end_inset + +\SpecialChar ldots + alternative text taking a specific space on specified slides. +\end_layout + +\begin_layout Plain Layout +as demonstrated here. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Inline overlays +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset Note Note +status collapsed + +\begin_layout Plain Layout +To demonstrate uncover/visible difference: +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +setbeamercovered{transparent} +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + also supports inline overlays for text parts (as opposed to whole paragraphs), + which are accessible via +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Edit\SpecialChar menuseparator +Text Style +\end_layout + +\end_inset + + in \SpecialChar LyX +: +\end_layout + +\begin_layout Itemize +You can +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +uncover +\end_layout + +\end_inset + + +\begin_inset Flex Uncover +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +2- +\end_layout + +\end_inset + +text +\end_layout + +\end_inset + + on specific slides +\end_layout + +\begin_layout Itemize +You can make +\begin_inset Flex Visible +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +3- +\end_layout + +\end_inset + +text +\end_layout + +\end_inset + + +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +visible +\end_layout + +\end_inset + + (which makes a difference to +\begin_inset Quotes eld +\end_inset + +uncover +\begin_inset Quotes erd +\end_inset + + only with +\begin_inset Quotes eld +\end_inset + +transparent +\begin_inset Quotes erd +\end_inset + + coverage setting, as used locally on this slide) +\end_layout + +\begin_layout Itemize +You can show +\begin_inset Flex Only +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +4- +\end_layout + +\end_inset + +text +\end_layout + +\end_inset + + +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +only +\end_layout + +\end_inset + + on specific slides +\end_layout + +\begin_layout Itemize +You can make +\begin_inset Flex Invisible +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +5- +\end_layout + +\end_inset + +text +\end_layout + +\end_inset + + +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +invisible +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Itemize +And you can show +\begin_inset Flex Alternative +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +6- +\end_layout + +\end_inset + + +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout +different +\end_layout + +\end_inset + + +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +alternative +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + text +\end_layout + +\begin_layout Plain Layout +As for the paragraph layouts, the overlay settings can be accessed via the + +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Insert +\end_layout + +\end_inset + + menu. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Overlay-aware commands +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +Many +\begin_inset Quotes eld +\end_inset + +inline +\begin_inset Quotes erd +\end_inset + + commands (also to be found at +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Edit\SpecialChar menuseparator +Text Style +\end_layout + +\end_inset + +) are overlay-aware. + +\end_layout + +\begin_layout Itemize +Thus, you can make for instance text on specific slides +\begin_inset Flex Emphasize +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +2 +\end_layout + +\end_inset + +emphasized +\end_layout + +\end_inset + +, +\begin_inset Flex Bold +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +3 +\end_layout + +\end_inset + +bold +\end_layout + +\end_inset + +, shown in +\begin_inset Flex Alert +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +4 +\end_layout + +\end_inset + +alert +\end_layout + +\end_inset + + or +\begin_inset Flex Structure +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +5 +\end_layout + +\end_inset + +structure +\end_layout + +\end_inset + + color. +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +6 +\end_layout + +\end_inset + + +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout +Tip +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +Use these Emphasize and Bold insets (instead of the usual respective font + settings) also if you do not need overlay specifications. + Due to the way emphasized and bold is defined in +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + +, normal emphasizing and boldface can lead to \SpecialChar LaTeX + errors, e. +\begin_inset space \thinspace{} +\end_inset + +g. + when used in section headings. +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Section +Specific environments +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Specific environments +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +Specific environments, particularly suited for presentations are: +\end_layout + +\begin_layout Itemize +Diverse +\begin_inset Quotes eld +\end_inset + +blocks +\begin_inset Quotes erd +\end_inset + + +\end_layout + +\begin_layout Itemize +Theorem-style environments +\end_layout + +\begin_layout Itemize +Columns +\end_layout + +\begin_layout Plain Layout +We sketch them briefly in what follows. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Blocks +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +Blocks can contain all sorts of information. + We used them here for +\begin_inset Quotes eld +\end_inset + +tips +\begin_inset Quotes erd +\end_inset + + and +\begin_inset Quotes eld +\end_inset + +hints +\begin_inset Quotes erd +\end_inset + +. + The class provides 3 pre-defined blocks with different look: +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +2- +\end_layout + +\end_inset + + +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout +Block +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +A general-purpose block +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex Example Block +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +3- +\end_layout + +\end_inset + + +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout +Example Block +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +A block for +\begin_inset Quotes eld +\end_inset + +examples +\begin_inset Quotes erd +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex Alert Block +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +4- +\end_layout + +\end_inset + + +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout +Alert Block +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +And an +\begin_inset Quotes eld +\end_inset + +alert +\begin_inset Quotes erd +\end_inset + + block for important remarks. +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Theorem-style environments +\end_layout + +\end_inset + + +\end_layout + +\begin_layout FrameSubtitle +(Theorem, Corollary, Definition, Definitions, Example, Examples, Fact, Proof) +\end_layout + +\begin_layout Plain Layout +Theorems look similar to blocks in the output, but they have a fixed title + (depending on the type). + +\end_layout + +\begin_layout Theorem +This is a theorem! +\end_layout + +\begin_layout Fact +This is a fact! +\end_layout + +\begin_layout Pause + +\end_layout + +\begin_layout Plain Layout +Via +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Insert\SpecialChar menuseparator +Additional Theorem Text +\end_layout + +\end_inset + +, you can add some extra text to this fixed title +\end_layout + +\begin_layout Example +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout +a bad one! +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Example +An example with additional text (brackets added automatically) +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Columns +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +Sometimes it is useful to divide a presentation into columns +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex Columns +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout +t +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Column + +.4 +\backslash +textwidth +\end_layout + +\begin_layout Plain Layout +To do this, first insert a +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Columns +\end_layout + +\end_inset + + inset ( +\begin_inset Info +type "icon" +arg "custom-insets" +\end_inset + +) to start the columns +\end_layout + +\begin_layout Pause + +\end_layout + +\begin_layout Column + +.4 +\backslash +textwidth +\end_layout + +\begin_layout Plain Layout +And then, in the following paragraph, select the +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Column +\end_layout + +\end_inset + + layout to start a specific column +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Pause + +\end_layout + +\begin_layout Plain Layout +\begin_inset VSpace defskip +\end_inset + + +\end_layout + +\begin_layout Plain Layout +Note: In the +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Column +\end_layout + +\end_inset + + environment, you need to specify the width using \SpecialChar LaTeX + syntax (something like + +\begin_inset Quotes eld +\end_inset + + +\family typewriter +3.5cm +\family default + +\begin_inset Quotes erd +\end_inset + + or +\begin_inset Quotes eld +\end_inset + + +\family typewriter +.4 +\backslash +textwidth +\family default + +\begin_inset Quotes erd +\end_inset + + will work) +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Section +Short remarks on modes +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Modes +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +In +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + terms, a +\begin_inset Quotes eld +\end_inset + +mode +\begin_inset Quotes erd +\end_inset + + is a specific output route. + There are several modes for different purposes. + We just want to highlight three: +\end_layout + +\begin_layout Enumerate +The +\begin_inset Quotes eld +\end_inset + +beamer +\begin_inset Quotes erd +\end_inset + + mode +\end_layout + +\begin_layout Enumerate +The +\begin_inset Quotes eld +\end_inset + +presentation +\begin_inset Quotes erd +\end_inset + + mode +\end_layout + +\begin_layout Enumerate +The +\begin_inset Quotes eld +\end_inset + +article +\begin_inset Quotes erd +\end_inset + + mode +\end_layout + +\begin_layout Plain Layout +The beamer mode is the default. + Unless explicitly specified otherwise, your +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + document is in +\begin_inset Quotes eld +\end_inset + +beamer +\begin_inset Quotes erd +\end_inset + + mode. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +presentation +\end_layout + +\end_inset + + +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Switching Modes +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +However, you can switch document parts, frames, headings and all +\begin_inset Quotes eld +\end_inset + +action +\begin_inset Quotes erd +\end_inset + +-aware environments to a different mode. + For instance, we have switched this frame to +\begin_inset Quotes eld +\end_inset + +presentation +\begin_inset Quotes erd +\end_inset + + mode. +\end_layout + +\begin_layout Itemize +What does this mean? +\end_layout + +\begin_layout Itemize +It means that this frame will only be visible in the presentation, not in + the accompanying +\begin_inset Quotes eld +\end_inset + +article +\begin_inset Quotes erd +\end_inset + +, if you produce such an article (we will elaborate on this a bit below) +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +article +\end_layout + +\end_inset + + +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Switching Modes +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +This frame will not be visible in the presentation, but only in the article, + since it is in +\begin_inset Quotes eld +\end_inset + +article +\begin_inset Quotes erd +\end_inset + + mode. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +So what? +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +This is actually pretty useful! You can set up a single document and produce + both a presentation and—using the article mode—a handout. + +\end_layout + +\begin_layout Itemize +And we mean a +\begin_inset Flex Emphasize +status collapsed + +\begin_layout Plain Layout +real +\end_layout + +\end_inset + +, useful handout, not one of those scaled slide printouts that are so common + nowadays (but if you insist, you can produce one of those as well) +\end_layout + +\begin_layout Itemize +Modes allow you to add extra text to the handout or hide parts from it +\end_layout + +\begin_layout Itemize +You can use for instance different graphics for the presentation and the + handout +\end_layout + +\begin_layout Itemize +and so on \SpecialChar ldots + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Examples +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +As said, many elements are mode-aware. + +\end_layout + +\begin_layout Itemize +\noindent +You can show particular text +\begin_inset Flex Only +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +presentation +\end_layout + +\end_inset + +only in the presentation +\end_layout + +\end_inset + + +\begin_inset Flex Only +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +article +\end_layout + +\end_inset + +only in the article +\end_layout + +\end_inset + + via +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +\noindent +Edit\SpecialChar menuseparator +Text Style\SpecialChar menuseparator +Only +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex ArticleMode +status open + +\begin_layout Itemize +Or put all sorts of complex contents via an +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +ArticleMode +\end_layout + +\end_inset + + inset ( +\begin_inset Info +type "icon" +arg "custom-insets" +\end_inset + +) that will only be output in article mode +\end_layout + +\end_inset + + +\begin_inset Flex PresentationMode +status open + +\begin_layout Itemize +Or put all sorts of complex contents via a +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +PresentationMode +\end_layout + +\end_inset + + inset ( +\begin_inset Info +type "icon" +arg "custom-insets" +\end_inset + +) that will only be output in presentation mode +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Itemize +Or you can define that an +\begin_inset Flex Emphasize +status collapsed + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +presentation +\end_layout + +\end_inset + +emphasizing +\end_layout + +\end_inset + + should only apply to the presentation, +\begin_inset Flex Bold +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +article +\end_layout + +\end_inset + +a bold face +\end_layout + +\end_inset + + only to article +\end_layout + +\begin_layout Itemize +You can also show section headings or frame titles\SpecialChar breakableslash +subtitles only in the + presentation\SpecialChar breakableslash +article (like we do for the +\begin_inset Quotes eld +\end_inset + +Contents +\begin_inset Quotes erd +\end_inset + + and +\begin_inset Quotes eld +\end_inset + +References +\begin_inset Quotes erd +\end_inset + + frame titles in this presentation) +\end_layout + +\begin_layout Itemize +And much more of this sort \SpecialChar ldots + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Setting up an article +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +Setting up a beamer article with \SpecialChar LyX + is easy. +\end_layout + +\begin_layout Itemize +\noindent +Just create a new document with the class +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +\noindent +Beamer-flex Article (Standard Class) +\end_layout + +\end_inset + + or +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +\noindent +Beamer-flex Article (KOMA-Script) +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Itemize +Then add the presentation to this document as a child (via +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Insert\SpecialChar menuseparator +File\SpecialChar menuseparator +Child Document\SpecialChar ldots + +\end_layout + +\end_inset + +) +\end_layout + +\begin_layout Itemize +And that's it. + Now you can produce the handout and the presentation by compiling one of + these two documents, while you only need to edit one, namely the presentation +\end_layout + +\begin_layout Plain Layout +Check out the accompanying beamer-article example document for this presentation. + You can find it in the same folder as this document. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Section +Changing the look +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Themes +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Itemize +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + presentations are themeable. + Themes determine the colors used, the macro structure (use of sidebars, + headlines etc.), the fonts, the look of list items, blocks and in general + the whole look and feel of a presentation +\end_layout + +\begin_layout Itemize +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + itself ships a number of different-looking themes to chose from (we use + the +\begin_inset Quotes eld +\end_inset + +Berkeley +\begin_inset Quotes erd +\end_inset + + theme in this presentation; see +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout +Document\SpecialChar menuseparator +Settings\SpecialChar menuseparator +LaTeX +\begin_inset space ~ +\end_inset + +Preamble +\end_layout + +\end_inset + + for how we activated and slightly tweaked the theme) +\end_layout + +\begin_layout Itemize +In addition to this standard set, you can get more themes from +\begin_inset CommandInset href +LatexCommand href +name "CTAN" +target "http://www.ctan.org" +literal "false" + +\end_inset + + and other places at the Internet +\end_layout + +\begin_layout Itemize +If you still are not satisified or if you need a theme matching to your + University's or company's corporate design, the +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + manual +\begin_inset CommandInset citation +LatexCommand cite +key "beamer-ug" +literal "true" + +\end_inset + + explains how you can setup your own theme +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +Themes can be modified +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +But you do not need to write a theme from scratch if you want to alter the + look. +\end_layout + +\begin_layout Itemize +Existing themes can be modified both in details and in major areas (such + as the coloring) +\end_layout + +\begin_layout Itemize +Consult the +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + manual +\begin_inset CommandInset citation +LatexCommand cite +key "beamer-ug" +literal "true" + +\end_inset + + for details +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Section +And more \SpecialChar ldots + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout +\begin_inset Argument 4 +status open + +\begin_layout Plain Layout +\SpecialChar ldots + much more! +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +Note that +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + can do much more than we have described here. + The +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + manual +\begin_inset CommandInset citation +LatexCommand cite +key "beamer-ug" +literal "true" + +\end_inset + + provides a comprehensive documentation. +\end_layout + +\begin_layout Plain Layout +Also, have a look at the +\begin_inset Flex Structure +status collapsed + +\begin_layout Plain Layout +Beamer +\end_layout + +\end_inset + + examples and templates shipped with \SpecialChar LyX +! +\end_layout + +\begin_layout Description +templates/beamer-conference-ornate-20min.lyx A template for a short talk, + with advice. +\end_layout + +\begin_layout Description +examples/beamerlyxexample1-flex.lyx An advanced example. +\end_layout + +\begin_layout Description +examples/beamer-article.lyx The current document in article mode. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Section +\start_of_appendix +Appendix +\end_layout + +\begin_layout Standard +\begin_inset Note Note +status open + +\begin_layout Plain Layout +We use a FrameTitle layout (and not the Frame Title inset) below in order + to exclude the redundant title from the article. + Also note the +\begin_inset Flex Alert +status collapsed + +\begin_layout Plain Layout + +\backslash +newblock +\end_layout + +\end_inset + + in the bibliography. + It is needed for proper entry rendering (note the different coloring of + the author in the PDF output). +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout FrameTitle +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +presentation +\end_layout + +\end_inset + +References +\end_layout + +\begin_layout Bibliography +\begin_inset CommandInset bibitem +LatexCommand bibitem +key "beamer-ug" +literal "true" + +\end_inset + +Tantau, Till et al.: +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +newblock +\end_layout + +\end_inset + + The beamer class. + +\begin_inset Flex URL +status collapsed + +\begin_layout Plain Layout + +https://ctan.org/tex-archive/macros/latex/contrib/beamer/doc/beameruserguide.pdf +\end_layout + +\end_inset + +. +\end_layout + +\end_inset + + +\end_layout + +\end_body +\end_document diff --git a/lib/doc/Makefile.am b/lib/doc/Makefile.am index e18228cc78..70ab574dcb 100644 --- a/lib/doc/Makefile.am +++ b/lib/doc/Makefile.am @@ -5,6 +5,7 @@ EXTRA_DIST = README.Documentation docdir = $(pkgdatadir)/doc dist_doc_DATA = \ Additional.lyx \ + Beamer-flex.lyx \ Customization.lyx \ Development.lyx \ DummyTextDocument.txt \ diff --git a/lib/examples/beamer-article.lyx b/lib/examples/beamer-article.lyx index a2e3fcf9e8..0fb9671d7c 100644 --- a/lib/examples/beamer-article.lyx +++ b/lib/examples/beamer-article.lyx @@ -1,4 +1,4 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header @@ -141,7 +141,7 @@ Do not show this warning again! \begin_layout Standard \begin_inset CommandInset include LatexCommand include -filename "beamer.lyx" +filename "../doc/Beamer-flex.lyx" \end_inset diff --git a/lib/examples/beamer-flex.lyx b/lib/examples/beamer-flex.lyx deleted file mode 100644 index f22b48ea1a..0000000000 --- a/lib/examples/beamer-flex.lyx +++ /dev/null @@ -1,1351 +0,0 @@ -#LyX 2.2 created this file. For more info see http://www.lyx.org/ -\lyxformat 508 -\begin_document -\begin_header -\save_transient_properties true -\origin unavailable -\textclass beamer-flex -\begin_preamble -\usetheme{Warsaw} -% or ... - -\setbeamercovered{transparent} -% or whatever (possibly just delete it) -\end_preamble -\use_default_options false -\maintain_unincluded_children false -\language english -\language_package default -\inputencoding auto -\fontencoding global -\font_roman "times" "default" -\font_sans "default" "default" -\font_typewriter "default" "default" -\font_math "auto" "auto" -\font_default_family default -\use_non_tex_fonts false -\font_sc false -\font_osf false -\font_sf_scale 100 100 -\font_tt_scale 100 100 -\graphics default -\default_output_format default -\output_sync 0 -\bibtex_command default -\index_command default -\paperfontsize default -\spacing single -\use_hyperref false -\papersize default -\use_geometry true -\use_package amsmath 2 -\use_package amssymb 2 -\use_package cancel 0 -\use_package esint 0 -\use_package mathdots 1 -\use_package mathtools 0 -\use_package mhchem 1 -\use_package stackrel 0 -\use_package stmaryrd 0 -\use_package undertilde 0 -\cite_engine basic -\cite_engine_type default -\biblio_style plain -\use_bibtopic false -\use_indices false -\paperorientation portrait -\suppress_date false -\justification true -\use_refstyle 0 -\index Index -\shortcut idx -\color #008000 -\end_index -\secnumdepth 2 -\tocdepth 2 -\paragraph_separation indent -\paragraph_indentation default -\quotes_language english -\papercolumns 1 -\papersides 1 -\paperpagestyle default -\tracking_changes false -\output_changes false -\html_math_output 0 -\html_css_as_file 0 -\html_be_strict false -\end_header - -\begin_body - -\begin_layout Standard -\begin_inset Note Note -status open - -\begin_layout Plain Layout -This file is a solution template for: -\end_layout - -\begin_layout Itemize -Talk at a conference/colloquium. - -\end_layout - -\begin_layout Itemize -Talk length is about 20min. - -\end_layout - -\begin_layout Itemize -Style is ornate. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Note Note -status collapsed - -\begin_layout Plain Layout -Copyright 2004 by Till Tantau . - -\end_layout - -\begin_layout Plain Layout -In principle, this file can be redistributed and/or modified under the terms - of the GNU Public License, version 2. - However, this file is supposed to be a template to be modified for your - own needs. - For this reason, if you use this file as a template and not specifically - distribute it as part of a another package/program, the author grants the - extra permission to freely copy and modify this file as you see fit and - even to delete this copyright notice. - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Title -Title As It Is In the Proceedings -\begin_inset Argument 1 -status open - -\begin_layout Plain Layout -Short Paper Title -\begin_inset Note Note -status collapsed - -\begin_layout Plain Layout -optional, use only with long paper titles -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Subtitle -Include Only If Paper Has a Subtitle -\end_layout - -\begin_layout Author -F. -\begin_inset space ~ -\end_inset - -Author -\begin_inset Flex InstituteMark -status open - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -and -\end_layout - -\end_inset - - S. -\begin_inset space ~ -\end_inset - -Another -\begin_inset Flex InstituteMark -status collapsed - -\begin_layout Plain Layout -2 -\end_layout - -\end_inset - - -\begin_inset Note Note -status collapsed - -\begin_layout Itemize -Give the names in the same order as the appear in the paper. - -\end_layout - -\begin_layout Itemize -Use the -\begin_inset Quotes eld -\end_inset - -Institute mark -\begin_inset Quotes erd -\end_inset - - inset ( -\family sans -Insert\SpecialChar menuseparator -Custom Insets\SpecialChar menuseparator -InstituteMark -\family default -) only if the authors have different affiliations. -\end_layout - -\end_inset - - -\begin_inset Argument 1 -status open - -\begin_layout Plain Layout -Author, Another -\begin_inset Note Note -status collapsed - -\begin_layout Plain Layout -- optional, use only with lots of authors -\end_layout - -\begin_layout Plain Layout -- if there are really lots of authors, use -\begin_inset Quotes eld -\end_inset - -Author et al. -\begin_inset Quotes erd -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Institute -\begin_inset Flex InstituteMark -status collapsed - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - -Department of Computer Science -\begin_inset Newline newline -\end_inset - -University of Somewhere -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -and -\end_layout - -\end_inset - - -\begin_inset Flex InstituteMark -status collapsed - -\begin_layout Plain Layout -2 -\end_layout - -\end_inset - -Department of Theoretical Philosophy -\begin_inset Newline newline -\end_inset - -University of Elsewhere -\begin_inset Note Note -status collapsed - -\begin_layout Itemize -Use the -\begin_inset Quotes eld -\end_inset - -Institute mark -\begin_inset Quotes erd -\end_inset - - inset ( -\family sans -Insert\SpecialChar menuseparator -Custom Insets\SpecialChar menuseparator -InstituteMark -\family default -) only if there are several affiliations. -\end_layout - -\begin_layout Itemize -Keep it simple, no one is interested in your street address. -\end_layout - -\end_inset - - -\begin_inset Argument 1 -status open - -\begin_layout Plain Layout -Universities of Somewhere and Elsewhere -\begin_inset Note Note -status collapsed - -\begin_layout Plain Layout -optional, but mostly needed -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Date -Conference on Fabulous Presentations, 2003 -\begin_inset Note Note -status collapsed - -\begin_layout Itemize -Either use conference name or its abbreviation. - -\end_layout - -\begin_layout Itemize -Not really informative to the audience, more for people (including yourself) - who are reading the slides online -\end_layout - -\end_inset - - -\begin_inset Argument 1 -status open - -\begin_layout Plain Layout -CFP 2003 -\begin_inset Note Note -status collapsed - -\begin_layout Plain Layout -optional, should be abbreviation of conference name -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Note Note -status open - -\begin_layout Plain Layout -If you have a file called "institution-logo-filename.xxx", where xxx is a - graphic format that can be processed by latex or pdflatex, resp., then you - can add a logo by uncommenting the following: -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset ERT -status open - -\begin_layout Plain Layout - -% -\backslash -pgfdeclareimage[height=0.5cm]{institution-logo}{institution-logo-filename} -\end_layout - -\begin_layout Plain Layout - -% -\backslash -logo{ -\backslash -pgfuseimage{institution-logo}} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Note Note -status open - -\begin_layout Plain Layout -The following causes the table of contents to be shown at the beginning - of every subsection. - Delete this, if you do not want it. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset ERT -status open - -\begin_layout Plain Layout - - -\backslash -AtBeginSubsection[]{% -\end_layout - -\begin_layout Plain Layout - - -\backslash -frame{ -\end_layout - -\begin_layout Plain Layout - - -\backslash -frametitle{Outline} -\end_layout - -\begin_layout Plain Layout - - -\backslash -tableofcontents[currentsection,currentsubsection] -\end_layout - -\begin_layout Plain Layout - - } -\end_layout - -\begin_layout Plain Layout - -} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Note Note -status open - -\begin_layout Plain Layout -If you wish to uncover everything in a step-wise fashion, uncomment the - following command: -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset ERT -status open - -\begin_layout Plain Layout - -% -\backslash -beamerdefaultoverlayspecification{<+->} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Flex Frame -status open - -\begin_layout Plain Layout -\begin_inset Argument 4 -status open - -\begin_layout Plain Layout -Outline -\end_layout - -\end_inset - - -\begin_inset CommandInset toc -LatexCommand tableofcontents - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Note Note -status open - -\begin_layout Plain Layout -Structuring a talk is a difficult task and the following structure may not - be suitable. - Here are some rules that apply for this solution: -\end_layout - -\begin_layout Itemize -Exactly two or three sections (other than the summary). - -\end_layout - -\begin_layout Itemize -At *most* three subsections per section. - -\end_layout - -\begin_layout Itemize -Talk about 30s to 2min per frame. - So there should be between about 15 and 30 frames, all told. -\end_layout - -\begin_layout Itemize -A conference audience is likely to know very little of what you are going - to talk about. - So *simplify*! -\end_layout - -\begin_layout Itemize -In a 20min talk, getting the main ideas across is hard enough. - Leave out details, even if it means being less precise than you think necessary. - -\end_layout - -\begin_layout Itemize -If you omit details that are vital to the proof/implementation, just say - so once. - Everybody will be happy with that. - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Section -Motivation -\end_layout - -\begin_layout Subsection -The Basic Problem That We Studied -\begin_inset Argument 2 -status open - -\begin_layout Plain Layout -Basic Problem -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Flex Frame -status open - -\begin_layout Plain Layout -\begin_inset Argument 4 -status open - -\begin_layout Plain Layout -Make Titles Informative. - Use Uppercase Letters. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout FrameSubtitle -Frame subtitles are optional. - Use upper- or lowercase letters. -\begin_inset Note Note -status open - -\begin_layout Plain Layout -A title should summarize the slide in an understandable fashion for anyone - how does not follow everything on the slide itself. - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Itemize -Use Itemize a lot. -\end_layout - -\begin_deeper -\begin_layout Pause - -\end_layout - -\end_deeper -\begin_layout Itemize -Use very short sentences or short phrases. -\end_layout - -\begin_deeper -\begin_layout Pause - -\end_layout - -\end_deeper -\begin_layout Itemize -These overlays are created using the Pause style. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Flex Frame -status open - -\begin_layout Plain Layout -\begin_inset Argument 4 -status open - -\begin_layout Plain Layout -Make Titles Informative. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Itemize -\begin_inset Argument item:2 -status open - -\begin_layout Plain Layout -1- -\end_layout - -\end_inset - -You can also use overlay specifications to create overlays. -\end_layout - -\begin_layout Itemize -\begin_inset Argument item:2 -status open - -\begin_layout Plain Layout -3- -\end_layout - -\end_inset - -This allows you to present things in any order. -\end_layout - -\begin_layout Itemize -\begin_inset Argument item:2 -status open - -\begin_layout Plain Layout -2- -\end_layout - -\end_inset - -This is shown second. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Flex Frame -status open - -\begin_layout Plain Layout -\begin_inset Argument 4 -status open - -\begin_layout Plain Layout -Make Titles Informative. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\begin_inset Flex Block -status open - -\begin_layout Plain Layout -\begin_inset Argument 1 -status open - -\begin_layout Plain Layout -1- -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Itemize -Untitled block. -\end_layout - -\begin_layout Itemize -Shown on all slides. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\begin_inset Flex Example Block -status open - -\begin_layout Plain Layout -\begin_inset Argument 1 -status open - -\begin_layout Plain Layout -2- -\end_layout - -\end_inset - - -\begin_inset Argument 2 -status open - -\begin_layout Plain Layout -Some Example Block Title -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Itemize -\begin_inset Formula $e^{i\pi}=-1$ -\end_inset - -. -\end_layout - -\begin_layout Itemize -\begin_inset Formula $e^{i\pi/2}=i$ -\end_inset - -. -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Subsection -Previous Work -\end_layout - -\begin_layout Standard -\begin_inset Flex Frame -status open - -\begin_layout Plain Layout -\begin_inset Argument 4 -status open - -\begin_layout Plain Layout -Make Titles Informative. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Example -\begin_inset Argument 1 -status open - -\begin_layout Plain Layout -1- -\end_layout - -\end_inset - -On first slide. -\end_layout - -\begin_layout Plain Layout -\begin_inset Separator plain -\end_inset - - -\end_layout - -\begin_layout Example -\begin_inset Argument 1 -status open - -\begin_layout Plain Layout -2- -\end_layout - -\end_inset - -On second slide. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Section -Our Results/Contribution -\end_layout - -\begin_layout Subsection -Main Results -\end_layout - -\begin_layout Standard -\begin_inset Flex Frame -status open - -\begin_layout Plain Layout -\begin_inset Argument 4 -status open - -\begin_layout Plain Layout -Make Titles Informative. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Theorem -On first slide. -\end_layout - -\begin_layout Pause - -\end_layout - -\begin_layout Corollary -On second slide. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Flex Frame -status open - -\begin_layout Plain Layout -\begin_inset Argument 4 -status open - -\begin_layout Plain Layout -Make Titles Informative. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\begin_inset Flex Columns -status open - -\begin_layout Plain Layout -\begin_inset Argument 1 -status open - -\begin_layout Plain Layout -T -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Column - -0.5 -\backslash -textwidth -\end_layout - -\begin_layout Theorem -\begin_inset Argument 1 -status open - -\begin_layout Plain Layout -1- -\end_layout - -\end_inset - -In left column. -\end_layout - -\begin_layout Column - -0.5 -\backslash -textwidth -\end_layout - -\begin_layout Corollary -\begin_inset Argument 1 -status open - -\begin_layout Plain Layout -2- -\end_layout - -\end_inset - -In right column. -\begin_inset Newline newline -\end_inset - -New line -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Subsection -Basic Ideas for Proofs/Implementations -\end_layout - -\begin_layout Section* -Summary -\end_layout - -\begin_layout Standard -\begin_inset Flex Frame -status open - -\begin_layout Plain Layout -\begin_inset Argument 4 -status open - -\begin_layout Plain Layout -Summary -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Itemize -The -\color none - -\color inherit - -\begin_inset Flex Alert -status open - -\begin_layout Plain Layout -first main message -\end_layout - -\end_inset - - -\color none - of your talk in one or two lines. -\end_layout - -\begin_layout Itemize -The -\color none - -\color inherit - -\begin_inset Flex Alert -status open - -\begin_layout Plain Layout -second main message -\end_layout - -\end_inset - - -\color none - of your talk in one or two lines. -\end_layout - -\begin_layout Itemize -Perhaps a -\color none - -\color inherit - -\begin_inset Flex Alert -status open - -\begin_layout Plain Layout -third message -\end_layout - -\end_inset - - -\color none -, but not more than that. -\end_layout - -\begin_layout Plain Layout -\begin_inset Note Note -status open - -\begin_layout Plain Layout -An outlook is always optional. -\end_layout - -\end_inset - - -\begin_inset VSpace defskip -\end_inset - - -\end_layout - -\begin_layout Itemize -Outlook -\end_layout - -\begin_deeper -\begin_layout Itemize -What we have not done yet. -\end_layout - -\begin_layout Itemize -Even more stuff. -\end_layout - -\end_deeper -\end_inset - - -\end_layout - -\begin_layout Section* -\start_of_appendix -\begin_inset Note Note -status open - -\begin_layout Plain Layout -All of the following is optional and typically not needed. -\end_layout - -\end_inset - -Appendix -\end_layout - -\begin_layout Subsection* -For Further Reading -\end_layout - -\begin_layout Standard -\begin_inset Flex Frame -status open - -\begin_layout Plain Layout -\begin_inset Argument 3 -status collapsed - -\begin_layout Plain Layout -allowframebreaks -\end_layout - -\end_inset - - -\begin_inset Argument 4 -status open - -\begin_layout Plain Layout -For Further Reading -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\begin_inset ERT -status open - -\begin_layout Plain Layout - - -\backslash -beamertemplatebookbibitems -\end_layout - -\end_inset - - -\begin_inset Note Note -status open - -\begin_layout Plain Layout -Start with overview books. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Bibliography -\begin_inset CommandInset bibitem -LatexCommand bibitem -key "Author1990" - -\end_inset - -A. - Author. - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -newblock -\end_layout - -\end_inset - - -\emph on -Handbook of Everything -\emph default -. -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -newblock -\end_layout - -\end_inset - - Some Press, 1990. -\begin_inset ERT -status open - -\begin_layout Plain Layout - - -\backslash -beamertemplatearticlebibitems -\end_layout - -\end_inset - - -\begin_inset Note Note -status open - -\begin_layout Plain Layout -Followed by interesting articles. - Keep the list short. - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Bibliography -\begin_inset CommandInset bibitem -LatexCommand bibitem -key "Someone2002" - -\end_inset - -S. - Someone. -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -newblock -\end_layout - -\end_inset - - On this and that -\emph on -. - -\emph default - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -newblock -\end_layout - -\end_inset - - -\emph on -Journal on This and That -\emph default -. - 2(1):50–100, 2000. -\end_layout - -\end_inset - - -\end_layout - -\end_body -\end_document diff --git a/lib/examples/beamerlyxexample1.lyx b/lib/examples/beamerlyxexample1-flex.lyx similarity index 92% rename from lib/examples/beamerlyxexample1.lyx rename to lib/examples/beamerlyxexample1-flex.lyx index 922cee1048..9f8a27e2fc 100644 --- a/lib/examples/beamerlyxexample1.lyx +++ b/lib/examples/beamerlyxexample1-flex.lyx @@ -1,10 +1,10 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header \save_transient_properties true \origin /systemlyxdir/examples/ -\textclass beamer +\textclass beamer-flex \begin_preamble \beamertemplateshadingbackground{red!5}{structure!5} @@ -257,7 +257,11 @@ ICSI January 30th, 2004 \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -270,8 +274,7 @@ Outline \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout \begin_inset CommandInset toc LatexCommand tableofcontents @@ -279,7 +282,7 @@ LatexCommand tableofcontents \begin_inset ERT -status collapsed +status open \begin_layout Plain Layout @@ -291,7 +294,11 @@ status collapsed \end_layout -\end_deeper +\end_inset + + +\end_layout + \begin_layout Standard \begin_inset ERT status open @@ -357,7 +364,11 @@ Introduction What are Tournaments? \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -370,17 +381,16 @@ Tournaments Consist of Jousts Between Knights \end_layout -\begin_deeper -\begin_layout Columns - -\end_layout +\begin_layout Plain Layout +\begin_inset Flex Columns +status open -\begin_deeper \begin_layout Column + 5.75cm \end_layout -\begin_layout Standard +\begin_layout Plain Layout \begin_inset ERT status collapsed @@ -547,10 +557,15 @@ end{pgfpicture} \end_layout \begin_layout Column + 6cm \end_layout -\begin_layout Block +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status open @@ -563,7 +578,6 @@ What is a Tournament? \end_layout -\begin_deeper \begin_layout Itemize \begin_inset Argument item:2 status open @@ -606,17 +620,26 @@ status open In every joust one knight wins. \end_layout -\end_deeper -\end_deeper -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Frame +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -629,17 +652,16 @@ Tournaments are Complete Directed Graphs \end_layout -\begin_deeper -\begin_layout Columns - -\end_layout +\begin_layout Plain Layout +\begin_inset Flex Columns +status open -\begin_deeper \begin_layout Column + 5cm \end_layout -\begin_layout Standard +\begin_layout Plain Layout \begin_inset ERT status collapsed @@ -836,6 +858,7 @@ end{pgfpicture} \end_layout \begin_layout Column + 6cm \end_layout @@ -872,19 +895,34 @@ with exactly one edge between \end_inset any two different vertices. +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + \end_layout \end_deeper -\end_deeper -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Frame +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -908,8 +946,11 @@ Tournaments Arise Naturally in Different Situations \end_layout -\begin_deeper -\begin_layout ExampleBlock +\begin_layout Plain Layout +\begin_inset Flex Example Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -922,8 +963,7 @@ Applications in Ordering Theory \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout Elements in a set need to be sorted. \begin_inset Newline newline @@ -932,15 +972,16 @@ Elements in a set need to be sorted. The comparison relation may be cyclic, however. \end_layout -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout ExampleBlock +\begin_layout Plain Layout +\begin_inset Flex Example Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -953,8 +994,7 @@ Applications in Sociology \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout Several candidates apply for a position. \begin_inset Newline newline \end_inset @@ -963,15 +1003,16 @@ Reviewers decide for any two candidates whom they prefer. \end_layout -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout ExampleBlock +\begin_layout Plain Layout +\begin_inset Flex Example Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -984,8 +1025,7 @@ Applications in Structural Complexity Theory \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout A language \begin_inset Formula $L$ \end_inset @@ -1005,13 +1045,25 @@ It chooses from any two words the one more likely to be in . \end_layout -\end_deeper -\end_deeper +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + \begin_layout Subsection What Does ``Finding Paths'' Mean? \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -1024,8 +1076,11 @@ status open \end_layout -\begin_deeper -\begin_layout Block +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status open @@ -1166,7 +1221,6 @@ the Approximation Problem \end_layout -\begin_deeper \begin_layout Itemize A \color none @@ -1274,10 +1328,14 @@ approximation ratio . \end_layout -\end_deeper -\begin_layout Standard +\end_inset + + +\end_layout + +\begin_layout Plain Layout \begin_inset ERT -status collapsed +status open \begin_layout Plain Layout @@ -1303,10 +1361,10 @@ status open \end_inset -\end_layout +\begin_inset Flex Columns +status open -\begin_deeper -\begin_layout Columns +\begin_layout Plain Layout \begin_inset Argument 1 status open @@ -1319,8 +1377,7 @@ t,onlytextwidth \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout \begin_inset Flex Alternative status open @@ -1380,7 +1437,11 @@ column{5cm} \end_layout -\begin_layout ExampleBlock +\begin_layout Plain Layout +\begin_inset Flex Example Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -1393,8 +1454,7 @@ Example Input \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout \begin_inset ERT status collapsed @@ -1723,8 +1783,12 @@ end{pgfpicture} \end_layout -\end_deeper -\begin_layout Standard +\end_inset + + +\end_layout + +\begin_layout Plain Layout \begin_inset Flex Only status open @@ -1760,7 +1824,11 @@ column{5cm} \end_layout -\begin_layout ExampleBlock +\begin_layout Plain Layout +\begin_inset Flex Example Block +status open + +\begin_layout Plain Layout \begin_inset Argument 1 status collapsed @@ -1784,8 +1852,7 @@ Example Output \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout \begin_inset ERT status collapsed @@ -1994,9 +2061,16 @@ end{pgfpicture} \end_layout -\end_deeper -\end_deeper -\end_deeper +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + \begin_layout Overprint \begin_inset Argument item:1 status open @@ -2009,10 +2083,10 @@ status open \end_inset -\end_layout +\begin_inset Flex Block +status open -\begin_deeper -\begin_layout Block +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -2025,7 +2099,6 @@ Variants of Path Finding Problems \end_layout -\begin_deeper \begin_layout Description \begin_inset Argument item:1 status open @@ -2198,9 +2271,16 @@ Problem: Construct a path from approximately their distance. \end_layout -\end_deeper -\end_deeper -\end_deeper +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + \begin_layout Section Review \end_layout @@ -2228,7 +2308,11 @@ pgfdeclareimage[height=2cm,mask=computer-mask,interpolate=true]{computer}{beamer \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -2245,8 +2329,7 @@ Logspace Turing Machines \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout \begin_inset ERT status collapsed @@ -2409,15 +2492,16 @@ end{pgfpicture} \end_layout -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -2430,8 +2514,11 @@ Logspace Turing Machines Are Quite Powerful \end_layout -\begin_deeper -\begin_layout Block +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -2444,7 +2531,6 @@ Deterministic logspace machines can compute \end_layout -\begin_deeper \begin_layout Itemize addition, multiplication, and even division \end_layout @@ -2457,12 +2543,20 @@ reductions used in completeness proofs, reachability in forests. \end_layout -\end_deeper +\end_inset + + +\end_layout + \begin_layout Pause \end_layout -\begin_layout Block +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -2475,7 +2569,6 @@ Non-deterministic logspace machines can compute \end_layout -\begin_deeper \begin_layout Itemize reachability in graphs, \end_layout @@ -2488,16 +2581,21 @@ non-reachability in graphs, satisfiability with two literals per clause. \end_layout -\end_deeper -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Frame +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 1 status collapsed @@ -2531,8 +2629,7 @@ The Complexity Class Hierarchy \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout \begin_inset ERT status collapsed @@ -2915,15 +3012,16 @@ end{pgfpicture} \end_layout -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -2952,8 +3050,7 @@ Limit the Circuit Depth \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout \begin_inset ERT status collapsed @@ -2978,7 +3075,11 @@ nointerlineskip \end_layout -\begin_layout Columns +\begin_layout Plain Layout +\begin_inset Flex Columns +status open + +\begin_layout Plain Layout \begin_inset Argument 1 status open @@ -2991,12 +3092,16 @@ t \end_layout -\begin_deeper \begin_layout Column + 3.6cm \end_layout -\begin_layout Block +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status open @@ -3013,7 +3118,6 @@ Circuit Class \end_layout -\begin_deeper \begin_layout Itemize \begin_inset Formula $O(1)$ \end_inset @@ -3025,8 +3129,16 @@ Circuit Class unbounded fan-in \end_layout -\end_deeper \begin_layout Examples +\begin_inset ERT +status open + +\begin_layout Plain Layout + +\end_layout + +\end_inset + \end_layout @@ -3046,15 +3158,25 @@ unbounded fan-in \end_layout \end_deeper +\end_inset + + +\end_layout + \begin_layout Pause \end_layout \begin_layout Column + 3.6cm \end_layout -\begin_layout Block +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status open @@ -3071,7 +3193,6 @@ Circuit Class \end_layout -\begin_deeper \begin_layout Itemize \begin_inset Formula $O(\log n)$ \end_inset @@ -3083,12 +3204,6 @@ Circuit Class bounded fan-in \end_layout -\end_deeper -\begin_layout Examples - -\end_layout - -\begin_deeper \begin_layout Itemize \begin_inset Formula $\Lang{parity}\in\Class{NC}^{1}$ \end_inset @@ -3110,16 +3225,25 @@ bounded fan-in . \end_layout -\end_deeper +\end_inset + + +\end_layout + \begin_layout Pause \end_layout \begin_layout Column + 3.6cm \end_layout -\begin_layout Block +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status open @@ -3136,7 +3260,6 @@ Circuit Class \end_layout -\begin_deeper \begin_layout Itemize \begin_inset Formula $O(\log^{2}n)$ \end_inset @@ -3148,8 +3271,16 @@ Circuit Class bounded fan-in \end_layout -\end_deeper \begin_layout Examples +\begin_inset ERT +status open + +\begin_layout Plain Layout + +\end_layout + +\end_inset + \end_layout @@ -3162,8 +3293,21 @@ bounded fan-in \end_layout \end_deeper -\end_deeper -\end_deeper +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + \begin_layout AgainFrame \begin_inset Argument 1 status collapsed @@ -3182,7 +3326,11 @@ hierarchy Standard Complexity Results on Finding Paths \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -3199,7 +3347,6 @@ Are Equally Difficult \end_layout -\begin_deeper \begin_layout Fact \begin_inset Formula $\Lang{reach}$ \end_inset @@ -3258,7 +3405,11 @@ the approximation problem in logspace iff \end_layout \end_deeper -\end_deeper +\end_inset + + +\end_layout + \begin_layout AgainFrame \begin_inset Argument 1 status collapsed @@ -3273,7 +3424,11 @@ status collapsed hierarchy \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -3290,7 +3445,6 @@ But Not Trivial \end_layout -\begin_deeper \begin_layout Fact \begin_inset Formula $\Lang{reach}_{\operatorname{forest}}$ \end_inset @@ -3306,7 +3460,7 @@ But Not Trivial -complete. \end_layout -\begin_layout Standard +\begin_layout Plain Layout \begin_inset Separator plain \end_inset @@ -3328,7 +3482,11 @@ But Not Trivial -complete. \end_layout -\end_deeper +\end_inset + + +\end_layout + \begin_layout AgainFrame \begin_inset Argument 1 status collapsed @@ -3351,7 +3509,11 @@ Finding Paths in Tournaments Complexity of: Does a Path Exist? \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -3364,7 +3526,6 @@ Definition of the Tournament Reachability Problem \end_layout -\begin_deeper \begin_layout Definition Let \color none @@ -3414,15 +3575,16 @@ there exists a path from \end_layout \end_deeper -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -3435,7 +3597,6 @@ The Tournament Reachability Problem is Very Easy \end_layout -\begin_deeper \begin_layout Theorem \begin_inset Formula $\Lang{reach}_{\operatorname{tourn}}\in\Class{AC}^{0}$ \end_inset @@ -3447,7 +3608,11 @@ The Tournament Reachability Problem is Very Easy \end_layout -\begin_layout AlertBlock +\begin_layout Plain Layout +\begin_inset Flex Alert Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -3460,7 +3625,6 @@ Implications \end_layout -\begin_deeper \begin_layout Itemize The problem is \begin_inset Quotes eld @@ -3488,8 +3652,16 @@ easier . \end_layout -\end_deeper -\end_deeper +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + \begin_layout AgainFrame \begin_inset Argument 1 status open @@ -3508,7 +3680,11 @@ hierarchy Complexity of: Construct a Shortest Path \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -3525,7 +3701,6 @@ the Distance Problem \end_layout -\begin_deeper \begin_layout Definition Let \color none @@ -3579,15 +3754,16 @@ the distance of \end_layout \end_deeper -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -3600,7 +3776,6 @@ The Tournament Distance Problem is Hard \end_layout -\begin_deeper \begin_layout Theorem \begin_inset Formula $\Lang{distance}_{\operatorname{tourn}}$ \end_inset @@ -3612,13 +3787,13 @@ The Tournament Distance Problem is Hard -complete. \end_layout -\begin_layout Standard +\begin_layout Plain Layout \begin_inset space \hfill{} \end_inset \begin_inset ERT -status collapsed +status open \begin_layout Plain Layout @@ -3661,15 +3836,16 @@ in logarithmic space, iff . \end_layout -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -3686,8 +3862,7 @@ Proof That \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout \begin_inset ERT status collapsed @@ -3703,7 +3878,11 @@ nointerlineskip \end_layout -\begin_layout Columns +\begin_layout Plain Layout +\begin_inset Flex Columns +status open + +\begin_layout Plain Layout \begin_inset Argument 1 status open @@ -3716,12 +3895,12 @@ t,onlytextwidth \end_layout -\begin_deeper \begin_layout Column + 5.7cm \end_layout -\begin_layout Standard +\begin_layout Plain Layout \begin_inset ERT status collapsed @@ -3739,7 +3918,11 @@ leftmargini{1.5em} \end_layout -\begin_layout Block +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status open @@ -3760,7 +3943,6 @@ Reduce \end_layout -\begin_deeper \begin_layout Enumerate \begin_inset Argument item:2 status open @@ -3825,17 +4007,28 @@ Query: \end_inset ? +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout + \end_layout -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Block +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status open @@ -3859,7 +4052,6 @@ status open \end_layout -\begin_deeper \begin_layout Enumerate \begin_inset Argument item:2 status open @@ -3926,10 +4118,25 @@ a path in \end_inset . +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + \end_layout -\end_deeper \begin_layout Column + 4.5cm \end_layout @@ -4984,8 +5191,16 @@ end{pgfpicture} \end_layout -\end_deeper -\end_deeper +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + \begin_layout AgainFrame \begin_inset Argument 1 status open @@ -5004,7 +5219,11 @@ hierarchy Complexity of: Approximating the Shortest Path \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -5017,7 +5236,6 @@ Approximators Compute Paths that Are Nearly As Short As a Shortest Path \end_layout -\begin_deeper \begin_layout Definition An \color none @@ -5051,7 +5269,7 @@ a number . \end_layout -\begin_layout Standard +\begin_layout Plain Layout It outputs \end_layout @@ -5076,7 +5294,11 @@ a path from \end_layout \end_deeper -\end_deeper +\end_inset + + +\end_layout + \begin_layout Standard \begin_inset Separator plain \end_inset @@ -5084,7 +5306,11 @@ a path from \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -5101,7 +5327,6 @@ the Tournament Shortest Path Problem \end_layout -\begin_deeper \begin_layout Theorem There exists an approximation scheme for \begin_inset Formula $\Lang{tournament-shortest-path}$ @@ -5130,7 +5355,7 @@ O\left(\log|V|\log\frac{1}{r-1}\right). In tournaments, paths can be constructed in logarithmic space. \end_layout -\begin_layout Standard +\begin_layout Plain Layout \begin_inset space \hfill{} \end_inset @@ -5152,7 +5377,11 @@ beamergotobutton{More Details}} \end_layout -\end_deeper +\end_inset + + +\end_layout + \begin_layout AgainFrame \begin_inset Argument 1 status collapsed @@ -5182,7 +5411,7 @@ fragile . \SpecialChar LyX - has the FragileFrame layout for this. + has the FragileFrame inset for this. \end_layout \end_inset @@ -5190,7 +5419,11 @@ fragile \end_layout -\begin_layout FragileFrame +\begin_layout Standard +\begin_inset Flex Frame (fragile) +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -5203,12 +5436,11 @@ Just a frame with a program code listing \end_layout -\begin_layout FragileFrame +\begin_layout Plain Layout This is some program code: \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout \begin_inset listings lstparams "extendedchars=true,language=Python,numbers=left,stepnumber=3,tabsize=4" inline false @@ -5264,7 +5496,11 @@ pass \end_layout -\end_deeper +\end_inset + + +\end_layout + \begin_layout Section* Summary \end_layout @@ -5273,7 +5509,11 @@ Summary Summary \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -5286,8 +5526,11 @@ Summary \end_layout -\begin_deeper -\begin_layout Block +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -5300,7 +5543,6 @@ Summary \end_layout -\begin_deeper \begin_layout Itemize Tournament \color none @@ -5366,15 +5608,16 @@ in tournaments is . \end_layout -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Block +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -5387,7 +5630,6 @@ Outlook \end_layout -\begin_deeper \begin_layout Itemize The same results apply to graphs with \begin_inset Newline newline @@ -5442,13 +5684,25 @@ beamergotobutton{More Details}} \end_layout -\end_deeper -\end_deeper +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + \begin_layout Subsection* For Further Reading \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -5461,8 +5715,7 @@ For Further Reading \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout \begin_inset ERT status open @@ -5647,7 +5900,11 @@ newblock In press. \end_layout -\end_deeper +\end_inset + + +\end_layout + \begin_layout Standard \start_of_appendix \begin_inset ERT @@ -5673,7 +5930,11 @@ Appendix Graphs With Bounded Independence Number \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 3 status collapsed @@ -5696,7 +5957,6 @@ Definition of Independence Number of a Graph \end_layout -\begin_deeper \begin_layout Definition The \color none @@ -5726,15 +5986,16 @@ Tournaments have independence number 1. \end_layout -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -5751,7 +6012,6 @@ Graphs With Bounded Independence Number \end_layout -\begin_deeper \begin_layout Theorem For each \begin_inset space ~ @@ -5788,7 +6048,7 @@ at most . \end_layout -\begin_layout Standard +\begin_layout Plain Layout \begin_inset Separator plain \end_inset @@ -5824,7 +6084,7 @@ for approximating the shortest path in graphs with independence number at \end_layout -\begin_layout Standard +\begin_layout Plain Layout \begin_inset Separator plain \end_inset @@ -5869,12 +6129,20 @@ in graphs with independence number at most . \end_layout -\end_deeper +\end_inset + + +\end_layout + \begin_layout Subsection Finding Paths in Undirected Graphs \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 1 status collapsed @@ -5912,7 +6180,6 @@ Is Party Unknown. \end_layout -\begin_deeper \begin_layout Fact \begin_inset Formula $\Lang{reach}_{\operatorname{undirected}}$ \end_inset @@ -6033,16 +6300,23 @@ status open \begin_layout Itemize the approximation problem in logspace iff ?. - \end_layout \end_deeper -\end_deeper +\end_inset + + +\end_layout + \begin_layout Subsection The Approximation Scheme is Optimal \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 3 status collapsed @@ -6065,7 +6339,6 @@ The Approximation Scheme is Optimal \end_layout -\begin_deeper \begin_layout Theorem Suppose there exists an approximation scheme for \begin_inset Formula $\Lang{tournament-shortest-path}$ @@ -6149,6 +6422,10 @@ qedhere \end_layout \end_deeper -\end_deeper +\end_inset + + +\end_layout + \end_body \end_document diff --git a/lib/examples/de/beamer-article.lyx b/lib/examples/de/beamer-article.lyx index b053b0b3d2..30975e038f 100644 --- a/lib/examples/de/beamer-article.lyx +++ b/lib/examples/de/beamer-article.lyx @@ -1,4 +1,4 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header @@ -90,6 +90,21 @@ \begin_inset Note Note status open +\begin_layout Plain Layout + +\lang english +Note: this example uses the old beamer layout. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Note Note +status open + \begin_layout Plain Layout Dies ist ein Begleitdokument zum Beispieldokument \begin_inset Quotes gld diff --git a/lib/examples/de/beamer.lyx b/lib/examples/de/beamer.lyx index d874b70270..7689661bc7 100644 --- a/lib/examples/de/beamer.lyx +++ b/lib/examples/de/beamer.lyx @@ -1,4 +1,4 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header @@ -83,6 +83,21 @@ \begin_body +\begin_layout Standard +\begin_inset Note Note +status open + +\begin_layout Plain Layout + +\lang english +Note: this example uses the old beamer layout. +\end_layout + +\end_inset + + +\end_layout + \begin_layout Title Präsentationen mit Beamer und \SpecialChar LyX diff --git a/lib/examples/fr/beamer-article.lyx b/lib/examples/fr/beamer-article.lyx index c5a83c519d..48779b8aee 100644 --- a/lib/examples/fr/beamer-article.lyx +++ b/lib/examples/fr/beamer-article.lyx @@ -1,4 +1,4 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header @@ -87,6 +87,16 @@ \begin_body \begin_layout Standard +\begin_inset Note Note +status open + +\begin_layout Plain Layout +Note: cet exemple utilise l'ancien style Beamer. +\end_layout + +\end_inset + + \begin_inset Note Note status collapsed diff --git a/lib/examples/fr/beamer.lyx b/lib/examples/fr/beamer.lyx index 3f60690667..7391c1af44 100644 --- a/lib/examples/fr/beamer.lyx +++ b/lib/examples/fr/beamer.lyx @@ -1,4 +1,4 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header @@ -81,6 +81,19 @@ \begin_body +\begin_layout Standard +\begin_inset Note Note +status open + +\begin_layout Plain Layout +Note: cet exemple utilise l'ancien style Beamer. +\end_layout + +\end_inset + + +\end_layout + \begin_layout Standard \begin_inset Note Note status collapsed diff --git a/lib/examples/ja/beamer.lyx b/lib/examples/ja/beamer.lyx index c8d6034725..5ac63694a9 100644 --- a/lib/examples/ja/beamer.lyx +++ b/lib/examples/ja/beamer.lyx @@ -1,4 +1,4 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header @@ -90,6 +90,21 @@ \begin_body +\begin_layout Standard +\begin_inset Note Note +status open + +\begin_layout Plain Layout + +\lang english +Note: this example uses the old beamer layout. +\end_layout + +\end_inset + + +\end_layout + \begin_layout Title Beamerと\SpecialChar LyX を用いた発表 diff --git a/lib/layouts/article-beamer.layout b/lib/layouts/article-beamer.layout index ee17378df3..ebc8dd465b 100644 --- a/lib/layouts/article-beamer.layout +++ b/lib/layouts/article-beamer.layout @@ -1,6 +1,6 @@ #% Do not delete the line below; configure depends on this -# \DeclareLaTeXClass[article,beamerarticle.sty,keyval.sty,pgf.sty]{Beamer Article (Standard Class)} -# \DeclareCategory{Articles} +# \DeclareLaTeXClass[article,beamerarticle.sty,keyval.sty,pgf.sty]{Beamer Article (Standard Class, obsolete)} +# \DeclareCategory{Obsolete} # Author: Jürgen Spitzmüller Format 66 diff --git a/lib/layouts/beamer-flex.inc b/lib/layouts/beamer-flex.inc index 9472f6ea6c..60683da6d0 100644 --- a/lib/layouts/beamer-flex.inc +++ b/lib/layouts/beamer-flex.inc @@ -1,5 +1,5 @@ # Definition of flex insets for beamer-flex -# Author: Guillaume Munch +# Author: Guillaume Munch-Maccagnoni # Based on beamer.layout by Till Tantau and others. # This file is included by beamer-flex.layout and beamer-flex.module diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index 9d51a526c7..6085c90dc3 100644 --- a/lib/layouts/beamer.layout +++ b/lib/layouts/beamer.layout @@ -1,6 +1,6 @@ #% Do not delete the line below; configure depends on this -# \DeclareLaTeXClass[beamer]{Beamer} -# \DeclareCategory{Presentations} +# \DeclareLaTeXClass[beamer]{Beamer (obsolete)} +# \DeclareCategory{Obsolete} # Original Author: Till Tantau # Revised and extended by Jürgen Spitzmüller , Uwe Stöhr , # Richard Heck , Martin Vermeer and probably others. diff --git a/lib/layouts/beamerposter.layout b/lib/layouts/beamerposter.layout index 75c493ac2b..07ffc07036 100644 --- a/lib/layouts/beamerposter.layout +++ b/lib/layouts/beamerposter.layout @@ -1,6 +1,6 @@ #% Do not delete the line below; configure depends on this -# \DeclareLaTeXClass[beamer,beamerposter.sty]{Beamerposter} -# \DeclareCategory{Posters} +# \DeclareLaTeXClass[beamer,beamerposter.sty]{Beamerposter (obsolete)} +# \DeclareCategory{Obsolete} # Wrapper layout for the beamer class with beamerposter style # # Authors: Jürgen Spitzmüller (spitz@lyx.org) diff --git a/lib/layouts/scrarticle-beamer.layout b/lib/layouts/scrarticle-beamer.layout index 997aad6ce5..ea5bfcfd1a 100644 --- a/lib/layouts/scrarticle-beamer.layout +++ b/lib/layouts/scrarticle-beamer.layout @@ -1,6 +1,6 @@ #% Do not delete the line below; configure depends on this -# \DeclareLaTeXClass[scrartcl,beamerarticle.sty,keyval.sty,pgf.sty]{Beamer Article (KOMA-Script)} -# \DeclareCategory{Articles} +# \DeclareLaTeXClass[scrartcl,beamerarticle.sty,keyval.sty,pgf.sty]{Beamer Article (KOMA-Script, obsolete)} +# \DeclareCategory{Obsolete} # Author: Jürgen Spitzmüller Format 66 diff --git a/lib/templates/beamer-conference-ornate-20min.lyx b/lib/templates/beamer-conference-ornate-20min.lyx index 8c034bc207..dbfe312099 100644 --- a/lib/templates/beamer-conference-ornate-20min.lyx +++ b/lib/templates/beamer-conference-ornate-20min.lyx @@ -1,10 +1,10 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header \save_transient_properties true \origin /systemlyxdir/templates/ -\textclass beamer +\textclass beamer-flex \begin_preamble \usetheme{Warsaw} % or ... @@ -18,9 +18,9 @@ \language_package default \inputencoding auto \fontencoding global -\font_roman "lmodern" "default" -\font_sans "lmss" "default" -\font_typewriter "lmtt" "default" +\font_roman "times" "default" +\font_sans "default" "default" +\font_typewriter "default" "default" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false @@ -42,14 +42,14 @@ \use_geometry true \use_package amsmath 2 \use_package amssymb 2 -\use_package cancel 1 -\use_package esint 1 +\use_package cancel 0 +\use_package esint 0 \use_package mathdots 1 -\use_package mathtools 1 +\use_package mathtools 0 \use_package mhchem 1 -\use_package stackrel 1 -\use_package stmaryrd 1 -\use_package undertilde 1 +\use_package stackrel 0 +\use_package stmaryrd 0 +\use_package undertilde 0 \cite_engine basic \cite_engine_type default \biblio_style plain @@ -113,7 +113,7 @@ Style is ornate. \begin_layout Standard \begin_inset Note Note -status collapsed +status open \begin_layout Plain Layout Copyright 2004 by Till Tantau . @@ -535,7 +535,11 @@ beamerdefaultoverlayspecification{<+->} \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -546,16 +550,17 @@ Outline \end_inset -\end_layout - -\begin_deeper -\begin_layout Standard \begin_inset CommandInset toc LatexCommand tableofcontents \end_inset +\end_layout + +\end_inset + + \end_layout \begin_layout Standard @@ -607,7 +612,6 @@ If you omit details that are vital to the proof/implementation, just say \end_layout -\end_deeper \begin_layout Section Motivation \end_layout @@ -626,7 +630,11 @@ Basic Problem \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -640,7 +648,6 @@ Make Titles Informative. \end_layout -\begin_deeper \begin_layout FrameSubtitle Frame subtitles are optional. Use upper- or lowercase letters. @@ -682,21 +689,21 @@ Use very short sentences or short phrases. These overlays are created using the Pause style. \end_layout -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open \begin_layout Plain Layout Make Titles Informative. - \end_layout \end_inset @@ -704,7 +711,6 @@ Make Titles Informative. \end_layout -\begin_deeper \begin_layout Itemize \begin_inset Argument item:2 status open @@ -747,15 +753,16 @@ status open This is shown second. \end_layout -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -768,8 +775,11 @@ Make Titles Informative. \end_layout -\begin_deeper -\begin_layout Block +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 1 status open @@ -783,7 +793,6 @@ status open \end_layout -\begin_deeper \begin_layout Itemize Untitled block. \end_layout @@ -792,8 +801,16 @@ Untitled block. Shown on all slides. \end_layout -\end_deeper -\begin_layout ExampleBlock +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex Example Block +status open + +\begin_layout Plain Layout \begin_inset Argument 1 status open @@ -817,7 +834,6 @@ Some Example Block Title \end_layout -\begin_deeper \begin_layout Itemize \begin_inset Formula $e^{i\pi}=-1$ \end_inset @@ -832,19 +848,30 @@ Some Example Block Title . \end_layout -\end_deeper -\end_deeper +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + \begin_layout Subsection Previous Work \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open \begin_layout Plain Layout Make Titles Informative. - \end_layout \end_inset @@ -852,7 +879,6 @@ Make Titles Informative. \end_layout -\begin_deeper \begin_layout Example \begin_inset Argument 1 status open @@ -865,10 +891,9 @@ status open \end_inset On first slide. - \end_layout -\begin_layout Standard +\begin_layout Plain Layout \begin_inset Separator plain \end_inset @@ -889,7 +914,11 @@ status open On second slide. \end_layout -\end_deeper +\end_inset + + +\end_layout + \begin_layout Section Our Results/Contribution \end_layout @@ -898,13 +927,16 @@ Our Results/Contribution Main Results \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open \begin_layout Plain Layout Make Titles Informative. - \end_layout \end_inset @@ -912,7 +944,6 @@ Make Titles Informative. \end_layout -\begin_deeper \begin_layout Theorem On first slide. \end_layout @@ -925,21 +956,21 @@ On first slide. On second slide. \end_layout -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open \begin_layout Plain Layout Make Titles Informative. - \end_layout \end_inset @@ -947,14 +978,28 @@ Make Titles Informative. \end_layout -\begin_deeper -\begin_layout ColumnsTopAligned +\begin_layout Plain Layout +\begin_inset Flex Columns +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout +T +\end_layout + +\end_inset + \end_layout -\begin_deeper \begin_layout Column -5cm + +0.5 +\backslash +textwidth \end_layout \begin_layout Theorem @@ -972,7 +1017,10 @@ In left column. \end_layout \begin_layout Column -5cm + +0.5 +\backslash +textwidth \end_layout \begin_layout Corollary @@ -993,8 +1041,16 @@ In right column. New line \end_layout -\end_deeper -\end_deeper +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + \begin_layout Subsection Basic Ideas for Proofs/Implementations \end_layout @@ -1003,7 +1059,11 @@ Basic Ideas for Proofs/Implementations Summary \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 4 status open @@ -1016,7 +1076,6 @@ Summary \end_layout -\begin_deeper \begin_layout Itemize The \color none @@ -1077,7 +1136,7 @@ third message , but not more than that. \end_layout -\begin_layout Standard +\begin_layout Plain Layout \begin_inset Note Note status open @@ -1108,7 +1167,11 @@ Even more stuff. \end_layout \end_deeper -\end_deeper +\end_inset + + +\end_layout + \begin_layout Section* \start_of_appendix \begin_inset Note Note @@ -1127,7 +1190,11 @@ Appendix For Further Reading \end_layout -\begin_layout Frame +\begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Argument 3 status collapsed @@ -1150,8 +1217,7 @@ For Further Reading \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout \begin_inset ERT status open @@ -1219,7 +1285,7 @@ newblock Some Press, 1990. \begin_inset ERT -status collapsed +status open \begin_layout Plain Layout @@ -1293,6 +1359,10 @@ Journal on This and That 2(1):50–100, 2000. \end_layout -\end_deeper +\end_inset + + +\end_layout + \end_body \end_document diff --git a/lib/templates/de_beamer-conference-ornate-20min.lyx b/lib/templates/obsolete/de_beamer-conference-ornate-20min.lyx similarity index 98% rename from lib/templates/de_beamer-conference-ornate-20min.lyx rename to lib/templates/obsolete/de_beamer-conference-ornate-20min.lyx index 5b61bf1545..05e7009a27 100644 --- a/lib/templates/de_beamer-conference-ornate-20min.lyx +++ b/lib/templates/obsolete/de_beamer-conference-ornate-20min.lyx @@ -1,9 +1,9 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header \save_transient_properties true -\origin /systemlyxdir/templates/ +\origin /systemlyxdir/templates/obsolete/ \textclass beamer \begin_preamble \usetheme{Warsaw} @@ -88,6 +88,21 @@ \begin_inset Note Note status open +\begin_layout Plain Layout + +\lang english +Note: this template uses the old beamer layout. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Note Note +status open + \begin_layout Plain Layout Diese Datei enthält eine Lösungsvorlage für: \end_layout diff --git a/lib/templates/es_beamer-conference-ornate-20min.lyx b/lib/templates/obsolete/es_beamer-conference-ornate-20min.lyx similarity index 98% rename from lib/templates/es_beamer-conference-ornate-20min.lyx rename to lib/templates/obsolete/es_beamer-conference-ornate-20min.lyx index 4937bf72ec..2f07515ec6 100644 --- a/lib/templates/es_beamer-conference-ornate-20min.lyx +++ b/lib/templates/obsolete/es_beamer-conference-ornate-20min.lyx @@ -1,9 +1,9 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header \save_transient_properties true -\origin /systemlyxdir/templates/ +\origin /systemlyxdir/templates/obsolete/ \textclass beamer \begin_preamble \usetheme{Warsaw} @@ -88,6 +88,21 @@ \begin_inset Note Note status open +\begin_layout Plain Layout + +\lang english +Note: this template uses the old beamer layout. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Note Note +status open + \begin_layout Plain Layout Este archivo es una plantilla para: \end_layout diff --git a/lib/templates/fr_beamer-conference-ornate-20min.lyx b/lib/templates/obsolete/fr_beamer-conference-ornate-20min.lyx similarity index 98% rename from lib/templates/fr_beamer-conference-ornate-20min.lyx rename to lib/templates/obsolete/fr_beamer-conference-ornate-20min.lyx index 41467eb8a5..e4cdbc5cd1 100644 --- a/lib/templates/fr_beamer-conference-ornate-20min.lyx +++ b/lib/templates/obsolete/fr_beamer-conference-ornate-20min.lyx @@ -1,9 +1,9 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header \save_transient_properties true -\origin /systemlyxdir/templates/ +\origin /systemlyxdir/templates/obsolete/ \textclass beamer \begin_preamble \usetheme{Warsaw} @@ -88,6 +88,16 @@ \begin_inset Note Note status open +\begin_layout Plain Layout +Remarque: cet exemple utilise l'ancien style Beamer. +\end_layout + +\end_inset + + +\begin_inset Note Note +status open + \begin_layout Plain Layout Ce fichier est un exemple d'exposé: \end_layout diff --git a/lib/templates/ja_beamer-conference-ornate-20min.lyx b/lib/templates/obsolete/ja_beamer-conference-ornate-20min.lyx similarity index 98% rename from lib/templates/ja_beamer-conference-ornate-20min.lyx rename to lib/templates/obsolete/ja_beamer-conference-ornate-20min.lyx index 3ae53b1269..9e0af66f82 100644 --- a/lib/templates/ja_beamer-conference-ornate-20min.lyx +++ b/lib/templates/obsolete/ja_beamer-conference-ornate-20min.lyx @@ -1,9 +1,9 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header \save_transient_properties true -\origin /systemlyxdir/templates/ +\origin /systemlyxdir/templates/obsolete/ \textclass beamer \begin_preamble \usetheme{Warsaw} @@ -93,6 +93,21 @@ \begin_inset Note Note status open +\begin_layout Plain Layout + +\lang english +Note: this template uses the old beamer layout. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Note Note +status open + \begin_layout Plain Layout このファイルは、下記の要請を満たすひな型です。 \end_layout diff --git a/lib/templates/poster-beamerposter.lyx b/lib/templates/poster-beamerposter.lyx index 5279b85f32..feb587ec2e 100644 --- a/lib/templates/poster-beamerposter.lyx +++ b/lib/templates/poster-beamerposter.lyx @@ -1,10 +1,10 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header \save_transient_properties true \origin /systemlyxdir/templates/ -\textclass beamerposter +\textclass beamerposter-flex \begin_preamble % You can select your theme here. Any beamer theme without a sidebar should work: \usetheme{Berlin} @@ -238,12 +238,11 @@ You can use any beamer element, especially the use of blocks is advisable. \end_layout -\begin_layout Frame - -\end_layout - -\begin_deeper \begin_layout Standard +\begin_inset Flex Frame +status open + +\begin_layout Plain Layout \begin_inset Note Note status open @@ -287,7 +286,7 @@ dedicated beamerposter theme* \end_layout -\begin_layout Standard +\begin_layout Plain Layout \noindent \begin_inset Box Frameless position "t" @@ -442,14 +441,18 @@ inserttitlegraphic \end_layout -\begin_layout Standard +\begin_layout Plain Layout \begin_inset VSpace 1.7cm \end_inset \end_layout -\begin_layout Block +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -462,11 +465,11 @@ The poster can be structured in blocks of different width \end_layout -\begin_layout Block +\begin_layout Plain Layout This block spans the whole width of the poster. \end_layout -\begin_layout Block +\begin_layout Plain Layout Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. @@ -488,23 +491,30 @@ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy \end_layout -\begin_layout Block +\begin_layout Plain Layout Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. \end_layout -\end_deeper -\begin_layout Frame +\end_inset + + +\end_layout + +\begin_layout Plain Layout \begin_inset VSpace vfill \end_inset \end_layout -\begin_deeper -\begin_layout Block +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -517,7 +527,7 @@ Get reasonable line lengths \end_layout -\begin_layout Block +\begin_layout Plain Layout \begin_inset ERT status open @@ -545,7 +555,7 @@ status open \end_layout -\begin_layout Block +\begin_layout Plain Layout \begin_inset Flex Multiple Columns status open @@ -667,8 +677,12 @@ Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit. \end_layout -\end_deeper -\begin_layout Frame +\end_inset + + +\end_layout + +\begin_layout Plain Layout \begin_inset Note Note status open @@ -692,8 +706,11 @@ totalwidth \end_layout -\begin_deeper -\begin_layout Columns +\begin_layout Plain Layout +\begin_inset Flex Columns +status open + +\begin_layout Plain Layout \begin_inset Argument 1 status open @@ -719,25 +736,18 @@ textwidth \end_layout -\begin_deeper \begin_layout Column -.49 -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - +.49 \backslash linewidth \end_layout -\end_inset - - -\end_layout +\begin_layout Plain Layout +\begin_inset Flex Block +status open -\begin_layout Block +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -777,69 +787,68 @@ Text Style. \end_layout -\begin_layout Block +\begin_layout Plain Layout \begin_inset VSpace defskip \end_inset \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout \size tiny Tiny \end_layout -\begin_layout Standard +\begin_layout Plain Layout \size scriptsize Smallest \end_layout -\begin_layout Standard +\begin_layout Plain Layout \size footnotesize Smaller \end_layout -\begin_layout Standard +\begin_layout Plain Layout \size normal Normal \end_layout -\begin_layout Standard +\begin_layout Plain Layout \size large Large \end_layout -\begin_layout Standard +\begin_layout Plain Layout \size larger Larger \end_layout -\begin_layout Standard +\begin_layout Plain Layout \size largest Largest \end_layout -\begin_layout Standard +\begin_layout Plain Layout \size huge Huge \end_layout -\begin_layout Standard +\begin_layout Plain Layout \size giant Huger \end_layout -\begin_layout Standard +\begin_layout Plain Layout \begin_inset Flex Giant status open @@ -852,7 +861,7 @@ Giant \end_layout -\begin_layout Standard +\begin_layout Plain Layout \begin_inset Flex More Giant status open @@ -865,7 +874,7 @@ More Giant \end_layout -\begin_layout Standard +\begin_layout Plain Layout \begin_inset Flex Most Giant status open @@ -878,8 +887,16 @@ Most Giant \end_layout -\end_deeper -\begin_layout AlertBlock +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex Alert Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status open @@ -892,7 +909,7 @@ Blocks in different colors \end_layout -\begin_layout AlertBlock +\begin_layout Plain Layout Beamer provides special blocks with specific colors that can also be used for posters. This one is an @@ -907,7 +924,16 @@ alert Its main purpose is to highlight important things. \end_layout -\begin_layout ExampleBlock +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex Example Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status open @@ -920,7 +946,7 @@ Blocks in different colors \end_layout -\begin_layout ExampleBlock +\begin_layout Plain Layout This is an \begin_inset Quotes eld \end_inset @@ -932,28 +958,27 @@ example block . \end_layout -\begin_layout ExampleBlock +\begin_layout Plain Layout Yet another color. \end_layout -\begin_layout Column -.49 -\begin_inset ERT -status collapsed +\end_inset -\begin_layout Plain Layout +\end_layout + +\begin_layout Column +.49 \backslash linewidth \end_layout -\end_inset - - -\end_layout +\begin_layout Plain Layout +\begin_inset Flex Block +status open -\begin_layout Block +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -966,7 +991,6 @@ Enumerated Lists \end_layout -\begin_deeper \begin_layout Enumerate some items \end_layout @@ -981,17 +1005,28 @@ some items \begin_layout Enumerate some items +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout + \end_layout -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Block +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -1004,7 +1039,6 @@ Some items and some math \end_layout -\begin_deeper \begin_layout Itemize some items and \begin_inset Formula $\alpha=\gamma,\sum_{i}$ @@ -1021,7 +1055,7 @@ some items some items \end_layout -\begin_layout Standard +\begin_layout Plain Layout \begin_inset Formula \[ \alpha=\gamma,\sum_{i} @@ -1032,15 +1066,16 @@ some items \end_layout -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Block +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -1054,7 +1089,6 @@ More items \SpecialChar ldots \end_layout -\begin_deeper \begin_layout Itemize some items \end_layout @@ -1075,15 +1109,16 @@ some items some items \end_layout -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Block +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status collapsed @@ -1097,7 +1132,6 @@ status collapsed \end_layout -\begin_deeper \begin_layout Itemize some items \end_layout @@ -1114,15 +1148,16 @@ some items some items \end_layout -\end_deeper -\begin_layout Standard -\begin_inset Separator plain \end_inset \end_layout -\begin_layout Block +\begin_layout Plain Layout +\begin_inset Flex Block +status open + +\begin_layout Plain Layout \begin_inset Argument 2 status open @@ -1149,8 +1184,7 @@ An example for displaying your address. \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout \begin_inset Box Frameless position "t" hor_pos "c" @@ -1255,12 +1289,20 @@ http://www.uon.edu/doe \end_layout -\end_deeper -\end_deeper -\begin_layout Columns +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\end_inset + \end_layout -\end_deeper \end_body \end_document diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index b9af820225..c7987c7f85 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -627,7 +627,7 @@ Menuset End Menu "examples" - Item "Beamer Presentations|B" "help-open beamer" + Item "Beamer Presentations|B" "help-open Beamer-flex" Item "Braille|a" "help-open Braille" Item "Colored boxes|r" "help-open colored-boxes" Item "Feynman-diagram|F" "help-open FeynmanDiagrams" From 5dc2ede36d503dfea0295dfd32734903d9076d19 Mon Sep 17 00:00:00 2001 From: Guillaume MM Date: Sun, 11 Feb 2018 18:57:31 +0100 Subject: [PATCH 38/40] Fix scrolling boundaries one last time Thinko at 96bb7c27 --- src/BufferView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 2e0990e57b..a640623b1b 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -2818,7 +2818,7 @@ void BufferView::updateMetrics(Update::flags & update_flags, bool const scroll) d->anchor_ypos_ -= pm0.position() - pm0.ascent(); again(); } else if (scrollbar.min > 0) { - d->anchor_ypos_ += scrollbar.min; + d->anchor_ypos_ -= scrollbar.min; again(); } else if (scrollbar.max < 0) { d->anchor_ypos_ -= scrollbar.max; From 53289c84a00bf97c297827752fba993a67430017 Mon Sep 17 00:00:00 2001 From: Guillaume MM Date: Sun, 11 Feb 2018 21:06:22 +0100 Subject: [PATCH 39/40] Thicker InsetText border width --- src/insets/InsetText.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp index 9da93aa205..45ae7ca386 100644 --- a/src/insets/InsetText.cpp +++ b/src/insets/InsetText.cpp @@ -217,7 +217,7 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const TextMetrics & tm = pi.base.bv->textMetrics(&text_); int const t2i_offset = pi.base.textToInsetOffset(); // FIXME: rounding because of overpainting issues - int const t = (int) round(pi.base.thinLineThickness()); + int const t = (int) round(0.3 + pi.base.thinLineThickness()); int const w = tm.width() + t2i_offset; int const yframe = y - t2i_offset - tm.ascent(); From 649382d8ae7d89b07971e32b2912c731a87daabe Mon Sep 17 00:00:00 2001 From: Guillaume MM Date: Sun, 11 Feb 2018 21:37:12 +0100 Subject: [PATCH 40/40] Gen LFUNS.lyx --- lib/doc/LFUNs.lyx | 113 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 87 insertions(+), 26 deletions(-) diff --git a/lib/doc/LFUNs.lyx b/lib/doc/LFUNs.lyx index 9d3ce9147a..135a0f0dbf 100644 --- a/lib/doc/LFUNs.lyx +++ b/lib/doc/LFUNs.lyx @@ -1,4 +1,4 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header @@ -1115,6 +1115,24 @@ Syntax branch-insert Origin vermeer, 17 Aug 2003 \end_layout +\begin_layout Subsection* +buffer-anonymize +\end_layout + +\begin_layout Description +Action For debug purposes only. + Convert all [a-zA-Z0-1] characters to single character. + Useful when submitting docs to list or bugzilla. +\end_layout + +\begin_layout Description +Syntax buffer-anonymize +\end_layout + +\begin_layout Description +Origin sanda, Feb 1 2018 +\end_layout + \begin_layout Subsection* buffer-begin \end_layout @@ -2226,6 +2244,50 @@ Syntax graphics-reload Origin vfr, 10 Aug 2009 \end_layout +\begin_layout Subsection* +graphics-set-group +\end_layout + +\begin_layout Description +Action Set the group for the graphics inset on the cursor position. +\end_layout + +\begin_layout Description +Syntax graphics-set-group [] +\end_layout + +\begin_layout Description +Params : Id for an existing group. + In case the Id is an empty string, the graphics inset is removed from the + current group. +\end_layout + +\begin_layout Description +Origin sanda, 6 May 2008 +\end_layout + +\begin_layout Subsection* +graphics-unify +\end_layout + +\begin_layout Description +Action Set the same group for all graphics insets in the marked block. +\end_layout + +\begin_layout Description +Syntax graphics-unify [] +\end_layout + +\begin_layout Description +Params : Id for an existing group. + In case the Id is an empty string, the group Id from the first graphics + inset will be used. +\end_layout + +\begin_layout Description +Origin sanda, 7 Feb 2018 +\end_layout + \begin_layout Subsection* href-insert \end_layout @@ -2803,6 +2865,22 @@ graphics|href|include|index|index_print|label|line| listings|note|phantom|ref|space|tabular|vspace|wrap>. \end_layout +\begin_layout Subsection* +inset-split +\end_layout + +\begin_layout Description +Action Split the current inset in two. +\end_layout + +\begin_layout Description +Syntax inset-split +\end_layout + +\begin_layout Description +Origin gm, 10 Feb 2018 +\end_layout + \begin_layout Subsection* inset-toggle \end_layout @@ -4018,28 +4096,6 @@ Params : default: plain Origin ef, 2 May 2014 \end_layout -\begin_layout Subsection* -set-graphics-group -\end_layout - -\begin_layout Description -Action Set the group for the graphics inset on the cursor position. -\end_layout - -\begin_layout Description -Syntax set-graphics-group [] -\end_layout - -\begin_layout Description -Params : Id for an existing group. - In case the Id is an empty string, the graphics inset is removed from the - current group. -\end_layout - -\begin_layout Description -Origin sanda, 6 May 2008 -\end_layout - \begin_layout Subsection* space-insert \end_layout @@ -4713,11 +4769,11 @@ Syntax word-replace [] \end_layout \begin_layout Description -Params : data is of the form " +Params : data is of the form " \begin_inset Newline newline \end_inset - + \begin_inset Newline newline \end_inset @@ -6243,7 +6299,12 @@ Action Reverts opened document. \end_layout \begin_layout Description -Syntax buffer-reload +Syntax buffer-reload [dump] +\end_layout + +\begin_layout Description +Params dump: do not ask for any confirmation, just reload. + All changes will be lost. \end_layout \begin_layout Description