[LyX/2.3.x] Skip insets when checking for uncodable chars to paste.
commit 6ce83844dc1a7572efec54ce386557a056517483
Author: Juergen Spitzmueller
Date: Sat Feb 17 12:27:26 2018 +0100
Skip insets when checking for uncodable chars to paste.
Fixes paste of quote insets to ERT/chunk.
(cherry picked from commit 8f9b733e6720c0709ea25c4bf56847e01faadd6f)
---
src/CutAndPaste.cpp |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index f611d59..7c15845 100644
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -168,6 +168,9 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList
const & parlist,
for (size_t i = 0; i != insertion.size(); ++i) {
pos_type end = insertion[i].size();
for (pos_type j = 0; j != end; ++j) {
+ // skip insets
+ if (insertion[i].isInset(j))
+ continue;
char_type const c = insertion[i].getChar(j);
if (!e->encodable(c)) {
// do not track deletion
[LyX/master] Add Nomenclature to localization_test.lyx
commit 0c2f431003b1ca57d541353cb11c03e78b6f77c5 Author: Scott Kostyshak Date: Sat Feb 17 23:27:39 2018 -0500 Add Nomenclature to localization_test.lyx --- lib/examples/localization_test.lyx | 22 ++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/lib/examples/localization_test.lyx b/lib/examples/localization_test.lyx index f388c6f..aeb8b76 100644 --- a/lib/examples/localization_test.lyx +++ b/lib/examples/localization_test.lyx @@ -435,5 +435,27 @@ LatexCommand lstlistoflistings \end_layout +\begin_layout Standard +\begin_inset CommandInset nomenclature +LatexCommand nomenclature +symbol "x" +description "dfadsf13" +literal "false" + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset CommandInset nomencl_print +LatexCommand printnomenclature +set_width "auto" + +\end_inset + + +\end_layout + \end_body \end_document
[LyX/2.3.x] Win installer: backport recent changes for LyX 2.3.0
commit ae76c030d38aedd95690d1569903e3eb6122945f
Author: Uwe Stöhr
Date: Sun Feb 18 06:16:22 2018 +0100
Win installer: backport recent changes for LyX 2.3.0
---
.../Win32/packaging/installer/ChangeLog.txt| 13 ++-
.../packaging/installer/DictionaryMirrors.txt | 41 ---
.../installer/HunspellDictionaryNames.txt |4 +-
development/Win32/packaging/installer/Packages.txt |6 +++
.../installer/ThesaurusDictionaryNames.txt |2 +
.../packaging/installer/include/dictionaries.nsh | 14 +++---
.../Win32/packaging/installer/include/init.nsh | 24 +---
development/Win32/packaging/installer/settings.nsh |4 +-
.../Win32/packaging/installer/setup/configure.nsh |6 +-
9 files changed, 69 insertions(+), 45 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 0a276cf..61cd73d 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,5 +1,16 @@
-Changelog for LyX-230-RC2:
+Changelog for LyX-230-1:
+- installs LyX 2.3.0
+- fix installation of Arabic spell checker
+- updated to MiKTeX 2.9 build 6615
+- new thesaurus for Arabic
+- updated thesaurus for Ukrainian
+- updated spell checker dictionaries for Arabic, Breton and Ukrainian
+
+
+Changelog for LyX-230-RC2:
- installs LyX 2.3.0 RC2
+- updated to Qt 5.9.4
+- updated to ImageMagick 7.0.7-22
Changelog for LyX-230-RC1:
diff --git a/development/Win32/packaging/installer/DictionaryMirrors.txt
b/development/Win32/packaging/installer/DictionaryMirrors.txt
index 434ea15..99a4590 100644
--- a/development/Win32/packaging/installer/DictionaryMirrors.txt
+++ b/development/Win32/packaging/installer/DictionaryMirrors.txt
@@ -1,29 +1,22 @@
-dfn
+astuteinternet
+ayera
+cfhcable
+cytranet
+excellmedia
freefr
-cznic
-garr
-optimate
-kaz
-kent
-heanet
-hivelocity
-ignum
-internode
iweb
jaist
-netcologne
-switch
+kent
+liquidtelecom
nchc
-ncu
-skylink
-tcpdiag
-tenet
-ufpr
-waia
-colocrossing
-citylan
-aarnet
+netcologne
+netix
+netcologne
+newcontinuum
+phoenixnap
+razaoinfo
superb-dca2
-superb-dca3
-softlayer-ams
-softlayer-dal
+superb-sea2
+ufpr
+versaweb
+vorboss
diff --git a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
index ff7b103..817adc9 100644
--- a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
+++ b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
@@ -1,7 +1,7 @@
af_ZA.aff
af_ZA.dic
-ar_DZ.aff
-ar_DZ.dic
+ar_SA.aff
+ar_SA.dic
be_BY.aff
be_BY.dic
bg_BG.aff
diff --git a/development/Win32/packaging/installer/Packages.txt
b/development/Win32/packaging/installer/Packages.txt
index 552a2d8..3ba3f1e 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -3,6 +3,7 @@ l3packages
l3experimental
ctablestack
babel-albanian
+babel-azerbaijani
babel-basque
babel-belarusian
babel-bosnian
@@ -13,12 +14,15 @@ babel-croatian
babel-czech
babel-danish
babel-dutch
+babel-english
babel-esperanto
babel-estonian
babel-finnish
+babel-french
babel-friulan
babel-galician
babel-georgian
+babel-german
babel-greek
babel-hebrew
babel-hungarian
@@ -32,6 +36,7 @@ babel-kurmanji
babel-latin
babel-latvian
babel-macedonian
+babel-malay
babel-norsk
babel-piedmontese
babel-polish
@@ -46,6 +51,7 @@ babel-serbianc
babel-slovak
babel-slovenian
babel-sorbian
+babel-spanish
babel-swedish
babel-thai
babel-turkish
diff --git a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
index 6d19dfa..27e248f 100644
--- a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
+++ b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
@@ -1,3 +1,5 @@
+th_ar_SA_v2.dat
+th_ar_SA_v2.idx
th_bg_BG_v2.dat
th_bg_BG_v2.idx
th_ca_ES_v2.dat
diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh
b/development/Win32/packaging/installer/include/dictionaries.nsh
index 8119a06..415b19c 100644
--- a/development/Win32/packaging/installer/include/dictionaries.nsh
+++ b/development/Win32/packaging/installer/include/dictionaries.nsh
@@ -43,8 +43,8 @@ Function FindDictionaries
# read out the possible thesaurus filenames from the file
FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r
- ${for} $5 1 27
- # the file has 54 lines, but we only need to check for one of the 2
thesaurus files per language
+ ${for} $5 1 28
+ # the file has 56 lines, but we only need to check for one of the 2
thesaurus files per language
# therefore check only for every second line
FileRead $R5 $String # $String is now the dictionary name
FileRead $R5 $String # $String is now the dictionary name
@@ -77,11
[LyX/2.2.x] Win installer: MiKTeX has a new maintenance program
commit 7879fadfc07430a6c5fcd7f7b6d5a4f28759d39c
Author: Uwe Stöhr
Date: Sun Feb 18 06:13:16 2018 +0100
Win installer: MiKTeX has a new maintenance program
- therefore the command line parameters changed
- all babel packages must be required
- use another default mirror that is hopefully not down 2 hours every day
---
.../Win32/packaging/installer/ChangeLog.txt|6 ++
development/Win32/packaging/installer/Packages.txt |6 ++
development/Win32/packaging/installer/settings.nsh |4 ++--
.../Win32/packaging/installer/setup/configure.nsh |6 +++---
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 096b2dc..6c52438 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -2,9 +2,15 @@
- installs LyX 2.2.4
- new Russian translation of the installer messages
- fix installation of Arabic spell checker
+- LyX will work under Windows Vista but is no longer supported
+- updated to MiKTeX 2.9 build 6615
+- updated to ImageMagick 7.0.7-22
+- updated to Qt 5.9.4
- new thesaurus for Arabic
- updated thesaurus for Ukrainian
- updated spell checker dictionaries for Arabic, Breton and Ukrainian
+ (To benefit from them you must uninstall an already installed LyX 2.2.x and
+ then use this installer.)
Changelog for LyX-223-2:
diff --git a/development/Win32/packaging/installer/Packages.txt
b/development/Win32/packaging/installer/Packages.txt
index 552a2d8..3ba3f1e 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -3,6 +3,7 @@ l3packages
l3experimental
ctablestack
babel-albanian
+babel-azerbaijani
babel-basque
babel-belarusian
babel-bosnian
@@ -13,12 +14,15 @@ babel-croatian
babel-czech
babel-danish
babel-dutch
+babel-english
babel-esperanto
babel-estonian
babel-finnish
+babel-french
babel-friulan
babel-galician
babel-georgian
+babel-german
babel-greek
babel-hebrew
babel-hungarian
@@ -32,6 +36,7 @@ babel-kurmanji
babel-latin
babel-latvian
babel-macedonian
+babel-malay
babel-norsk
babel-piedmontese
babel-polish
@@ -46,6 +51,7 @@ babel-serbianc
babel-slovak
babel-slovenian
babel-sorbian
+babel-spanish
babel-swedish
babel-thai
babel-turkish
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 4c07025..96e3aeb 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -45,12 +45,12 @@ These typically need to be modified for each LyX release
#
# MiKTeX and JabRef
-!define MiKTeXRepo
"ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/";
+!define MiKTeXRepo
"ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/";
!define MiKTeXDeliveredVersion "2.9"
!define ImageMagickVersion "7.0.7"
# definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6520.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6615.exe"
!endif
diff --git a/development/Win32/packaging/installer/setup/configure.nsh
b/development/Win32/packaging/installer/setup/configure.nsh
index 7a4aa7a..f96b033 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -247,14 +247,14 @@ Section -ConfigureScript
# call the non-admin version
# at first we need to synchronize the package database
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
-nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
${else}
${if} $MiKTeXUser != "HKCU" # call the admin version
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--update-db"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
${else}
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
${endif}
${endif}
${endif}
[LyX/master] Win installer: MiKTeX has a new maintenance program
commit 3419fa6a9e0ff3542c8118a34eab67593bd8d895
Author: Uwe Stöhr
Date: Sun Feb 18 06:11:11 2018 +0100
Win installer: MiKTeX has a new maintenance program
- therefore the command line parameters changed
- all babel packages must be required
- use another default mirror that is hopefully not down 2hours every day
---
.../Win32/packaging/installer/ChangeLog.txt|1 +
development/Win32/packaging/installer/Packages.txt |6 ++
development/Win32/packaging/installer/settings.nsh |4 ++--
.../Win32/packaging/installer/setup/configure.nsh |6 +++---
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 4bf75a8..61cd73d 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,6 +1,7 @@
Changelog for LyX-230-1:
- installs LyX 2.3.0
- fix installation of Arabic spell checker
+- updated to MiKTeX 2.9 build 6615
- new thesaurus for Arabic
- updated thesaurus for Ukrainian
- updated spell checker dictionaries for Arabic, Breton and Ukrainian
diff --git a/development/Win32/packaging/installer/Packages.txt
b/development/Win32/packaging/installer/Packages.txt
index 552a2d8..3ba3f1e 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -3,6 +3,7 @@ l3packages
l3experimental
ctablestack
babel-albanian
+babel-azerbaijani
babel-basque
babel-belarusian
babel-bosnian
@@ -13,12 +14,15 @@ babel-croatian
babel-czech
babel-danish
babel-dutch
+babel-english
babel-esperanto
babel-estonian
babel-finnish
+babel-french
babel-friulan
babel-galician
babel-georgian
+babel-german
babel-greek
babel-hebrew
babel-hungarian
@@ -32,6 +36,7 @@ babel-kurmanji
babel-latin
babel-latvian
babel-macedonian
+babel-malay
babel-norsk
babel-piedmontese
babel-polish
@@ -46,6 +51,7 @@ babel-serbianc
babel-slovak
babel-slovenian
babel-sorbian
+babel-spanish
babel-swedish
babel-thai
babel-turkish
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index ff8029f..0d94fc7 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -45,13 +45,13 @@ These typically need to be modified for each LyX release
#
# MiKTeX and JabRef
-!define MiKTeXRepo
"ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/";
+!define MiKTeXRepo
"ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/";
!define MiKTeXDeliveredVersion "2.9"
!define ImageMagickVersion "7.0.7"
# definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6520.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6615.exe"
!endif
diff --git a/development/Win32/packaging/installer/setup/configure.nsh
b/development/Win32/packaging/installer/setup/configure.nsh
index 8058507..3de31b3 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -245,14 +245,14 @@ Section -ConfigureScript
# call the non-admin version
# at first we need to synchronize the package database
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
-nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
${else}
${if} $MiKTeXUser != "HKCU" # call the admin version
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--update-db"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
${else}
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
${endif}
${endif}
${endif}
[LyX/master] port recent Basque translation updates
commit 7df53d50f21cc4b97d2dea3d2ac31fd354767e7e Author: Uwe Stöhr Date: Sun Feb 18 02:24:22 2018 +0100 port recent Basque translation updates --- lib/layouttranslations| 10 +- lib/layouttranslations.review |5 +- po/eu.po | 184 ++--- 3 files changed, 123 insertions(+), 76 deletions(-) diff --git a/lib/layouttranslations b/lib/layouttranslations index f350f23..f96320f 100644 --- a/lib/layouttranslations +++ b/lib/layouttranslations @@ -436,11 +436,11 @@ Translation eu "List of Algorithms" "Algoritmoen zerrenda" "List of Charts" "Diagramen zerrenda" "List of Graphs[[mathematical]]" "Grafikoen zerrenda" - "List of Listings" "Zerrenden zerrenda" + "List of Listings" "Zerrendatuen zerrenda" "List of Schemes" "Eskemen zerrenda" "List of Tableaux" "Taulen zerrenda" - "Listing" "Zerrenda" - "Listings[[List of Listings]]" "Zerrendak" + "Listing" "Zerrendatua" + "Listings[[List of Listings]]" "Zerrendatuak" "Nomenclature[[output]]" "Nomenklatura" "Notation" "Notazioa" "Note" "Oharra" @@ -455,8 +455,8 @@ Translation eu "Summary" "Laburpena" "Tableau" "Taula" "Theorem" "Teorema" - "page[[nomencl]]" "page" - "see equation[[nomencl]]" "see equation" + "page[[nomencl]]" "orrialdea" + "see equation[[nomencl]]" "ikus ekuazioa" End Translation fi diff --git a/lib/layouttranslations.review b/lib/layouttranslations.review index 7a9d149..39474b7 100644 --- a/lib/layouttranslations.review +++ b/lib/layouttranslations.review @@ -21,7 +21,6 @@ Additionally to the top ones, these languages should be reviewed for the followi "Listing" "Listings" -eu hu id ro @@ -31,9 +30,9 @@ sr (30.11.2017, LyX 2.3.0 release ) Additionally to the top ones, these languages should be reviewed for the following strings "List of Listings" -ar bg ca da el eu es fi gl he hu ia id ko nb nl nn pl ro sl sr sv tr uk zh_CN zh_TW +ar bg ca da el es fi gl he hu ia id ko nb nl nn pl ro sl sr sv tr uk zh_CN zh_TW "Nomenclature[[output]]" -> The string that is output to PDF for the nomenclature list "see equation[[nomencl]]" "page[[nomencl]]" -ar bg ca da el eu fi gl he hu ia id ja ko nb nl nn pl ro sl sr sv tr zh_CN zh_TW +ar bg ca da el fi gl he hu ia id ja ko nb nl nn pl ro sl sr sv tr zh_CN zh_TW diff --git a/po/eu.po b/po/eu.po index b858bc1..6a358e3 100644 --- a/po/eu.po +++ b/po/eu.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: lyx_2.0.0_eu\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2018-02-12 16:39+0100\n" -"PO-Revision-Date: 2018-02-12 20:50+0100\n" +"PO-Revision-Date: 2018-02-17 18:34+0100\n" "Last-Translator: Inaki Larranaga Murgoitio \n" "Language-Team: Basque \n" "Language: eu\n" @@ -627,9 +627,10 @@ msgstr "Hautatu adarra" msgid "Inverted" msgstr "Alderantzikatuta" +# adarra #: src/frontends/qt4/ui/BranchesUi.ui:25 msgid "&New:[[branch]]" -msgstr "&Berria:[[adarra]]" +msgstr "&Berria:" #: src/frontends/qt4/ui/BranchesUi.ui:35 msgid "" @@ -2084,9 +2085,12 @@ msgstr "Estekatu fitxategia" msgid "Fi&le" msgstr "&Fitxategia" +# 'listing' pakete baten izena da, progamazioko iturburua nabarmentzeko eginbidea eskaintzen du. LyX-eko agerpenetan 'zerrendatua' gisa euskaratu da. +# +# https://en.wikibooks.org/wiki/LaTeX/Source_Code_Listings #: src/frontends/qt4/ui/IncludeUi.ui:36 msgid "Listing Parameters" -msgstr "Zerrendaren parametroak" +msgstr "Zerrendatuaren parametroak" #: src/frontends/qt4/ui/IncludeUi.ui:66 #: src/frontends/qt4/ui/ListingsSettingsUi.ui:79 @@ -2148,10 +2152,11 @@ msgstr "Sarrera" msgid "Verbatim" msgstr "Hitzez hitz" +# erabili 'zerrendatua' termino 'listing' terminoaren itzulen gisa #: src/frontends/qt4/ui/IncludeUi.ui:308 src/insets/InsetInclude.cpp:1305 #: src/insets/InsetInclude.cpp:1311 msgid "Program Listing" -msgstr "Programaren zerrenda" +msgstr "Iturburuaren zerrendatua" #: src/frontends/qt4/ui/IncludeUi.ui:342 msgid "Edit the file" @@ -2197,9 +2202,10 @@ msgstr "Aktibatu hainbat indize behar badituzu (adib. Izenen indizea)" msgid "&Use multiple indexes" msgstr "&Erabili indize anitzak" +# indizea #: src/frontends/qt4/ui/IndicesUi.ui:114 msgid "&New:[[index]]" -msgstr "&Berria:[[indizea]]" +msgstr "&Berria:" #: src/frontends/qt4/ui/IndicesUi.ui:124 msgid "" @@ -2407,7 +2413,7 @@ msgstr "Lerroaren lodieraren balioa." #: src/frontends/qt4/ui/ListingsSettingsUi.ui:47 msgid "Input here the listings parameters" -msgstr "Sartu hemen zerrenden parametroak" +msgstr "Sartu hemen zerrendatuaren parametroak" #: src/frontends/qt4/ui/ListingsSettingsUi.ui:63 #: src/frontends/qt4/ui/ListingsUi.ui:477 @@ -2427,7 +2433,7 @@ msgstr "&Sintaxiaren nabarmentzeko paketea:" #: lib/layouts/stdinsets.inc:388 src/insets/InsetCaption.cpp:388 #: src/insets/InsetListings.cpp:464 src/insets/InsetListings.cpp:4
[LyX/2.3.x] * eu.po - update from Inaki.
commit b57b053a3f62632081fb9a6f85b4fd4cfcae7a80 Author: Pavel Sanda Date: Sat Feb 17 19:01:53 2018 +0100 * eu.po - update from Inaki. --- po/eu.po | 184 +++--- 1 files changed, 116 insertions(+), 68 deletions(-) diff --git a/po/eu.po b/po/eu.po index b858bc1..6a358e3 100644 --- a/po/eu.po +++ b/po/eu.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: lyx_2.0.0_eu\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2018-02-12 16:39+0100\n" -"PO-Revision-Date: 2018-02-12 20:50+0100\n" +"PO-Revision-Date: 2018-02-17 18:34+0100\n" "Last-Translator: Inaki Larranaga Murgoitio \n" "Language-Team: Basque \n" "Language: eu\n" @@ -627,9 +627,10 @@ msgstr "Hautatu adarra" msgid "Inverted" msgstr "Alderantzikatuta" +# adarra #: src/frontends/qt4/ui/BranchesUi.ui:25 msgid "&New:[[branch]]" -msgstr "&Berria:[[adarra]]" +msgstr "&Berria:" #: src/frontends/qt4/ui/BranchesUi.ui:35 msgid "" @@ -2084,9 +2085,12 @@ msgstr "Estekatu fitxategia" msgid "Fi&le" msgstr "&Fitxategia" +# 'listing' pakete baten izena da, progamazioko iturburua nabarmentzeko eginbidea eskaintzen du. LyX-eko agerpenetan 'zerrendatua' gisa euskaratu da. +# +# https://en.wikibooks.org/wiki/LaTeX/Source_Code_Listings #: src/frontends/qt4/ui/IncludeUi.ui:36 msgid "Listing Parameters" -msgstr "Zerrendaren parametroak" +msgstr "Zerrendatuaren parametroak" #: src/frontends/qt4/ui/IncludeUi.ui:66 #: src/frontends/qt4/ui/ListingsSettingsUi.ui:79 @@ -2148,10 +2152,11 @@ msgstr "Sarrera" msgid "Verbatim" msgstr "Hitzez hitz" +# erabili 'zerrendatua' termino 'listing' terminoaren itzulen gisa #: src/frontends/qt4/ui/IncludeUi.ui:308 src/insets/InsetInclude.cpp:1305 #: src/insets/InsetInclude.cpp:1311 msgid "Program Listing" -msgstr "Programaren zerrenda" +msgstr "Iturburuaren zerrendatua" #: src/frontends/qt4/ui/IncludeUi.ui:342 msgid "Edit the file" @@ -2197,9 +2202,10 @@ msgstr "Aktibatu hainbat indize behar badituzu (adib. Izenen indizea)" msgid "&Use multiple indexes" msgstr "&Erabili indize anitzak" +# indizea #: src/frontends/qt4/ui/IndicesUi.ui:114 msgid "&New:[[index]]" -msgstr "&Berria:[[indizea]]" +msgstr "&Berria:" #: src/frontends/qt4/ui/IndicesUi.ui:124 msgid "" @@ -2407,7 +2413,7 @@ msgstr "Lerroaren lodieraren balioa." #: src/frontends/qt4/ui/ListingsSettingsUi.ui:47 msgid "Input here the listings parameters" -msgstr "Sartu hemen zerrenden parametroak" +msgstr "Sartu hemen zerrendatuaren parametroak" #: src/frontends/qt4/ui/ListingsSettingsUi.ui:63 #: src/frontends/qt4/ui/ListingsUi.ui:477 @@ -2427,7 +2433,7 @@ msgstr "&Sintaxiaren nabarmentzeko paketea:" #: lib/layouts/stdinsets.inc:388 src/insets/InsetCaption.cpp:388 #: src/insets/InsetListings.cpp:464 src/insets/InsetListings.cpp:466 msgid "Listing" -msgstr "Zerrenda" +msgstr "Zerrendatua" #: src/frontends/qt4/ui/ListingsUi.ui:23 msgid "&Main Settings" @@ -2439,15 +2445,15 @@ msgstr "Kokapena" #: src/frontends/qt4/ui/ListingsUi.ui:35 msgid "Check for inline listings" -msgstr "Aktibatu lerroko zerrendentzako" +msgstr "Aktibatu lerroko zerrendatuak" #: src/frontends/qt4/ui/ListingsUi.ui:38 msgid "&Inline listing" -msgstr "&Lerroko zerrenda" +msgstr "&Lerroko zerrendatuak" #: src/frontends/qt4/ui/ListingsUi.ui:45 msgid "Check for floating listings" -msgstr "Aktibatu zerrenda mugikorrentzako" +msgstr "Aktibatu zerrendatu mugikorrentzako" #: src/frontends/qt4/ui/ListingsUi.ui:48 msgid "&Float" @@ -2459,7 +2465,7 @@ msgstr "&Kokapena:" #: src/frontends/qt4/ui/ListingsUi.ui:68 msgid "Specify placement (htbp) for floating listings" -msgstr "Zehaztu zerrenda mugikorren kokapena (htpb)" +msgstr "Zehaztu zerrendatu mugikorren kokapena (htpb)" #: src/frontends/qt4/ui/ListingsUi.ui:78 msgid "Line numbering" @@ -2593,7 +2599,7 @@ msgstr "Parametro gehiago" #: src/frontends/qt4/ui/ListingsUi.ui:499 msgid "Input listing parameters here. Enter ? for a list of parameters." msgstr "" -"Sartu zerrendaren parametroak hemen. Sartu ? parametroen zerrenda " +"Sartu zerrendatuaren parametroak hemen. Sartu ? parametroen zerrenda " "eskuratzeko." #: src/frontends/qt4/ui/LocalLayoutUi.ui:19 @@ -3899,10 +3905,11 @@ msgstr "Automatikoa" msgid "Always Babel" msgstr "Beti erabili Babel" +# hizkuntzaren paketea #: src/frontends/qt4/ui/PrefLanguageUi.ui:71 #: src/frontends/qt4/GuiDocument.cpp:1095 msgid "None[[language package]]" -msgstr "Bat ere ez [[hizkuntzaren paketea]]" +msgstr "Bat ere ez" #: src/frontends/qt4/ui/PrefLanguageUi.ui:88 msgid "Command s&tart:" @@ -4524,9 +4531,10 @@ msgstr "Bistaratu egoera-barrako mezuak?" msgid "&Statusbar messages" msgstr "&Egoera-barrako mezuak" +# bufferra #: src/frontends/qt4/ui/RefUi.ui:73 msgid "&In[[buffer]]:" -msgstr "&Sarrera[[bufferra]]:" +msgstr "&Sarrera:" #: src/frontends/qt4/ui/RefUi.ui:92 msgid "Filter case-sensitively" @@ -4655,9 +4663,10 @@ msgstr "Ez atera etiketaren \"
[LyX/2.3.x] * layouttranslations reviewed by Inaki
commit 4c3991b9ca2dc22427b540891bd4409a8ead149b Author: Pavel Sanda Date: Sat Feb 17 19:07:02 2018 +0100 * layouttranslations reviewed by Inaki --- lib/layouttranslations| 10 +- lib/layouttranslations.review |5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/layouttranslations b/lib/layouttranslations index f350f23..f96320f 100644 --- a/lib/layouttranslations +++ b/lib/layouttranslations @@ -436,11 +436,11 @@ Translation eu "List of Algorithms" "Algoritmoen zerrenda" "List of Charts" "Diagramen zerrenda" "List of Graphs[[mathematical]]" "Grafikoen zerrenda" - "List of Listings" "Zerrenden zerrenda" + "List of Listings" "Zerrendatuen zerrenda" "List of Schemes" "Eskemen zerrenda" "List of Tableaux" "Taulen zerrenda" - "Listing" "Zerrenda" - "Listings[[List of Listings]]" "Zerrendak" + "Listing" "Zerrendatua" + "Listings[[List of Listings]]" "Zerrendatuak" "Nomenclature[[output]]" "Nomenklatura" "Notation" "Notazioa" "Note" "Oharra" @@ -455,8 +455,8 @@ Translation eu "Summary" "Laburpena" "Tableau" "Taula" "Theorem" "Teorema" - "page[[nomencl]]" "page" - "see equation[[nomencl]]" "see equation" + "page[[nomencl]]" "orrialdea" + "see equation[[nomencl]]" "ikus ekuazioa" End Translation fi diff --git a/lib/layouttranslations.review b/lib/layouttranslations.review index 7a9d149..39474b7 100644 --- a/lib/layouttranslations.review +++ b/lib/layouttranslations.review @@ -21,7 +21,6 @@ Additionally to the top ones, these languages should be reviewed for the followi "Listing" "Listings" -eu hu id ro @@ -31,9 +30,9 @@ sr (30.11.2017, LyX 2.3.0 release ) Additionally to the top ones, these languages should be reviewed for the following strings "List of Listings" -ar bg ca da el eu es fi gl he hu ia id ko nb nl nn pl ro sl sr sv tr uk zh_CN zh_TW +ar bg ca da el es fi gl he hu ia id ko nb nl nn pl ro sl sr sv tr uk zh_CN zh_TW "Nomenclature[[output]]" -> The string that is output to PDF for the nomenclature list "see equation[[nomencl]]" "page[[nomencl]]" -ar bg ca da el eu fi gl he hu ia id ja ko nb nl nn pl ro sl sr sv tr zh_CN zh_TW +ar bg ca da el fi gl he hu ia id ja ko nb nl nn pl ro sl sr sv tr zh_CN zh_TW
[LyX/2.3.2-staging] * layouttranslations reviewed by Inaki
commit 2136af92b5b64f4488e765f52bf5a41d27106e9c Author: Pavel Sanda Date: Sat Feb 17 19:07:02 2018 +0100 * layouttranslations reviewed by Inaki --- lib/layouttranslations| 10 +- lib/layouttranslations.review |5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/layouttranslations b/lib/layouttranslations index f350f23..f96320f 100644 --- a/lib/layouttranslations +++ b/lib/layouttranslations @@ -436,11 +436,11 @@ Translation eu "List of Algorithms" "Algoritmoen zerrenda" "List of Charts" "Diagramen zerrenda" "List of Graphs[[mathematical]]" "Grafikoen zerrenda" - "List of Listings" "Zerrenden zerrenda" + "List of Listings" "Zerrendatuen zerrenda" "List of Schemes" "Eskemen zerrenda" "List of Tableaux" "Taulen zerrenda" - "Listing" "Zerrenda" - "Listings[[List of Listings]]" "Zerrendak" + "Listing" "Zerrendatua" + "Listings[[List of Listings]]" "Zerrendatuak" "Nomenclature[[output]]" "Nomenklatura" "Notation" "Notazioa" "Note" "Oharra" @@ -455,8 +455,8 @@ Translation eu "Summary" "Laburpena" "Tableau" "Taula" "Theorem" "Teorema" - "page[[nomencl]]" "page" - "see equation[[nomencl]]" "see equation" + "page[[nomencl]]" "orrialdea" + "see equation[[nomencl]]" "ikus ekuazioa" End Translation fi diff --git a/lib/layouttranslations.review b/lib/layouttranslations.review index 7a9d149..39474b7 100644 --- a/lib/layouttranslations.review +++ b/lib/layouttranslations.review @@ -21,7 +21,6 @@ Additionally to the top ones, these languages should be reviewed for the followi "Listing" "Listings" -eu hu id ro @@ -31,9 +30,9 @@ sr (30.11.2017, LyX 2.3.0 release ) Additionally to the top ones, these languages should be reviewed for the following strings "List of Listings" -ar bg ca da el eu es fi gl he hu ia id ko nb nl nn pl ro sl sr sv tr uk zh_CN zh_TW +ar bg ca da el es fi gl he hu ia id ko nb nl nn pl ro sl sr sv tr uk zh_CN zh_TW "Nomenclature[[output]]" -> The string that is output to PDF for the nomenclature list "see equation[[nomencl]]" "page[[nomencl]]" -ar bg ca da el eu fi gl he hu ia id ja ko nb nl nn pl ro sl sr sv tr zh_CN zh_TW +ar bg ca da el fi gl he hu ia id ja ko nb nl nn pl ro sl sr sv tr zh_CN zh_TW
[LyX/2.3.2-staging] * eu.po - update from Inaki.
commit f135013b3075f3e077f05b5fcc2bdc9e86825f4c Author: Pavel Sanda Date: Sat Feb 17 19:01:53 2018 +0100 * eu.po - update from Inaki. --- po/eu.po | 184 +++--- 1 files changed, 116 insertions(+), 68 deletions(-) diff --git a/po/eu.po b/po/eu.po index b858bc1..6a358e3 100644 --- a/po/eu.po +++ b/po/eu.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: lyx_2.0.0_eu\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2018-02-12 16:39+0100\n" -"PO-Revision-Date: 2018-02-12 20:50+0100\n" +"PO-Revision-Date: 2018-02-17 18:34+0100\n" "Last-Translator: Inaki Larranaga Murgoitio \n" "Language-Team: Basque \n" "Language: eu\n" @@ -627,9 +627,10 @@ msgstr "Hautatu adarra" msgid "Inverted" msgstr "Alderantzikatuta" +# adarra #: src/frontends/qt4/ui/BranchesUi.ui:25 msgid "&New:[[branch]]" -msgstr "&Berria:[[adarra]]" +msgstr "&Berria:" #: src/frontends/qt4/ui/BranchesUi.ui:35 msgid "" @@ -2084,9 +2085,12 @@ msgstr "Estekatu fitxategia" msgid "Fi&le" msgstr "&Fitxategia" +# 'listing' pakete baten izena da, progamazioko iturburua nabarmentzeko eginbidea eskaintzen du. LyX-eko agerpenetan 'zerrendatua' gisa euskaratu da. +# +# https://en.wikibooks.org/wiki/LaTeX/Source_Code_Listings #: src/frontends/qt4/ui/IncludeUi.ui:36 msgid "Listing Parameters" -msgstr "Zerrendaren parametroak" +msgstr "Zerrendatuaren parametroak" #: src/frontends/qt4/ui/IncludeUi.ui:66 #: src/frontends/qt4/ui/ListingsSettingsUi.ui:79 @@ -2148,10 +2152,11 @@ msgstr "Sarrera" msgid "Verbatim" msgstr "Hitzez hitz" +# erabili 'zerrendatua' termino 'listing' terminoaren itzulen gisa #: src/frontends/qt4/ui/IncludeUi.ui:308 src/insets/InsetInclude.cpp:1305 #: src/insets/InsetInclude.cpp:1311 msgid "Program Listing" -msgstr "Programaren zerrenda" +msgstr "Iturburuaren zerrendatua" #: src/frontends/qt4/ui/IncludeUi.ui:342 msgid "Edit the file" @@ -2197,9 +2202,10 @@ msgstr "Aktibatu hainbat indize behar badituzu (adib. Izenen indizea)" msgid "&Use multiple indexes" msgstr "&Erabili indize anitzak" +# indizea #: src/frontends/qt4/ui/IndicesUi.ui:114 msgid "&New:[[index]]" -msgstr "&Berria:[[indizea]]" +msgstr "&Berria:" #: src/frontends/qt4/ui/IndicesUi.ui:124 msgid "" @@ -2407,7 +2413,7 @@ msgstr "Lerroaren lodieraren balioa." #: src/frontends/qt4/ui/ListingsSettingsUi.ui:47 msgid "Input here the listings parameters" -msgstr "Sartu hemen zerrenden parametroak" +msgstr "Sartu hemen zerrendatuaren parametroak" #: src/frontends/qt4/ui/ListingsSettingsUi.ui:63 #: src/frontends/qt4/ui/ListingsUi.ui:477 @@ -2427,7 +2433,7 @@ msgstr "&Sintaxiaren nabarmentzeko paketea:" #: lib/layouts/stdinsets.inc:388 src/insets/InsetCaption.cpp:388 #: src/insets/InsetListings.cpp:464 src/insets/InsetListings.cpp:466 msgid "Listing" -msgstr "Zerrenda" +msgstr "Zerrendatua" #: src/frontends/qt4/ui/ListingsUi.ui:23 msgid "&Main Settings" @@ -2439,15 +2445,15 @@ msgstr "Kokapena" #: src/frontends/qt4/ui/ListingsUi.ui:35 msgid "Check for inline listings" -msgstr "Aktibatu lerroko zerrendentzako" +msgstr "Aktibatu lerroko zerrendatuak" #: src/frontends/qt4/ui/ListingsUi.ui:38 msgid "&Inline listing" -msgstr "&Lerroko zerrenda" +msgstr "&Lerroko zerrendatuak" #: src/frontends/qt4/ui/ListingsUi.ui:45 msgid "Check for floating listings" -msgstr "Aktibatu zerrenda mugikorrentzako" +msgstr "Aktibatu zerrendatu mugikorrentzako" #: src/frontends/qt4/ui/ListingsUi.ui:48 msgid "&Float" @@ -2459,7 +2465,7 @@ msgstr "&Kokapena:" #: src/frontends/qt4/ui/ListingsUi.ui:68 msgid "Specify placement (htbp) for floating listings" -msgstr "Zehaztu zerrenda mugikorren kokapena (htpb)" +msgstr "Zehaztu zerrendatu mugikorren kokapena (htpb)" #: src/frontends/qt4/ui/ListingsUi.ui:78 msgid "Line numbering" @@ -2593,7 +2599,7 @@ msgstr "Parametro gehiago" #: src/frontends/qt4/ui/ListingsUi.ui:499 msgid "Input listing parameters here. Enter ? for a list of parameters." msgstr "" -"Sartu zerrendaren parametroak hemen. Sartu ? parametroen zerrenda " +"Sartu zerrendatuaren parametroak hemen. Sartu ? parametroen zerrenda " "eskuratzeko." #: src/frontends/qt4/ui/LocalLayoutUi.ui:19 @@ -3899,10 +3905,11 @@ msgstr "Automatikoa" msgid "Always Babel" msgstr "Beti erabili Babel" +# hizkuntzaren paketea #: src/frontends/qt4/ui/PrefLanguageUi.ui:71 #: src/frontends/qt4/GuiDocument.cpp:1095 msgid "None[[language package]]" -msgstr "Bat ere ez [[hizkuntzaren paketea]]" +msgstr "Bat ere ez" #: src/frontends/qt4/ui/PrefLanguageUi.ui:88 msgid "Command s&tart:" @@ -4524,9 +4531,10 @@ msgstr "Bistaratu egoera-barrako mezuak?" msgid "&Statusbar messages" msgstr "&Egoera-barrako mezuak" +# bufferra #: src/frontends/qt4/ui/RefUi.ui:73 msgid "&In[[buffer]]:" -msgstr "&Sarrera[[bufferra]]:" +msgstr "&Sarrera:" #: src/frontends/qt4/ui/RefUi.ui:92 msgid "Filter case-sensitively" @@ -4655,9 +4663,10 @@ msgstr "Ez atera etiketaren \"
[LyX/master] Untranslated menu name in fr/EmbeddedObjects.lyx
commit 83485b670e8d79749b61c055994512ad23a03c76 Author: jpc Date: Sat Feb 17 18:42:05 2018 +0100 Untranslated menu name in fr/EmbeddedObjects.lyx --- lib/doc/fr/EmbeddedObjects.lyx |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx index f74d56c..c4f51ae 100644 --- a/lib/doc/fr/EmbeddedObjects.lyx +++ b/lib/doc/fr/EmbeddedObjects.lyx @@ -26866,11 +26866,11 @@ reference "fig:Deux-images-déformées" \end_layout \begin_layout Description -Label +Étiquette \begin_inset space ~ \end_inset -only: n'imprime que l'étiquette \SpecialChar LaTeX +uniquement: n'imprime que l'étiquette \SpecialChar LaTeX comme référence: \begin_inset CommandInset ref LatexCommand labelonly
[LyX/2.3.x] Untranslated menu name in fr/EmbeddedObjects.lyx
commit 15b099d5bf21e25e427930fe8b14e315ab23b162 Author: jpc Date: Sat Feb 17 18:42:05 2018 +0100 Untranslated menu name in fr/EmbeddedObjects.lyx --- lib/doc/fr/EmbeddedObjects.lyx |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx index f74d56c..c4f51ae 100644 --- a/lib/doc/fr/EmbeddedObjects.lyx +++ b/lib/doc/fr/EmbeddedObjects.lyx @@ -26866,11 +26866,11 @@ reference "fig:Deux-images-déformées" \end_layout \begin_layout Description -Label +Étiquette \begin_inset space ~ \end_inset -only: n'imprime que l'étiquette \SpecialChar LaTeX +uniquement: n'imprime que l'étiquette \SpecialChar LaTeX comme référence: \begin_inset CommandInset ref LatexCommand labelonly
[LyX/master] A couple of forgotten items in fr/Additional.lyx
commit c9a9f26f4262963f711bbe183c1d2a8269255f97 Author: jpc Date: Sat Feb 17 18:30:52 2018 +0100 A couple of forgotten items in fr/Additional.lyx --- lib/doc/fr/Additional.lyx | 44 ++-- 1 files changed, 18 insertions(+), 26 deletions(-) diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx index f8e6970..6ee6828 100644 --- a/lib/doc/fr/Additional.lyx +++ b/lib/doc/fr/Additional.lyx @@ -4522,8 +4522,6 @@ labelitem \end_layout \begin_layout Itemize - -\lang english \begin_inset Argument item:1 status open @@ -4551,27 +4549,21 @@ star \end_inset - -\lang french -Agissez sur chaque entrée individuellement en écrivant le motif de la puce - -\lang english -in a -\begin_inset Quotes eld + Agissez sur chaque entrée individuellement en écrivant le motif de la puce + dans un insert +\begin_inset Quotes cld \end_inset -Custom Item -\begin_inset Quotes erd +Élément paramétrable +\begin_inset Quotes crd \end_inset - inset (available at + (accessible via \family sans -Insert\SpecialChar menuseparator -Custom Item +Insertion\SpecialChar menuseparator +Élément paramétrable \family default -) -\lang french - et en mode \SpecialChar TeX +) et en code \SpecialChar TeX . Par exemple, cet élément a commencé par \family typewriter @@ -18420,18 +18412,18 @@ Memoir et les entêtes. Vous pouvez donc définir trois variantes d'un titre : un pour le corps du texte, un pour la table des matières et un pour les entêtes. - -\lang english -\SpecialChar LyX - makes these available in form of specific + \SpecialChar LyX + rend ceux-ci accessibles via des variantes particulières de \family sans -Short Title + Titre +\begin_inset space ~ +\end_inset + +court \family default - variants in the + dans le menu \family sans -Insert -\family default - menu. +Insertion. \end_layout \begin_layout Description
[LyX/2.3.x] A couple of forgotten items in fr/Additional.lyx
commit 487c9c9df3f86758aa1e1fe603695056de2b3efd Author: jpc Date: Sat Feb 17 18:30:52 2018 +0100 A couple of forgotten items in fr/Additional.lyx --- lib/doc/fr/Additional.lyx | 44 ++-- 1 files changed, 18 insertions(+), 26 deletions(-) diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx index f8e6970..6ee6828 100644 --- a/lib/doc/fr/Additional.lyx +++ b/lib/doc/fr/Additional.lyx @@ -4522,8 +4522,6 @@ labelitem \end_layout \begin_layout Itemize - -\lang english \begin_inset Argument item:1 status open @@ -4551,27 +4549,21 @@ star \end_inset - -\lang french -Agissez sur chaque entrée individuellement en écrivant le motif de la puce - -\lang english -in a -\begin_inset Quotes eld + Agissez sur chaque entrée individuellement en écrivant le motif de la puce + dans un insert +\begin_inset Quotes cld \end_inset -Custom Item -\begin_inset Quotes erd +Élément paramétrable +\begin_inset Quotes crd \end_inset - inset (available at + (accessible via \family sans -Insert\SpecialChar menuseparator -Custom Item +Insertion\SpecialChar menuseparator +Élément paramétrable \family default -) -\lang french - et en mode \SpecialChar TeX +) et en code \SpecialChar TeX . Par exemple, cet élément a commencé par \family typewriter @@ -18420,18 +18412,18 @@ Memoir et les entêtes. Vous pouvez donc définir trois variantes d'un titre : un pour le corps du texte, un pour la table des matières et un pour les entêtes. - -\lang english -\SpecialChar LyX - makes these available in form of specific + \SpecialChar LyX + rend ceux-ci accessibles via des variantes particulières de \family sans -Short Title + Titre +\begin_inset space ~ +\end_inset + +court \family default - variants in the + dans le menu \family sans -Insert -\family default - menu. +Insertion. \end_layout \begin_layout Description
[LyX/master] Remove spurious occurrence of AGU and EGS chapters in fr/Additional.lyx
commit 99b6af52f17a003d341a271ca80444f04f5fb395 Author: jpc Date: Sat Feb 17 17:54:24 2018 +0100 Remove spurious occurrence of AGU and EGS chapters in fr/Additional.lyx --- lib/doc/fr/Additional.lyx | 321 - 1 files changed, 0 insertions(+), 321 deletions(-) diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx index 23aaa8b..f8e6970 100644 --- a/lib/doc/fr/Additional.lyx +++ b/lib/doc/fr/Additional.lyx @@ -19002,327 +19002,6 @@ ejour2 \end_layout \begin_layout Section -Publications de l'AGU ( -\family sans -aguplus -\family default -) -\end_layout - -\begin_layout Standard -par -\shape smallcaps -Martin Vermeer -\end_layout - -\begin_layout Subsection -Description -\end_layout - -\begin_layout Standard -Ce sont les fichiers de format correspondant à certaines publications de - l'American Geophysical Society. - Nous supposons que vous avez déjà installé les fichiers de classe propres - à l'AGU, ainsi qu'AGUplus (tout ceci se trouve à -\begin_inset Flex URL -status collapsed - -\begin_layout Plain Layout - -http://publications.agu.org/files/2013/08/AGU-LaTeX.zip -\end_layout - -\end_inset - -). -\end_layout - -\begin_layout Subsection -Nouveaux environnements -\end_layout - -\begin_layout Standard - -\family sans -Paragraphe -\family default - et -\family sans -Paragraphe* -\family default - sont redéfinis. - Ils portent toujours ce nom dans l'interface \SpecialChar LyX -, bien que leurs équivalents - \SpecialChar LaTeX - dans les classes AGU soient -\family sans -Subsubsubsection -\family default - et -\family sans -Subsubsubsection* -\family default -. -\end_layout - -\begin_layout Standard -Les environnements nouvellement définis sont -\family sans -En-tête_Gauche -\family default - (Left_Header -\family sans -) -\family default -, -\family sans -En-tête_Droite -\family default - (Right_Header -\family sans -) -\family default -, -\family sans -Reçu -\family default - (Received -\family sans -) -\family default -, -\family sans -Révisé -\family default - (Revised -\family sans -) -\family default -, -\family sans -Accepté -\family default - (Accepted -\family sans -) -\family default -, -\family sans -CCC -\family default -, -\family sans -Id_Papier -\family default - (PaperId -\family sans -) -\family default -, -\family sans -Adresse_Auteur -\family default - (AuthorAddr) et -\family sans -SlugComment -\family default -. - Ce sont pour la plupart des paramètres du manuscrit qui sont expliqués - dans la documentation des classes AGU. -\end_layout - -\begin_layout Standard -Je soupçonne que tout ceci soit encore relativement incomplet. -\end_layout - -\begin_layout Subsection -Nouveaux flottants -\end_layout - -\begin_layout Standard - -\family sans -Planotable -\family default - et -\family sans -Planche -\family default - (Plate). - Nous avons également une nouvelle -\family sans -Légende_Table -\family default - (Table_Caption). -\end_layout - -\begin_layout Subsection -Publications supportées -\end_layout - -\begin_layout Itemize - -\emph on -Journal of Geophysical Research -\emph default - : -\family typewriter -jgrga.layout -\family default - – Martin Vermeer -\end_layout - -\begin_layout Standard -Ajoutez les vôtres, ce n'est pas si dur ! Regardez l'exemple -\family typewriter -jgrga.layout -\family default - ainsi que -\family typewriter -aguplus.inc -\family default -. -\end_layout - -\begin_layout Subsection -Bogues et choses à retenir -\end_layout - -\begin_layout Standard -Pour utiliser les nouveaux environnements, vous devez faire ce qui suit - à chaque nouveau document : -\end_layout - -\begin_layout Enumerate - -\emph on -(Dés)Activer babel -\emph default -, ce que vous ferez dans -\family sans -Document\SpecialChar menuseparator -Paramètres -\family default -. - (Les articles AGU sont écrits en anglais de toutes façons, il ne faut donc - -\emph on -pas -\emph default - choisir de langue.) -\end_layout - -\begin_layout Enumerate -Tapez -\family typewriter -jgrga -\family default - dans le champ -\family sans -Options -\family default - de la classe de document (c'est effectivement un bogue.) -\end_layout - -\begin_layout Enumerate -Assurez-vous que vous utilisez le style de bibliographie -\family typewriter -agu.bst -\family default -, en tapant -\family sans -agu -\family default - dans le deuxième champ de l'insert Bib\SpecialChar TeX -. - Aucun des styles standard ne conviendra. -\end_layout - -\begin_layout Section -Publications de l'EGS ( -\family sans -egs -\family default -) -\end_layout - -\begin_layout Standard -par -\shape smallcaps -Martin Vermeer -\end_layout - -\begin_layout Subsection -Description -\end_layout - -\begin_layout Standard -C'est le fichier de format pour les publications de l'EGS ( -\emph on -European Geophysical Society -\emph default -). - Vous pouvez télécharger la classe -\family typewriter -egs.cls -\family default - (nécessaire) depuis le site de l'
[LyX/2.3.x] Remove spurious occurrence of AGU and EGS chapters in fr/Additional.lyx
commit 16a76383298872ed09c699f3110f2151ef9cd9c3 Author: jpc Date: Sat Feb 17 17:54:24 2018 +0100 Remove spurious occurrence of AGU and EGS chapters in fr/Additional.lyx --- lib/doc/fr/Additional.lyx | 321 - 1 files changed, 0 insertions(+), 321 deletions(-) diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx index 23aaa8b..f8e6970 100644 --- a/lib/doc/fr/Additional.lyx +++ b/lib/doc/fr/Additional.lyx @@ -19002,327 +19002,6 @@ ejour2 \end_layout \begin_layout Section -Publications de l'AGU ( -\family sans -aguplus -\family default -) -\end_layout - -\begin_layout Standard -par -\shape smallcaps -Martin Vermeer -\end_layout - -\begin_layout Subsection -Description -\end_layout - -\begin_layout Standard -Ce sont les fichiers de format correspondant à certaines publications de - l'American Geophysical Society. - Nous supposons que vous avez déjà installé les fichiers de classe propres - à l'AGU, ainsi qu'AGUplus (tout ceci se trouve à -\begin_inset Flex URL -status collapsed - -\begin_layout Plain Layout - -http://publications.agu.org/files/2013/08/AGU-LaTeX.zip -\end_layout - -\end_inset - -). -\end_layout - -\begin_layout Subsection -Nouveaux environnements -\end_layout - -\begin_layout Standard - -\family sans -Paragraphe -\family default - et -\family sans -Paragraphe* -\family default - sont redéfinis. - Ils portent toujours ce nom dans l'interface \SpecialChar LyX -, bien que leurs équivalents - \SpecialChar LaTeX - dans les classes AGU soient -\family sans -Subsubsubsection -\family default - et -\family sans -Subsubsubsection* -\family default -. -\end_layout - -\begin_layout Standard -Les environnements nouvellement définis sont -\family sans -En-tête_Gauche -\family default - (Left_Header -\family sans -) -\family default -, -\family sans -En-tête_Droite -\family default - (Right_Header -\family sans -) -\family default -, -\family sans -Reçu -\family default - (Received -\family sans -) -\family default -, -\family sans -Révisé -\family default - (Revised -\family sans -) -\family default -, -\family sans -Accepté -\family default - (Accepted -\family sans -) -\family default -, -\family sans -CCC -\family default -, -\family sans -Id_Papier -\family default - (PaperId -\family sans -) -\family default -, -\family sans -Adresse_Auteur -\family default - (AuthorAddr) et -\family sans -SlugComment -\family default -. - Ce sont pour la plupart des paramètres du manuscrit qui sont expliqués - dans la documentation des classes AGU. -\end_layout - -\begin_layout Standard -Je soupçonne que tout ceci soit encore relativement incomplet. -\end_layout - -\begin_layout Subsection -Nouveaux flottants -\end_layout - -\begin_layout Standard - -\family sans -Planotable -\family default - et -\family sans -Planche -\family default - (Plate). - Nous avons également une nouvelle -\family sans -Légende_Table -\family default - (Table_Caption). -\end_layout - -\begin_layout Subsection -Publications supportées -\end_layout - -\begin_layout Itemize - -\emph on -Journal of Geophysical Research -\emph default - : -\family typewriter -jgrga.layout -\family default - – Martin Vermeer -\end_layout - -\begin_layout Standard -Ajoutez les vôtres, ce n'est pas si dur ! Regardez l'exemple -\family typewriter -jgrga.layout -\family default - ainsi que -\family typewriter -aguplus.inc -\family default -. -\end_layout - -\begin_layout Subsection -Bogues et choses à retenir -\end_layout - -\begin_layout Standard -Pour utiliser les nouveaux environnements, vous devez faire ce qui suit - à chaque nouveau document : -\end_layout - -\begin_layout Enumerate - -\emph on -(Dés)Activer babel -\emph default -, ce que vous ferez dans -\family sans -Document\SpecialChar menuseparator -Paramètres -\family default -. - (Les articles AGU sont écrits en anglais de toutes façons, il ne faut donc - -\emph on -pas -\emph default - choisir de langue.) -\end_layout - -\begin_layout Enumerate -Tapez -\family typewriter -jgrga -\family default - dans le champ -\family sans -Options -\family default - de la classe de document (c'est effectivement un bogue.) -\end_layout - -\begin_layout Enumerate -Assurez-vous que vous utilisez le style de bibliographie -\family typewriter -agu.bst -\family default -, en tapant -\family sans -agu -\family default - dans le deuxième champ de l'insert Bib\SpecialChar TeX -. - Aucun des styles standard ne conviendra. -\end_layout - -\begin_layout Section -Publications de l'EGS ( -\family sans -egs -\family default -) -\end_layout - -\begin_layout Standard -par -\shape smallcaps -Martin Vermeer -\end_layout - -\begin_layout Subsection -Description -\end_layout - -\begin_layout Standard -C'est le fichier de format pour les publications de l'EGS ( -\emph on -European Geophysical Society -\emph default -). - Vous pouvez télécharger la classe -\family typewriter -egs.cls -\family default - (nécessaire) depuis le site de l'
[LyX/master] Another go at fixing string metrics
commit 5861df71721ddf823e5b01e0d9b8f4b97da58a97
Author: Jean-Marc Lasgouttes
Date: Sat Feb 17 16:55:22 2018 +0100
Another go at fixing string metrics
This time, it is the problems with \int in esint and cmex that we are
trying to work around. This code is becoming too complicated to my
taste.
---
src/frontends/qt4/GuiFontMetrics.cpp | 32 ++--
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/frontends/qt4/GuiFontMetrics.cpp
b/src/frontends/qt4/GuiFontMetrics.cpp
index b9eab85..c2d4b88 100644
--- a/src/frontends/qt4/GuiFontMetrics.cpp
+++ b/src/frontends/qt4/GuiFontMetrics.cpp
@@ -181,26 +181,38 @@ int GuiFontMetrics::width(docstring const & s) const
if (strwidth_cache_.contains(s))
return strwidth_cache_[s];
PROFILE_CACHE_MISS(width);
- /* For some reason QMetrics::width returns a wrong value with Qt5
-* with some arabic text. OTOH, QTextLayout is broken for single
-* characters with null width (like \not in mathed). Also, as a
-* safety measure, always use QMetrics::width with our math fonts.
+ /* Several problems have to be taken into account:
+* * QFontMetrics::width does not returns a wrong value with Qt5 with
+* some arabic text, since the glyph-shaping operations are not
+* done (documented in Qt5).
+* * QTextLayout is broken for single characters with null width
+* (like \not in mathed).
+* * While QTextLine::horizontalAdvance is the right thing to use
+ * for text strings, it does not give a good result with some
+ * characters like the \int (gyph 4) of esint.
+
+* Also, as a safety measure, always use QFontMetrics::width with
+* our math fonts.
*/
int w = 0;
- if (s.length() == 1
+ // is the string a single character from a math font ?
#if QT_VERSION >= 0x040800
- || font_.styleName() == "LyX"
+ bool const math_char = s.length() == 1 || font_.styleName() == "LyX";
+#else
+ bool const math_char = s.length() == 1;
#endif
- )
- w = metrics_.width(toqstr(s));
- else {
+ // keep value 0 for math chars with width 0
+ if (!math_char || metrics_.width(toqstr(s)) != 0) {
QTextLayout tl;
tl.setText(toqstr(s));
tl.setFont(font_);
tl.beginLayout();
QTextLine line = tl.createLine();
tl.endLayout();
- w = iround(line.horizontalAdvance());
+ if (math_char)
+ w = iround(line.naturalTextWidth());
+ else
+ w = iround(line.horizontalAdvance());
}
strwidth_cache_.insert(s, w, s.size() * sizeof(char_type));
return w;
[LyX/master] Skip insets when checking for uncodable chars to paste.
commit 8f9b733e6720c0709ea25c4bf56847e01faadd6f
Author: Juergen Spitzmueller
Date: Sat Feb 17 12:27:26 2018 +0100
Skip insets when checking for uncodable chars to paste.
Fixes paste of quote insets to ERT/chunk.
---
src/CutAndPaste.cpp |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 92d6d95..1d4299a 100644
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -169,6 +169,9 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList
const & parlist,
for (size_t i = 0; i != insertion.size(); ++i) {
pos_type end = insertion[i].size();
for (pos_type j = 0; j != end; ++j) {
+ // skip insets
+ if (insertion[i].isInset(j))
+ continue;
char_type const c = insertion[i].getChar(j);
if (!e->encodable(c)) {
// do not track deletion
[LyX/master] Adapt to new ChkTeX return values.
commit 0d806799aaef65b12a9b75e8c49c2613c68d5ac2
Author: Juergen Spitzmueller
Date: Sat Feb 17 11:25:28 2018 +0100
Adapt to new ChkTeX return values.
As of v. 1.7.7, chktex has four exit values. Only consider the program
failed with EXIT_FAILURE (1). This is backwards compatible to chktex
up to v. 1.7.5 and later patched versions included in TeXLive, where
there was the distinction EXIT_FAILURE (program failed) and EXIT_SUCCESS
(program successfully run, with or without something to report).
Note that ChkTeX v. 1.7.5 and 1.7.6 vanilla (as included in MikTeX) also
returned EXITE_FAILURE if ChkTeX found something to report.
We do not, and never did, support this case.
Fixes: #9989 (after ChkTeX 1.7.7. is released).
---
src/Chktex.cpp | 16 +++-
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/Chktex.cpp b/src/Chktex.cpp
index 816837a..ac4599d 100644
--- a/src/Chktex.cpp
+++ b/src/Chktex.cpp
@@ -34,16 +34,22 @@ Chktex::Chktex(string const & chktex, string const & f,
string const & p)
int Chktex::run(TeXErrors &terr)
{
- // run bibtex
+ // run chktex
string log = onlyFileName(changeExtension(file, ".log"));
string tmp = cmd + " -q -v0 -b0 -x " + file + " -o " + log;
Systemcall one;
int result = one.startscript(Systemcall::Wait, tmp);
- if (result == 0) {
- result = scanLogFile(terr);
- } else {
+ // ChkTeX (as of v. 1.7.7) has the following return values:
+ // 0 = EXIT_SUCCESS : program run successfully, nothing to report
+ // 1 = EXIT_FAILURE : program run unsucessfully
+ // 2 = EXIT_WARNINGS : program run successfully, only warnings to report
+ // 3 = EXIT_ERRORS : program run successfully, errors to report
+ // We only check for EXIT_FAILURE here, since older versions of ChkTeX
+ // returned 0 also in case 2 and 3.
+ if (result == EXIT_FAILURE)
result = -1;
- }
+ else
+ result = scanLogFile(terr);
return result;
}
