[LyX/2.2.x] Win installer: add an MSVC DLL
commit 2da990973b3ca637b79dac24bf3824dbf10cff8e
Author: Uwe Stöhr
Date: Tue Jul 26 23:40:19 2016 +0200
Win installer: add an MSVC DLL
the compiled lyx.exe does not use it but since its distribution is
recommended by Microsoft it doesn't harm to distribute it with the installer
---
.../Win32/packaging/installer/include/filelist.nsh |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/development/Win32/packaging/installer/include/filelist.nsh
b/development/Win32/packaging/installer/include/filelist.nsh
index 54863f4..20342ca 100644
--- a/development/Win32/packaging/installer/include/filelist.nsh
+++ b/development/Win32/packaging/installer/include/filelist.nsh
@@ -61,6 +61,7 @@ Lists of files to include in the installer
${FILE}msvcr100.dll"
${FILE}msvcp100.dll"
# Files needed for MSVC 2015
+ ${FILE}concrt140.dll"
${FILE}msvcp140.dll"
${FILE}vcamp140.dll"
${FILE}vccorlib140.dll"
[LyX/2.2.x] Merge branch '2.2.x' of git.lyx.org:lyx into 2.2.x
commit 5e6f9d17532407589f35931da9900758e8543231 Merge: 2da9909 0dceac6 Author: Uwe Stöhr Date: Tue Jul 26 23:40:34 2016 +0200 Merge branch '2.2.x' of git.lyx.org:lyx into 2.2.x src/RowPainter.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
[LyX/master] win installer: port recent changes from branch
commit 056422dae9aeae150ed68e1b02c6b022c825d92d
Author: Uwe Stöhr
Date: Tue Jul 26 23:41:23 2016 +0200
win installer: port recent changes from branch
---
.../Win32/packaging/installer/ChangeLog.txt| 12 +++-
.../Win32/packaging/installer/include/filelist.nsh |1 +
development/Win32/packaging/installer/settings.nsh | 12 ++--
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index f512d25..d4f71b5 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,14 @@
-Changelog for LyX-220-3:
+Changelog for LyX-221-1:
+- installs LyX 2.2.1
+- recompiled LyX using MSVC 2015 update 3
+- updated to Qt 5.6.1-1
+- updated to MiKTeX 2.9 build 6022
+- updated to Imagemagick 6.9.5
+- updated to Python 2.7.12
+- updated to JabRef 3.5
+
+
+Changelog for LyX-220-3:
- updated to Qt 5.6.1
- updated to MiKTeX 2.9 build 5997
- updated to JabRef 3.4
diff --git a/development/Win32/packaging/installer/include/filelist.nsh
b/development/Win32/packaging/installer/include/filelist.nsh
index 54863f4..20342ca 100644
--- a/development/Win32/packaging/installer/include/filelist.nsh
+++ b/development/Win32/packaging/installer/include/filelist.nsh
@@ -61,6 +61,7 @@ Lists of files to include in the installer
${FILE}msvcr100.dll"
${FILE}msvcp100.dll"
# Files needed for MSVC 2015
+ ${FILE}concrt140.dll"
${FILE}msvcp140.dll"
${FILE}vcamp140.dll"
${FILE}vccorlib140.dll"
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 6553c33..25ca141 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -11,10 +11,10 @@ These typically need to be modified for each LyX release
!define APP_VERSION_MAJOR 2
!define APP_VERSION_MINOR 2
-!define APP_VERSION_REVISION 0
+!define APP_VERSION_REVISION 1
!define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX
otherwise ""
!define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX
otherwise ""
-!define APP_VERSION_BUILD 3 # Start with 1 for the installer releases of each
version
+!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each
version
!define APP_VERSION
"${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}"
# Version to display
@@ -51,12 +51,12 @@ These typically need to be modified for each LyX release
!define MiKTeXRepo
"ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/";
!define MiKTeXDeliveredVersion "2.9"
-!define ImageMagickVersion "6.9.4"
+!define ImageMagickVersion "6.9.5"
# definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE
- !define JabRefInstall "external\JabRef_windows_3_4.exe"
- !define SIZE_JABREF 25700 # size in KB
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.5997.exe"
+ !define JabRefInstall "external\JabRef_windows_3_5.exe"
+ !define SIZE_JABREF 26252 # size in KB
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6022.exe"
!endif
[LyX/2.2.x] Customization.lyx: remove incorrect LaTeX symbols
commit 3eb90307a7827bfd1f2ab70646c8d2b3a492d34d Author: Uwe Stöhr Date: Sun Jul 31 10:35:04 2016 +0200 Customization.lyx: remove incorrect LaTeX symbols --- lib/doc/Customization.lyx|8 +++- lib/doc/de/Customization.lyx | 10 +++--- lib/doc/es/Customization.lyx | 10 +++--- lib/doc/fr/Customization.lyx | 10 +++--- lib/doc/ja/Customization.lyx |2 +- 5 files changed, 13 insertions(+), 27 deletions(-) diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx index 7cf54ea..3ca022e 100644 --- a/lib/doc/Customization.lyx +++ b/lib/doc/Customization.lyx @@ -22945,8 +22945,7 @@ Transform Resize \end_layout \begin_layout LyX-Code -Format \SpecialChar LaTeX - +Format LaTeX \end_layout \begin_layout LyX-Code @@ -23002,8 +23001,7 @@ FormatEnd \end_layout \begin_layout LyX-Code -Format PDF\SpecialChar LaTeX - +Format PDFLaTeX \end_layout \begin_layout LyX-Code @@ -23438,7 +23436,7 @@ Format \begin_inset space ~ \end_inset -LaTeX|PDFLaTeX|PlainText|DocBook +LaTeX|PDFLaTeX|PlainText|DocBook|XHTML \end_layout \end_inset diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx index cb23846..7cf74fa 100644 --- a/lib/doc/de/Customization.lyx +++ b/lib/doc/de/Customization.lyx @@ -22010,8 +22010,7 @@ Transform Resize \begin_layout LyX-Code \lang english -Format \SpecialChar LaTeX - +Format LaTeX \end_layout \begin_layout LyX-Code @@ -22093,8 +22092,7 @@ FormatEnd \begin_layout LyX-Code \lang english -Format PDF\SpecialChar LaTeX - +Format PDFLaTeX \end_layout \begin_layout LyX-Code @@ -22649,9 +22647,7 @@ Format \begin_inset space ~ \end_inset -\SpecialChar LaTeX -|PDF\SpecialChar LaTeX -|PlainText|DocBook +LaTeX|PDFLaTeX|PlainText|DocBook|XHTML \end_layout \end_inset diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx index 83c7f75..7ed824d 100644 --- a/lib/doc/es/Customization.lyx +++ b/lib/doc/es/Customization.lyx @@ -22762,8 +22762,7 @@ Transform Resize \end_layout \begin_layout LyX-Code -Format \SpecialChar LaTeX - +Format LaTeX \end_layout \begin_layout LyX-Code @@ -22819,8 +22818,7 @@ FormatEnd \end_layout \begin_layout LyX-Code -Format PDF\SpecialChar LaTeX - +Format PDFLaTeX \end_layout \begin_layout LyX-Code @@ -23257,9 +23255,7 @@ Format \begin_inset space ~ \end_inset -\SpecialChar LaTeX -|PDF\SpecialChar LaTeX -|PlainText|DocBook +LaTeX|PDFLaTeX|PlainText|DocBook|XHTML \end_layout \end_inset diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx index 4ef7a1b..9db5034 100644 --- a/lib/doc/fr/Customization.lyx +++ b/lib/doc/fr/Customization.lyx @@ -25248,8 +25248,7 @@ Transform Resize \begin_layout LyX-Code \lang english -Format \SpecialChar LaTeX - +Format LaTeX \end_layout \begin_layout LyX-Code @@ -25331,8 +25330,7 @@ FormatEnd \begin_layout LyX-Code \lang english -Format PDF\SpecialChar LaTeX - +Format PDFLaTeX \end_layout \begin_layout LyX-Code @@ -25896,9 +25894,7 @@ Format \begin_inset space ~ \end_inset -\SpecialChar LaTeX -|PDF\SpecialChar LaTeX -|PlainText|DocBook +LaTeX|PDFLaTeX|PlainText|DocBook|XHTML \end_layout \end_inset diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx index 4bc86bf..9a65cac 100644 --- a/lib/doc/ja/Customization.lyx +++ b/lib/doc/ja/Customization.lyx @@ -20849,7 +20849,7 @@ Format \begin_inset space ~ \end_inset -LaTeX|PDFLaTeX|PlainText|DocBook +LaTeX|PDFLaTeX|PlainText|DocBook|XHTML \end_layout \end_inset
[LyX/master] Customization.lyx: accept Richards changes
commit 79a76392ab7514693b06bec37158f66ec37a4c00 Author: Uwe Stöhr Date: Sun Jul 31 10:37:28 2016 +0200 Customization.lyx: accept Richards changes Richard, please do everything that does not depend on LyX 2.3 this in the 2.2.x branch. Also don't upgrade the fileformat if not necessary. --- lib/doc/Customization.lyx | 34 ++ 1 files changed, 6 insertions(+), 28 deletions(-) diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx index d071758..919f7a4 100644 --- a/lib/doc/Customization.lyx +++ b/lib/doc/Customization.lyx @@ -1,5 +1,5 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ -\lyxformat 511 +#LyX 2.2 created this file. For more info see http://www.lyx.org/ +\lyxformat 508 \begin_document \begin_header \save_transient_properties true @@ -56,7 +56,6 @@ logicalmkup \font_osf false \font_sf_scale 100 100 \font_tt_scale 100 100 -\use_microtype false \graphics default \default_output_format pdf2 \output_sync 0 @@ -118,12 +117,11 @@ logicalmkup \papercolumns 1 \papersides 2 \paperpagestyle headings -\tracking_changes true +\tracking_changes false \output_changes false \html_math_output 0 \html_css_as_file 0 \html_be_strict true -\author 424524441 "rgheck" \end_header \begin_body @@ -224,7 +222,6 @@ This manual covers the customization features present in \SpecialChar LyX \begin_layout Standard \begin_inset Branch OutDated -inverted 0 status collapsed \begin_layout Standard @@ -3520,7 +3517,6 @@ If you ever find an error in the original document, fix it and notify the \begin_layout Standard \begin_inset Branch OutDated -inverted 0 status collapsed \begin_layout Section @@ -22949,14 +22945,7 @@ Transform Resize \end_layout \begin_layout LyX-Code -Format -\change_deleted 424524441 1469933132 -\SpecialChar LaTeX - -\change_inserted 424524441 1469933134 -LaTeX -\change_unchanged - +Format LaTeX \end_layout \begin_layout LyX-Code @@ -23012,14 +23001,7 @@ FormatEnd \end_layout \begin_layout LyX-Code -Format PDF -\change_deleted 424524441 1469933139 -\SpecialChar LaTeX - -\change_inserted 424524441 1469933140 -LaTeX -\change_unchanged - +Format PDFLaTeX \end_layout \begin_layout LyX-Code @@ -23434,11 +23416,7 @@ Format \begin_inset space ~ \end_inset -LaTeX|PDFLaTeX|PlainText|DocBook -\change_inserted 424524441 1469933248 -|XHTML -\change_unchanged - +LaTeX|PDFLaTeX|PlainText|DocBook|XHTML \end_layout \end_inset
[LyX/master] Customization.lyx: port recent changes to master
commit d9db72833ae8c53f58f56cea5ae1af5bd3197d10 Author: Uwe Stöhr Date: Sun Jul 31 10:43:00 2016 +0200 Customization.lyx: port recent changes to master --- lib/doc/de/Customization.lyx | 10 +++--- lib/doc/es/Customization.lyx | 10 +++--- lib/doc/fr/Customization.lyx | 10 +++--- lib/doc/ja/Customization.lyx |2 +- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx index cb23846..7cf74fa 100644 --- a/lib/doc/de/Customization.lyx +++ b/lib/doc/de/Customization.lyx @@ -22010,8 +22010,7 @@ Transform Resize \begin_layout LyX-Code \lang english -Format \SpecialChar LaTeX - +Format LaTeX \end_layout \begin_layout LyX-Code @@ -22093,8 +22092,7 @@ FormatEnd \begin_layout LyX-Code \lang english -Format PDF\SpecialChar LaTeX - +Format PDFLaTeX \end_layout \begin_layout LyX-Code @@ -22649,9 +22647,7 @@ Format \begin_inset space ~ \end_inset -\SpecialChar LaTeX -|PDF\SpecialChar LaTeX -|PlainText|DocBook +LaTeX|PDFLaTeX|PlainText|DocBook|XHTML \end_layout \end_inset diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx index 83c7f75..7ed824d 100644 --- a/lib/doc/es/Customization.lyx +++ b/lib/doc/es/Customization.lyx @@ -22762,8 +22762,7 @@ Transform Resize \end_layout \begin_layout LyX-Code -Format \SpecialChar LaTeX - +Format LaTeX \end_layout \begin_layout LyX-Code @@ -22819,8 +22818,7 @@ FormatEnd \end_layout \begin_layout LyX-Code -Format PDF\SpecialChar LaTeX - +Format PDFLaTeX \end_layout \begin_layout LyX-Code @@ -23257,9 +23255,7 @@ Format \begin_inset space ~ \end_inset -\SpecialChar LaTeX -|PDF\SpecialChar LaTeX -|PlainText|DocBook +LaTeX|PDFLaTeX|PlainText|DocBook|XHTML \end_layout \end_inset diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx index 4ef7a1b..9db5034 100644 --- a/lib/doc/fr/Customization.lyx +++ b/lib/doc/fr/Customization.lyx @@ -25248,8 +25248,7 @@ Transform Resize \begin_layout LyX-Code \lang english -Format \SpecialChar LaTeX - +Format LaTeX \end_layout \begin_layout LyX-Code @@ -25331,8 +25330,7 @@ FormatEnd \begin_layout LyX-Code \lang english -Format PDF\SpecialChar LaTeX - +Format PDFLaTeX \end_layout \begin_layout LyX-Code @@ -25896,9 +25894,7 @@ Format \begin_inset space ~ \end_inset -\SpecialChar LaTeX -|PDF\SpecialChar LaTeX -|PlainText|DocBook +LaTeX|PDFLaTeX|PlainText|DocBook|XHTML \end_layout \end_inset diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx index 4bc86bf..9a65cac 100644 --- a/lib/doc/ja/Customization.lyx +++ b/lib/doc/ja/Customization.lyx @@ -20849,7 +20849,7 @@ Format \begin_inset space ~ \end_inset -LaTeX|PDFLaTeX|PlainText|DocBook +LaTeX|PDFLaTeX|PlainText|DocBook|XHTML \end_layout \end_inset
[LyX/2.2.x] French doc files: re-add missing \origin tag
commit e8b41bf1fdb4e1f5a3d19ac9afb3bd467e5b701e Author: Uwe Stöhr Date: Sat Sep 3 22:17:52 2016 +0200 French doc files: re-add missing \origin tag otherwise LyX cannot be compiled here --- lib/doc/fr/Customization.lyx |2 +- lib/doc/fr/Math.lyx |2 +- lib/doc/fr/Tutorial.lyx |2 +- lib/doc/fr/UserGuide.lyx |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx index a60f673..f1bf841 100644 --- a/lib/doc/fr/Customization.lyx +++ b/lib/doc/fr/Customization.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/doc/fr/ \textclass scrbook \begin_preamble % DO NOT ALTER THIS PREAMBLE!!! diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx index 2a1f385..2940cb5 100644 --- a/lib/doc/fr/Math.lyx +++ b/lib/doc/fr/Math.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/doc/fr/ \textclass scrartcl \begin_preamble % DO NOT ALTER THIS PREAMBLE!!! diff --git a/lib/doc/fr/Tutorial.lyx b/lib/doc/fr/Tutorial.lyx index 65a75c5..573b5ab 100644 --- a/lib/doc/fr/Tutorial.lyx +++ b/lib/doc/fr/Tutorial.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/doc/fr/ \textclass book \use_default_options false \maintain_unincluded_children false diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index 9bfdeaf..98db056 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/doc/fr/ \textclass scrbook \begin_preamble % DO NOT ALTER THIS PREAMBLE!!!
[LyX/master] French doc files: port last changes to master
commit 95bdeba21e43b6fa93b3c80b3d480351b2990b79 Author: Uwe Stöhr Date: Sat Sep 3 22:19:46 2016 +0200 French doc files: port last changes to master --- lib/doc/fr/Customization.lyx | 180 +- lib/doc/fr/Math.lyx | 31 ++-- lib/doc/fr/Tutorial.lyx | 196 ++ lib/doc/fr/UserGuide.lyx | 122 +++--- 4 files changed, 317 insertions(+), 212 deletions(-) diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx index 9db5034..f1bf841 100644 --- a/lib/doc/fr/Customization.lyx +++ b/lib/doc/fr/Customization.lyx @@ -195,7 +195,7 @@ Chrétien \begin_inset Note Note -status collapsed +status open \begin_layout Plain Layout Informations de révision : @@ -219,7 +219,8 @@ Mise à jour pour 2.2, 19/01/2016 (JPC) \end_layout \begin_layout Plain Layout -Original : 09/06/2013 +Nouvel exemple pour le paragraphe 4.1.1.1 + quelques corrections mineures, + 25/07/2016 (JPC) \end_layout \end_inset @@ -3181,9 +3182,6 @@ distribution \end_layout \begin_layout Subsubsection - -\family roman -\series medium Messages ambigus \end_layout @@ -3197,17 +3195,19 @@ status collapsed \begin_layout Plain Layout \lang english -To +&New: \end_layout \end_inset - qui se traduit en allemand par + qui se traduit en français par \begin_inset Flex Noun status collapsed \begin_layout Plain Layout -Nach + +\lang german +Nouvelle \end_layout \end_inset @@ -3217,20 +3217,12 @@ Nach status collapsed \begin_layout Plain Layout -Bis +Nouvel \end_layout \end_inset -, suivant la signification exacte de -\begin_inset Quotes fld -\end_inset - -to -\begin_inset Quotes frd -\end_inset - - en anglais. +, suivant le genre et l'initiale du mot suivant. GNU \begin_inset Flex Code status collapsed @@ -3251,7 +3243,7 @@ status collapsed \begin_layout Plain Layout \lang english -To +&New: \end_layout \end_inset @@ -3263,7 +3255,7 @@ status collapsed \begin_layout Plain Layout \lang english -To[[as in 'From format x to format y']] +&New:[[branch]] \end_layout \end_inset @@ -3275,7 +3267,7 @@ status collapsed \begin_layout Plain Layout \lang english -To[[as in 'From page x to page y']]. +&New:[[index]]. \end_layout \end_inset @@ -3287,7 +3279,7 @@ status collapsed \begin_layout Plain Layout \lang english -To +&New: \end_layout \end_inset @@ -3309,7 +3301,14 @@ gettext status collapsed \begin_layout Plain Layout -Nach + +\noun on +\lang german +Nouvelle branche +\begin_inset space ~ +\end_inset + +: \end_layout \end_inset @@ -3319,7 +3318,14 @@ Nach status collapsed \begin_layout Plain Layout -Bis + +\noun on +\lang english +Nouvel index +\begin_inset space ~ +\end_inset + +: \end_layout \end_inset @@ -18500,7 +18506,15 @@ status collapsed ] indique s'il faut utiliser le contenu de l'insert comme une étiquette, quand l'insert est fermé. - Valeur implicite: faux. + Valeur implicite: +\begin_inset Quotes fld +\end_inset + +faux +\begin_inset Quotes frd +\end_inset + +. \end_layout \begin_layout Description @@ -18816,7 +18830,15 @@ LatexName \end_inset . - Valeur implicite: vrai. + Valeur implicite: +\begin_inset Quotes fld +\end_inset + +vrai +\begin_inset Quotes frd +\end_inset + +. \end_layout \begin_layout Description @@ -19243,7 +19265,15 @@ PlainLayout doit être utilisé, ou bien si l'utilisateur peut modifier le style de paragraph e utilisé dans l'insert. - Valeur implicite: faux. + Valeur implicite: +\begin_inset Quotes fld +\end_inset + +faux +\begin_inset Quotes frd +\end_inset + +. \end_layout \begin_layout Description @@ -19379,7 +19409,15 @@ Plan bas de page dans un titre de section soit incluse dans la tables des matières affichée dans le plan, mais voudra habituellement voir affiché le contenu d'un style de caractère. - Valeur implicite; faux, pas d'inclusion. + Valeur implicite; +\begin_inset Quotes fld +\end_inset + +faux +\begin_inset Quotes frd +\end_inset + +, pas d'inclusion. \end_layout \begin_layout Description @@ -20042,7 +20080,15 @@ MultiPar \end_inset - à faux et + à +\begin_inset Quotes fld +\end_inset + +faux +\begin_inset Quotes frd +\end_inset + + et \begin_inset Flex Code status collapsed @@ -20052,10 +20098,14 @@ ForcePlain \end_inset - -\lang english -to true -\lang french + à +\begin_inset Quotes fld +\end_inset + +vrai +\begin_inset Quotes frd +\end_inset + . \begin_inset Flex Code @@ -20067,7 +20117,15 @@ MultiPar \end_inset - peut être positionné à vrai ou + peut être positionné à +\begin_inset Quotes fld +\end_inset + +vrai +\begin_inset Quotes frd +\end_inset + + ou \begin_inset Flex Code status collapsed @@ -20077,10 +20135,14 @@ ForcePlain \end_inset - -\lang english -to false -\lang french +à +\begin_inset Quot
[LyX/master] installer: major third-party updates
commit 216fd2d786c45361b27d4fea95bbe5617e91ecfb
Author: Uwe Stöhr
Date: Mon Sep 5 23:40:43 2016 +0200
installer: major third-party updates
---
.../Win32/packaging/installer/ChangeLog.txt| 13 -
development/Win32/packaging/installer/Readme.txt | 10 +-
development/Win32/packaging/installer/settings.nsh | 10 +-
.../Win32/packaging/installer/setup/install.nsh|1 -
4 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index d4f71b5..c723f78 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,15 @@
-Changelog for LyX-221-1:
+Changelog for LyX-221-3:
+- updated to MiKTeX 2.9 build 6069
+- updated to Imagemagick 7.0.3-0
+- updated to JabRef 3.6
+- updated to NSIS 3.0
+
+
+Changelog for LyX-221-2:
+- fix broken LyX compilation that could not be installed on 32bit Windows
+
+
+Changelog for LyX-221-1:
- installs LyX 2.2.1
- recompiled LyX using MSVC 2015 update 3
- updated to Qt 5.6.1-1
diff --git a/development/Win32/packaging/installer/Readme.txt
b/development/Win32/packaging/installer/Readme.txt
index 430caa5..46a984e 100644
--- a/development/Win32/packaging/installer/Readme.txt
+++ b/development/Win32/packaging/installer/Readme.txt
@@ -4,16 +4,16 @@
2. open the file settings.nsh with a text editor
and adapt there the following paths to the one on your PC, e.g.:
!define FILES_LYX "C:\LyX-Installer\LyXPackage\LyX"
- !define FILES_DEPS "C:\LyX-Installer\LyX2.1x\lyx-windows-deps-msvc2010"
+ !define FILES_DEPS "C:\LyX-Installer\LyX2.2x\lyx-windows-deps-msvc2015"
!define FILES_QT "C:\LyX-Installer\LyXPackage\LyX"
-3. install the latest version 2.x of NSIS
(http://nsis.sourceforge.net/Download)
+3. install the latest version 3.x of NSIS
(http://nsis.sourceforge.net/Download)
4. install the NSIS Large Strings extension
(http://nsis.sourceforge.net/Special_Builds)
(extract the extension ZIP file in your NSIS installation folder and this
way overwrite some files)
-5. open the file FindProc.zip (that is part of this bundle),
- extract from it the file FindProc.dll to the Plugins folder of
+5. open the file FindProcDLL.zip (that is part of this bundle),
+ extract from it the file FindProc.dll to the folder \Plugins\x86-ansi of
NSIS's installation folder
6. open the file InetLoad.zip (that is part of this bundle),
- extract from it the file InetLoad.dll to the Plugins folder of
+ extract from it the file InetLoad.dll to the folder \Plugins\x86-ansi of
NSIS's installation folder
7. right-click on the file lyx-standard.nsi and choose "Compile NSIS script"
to compile the standard installer
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 25ca141..0e32bbf 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -14,7 +14,7 @@ These typically need to be modified for each LyX release
!define APP_VERSION_REVISION 1
!define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX
otherwise ""
!define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX
otherwise ""
-!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each
version
+!define APP_VERSION_BUILD 3 # Start with 1 for the installer releases of each
version
!define APP_VERSION
"${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}"
# Version to display
@@ -51,12 +51,12 @@ These typically need to be modified for each LyX release
!define MiKTeXRepo
"ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/";
!define MiKTeXDeliveredVersion "2.9"
-!define ImageMagickVersion "6.9.5"
+!define ImageMagickVersion "7.0.3"
# definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE
- !define JabRefInstall "external\JabRef_windows_3_5.exe"
- !define SIZE_JABREF 26252 # size in KB
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6022.exe"
+ !define JabRefInstall "external\JabRef_windows_3_6.exe"
+ !define SIZE_JABREF 26668 # size in KB
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6069.exe"
!endif
diff --git a/development/Win32/packaging/installer/setup/install.nsh
b/development/Win32/packaging/installer/setup/install.nsh
index 65daf4f..6894eda 100644
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -107,7 +107,6 @@ Section -ProgramFiles SecProgramFiles
File /r "${FILES
[LyX/2.2.x] French UserGuide.lyx: remove unnecessary language change
commit b30dd8efac6e01331694492ba7ad56955a70d142
Author: Uwe Stöhr
Date: Thu Sep 8 00:49:56 2016 +0200
French UserGuide.lyx: remove unnecessary language change
---
lib/doc/fr/UserGuide.lyx |6 --
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 98db056..9289865 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -8984,8 +8984,6 @@ Verbatim
status collapsed
\begin_layout Plain Layout
-
-\lang english
Verbatim
\end_layout
@@ -9055,14 +9053,12 @@ Verbatim
\end_layout
\begin_layout Verbatim
-
This is Verbatim.
\end_layout
\begin_layout Verbatim
\noindent
\align block
-
The following 2 lines are empty:
\end_layout
@@ -9075,7 +9071,6 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
-
Almost everything is allowed in Verbatim:"%&$§#~'`
\backslash
}][{|
@@ -9108,7 +9103,6 @@ Verbatim
\end_layout
\begin_layout Verbatim*
-
This is Verbatim*.
\end_layout
[LyX/master] partly Revert "fr/UserGuide: remove spurious language switch in an index inset."
commit 7d94afc4daf45d96965cd09a7003ec56b514c67f
Author: Uwe Stöhr
Date: Thu Sep 8 00:52:45 2016 +0200
partly Revert "fr/UserGuide: remove spurious language switch in an index
inset."
Please fix at first the versions in branch since this is the working copy
delivered with LyX.
Also please keep the fileformat unless you need to document a new feature
that requires a new fileformat.
---
lib/doc/fr/UserGuide.lyx | 11 +++
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index d036a2c..9289865 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -1,5 +1,5 @@
-#LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 512
+#LyX 2.2 created this file. For more info see http://www.lyx.org/
+\lyxformat 508
\begin_document
\begin_header
\save_transient_properties true
@@ -81,7 +81,6 @@ logicalmkup
\font_osf false
\font_sf_scale 100 100
\font_tt_scale 100 100
-\use_microtype false
\graphics default
\default_output_format pdf2
\output_sync 0
@@ -8982,7 +8981,7 @@ Objets insérés
\begin_layout Subsubsection
Verbatim
\begin_inset Index idx
-status open
+status collapsed
\begin_layout Plain Layout
Verbatim
@@ -31601,7 +31600,6 @@ Réponses
\begin_layout Standard
\begin_inset Branch Question
-inverted 0
status open
\begin_layout Standard
@@ -31615,7 +31613,6 @@ Question: Qui a été le premier prix Nobel de physique ?
\begin_layout Standard
\begin_inset Branch Réponse
-inverted 0
status collapsed
\begin_layout Standard
@@ -31789,7 +31786,6 @@ reponse}[1]{#1}
\begin_layout Standard
\begin_inset Branch Question
-inverted 0
status open
\begin_layout Standard
@@ -31826,7 +31822,6 @@ reponse}[1]{}
\begin_layout Standard
\begin_inset Branch Réponse
-inverted 0
status collapsed
\begin_layout Standard
[LyX/master] Development.lyx: update documentation rules
commit a588bddec50ece1ed00491e05801bcf90a0e618a Author: Uwe Stöhr Date: Fri Sep 16 23:25:04 2016 +0200 Development.lyx: update documentation rules --- lib/doc/Development.lyx | 121 ++- 1 files changed, 78 insertions(+), 43 deletions(-) diff --git a/lib/doc/Development.lyx b/lib/doc/Development.lyx index 92628df..34e39c2 100644 --- a/lib/doc/Development.lyx +++ b/lib/doc/Development.lyx @@ -1,5 +1,5 @@ #LyX 2.3 created this file. For more info see http://www.lyx.org/ -\lyxformat 512 +\lyxformat 508 \begin_document \begin_header \save_transient_properties true @@ -25,7 +25,6 @@ logicalmkup \font_osf false \font_sf_scale 100 100 \font_tt_scale 100 100 -\use_microtype false \graphics default \default_output_format pdf2 \output_sync 1 @@ -5179,6 +5178,83 @@ No. Documentation policies \end_layout +\begin_layout Subsection +Rules +\end_layout + +\begin_layout Standard +There are 6 +\begin_inset space ~ +\end_inset + +rules in editing the docs: +\end_layout + +\begin_layout Enumerate +\begin_inset CommandInset label +LatexCommand label +name "enu:If-you-are" + +\end_inset + +If you are not the maintainer of a doc file or a chapter/section, you MUST + use change tracking so that the maintainer could review your changes +\end_layout + +\begin_layout Enumerate +Respect the formatting of the document. + The different files use different formatting styles. + That is OK and has historic reasons nobody fully knows ;-). + But it is important to be consistent within one file. +\end_layout + +\begin_layout Enumerate +All changes you make to a file in one language MUST also go the file in + the other actively maintained languages. + Normally the maintainer does this for you, if you are the maintainer, you + must do this by copying or changing the changed or added text to the other + files so that the translators sees the blue underlined text and know what + they have to translate and what was changed. +\end_layout + +\begin_layout Enumerate +You MUST assure that the document is compilable as +\begin_inset Quotes eld +\end_inset + +PDF (pdflatex) +\begin_inset Quotes erd +\end_inset + + after your changes. +\end_layout + +\begin_layout Enumerate +All fixes (typos, compilation fixes, updates info etc.) go at first into + the current GIT branch because the user should benefit from all fixes with + every minor release. + Feel free to commit directly to branch as long as you follow rule +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "enu:If-you-are" + +\end_inset + +. + You can immediately commit to master as well. +\end_layout + +\begin_layout Enumerate +The fileformat of a file must not be changed unless you document a new feature + in LyX that requires a new fileformat. + The reason for this rule is to keep it easy for the doc maintainers to + port/backport changes to from master/branch. +\end_layout + \begin_layout Standard The main documentation consists of these files: \end_layout @@ -5273,46 +5349,5 @@ Customization.lyx this manual covers information how to customize \SpecialChar L distributions (meaning be as objective as possible). \end_layout -\begin_layout Standard -There are only 4 -\begin_inset space ~ -\end_inset - -rules in editing the docs: -\end_layout - -\begin_layout Enumerate -If you are not the maintainer of a doc file or a chapter/section, you MUST - use change tracking so that the maintainer could review your changes -\end_layout - -\begin_layout Enumerate -Respect the formatting of the document. - The different files use different formatting styles. - That is OK and has historic reasons nobody fully knows ;-). - But it is important to be consistent within one file. -\end_layout - -\begin_layout Enumerate -All changes you make to a file in one language MUST also go the file in - the other actively maintained languages. - Normally the maintainer does this for you, if you are the maintainer, you - must do this by copying or changing the changed or added text to the other - files so that the translators sees the blue underlined text and know what - they have to translate and what was changed. -\end_layout - -\begin_layout Enumerate -You MUST assure that the document is compilable as -\begin_inset Quotes eld -\end_inset - -PDF (pdflatex) -\begin_inset Quotes erd -\end_inset - - after your changes. -\end_layout - \end_body \end_document
[LyX/2.2.x] pt_BR.po: updates from Georger
commit 2020fbce6ecff21df2b51adb9a3e0b83f7436b80
Author: Uwe Stöhr
Date: Sat Sep 17 12:58:33 2016 +0200
pt_BR.po: updates from Georger
---
po/pt_BR.po | 357 ---
status.22x |2 +-
2 files changed, 197 insertions(+), 162 deletions(-)
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6320779..7fb5e2c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,10 +8,10 @@
# Susana Barbosa , 2010, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: pt_BR 2.2.0\n"
+"Project-Id-Version: pt_BR 2.2.2\n"
"Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
"POT-Creation-Date: 2016-09-11 12:06-0400\n"
-"PO-Revision-Date: 2016-07-15 19:54-0300\n"
+"PO-Revision-Date: 2016-09-13 22:46-0300\n"
"Last-Translator: Georger Araújo \n"
"Language-Team: Brazilian Portuguese = 2.14.1. For more info see http://yihui.name/knitr";
msgstr ""
"Usa o pacote knitr do R para gerar relatórios dinamicamente. Este pacote do "
-"R deve ser instalado para que o módule possa funcionar: install."
-"packages('knitr'). Nota: exige R >= 2.14.1. Para mais informações, consulte "
-"http://yihui.name/knitr";
+"R deve ser instalado para que o módule possa funcionar: install.packages"
+"('knitr'). Nota: exige R >= 2.14.1. Para mais informações, consulte http://";
+"yihui.name/knitr"
#: lib/layouts/knitr.module:6 lib/layouts/noweb.module:5
#: lib/layouts/sweave.module:6
@@ -14423,7 +14456,7 @@ msgstr "Capítulo \\thechapter"
#: lib/layouts/stdsections.inc:48
msgid "Appendix \\thechapter"
-msgstr "Apêndice \\thechapter"
+msgstr "Apêndice \\thechapter"
#: lib/layouts/svcommon.inc:68
msgid "Front Matter"
@@ -15234,7 +15267,7 @@ msgstr ""
"contrário do módulo Teorema simples, cada tipo diferente de teorema "
"fornecido aqui tem um contador separado (p.ex., teorema 1, teorema 2, lema "
"1, proposição 1, teorema 3, lema 2, ..., em vez de teorema 1, teorema 2, "
-"lema 3, proposição 4, ). O âmbito da numeração é o documento inteiro. "
+"lema 3, proposição 4, ). O âmbito da numeração é o documento inteiro. "
"Para numerar por capítulo e por seção, use os módulos '... no âmbito de cada "
"Capítulo' e '... no âmbito de cada Seção', respectivamente."
@@ -16234,7 +16267,7 @@ msgstr "Minion Pro (New TX)"
#: lib/latexfonts:676
msgid "Times Roman (New TX)"
-msgstr "Times Roman (New TX)"
+msgstr "Times Roman (New TX)"
#: lib/encodings:31
msgid "Unicode (utf8)"
@@ -16620,19 +16653,19 @@ msgstr "Referência Formatada|F"
msgid "Textual Reference|x"
msgstr "Referência Textual|T"
-#: lib/ui/stdcontext.inc:98 lib/ui/stdcontext.inc:110 lib/ui/stdcontext.inc:120
-#: lib/ui/stdcontext.inc:128 lib/ui/stdcontext.inc:137
-#: lib/ui/stdcontext.inc:148 lib/ui/stdcontext.inc:155
-#: lib/ui/stdcontext.inc:244 lib/ui/stdcontext.inc:262
-#: lib/ui/stdcontext.inc:289 lib/ui/stdcontext.inc:394
-#: lib/ui/stdcontext.inc:407 lib/ui/stdcontext.inc:459
-#: lib/ui/stdcontext.inc:484 lib/ui/stdcontext.inc:507
-#: lib/ui/stdcontext.inc:518 lib/ui/stdcontext.inc:526
-#: lib/ui/stdcontext.inc:536 lib/ui/stdcontext.inc:544
-#: lib/ui/stdcontext.inc:552 lib/ui/stdcontext.inc:560
-#: lib/ui/stdcontext.inc:573 lib/ui/stdcontext.inc:583
-#: lib/ui/stdcontext.inc:604 lib/ui/stdcontext.inc:612
-#: lib/ui/stdcontext.inc:658 lib/ui/stdmenus.inc:536
+#: lib/ui/stdcontext.inc:98 lib/ui/stdcontext.inc:110
+#: lib/ui/stdcontext.inc:120 lib/ui/stdcontext.inc:128
+#: lib/ui/stdcontext.inc:137 lib/ui/stdcontext.inc:148
+#: lib/ui/stdcontext.inc:155 lib/ui/stdcontext.inc:244
+#: lib/ui/stdcontext.inc:262 lib/ui/stdcontext.inc:289
+#: lib/ui/stdcontext.inc:394 lib/ui/stdcontext.inc:407
+#: lib/ui/stdcontext.inc:459 lib/ui/stdcontext.inc:484
+#: lib/ui/stdcontext.inc:507 lib/ui/stdcontext.inc:518
+#: lib/ui/stdcontext.inc:526 lib/ui/stdcontext.inc:536
+#: lib/ui/stdcontext.inc:544 lib/ui/stdcontext.inc:552
+#: lib/ui/stdcontext.inc:560 lib/ui/stdcontext.inc:573
+#: lib/ui/stdcontext.inc:583 lib/ui/stdcontext.inc:604
+#: lib/ui/stdcontext.inc:612 lib/ui/stdcontext.inc:658 lib/ui/stdmenus.inc:536
msgid "Settings...|S"
msgstr "Configurações...|C"
@@ -17520,7 +17553,7 @@ msgstr "Colar como PDF"
#: lib/ui/stdmenus.inc:160
msgid "Paste as PNG"
-msgstr "Colar como PNG"
+msgstr "Colar como PNG"
#: lib/ui/stdmenus.inc:161
msgid "Paste as JPEG"
@@ -23047,7 +23080,7 @@ msgid ""
msgstr ""
"Um diagrama de posições de xadrez.\n"
"Este modelo usa XBoard para editar a posição.\n"
[LyX/2.2.x] Win installer: backport changes from master and prepare for 2.2.2
commit dae621f0d85e006449702bce8c8782d4ba5f3a68
Author: Uwe Stöhr
Date: Sat Sep 17 13:01:32 2016 +0200
Win installer: backport changes from master and prepare for 2.2.2
---
.../Win32/packaging/installer/ChangeLog.txt| 14 +-
development/Win32/packaging/installer/Readme.txt | 10 +-
development/Win32/packaging/installer/settings.nsh | 10 +-
.../Win32/packaging/installer/setup/install.nsh|1 -
4 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index d4f71b5..90fd3c9 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,16 @@
-Changelog for LyX-221-1:
+Changelog for LyX-222-1:
+- installs LyX 2.2.2
+- updated to MiKTeX 2.9 build 6069
+- updated to Imagemagick 7.0.3-0
+- updated to JabRef 3.6
+- updated to NSIS 3.0
+
+
+Changelog for LyX-221-2:
+- fix broken LyX compilation that could not be installed on 32bit Windows
+
+
+Changelog for LyX-221-1:
- installs LyX 2.2.1
- recompiled LyX using MSVC 2015 update 3
- updated to Qt 5.6.1-1
diff --git a/development/Win32/packaging/installer/Readme.txt
b/development/Win32/packaging/installer/Readme.txt
index 430caa5..46a984e 100644
--- a/development/Win32/packaging/installer/Readme.txt
+++ b/development/Win32/packaging/installer/Readme.txt
@@ -4,16 +4,16 @@
2. open the file settings.nsh with a text editor
and adapt there the following paths to the one on your PC, e.g.:
!define FILES_LYX "C:\LyX-Installer\LyXPackage\LyX"
- !define FILES_DEPS "C:\LyX-Installer\LyX2.1x\lyx-windows-deps-msvc2010"
+ !define FILES_DEPS "C:\LyX-Installer\LyX2.2x\lyx-windows-deps-msvc2015"
!define FILES_QT "C:\LyX-Installer\LyXPackage\LyX"
-3. install the latest version 2.x of NSIS
(http://nsis.sourceforge.net/Download)
+3. install the latest version 3.x of NSIS
(http://nsis.sourceforge.net/Download)
4. install the NSIS Large Strings extension
(http://nsis.sourceforge.net/Special_Builds)
(extract the extension ZIP file in your NSIS installation folder and this
way overwrite some files)
-5. open the file FindProc.zip (that is part of this bundle),
- extract from it the file FindProc.dll to the Plugins folder of
+5. open the file FindProcDLL.zip (that is part of this bundle),
+ extract from it the file FindProc.dll to the folder \Plugins\x86-ansi of
NSIS's installation folder
6. open the file InetLoad.zip (that is part of this bundle),
- extract from it the file InetLoad.dll to the Plugins folder of
+ extract from it the file InetLoad.dll to the folder \Plugins\x86-ansi of
NSIS's installation folder
7. right-click on the file lyx-standard.nsi and choose "Compile NSIS script"
to compile the standard installer
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 25ca141..758fc6c 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -11,7 +11,7 @@ These typically need to be modified for each LyX release
!define APP_VERSION_MAJOR 2
!define APP_VERSION_MINOR 2
-!define APP_VERSION_REVISION 1
+!define APP_VERSION_REVISION 2
!define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX
otherwise ""
!define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX
otherwise ""
!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each
version
@@ -51,12 +51,12 @@ These typically need to be modified for each LyX release
!define MiKTeXRepo
"ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/";
!define MiKTeXDeliveredVersion "2.9"
-!define ImageMagickVersion "6.9.5"
+!define ImageMagickVersion "7.0.3"
# definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE
- !define JabRefInstall "external\JabRef_windows_3_5.exe"
- !define SIZE_JABREF 26252 # size in KB
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6022.exe"
+ !define JabRefInstall "external\JabRef_windows_3_6.exe"
+ !define SIZE_JABREF 26668 # size in KB
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6069.exe"
!endif
diff --git a/development/Win32/packaging/installer/setup/install.nsh
b/development/Win32/packaging/installer/setup/install.nsh
index 65daf4f..6894eda 100644
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -107,7 +107,6 @@ Section -ProgramFiles SecProgramFiles
File /r "${FILES_IMAGEMAGICK}\"
!insertmacro FileListMSVC File "${FILES_MSVC}\"
# register ImageMagick
-
[LyX/2.2.x] Makefile.am: add 2 missing entries
commit 3ac29c96a07c070d0c2c99c4b1d7cd9e56ba714a Author: Uwe Stöhr Date: Sat Sep 17 13:02:48 2016 +0200 Makefile.am: add 2 missing entries --- development/Makefile.am |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/development/Makefile.am b/development/Makefile.am index 43ca808..323c66e 100644 --- a/development/Makefile.am +++ b/development/Makefile.am @@ -124,6 +124,8 @@ cmake/TODO.txt \ cmake/build4-2010.bat \ cmake/build5-2010.bat \ cmake/build5-2010-installer.bat \ +cmake/build5-2015.bat \ +cmake/build5-2015-x64.bat \ cmake/config.cpp.cmake \ cmake/config.h.cmake \ cmake/lyx_commit_hash.h.cmake \
[LyX/2.2.x] French beamer.lyx: accept changes
commit aa81ae7e30c7f8da06acc6b426fdf3eb4159ca02
Author: Uwe Stöhr
Date: Tue Sep 20 23:16:42 2016 +0200
French beamer.lyx: accept changes
I think this can be accepted without further explanation since it is in a
comment
---
lib/examples/fr/beamer.lyx | 19 +++
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/lib/examples/fr/beamer.lyx b/lib/examples/fr/beamer.lyx
index 846c1ef..d23bc2d 100644
--- a/lib/examples/fr/beamer.lyx
+++ b/lib/examples/fr/beamer.lyx
@@ -66,12 +66,11 @@
\papercolumns 1
\papersides 1
\paperpagestyle default
-\tracking_changes true
+\tracking_changes false
\output_changes false
\html_math_output 0
\html_css_as_file 0
\html_be_strict false
-\author 274215730 "scott"
\end_header
\begin_body
@@ -2728,22 +2727,10 @@ status collapsed
\begin_layout Plain Layout
%Pour illustrer le diff
-\change_deleted 274215730 1474337976
-é
-\change_inserted 274215730 1474337982
-
\backslash
-'{e}
-\change_unchanged
-rence entre d
-\change_deleted 274215730 1474337993
-e
-\change_inserted 274215730 1474337996
-
+'{e}rence entre d
\backslash
-'{e}
-\change_unchanged
-couvert et visible:
+'{e}couvert et visible:
\end_layout
\begin_layout Plain Layout
[LyX/master] French beamer.lyx: accept changes
commit df11db1dd3df2a5331fc8206b941e8fbcdad0f9d
Author: Uwe Stöhr
Date: Tue Sep 20 23:17:09 2016 +0200
French beamer.lyx: accept changes
I think this can be accepted without further explanation since it is in a
comment
---
lib/examples/fr/beamer.lyx | 19 +++
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/lib/examples/fr/beamer.lyx b/lib/examples/fr/beamer.lyx
index 846c1ef..d23bc2d 100644
--- a/lib/examples/fr/beamer.lyx
+++ b/lib/examples/fr/beamer.lyx
@@ -66,12 +66,11 @@
\papercolumns 1
\papersides 1
\paperpagestyle default
-\tracking_changes true
+\tracking_changes false
\output_changes false
\html_math_output 0
\html_css_as_file 0
\html_be_strict false
-\author 274215730 "scott"
\end_header
\begin_body
@@ -2728,22 +2727,10 @@ status collapsed
\begin_layout Plain Layout
%Pour illustrer le diff
-\change_deleted 274215730 1474337976
-é
-\change_inserted 274215730 1474337982
-
\backslash
-'{e}
-\change_unchanged
-rence entre d
-\change_deleted 274215730 1474337993
-e
-\change_inserted 274215730 1474337996
-
+'{e}rence entre d
\backslash
-'{e}
-\change_unchanged
-couvert et visible:
+'{e}couvert et visible:
\end_layout
\begin_layout Plain Layout
[LyX/2.2.x] French UserGuide.lyx: restore \origin tag
commit df66391485680664041af09ae9fcb9fc3c48f445 Author: Uwe Stöhr Date: Mon Oct 10 02:14:41 2016 +0200 French UserGuide.lyx: restore \origin tag Jean-Pierre, please take care of this otherwise LyX cannot be compiled. Please also port changes you commit to 2.2.x to master --- lib/doc/fr/UserGuide.lyx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index f3231b2..2ae672f 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/doc/fr/ \textclass scrbook \begin_preamble % DO NOT ALTER THIS PREAMBLE!!!
[LyX/master] Development.lyx: small change from Scott
commit 16822a8a8ecf59eeda7cd113aa666319e43cccde Author: Uwe Stöhr Date: Mon Oct 10 02:45:05 2016 +0200 Development.lyx: small change from Scott --- lib/doc/Development.lyx |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/doc/Development.lyx b/lib/doc/Development.lyx index 34e39c2..5ce29c4 100644 --- a/lib/doc/Development.lyx +++ b/lib/doc/Development.lyx @@ -1,4 +1,4 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.2 created this file. For more info see http://www.lyx.org/ \lyxformat 508 \begin_document \begin_header @@ -5226,7 +5226,7 @@ PDF (pdflatex) \begin_inset Quotes erd \end_inset - after your changes. + or the document's default output format after your changes. \end_layout \begin_layout Enumerate
[LyX/2.2.x] Development.lyx: backport the current rules/advises
commit 0ca507ca6463ce9d5a3493d84ec7185d1e6d2230 Author: Uwe Stöhr Date: Mon Oct 10 02:45:57 2016 +0200 Development.lyx: backport the current rules/advises --- lib/doc/Development.lyx | 800 +-- 1 files changed, 557 insertions(+), 243 deletions(-) diff --git a/lib/doc/Development.lyx b/lib/doc/Development.lyx index 6f2267e..5ce29c4 100644 --- a/lib/doc/Development.lyx +++ b/lib/doc/Development.lyx @@ -1102,37 +1102,6 @@ lyx2lyx New layouts and modules \end_layout -\begin_layout Standard -\begin_inset Note Greyedout -status open - -\begin_layout Description -Note: This section is currently only a proposal under discussion. - Please correct/amend as suited. - Remove this note once a consensus is found. -\end_layout - -\begin_layout Plain Layout -See the thread -\begin_inset Quotes eld -\end_inset - -Proposal for a guide on updating layouts -\begin_inset Quotes erd -\end_inset - - for details and background -\end_layout - -\begin_layout Plain Layout -http://permalink.gmane.org/gmane.editors.lyx.devel/161126 -\end_layout - -\end_inset - - -\end_layout - \begin_layout Subsection \begin_inset CommandInset label LatexCommand label @@ -1174,7 +1143,7 @@ target "https://wiki.lyx.org/Layouts/Layouts"; \begin_layout Standard In older versions of this document, it was stated that new layout files require a file format change. - After some discussion it was decided that this is not needed. + After some discussion, it was decided that this is not needed. \begin_inset Foot status open @@ -1440,6 +1409,37 @@ Layouts for document classes with incompatible versions \end_layout \begin_layout Standard +\begin_inset Note Greyedout +status open + +\begin_layout Description +Note: This section is currently only a proposal under discussion. + Please correct/amend as suited. + Remove this note once a consensus is found. +\end_layout + +\begin_layout Plain Layout +See the thread +\begin_inset Quotes eld +\end_inset + +Proposal for a guide on updating layouts +\begin_inset Quotes erd +\end_inset + + for details and background +\end_layout + +\begin_layout Plain Layout +http://permalink.gmane.org/gmane.editors.lyx.devel/161126 +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard Every now and then, there are changes to LaTeX document classes that break backwards compatibility. \begin_inset Foot @@ -3193,7 +3193,7 @@ status collapsed status collapsed \begin_layout Plain Layout -development/autotests/suspiciousTests +development/autotests/invertedTests \end_layout \end_inset @@ -,15 +,15 @@ inverted \emph on uninvert \emph default - the test by removing the labeling pattern from + the test by removing the pattern from the \begin_inset Quotes eld \end_inset -suspiciousTests +invertedTests \begin_inset Quotes erd \end_inset -) (see + file) (see \begin_inset CommandInset ref LatexCommand ref reference "par:Inverted-tests" @@ -3353,11 +3353,15 @@ reference "par:Inverted-tests" \begin_layout Itemize If the export did not fail previously but led to wrong output (PDF, say), - it is in fact an improvement when the test now fails, label it as +\begin_inset Foot +status collapsed + +\begin_layout Plain Layout +Non-failing test with wrong output should be labeledas \begin_inset Quotes eld \end_inset -unreliable:wrong:output +unreliable:wrong_output \begin_inset Quotes erd \end_inset @@ -3371,9 +3375,25 @@ reference "par:Unreliable-tests" ). \end_layout +\end_inset + + it is in fact an improvement when the test now fails. + +\emph on +Invert +\emph default + the failing test case (see +\begin_inset CommandInset ref +LatexCommand ref +reference "par:Inverted-tests" + +\end_inset + +). +\end_layout + \begin_layout Itemize -In case of tests failing due to missing requirements (when only a subset - of TeXLive is installed or a test labeled +In case of tests failing due to missing requirements (tests labeled \begin_inset Quotes eld \end_inset @@ -3381,8 +3401,9 @@ unreliable:nonstandard \begin_inset Quotes erd \end_inset - fails), ignore the failure, ask for someone else to run the test, or install - the missing ressources and try again. + or testing on a system withonly a subset of TeXLive installed), ignore + the failure, ask for someone else to run the test, or install the missing + ressources and try again. \end_layout \begin_layout Paragraph @@ -3401,7 +3422,7 @@ Test cases whose name matches a pattern in the file status collapsed \begin_layout Plain Layout -development/autotests/suspiciousTests +development/autotests/invertedTests \end_layout \end_inset @@ -3456,7 +3477,7 @@ The following sublabels are currently present in status collapsed \begin_layout Plain Layout -suspiciousTests +invertedTests \end_layout \end_inset @@ -3522,12 +3543,20 @@ otherwise, add a pattern here. \end_deeper \begin_layout Desc
[LyX/master] French UserGuide.lyx: back to format of 2.2
commit ef4594c71e1dc0e3006b459bc53ea964ce1cdf82
Author: Uwe Stöhr
Date: Mon Oct 10 23:47:33 2016 +0200
French UserGuide.lyx: back to format of 2.2
Sorry for this, but see the last "rule" of the documentation guidelines:
don't upgrade the fileformat unnecessarily
---
lib/doc/fr/UserGuide.lyx | 13 -
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 542fc4f..b4ec016 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -1,5 +1,5 @@
-#LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 512
+#LyX 2.2 created this file. For more info see http://www.lyx.org/
+\lyxformat 508
\begin_document
\begin_header
\save_transient_properties true
@@ -81,7 +81,6 @@ logicalmkup
\font_osf false
\font_sf_scale 100 100
\font_tt_scale 100 100
-\use_microtype false
\graphics default
\default_output_format pdf2
\output_sync 0
@@ -31601,8 +31600,7 @@ Réponses
\begin_layout Standard
\begin_inset Branch Question
-inverted 0
-status open
+status collapsed
\begin_layout Standard
Question: Qui a été le premier prix Nobel de physique ?
@@ -31615,7 +31613,6 @@ Question: Qui a été le premier prix Nobel de physique ?
\begin_layout Standard
\begin_inset Branch Réponse
-inverted 0
status collapsed
\begin_layout Standard
@@ -31789,8 +31786,7 @@ reponse}[1]{#1}
\begin_layout Standard
\begin_inset Branch Question
-inverted 0
-status open
+status collapsed
\begin_layout Standard
\begin_inset ERT
@@ -31826,7 +31822,6 @@ reponse}[1]{}
\begin_layout Standard
\begin_inset Branch Réponse
-inverted 0
status collapsed
\begin_layout Standard
[LyX/master] Win installer: remove outdated actions for Belarusion
commit 7cdc6b536751c9b86b47d222e724da2bbc94f95c
Author: Uwe Stöhr
Date: Tue Oct 11 02:30:08 2016 +0200
Win installer: remove outdated actions for Belarusion
there is now the package babel-belarusian available since a while
---
development/Win32/packaging/installer/Packages.txt |1 +
.../Win32/packaging/installer/include/LaTeX.nsh| 11 +++
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/development/Win32/packaging/installer/Packages.txt
b/development/Win32/packaging/installer/Packages.txt
index 581b911..d0ed643 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -12,6 +12,7 @@ authordate
babel-albanian
babel-bahasa
babel-basque
+babel-belarusian
babel-breton
babel-bulgarian
babel-catalan
diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh
b/development/Win32/packaging/installer/include/LaTeX.nsh
index 68c6c36..dcf7cd0 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -277,16 +277,11 @@ Function ConfigureMiKTeX
SetOutPath "$PathLaTeXLocal\tex\latex\lyx"
CopyFiles /SILENT "$INSTDIR\Resources\tex\*.*"
"$PathLaTeXLocal\tex\latex\lyx"
${endif}
- # Belarusian support
- ${ifnot} ${FileExists} "$PathLaTeXLocal\tex\generic\babel\belarusian.ldf"
- SetOutPath "$PathLaTeXLocal\tex\generic\babel"
- File "${FILES_DVIPOST_PKG}\belarusian.ldf"
- File "${FILES_DVIPOST_PKG}\belarusian.sty"
- ${endif}
# Hungarian support
+ # The following seems to be unnecesary since 2015, therefore it is commented
# this is a replacement therefore do this in every case
- SetOutPath "$PathLaTeXLocal\tex\generic\babel"
- File "${FILES_DVIPOST_PKG}\magyar.ldf"
+ #SetOutPath "$PathLaTeXLocal\tex\generic\babel"
+ #File "${FILES_DVIPOST_PKG}\magyar.ldf"
# install a Perl interpreter for splitindex and pdfcrop
SetOutPath "$INSTDIR"
[LyX/master] Win installer: changelog for LyX 2.2.2
commit ca9e16e73d0583e697de119375dab980184f8a4a Author: Uwe Stöhr Date: Tue Oct 11 02:30:58 2016 +0200 Win installer: changelog for LyX 2.2.2 --- .../Win32/packaging/installer/ChangeLog.txt|6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index c723f78..5600b0b 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,8 +1,10 @@ -Changelog for LyX-221-3: +Changelog for LyX-222-1: +- installs LyX 2.2.2 - updated to MiKTeX 2.9 build 6069 -- updated to Imagemagick 7.0.3-0 +- updated to Imagemagick 7.0.3-3 - updated to JabRef 3.6 - updated to NSIS 3.0 +- updated to Ghostscript 9.20 Changelog for LyX-221-2:
[LyX/master] uk.po: translation updates from Yuri for master
commit 88bbce9b7ec30666bec29082c23ea55a5b3e92d5 Author: Uwe Stöhr Date: Wed Oct 12 02:21:21 2016 +0200 uk.po: translation updates from Yuri for master (he also sent an update for 2.2.x but unfortunately a day too late) --- po/uk.po | 64 +++--- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/po/uk.po b/po/uk.po index 325091c..b40ed68 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: uk\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2016-04-24 10:40+0200\n" -"PO-Revision-Date: 2016-02-01 09:20+0200\n" +"PO-Revision-Date: 2016-10-11 19:14+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -1209,6 +1209,8 @@ msgstr "Переглянути &журнал повністю…" #: src/frontends/qt4/ui/ErrorListUi.ui:93 msgid "Attempt to show the output even if there were compilation errors" msgstr "" +"Намагатися показати результати, навіть якщо під час компіляції виявлено " +"помилки" #: src/frontends/qt4/ui/ErrorListUi.ui:96 msgid "Show Output &Anyway" @@ -1219,6 +1221,9 @@ msgid "" "Selecting an error will show the error message in the panel below, and jump " "the cursor to the location in the document where the error occurred." msgstr "" +"Позначення пункту помилки призведе до показу повідомлення щодо помилки на " +"нижній панелі і переведення курсора до місця у документі, де було виявлено " +"помилку." #: src/frontends/qt4/ui/ExternalUi.ui:35 msgid "F&ile" @@ -1547,7 +1552,7 @@ msgstr "Форма" #: src/frontends/qt4/ui/FloatPlacementUi.ui:19 msgid "Float Type:" -msgstr "Тип плаваючого об’єкта:" +msgstr "Тип рухомого об’єкта:" #: src/frontends/qt4/ui/FloatPlacementUi.ui:36 msgid "Use &default placement" @@ -1575,7 +1580,7 @@ msgstr "&Якщо можливо, не переміщувати" #: src/frontends/qt4/ui/FloatPlacementUi.ui:83 msgid "&Page of floats" -msgstr "&Сторінка плаваючих об'єктів" +msgstr "&Сторінка рухомих об'єктів" #: src/frontends/qt4/ui/FloatPlacementUi.ui:90 msgid "&Bottom of page" @@ -2289,11 +2294,11 @@ msgstr "&Вбудований текст програми" #: src/frontends/qt4/ui/ListingsUi.ui:45 msgid "Check for floating listings" -msgstr "Перевірка плаваючих текстів програм" +msgstr "Перевірка рухомих текстів програм" #: src/frontends/qt4/ui/ListingsUi.ui:48 msgid "&Float" -msgstr "&Плаваючі" +msgstr "&Рухомі" #: src/frontends/qt4/ui/ListingsUi.ui:55 src/frontends/qt4/ui/WrapUi.ui:185 msgid "&Placement:" @@ -2301,7 +2306,7 @@ msgstr "Р&озташування:" #: src/frontends/qt4/ui/ListingsUi.ui:68 msgid "Specify placement (htbp) for floating listings" -msgstr "Визначте розташування (htbp) плаваючих текстів програм" +msgstr "Визначте розташування (htbp) рухомих текстів програм" #: src/frontends/qt4/ui/ListingsUi.ui:78 msgid "Line numbering" @@ -6591,9 +6596,8 @@ msgid "Thesaurus" msgstr "Тезаурус" #: lib/layouts/aastex.layout:3 -#, fuzzy msgid "American Astronomical Society (AASTeX v. 5)" -msgstr "American Astronomical Society (AASTeX)" +msgstr "Американське астрономічне товариство (AASTeX v. 5)" #: lib/layouts/aastex.layout:159 lib/layouts/achemso.layout:102 #: lib/layouts/apa.layout:159 lib/layouts/apa6.layout:149 @@ -6771,31 +6775,28 @@ msgid "Separate the dataset ID from text" msgstr "Відокремити ідентифікатор набору даних від тексту" #: lib/layouts/aastex6.layout:3 -#, fuzzy msgid "American Astronomical Society (AASTeX v. 6)" -msgstr "American Astronomical Society (AASTeX)" +msgstr "Американське астрономічне товариство (AASTeX v. 6)" #: lib/layouts/aastex6.layout:59 msgid "Software" -msgstr "" +msgstr "Програмне забезпечення" #: lib/layouts/aastex6.layout:66 msgid "Software:" -msgstr "" +msgstr "Програмне забезпечення:" #: lib/layouts/aastex6.layout:99 msgid "APPENDIX" -msgstr "" +msgstr "ДОДАТОК" #: lib/layouts/aastex6.layout:103 -#, fuzzy msgid "References-" -msgstr "Посилання" +msgstr "Посилання-" #: lib/layouts/aastex6.layout:110 -#, fuzzy msgid "Note-" -msgstr "Примітка" +msgstr "Примітка-" #: lib/layouts/achemso.layout:3 msgid "American Chemical Society (ACS)" @@ -6941,9 +6942,8 @@ msgid
[LyX/master] Win installer: update some dictionaries
commit 5022ad51cb0bd28c1a08fbaedcfb6a5fa9b720d8
Author: Uwe Stöhr
Date: Wed Oct 12 02:24:01 2016 +0200
Win installer: update some dictionaries
there is now a separate thesaurus for Australian available
---
.../Win32/packaging/installer/ChangeLog.txt|6
.../Win32/packaging/installer/include/init.nsh | 26 ++-
2 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 5600b0b..fd257e5 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -5,6 +5,12 @@
- updated to JabRef 3.6
- updated to NSIS 3.0
- updated to Ghostscript 9.20
+- new thesaurus for English (AU)
+- updated thesaurus for Portuguese and Ukrainian
+- updated spell checker dictionaries for English (CA, GB and US), Portuguese
+ and Ukrainian
+ (To benefit from them you must uninstall an already installed LyX 2.2.x and
+ then use this installer.)
Changelog for LyX-221-2:
diff --git a/development/Win32/packaging/installer/include/init.nsh
b/development/Win32/packaging/installer/include/init.nsh
index 6447734..53f8b21 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -348,7 +348,7 @@ SectionEnd
Section /o "Portugu�s (PT)" SecDPortuguesePT
StrCpy $DictCodes "pt_PT,$DictCodes"
- AddSize 1490
+ AddSize 1568
SectionEnd
Section /o "Rom�na" SecDRomanian
@@ -428,7 +428,7 @@ SectionEnd
Section /o "Ukrainian" SecDUkrainian
StrCpy $DictCodes "uk_UA,$DictCodes"
- AddSize 3077
+ AddSize 5298
SectionEnd
Section /o "Urdu" SecDUrdu
@@ -476,12 +476,17 @@ Section /o "Deutsch (CH)" SecTGermanCH
AddSize 14600
SectionEnd
+Section /o "English (AU)" SecTEnglishAU
+ StrCpy $ThesCodes "en_AU,$ThesCodes"
+ AddSize 21642
+SectionEnd
+
Section /o "English (GB)" SecTEnglishGB
StrCpy $ThesCodes "en_GB,$ThesCodes"
AddSize 14300
SectionEnd
-Section /o "English (US/AU)" SecTEnglishUSAU
+Section /o "English (US)" SecTEnglishUS
StrCpy $ThesCodes "en_US,$ThesCodes"
AddSize 22095
SectionEnd
@@ -543,7 +548,7 @@ SectionEnd
Section /o "Portugu�s" SecTPortuguese
StrCpy $ThesCodes "pt_PT,$ThesCodes"
- AddSize 860
+ AddSize 3950
SectionEnd
Section /o "Rom�na" SecTRomanian
@@ -573,7 +578,7 @@ SectionEnd
Section /o "Ukrainian" SecTUkrainian
StrCpy $ThesCodes "uk_UA,$ThesCodes"
- AddSize 1309
+ AddSize 1339
SectionEnd
SectionGroupEnd
@@ -1262,6 +1267,13 @@ Function .onInit
SectionSetFlags ${SecTGermanCH} $0
SectionSetSize ${SecTGermanCH} 0
${endif}
+ StrCpy $Search "en_AU"
+ Call StrPoint
+ ${if} $Pointer != "-1"
+ IntOp $0 ${SF_SELECTED} | ${SF_RO}
+ SectionSetFlags ${SecTEnglishAU} $0
+ SectionSetSize ${SecTEnglishAU} 0
+ ${endif}
StrCpy $Search "en_GB"
Call StrPoint
${if} $Pointer != "-1"
@@ -1273,8 +1285,8 @@ Function .onInit
Call StrPoint
${if} $Pointer != "-1"
IntOp $0 ${SF_SELECTED} | ${SF_RO}
- SectionSetFlags ${SecTEnglishUSAU} $0
- SectionSetSize ${SecTEnglishUSAU} 0
+ SectionSetFlags ${SecTEnglishUS} $0
+ SectionSetSize ${SecTEnglishUS} 0
${endif}
StrCpy $Search "es_ES"
Call StrPoint
[LyX/master] Win installer: uses now NSIS 3
commit f30cd5b6a11c4d5aaa3ae1eff49604e275b8da94 Author: Uwe Stöhr Date: Thu Oct 13 02:07:30 2016 +0200 Win installer: uses now NSIS 3 --- .../Win32/packaging/installer/lyx-bundle.nsi |2 +- .../Win32/packaging/installer/lyx-standard.nsi |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/development/Win32/packaging/installer/lyx-bundle.nsi b/development/Win32/packaging/installer/lyx-bundle.nsi index 824debb..ce6a3e6 100644 --- a/development/Win32/packaging/installer/lyx-bundle.nsi +++ b/development/Win32/packaging/installer/lyx-bundle.nsi @@ -2,7 +2,7 @@ NSIS Script - LyX 2.2 Installer for Windows Authors: Joost Verburg, Angus Leeming, Uwe St�hr -Compatible with NSIS 2.51 +Compatible with NSIS 3.0 */ diff --git a/development/Win32/packaging/installer/lyx-standard.nsi b/development/Win32/packaging/installer/lyx-standard.nsi index 3cbce02..638f8c6 100644 --- a/development/Win32/packaging/installer/lyx-standard.nsi +++ b/development/Win32/packaging/installer/lyx-standard.nsi @@ -1,7 +1,7 @@ /* NSIS Script - LyX 2.2 Installer for Windows Authors: Joost Verburg, Angus Leeming, Uwe St�hr -Compatible with NSIS 2.51 +Compatible with NSIS 3.0 */ # Do a Cyclic Redundancy Check to make sure the installer
[LyX/master] Win installer: new version with Qt 5.6.2
commit 08b3039464ac7ef850e5fec146ca1f738839f17b
Author: Uwe Stöhr
Date: Fri Oct 14 00:36:28 2016 +0200
Win installer: new version with Qt 5.6.2
---
.../Win32/packaging/installer/ChangeLog.txt|7 ++-
development/Win32/packaging/installer/settings.nsh |6 +++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index fd257e5..68b8138 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,9 @@
-Changelog for LyX-222-1:
+Changelog for LyX-222-2:
+- updated to Qt 5.6.2-1 (fixes Windows-specific bugs)
+- updated to Perl 5.22.2.1
+
+
+Changelog for LyX-222-1:
- installs LyX 2.2.2
- updated to MiKTeX 2.9 build 6069
- updated to Imagemagick 7.0.3-3
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 0e32bbf..1b2930b 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -11,10 +11,10 @@ These typically need to be modified for each LyX release
!define APP_VERSION_MAJOR 2
!define APP_VERSION_MINOR 2
-!define APP_VERSION_REVISION 1
+!define APP_VERSION_REVISION 2
!define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX
otherwise ""
!define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX
otherwise ""
-!define APP_VERSION_BUILD 3 # Start with 1 for the installer releases of each
version
+!define APP_VERSION_BUILD 2 # Start with 1 for the installer releases of each
version
!define APP_VERSION
"${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}"
# Version to display
@@ -41,7 +41,7 @@ These typically need to be modified for each LyX release
!define FILES_LYX "D:\LyXPackage2.2\LyX"
!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015"
-!define FILES_QT "C:\Qt\Qt5.6.1-MSVC2015\5.6\msvc2015"
+!define FILES_QT "C:\Qt\Qt5.6.2-MSVC-2015\5.6\msvc2015"
!define ClassFileDir "${FILES_LYX}\Resources\tex"
!define DVIPostFileDir "${FILES_DEPS}\tex"
[LyX/master] Customization.lyx: use change tracking for the changes made in 0eb651a2
commit 3a6af2c1a49b2fc16f13bfd4f3230b0ad487237f Author: Uwe Stöhr Date: Sat Oct 15 01:44:14 2016 +0200 Customization.lyx: use change tracking for the changes made in 0eb651a2 --- lib/doc/Customization.lyx | 35 ++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx index 8a45f6e..851146e 100644 --- a/lib/doc/Customization.lyx +++ b/lib/doc/Customization.lyx @@ -117,11 +117,12 @@ logicalmkup \papercolumns 1 \papersides 2 \paperpagestyle headings -\tracking_changes false +\tracking_changes true \output_changes false \html_math_output 0 \html_css_as_file 0 \html_be_strict true +\author 2089657418 "Usti" \end_header \begin_body @@ -14678,13 +14679,19 @@ CopyStyle \end_inset , but you do not want to inherit its (required and optional) arguments. +\change_inserted 2089657418 1476488475 + \end_layout \begin_layout Description + +\change_inserted 2089657418 1476488475 \begin_inset Flex Code status collapsed \begin_layout Plain Layout + +\change_inserted 2089657418 1476488475 ResumeCounter \end_layout @@ -14696,6 +14703,8 @@ status collapsed \begin_layout Plain Layout +\change_inserted 2089657418 1476488475 + \emph on 0 \end_layout @@ -14707,6 +14716,8 @@ status collapsed status collapsed \begin_layout Plain Layout + +\change_inserted 2089657418 1476488475 1 \end_layout @@ -14718,6 +14729,8 @@ status collapsed status collapsed \begin_layout Plain Layout + +\change_inserted 2089657418 1476488475 LabelType \end_layout @@ -14728,12 +14741,16 @@ LabelType status collapsed \begin_layout Plain Layout + +\change_inserted 2089657418 1476488475 Enumerate \end_layout \end_inset . +\change_unchanged + \end_layout \begin_layout Description @@ -14968,13 +14985,19 @@ status collapsed ] Allow spell-checking paragraphs of this style. Default is true. +\change_inserted 2089657418 1476488264 + \end_layout \begin_layout Description + +\change_inserted 2089657418 1476488264 \begin_inset Flex Code status collapsed \begin_layout Plain Layout + +\change_inserted 2089657418 1476488264 StepMasterCounter \end_layout @@ -14986,6 +15009,8 @@ status collapsed \begin_layout Plain Layout +\change_inserted 2089657418 1476488264 + \emph on 0 \end_layout @@ -14997,6 +15022,8 @@ status collapsed status collapsed \begin_layout Plain Layout + +\change_inserted 2089657418 1476488264 1 \end_layout @@ -15009,6 +15036,8 @@ status collapsed status collapsed \begin_layout Plain Layout + +\change_inserted 2089657418 1476488264 LabelType \end_layout @@ -15019,12 +15048,16 @@ LabelType status collapsed \begin_layout Plain Layout + +\change_inserted 2089657418 1476488264 Enumerate \end_layout \end_inset . +\change_unchanged + \end_layout \begin_layout Description
[LyX/2.2.x] uk.po: update from Yuri for 2.2.x
commit 46c2e2b5d67325a2d3e31976703f995a9b686753 Author: Uwe Stöhr Date: Sat Oct 15 22:50:08 2016 +0200 uk.po: update from Yuri for 2.2.x --- po/uk.po | 150 +-- status.22x |2 + 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/po/uk.po b/po/uk.po index b8e35f4..9fab758 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: uk\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2016-10-10 10:33-0400\n" -"PO-Revision-Date: 2016-02-01 09:20+0200\n" +"PO-Revision-Date: 2016-10-11 19:18+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -1191,6 +1191,8 @@ msgstr "Переглянути &журнал повністю…" #: src/frontends/qt4/ui/ErrorListUi.ui:93 msgid "Attempt to show the output even if there were compilation errors" msgstr "" +"Намагатися показати результати, навіть якщо під час компіляції виявлено " +"помилки" #: src/frontends/qt4/ui/ErrorListUi.ui:96 msgid "Show Output &Anyway" @@ -1201,6 +1203,9 @@ msgid "" "Selecting an error will show the error message in the panel below and the " "cursor will jump to the location in the document where the error occurred." msgstr "" +"Позначення пункту помилки призведе до показу повідомлення щодо помилки на " +"нижній панелі і переведення курсора до місця у документі, де було виявлено " +"помилку." #: src/frontends/qt4/ui/ExternalUi.ui:35 msgid "F&ile" @@ -1526,7 +1531,7 @@ msgstr "Форма" #: src/frontends/qt4/ui/FloatPlacementUi.ui:19 msgid "Float Type:" -msgstr "Тип плаваючого об’єкта:" +msgstr "Тип рухомого об’єкта:" #: src/frontends/qt4/ui/FloatPlacementUi.ui:36 msgid "Use &default placement" @@ -1554,7 +1559,7 @@ msgstr "&Якщо можливо, не переміщувати" #: src/frontends/qt4/ui/FloatPlacementUi.ui:83 msgid "&Page of floats" -msgstr "&Сторінка плаваючих об'єктів" +msgstr "&Сторінка рухомих об'єктів" #: src/frontends/qt4/ui/FloatPlacementUi.ui:90 msgid "&Bottom of page" @@ -2265,11 +2270,11 @@ msgstr "&Вбудований текст програми" #: src/frontends/qt4/ui/ListingsUi.ui:45 msgid "Check for floating listings" -msgstr "Перевірка плаваючих текстів програм" +msgstr "Перевірка рухомих текстів програм" #: src/frontends/qt4/ui/ListingsUi.ui:48 msgid "&Float" -msgstr "&Плаваючі" +msgstr "&Рухомі" #: src/frontends/qt4/ui/ListingsUi.ui:55 src/frontends/qt4/ui/WrapUi.ui:185 msgid "&Placement:" @@ -2277,7 +2282,7 @@ msgstr "Р&озташування:" #: src/frontends/qt4/ui/ListingsUi.ui:68 msgid "Specify placement (htbp) for floating listings" -msgstr "Визначте розташування (htbp) плаваючих текстів програм" +msgstr "Визначте розташування (htbp) рухомих текстів програм" #: src/frontends/qt4/ui/ListingsUi.ui:78 msgid "Line numbering" @@ -2696,9 +2701,8 @@ msgid "De&fault output format:" msgstr "Типовий &формат виводу:" #: src/frontends/qt4/ui/OutputUi.ui:86 -#, fuzzy msgid "LyX Format" -msgstr "&Формат:" +msgstr "Формат LyX" #: src/frontends/qt4/ui/OutputUi.ui:98 msgid "" @@ -2708,10 +2712,16 @@ msgid "" "directory path). Disabling this option plays nicer in\n" "collaborative settings and with version control systems." msgstr "" +"Зберегти усі параметри до файла LyX, включаючи параметри,\n" +"які часто змінюються або є специфічними для користувача\n" +"(зокрема виведення змін, за якими ведеться стеження, або\n" +"шлях до каталогу документа). Вимикання збереження таких\n" +"параметрів покращить роботу з документами, які мають\n" +"багато авторів, та системами керування версіями." #: src/frontends/qt4/ui/OutputUi.ui:101 msgid "Save &transient properties" -msgstr "" +msgstr "Зберегти &проміжні властивості" #: src/frontends/qt4/ui/OutputUi.ui:111 msgid "Enable forward/reverse search between editor and output (e.g., SyncTeX)" @@ -6244,9 +6254,8 @@ msgid "Proof." msgstr "Доведення." #: lib/layouts/InStar.module:2 -#, fuzzy msgid "Title and Preamble Hacks" -msgstr "Заголовок (звичайна вставка)" +msgstr "Зміни у заголовку і преамбулі" #: lib/layouts/InStar.module:12 msgid "" @@ -6258,16 +6267,22 @@ msgid "" "in title-related material. (I
[LyX/master] Win installer: extend list of supported babel packages
commit 6e695290a2c47e2c8bd47f536e0b9bff92e7c91d Author: Uwe Stöhr Date: Sun Oct 16 14:31:46 2016 +0200 Win installer: extend list of supported babel packages --- development/Win32/packaging/installer/Packages.txt |9 +++- .../Win32/packaging/installer/babel-Packages.txt | 52 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/development/Win32/packaging/installer/Packages.txt b/development/Win32/packaging/installer/Packages.txt index d0ed643..a3c8db7 100644 --- a/development/Win32/packaging/installer/Packages.txt +++ b/development/Win32/packaging/installer/Packages.txt @@ -13,6 +13,7 @@ babel-albanian babel-bahasa babel-basque babel-belarusian +babel-bosnian babel-breton babel-bulgarian babel-catalan @@ -22,8 +23,9 @@ babel-danish babel-dutch babel-esperanto babel-estonian -babel-finnish -babel-galician +babel-finnish +babel-friulan +babel-galician babel-georgian babel-greek babel-hebrew @@ -35,10 +37,13 @@ babel-italian babel-kurmanji babel-latin babel-latvian +babel-macedonian babel-norsk +babel-piedmontese babel-polish babel-portuges babel-romanian +babel-romansh babel-russian babel-samin babel-scottish diff --git a/development/Win32/packaging/installer/babel-Packages.txt b/development/Win32/packaging/installer/babel-Packages.txt new file mode 100644 index 000..4f780fa --- /dev/null +++ b/development/Win32/packaging/installer/babel-Packages.txt @@ -0,0 +1,52 @@ +babel-albanian +babel-bahasa +babel-basque +babel-belarusian +babel-bosnian +babel-breton +babel-bulgarian +babel-catalan +babel-croatian +babel-czech +babel-danish +babel-dutch +babel-english +babel-esperanto +babel-estonian +babel-finnish +babel-french +babel-friulan +babel-galician +babel-german +babel-greek +babel-hebrew +babel-hungarian +babel-icelandic +babel-interlingua +babel-irish +babel-italian +babel-kurmanji +babel-latin +babel-latvian +babel-macedonian +babel-norsk +babel-piedmontese +babel-polish +babel-portuges +babel-romanian +babel-romansh +babel-russian +babel-samin +babel-scottish +babel-serbian +babel-serbianc +babel-slovak +babel-slovenian +babel-sorbian +babel-spanish +babel-swedish +babel-thai +babel-turkish +babel-ukrainian +babel-vietnamese +babel-welsh \ No newline at end of file
[LyX/master] Win build: fix a typo
commit 10e90ad78cd68afc274e43dd1c3d7d5002ed13e5 Author: Uwe Stöhr Date: Sun Oct 16 14:33:18 2016 +0200 Win build: fix a typo --- development/cmake/build5-2015.bat | 12 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/development/cmake/build5-2015.bat b/development/cmake/build5-2015.bat index 0d69b1c..01bec6a 100644 --- a/development/cmake/build5-2015.bat +++ b/development/cmake/build5-2015.bat @@ -33,9 +33,9 @@ REM Save path set CALLED_FROM=%CD% REM Add path to qmake here or set PATH correctly on your system. -set PATH=C:\Qt\Qt5.6.1-MSVC2015\5.6\msvc2015\bin;%PATH% +set PATH=C:\Qt\Qt5.6.2-MSVC2015\5.6\msvc2015\bin;%PATH% -REM Edit pathes here or set the environment variables on you system. +REM Edit pathes here or set the environment variables on your system. set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015 set LYX_SOURCE=D:\LyXGit\Master\ set LYX_BUILD=D:\LyXGit\Master\compile-2015 @@ -65,9 +65,6 @@ if not exist %LYX_BUILD% ( ) ) -REM MSVC 2015 tools -call "C:\Programme (x86)\MSVC2015\VC\vcvarsall.bat" x86 - cd "%LYX_BUILD%" REM start with a new cmake run @@ -76,7 +73,7 @@ REM start with a new cmake run if "%1%" == "devel" ( REM Build solution to develop LyX REM you can add the option "-GNinja" for a faster compilation - cmake %LYX_SOURCE% -G"Visual Studio 14 2015" -DLYX_USE_QT=QT5 -DLYX_ENABLE_EXPORT_TESTS=0 -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 -DLYX_RELEASE=0 -DLYX_CONSOLE=FORCE -DLYX_3RDPARTY_BUILD=1 %DEPENDENCIES_DOWNLOAD% + cmake %LYX_SOURCE% -G"Visual Studio 14 2015" -DLYX_ENABLE_CXX11=ON -DLYX_USE_QT=QT5 -DLYX_ENABLE_EXPORT_TESTS=0 -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 -DLYX_RELEASE=0 -DLYX_CONSOLE=FORCE -DLYX_3RDPARTY_BUILD=1 %DEPENDENCIES_DOWNLOAD% msbuild src\LyX.vcxproj /p:Configuration=Debug msbuild src\tex2lyx\tex2lyx.vcxproj /p:Configuration=Debug ) @@ -84,8 +81,7 @@ if "%1%" == "devel" ( if "%1%" == "install" ( REM Build solution to develop LyX REM set -DLYX_MERGE_REBUILD and -DLYX_MERGE_FILES to 1 for a version released with an installer - cmake %LYX_SOURCE% -GNinja -G"Visual Studio 14 2015" -DLYX_USE_QT=QT5 -DLYX_MERGE_REBUILD=0 -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF %DEPENDENCIES_DOWNLOAD% - REM msbuild lyx.sln /p:Configuration=Release /t:ALL_BUILD + cmake %LYX_SOURCE% -GNinja -G"Visual Studio 14 2015" -DLYX_ENABLE_CXX11=ON -DLYX_USE_QT=QT5 -DLYX_MERGE_REBUILD=0 -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF %DEPENDENCIES_DOWNLOAD% msbuild INSTALL.vcxproj /p:Configuration=Release )
[LyX/2.2.x] Win installer backport recent changes
commit 4961683764c7228b06db5e9f09872eb5cffa7f65
Author: Uwe Stöhr
Date: Sun Oct 16 14:34:27 2016 +0200
Win installer backport recent changes
---
.../Win32/packaging/installer/ChangeLog.txt| 16 +-
development/Win32/packaging/installer/Packages.txt | 10 +++-
.../Win32/packaging/installer/babel-Packages.txt | 52
.../Win32/packaging/installer/include/LaTeX.nsh| 12 +---
.../Win32/packaging/installer/include/init.nsh | 26 +++---
development/Win32/packaging/installer/settings.nsh |4 +-
development/cmake/build5-2015.bat |2 +-
7 files changed, 99 insertions(+), 23 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 90fd3c9..68b8138 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,9 +1,21 @@
-Changelog for LyX-222-1:
+Changelog for LyX-222-2:
+- updated to Qt 5.6.2-1 (fixes Windows-specific bugs)
+- updated to Perl 5.22.2.1
+
+
+Changelog for LyX-222-1:
- installs LyX 2.2.2
- updated to MiKTeX 2.9 build 6069
-- updated to Imagemagick 7.0.3-0
+- updated to Imagemagick 7.0.3-3
- updated to JabRef 3.6
- updated to NSIS 3.0
+- updated to Ghostscript 9.20
+- new thesaurus for English (AU)
+- updated thesaurus for Portuguese and Ukrainian
+- updated spell checker dictionaries for English (CA, GB and US), Portuguese
+ and Ukrainian
+ (To benefit from them you must uninstall an already installed LyX 2.2.x and
+ then use this installer.)
Changelog for LyX-221-2:
diff --git a/development/Win32/packaging/installer/Packages.txt
b/development/Win32/packaging/installer/Packages.txt
index 581b911..a3c8db7 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -12,6 +12,8 @@ authordate
babel-albanian
babel-bahasa
babel-basque
+babel-belarusian
+babel-bosnian
babel-breton
babel-bulgarian
babel-catalan
@@ -21,8 +23,9 @@ babel-danish
babel-dutch
babel-esperanto
babel-estonian
-babel-finnish
-babel-galician
+babel-finnish
+babel-friulan
+babel-galician
babel-georgian
babel-greek
babel-hebrew
@@ -34,10 +37,13 @@ babel-italian
babel-kurmanji
babel-latin
babel-latvian
+babel-macedonian
babel-norsk
+babel-piedmontese
babel-polish
babel-portuges
babel-romanian
+babel-romansh
babel-russian
babel-samin
babel-scottish
diff --git a/development/Win32/packaging/installer/babel-Packages.txt
b/development/Win32/packaging/installer/babel-Packages.txt
new file mode 100644
index 000..4f780fa
--- /dev/null
+++ b/development/Win32/packaging/installer/babel-Packages.txt
@@ -0,0 +1,52 @@
+babel-albanian
+babel-bahasa
+babel-basque
+babel-belarusian
+babel-bosnian
+babel-breton
+babel-bulgarian
+babel-catalan
+babel-croatian
+babel-czech
+babel-danish
+babel-dutch
+babel-english
+babel-esperanto
+babel-estonian
+babel-finnish
+babel-french
+babel-friulan
+babel-galician
+babel-german
+babel-greek
+babel-hebrew
+babel-hungarian
+babel-icelandic
+babel-interlingua
+babel-irish
+babel-italian
+babel-kurmanji
+babel-latin
+babel-latvian
+babel-macedonian
+babel-norsk
+babel-piedmontese
+babel-polish
+babel-portuges
+babel-romanian
+babel-romansh
+babel-russian
+babel-samin
+babel-scottish
+babel-serbian
+babel-serbianc
+babel-slovak
+babel-slovenian
+babel-sorbian
+babel-spanish
+babel-swedish
+babel-thai
+babel-turkish
+babel-ukrainian
+babel-vietnamese
+babel-welsh
\ No newline at end of file
diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh
b/development/Win32/packaging/installer/include/LaTeX.nsh
index 045b271..dcf7cd0 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -214,7 +214,6 @@ FunctionEnd
${if} $PathLaTeX == ""
# launch MiKTeX's installer
MessageBox MB_OK|MB_ICONINFORMATION "$(LatexInfo)" /SD IDOK
- MessageBox MB_OK|MB_ICONINFORMATION "${MiKTeXInstall} --shared"
${if} $MultiUser.Privileges != "Admin"
${andif} $MultiUser.Privileges != "Power"
# call the non-admin version
@@ -278,16 +277,11 @@ Function ConfigureMiKTeX
SetOutPath "$PathLaTeXLocal\tex\latex\lyx"
CopyFiles /SILENT "$INSTDIR\Resources\tex\*.*"
"$PathLaTeXLocal\tex\latex\lyx"
${endif}
- # Belarusian support
- ${ifnot} ${FileExists} "$PathLaTeXLocal\tex\generic\babel\belarusian.ldf"
- SetOutPath "$PathLaTeXLocal\tex\generic\babel"
- File "${FILES_DVIPOST_PKG}\belarusian.ldf"
- File "${FILES_DVIPOST_PKG}\belarusian.sty"
- ${endif}
# Hungarian support
+ # The following seems to be unnecesary since 2015, therefore it is commented
# this is a replacement therefore do this in every case
- SetOutPath "$PathL
[LyX/master] Development.lyx: Updates
commit 2974e1a3dba13e5bc53003aeff90ff2801ed1595 Author: Uwe Stöhr Date: Sun Oct 16 14:52:46 2016 +0200 Development.lyx: Updates - the range of file format does no longer need to be updated - mention rule 6 of the documentation policies --- lib/doc/Development.lyx | 91 --- 1 files changed, 62 insertions(+), 29 deletions(-) diff --git a/lib/doc/Development.lyx b/lib/doc/Development.lyx index 6deb3d7..a6e5d4e 100644 --- a/lib/doc/Development.lyx +++ b/lib/doc/Development.lyx @@ -1,5 +1,5 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ -\lyxformat 512 +#LyX 2.2 created this file. For more info see http://www.lyx.org/ +\lyxformat 508 \begin_document \begin_header \save_transient_properties true @@ -25,7 +25,6 @@ logicalmkup \font_osf false \font_sf_scale 100 100 \font_tt_scale 100 100 -\use_microtype false \graphics default \default_output_format pdf2 \output_sync 1 @@ -460,30 +459,6 @@ src/version.h \end_layout \begin_layout Enumerate -Update the range of file formats in the array -\begin_inset Flex Code -status collapsed - -\begin_layout Plain Layout -format_relation -\end_layout - -\end_inset - - in -\begin_inset Flex Code -status collapsed - -\begin_layout Plain Layout -lib/lyx2lyx/LyX.py -\end_layout - -\end_inset - -. -\end_layout - -\begin_layout Enumerate \begin_inset CommandInset label LatexCommand label name "enu:Add-an-entry" @@ -613,7 +588,8 @@ name "enu:updatefiles" \end_inset -Update LyX's .lyx documentation files to the new format. +Test your lyx2lyx code by updating LyX's .lyx documentation files to the + new format. The developer who makes the change knows best what changes to expect when inspecting the resulting diff. Because of this, you might be able to catch a bug in the lyx2lyx code that @@ -687,7 +663,52 @@ gen_lfuns.py \end_inset before being converted to the latest format. - Finally, commit using +\begin_inset Newline newline +\end_inset + + +\begin_inset Note Greyedout +status open + +\begin_layout Plain Layout + +\series bold +Note: +\series default + Only commit file format changes in the doc files if these files are using + the new feature of the new file format. + The reason is rule +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "enu:The-fileformat-of" + +\end_inset + + of the documentation policies described in sec. +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "sec:Documentation-policies" + +\end_inset + +. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Enumerate +Finally, commit using \begin_inset Flex Code status collapsed @@ -5184,6 +5205,12 @@ No. \end_layout \begin_layout Section +\begin_inset CommandInset label +LatexCommand label +name "sec:Documentation-policies" + +\end_inset + Documentation policies \end_layout @@ -5258,6 +5285,12 @@ reference "enu:If-you-are" \end_layout \begin_layout Enumerate +\begin_inset CommandInset label +LatexCommand label +name "enu:The-fileformat-of" + +\end_inset + The fileformat of a file must not be changed unless you document a new feature in LyX that requires a new fileformat. The reason for this rule is to keep it easy for the doc maintainers to
[LyX/master] Development.lyx: a MSCV specific update
commit 1feeefb2b12d3837498c85c9659c34cf7d0544b4 Author: Uwe Stöhr Date: Sun Oct 16 15:30:51 2016 +0200 Development.lyx: a MSCV specific update --- lib/doc/Development.lyx |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/doc/Development.lyx b/lib/doc/Development.lyx index a6e5d4e..82b2c5a 100644 --- a/lib/doc/Development.lyx +++ b/lib/doc/Development.lyx @@ -2027,13 +2027,17 @@ src/tex2lyx/test \end_layout \begin_layout Itemize -In the appearing MSVC program right-click on the project +In the appearing MSVC program assure that you build the +\emph on +release +\emph default + version and then right-click on the project \family sans updatetex2lyxtests \family default in the project explorer and chose \family sans -Create +Build \family default . \end_layout
[LyX/master] support for the languages Bosnian, Friulian, Macedonian, Piedmontese and Romansh
commit f179173e423469eb95cab6a5c7dd6ac317d4831b
Author: Uwe Stöhr
Date: Sun Oct 16 15:33:23 2016 +0200
support for the languages Bosnian, Friulian, Macedonian, Piedmontese and
Romansh
- file format change
- note that I could not update the tex2lyx test files because of bug #10440
---
development/FORMAT |7 +++
lib/languages| 49 +++
lib/lyx2lyx/lyx_2_3.py | 99 +-
src/tex2lyx/Preamble.cpp | 35
src/version.h|4 +-
5 files changed, 174 insertions(+), 20 deletions(-)
diff --git a/development/FORMAT b/development/FORMAT
index 902c145..58a58e1 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -11,6 +11,13 @@ adjustments are made to tex2lyx and bugs are fixed in
lyx2lyx.
---
+2016-10-16 Uwe Stöhr
+ * Format incremented to 513: support for Piedmontese etc.:
+ \lang bosnian
+ \lang macedonian
+ \lang piedmontese
+ \lang romansh
+
2016-08-04 Jürgen Spitzmüller
* Format incremented to 512
Added inclusion of styles from [scr]article to the [scr]article-beamer
diff --git a/lib/languages b/lib/languages
index d56d030..08cf331 100644
--- a/lib/languages
+++ b/lib/languages
@@ -256,6 +256,15 @@ Language belarusian
AsBabelOptions true
End
+# not yet supported by polyglossia
+Language bosnian
+ GuiName "Bosnian"
+ BabelNamebosnian
+ QuoteStyle polish
+ Encoding iso8859-2
+ LangCode bs_BA
+End
+
Language brazilian
GuiName "Portuguese (Brazil)"
HasGuiSupporttrue
@@ -480,6 +489,16 @@ Language french
EndPostBabelPreamble
End
+Language friulan
+ GuiName "Friulian"
+ HasGuiSupporttrue
+ BabelNamefriulan
+ PolyglossiaName friulan
+ QuoteStyle french
+ Encoding iso8859-15
+ LangCode fur_IT
+End
+
Language galician
GuiName "Galician"
HasGuiSupporttrue
@@ -768,6 +787,16 @@ Language magyar
LangCode hu_HU
End
+# not yet supported by polyglossia
+Language macedonian
+ GuiName "Macedonian"
+ BabelNamemacedonian
+ QuoteStyle german
+ Encoding cp1251
+ FontEncoding T2A
+ LangCode mk_MK
+End
+
# not supported by babel
Language marathi
GuiName "Marathi"
@@ -837,6 +866,16 @@ End
# LangCode ru_petr1708
# End
+Language piedmontese
+ GuiName "Piedmontese"
+ HasGuiSupporttrue
+ BabelNamepiedmontese
+ PolyglossiaName piedmontese
+ QuoteStyle french
+ Encoding iso8859-15
+ LangCode pms_IT
+End
+
Language polish
GuiName "Polish"
HasGuiSupporttrue
@@ -868,6 +907,16 @@ Language romanian
LangCode ro_RO
End
+Language romansh
+ GuiName "Romansh"
+ HasGuiSupporttrue
+ BabelNameromansh
+ PolyglossiaName romansh
+ QuoteStyle german
+ Encoding iso8859-15
+ LangCode rm_CH
+End
+
Language russian
GuiName "Russian"
HasGuiSupporttrue
diff --git a/lib/lyx2lyx/lyx_2_3.py b/lib/lyx2lyx/lyx_2_3.py
index 001c1cb..93bf0f6 100644
--- a/lib/lyx2lyx/lyx_2_3.py
+++ b/lib/lyx2lyx/lyx_2_3.py
@@ -261,6 +261,101 @@ def convert_beamer_article_styles(document):
return
+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"
+
+if document.language == "friulan":
+document.language = "english"
+i = find_token(document.header, "\\language friulan", 0)
+if i != -1:
+ document.head
[LyX/master] FORMAT: forgot an entry in previous commit
commit 79fd5496218143d8727b85e168d20cf55cb2e5e5 Author: Uwe Stöhr Date: Sun Oct 16 15:36:31 2016 +0200 FORMAT: forgot an entry in previous commit --- development/FORMAT |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/development/FORMAT b/development/FORMAT index 58a58e1..6f8bb59 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -14,6 +14,7 @@ adjustments are made to tex2lyx and bugs are fixed in lyx2lyx. 2016-10-16 Uwe Stöhr * Format incremented to 513: support for Piedmontese etc.: \lang bosnian + \lang friulan \lang macedonian \lang piedmontese \lang romansh
[LyX/2.2.x] sv.po: updates from Jim
commit b040985a2b2eb8d3fec332ac7155a95e5cf264c0 Author: Uwe Stöhr Date: Thu Oct 20 01:01:13 2016 +0200 sv.po: updates from Jim --- po/sv.po | 695 status.22x |2 +- 2 files changed, 368 insertions(+), 329 deletions(-) diff --git a/po/sv.po b/po/sv.po index 64cf24c..37b0b5b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,11 +4,11 @@ # Joacim Persson 1997, 1998. # Jim Rotmalm , 2010-2016. # -# Information 2016-04-12: +# Information 2016-10-14: # Bad menu shortcuts: 167 -# Bad Qt shortcuts: 127 +# Bad Qt shortcuts: 128 # Inconsistent translations: 21 -# Total warnings: 315 +# Total warnings: 316 # # Behöver förbättras: # Alla genvägar (snabbkommandon, kortkommandon) @@ -212,10 +212,10 @@ # Jim Rotmalm , 2010-2016. msgid "" msgstr "" -"Project-Id-Version: LyX 2.2.0\n" +"Project-Id-Version: LyX 2.2.3\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2016-10-10 10:33-0400\n" -"PO-Revision-Date: 2016-04-12 21:12+0100\n" +"POT-Creation-Date: 2016-10-14 12:21+0200\n" +"PO-Revision-Date: 2016-10-14 21:12+0100\n" "Last-Translator: Jim Rotmalm \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -251,14 +251,15 @@ msgstr "Utgåvenoter" #: src/frontends/qt4/ui/AboutUi.ui:159 src/frontends/qt4/ui/CompareUi.ui:163 #: src/frontends/qt4/ui/DelimiterUi.ui:286 #: src/frontends/qt4/ui/ErrorListUi.ui:60 -#: src/frontends/qt4/ui/ExternalUi.ui:620 src/frontends/qt4/ui/IncludeUi.ui:250 +#: src/frontends/qt4/ui/ExternalUi.ui:620 +#: src/frontends/qt4/ui/IncludeUi.ui:250 #: src/frontends/qt4/ui/InsetParamsUi.ui:138 src/frontends/qt4/ui/LogUi.ui:88 #: src/frontends/qt4/ui/ParagraphUi.ui:261 src/frontends/qt4/ui/PrefsUi.ui:90 #: src/frontends/qt4/ui/RefUi.ui:343 src/frontends/qt4/ui/SearchUi.ui:203 #: src/frontends/qt4/ui/ShowFileUi.ui:55 src/frontends/qt4/ui/SymbolsUi.ui:66 -#: src/frontends/qt4/ui/TexinfoUi.ui:58 src/frontends/qt4/ui/ThesaurusUi.ui:138 -#: src/frontends/qt4/ui/WrapUi.ui:173 src/frontends/qt4/GuiParagraph.cpp:163 -#: src/frontends/qt4/GuiView.cpp:2746 +#: src/frontends/qt4/ui/TexinfoUi.ui:58 +#: src/frontends/qt4/ui/ThesaurusUi.ui:138 src/frontends/qt4/ui/WrapUi.ui:173 +#: src/frontends/qt4/GuiParagraph.cpp:163 src/frontends/qt4/GuiView.cpp:2781 msgid "&Close" msgstr "&Stäng" @@ -392,15 +393,16 @@ msgid "Enter BibTeX database name" msgstr "Ange BibTeX-databasens namn" #: src/frontends/qt4/ui/BibtexAddUi.ui:114 -#: src/frontends/qt4/ui/BranchesUi.ui:113 src/frontends/qt4/ui/CitationUi.ui:84 -#: src/frontends/qt4/ui/IndicesUi.ui:134 src/CutAndPaste.cpp:369 +#: src/frontends/qt4/ui/BranchesUi.ui:113 +#: src/frontends/qt4/ui/CitationUi.ui:84 src/frontends/qt4/ui/IndicesUi.ui:134 +#: src/CutAndPaste.cpp:369 msgid "&Add" msgstr "Lä&gg till" -#: src/frontends/qt4/ui/BibtexAddUi.ui:127 src/frontends/qt4/ui/BibtexUi.ui:213 -#: src/frontends/qt4/ui/ChangesUi.ui:91 src/frontends/qt4/ui/SendtoUi.ui:92 -#: src/frontends/qt4/ui/ShortcutUi.ui:65 src/buffer_funcs.cpp:123 -#: src/frontends/qt4/ButtonController.cpp:239 +#: src/frontends/qt4/ui/BibtexAddUi.ui:127 +#: src/frontends/qt4/ui/BibtexUi.ui:213 src/frontends/qt4/ui/ChangesUi.ui:91 +#: src/frontends/qt4/ui/SendtoUi.ui:92 src/frontends/qt4/ui/ShortcutUi.ui:65 +#: src/buffer_funcs.cpp:123 src/frontends/qt4/ButtonController.cpp:239 #: src/frontends/qt4/GuiApplication.cpp:1780 #: src/frontends/qt4/GuiCompare.cpp:192 msgid "Cancel" @@ -447,16 +449,19 @@ msgstr "Lägg till bibliografi till innehållsförteckningen" msgid "Add bibliography to &TOC" msgstr "Lägg till bibliografi till innehålls&förteckning" -#: src/frontends/qt4/ui/BibtexUi.ui:200 src/frontends/qt4/ui/CharacterUi.ui:357 +#: src/frontends/qt4/ui/BibtexUi.ui:200 +#: src/frontends/qt4/ui/CharacterUi.ui:357 #: src/frontends/qt4/ui/CitationUi.ui:511 #: src/frontends/qt4/ui/CompareHistoryUi.ui:183 #: src/frontends/qt4/ui/CompareUi.ui:153 src/frontends/qt4/ui/DocumentUi.ui:67 #: src/frontends/qt4/ui/ExternalUi.ui:600 -#: src/frontends/qt4/ui/GraphicsUi.ui:711 src/frontends/qt4/ui/IncludeUi.ui:237 -#: src/frontends/qt4/ui/IndexUi.ui:41 src/frontends/qt4/ui/InsetParamsUi.ui:118 +#: src/frontends/qt4/ui/GraphicsUi.ui:711 +#: src/frontends/qt4/ui/IncludeUi.ui:237 src/frontends/qt4/ui/IndexUi.ui:41 +#: src/frontends/qt4/ui/InsetParamsUi.ui:118 #: src/frontends/qt4/ui/ListingsUi.ui:539 #: src/frontends/qt4/ui/MathMatrixUi.ui:263 src/frontends/qt4/ui/NoteUi.ui:38 -#: src/frontends/qt4/ui/ParagraphUi.ui:241 src/frontends/qt4/ui/PhantomUi.ui:38 +#: src/frontends/qt4/ui/ParagraphUi.ui:241 +#: src/frontends/qt4/ui/PhantomUi.ui:38 #: src/frontends/qt4/ui/PrintindexUi.ui:38 src/frontends/qt4/ui/RefUi.ui:317 #: src/frontends/qt4/ui/Sen
[LyX/master] seminar.lyx: accept change from Günter
commit 62c4ba308a9cea71c3b40d2acb78fe884cf289b1 Author: Uwe Stöhr Date: Thu Oct 20 22:31:30 2016 +0200 seminar.lyx: accept change from Günter - French seminar.lyx: few beautifications --- lib/examples/fr/seminar.lyx | 11 +-- lib/examples/seminar.lyx|7 +-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/lib/examples/fr/seminar.lyx b/lib/examples/fr/seminar.lyx index 84967e9..8df87a2 100644 --- a/lib/examples/fr/seminar.lyx +++ b/lib/examples/fr/seminar.lyx @@ -1,4 +1,4 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.2 created this file. For more info see http://www.lyx.org/ \lyxformat 508 \begin_document \begin_header @@ -528,7 +528,7 @@ Vous pouvez spécifier une famille sans empattements et une police adéquate via \family sans Document\SpecialChar menuseparator -Paramètres...\SpecialChar menuseparator +Paramètres\SpecialChar menuseparator Polices \family default . @@ -596,8 +596,7 @@ target "https://www.ctan.org/tex-archive/macros/latex/contrib/seminar/doc/semina \end_layout \begin_layout Section -En cas de problèmes\SpecialChar ldots - +En cas de problèmes \end_layout \begin_layout Itemize @@ -608,11 +607,11 @@ Lyx-2.2.0 échoue avec l'erreur \lang english missing characters in font nullfont +\lang french + \begin_inset Quotes frd \end_inset - -\lang french . Cette erreur provient d'un bogue PGF et peut être ignorée. \end_layout diff --git a/lib/examples/seminar.lyx b/lib/examples/seminar.lyx index fb29e7e..f7faad2 100644 --- a/lib/examples/seminar.lyx +++ b/lib/examples/seminar.lyx @@ -77,12 +77,11 @@ \papercolumns 1 \papersides 1 \paperpagestyle empty -\tracking_changes true +\tracking_changes false \output_changes false \html_math_output 0 \html_css_as_file 0 \html_be_strict false -\author -1402925745 "Günter Milde" \end_header \begin_body @@ -589,10 +588,6 @@ portrait \begin_layout Itemize Correct size and orientation of the slides is somewhat tricky. Depending on the use case, different settings and export routes work best. - -\change_deleted -1402925745 1476100062 - -\change_unchanged For details see the Appendix. \end_layout
[LyX/master] French splash.lyx: restore \origin
commit f738b1003bce7340d8e783f268faa19f6cdad9c1 Author: Uwe Stöhr Date: Thu Oct 20 22:35:00 2016 +0200 French splash.lyx: restore \origin --- lib/examples/fr/splash.lyx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/examples/fr/splash.lyx b/lib/examples/fr/splash.lyx index baaad97..becf9b5 100644 --- a/lib/examples/fr/splash.lyx +++ b/lib/examples/fr/splash.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/examples/fr/ \textclass article \use_default_options false \maintain_unincluded_children false
[LyX/2.2.x] French splash.lyx: restore \origin tag
commit 9b25f19aa795ed38e8f0636f3e6dda4cb9d9f4e0 Author: Uwe Stöhr Date: Thu Oct 20 22:35:59 2016 +0200 French splash.lyx: restore \origin tag --- lib/examples/fr/splash.lyx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/examples/fr/splash.lyx b/lib/examples/fr/splash.lyx index baaad97..becf9b5 100644 --- a/lib/examples/fr/splash.lyx +++ b/lib/examples/fr/splash.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/examples/fr/ \textclass article \use_default_options false \maintain_unincluded_children false
[LyX/master] tex2lyx/Preamble.cpp: sort alphabetically to keep overview
commit fe542e79898005dff02e1bdc2fd7d48f5824bb09
Author: Uwe Stöhr
Date: Fri Oct 21 00:14:09 2016 +0200
tex2lyx/Preamble.cpp: sort alphabetically to keep overview
- also comment out the unsupported languages
---
src/tex2lyx/Preamble.cpp | 48 +++---
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 9709cf0..7af0ad3 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -297,36 +297,36 @@ string process_keyval_opt(vector & options,
string name)
* FIXME: support spelling=old for german variants (german vs. ngerman LyX
names etc)
*/
const char * const Preamble::polyglossia_languages[] = {
-"albanian", "croatian", "hebrew", "norsk", "swedish", "amharic", "czech",
"hindi",
-"nynorsk", "syriac", "arabic", "danish", "icelandic", "occitan", "tamil",
-"armenian", "divehi", "interlingua", "polish", "telugu", "asturian", "dutch",
-"irish", "portuges", "thai", "bahasai", "english", "italian", "romanian",
"turkish",
-"bahasam", "esperanto", "lao", "russian", "turkmen", "basque", "estonian",
"latin",
-"samin", "ukrainian", "bengali", "farsi", "latvian", "sanskrit", "tibetan",
"urdu",
-"brazil", "brazilian", "finnish", "lithuanian", "scottish", "usorbian",
"breton",
-"french", "lsorbian", "serbian", "vietnamese", "bulgarian", "galician",
"magyar",
-"slovak", "welsh", "catalan", "german", "malayalam", "slovenian", "coptic",
"greek",
-"marathi", "spanish", "austrian",
-"american", "ancient", "australian", "british", "monotonic", "newzealand",
-"polytonic", 0};
+"albanian", "american", "ancient", "arabic", "armenian", "australian",
+"bahasai", "bahasam", "basque", "bengali", "brazil", "brazilian", "breton",
"british", "bulgarian",
+"catalan", "coptic", "croatian", "czech", "danish", "divehi", "dutch",
+"english", "esperanto", "estonian", "farsi", "finnish", "french", "galician",
"greek", "monotonic",
+"hebrew", "hindi", "icelandic", "interlingua", "irish", "italian",
+"lao", "latin", "latvian", "lithuanian", "lsorbian", "magyar", "malayalam",
"marathi",
+"austrian", "newzealand", "german", "norsk", "nynorsk", "occitan",
+"polish", "polytonic", "portuges", "romanian", "russian",
+"samin", "sanskrit", "scottish", "serbian", "slovak", "slovenian", "spanish",
"swedish",
+"tamil", "telugu", "thai", "tibetan", "turkish", "turkmen",
+"ukrainian", "usorbian", "vietnamese", "welsh", 0};
+// not yet supported by LyX: "amharic", "asturian", "syriac", "urdu"
/**
* the same as polyglossia_languages with .lyx names
* please keep this in sync with polyglossia_languages line by line!
*/
const char * const Preamble::coded_polyglossia_languages[] = {
-"albanian", "croatian", "hebrew", "norsk", "swedish", "amharic", "czech",
"hindi",
-"nynorsk", "syriac", "arabic_arabi", "danish", "icelandic", "occitan", "tamil",
-"armenian", "divehi", "interlingua", "polish", "telugu", "asturian", "dutch",
-"irish", "portuges", "thai", "bahasa", "english", "italian", "romanian",
"turkish",
-"bahasam", "esperanto", "lao", "russian", "turkmen", "basque", "estonian",
"latin",
-"samin", "ukrainian", "bengali", "farsi", "latvian", "sanskrit", "tibetan",
"urdu",
-"brazilian", "brazilian", "finnish", "lithuanian", "scottish", "uppersorbian",
"breton",
-"french", "lowersorbian", "serbian", "vietnamese", "bulgarian", "galician",
"magyar",
-"slovak", "welsh", "catalan", "ngerman", "malayalam", "slovene", "coptic",
"greek",
-"marathi", "spanish", "naustrian",
-"american", "ancientgreek", "australian", "british", "greek", "newzealand",
-"polutonikogreek", 0};
+"albanian", "american", "ancientgreek", "arabic_arabi", "armenian",
"australian",
+"bahasa", "bahasam", "basque", "bengali", "brazilian", "brazilian", "breton",
"british", "bulgarian",
+"catalan", "coptic", "croatian", "czech", "danish", "divehi", "dutch",
+"english", "esperanto", "estonian", "farsi", "finnish", "french", "galician",
"greek", "greek",
+"hebrew", "hindi", "icelandic", "interlingua", "irish", "italian",
+"lao", "latin", "latvian", "lithuanian", "lowersorbian", "magyar",
"malayalam", "marathi",
+"naustrian","newzealand", "ngerman", "norsk", "nynorsk", "occitan",
+"polish", "polutonikogreek", "portuges", "romanian", "russian",
+"samin", "sanskrit", "scottish", "serbian", "slovak", "slovene", "spanish",
"swedish",
+"tamil", "telugu", "thai", "tibetan", "turkish", "turkmen",
+"ukrainian", "uppersorbian", "vietnamese", "welsh", 0};
+// not yet supported by LyX: "amharic", "asturian", "syriac", "urdu"
bool Preamble::usePolyglossia() const
[LyX/master] tex2lyx/Preamble.cpp: forgot this in r[f179173e/lyxgit]
commit 5adf949abba7952dc4023e283abe8f4727cc81ff
Author: Uwe Stöhr
Date: Fri Oct 21 00:20:27 2016 +0200
tex2lyx/Preamble.cpp: forgot this in r[f179173e/lyxgit]
- polyglossia supports Romansh, Piedmontese and Friulian
---
src/tex2lyx/Preamble.cpp | 14 --
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 7af0ad3..9d9d55c 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -300,11 +300,12 @@ const char * const Preamble::polyglossia_languages[] = {
"albanian", "american", "ancient", "arabic", "armenian", "australian",
"bahasai", "bahasam", "basque", "bengali", "brazil", "brazilian", "breton",
"british", "bulgarian",
"catalan", "coptic", "croatian", "czech", "danish", "divehi", "dutch",
-"english", "esperanto", "estonian", "farsi", "finnish", "french", "galician",
"greek", "monotonic",
-"hebrew", "hindi", "icelandic", "interlingua", "irish", "italian",
+"english", "esperanto", "estonian", "farsi", "finnish", "french", "friulan",
+"galician", "greek", "monotonic", "hebrew", "hindi",
+"icelandic", "interlingua", "irish", "italian",
"lao", "latin", "latvian", "lithuanian", "lsorbian", "magyar", "malayalam",
"marathi",
"austrian", "newzealand", "german", "norsk", "nynorsk", "occitan",
-"polish", "polytonic", "portuges", "romanian", "russian",
+"piedmontese", "polish", "polytonic", "portuges", "romanian", "romansh",
"russian",
"samin", "sanskrit", "scottish", "serbian", "slovak", "slovenian", "spanish",
"swedish",
"tamil", "telugu", "thai", "tibetan", "turkish", "turkmen",
"ukrainian", "usorbian", "vietnamese", "welsh", 0};
@@ -318,11 +319,12 @@ const char * const
Preamble::coded_polyglossia_languages[] = {
"albanian", "american", "ancientgreek", "arabic_arabi", "armenian",
"australian",
"bahasa", "bahasam", "basque", "bengali", "brazilian", "brazilian", "breton",
"british", "bulgarian",
"catalan", "coptic", "croatian", "czech", "danish", "divehi", "dutch",
-"english", "esperanto", "estonian", "farsi", "finnish", "french", "galician",
"greek", "greek",
-"hebrew", "hindi", "icelandic", "interlingua", "irish", "italian",
+"english", "esperanto", "estonian", "farsi", "finnish", "french", "friulan",
+"galician", "greek", "greek", "hebrew", "hindi",
+"icelandic", "interlingua", "irish", "italian",
"lao", "latin", "latvian", "lithuanian", "lowersorbian", "magyar",
"malayalam", "marathi",
"naustrian","newzealand", "ngerman", "norsk", "nynorsk", "occitan",
-"polish", "polutonikogreek", "portuges", "romanian", "russian",
+"piedmontese", "polish", "polutonikogreek", "portuges", "romanian", "romansh",
"russian",
"samin", "sanskrit", "scottish", "serbian", "slovak", "slovene", "spanish",
"swedish",
"tamil", "telugu", "thai", "tibetan", "turkish", "turkmen",
"ukrainian", "uppersorbian", "vietnamese", "welsh", 0};
[LyX/2.2.x] UserGuide.lyx: deny a change
commit 67cbf179b4cfae74b18ddcf12e1b4145b6f02e51 Author: Uwe Stöhr Date: Sat Oct 22 01:00:11 2016 +0200 UserGuide.lyx: deny a change this type of description is used all over the place in the LyX docs --- lib/doc/UserGuide.lyx | 11 ++- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index ca7b29a..09ad3a6 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -134,12 +134,11 @@ enumitem \papercolumns 1 \papersides 2 \paperpagestyle default -\tracking_changes true +\tracking_changes false \output_changes false \html_math_output 0 \html_css_as_file 0 \html_be_strict true -\author 1414654397 "Richard Heck" \end_header \begin_body @@ -6729,13 +6728,7 @@ reference "sec:TeX-Code" \emph on enumi \emph default - is -\change_inserted 1414654397 1468603336 -the LaTeX name of -\change_deleted 1414654397 1468603338 -hereby -\change_unchanged -the first level counter of the enumeration. + is hereby the first level counter of the enumeration. The command \series bold
[LyX/2.2.x] Merge branch '2.2.x' of git.lyx.org:lyx into 2.2.x
commit e178eb864a6728d094d17637ead928aea49dcac8 Merge: 67cbf17 769494e Author: Uwe Stöhr Date: Sat Oct 22 01:00:23 2016 +0200 Merge branch '2.2.x' of git.lyx.org:lyx into 2.2.x po/sk.gmo | Bin 483576 -> 484575 bytes po/sk.po | 373 - 2 files changed, 245 insertions(+), 128 deletions(-)
[LyX/master] layouts/modules: use the new PassThru tag
commit 7f7534403b7cf8fa81efedb974c18ef1569a2133 Author: Uwe Stöhr Date: Sat Oct 22 03:01:44 2016 +0200 layouts/modules: use the new PassThru tag This fixes problems like bug #10434 --- lib/layouts/aastex.layout |3 ++- lib/layouts/acmsiggraph-0-92.layout |5 - lib/layouts/acmsiggraph.layout | 27 +++ lib/layouts/agutex.layout |3 ++- lib/layouts/europecv.layout |5 - lib/layouts/ijmpc.layout|3 ++- lib/layouts/ijmpd.layout|3 ++- lib/layouts/moderncv.layout |5 - lib/layouts/multicol.module | 33 + lib/layouts/tcolorbox.module|5 +++-- 10 files changed, 55 insertions(+), 37 deletions(-) diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout index f72ded3..5477fd6 100644 --- a/lib/layouts/aastex.layout +++ b/lib/layouts/aastex.layout @@ -42,7 +42,7 @@ # The new "aastex6.layout" depends on aastex6.cls but inputs this # file for the definitions (cf. LyX ticket #10027) -Format 60 +Format 62 Columns1 Sides 1 #SecNumDepth 3 @@ -184,6 +184,7 @@ Style Altaffilation Mandatory 1 LabelString "Number" Tooltip "Consecutive number for the alternative affiliations" + PassThru 1 EndArgument LabelSepxx LabelType Static diff --git a/lib/layouts/acmsiggraph-0-92.layout b/lib/layouts/acmsiggraph-0-92.layout index 5732ecc..6cf0a03 100644 --- a/lib/layouts/acmsiggraph-0-92.layout +++ b/lib/layouts/acmsiggraph-0-92.layout @@ -14,7 +14,7 @@ # "TOG data URL", and "TOG code URL". The corresponding # LaTeX commands are no longer supported. -Format 60 +Format 62 Columns1 Sides 1 @@ -294,16 +294,19 @@ InsetLayout "Flex:CRcat" Mandatory 1 LabelString "CR-number" Tooltip "Number of the category" + PassThru1 EndArgument Argument 2 Mandatory 1 LabelString "Subcategory" Tooltip "Subcategory" + PassThru1 EndArgument Argument 3 Mandatory 1 LabelString "Third-level" Tooltip "Third-level of the category" + PassThru1 EndArgument End diff --git a/lib/layouts/acmsiggraph.layout b/lib/layouts/acmsiggraph.layout index aaf5484..132133b 100644 --- a/lib/layouts/acmsiggraph.layout +++ b/lib/layouts/acmsiggraph.layout @@ -11,13 +11,13 @@ # ACM style files can be obtained at # http://www.acm.org/sigs/pubs/proceed/template.html -Format 60 +Format 62 -Columns 1 -Sides 1 +Columns1 +Sides 1 SecNumDepth3 TocDepth 3 -DefaultStyleStandard +DefaultStyle Standard ClassOptions FontSize 9|10|11|12 @@ -33,15 +33,15 @@ EndFont Style Standard - Category MainText - Margin Static - LatexTypeParagraph - LatexNamedummy + Category MainText + Margin Static + LatexTypeParagraph + LatexNamedummy ParIndentMM - ParSkip 0.4 - AlignBlock - AlignPossibleBlock, Left, Right, Center - LabelTypeNo_Label + ParSkip 0.4 + AlignBlock + AlignPossible Block, Left, Right, Center + LabelTypeNo_Label End @@ -259,16 +259,19 @@ InsetLayout "Flex:CRcat" Mandatory 1 LabelString "CR-number" Tooltip "Number of the category" + PassThru1 EndArgument Argument 2 Mandatory 1 LabelString "Subcategory" Tooltip "Subcategory" + PassThru1 EndArgument Argument 3 Mandatory 1 LabelString "Third-level" Tooltip "Third-level of the category" + PassThru1 EndArgument End diff --git a/lib/layouts/agutex.layout b/lib/layouts/agutex.layout index 436b549..f44f705 100644 --- a/lib/layouts/agutex.layout +++ b/lib/layouts/agutex.layout @@ -4,7 +4,7 @@ # AGUTeX textclass definition file. # Author: Uwe Stöhr (uwesto...@web.de) -Format 60 +Format 62 Columns1 Sides 1 @@ -123,6 +123
[LyX/master] Additional.lyx: accept some changes
commit fd3e2ebc37d62c60f6c3124298dd4253fcb3a550 Author: Uwe Stöhr Date: Sat Oct 22 03:04:10 2016 +0200 Additional.lyx: accept some changes --- lib/doc/Additional.lyx | 12 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx index 3c5ff70..9bd84e2 100644 --- a/lib/doc/Additional.lyx +++ b/lib/doc/Additional.lyx @@ -2178,8 +2178,6 @@ perhaps \end_layout \begin_layout Chapter - -\change_inserted 893223064 1464851738 Document classes \end_layout @@ -13031,8 +13029,6 @@ This is a holder for prepared text. \end_layout \begin_layout Chapter - -\change_inserted 893223064 1464851939 Page layout \end_layout @@ -14907,8 +14903,6 @@ go back to the default \end_layout \begin_layout Chapter - -\change_inserted 893223064 1464852301 Text formatting \end_layout @@ -15896,13 +15890,7 @@ target "http://mirrors.ctan.org/macros/latex/contrib/shapepar/shapepar.pdf"; \end_layout \begin_layout Chapter - -\change_inserted 893223064 1464852414 Bibliographic databases -\change_deleted 893223064 1464852406 -Supplemental Tools -\change_unchanged - \end_layout \begin_layout Section
[LyX/master] support for Amharic, Asturian, Kannada and Khmer
commit d9c52c7a3f06ec892cd2e36d0d20998bc99b2fd8
Author: Uwe Stöhr
Date: Sat Oct 22 15:33:59 2016 +0200
support for Amharic, Asturian, Kannada and Khmer
- fileformat change
- I could not update the tex2lyx test files because of bug #10440
- maybe the lyx2lyx routine could be improved but since a document can also
begin with another layout than "Standard" I could not use the lyx2lyx function
put_cmd_in_ert
---
development/FORMAT |7
lib/languages| 33 +
lib/lyx2lyx/lyx_2_3.py | 91 +-
src/tex2lyx/Preamble.cpp | 20 +-
src/version.h|4 +-
5 files changed, 141 insertions(+), 14 deletions(-)
diff --git a/development/FORMAT b/development/FORMAT
index 6f8bb59..86bc183 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -11,6 +11,13 @@ adjustments are made to tex2lyx and bugs are fixed in
lyx2lyx.
---
+2016-10-21 Uwe Stöhr
+ * Format incremented to 514: support for Amharic etc.:
+ \lang amharic
+ \lang asturian
+ \lang kannada
+ \lang khmer
+
2016-10-16 Uwe Stöhr
* Format incremented to 513: support for Piedmontese etc.:
\lang bosnian
diff --git a/lib/languages b/lib/languages
index 08cf331..f126e69 100644
--- a/lib/languages
+++ b/lib/languages
@@ -129,6 +129,14 @@ Language american
LangCode en_US
End
+# not supported by babel
+Language amharic
+ GuiName "Amharic"
+ PolyglossiaName amharic
+ Encoding utf8
+ LangCode am_ET
+End
+
# In Babel, this is supported since v. 1.8a of babel-greek (2013-12-03)
# We introduce it with LyX 2.2 to give the support time to settle.
Language ancientgreek
@@ -180,6 +188,15 @@ Language armenian
LangCode hy_AM
End
+# not supported by babel
+Language asturian
+ GuiName "Asturian"
+ PolyglossiaName asturian
+ QuoteStyle french
+ Encoding iso8859-15
+ LangCode ast_ES
+End
+
Language australian
GuiName "English (Australia)"
BabelNameaustralian
@@ -695,6 +712,14 @@ Language japanese-cjk
RequiresCJK
End
+# not supported by babel
+Language kannada
+ GuiName "Kannada"
+ PolyglossiaName kannada
+ Encoding utf8
+ LangCode kn_IN
+End
+
# not yet supported by polyglossia
# not supported by babel
Language kazakh
@@ -707,6 +732,14 @@ Language kazakh
EndPostBabelPreamble
End
+# not supported by babel
+Language khmer
+ GuiName "Khmer"
+ PolyglossiaName khmer
+ Encoding utf8
+ LangCode km_KH
+End
+
Language korean
GuiName "Korean"
Encodingeuc-kr
diff --git a/lib/lyx2lyx/lyx_2_3.py b/lib/lyx2lyx/lyx_2_3.py
index 93bf0f6..3a1b292 100644
--- a/lib/lyx2lyx/lyx_2_3.py
+++ b/lib/lyx2lyx/lyx_2_3.py
@@ -33,7 +33,8 @@ from parser_tools import find_end_of#, find_token,
find_tokens, \
from parser_tools import find_token, find_end_of_inset, get_value, \
get_bool_value
-#from lyx2lyx_tools import add_to_preamble, put_cmd_in_ert, get_ert,
lyx2latex, \
+from lyx2lyx_tools import add_to_preamble, put_cmd_in_ert
+# get_ert, lyx2latex, \
# lyx2verbatim, length_in_bp, convert_info_insets
# insert_to_preamble, latex_length, revert_flex_inset, \
# revert_font_attrs, hex2ratio, str2bool
@@ -356,6 +357,90 @@ def revert_romansh(document):
document.header.insert(l + 1, "\\options romansh")
+def revert_amharic(document):
+"Set the document language to English but assure Amharic output"
+
+if document.language == "amharic":
+document.language = "english"
+i = find_token(document.header, "\\language amharic", 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 default"
+add_to_preamble(document,
["\\AtBeginDocument{\setotherlanguage{amharic}}"])
+document.body[2 : 2] = ["\\begin_layout Standard",
+"\\begin_inset ERT", "status open", "",
+"\\begin_layout Plain Layout", "", "",
+"\\backslash",
+"resetdefaultlanguage{amharic}",
+"\\end_layout", "", "\\end_inset", "", "",
+"\\end_layout", ""]
+
+
+def
[LyX/master] FORMAT: fix date
commit 17b49329bcbff794ea2898d85fbd5e44f905b1d4 Author: Uwe Stöhr Date: Sun Oct 23 03:41:45 2016 +0200 FORMAT: fix date --- development/FORMAT |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/development/FORMAT b/development/FORMAT index 86bc183..e615671 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -11,7 +11,7 @@ adjustments are made to tex2lyx and bugs are fixed in lyx2lyx. --- -2016-10-21 Uwe Stöhr +2016-10-22 Uwe Stöhr * Format incremented to 514: support for Amharic etc.: \lang amharic \lang asturian
[LyX/2.2.x] Win installer: correct Arabic translation by Hatim
commit 0e4b459b08c820ae32659038b7a39e16b795ae22
Author: Uwe Stöhr
Date: Sun Oct 23 16:27:37 2016 +0200
Win installer: correct Arabic translation by Hatim
---
.../Win32/packaging/installer/ChangeLog.txt|7 +-
.../Win32/packaging/installer/lang/arabic.nsh | 192 ++--
development/Win32/packaging/installer/settings.nsh |2 +-
3 files changed, 106 insertions(+), 95 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 68b8138..eb6bccf 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,9 @@
-Changelog for LyX-222-2:
+Changelog for LyX-222-3:
+- updated Swedish and Ukrainian translation of the installer
+- correct Arabic translation of the installer (was acidentally in Farsi before)
+
+
+Changelog for LyX-222-2:
- updated to Qt 5.6.2-1 (fixes Windows-specific bugs)
- updated to Perl 5.22.2.1
diff --git a/development/Win32/packaging/installer/lang/arabic.nsh
b/development/Win32/packaging/installer/lang/arabic.nsh
index eec2baf..b0bf267 100644
--- a/development/Win32/packaging/installer/lang/arabic.nsh
+++ b/development/Win32/packaging/installer/lang/arabic.nsh
@@ -1,107 +1,113 @@
+/*
+LyX Installer Language File
+Language: Arabic
+Author: Hatim Alahmady
+*/
+
!insertmacro LANGFILE_EXT "Arabic"
-${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)"
+${LangFileString} TEXT_INSTALL_CURRENTUSER "(� ��)"
-${LangFileString} TEXT_WELCOME "�� � � �� ���
��.$\r$\n\
+${LangFileString} TEXT_WELCOME "��� ��� ��� � � $(^NameDA),
$\r$\n\
$\r$\n\
$_CLICK"
-${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename
database..."
-${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($LaTeXInstalled may
download missing packages, this can take some time) ..."
-${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..."
+#${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename
database..."
+${LangFileString} TEXT_CONFIGURE_LYX "��� ��� ($LaTeXInstalled �
, ��� ��� �) ..."
+${LangFileString} TEXT_CONFIGURE_PYTHON " ��� ��..."
-${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut"
-${LangFileString} TEXT_FINISH_WEBSITE "Visit lyx.org for the latest news,
support and tips"
+${LangFileString} TEXT_FINISH_DESKTOP "� �� ��� ��"
+${LangFileString} TEXT_FINISH_WEBSITE "� lyx.org ��� ��� ���,
� "
-${LangFileString} FileTypeTitle "�-���"
+#${LangFileString} FileTypeTitle "LyX-Document"
${LangFileString} SecInstJabRefTitle "JabRef"
-${LangFileString} SecAllUsersTitle "� ��� ���"
-${LangFileString} SecFileAssocTitle "� ��"
-${LangFileString} SecDesktopTitle "��� ��� ��"
-
-${LangFileString} SecCoreDescription "� ���."
-${LangFileString} SecInstJabRefDescription " ��� ��
�� BibTeX."
-${LangFileString} SecAllUsersDescription "� �� ��� ��� �� ��
�� ���."
-${LangFileString} SecFileAssocDescription "��� ��� .lyx
� ��� ���."
-${LangFileString} SecDesktopDescription "��� ��� ��� ��� ��."
-
-${LangFileString} EnterLaTeXHeader1 '��-'
-${LangFileString} EnterLaTeXHeader2 ' ��- ��
���.'
-${LangFileString} EnterLaTeXFolder '� ��� �� �� �
$\"latex.exe$\" \
- ��- ��� ��
���.\r\n\
- ��� ��� �� �� ��� ��� ��
�� � �!\r\n\
+#${LangFileString} SecAllUsersTitle "Install for all users?"
+${LangFileString} SecFileAssocTitle "File associations"
+${LangFileString} SecDesktopTitle "��� ��� ��"
+
+${LangFileString} SecCoreDescription "� ���."
+${LangFileString} SecInstJabRefDescription "� ��� ��� � �
bibtex."
+#${LangFileString} SecAllUsersDescription "� ��� �� �
��."
+${LangFileString} SecFileAssocDescription "��� �� .lyx ���
��� ��� ���."
+${LangFileString} SecDesktopDescription "��� ��� ��� ��� ��."
+${LangFileString} SecDictionariesDescription "�� ��
��� ."
+${LangFileString} SecThesaurusDe
[LyX/master] Win installer: correct Arabic translation by Hatim
commit f6104fa1cac97419ea9939b5b75772e88b309e9e
Author: Uwe Stöhr
Date: Sun Oct 23 16:28:53 2016 +0200
Win installer: correct Arabic translation by Hatim
---
.../Win32/packaging/installer/ChangeLog.txt|7 +-
.../Win32/packaging/installer/lang/arabic.nsh | 192 ++--
development/Win32/packaging/installer/settings.nsh |2 +-
3 files changed, 106 insertions(+), 95 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 68b8138..eb6bccf 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,9 @@
-Changelog for LyX-222-2:
+Changelog for LyX-222-3:
+- updated Swedish and Ukrainian translation of the installer
+- correct Arabic translation of the installer (was acidentally in Farsi before)
+
+
+Changelog for LyX-222-2:
- updated to Qt 5.6.2-1 (fixes Windows-specific bugs)
- updated to Perl 5.22.2.1
diff --git a/development/Win32/packaging/installer/lang/arabic.nsh
b/development/Win32/packaging/installer/lang/arabic.nsh
index eec2baf..b0bf267 100644
--- a/development/Win32/packaging/installer/lang/arabic.nsh
+++ b/development/Win32/packaging/installer/lang/arabic.nsh
@@ -1,107 +1,113 @@
+/*
+LyX Installer Language File
+Language: Arabic
+Author: Hatim Alahmady
+*/
+
!insertmacro LANGFILE_EXT "Arabic"
-${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)"
+${LangFileString} TEXT_INSTALL_CURRENTUSER "(� ��)"
-${LangFileString} TEXT_WELCOME "�� � � �� ���
��.$\r$\n\
+${LangFileString} TEXT_WELCOME "��� ��� ��� � � $(^NameDA),
$\r$\n\
$\r$\n\
$_CLICK"
-${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename
database..."
-${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($LaTeXInstalled may
download missing packages, this can take some time) ..."
-${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..."
+#${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename
database..."
+${LangFileString} TEXT_CONFIGURE_LYX "��� ��� ($LaTeXInstalled �
, ��� ��� �) ..."
+${LangFileString} TEXT_CONFIGURE_PYTHON " ��� ��..."
-${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut"
-${LangFileString} TEXT_FINISH_WEBSITE "Visit lyx.org for the latest news,
support and tips"
+${LangFileString} TEXT_FINISH_DESKTOP "� �� ��� ��"
+${LangFileString} TEXT_FINISH_WEBSITE "� lyx.org ��� ��� ���,
� "
-${LangFileString} FileTypeTitle "�-���"
+#${LangFileString} FileTypeTitle "LyX-Document"
${LangFileString} SecInstJabRefTitle "JabRef"
-${LangFileString} SecAllUsersTitle "� ��� ���"
-${LangFileString} SecFileAssocTitle "� ��"
-${LangFileString} SecDesktopTitle "��� ��� ��"
-
-${LangFileString} SecCoreDescription "� ���."
-${LangFileString} SecInstJabRefDescription " ��� ��
�� BibTeX."
-${LangFileString} SecAllUsersDescription "� �� ��� ��� �� ��
�� ���."
-${LangFileString} SecFileAssocDescription "��� ��� .lyx
� ��� ���."
-${LangFileString} SecDesktopDescription "��� ��� ��� ��� ��."
-
-${LangFileString} EnterLaTeXHeader1 '��-'
-${LangFileString} EnterLaTeXHeader2 ' ��- ��
���.'
-${LangFileString} EnterLaTeXFolder '� ��� �� �� �
$\"latex.exe$\" \
- ��- ��� ��
���.\r\n\
- ��� ��� �� �� ��� ��� ��
�� � �!\r\n\
+#${LangFileString} SecAllUsersTitle "Install for all users?"
+${LangFileString} SecFileAssocTitle "File associations"
+${LangFileString} SecDesktopTitle "��� ��� ��"
+
+${LangFileString} SecCoreDescription "� ���."
+${LangFileString} SecInstJabRefDescription "� ��� ��� � �
bibtex."
+#${LangFileString} SecAllUsersDescription "� ��� �� �
��."
+${LangFileString} SecFileAssocDescription "��� �� .lyx ���
��� ��� ���."
+${LangFileString} SecDesktopDescription "��� ��� ��� ��� ��."
+${LangFileString} SecDictionariesDescription "�� ��
��� ."
+${LangFileString} SecThesaurusDe
[LyX/2.2.x] Win installer: more translations by Hatim
commit c8f7c316f2e4f37c679c8e27ae4fa34b6e17e2e0
Author: Uwe Stöhr
Date: Tue Oct 25 01:22:18 2016 +0200
Win installer: more translations by Hatim
---
.../Win32/packaging/installer/lang/arabic.nsh |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/development/Win32/packaging/installer/lang/arabic.nsh
b/development/Win32/packaging/installer/lang/arabic.nsh
index b0bf267..a0c4388 100644
--- a/development/Win32/packaging/installer/lang/arabic.nsh
+++ b/development/Win32/packaging/installer/lang/arabic.nsh
@@ -12,18 +12,18 @@ ${LangFileString} TEXT_WELCOME "
$\r$\n\
$_CLICK"
-#${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename
database..."
+#${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "� � �� MiKTeX..."
${LangFileString} TEXT_CONFIGURE_LYX "��� ��� ($LaTeXInstalled �
, ��� ��� �) ..."
${LangFileString} TEXT_CONFIGURE_PYTHON " ��� ��..."
${LangFileString} TEXT_FINISH_DESKTOP "� �� ��� ��"
${LangFileString} TEXT_FINISH_WEBSITE "� lyx.org ��� ��� ���,
� "
-#${LangFileString} FileTypeTitle "LyX-Document"
+#${LangFileString} FileTypeTitle "� - ���"
${LangFileString} SecInstJabRefTitle "JabRef"
-#${LangFileString} SecAllUsersTitle "Install for all users?"
-${LangFileString} SecFileAssocTitle "File associations"
+#${LangFileString} SecAllUsersTitle "� ��� ���"
+${LangFileString} SecFileAssocTitle "�� �"
${LangFileString} SecDesktopTitle "��� ��� ��"
${LangFileString} SecCoreDescription "� ���."
[LyX/master] Win installer: more translations by Hatim
commit a9aaec540f5365b276d8b5bda078e69d66d028a8
Author: Uwe Stöhr
Date: Tue Oct 25 01:21:53 2016 +0200
Win installer: more translations by Hatim
---
.../Win32/packaging/installer/lang/arabic.nsh |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/development/Win32/packaging/installer/lang/arabic.nsh
b/development/Win32/packaging/installer/lang/arabic.nsh
index b0bf267..a0c4388 100644
--- a/development/Win32/packaging/installer/lang/arabic.nsh
+++ b/development/Win32/packaging/installer/lang/arabic.nsh
@@ -12,18 +12,18 @@ ${LangFileString} TEXT_WELCOME "
$\r$\n\
$_CLICK"
-#${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename
database..."
+#${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "� � �� MiKTeX..."
${LangFileString} TEXT_CONFIGURE_LYX "��� ��� ($LaTeXInstalled �
, ��� ��� �) ..."
${LangFileString} TEXT_CONFIGURE_PYTHON " ��� ��..."
${LangFileString} TEXT_FINISH_DESKTOP "� �� ��� ��"
${LangFileString} TEXT_FINISH_WEBSITE "� lyx.org ��� ��� ���,
� "
-#${LangFileString} FileTypeTitle "LyX-Document"
+#${LangFileString} FileTypeTitle "� - ���"
${LangFileString} SecInstJabRefTitle "JabRef"
-#${LangFileString} SecAllUsersTitle "Install for all users?"
-${LangFileString} SecFileAssocTitle "File associations"
+#${LangFileString} SecAllUsersTitle "� ��� ���"
+${LangFileString} SecFileAssocTitle "�� �"
${LangFileString} SecDesktopTitle "��� ��� ��"
${LangFileString} SecCoreDescription "� ���."
[LyX/master] Arabic Shortcuts.lyx: new translation by Hatim
commit e01b4459fcd1cfb290626da98d73e4b0a6118c9e Author: Uwe Stöhr Date: Tue Oct 25 23:33:25 2016 +0200 Arabic Shortcuts.lyx: new translation by Hatim --- lib/doc/Makefile.am |4 + lib/doc/ar/Shortcuts.lyx | 3737 ++ 2 files changed, 3741 insertions(+), 0 deletions(-) diff --git a/lib/doc/Makefile.am b/lib/doc/Makefile.am index 2b0d6a0..0cb0e6f 100644 --- a/lib/doc/Makefile.am +++ b/lib/doc/Makefile.am @@ -58,6 +58,10 @@ dist_clipartdoc_DATA = \ clipart/with_fntright.pdf \ clipart/workaround.png +ardocdir = $(docdir)/ar +dist_ardoc_DATA = \ + ar/Shortcuts.lyx + cadocdir = $(docdir)/ca dist_cadoc_DATA = \ ca/Intro.lyx diff --git a/lib/doc/ar/Shortcuts.lyx b/lib/doc/ar/Shortcuts.lyx new file mode 100644 index 000..bd239a4 --- /dev/null +++ b/lib/doc/ar/Shortcuts.lyx @@ -0,0 +1,3737 @@ +#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 /systemlyxdir/doc/ar/ +\textclass article +\use_default_options false +\maintain_unincluded_children false +\language arabic_arabi +\language_package default +\inputencoding auto +\fontencoding global +\font_roman "default" "Scheherazade" +\font_sans "default" "Scheherazade" +\font_typewriter "default" "Scheherazade" +\font_math "auto" "auto" +\font_default_family default +\use_non_tex_fonts true +\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 false +\use_package amsmath 1 +\use_package amssymb 1 +\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 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\quotes_language french +\papercolumns 1 +\papersides 1 +\paperpagestyle empty +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict true +\end_header + +\begin_body + +\begin_layout Title +اختصارات مفاتيح ليك +\end_layout + +\begin_layout Author +بواسطة فريق ليك +\end_layout + +\begin_layout Standard +هذا الملف يسرد الاختصارات الحالية من ملف التوثيق +\family typewriter + +\begin_inset Info +type "lyxrc" +arg "bind_file" +\end_inset + + +\family default +. + تستطيع تعديل الاختصارات من قائمة الادوات +\family sans +\SpecialChar menuseparator +تفضيلات\SpecialChar menuseparator +تحرير\SpecialChar menuseparator +اختصارات كما هو موضح في قسم "اختصارات" من دليل استخدام ليك. +\end_layout + +\begin_layout Subsection* +Buffer +\end_layout + +\begin_layout Standard +\begin_inset Tabular + + + + + + + + + + +\begin_inset Text + +\begin_layout Plain Layout + الفعل +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +الاختصار +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +الفعل +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +الاختصار +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +الفعل +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +الاختصار +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +جديد +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Info +type "shortcut" +arg "buffer-new" +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +View DVI +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Info +type "shortcut" +arg "buffer-view dvi" +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Master View DVI +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Info +type "shortcut" +arg "master-buffer-view dvi" +\end_inset + + +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +فتح +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Info +type "shortcut" +arg "file-open" +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +View PS +\end_layou
[LyX/2.2.x] Arabic Shortcuts.lyx: new translation by Hatim
commit cc214a0e16dfd92ef013a2bdf0a5b06eb3783052 Author: Uwe Stöhr Date: Tue Oct 25 23:35:14 2016 +0200 Arabic Shortcuts.lyx: new translation by Hatim --- lib/doc/Makefile.am |4 + lib/doc/ar/Shortcuts.lyx | 3737 ++ status.22x |1 + 3 files changed, 3742 insertions(+), 0 deletions(-) diff --git a/lib/doc/Makefile.am b/lib/doc/Makefile.am index 8f534a2..e6bcda5 100644 --- a/lib/doc/Makefile.am +++ b/lib/doc/Makefile.am @@ -57,6 +57,10 @@ dist_clipartdoc_DATA = \ clipart/without_fntright.pdf \ clipart/with_fntright.pdf +ardocdir = $(docdir)/ar +dist_ardoc_DATA = \ + ar/Shortcuts.lyx + cadocdir = $(docdir)/ca dist_cadoc_DATA = \ ca/Intro.lyx diff --git a/lib/doc/ar/Shortcuts.lyx b/lib/doc/ar/Shortcuts.lyx new file mode 100644 index 000..bd239a4 --- /dev/null +++ b/lib/doc/ar/Shortcuts.lyx @@ -0,0 +1,3737 @@ +#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 /systemlyxdir/doc/ar/ +\textclass article +\use_default_options false +\maintain_unincluded_children false +\language arabic_arabi +\language_package default +\inputencoding auto +\fontencoding global +\font_roman "default" "Scheherazade" +\font_sans "default" "Scheherazade" +\font_typewriter "default" "Scheherazade" +\font_math "auto" "auto" +\font_default_family default +\use_non_tex_fonts true +\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 false +\use_package amsmath 1 +\use_package amssymb 1 +\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 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\quotes_language french +\papercolumns 1 +\papersides 1 +\paperpagestyle empty +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict true +\end_header + +\begin_body + +\begin_layout Title +اختصارات مفاتيح ليك +\end_layout + +\begin_layout Author +بواسطة فريق ليك +\end_layout + +\begin_layout Standard +هذا الملف يسرد الاختصارات الحالية من ملف التوثيق +\family typewriter + +\begin_inset Info +type "lyxrc" +arg "bind_file" +\end_inset + + +\family default +. + تستطيع تعديل الاختصارات من قائمة الادوات +\family sans +\SpecialChar menuseparator +تفضيلات\SpecialChar menuseparator +تحرير\SpecialChar menuseparator +اختصارات كما هو موضح في قسم "اختصارات" من دليل استخدام ليك. +\end_layout + +\begin_layout Subsection* +Buffer +\end_layout + +\begin_layout Standard +\begin_inset Tabular + + + + + + + + + + +\begin_inset Text + +\begin_layout Plain Layout + الفعل +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +الاختصار +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +الفعل +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +الاختصار +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +الفعل +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +الاختصار +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +جديد +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Info +type "shortcut" +arg "buffer-new" +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +View DVI +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Info +type "shortcut" +arg "buffer-view dvi" +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Master View DVI +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Info +type "shortcut" +arg "master-buffer-view dvi" +\end_inset + + +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +فتح +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Info +type "shortcut" +arg "file-open" +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text +
[LyX/master] add support for Urdu and Syriac
commit 87c00f33837460e10a8bfec093eb681d2fa4d3f8
Author: Uwe Stöhr
Date: Fri Oct 28 00:21:58 2016 +0200
add support for Urdu and Syriac
- fileformat change
- I could not update the tex2lyx testfiles because of bug #10440 (there is
now a probable fix)
---
development/FORMAT |5 +
lib/languages| 28 ++--
lib/lyx2lyx/lyx_2_3.py | 46 +-
src/tex2lyx/Preamble.cpp | 12 ++--
src/version.h|4 ++--
5 files changed, 72 insertions(+), 23 deletions(-)
diff --git a/development/FORMAT b/development/FORMAT
index e615671..d098516 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -11,6 +11,11 @@ adjustments are made to tex2lyx and bugs are fixed in
lyx2lyx.
---
+2016-10-28 Uwe Stöhr
+ * Format incremented to 515: support for Urdu and Syriac:
+ \lang urdu
+ \lang syriac
+
2016-10-22 Uwe Stöhr
* Format incremented to 514: support for Amharic etc.:
\lang amharic
diff --git a/lib/languages b/lib/languages
index f126e69..fa9019e 100644
--- a/lib/languages
+++ b/lib/languages
@@ -1064,13 +1064,13 @@ Language swedish
End
# not supported by babel
-#Language syriac
-# GuiName "Syriac"
-# PolyglossiaName syriac
-# Encoding utf8
-# RTL true
-# LangCode syr_SY
-#End
+Language syriac
+ GuiName "Syriac"
+ PolyglossiaName syriac
+ Encoding utf8
+ RTL true
+ LangCode syr_SY
+End
# not supported by babel
Language tamil
@@ -1155,13 +1155,13 @@ Language uppersorbian
End
# not supported by babel
-#Language urdu
-# GuiName "Urdu"
-# PolyglossiaName urdu
-# Encoding utf8
-# RTL true
-# LangCode ur_PK
-#End
+Language urdu
+ GuiName "Urdu"
+ PolyglossiaName urdu
+ Encoding utf8
+ RTL true
+ LangCode ur_PK
+End
# vietnam must be loaded locally with babel options,
# not globally via class options, see
diff --git a/lib/lyx2lyx/lyx_2_3.py b/lib/lyx2lyx/lyx_2_3.py
index 3a1b292..65b5188 100644
--- a/lib/lyx2lyx/lyx_2_3.py
+++ b/lib/lyx2lyx/lyx_2_3.py
@@ -441,6 +441,48 @@ def revert_khmer(document):
"\\end_layout", ""]
+def revert_urdu(document):
+"Set the document language to English but assure Urdu output"
+
+if document.language == "urdu":
+document.language = "english"
+i = find_token(document.header, "\\language urdu", 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 default"
+add_to_preamble(document,
["\\AtBeginDocument{\setotherlanguage{urdu}}"])
+document.body[2 : 2] = ["\\begin_layout Standard",
+"\\begin_inset ERT", "status open", "",
+"\\begin_layout Plain Layout", "", "",
+"\\backslash",
+"resetdefaultlanguage{urdu}",
+"\\end_layout", "", "\\end_inset", "", "",
+"\\end_layout", ""]
+
+
+def revert_syriac(document):
+"Set the document language to English but assure Syriac output"
+
+if document.language == "syriac":
+document.language = "english"
+i = find_token(document.header, "\\language syriac", 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 default"
+add_to_preamble(document,
["\\AtBeginDocument{\setotherlanguage{syriac}}"])
+document.body[2 : 2] = ["\\begin_layout Standard",
+"\\begin_inset ERT", "status open", "",
+"\\begin_layout Plain Layout", "", "",
+"\\backslash",
+"resetdefaultlanguage{syriac}",
+"\\end_layout", "", "\\end_inset", "", "",
+"\\end_layout", "
[LyX/master] tex2lyx test files: update them
commit 41a58339208be2b1a26b844dd9993a860eee6cff Author: Uwe Stöhr Date: Fri Oct 28 00:45:33 2016 +0200 tex2lyx test files: update them - update the test files after the last 3 fileformat changes - this is now possible thanks to the patch for bug #10440 --- src/tex2lyx/test/CJK.lyx.lyx |2 +- src/tex2lyx/test/CJKutf8.lyx.lyx |2 +- src/tex2lyx/test/DummyDocument.lyx.lyx |2 +- src/tex2lyx/test/Dummy~Document.lyx.lyx|2 +- src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx |2 +- src/tex2lyx/test/algo2e.lyx.lyx|2 +- .../test/box-color-size-space-align.lyx.lyx|2 +- src/tex2lyx/test/test-insets-basic.lyx.lyx |2 +- src/tex2lyx/test/test-insets.lyx.lyx |2 +- src/tex2lyx/test/test-memoir.lyx.lyx |2 +- src/tex2lyx/test/test-modules.lyx.lyx |2 +- src/tex2lyx/test/test-refstyle-theorems.lyx.lyx|2 +- src/tex2lyx/test/test-scr.lyx.lyx |2 +- src/tex2lyx/test/test-structure.lyx.lyx|2 +- src/tex2lyx/test/test.lyx.lyx |2 +- src/tex2lyx/test/verbatim.lyx.lyx |2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx index ad84ed1..b0ec0d8 100644 --- a/src/tex2lyx/test/CJK.lyx.lyx +++ b/src/tex2lyx/test/CJK.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.3 -\lyxformat 512 +\lyxformat 515 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx index 8e94ecd..ad8d5b8 100644 --- a/src/tex2lyx/test/CJKutf8.lyx.lyx +++ b/src/tex2lyx/test/CJKutf8.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.3 -\lyxformat 512 +\lyxformat 515 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/DummyDocument.lyx.lyx b/src/tex2lyx/test/DummyDocument.lyx.lyx index 6ac6d5b..72181df 100644 --- a/src/tex2lyx/test/DummyDocument.lyx.lyx +++ b/src/tex2lyx/test/DummyDocument.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.3 -\lyxformat 512 +\lyxformat 515 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/Dummy~Document.lyx.lyx b/src/tex2lyx/test/Dummy~Document.lyx.lyx index 520ce75..34a3fcb 100644 --- a/src/tex2lyx/test/Dummy~Document.lyx.lyx +++ b/src/tex2lyx/test/Dummy~Document.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.3 -\lyxformat 512 +\lyxformat 515 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx index 8d23401..d4fab85 100644 --- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx +++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.3 -\lyxformat 512 +\lyxformat 515 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx index 8f04e07..f8cce47 100644 --- a/src/tex2lyx/test/algo2e.lyx.lyx +++ b/src/tex2lyx/test/algo2e.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.3 -\lyxformat 512 +\lyxformat 515 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx index 30b5523..0ab6e58 100644 --- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx +++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.3 -\lyxformat 512 +\lyxformat 515 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/test-insets-basic.lyx.lyx b/src/tex2lyx/test/test-insets-basic.lyx.lyx index 47acffa..89b81ff 100644 --- a/src/tex2lyx/test/test-insets-basic.lyx.lyx +++ b/src/tex2lyx/test/test-insets-basic.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.3 -\lyxformat 512 +\lyxformat 515 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx index 8424bdb..afe286b 100644 --- a/src/tex2lyx/test/test-insets.lyx.lyx +++ b/src/tex2lyx/test/test-insets.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.3 -\lyxformat 512 +\lyxformat 515 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/test-memoir.lyx.lyx b/src/tex2lyx/test/test-memoir.lyx.lyx index ca6abe9..8f834c5 100644 --- a/src/tex2lyx/test/test-memoir.lyx.lyx +++ b/src/tex2lyx/test/test-memoir.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.3 -\lyxformat 512 +\lyxformat 515 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/test-modules.lyx.lyx b/src/tex2lyx/test/test
[LyX/master] Development.lyx: update info how to update the tex2lyx test files
commit 42d900c2a7e154ceab6956ba1e18fb12e47b8f83 Author: Uwe Stöhr Date: Fri Oct 28 00:46:59 2016 +0200 Development.lyx: update info how to update the tex2lyx test files --- lib/doc/Development.lyx | 17 + 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/doc/Development.lyx b/lib/doc/Development.lyx index 82b2c5a..cef5d46 100644 --- a/lib/doc/Development.lyx +++ b/lib/doc/Development.lyx @@ -2029,15 +2029,24 @@ src/tex2lyx/test \begin_layout Itemize In the appearing MSVC program assure that you build the \emph on -release +Release \emph default - version and then right-click on the project + version, then right-click on the project \family sans updatetex2lyxtests \family default - in the project explorer and chose + in the project explorer and choose then \family sans -Build +Project +\begin_inset space ~ +\end_inset + +Only\SpecialChar menuseparator +Rebuild +\begin_inset space ~ +\end_inset + +only \family default . \end_layout
[LyX/2.2.x] EmbeddedObjects.lyx; remove unnecessary latexpar
commit 350708102b229e75f59938956182ab427929e51e
Author: Uwe Stöhr
Date: Mon Oct 31 11:46:42 2016 +0100
EmbeddedObjects.lyx; remove unnecessary latexpar
- this was the last issue to fix bug #10068
---
lib/doc/EmbeddedObjects.lyx | 98 ---
1 files changed, 0 insertions(+), 98 deletions(-)
diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 42aaf11..2becbfe 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -646,10 +646,6 @@ reference "sec:Image-Formats"
\end_inset
within a separate, horizontally centered paragraph:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -667,10 +663,6 @@ reference "sec:Image-Formats"
\begin_layout Standard
This is the same image like the one above but in draft mode:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -1705,10 +1697,6 @@ The default table has lines around any cell and the
first row appears separated
have a line below them and the cells of the second row have a line above
them.
Here is an example table:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -3315,10 +3303,6 @@ reference "subsec:Multi-page-Table-Captions"
\begin_layout Standard
You can also specify a row where the table is split.
See the following multi-page table to see how it works:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -7705,10 +7689,6 @@ reference "tab:DiffCaptions"
is an example of a multi-page table with different heading where the second
caption does not include the table number.
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -9880,10 +9860,6 @@ must be inserted as \SpecialChar TeX
Code at the beginning of the cell.
This ensures that the part of the cell that will be displayed on the new
page appears with the full width.
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -11688,10 +11664,6 @@ Multicolumns have their own cell settings.
the multicolumn.
Here is an example table with a multicolumn cell in the first row and one
in the last row without the upper border:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -12465,10 +12437,6 @@ Multirow
\begin_layout Standard
Here is an example table with a multirow in the first column:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -12647,10 +12615,6 @@ mm and is in a 3
\end_inset
cm wide column:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -12828,10 +12792,6 @@ arg "newline-insert newline"
\end_inset
) but this will not respect the cell lines as demonstrated in this table:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -13240,10 +13200,6 @@ Crystal Clear Pro
\begin_layout Standard
The 3-argument scheme is for example useful for cross-tables of sports leagues
or distances:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -13463,10 +13419,6 @@ Falcons
\begin_layout Standard
For larger cross-tables one might use split cells in 2 or every corner of
the table like in this example:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -13954,10 +13906,6 @@ is used.
The necessary width of split cells is automatically calculated.
Thus if you set a fixed column width smaller than the calculated one, the
cell's content will protrude the cell borders:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -14179,10 +14127,6 @@ diagtest]{A}{B}
\begin_layout Standard
in the first cell:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -14280,10 +14224,6 @@ Perfect Green
Note that the split cell needs to be the widest one in the column.
Otherwise the length of the diagonal line cannot be calculated correctly
like in this table:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -14395,10 +14335,6 @@ tabcolsep because the cell width is now the width of
the column.
\end_inset
cm is used:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -14548,10 +14484,6 @@ Ctrl+Return
\end_inset
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -33150,10 +33082,6 @@ Inner
Box
\family default
, you can align the box content horizontally in the box dialog.
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -34169,10 +34097,6 @@ Boxes ! Parboxes
\begin_layout Standard
Parboxes are very similar t
[LyX/master] EmbeddedObjects.lyx; remove unnecessary latexpar
commit 88f78803b5ea6d28751f883cac6d93e87e542cc4
Author: Uwe Stöhr
Date: Mon Oct 31 11:49:57 2016 +0100
EmbeddedObjects.lyx; remove unnecessary latexpar
- this was the last issue to fix bug #10068
---
lib/doc/EmbeddedObjects.lyx | 100 +--
1 files changed, 1 insertions(+), 99 deletions(-)
diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 23ece6c..078a9de 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -1,5 +1,5 @@
#LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 512
+\lyxformat 515
\begin_document
\begin_header
\save_transient_properties true
@@ -649,10 +649,6 @@ reference "sec:Image-Formats"
\end_inset
within a separate, horizontally centered paragraph:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -670,10 +666,6 @@ reference "sec:Image-Formats"
\begin_layout Standard
This is the same image like the one above but in draft mode:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -1708,10 +1700,6 @@ The default table has lines around any cell and the
first row appears separated
have a line below them and the cells of the second row have a line above
them.
Here is an example table:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -3318,10 +3306,6 @@ reference "subsec:Multi-page-Table-Captions"
\begin_layout Standard
You can also specify a row where the table is split.
See the following multi-page table to see how it works:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -7708,10 +7692,6 @@ reference "tab:DiffCaptions"
is an example of a multi-page table with different heading where the second
caption does not include the table number.
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -9883,10 +9863,6 @@ must be inserted as \SpecialChar TeX
Code at the beginning of the cell.
This ensures that the part of the cell that will be displayed on the new
page appears with the full width.
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -11691,10 +11667,6 @@ Multicolumns have their own cell settings.
the multicolumn.
Here is an example table with a multicolumn cell in the first row and one
in the last row without the upper border:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -12468,10 +12440,6 @@ Multirow
\begin_layout Standard
Here is an example table with a multirow in the first column:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -12650,10 +12618,6 @@ mm and is in a 3
\end_inset
cm wide column:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -12831,10 +12795,6 @@ arg "newline-insert newline"
\end_inset
) but this will not respect the cell lines as demonstrated in this table:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -13243,10 +13203,6 @@ Crystal Clear Pro
\begin_layout Standard
The 3-argument scheme is for example useful for cross-tables of sports leagues
or distances:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -13466,10 +13422,6 @@ Falcons
\begin_layout Standard
For larger cross-tables one might use split cells in 2 or every corner of
the table like in this example:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -13957,10 +13909,6 @@ is used.
The necessary width of split cells is automatically calculated.
Thus if you set a fixed column width smaller than the calculated one, the
cell's content will protrude the cell borders:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -14182,10 +14130,6 @@ diagtest]{A}{B}
\begin_layout Standard
in the first cell:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -14283,10 +14227,6 @@ Perfect Green
Note that the split cell needs to be the widest one in the column.
Otherwise the length of the diagonal line cannot be calculated correctly
like in this table:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -14398,10 +14338,6 @@ tabcolsep because the cell width is now the width of
the column.
\end_inset
cm is used:
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -14551,10 +14487,6 @@ Ctrl+Return
\end_inset
-\begin_inset Separator latexpar
-\end_inset
-
-
\end_layout
\begin_layout Standard
@@ -33153,10 +33085,6 @@ Inner
Box
\family default
, you can align the box content horizontally in the box dialog.
-\begi
[LyX/2.2.x] Arabic Intro.lyx: new translation from Hatim
commit a0395c3de0f6228799a190e47bf9dc8ba85498fe
Author: Uwe Stöhr
Date: Mon Oct 31 12:19:21 2016 +0100
Arabic Intro.lyx: new translation from Hatim
---
lib/doc/Makefile.am |1 +
lib/doc/ar/Intro.lyx | 1882 ++
2 files changed, 1883 insertions(+), 0 deletions(-)
diff --git a/lib/doc/Makefile.am b/lib/doc/Makefile.am
index e6bcda5..a30fff2 100644
--- a/lib/doc/Makefile.am
+++ b/lib/doc/Makefile.am
@@ -59,6 +59,7 @@ dist_clipartdoc_DATA = \
ardocdir = $(docdir)/ar
dist_ardoc_DATA = \
+ ar/Intro.lyx \
ar/Shortcuts.lyx
cadocdir = $(docdir)/ca
diff --git a/lib/doc/ar/Intro.lyx b/lib/doc/ar/Intro.lyx
new file mode 100644
index 000..a40d9d0
--- /dev/null
+++ b/lib/doc/ar/Intro.lyx
@@ -0,0 +1,1882 @@
+#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 /systemlyxdir/doc/ar/
+\textclass article
+\begin_preamble
+% DO NOT ALTER THIS PREAMBLE!!!
+%
+%This preamble is designed to ensure that the document prints
+% out as advertised. If you mess with this preamble,
+% parts of the document may not print out as expected. If you
+% have problems LaTeXing this file, please contact
+% the documentation team
+% email: lyx-d...@lists.lyx.org
+
+% the pages of the TOC is numbered roman
+% and a pdf-bookmark for the TOC is added
+\pagenumbering{roman}
+\let\myTOC\tableofcontents
+\renewcommand\tableofcontents{%
+ \pdfbookmark[1]{\contentsname}{}
+ \myTOC
+ \cleardoublepage
+ \pagenumbering{arabic} }
+\end_preamble
+\use_default_options false
+\maintain_unincluded_children false
+\language arabic_arabi
+\language_package default
+\inputencoding auto
+\fontencoding global
+\font_roman "palatino" "Scheherazade"
+\font_sans "helvet" "Scheherazade"
+\font_typewriter "courier" "Scheherazade"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts true
+\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 12
+\spacing single
+\use_hyperref true
+\pdf_title "Introduction to LyX"
+\pdf_author "LyX Team"
+\pdf_subject "LyX-documentation Intro"
+\pdf_keywords "LyX, documentation"
+\pdf_bookmarks true
+\pdf_bookmarksnumbered true
+\pdf_bookmarksopen true
+\pdf_bookmarksopenlevel 2
+\pdf_breaklinks false
+\pdf_pdfborder false
+\pdf_colorlinks true
+\pdf_backref false
+\pdf_pdfusetitle false
+\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue,
filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ,
plainpages=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 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 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\quotes_language french
+\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
+مدخل إلى ليك LYX
+\end_layout
+
+\begin_layout Author
+بواسطة فريق ليك
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+إذا كان لديك تعليقات أو تصويبات على هذه الوثائق، يرجى إرسالها إلى القائمة
+ البريدية لوثائق ليك:
+\begin_inset CommandInset href
+LatexCommand href
+target "lyx-d...@lists.lyx.org"
+type "mailto:";
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset CommandInset toc
+LatexCommand tableofcontents
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Section
+فلسفة ليك LYX
+\end_layout
+
+\begin_layout Subsection
+ما هو ليك
+\end_layout
+
+\begin_layout Standard
+ليك هو نظام لإعداد الوثائق.
+ ويبرع في السماح لك بإنشاء مقالات تقنية وعلمية معقدة مع الرياضيات، والإشارات
+ المرجعية وثبت المراجع، والفهارس، وما إلى ذلك، انه جيد جدا للعمل مع الوثائق
+ من أي طول والتي تتطلب قدرات المعالجة المعتادة مثل: التقسيم التلقائي وترقيم
+ الصفحات، ووالتدقيق الاملائي ..
+ الخ.
+ ويمكن أيضا أن يستخدم في كتابة الرسائل إلى أمك، وعلى الرغم من مميزاته، هناك
+ برامج ربما أبسط منه متاحة لذلك.
+ أنه بالتأكيد ليس أفضل وسيلة لإنشاء اللافتات، والنشرات، أو الإعلانات (سنوضح
+ لماذا في وقت لاحق)، ولكن مع بعض الجهد كل ذلك يمكن القيام به أيضا.
+ وفيما يلي بعض الامثلة ع
[LyX/2.2.x] Arabic Shortcuts.lyx: increase font size
commit ee9550b0bb6192eea7504792658026e716a8779a Author: Uwe Stöhr Date: Mon Oct 31 12:23:50 2016 +0100 Arabic Shortcuts.lyx: increase font size --- lib/doc/ar/Shortcuts.lyx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/doc/ar/Shortcuts.lyx b/lib/doc/ar/Shortcuts.lyx index bd239a4..bacb0f7 100644 --- a/lib/doc/ar/Shortcuts.lyx +++ b/lib/doc/ar/Shortcuts.lyx @@ -26,7 +26,7 @@ \output_sync 0 \bibtex_command default \index_command default -\paperfontsize default +\paperfontsize 12 \spacing single \use_hyperref false \papersize default
[LyX/master] Arabic doc files: port recent changes
commit da323c1910b300d5b68883d0b44a2dc33dbdd5b3
Author: Uwe Stöhr
Date: Mon Oct 31 12:24:19 2016 +0100
Arabic doc files: port recent changes
---
lib/doc/Makefile.am |3 +-
lib/doc/ar/Intro.lyx | 1882 ++
lib/doc/ar/Shortcuts.lyx |2 +-
3 files changed, 1885 insertions(+), 2 deletions(-)
diff --git a/lib/doc/Makefile.am b/lib/doc/Makefile.am
index 0cb0e6f..6621a70 100644
--- a/lib/doc/Makefile.am
+++ b/lib/doc/Makefile.am
@@ -60,8 +60,9 @@ dist_clipartdoc_DATA = \
ardocdir = $(docdir)/ar
dist_ardoc_DATA = \
+ ar/Intro.lyx \
ar/Shortcuts.lyx
-
+
cadocdir = $(docdir)/ca
dist_cadoc_DATA = \
ca/Intro.lyx
diff --git a/lib/doc/ar/Intro.lyx b/lib/doc/ar/Intro.lyx
new file mode 100644
index 000..a40d9d0
--- /dev/null
+++ b/lib/doc/ar/Intro.lyx
@@ -0,0 +1,1882 @@
+#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 /systemlyxdir/doc/ar/
+\textclass article
+\begin_preamble
+% DO NOT ALTER THIS PREAMBLE!!!
+%
+%This preamble is designed to ensure that the document prints
+% out as advertised. If you mess with this preamble,
+% parts of the document may not print out as expected. If you
+% have problems LaTeXing this file, please contact
+% the documentation team
+% email: lyx-d...@lists.lyx.org
+
+% the pages of the TOC is numbered roman
+% and a pdf-bookmark for the TOC is added
+\pagenumbering{roman}
+\let\myTOC\tableofcontents
+\renewcommand\tableofcontents{%
+ \pdfbookmark[1]{\contentsname}{}
+ \myTOC
+ \cleardoublepage
+ \pagenumbering{arabic} }
+\end_preamble
+\use_default_options false
+\maintain_unincluded_children false
+\language arabic_arabi
+\language_package default
+\inputencoding auto
+\fontencoding global
+\font_roman "palatino" "Scheherazade"
+\font_sans "helvet" "Scheherazade"
+\font_typewriter "courier" "Scheherazade"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts true
+\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 12
+\spacing single
+\use_hyperref true
+\pdf_title "Introduction to LyX"
+\pdf_author "LyX Team"
+\pdf_subject "LyX-documentation Intro"
+\pdf_keywords "LyX, documentation"
+\pdf_bookmarks true
+\pdf_bookmarksnumbered true
+\pdf_bookmarksopen true
+\pdf_bookmarksopenlevel 2
+\pdf_breaklinks false
+\pdf_pdfborder false
+\pdf_colorlinks true
+\pdf_backref false
+\pdf_pdfusetitle false
+\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue,
filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ,
plainpages=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 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 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\quotes_language french
+\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
+مدخل إلى ليك LYX
+\end_layout
+
+\begin_layout Author
+بواسطة فريق ليك
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+إذا كان لديك تعليقات أو تصويبات على هذه الوثائق، يرجى إرسالها إلى القائمة
+ البريدية لوثائق ليك:
+\begin_inset CommandInset href
+LatexCommand href
+target "lyx-d...@lists.lyx.org"
+type "mailto:";
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset CommandInset toc
+LatexCommand tableofcontents
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Section
+فلسفة ليك LYX
+\end_layout
+
+\begin_layout Subsection
+ما هو ليك
+\end_layout
+
+\begin_layout Standard
+ليك هو نظام لإعداد الوثائق.
+ ويبرع في السماح لك بإنشاء مقالات تقنية وعلمية معقدة مع الرياضيات، والإشارات
+ المرجعية وثبت المراجع، والفهارس، وما إلى ذلك، انه جيد جدا للعمل مع الوثائق
+ من أي طول والتي تتطلب قدرات المعالجة المعتادة مثل: التقسيم التلقائي وترقيم
+ الصفحات، ووالتدقيق الاملائي ..
+ الخ.
+ ويمكن أيضا أن يستخدم في كتابة الرسائل إلى أمك، وعلى الرغم من مميزاته، هناك
+ برامج ربما أبسط منه متاحة لذلك.
+ أنه بالتأكيد ليس أفضل وسيلة لإنشاء اللافتات، والنشرات، أو الإعلانات (سنوضح
+ لماذ
[LyX/2.2.x] Arabic Intro.lyx: fixes from Hatim
commit 34918465dd85c9ee892ec8eb431021737e05b668 Author: Uwe Stöhr Date: Tue Nov 1 15:08:40 2016 +0100 Arabic Intro.lyx: fixes from Hatim --- lib/doc/ar/Intro.lyx | 36 ++-- 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/doc/ar/Intro.lyx b/lib/doc/ar/Intro.lyx index a40d9d0..4c6b1e3 100644 --- a/lib/doc/ar/Intro.lyx +++ b/lib/doc/ar/Intro.lyx @@ -230,9 +230,9 @@ LatexCommand tableofcontents وتختار "مقدمة". نعم، هذا كل شيء. وإذا قمت بقص ولصق القسم، سيتم تلقائيا ترقيمه في المكان الذي وضع فيه. - وإذا قمت بإدخال مراجع لهذا القسم بشكل صحيح (عن طريق إدراج علامات الاسناد - المرجعي)، ليك سيحدث كل ما في الملف تلقائيا ولهذا ليس عليك، أبدا كتابة رقم - القسم. + وإذا قمت بإدخال مراجع لهذا القسم بشكل صحيح (عن طريق إدراج علامات الاشارة + المرجعية)، ليك سيحدث كل ما في الملف تلقائيا ولهذا ليس عليك، أبدا كتابة + رقم القسم. \end_layout \begin_layout Standard @@ -463,7 +463,7 @@ status collapsed ومفهوم WYSIWYM. ومع ذلك، لقد أصبحت في الآونة الأخيرة فقط قادرة على القيام بذلك، في حين تم بناء ليك على نظام إعداد الوثائق لتيك. - الذي يعمل على هذه المقهوم منذ عام 1985. + الذي يعمل على هذه المفهوم منذ عام 1985. \end_layout \begin_layout Subsection @@ -527,7 +527,7 @@ status collapsed العديد من الجامعات تملك تنسيق خاص لأطروحاتهم العلمية. أما الأسلوب فيختلف عن النوع لأنه لا يعرف نوع جديد من الوثائق، ولكن نوع مختلف من السلوك الذي يمكن أن يستخدم في أي وثيقة. - على سبيل المثال، ليكس يتحكم في هوامش الصفحة وتباعد الأسطر باستخدام نوعين + على سبيل المثال، ليك يتحكم في هوامش الصفحة وتباعد الأسطر باستخدام نوعين مختلفين من اساليب المصممة للملفات المخصصة لذلك. هناك اسلوب ملفات شامل لمجموعة كاملة من الأشياء: ملصقات الطباعة أو المظاريف، وتغيير المسافة البادئة، إضافة خطوط جديدة، التلاعب بالصور، تصميم عناوين @@ -659,9 +659,9 @@ type "mailto:"; \end_layout \begin_layout Standard -في الكتيبات المطبوعة، تظهر كافة الاسنادات الترافقية كأرقام مثل ارقام الفصل، +في الكتيبات المطبوعة، تظهر كافة الاشارات المرجعية كأرقام مثل ارقام الفصل، القسم، القسم الفرعي، الخ. - بينما في ملف ليك، تظهر الاسنادات الترافقية كصناديق مظللة بالرمادي كما يلي: + بينما في ملف ليك، تظهر الاشارات المرجعية كصناديق مظللة بالرمادي كما يلي: \begin_inset Graphics filename ../clipart/reference.png @@ -670,7 +670,7 @@ type "mailto:"; \end_inset .إذا نقرت على مثل هذا الصندوق بزر الفارة الأيسر، سوف يظهر مربع حوار يحتوي - على قائمة بكافة الإسنادات الترافقية في الوثيقة. + على قائمة بكافة الإشارات المرجعية في الوثيقة. يمكنك الذهاب إلى القسم المشار إليه بواسطة النقر بزر الماوس الأيمن على المربع أو عن طريق النقر على زر \family sans @@ -1628,7 +1628,7 @@ mu \begin_layout Description التخصيص وصف للمميزات المتقدمة في ليك، بما في ذلك كيفية تخصيص السلوك العام - لليكس. + لليك. وهذا يشمل أشياء مثل مفاتيح الوظائف، ملفات الضبط واللغات العالمية. وتتضمن أيضا معلومات حول ملفات النسق، ويتم الاحتياج إليها لإعطاء ليك القدرة على دعم أنواع مستندات لتيك وحزمه. @@ -1675,7 +1675,7 @@ mu \end_layout \begin_layout Standard -خلاف ذلك، ليس عليك أن تشعر بالقلق أوالاحباط. +خلاف ذلك، ليس عليك أن تشعر بالقلق أو الاحباط. \end_layout \begin_layout Section @@ -1694,7 +1694,7 @@ name "sec:مساهمة" \end_layout \begin_layout Standard -معظم ليك مكتوب بلغة C++ (لتيك مستورد بلغة بايثون). +معظم ليك مكتوب بلغة C++ (لتيك مستوردة بلغة بايثون). إنه مشروع كبير, وكنتيجة طبيعية لن يكون خاليا من العيوب, أو الحاجة لتحسين اكواده المصدريه. \end_layout @@ -1704,9 +1704,9 @@ name "sec:مساهمة" \end_layout \begin_layout Standard -أثناء استخدام ليكس وكما في البرامج الأخرى، قد تواجه علة ما. +أثناء استخدام ليك وكما في البرامج الأخرى، قد تواجه علة ما. أو انهيار، وإن كان نادر الحدوث. - وتعتبر مشاكل واجهة المستخدم هي الخلل الرئيسي الذي يهتم به فريق ليكس: إن + وتعتبر مشاكل واجهة المستخدم هي الخلل الرئيسي الذي يهتم به فريق ليك: إن المساعدة الحقيقية لنا تكون بالاشارة إلى عناصر واجهة المستخدم التي تجدون أنها مربكة وغير واضحة. \end_layout @@ -1753,8 +1753,8 @@ http://www.lyx.org/ \begin_layout Standard تقرير العلة المفيد سوف يحتوي كحد أدنى على إصدار ليك المستخدم. ويفضل وصفا تفصيليا يسمح للمطورين بمعرفة موقع الكود المسبب للخلل بأسرع وقت، - فاستهلاك الوقت في البحث عن المشكلة يجعل لديهم وقت أقل من أجل إدخال تحسينات - جديدة للبرنامج. + فاستهلاك الوقت في البحث عن سبب المشكلة يجعل لديهم وقت أقل من أجل إدخال + تحسينات جديدة للبرنامج. كما يجب ذكر النظام المستخدم وإصداره. وتزويدهم بإصدار المكتبات التي قمت بتثبيتها على نظامك، وإذا كان ذلك ممكنا، إصدارات البرامج الخارجية التي يستخدمها ليك. @@ -1779,7 +1779,7 @@ http://www.lyx.org/ \begin_layout Standard وثائق ليك شاملة. لكن ليك تحت التطوير المستمر، وفي كل إصدار جديد تضاف ميزات جديدة. - فقد تجد بعض الوثائق بحاجة إلى تحسين. + لذا قد تجد بعض الوثائق بحاجة إلى تحسين. يصف هذا القسم ماذا تفعل إذا وجدت خطأ، أو لديك بعض الاقتراحات لتحسين الوثائق. \end_layout @@ -1788,7 +1788,7 @@ http://www.lyx.org/ \end_layout \begin_layout Standard -إذا وجدت مشكلة في التوثيق, ارسل رسالة للقائمة البريدية +إذا وجدت
[LyX/master] Arabic Intro.lyx: fixes from Hatim
commit 9dc67281db2457ddbe3f99b4563a939cc197f7d7 Author: Uwe Stöhr Date: Tue Nov 1 15:11:26 2016 +0100 Arabic Intro.lyx: fixes from Hatim --- lib/doc/ar/Intro.lyx | 36 ++-- 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/doc/ar/Intro.lyx b/lib/doc/ar/Intro.lyx index a40d9d0..4c6b1e3 100644 --- a/lib/doc/ar/Intro.lyx +++ b/lib/doc/ar/Intro.lyx @@ -230,9 +230,9 @@ LatexCommand tableofcontents وتختار "مقدمة". نعم، هذا كل شيء. وإذا قمت بقص ولصق القسم، سيتم تلقائيا ترقيمه في المكان الذي وضع فيه. - وإذا قمت بإدخال مراجع لهذا القسم بشكل صحيح (عن طريق إدراج علامات الاسناد - المرجعي)، ليك سيحدث كل ما في الملف تلقائيا ولهذا ليس عليك، أبدا كتابة رقم - القسم. + وإذا قمت بإدخال مراجع لهذا القسم بشكل صحيح (عن طريق إدراج علامات الاشارة + المرجعية)، ليك سيحدث كل ما في الملف تلقائيا ولهذا ليس عليك، أبدا كتابة + رقم القسم. \end_layout \begin_layout Standard @@ -463,7 +463,7 @@ status collapsed ومفهوم WYSIWYM. ومع ذلك، لقد أصبحت في الآونة الأخيرة فقط قادرة على القيام بذلك، في حين تم بناء ليك على نظام إعداد الوثائق لتيك. - الذي يعمل على هذه المقهوم منذ عام 1985. + الذي يعمل على هذه المفهوم منذ عام 1985. \end_layout \begin_layout Subsection @@ -527,7 +527,7 @@ status collapsed العديد من الجامعات تملك تنسيق خاص لأطروحاتهم العلمية. أما الأسلوب فيختلف عن النوع لأنه لا يعرف نوع جديد من الوثائق، ولكن نوع مختلف من السلوك الذي يمكن أن يستخدم في أي وثيقة. - على سبيل المثال، ليكس يتحكم في هوامش الصفحة وتباعد الأسطر باستخدام نوعين + على سبيل المثال، ليك يتحكم في هوامش الصفحة وتباعد الأسطر باستخدام نوعين مختلفين من اساليب المصممة للملفات المخصصة لذلك. هناك اسلوب ملفات شامل لمجموعة كاملة من الأشياء: ملصقات الطباعة أو المظاريف، وتغيير المسافة البادئة، إضافة خطوط جديدة، التلاعب بالصور، تصميم عناوين @@ -659,9 +659,9 @@ type "mailto:"; \end_layout \begin_layout Standard -في الكتيبات المطبوعة، تظهر كافة الاسنادات الترافقية كأرقام مثل ارقام الفصل، +في الكتيبات المطبوعة، تظهر كافة الاشارات المرجعية كأرقام مثل ارقام الفصل، القسم، القسم الفرعي، الخ. - بينما في ملف ليك، تظهر الاسنادات الترافقية كصناديق مظللة بالرمادي كما يلي: + بينما في ملف ليك، تظهر الاشارات المرجعية كصناديق مظللة بالرمادي كما يلي: \begin_inset Graphics filename ../clipart/reference.png @@ -670,7 +670,7 @@ type "mailto:"; \end_inset .إذا نقرت على مثل هذا الصندوق بزر الفارة الأيسر، سوف يظهر مربع حوار يحتوي - على قائمة بكافة الإسنادات الترافقية في الوثيقة. + على قائمة بكافة الإشارات المرجعية في الوثيقة. يمكنك الذهاب إلى القسم المشار إليه بواسطة النقر بزر الماوس الأيمن على المربع أو عن طريق النقر على زر \family sans @@ -1628,7 +1628,7 @@ mu \begin_layout Description التخصيص وصف للمميزات المتقدمة في ليك، بما في ذلك كيفية تخصيص السلوك العام - لليكس. + لليك. وهذا يشمل أشياء مثل مفاتيح الوظائف، ملفات الضبط واللغات العالمية. وتتضمن أيضا معلومات حول ملفات النسق، ويتم الاحتياج إليها لإعطاء ليك القدرة على دعم أنواع مستندات لتيك وحزمه. @@ -1675,7 +1675,7 @@ mu \end_layout \begin_layout Standard -خلاف ذلك، ليس عليك أن تشعر بالقلق أوالاحباط. +خلاف ذلك، ليس عليك أن تشعر بالقلق أو الاحباط. \end_layout \begin_layout Section @@ -1694,7 +1694,7 @@ name "sec:مساهمة" \end_layout \begin_layout Standard -معظم ليك مكتوب بلغة C++ (لتيك مستورد بلغة بايثون). +معظم ليك مكتوب بلغة C++ (لتيك مستوردة بلغة بايثون). إنه مشروع كبير, وكنتيجة طبيعية لن يكون خاليا من العيوب, أو الحاجة لتحسين اكواده المصدريه. \end_layout @@ -1704,9 +1704,9 @@ name "sec:مساهمة" \end_layout \begin_layout Standard -أثناء استخدام ليكس وكما في البرامج الأخرى، قد تواجه علة ما. +أثناء استخدام ليك وكما في البرامج الأخرى، قد تواجه علة ما. أو انهيار، وإن كان نادر الحدوث. - وتعتبر مشاكل واجهة المستخدم هي الخلل الرئيسي الذي يهتم به فريق ليكس: إن + وتعتبر مشاكل واجهة المستخدم هي الخلل الرئيسي الذي يهتم به فريق ليك: إن المساعدة الحقيقية لنا تكون بالاشارة إلى عناصر واجهة المستخدم التي تجدون أنها مربكة وغير واضحة. \end_layout @@ -1753,8 +1753,8 @@ http://www.lyx.org/ \begin_layout Standard تقرير العلة المفيد سوف يحتوي كحد أدنى على إصدار ليك المستخدم. ويفضل وصفا تفصيليا يسمح للمطورين بمعرفة موقع الكود المسبب للخلل بأسرع وقت، - فاستهلاك الوقت في البحث عن المشكلة يجعل لديهم وقت أقل من أجل إدخال تحسينات - جديدة للبرنامج. + فاستهلاك الوقت في البحث عن سبب المشكلة يجعل لديهم وقت أقل من أجل إدخال + تحسينات جديدة للبرنامج. كما يجب ذكر النظام المستخدم وإصداره. وتزويدهم بإصدار المكتبات التي قمت بتثبيتها على نظامك، وإذا كان ذلك ممكنا، إصدارات البرامج الخارجية التي يستخدمها ليك. @@ -1779,7 +1779,7 @@ http://www.lyx.org/ \begin_layout Standard وثائق ليك شاملة. لكن ليك تحت التطوير المستمر، وفي كل إصدار جديد تضاف ميزات جديدة. - فقد تجد بعض الوثائق بحاجة إلى تحسين. + لذا قد تجد بعض الوثائق بحاجة إلى تحسين. يصف هذا القسم ماذا تفعل إذا وجدت خطأ، أو لديك بعض الاقتراحات لتحسين الوثائق. \end_layout @@ -1788,7 +1788,7 @@ http://www.lyx.org/ \end_layout \begin_layout Standard -إذا وجدت مشكلة في التوثيق, ارسل رسالة للقائمة البريدية +إذا وجدت
[LyX/master] languages: use correct encoding for Lithuanian
commit 0af72e23fd80d537b13281cb9d78d8891d27f249 Author: Uwe Stöhr Date: Tue Nov 1 16:08:33 2016 +0100 languages: use correct encoding for Lithuanian fixes bug #10474 --- lib/languages |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/languages b/lib/languages index fa9019e..a1d9558 100644 --- a/lib/languages +++ b/lib/languages @@ -795,7 +795,7 @@ Language lithuanian BabelNamelithuanian PolyglossiaName lithuanian QuoteStyle german - Encoding iso8859-13 + Encoding iso8859-4 FontEncoding L7x LangCode lt_LT AsBabelOptions true
[LyX/2.2.x] Win installer: install special XeTeX package
commit ce6d8100c721c3a39426589638a9cbf27760eac9 Author: Uwe Stöhr Date: Tue Nov 1 16:54:08 2016 +0100 Win installer: install special XeTeX package --- .../Win32/packaging/installer/ChangeLog.txt|2 ++ development/Win32/packaging/installer/Packages.txt |1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index eb6bccf..b1d75fb 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,6 +1,8 @@ Changelog for LyX-222-3: - updated Swedish and Ukrainian translation of the installer - correct Arabic translation of the installer (was acidentally in Farsi before) +- automatically install LaTeX package necessary for XeTeX in combintions with + document languages like e.g. Georgian Changelog for LyX-222-2: diff --git a/development/Win32/packaging/installer/Packages.txt b/development/Win32/packaging/installer/Packages.txt index a3c8db7..85657cf 100644 --- a/development/Win32/packaging/installer/Packages.txt +++ b/development/Win32/packaging/installer/Packages.txt @@ -120,6 +120,7 @@ tcolorbox thailatex trimspaces turkmen +ucharcat ulem undertilde unicode-math
[LyX/master] Win installer: install special XeTeX package
commit 621cf7548ecc83c207d5b324503ae69585241ddf Author: Uwe Stöhr Date: Tue Nov 1 16:57:43 2016 +0100 Win installer: install special XeTeX package --- .../Win32/packaging/installer/ChangeLog.txt|2 ++ development/Win32/packaging/installer/Packages.txt |1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index eb6bccf..b1d75fb 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,6 +1,8 @@ Changelog for LyX-222-3: - updated Swedish and Ukrainian translation of the installer - correct Arabic translation of the installer (was acidentally in Farsi before) +- automatically install LaTeX package necessary for XeTeX in combintions with + document languages like e.g. Georgian Changelog for LyX-222-2: diff --git a/development/Win32/packaging/installer/Packages.txt b/development/Win32/packaging/installer/Packages.txt index a3c8db7..85657cf 100644 --- a/development/Win32/packaging/installer/Packages.txt +++ b/development/Win32/packaging/installer/Packages.txt @@ -120,6 +120,7 @@ tcolorbox thailatex trimspaces turkmen +ucharcat ulem undertilde unicode-math
[LyX/2.2.x] UserGuide.lyx: accept changes
commit 6e0b27bc20bfa1554ce8985cb6be422e7a24b41a
Author: Uwe Stöhr
Date: Sat Nov 5 18:42:14 2016 +0100
UserGuide.lyx: accept changes
- update link to a Wiki page
---
lib/doc/EmbeddedObjects.lyx|2 +-
lib/doc/Math.lyx |2 +-
lib/doc/UserGuide.lyx | 27 +---
lib/doc/de/EmbeddedObjects.lyx |4 +--
lib/doc/de/Math.lyx|2 +-
lib/doc/de/UserGuide.lyx | 12
lib/doc/es/EmbeddedObjects.lyx |4 +--
lib/doc/es/Math.lyx|2 +-
lib/doc/es/UserGuide.lyx | 16 ++
lib/doc/fr/EmbeddedObjects.lyx |4 +--
lib/doc/fr/Math.lyx|2 +-
lib/doc/fr/Tutorial.lyx| 13 +++-
lib/doc/fr/UserGuide.lyx | 64 +++
lib/doc/ja/EmbeddedObjects.lyx |2 +-
lib/doc/ja/Math.lyx|2 +-
lib/doc/ja/UserGuide.lyx |6 +++-
16 files changed, 57 insertions(+), 107 deletions(-)
diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 2becbfe..b099aca 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -331,7 +331,7 @@ The latest PDF-version of this document can be found here:
\series bold
-http://wiki.lyx.org/LyX/DocumentationDevelopment#EmbeddedObjects
+http://wiki.lyx.org/LyX/Manuals#EmbeddedObjects
\end_layout
\end_inset
diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx
index 9b09d01..dbb03f1 100644
--- a/lib/doc/Math.lyx
+++ b/lib/doc/Math.lyx
@@ -311,7 +311,7 @@ The latest PDF-version of this document can be found here:
\series bold
-http://wiki.lyx.org/LyX/DocumentationDevelopment#Math
+http://wiki.lyx.org/LyX/Manuals#Math
\end_layout
\end_inset
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index ce52895..1397923 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -134,12 +134,11 @@ enumitem
\papercolumns 1
\papersides 2
\paperpagestyle default
-\tracking_changes true
+\tracking_changes false
\output_changes false
\html_math_output 0
\html_css_as_file 0
\html_be_strict true
-\author 2047637253 "Guillaume Munch"
\end_header
\begin_body
@@ -8311,14 +8310,12 @@ Verbatim
\end_layout
\begin_layout Verbatim
-
This is Verbatim.
\end_layout
\begin_layout Verbatim
\noindent
\align block
-
The following 2 lines are empty:
\end_layout
@@ -8331,7 +8328,6 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
-
Almost everything is allowed in Verbatim:"%&$§#~'`
\backslash
}][{|
@@ -8355,7 +8351,6 @@ Verbatim
\end_layout
\begin_layout Verbatim*
-
This is Verbatim*.
\end_layout
@@ -42749,13 +42744,7 @@ reference "sec:Branches"
\end_layout
\begin_layout Section
-
-\change_deleted 2047637253 1472399758
-Output
-\change_inserted 2047637253 1472400015
Formats
-\change_unchanged
-
\begin_inset CommandInset label
LatexCommand label
name "sec:Doc-Formats"
@@ -42948,28 +42937,16 @@ Save transient properties
\family default
controls whether document settings that are frequently switched or that
are specific to the user are saved with the document.
- The properties that are affected by option are currently
-\change_inserted 2047637253 1472400492
-:
-\change_unchanged
-
+ The properties that are affected by option are currently:
\end_layout
\begin_deeper
\begin_layout Itemize
the activation of change tracking
-\change_inserted 2047637253 1472400062
-,
-\change_unchanged
-
\end_layout
\begin_layout Itemize
the output of tracked changes
-\change_inserted 2047637253 1472400062
-,
-\change_unchanged
-
\end_layout
\begin_layout Itemize
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 36e4370..3b4e175 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -354,7 +354,7 @@ Wenn es Ihnen trotzdem nicht gelingen sollte, können Sie
die neueste PDF-Versio
\series bold
http://wiki.lyx.org/\SpecialChar LyX
-/DocumentationDevelopment#EmbeddedObjects
+/Manuals#EmbeddedObjects
\end_layout
\end_inset
@@ -37968,8 +37968,6 @@ white
{
\backslash
usepackage{color}}{}
-\series default
-
\end_layout
\begin_deeper
diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx
index fa11989..1ef8627 100644
--- a/lib/doc/de/Math.lyx
+++ b/lib/doc/de/Math.lyx
@@ -324,7 +324,7 @@ Die neueste PDF-Version dieses Dokuments ist hier zu finden:
\series bold
-http://wiki.lyx.org/LyX/DocumentationDevelopment#Math
+http://wiki.lyx.org/LyX/Manuals#Math
\end_layout
\end_inset
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 5120bbd..37db3f9 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -16372,7 +16372,7 @@ reference "sec:Dateiformate"
\begin_inset CommandInset ref
LatexCommand ref
-reference "sec:Dokument-Ausgabe"
+reference "sec:Dokument-Formate"
\end_inset
@@ -36551,7 +36551,7 @@ A
[LyX/2.2.x] UserGuide.lyx: describe a feature
commit 547fec979c272722b66462d6c46713b5614f7018
Author: Uwe Stöhr
Date: Sat Nov 5 19:01:08 2016 +0100
UserGuide.lyx: describe a feature
fixes bug #3880
---
lib/doc/Changelog-UserGuide-LyX_22x.txt | 10 +++---
lib/doc/UserGuide.lyx |5 +
lib/doc/de/UserGuide.lyx| 10 ++
lib/doc/es/UserGuide.lyx|7 +++
lib/doc/fr/UserGuide.lyx|7 +++
lib/doc/ja/UserGuide.lyx|7 +++
6 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/lib/doc/Changelog-UserGuide-LyX_22x.txt
b/lib/doc/Changelog-UserGuide-LyX_22x.txt
index 6f1453d..0b8fe63 100644
--- a/lib/doc/Changelog-UserGuide-LyX_22x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_22x.txt
@@ -1,8 +1,12 @@
-For LyX 2.2.1:
+For LyX 2.2.3:
+
+- sec. 2.5.1: new sentence
+- sec. B.20: section was renamed (Japanese only)
+
+
+For LyX 2.2.1:
-- sec. 3.3.7.1: (Japanese only) correct a menu name
- sec. 6.11: new sentence
-- sec. B.20: new item
For LyX 2.2.0:
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 1397923..dacf177 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -1932,6 +1932,11 @@ Shift-Tab
2.4.1.
\end_layout
+\begin_layout Standard
+By right-clicking on a section in the outliner you can select the whole
+ section to copy, cut or delete it.
+\end_layout
+
\begin_layout Subsection
Horizontal Scrolling
\begin_inset Index idx
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 37db3f9..0e7abb2 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -1981,6 +1981,12 @@ Die letzten vier Knöpfe erleichtern das Verschieben von
Textteilen, sofern
\end_layout
\begin_layout Standard
+Klickt man mit rechts auf einen Abschnitt in der Gliederung, kann man den
+ kompletten Abschnitt markieren, um ihn zu kopieren, auszuschneiden oder
+ zu löschen.
+\end_layout
+
+\begin_layout Standard
Die Gliederung erhalten Sie auch, wenn Sie am Anfang des Dokuments ein
Inhalts-,
Tabellen- oder Abbildungsverzeichnis angelegt haben und darauf klicken.
\end_layout
@@ -8579,10 +8585,12 @@ Unformatiert
\end_layout
\begin_layout Verbatim
+
Dies ist Unformatiert.
\end_layout
\begin_layout Verbatim
+
Die folgenden 2 Zeilen sind leer:
\end_layout
@@ -8595,6 +8603,7 @@ Die folgenden 2 Zeilen sind leer:
\end_layout
\begin_layout Verbatim
+
Fast alles ist in Unformatiert erlaubt:"%&$§#~'`
\backslash
}][{|
@@ -8618,6 +8627,7 @@ Unformatiert
\end_layout
\begin_layout Verbatim*
+
Dies ist Unformatiert*.
\end_layout
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 0288a07..64a4857 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -1814,6 +1814,13 @@ Mayúsculas+Tab
2.4.1.
\end_layout
+\begin_layout Standard
+
+\lang english
+By right-clicking on a section in the outliner you can select the whole
+ section to copy, cut or delete it.
+\end_layout
+
\begin_layout Subsection
Deslizamiento horizontal
\begin_inset Index idx
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 8b0cae4..565be24 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -2190,6 +2190,13 @@ Maj-Tab
2.4.1.
\end_layout
+\begin_layout Standard
+
+\lang english
+By right-clicking on a section in the outliner you can select the whole
+ section to copy, cut or delete it.
+\end_layout
+
\begin_layout Subsection
Défilement horizontal
\begin_inset Index idx
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 668dbca..01f0bdd 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -1519,6 +1519,13 @@ Shift+Tab
)は，節の階層を変更するものです．つまり，例えば第2.5節を，第3節にしたり第2.4.1節にしたりすることができます．
\end_layout
+\begin_layout Standard
+
+\lang english
+By right-clicking on a section in the outliner you can select the whole
+ section to copy, cut or delete it.
+\end_layout
+
\begin_layout Subsection
水平スクロール
\begin_inset Index idx
[LyX/2.2.x] Changelog-UserGuide-LyX_22x.txt: a correction
commit 2a9bcb007731118fe86d51e9361d6786543d5556 Author: Uwe Stöhr Date: Sat Nov 5 19:03:14 2016 +0100 Changelog-UserGuide-LyX_22x.txt: a correction --- lib/doc/Changelog-UserGuide-LyX_22x.txt |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/doc/Changelog-UserGuide-LyX_22x.txt b/lib/doc/Changelog-UserGuide-LyX_22x.txt index 0b8fe63..e739790 100644 --- a/lib/doc/Changelog-UserGuide-LyX_22x.txt +++ b/lib/doc/Changelog-UserGuide-LyX_22x.txt @@ -1,12 +1,13 @@ For LyX 2.2.3: - sec. 2.5.1: new sentence -- sec. B.20: section was renamed (Japanese only) +- sec. B.20: section was renamed For LyX 2.2.1: - sec. 6.11: new sentence +- sec. B.20: new item For LyX 2.2.0:
[LyX/master] doc files port recent changes
commit 108d6763cf4298dde41a29556d351342910e0caf
Author: Uwe Stöhr
Date: Sat Nov 5 19:03:56 2016 +0100
doc files port recent changes
---
lib/doc/Changelog-UserGuide-LyX_22x.txt |9 +++-
lib/doc/EmbeddedObjects.lyx |2 +-
lib/doc/Math.lyx|2 +-
lib/doc/UserGuide.lyx | 32 +-
lib/doc/de/EmbeddedObjects.lyx |4 +-
lib/doc/de/Math.lyx |2 +-
lib/doc/de/UserGuide.lyx| 22 +++---
lib/doc/es/EmbeddedObjects.lyx |4 +-
lib/doc/es/Math.lyx |2 +-
lib/doc/es/UserGuide.lyx| 23 +++---
lib/doc/fr/EmbeddedObjects.lyx |4 +-
lib/doc/fr/Math.lyx |2 +-
lib/doc/fr/Tutorial.lyx | 13 +-
lib/doc/fr/UserGuide.lyx| 75 +--
lib/doc/ja/EmbeddedObjects.lyx |6 +--
lib/doc/ja/Math.lyx |2 +-
lib/doc/ja/UserGuide.lyx| 13 +-
17 files changed, 107 insertions(+), 110 deletions(-)
diff --git a/lib/doc/Changelog-UserGuide-LyX_22x.txt
b/lib/doc/Changelog-UserGuide-LyX_22x.txt
index ca0286c..e739790 100644
--- a/lib/doc/Changelog-UserGuide-LyX_22x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_22x.txt
@@ -1,6 +1,13 @@
-For LyX 2.2.1:
+For LyX 2.2.3:
+
+- sec. 2.5.1: new sentence
+- sec. B.20: section was renamed
+
+
+For LyX 2.2.1:
- sec. 6.11: new sentence
+- sec. B.20: new item
For LyX 2.2.0:
diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 078a9de..dec3ba3 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -334,7 +334,7 @@ The latest PDF-version of this document can be found here:
\series bold
-http://wiki.lyx.org/LyX/DocumentationDevelopment#EmbeddedObjects
+http://wiki.lyx.org/LyX/Manuals#EmbeddedObjects
\end_layout
\end_inset
diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx
index 9b09d01..dbb03f1 100644
--- a/lib/doc/Math.lyx
+++ b/lib/doc/Math.lyx
@@ -311,7 +311,7 @@ The latest PDF-version of this document can be found here:
\series bold
-http://wiki.lyx.org/LyX/DocumentationDevelopment#Math
+http://wiki.lyx.org/LyX/Manuals#Math
\end_layout
\end_inset
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 43a9316..066fe3a 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -1,5 +1,5 @@
#LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 512
+\lyxformat 515
\begin_document
\begin_header
\save_transient_properties true
@@ -142,7 +142,6 @@ enumitem
\html_be_strict true
\author 274215730 "scott"
\author 424524441 "rgheck"
-\author 2047637253 "Guillaume Munch"
\end_header
\begin_body
@@ -1936,6 +1935,11 @@ Shift-Tab
2.4.1.
\end_layout
+\begin_layout Standard
+By right-clicking on a section in the outliner you can select the whole
+ section to copy, cut or delete it.
+\end_layout
+
\begin_layout Subsection
Horizontal Scrolling
\begin_inset Index idx
@@ -8314,12 +8318,14 @@ Verbatim
\end_layout
\begin_layout Verbatim
+
This is Verbatim.
\end_layout
\begin_layout Verbatim
\noindent
\align block
+
The following 2 lines are empty:
\end_layout
@@ -8332,6 +8338,7 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
+
Almost everything is allowed in Verbatim:"%&$§#~'`
\backslash
}][{|
@@ -8355,6 +8362,7 @@ Verbatim
\end_layout
\begin_layout Verbatim*
+
This is Verbatim*.
\end_layout
@@ -42812,13 +42820,7 @@ reference "sec:Branches"
\end_layout
\begin_layout Section
-
-\change_deleted 2047637253 1472399758
-Output
-\change_inserted 2047637253 1472400015
Formats
-\change_unchanged
-
\begin_inset CommandInset label
LatexCommand label
name "sec:Doc-Formats"
@@ -43011,28 +43013,16 @@ Save transient properties
\family default
controls whether document settings that are frequently switched or that
are specific to the user are saved with the document.
- The properties that are affected by option are currently
-\change_inserted 2047637253 1472400492
-:
-\change_unchanged
-
+ The properties that are affected by option are currently:
\end_layout
\begin_deeper
\begin_layout Itemize
the activation of change tracking
-\change_inserted 2047637253 1472400062
-,
-\change_unchanged
-
\end_layout
\begin_layout Itemize
the output of tracked changes
-\change_inserted 2047637253 1472400062
-,
-\change_unchanged
-
\end_layout
\begin_layout Itemize
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 36e4370..3b4e175 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -354,7 +354,7 @@ Wenn es Ihnen trotzdem nicht gelingen sollte, können Sie
die neueste PDF-Versio
\series bold
http://wiki.lyx.org/\SpecialChar LyX
-/DocumentationDevelopment#Embe
[LyX/master] Japanese EmbeddedObjects.lyx: re-add code
commit f5fd6998473b690ea19ba138f5b8212bb5c91a2e
Author: Uwe Stöhr
Date: Sat Nov 5 19:12:40 2016 +0100
Japanese EmbeddedObjects.lyx: re-add code
please use 2.2.x as working branch for all doc files unless you describe
new features in master!
---
lib/doc/ja/EmbeddedObjects.lyx |6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index cc8f7ee..0bc939c 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -134,6 +134,10 @@
{% \usepackage{sidecap} % This breaks title fonts with pLaTeX
\setboolean{sidecap}{true}}
{\setboolean{sidecap}{false}}
+% set sidecap to false in all cases for Japanese manual.
+% It breaks compliation and gives the following error:
+% ! LaTeX Error: Environment SCfigure undefined.
+\setboolean{sidecap}{false}
% check for picinpar
% used for surrounded fixed objects
@@ -213,7 +217,7 @@ End
\font_sf_scale 100 100
\font_tt_scale 100 100
\graphics default
-\default_output_format pdf3
+\default_output_format default
\output_sync 0
\bibtex_command default
\index_command default
[LyX/master] French Tutorial.lyx remove info accidentally introduced in recent commits
commit 02a1c06f321960ebd317f85dad11d12b3a5460c4 Author: Uwe Stöhr Date: Sat Nov 5 19:13:32 2016 +0100 French Tutorial.lyx remove info accidentally introduced in recent commits --- lib/doc/fr/Tutorial.lyx | 15 --- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/lib/doc/fr/Tutorial.lyx b/lib/doc/fr/Tutorial.lyx index 98c85de..2462119 100644 --- a/lib/doc/fr/Tutorial.lyx +++ b/lib/doc/fr/Tutorial.lyx @@ -200,21 +200,6 @@ Mise à jour section 5.4, JPC 28/01/16 Mise à jour générale pour 2.2, JPC 25/07/16 - Normalisation typo de l'insertion des notes de bas de page, corrections typographiques mineures et quelques ajouts traduits -\begin_inset Newline newline -\end_inset - - -\end_layout - -\begin_layout Plain Layout -Vous pouvez trouver la dernière version au format PDF de ce manuel ici : -\begin_inset Newline newline -\end_inset - - -\family typewriter -\series bold -http://wiki.lyx.org/LyX/Manuals#Tutorial \end_layout \end_inset
[LyX/master] Japanese EmbeddedObjects.lyx: re-add export format
commit 96518792533849cb412cf55582f92c43695627b0 Author: Uwe Stöhr Date: Sat Nov 5 19:19:19 2016 +0100 Japanese EmbeddedObjects.lyx: re-add export format - I don't know if it is a bug that LyX automatically deletes the output format if it cannot find --- lib/doc/ja/EmbeddedObjects.lyx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx index 0bc939c..4b6a7d3 100644 --- a/lib/doc/ja/EmbeddedObjects.lyx +++ b/lib/doc/ja/EmbeddedObjects.lyx @@ -217,7 +217,7 @@ End \font_sf_scale 100 100 \font_tt_scale 100 100 \graphics default -\default_output_format default +\default_output_format pdf3 \output_sync 0 \bibtex_command default \index_command default
[LyX/2.2.x] doc files: backport recent changes in master
commit 319117855589c506728b2069cbc2ac562487052a
Author: Uwe Stöhr
Date: Sat Nov 5 19:20:51 2016 +0100
doc files: backport recent changes in master
---
lib/doc/fr/Tutorial.lyx| 15 ---
lib/doc/ja/EmbeddedObjects.lyx |4
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/lib/doc/fr/Tutorial.lyx b/lib/doc/fr/Tutorial.lyx
index 98c85de..2462119 100644
--- a/lib/doc/fr/Tutorial.lyx
+++ b/lib/doc/fr/Tutorial.lyx
@@ -200,21 +200,6 @@ Mise à jour section 5.4, JPC 28/01/16
Mise à jour générale pour 2.2, JPC 25/07/16 - Normalisation typo de l'insertion
des notes de bas de page, corrections typographiques mineures et quelques
ajouts traduits
-\begin_inset Newline newline
-\end_inset
-
-
-\end_layout
-
-\begin_layout Plain Layout
-Vous pouvez trouver la dernière version au format PDF de ce manuel ici :
-\begin_inset Newline newline
-\end_inset
-
-
-\family typewriter
-\series bold
-http://wiki.lyx.org/LyX/Manuals#Tutorial
\end_layout
\end_inset
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index cc8f7ee..4b6a7d3 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -134,6 +134,10 @@
{% \usepackage{sidecap} % This breaks title fonts with pLaTeX
\setboolean{sidecap}{true}}
{\setboolean{sidecap}{false}}
+% set sidecap to false in all cases for Japanese manual.
+% It breaks compliation and gives the following error:
+% ! LaTeX Error: Environment SCfigure undefined.
+\setboolean{sidecap}{false}
% check for picinpar
% used for surrounded fixed objects
[LyX/2.2.x] poster-xxx.lyx: minor changes to keep uniformity of the document style
commit 2479b0d58a30ec1a47e82b02f21b0be2ad09236f Author: Uwe Stöhr Date: Mon Nov 7 23:35:57 2016 +0100 poster-xxx.lyx: minor changes to keep uniformity of the document style --- lib/templates/poster-a0poster-colored.lyx |3 +-- lib/templates/poster-sciposter.lyx|6 ++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/templates/poster-a0poster-colored.lyx b/lib/templates/poster-a0poster-colored.lyx index 81bafa1..bd12efb 100644 --- a/lib/templates/poster-a0poster-colored.lyx +++ b/lib/templates/poster-a0poster-colored.lyx @@ -155,8 +155,7 @@ myboxcolor is defined in \family sans Document\SpecialChar menuseparator -Settings \SpecialChar ldots - \SpecialChar menuseparator +Settings\SpecialChar menuseparator \SpecialChar LaTeX Preamble \family default diff --git a/lib/templates/poster-sciposter.lyx b/lib/templates/poster-sciposter.lyx index f0a2dd9..7a919be 100644 --- a/lib/templates/poster-sciposter.lyx +++ b/lib/templates/poster-sciposter.lyx @@ -149,8 +149,7 @@ Appearance See \family sans Document\SpecialChar menuseparator -Settings\SpecialChar ldots -\SpecialChar menuseparator +Settings\SpecialChar menuseparator \SpecialChar LaTeX Preamble \family default @@ -158,8 +157,7 @@ Settings\SpecialChar ldots Also check \family sans Document\SpecialChar menuseparator -Settings\SpecialChar ldots -\SpecialChar menuseparator +Settings\SpecialChar menuseparator Document Class\SpecialChar menuseparator Class Options \family default
[LyX/2.2.x] FeynmanDiagrams.lyx: fix compilation
commit fdfcb947c7a0dc354abc05beac3fe7af1058df96
Author: Uwe Stöhr
Date: Mon Nov 7 23:45:44 2016 +0100
FeynmanDiagrams.lyx: fix compilation
recent KOMA script versions don't accept \rm anymore
---
lib/examples/FeynmanDiagrams.lyx|8
lib/examples/de/FeynmanDiagrams.lyx |8
lib/examples/fr/FeynmanDiagrams.lyx |8
lib/examples/ja/FeynmanDiagrams.lyx |8
status.22x |1 +
5 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/lib/examples/FeynmanDiagrams.lyx b/lib/examples/FeynmanDiagrams.lyx
index 2f04454..ad0279b 100644
--- a/lib/examples/FeynmanDiagrams.lyx
+++ b/lib/examples/FeynmanDiagrams.lyx
@@ -671,7 +671,7 @@ particle-momentum specification
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\backslash{\rm momentum}\{fA\}\{\vec{p\}}$
+\begin_inset Formula $\backslash\mathrm{momentum}\{fA\}\{\vec{p\}}$
\end_inset
@@ -733,7 +733,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\backslash{\rm vertexlabel}^{e^{+}}fA$
+\begin_inset Formula $\backslash\mathrm{vertexlabel}^{e^{+}}fA$
\end_inset
@@ -747,7 +747,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $fglS\backslash{\rm vertexlabel}_{\gamma}$
+\begin_inset Formula $fglS\backslash\mathrm{vertexlabel}_{\gamma}$
\end_inset
@@ -769,7 +769,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\Diagram{\vertexlabel^{{\rm e^{+}}}fA\\
+\begin_inset Formula $\Diagram{\vertexlabel^{\mathrm{e^{+}}}fA\\
fglS\vertexlabel_{\gamma}
}
$
diff --git a/lib/examples/de/FeynmanDiagrams.lyx
b/lib/examples/de/FeynmanDiagrams.lyx
index be9fb65..29eda4b 100644
--- a/lib/examples/de/FeynmanDiagrams.lyx
+++ b/lib/examples/de/FeynmanDiagrams.lyx
@@ -676,7 +676,7 @@ Teilchenimpuls-Angabe
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\backslash{\rm momentum}\{fA\}\{\vec{p\}}$
+\begin_inset Formula $\backslash\mathrm{momentum}\{fA\}\{\vec{p\}}$
\end_inset
@@ -738,7 +738,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\backslash{\rm vertexlabel}^{e^{+}}fA$
+\begin_inset Formula $\backslash\mathrm{vertexlabel}^{e^{+}}fA$
\end_inset
@@ -752,7 +752,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $fglS\backslash{\rm vertexlabel}_{\gamma}$
+\begin_inset Formula $fglS\backslash\mathrm{vertexlabel}_{\gamma}$
\end_inset
@@ -774,7 +774,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\Diagram{\vertexlabel^{{\rm e^{+}}}fA\\
+\begin_inset Formula $\Diagram{\vertexlabel^{\mathrm{e^{+}}}fA\\
fglS\vertexlabel_{\gamma}
}
$
diff --git a/lib/examples/fr/FeynmanDiagrams.lyx
b/lib/examples/fr/FeynmanDiagrams.lyx
index d5e85d7..7268f0a 100644
--- a/lib/examples/fr/FeynmanDiagrams.lyx
+++ b/lib/examples/fr/FeynmanDiagrams.lyx
@@ -683,7 +683,7 @@ spécification des moments particulaires
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\backslash{\rm momentum}\{fA\}\{\vec{p\}}$
+\begin_inset Formula $\backslash\mathrm{momentum}\{fA\}\{\vec{p\}}$
\end_inset
@@ -745,7 +745,7 @@ Une étiquette de sommet
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\backslash{\rm vertexlabel}^{e^{+}}fA$
+\begin_inset Formula $\backslash\mathrm{vertexlabel}^{e^{+}}fA$
\end_inset
@@ -759,7 +759,7 @@ Une étiquette de sommet
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $fglS\backslash{\rm vertexlabel}_{\gamma}$
+\begin_inset Formula $fglS\backslash\mathrm{vertexlabel}_{\gamma}$
\end_inset
@@ -781,7 +781,7 @@ Une étiquette de sommet
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\Diagram{\vertexlabel^{{\rm e^{+}}}fA\\
+\begin_inset Formula $\Diagram{\vertexlabel^{\mathrm{e^{+}}}fA\\
fglS\vertexlabel_{\gamma}
}
$
diff --git a/lib/examples/ja/FeynmanDiagrams.lyx
b/lib/examples/ja/FeynmanDiagrams.lyx
index 00fa669..29c3c5a 100644
--- a/lib/examples/ja/FeynmanDiagrams.lyx
+++ b/lib/examples/ja/FeynmanDiagrams.lyx
@@ -644,7 +644,7 @@ momentum{ch}{文字列}
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\backslash{\rm momentum}\{fA\}\{\vec{p\}}$
+\begin_inset Formula $\backslash\mathrm{momentum}\{fA\}\{\vec{p\}}$
\end_inset
@@ -706,7 +706,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\backslash{\rm vertexlabel}^{e^{+}}fA$
+\begin_inset Formula $\backslash\mathrm{vertexlabel}^{e^{+}}fA$
\end_inset
@@ -720,7 +720,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $fglS\backslash{\rm vertexlabel}_{\gamma}$
+\begin_inset Formula $fglS\backslash\mathrm{vertexlabel}_{\gamma}$
\end_inset
@@ -742,7 +742,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\Diagram{\vertexlabel^{{\rm e^{+}}}fA\\
+\begin_inset Formula $\Diagram{\vertex
[LyX/2.2.x] hollywood.lyx: remove empty paragraph
commit 95bc002387138f711eb7edc41e2dc0d712ecf7ab Author: Uwe Stöhr Date: Mon Nov 7 23:52:43 2016 +0100 hollywood.lyx: remove empty paragraph - LyX correctly warned that a non-title paragraph was used in between titling paragraphs, this was even an empty paragraph --- lib/templates/hollywood.lyx |4 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/lib/templates/hollywood.lyx b/lib/templates/hollywood.lyx index 3e91b80..eed4e9b 100644 --- a/lib/templates/hollywood.lyx +++ b/lib/templates/hollywood.lyx @@ -86,10 +86,6 @@ \end_layout -\begin_layout General - -\end_layout - \begin_layout Right Address \begin_inset Newline newline
[LyX/master] doc files: port recent changes
commit 852687852a5396fe17abe6e55eb736e4ae8ee536
Author: Uwe Stöhr
Date: Mon Nov 7 23:53:19 2016 +0100
doc files: port recent changes
---
lib/examples/FeynmanDiagrams.lyx |8
lib/examples/de/FeynmanDiagrams.lyx |8
lib/examples/fr/FeynmanDiagrams.lyx |8
lib/examples/ja/FeynmanDiagrams.lyx |8
lib/templates/hollywood.lyx |4
lib/templates/poster-a0poster-colored.lyx |3 +--
lib/templates/poster-sciposter.lyx|6 ++
7 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/lib/examples/FeynmanDiagrams.lyx b/lib/examples/FeynmanDiagrams.lyx
index 12ea5ab..ad0279b 100644
--- a/lib/examples/FeynmanDiagrams.lyx
+++ b/lib/examples/FeynmanDiagrams.lyx
@@ -671,7 +671,7 @@ particle-momentum specification
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\backslash{\textrm{momentum}}\{fA\}\{\vec{p\}}$
+\begin_inset Formula $\backslash\mathrm{momentum}\{fA\}\{\vec{p\}}$
\end_inset
@@ -733,7 +733,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\backslash{\textrm{vertexlabel}}^{e^{+}}fA$
+\begin_inset Formula $\backslash\mathrm{vertexlabel}^{e^{+}}fA$
\end_inset
@@ -747,7 +747,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $fglS\backslash{\textrm{vertexlabel}}_{\gamma}$
+\begin_inset Formula $fglS\backslash\mathrm{vertexlabel}_{\gamma}$
\end_inset
@@ -769,7 +769,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\Diagram{\vertexlabel^{{\textrm{e^{+fA\\
+\begin_inset Formula $\Diagram{\vertexlabel^{\mathrm{e^{+}}}fA\\
fglS\vertexlabel_{\gamma}
}
$
diff --git a/lib/examples/de/FeynmanDiagrams.lyx
b/lib/examples/de/FeynmanDiagrams.lyx
index 965e1e4..29eda4b 100644
--- a/lib/examples/de/FeynmanDiagrams.lyx
+++ b/lib/examples/de/FeynmanDiagrams.lyx
@@ -676,7 +676,7 @@ Teilchenimpuls-Angabe
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\backslash{\textrm{momentum}}\{fA\}\{\vec{p\}}$
+\begin_inset Formula $\backslash\mathrm{momentum}\{fA\}\{\vec{p\}}$
\end_inset
@@ -738,7 +738,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\backslash{\textrm{vertexlabel}}^{e^{+}}fA$
+\begin_inset Formula $\backslash\mathrm{vertexlabel}^{e^{+}}fA$
\end_inset
@@ -752,7 +752,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $fglS\backslash{\textrm{vertexlabel}}_{\gamma}$
+\begin_inset Formula $fglS\backslash\mathrm{vertexlabel}_{\gamma}$
\end_inset
@@ -774,7 +774,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\Diagram{\vertexlabel^{{\textrm{e^{+fA\\
+\begin_inset Formula $\Diagram{\vertexlabel^{\mathrm{e^{+}}}fA\\
fglS\vertexlabel_{\gamma}
}
$
diff --git a/lib/examples/fr/FeynmanDiagrams.lyx
b/lib/examples/fr/FeynmanDiagrams.lyx
index 1b38b2c..7268f0a 100644
--- a/lib/examples/fr/FeynmanDiagrams.lyx
+++ b/lib/examples/fr/FeynmanDiagrams.lyx
@@ -683,7 +683,7 @@ spécification des moments particulaires
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\backslash{\textrm{momentum}}\{fA\}\{\vec{p\}}$
+\begin_inset Formula $\backslash\mathrm{momentum}\{fA\}\{\vec{p\}}$
\end_inset
@@ -745,7 +745,7 @@ Une étiquette de sommet
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\backslash{\textrm{vertexlabel}}^{e^{+}}fA$
+\begin_inset Formula $\backslash\mathrm{vertexlabel}^{e^{+}}fA$
\end_inset
@@ -759,7 +759,7 @@ Une étiquette de sommet
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $fglS\backslash{\textrm{vertexlabel}}_{\gamma}$
+\begin_inset Formula $fglS\backslash\mathrm{vertexlabel}_{\gamma}$
\end_inset
@@ -781,7 +781,7 @@ Une étiquette de sommet
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\Diagram{\vertexlabel^{{\textrm{e^{+fA\\
+\begin_inset Formula $\Diagram{\vertexlabel^{\mathrm{e^{+}}}fA\\
fglS\vertexlabel_{\gamma}
}
$
diff --git a/lib/examples/ja/FeynmanDiagrams.lyx
b/lib/examples/ja/FeynmanDiagrams.lyx
index 0655230..29c3c5a 100644
--- a/lib/examples/ja/FeynmanDiagrams.lyx
+++ b/lib/examples/ja/FeynmanDiagrams.lyx
@@ -644,7 +644,7 @@ momentum{ch}{文字列}
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\backslash{\textrm{momentum}}\{fA\}\{\vec{p\}}$
+\begin_inset Formula $\backslash\mathrm{momentum}\{fA\}\{\vec{p\}}$
\end_inset
@@ -706,7 +706,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $\backslash{\textrm{vertexlabel}}^{e^{+}}fA$
+\begin_inset Formula $\backslash\mathrm{vertexlabel}^{e^{+}}fA$
\end_inset
@@ -720,7 +720,7 @@ p
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula $fglS\backslash{\textrm{vertexlabel}}_{\gamma}$
+\begin_inset Formula $fglS\backslash\mathrm{vertexlabel}_{\gamma}$
\end_inset
@@ -742,7 +742,7 @@ p
\begin_inset
[LyX/master] encodings: use correct encoding "latin7" for ISO 8859-13
commit e7e6d07e84ba3a56831bd60cf004d2f82d3ba992 Author: Uwe Stöhr Date: Tue Nov 8 00:04:02 2016 +0100 encodings: use correct encoding "latin7" for ISO 8859-13 This fixes bug #10474 properly, thanks Günter --- lib/encodings |3 +-- lib/languages |2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/encodings b/lib/encodings index 75ae8f3..47c23cf 100644 --- a/lib/encodings +++ b/lib/encodings @@ -69,8 +69,7 @@ End Encoding iso8859-9 latin5 "Turkish (ISO 8859-9)" ISO-8859-9 fixed inputenc End -# Not standard, see http://www.vtex.lt/tex/littex/index.html -Encoding iso8859-13 l7xenc "Baltic (ISO 8859-13)" ISO-8859-13 fixed inputenc +Encoding iso8859-13 latin7 "Baltic (ISO 8859-13)" ISO-8859-13 fixed inputenc End Encoding iso8859-15 latin9 "Western European (ISO 8859-15)" ISO-8859-15 fixed inputenc diff --git a/lib/languages b/lib/languages index 53d5feb..4433738 100644 --- a/lib/languages +++ b/lib/languages @@ -800,7 +800,7 @@ Language lithuanian BabelNamelithuanian PolyglossiaName lithuanian QuoteStyle german - Encoding iso8859-4 + Encoding iso8859-13 FontEncoding L7x LangCode lt_LT AsBabelOptions true
[LyX/2.2.x] encodings: use correct encoding "latin7" for ISO 8859-13
commit 1fbe23a028f3745b6aef135ea0ebfe856a6676ef Author: Uwe Stöhr Date: Tue Nov 8 00:49:01 2016 +0100 encodings: use correct encoding "latin7" for ISO 8859-13 - fixes bug #10474 --- lib/encodings |3 +-- status.22x|4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/encodings b/lib/encodings index 75ae8f3..47c23cf 100644 --- a/lib/encodings +++ b/lib/encodings @@ -69,8 +69,7 @@ End Encoding iso8859-9 latin5 "Turkish (ISO 8859-9)" ISO-8859-9 fixed inputenc End -# Not standard, see http://www.vtex.lt/tex/littex/index.html -Encoding iso8859-13 l7xenc "Baltic (ISO 8859-13)" ISO-8859-13 fixed inputenc +Encoding iso8859-13 latin7 "Baltic (ISO 8859-13)" ISO-8859-13 fixed inputenc End Encoding iso8859-15 latin9 "Western European (ISO 8859-15)" ISO-8859-15 fixed inputenc diff --git a/status.22x b/status.22x index 6dadfe9..239350d 100644 --- a/status.22x +++ b/status.22x @@ -89,7 +89,9 @@ What's new corner cases. - Show symbol name and description in plaintext export of nomenclature - entries (bug 10459) + entries (bug 10459). + +- Correct encoding for Baltic languages like Lithuanian (bug 10474). * LYX2LYX
[LyX/master] Win installer: prepare for next release
commit cb6c40a07b275f62cb641f02f377c54a821837fb
Author: Uwe Stöhr
Date: Sat Nov 19 16:35:42 2016 +0100
Win installer: prepare for next release
- see ChangeLog.txt file for changes
---
.../Win32/packaging/installer/ChangeLog.txt| 11 ++-
.../installer/HunspellDictionaryNames.txt |2 ++
.../Win32/packaging/installer/include/init.nsh | 14 +-
development/Win32/packaging/installer/settings.nsh |6 +++---
4 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index b1d75fb..b954c80 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,8 +1,17 @@
Changelog for LyX-222-3:
-- updated Swedish and Ukrainian translation of the installer
+- updated to MiKTeX 2.9 build 6161
+ (should fix all compilation errors you might have encountered recently
+ with your LyX files)
+- new spell checker for Tibetan
- correct Arabic translation of the installer (was acidentally in Farsi before)
- automatically install LaTeX package necessary for XeTeX in combintions with
document languages like e.g. Georgian
+- updated Norwegian, Swedish and Ukrainian translation of the installer
+- updated to JabRef 3.7
+- updated to Imagemagick 7.0.3-7
+- updated spell checker dictionary for English (GB)
+ (To benefit from it you must uninstall an already installed LyX 2.2.x and
+ then use this installer.)
Changelog for LyX-222-2:
diff --git a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
index aba877c..ff7b103 100644
--- a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
+++ b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
@@ -6,6 +6,8 @@ be_BY.aff
be_BY.dic
bg_BG.aff
bg_BG.dic
+bo_CN.aff
+bo_CN.dic
br_FR.aff
br_FR.dic
ca_ES.aff
diff --git a/development/Win32/packaging/installer/include/init.nsh
b/development/Win32/packaging/installer/include/init.nsh
index 53f8b21..db4a9ef 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -180,7 +180,7 @@ Section "English (GB)" SecDEnglishGB
# already installed by default
SectionIn RO
#StrCpy $DictCodes "en_GB,$DictCodes"
- AddSize 760
+ AddSize 735
SectionEnd
Section /o "English (NZ)" SecDEnglishNZ
@@ -416,6 +416,11 @@ Section /o "Thai" SecDThai
AddSize 351
SectionEnd
+Section /o "Tibetan" SecDTibetan
+ StrCpy $DictCodes "bo_CN,$DictCodes"
+ AddSize 7
+SectionEnd
+
Section /o "T�rkmen�e" SecDTurkmen
StrCpy $DictCodes "tk_TM,$DictCodes"
AddSize 950
@@ -1186,6 +1191,13 @@ Function .onInit
SectionSetFlags ${SecDThai} $0
SectionSetSize ${SecDThai} 0
${endif}
+ StrCpy $Search "bo_CN"
+ Call StrPoint
+ ${if} $Pointer != "-1"
+ IntOp $0 ${SF_SELECTED} | ${SF_RO}
+ SectionSetFlags ${SecDTibetan} $0
+ SectionSetSize ${SecDTibetan} 0
+ ${endif}
StrCpy $Search "tk_TM"
Call StrPoint
${if} $Pointer != "-1"
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 72f25e4..58de627 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -55,8 +55,8 @@ These typically need to be modified for each LyX release
# definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE
- !define JabRefInstall "external\JabRef_windows_3_6.exe"
- !define SIZE_JABREF 26668 # size in KB
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6069.exe"
+ !define JabRefInstall "external\JabRef_windows_3_7.exe"
+ !define SIZE_JABREF 36502 # size in KB
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6161.exe"
!endif
[LyX/2.2.x] Win installer: init.nsh: a change that I forgot to backport
commit 33b9157b67d4c43ef78fa1d7a6e15719dc58e402
Author: Uwe Stöhr
Date: Wed Nov 23 03:01:08 2016 +0100
Win installer: init.nsh: a change that I forgot to backport
---
.../Win32/packaging/installer/include/init.nsh | 14 +-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/development/Win32/packaging/installer/include/init.nsh
b/development/Win32/packaging/installer/include/init.nsh
index 53f8b21..db4a9ef 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -180,7 +180,7 @@ Section "English (GB)" SecDEnglishGB
# already installed by default
SectionIn RO
#StrCpy $DictCodes "en_GB,$DictCodes"
- AddSize 760
+ AddSize 735
SectionEnd
Section /o "English (NZ)" SecDEnglishNZ
@@ -416,6 +416,11 @@ Section /o "Thai" SecDThai
AddSize 351
SectionEnd
+Section /o "Tibetan" SecDTibetan
+ StrCpy $DictCodes "bo_CN,$DictCodes"
+ AddSize 7
+SectionEnd
+
Section /o "T�rkmen�e" SecDTurkmen
StrCpy $DictCodes "tk_TM,$DictCodes"
AddSize 950
@@ -1186,6 +1191,13 @@ Function .onInit
SectionSetFlags ${SecDThai} $0
SectionSetSize ${SecDThai} 0
${endif}
+ StrCpy $Search "bo_CN"
+ Call StrPoint
+ ${if} $Pointer != "-1"
+ IntOp $0 ${SF_SELECTED} | ${SF_RO}
+ SectionSetFlags ${SecDTibetan} $0
+ SectionSetSize ${SecDTibetan} 0
+ ${endif}
StrCpy $Search "tk_TM"
Call StrPoint
${if} $Pointer != "-1"
[LyX/2.2.x] Win installer: prepare for new release
commit 1e804369681a82a3037d8c8ad5d58f333e097cb1 Author: Uwe Stöhr Date: Wed Nov 23 03:01:56 2016 +0100 Win installer: prepare for new release --- .../Win32/packaging/installer/ChangeLog.txt| 11 ++- .../installer/HunspellDictionaryNames.txt |2 + development/Win32/packaging/installer/Packages.txt | 154 +--- development/Win32/packaging/installer/settings.nsh |6 +- 4 files changed, 87 insertions(+), 86 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index b1d75fb..b954c80 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,8 +1,17 @@ Changelog for LyX-222-3: -- updated Swedish and Ukrainian translation of the installer +- updated to MiKTeX 2.9 build 6161 + (should fix all compilation errors you might have encountered recently + with your LyX files) +- new spell checker for Tibetan - correct Arabic translation of the installer (was acidentally in Farsi before) - automatically install LaTeX package necessary for XeTeX in combintions with document languages like e.g. Georgian +- updated Norwegian, Swedish and Ukrainian translation of the installer +- updated to JabRef 3.7 +- updated to Imagemagick 7.0.3-7 +- updated spell checker dictionary for English (GB) + (To benefit from it you must uninstall an already installed LyX 2.2.x and + then use this installer.) Changelog for LyX-222-2: diff --git a/development/Win32/packaging/installer/HunspellDictionaryNames.txt b/development/Win32/packaging/installer/HunspellDictionaryNames.txt index aba877c..ff7b103 100644 --- a/development/Win32/packaging/installer/HunspellDictionaryNames.txt +++ b/development/Win32/packaging/installer/HunspellDictionaryNames.txt @@ -6,6 +6,8 @@ be_BY.aff be_BY.dic bg_BG.aff bg_BG.dic +bo_CN.aff +bo_CN.dic br_FR.aff br_FR.dic ca_ES.aff diff --git a/development/Win32/packaging/installer/Packages.txt b/development/Win32/packaging/installer/Packages.txt index 85657cf..b1088c8 100644 --- a/development/Win32/packaging/installer/Packages.txt +++ b/development/Win32/packaging/installer/Packages.txt @@ -1,14 +1,7 @@ -l3experimental l3kernel l3packages -mptopdf -bezos -algorithms -algorithm2e -apacite -apalike -arabi -authordate +l3experimental +ctablestack babel-albanian babel-bahasa babel-basque @@ -58,16 +51,23 @@ babel-turkish babel-ukrainian babel-vietnamese babel-welsh +bezos +frankenstein +algorithms +algorithm2e +apacite +arabi +authordate beamerposter bibtopic +caption booktabs braille breakurl +cjk cancel -caption chemgreek chicago -cjk covington csquotes endnotes @@ -81,7 +81,6 @@ filehook footmisc forest framed -frankenstein greek-inputenc harvard hyphenat @@ -94,7 +93,6 @@ genmisc mathtools mhchem mongolian-babel -miktex-hyph-mongolian mslapa natbib units @@ -106,34 +104,28 @@ pgf prettyref preview refstyle -rotating rotfloat sectionbox serbianc -miktex-hyph-serbian setspace soul splitindex stmaryrd subfig tcolorbox -thailatex +tex4ht trimspaces turkmen -ucharcat ulem undertilde unicode-math url -vntex wallpaper wrapfig xargs xcolor -xetex-def arydshln braket -cancel colortbl diagbox etoolbox @@ -145,127 +137,125 @@ pict2e sidecap was bera -binhex +libertine ccfonts -charter -classico -cmbright -concmath concrete ecc +concmath +cmbright eco eulervm feyn -fontaxes fourier -fpl garamondx iwona kurier -lh -libertine -lm-math +fontaxes luxi mathdesign -mathpazo minion2newtx newtx +binhex symbol tex-gyre +classico tipa txfonts -zhmetrics +ascii-font bbding ifsym marvosym textgreek tfrupee -txfonts +thailatex wasy wasysym +ieeetran a0poster aastex +answers achemso +cleveref +mciteplus +comment +lineno aguplus -answers apa6 -apacite +endfloat +sttools apa arabtex +sansmathaccent beamer -bigfoot -changebar -changepage -cite -cleveref -comment +lastpage +lambda-lists +lh +pst-node ctex -datetime +savesym +xecjk dinbrief +epsf dtk -ebgaramond +filecontents +ms elsarticle elsevier -endfloat -epsf europasscv +mdwtools +tabu +totpages europecv +ucs extsizes -fancyvrb -filecontents -fixme -fmtcount -fontawesome frletter g-brief -harvard -ieeetran -ifmtarg jsclasses +fancyvrb +upquote kluwer -koma-script -lambda-lists -lastpage -latex2html lettre -lineno -mciteplus -mdwtools +tugboat memoir -microtype moderncv -ms +ebgaramond +fontawesome mwcls paper -placeins powerdot pst-grad -pst-node +koma-script revtex +textcase revtex4 -sauerj -savesym sciposter seminar -shapepar simplecv -skak spie -sttools -tabu -textcase -titlesec -todonotes -totpages -tufte-latex -tugboat +cite type1cm -ucs -upquote -xecjk -xifthen -elocalloc +fpl +mathpazo +tufte-latex +changepage hardwrap +ifmtarg ifplatform +microtype +sauerj +placeins +titlesec +xifthen +changebar +fixme +datetime +fmtcount +shapepar +todonotes
[LyX/master] Win installer major review of Packages.txt file
commit f3bdc762082add18a48b753fe9f5a25aca4a100d Author: Uwe Stöhr Date: Wed Nov 23 03:07:09 2016 +0100 Win installer major review of Packages.txt file MiKTeX made a major package cleanup during the last 2 weeks. (Which caused a lot of troubles btw.) Many packages were removed and renamed. Now the list is complete again. --- development/Win32/packaging/installer/Packages.txt | 154 +--- 1 files changed, 72 insertions(+), 82 deletions(-) diff --git a/development/Win32/packaging/installer/Packages.txt b/development/Win32/packaging/installer/Packages.txt index 85657cf..b1088c8 100644 --- a/development/Win32/packaging/installer/Packages.txt +++ b/development/Win32/packaging/installer/Packages.txt @@ -1,14 +1,7 @@ -l3experimental l3kernel l3packages -mptopdf -bezos -algorithms -algorithm2e -apacite -apalike -arabi -authordate +l3experimental +ctablestack babel-albanian babel-bahasa babel-basque @@ -58,16 +51,23 @@ babel-turkish babel-ukrainian babel-vietnamese babel-welsh +bezos +frankenstein +algorithms +algorithm2e +apacite +arabi +authordate beamerposter bibtopic +caption booktabs braille breakurl +cjk cancel -caption chemgreek chicago -cjk covington csquotes endnotes @@ -81,7 +81,6 @@ filehook footmisc forest framed -frankenstein greek-inputenc harvard hyphenat @@ -94,7 +93,6 @@ genmisc mathtools mhchem mongolian-babel -miktex-hyph-mongolian mslapa natbib units @@ -106,34 +104,28 @@ pgf prettyref preview refstyle -rotating rotfloat sectionbox serbianc -miktex-hyph-serbian setspace soul splitindex stmaryrd subfig tcolorbox -thailatex +tex4ht trimspaces turkmen -ucharcat ulem undertilde unicode-math url -vntex wallpaper wrapfig xargs xcolor -xetex-def arydshln braket -cancel colortbl diagbox etoolbox @@ -145,127 +137,125 @@ pict2e sidecap was bera -binhex +libertine ccfonts -charter -classico -cmbright -concmath concrete ecc +concmath +cmbright eco eulervm feyn -fontaxes fourier -fpl garamondx iwona kurier -lh -libertine -lm-math +fontaxes luxi mathdesign -mathpazo minion2newtx newtx +binhex symbol tex-gyre +classico tipa txfonts -zhmetrics +ascii-font bbding ifsym marvosym textgreek tfrupee -txfonts +thailatex wasy wasysym +ieeetran a0poster aastex +answers achemso +cleveref +mciteplus +comment +lineno aguplus -answers apa6 -apacite +endfloat +sttools apa arabtex +sansmathaccent beamer -bigfoot -changebar -changepage -cite -cleveref -comment +lastpage +lambda-lists +lh +pst-node ctex -datetime +savesym +xecjk dinbrief +epsf dtk -ebgaramond +filecontents +ms elsarticle elsevier -endfloat -epsf europasscv +mdwtools +tabu +totpages europecv +ucs extsizes -fancyvrb -filecontents -fixme -fmtcount -fontawesome frletter g-brief -harvard -ieeetran -ifmtarg jsclasses +fancyvrb +upquote kluwer -koma-script -lambda-lists -lastpage -latex2html lettre -lineno -mciteplus -mdwtools +tugboat memoir -microtype moderncv -ms +ebgaramond +fontawesome mwcls paper -placeins powerdot pst-grad -pst-node +koma-script revtex +textcase revtex4 -sauerj -savesym sciposter seminar -shapepar simplecv -skak spie -sttools -tabu -textcase -titlesec -todonotes -totpages -tufte-latex -tugboat +cite type1cm -ucs -upquote -xecjk -xifthen -elocalloc +fpl +mathpazo +tufte-latex +changepage hardwrap +ifmtarg ifplatform +microtype +sauerj +placeins +titlesec +xifthen +changebar +fixme +datetime +fmtcount +shapepar +todonotes +mptopdf pgfopts -trimspaces \ No newline at end of file +elocalloc +datetime2 +datetime2-german +tracklang +acrotex \ No newline at end of file
[LyX/master] Win installer: finish work for new installer version
commit c438a93411d6af09b31393125790886de8959934 Author: Uwe Stöhr Date: Sun Nov 27 14:35:55 2016 +0100 Win installer: finish work for new installer version --- .../Win32/packaging/installer/ChangeLog.txt| 23 ++- development/Win32/packaging/installer/Packages.txt |3 +- .../installer/ThesaurusDictionaryNames.txt |2 + 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index b954c80..73190e3 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -3,12 +3,13 @@ (should fix all compilation errors you might have encountered recently with your LyX files) - new spell checker for Tibetan -- correct Arabic translation of the installer (was acidentally in Farsi before) -- automatically install LaTeX package necessary for XeTeX in combintions with +- correct Arabic translation of the installer (was accidentally in Farsi before) +- automatically install LaTeX package necessary for XeTeX in combinations with document languages like e.g. Georgian +- fix bug that thesaurus for English (AU) was not installed - updated Norwegian, Swedish and Ukrainian translation of the installer - updated to JabRef 3.7 -- updated to Imagemagick 7.0.3-7 +- updated to ImageMagick 7.0.3-8 - updated spell checker dictionary for English (GB) (To benefit from it you must uninstall an already installed LyX 2.2.x and then use this installer.) @@ -22,7 +23,7 @@ Changelog for LyX-222-2: Changelog for LyX-222-1: - installs LyX 2.2.2 - updated to MiKTeX 2.9 build 6069 -- updated to Imagemagick 7.0.3-3 +- updated to ImageMagick 7.0.3-3 - updated to JabRef 3.6 - updated to NSIS 3.0 - updated to Ghostscript 9.20 @@ -43,7 +44,7 @@ Changelog for LyX-221-1: - recompiled LyX using MSVC 2015 update 3 - updated to Qt 5.6.1-1 - updated to MiKTeX 2.9 build 6022 -- updated to Imagemagick 6.9.5 +- updated to ImageMagick 6.9.5 - updated to Python 2.7.12 - updated to JabRef 3.5 @@ -52,20 +53,20 @@ Changelog for LyX-220-3: - updated to Qt 5.6.1 - updated to MiKTeX 2.9 build 5997 - updated to JabRef 3.4 -- updated to Imagemagick 6.9.4-8 +- updated to ImageMagick 6.9.4-8 Changelog for LyX-220-2: - remove also the user dependent LyX settings from the registry if the user preferences should be uninstalled - calculate the required installation size correctly -- updated to Imagemagick 6.9.4-6 (fixes 2 security issues) +- updated to ImageMagick 6.9.4-6 (fixes 2 security issues) Changelog for LyX.220-1: - installs LyX 2.2.0 - updated to MiKTeX 2.9 build 5987 -- updated to Imagemagick 6.9.4-4 +- updated to ImageMagick 6.9.4-4 - updated to JabRef 3.3 - new thesaurus for Norwegian (Nynorsk) - updated thesaurus for English (US) and Norwegian (Bokmal) @@ -77,7 +78,7 @@ Changelog for LyX.220-1: Changelog for LyX.220-RC1-1: - installs LyX 2.2.0 RC1 - updated to Ghostscript 9.19 -- updated to Imagemagick 6.9.3-8 +- updated to ImageMagick 6.9.3-8 - updated to Perl 5.22.1.3 - updated to Python 2.7.11 - updated to Qt 5.6.0 @@ -104,7 +105,7 @@ Changelog for LyX-214-5: - enable the usage of 'texindy' as index generation program in LyX - updated to JabRef 2.11 - updated to Perl 5.22 -- updated to Imagemagick 6.9.2-6 +- updated to ImageMagick 6.9.2-6 Changelog for LyX-214-4: @@ -115,7 +116,7 @@ Changelog for LyX-214-4: Changelog for LyX-214-3: - updated to MiKTeX 2.9 build 5721 -- updated to Imagemagick 6.9.2-3 +- updated to ImageMagick 6.9.2-3 - updated spell-checker dictionaries for English (GB and US) (To benefit from them you must uninstall an already installed LyX 2.1.x and then use this installer.) diff --git a/development/Win32/packaging/installer/Packages.txt b/development/Win32/packaging/installer/Packages.txt index b1088c8..c6af660 100644 --- a/development/Win32/packaging/installer/Packages.txt +++ b/development/Win32/packaging/installer/Packages.txt @@ -258,4 +258,5 @@ elocalloc datetime2 datetime2-german tracklang -acrotex \ No newline at end of file +acrotex +zhmetrics \ No newline at end of file diff --git a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt index 1ee0090..6d19dfa 100644 --- a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt +++ b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt @@ -12,6 +12,8 @@ th_de_DE_v2.dat th_de_DE_v2.idx th_el_GR_v2.dat th_el_GR_v2.idx +th_en_AU_v2.dat +th_en_AU_v2.idx th_en_GB_v2.dat th_en_GB_v2.idx th_en_US_v2.dat
[LyX/master] Win installer: fix a bug
commit 7c25e5138594643fd6d75fc65bc96b2dacb31f19
Author: Uwe Stöhr
Date: Sun Nov 27 15:33:06 2016 +0100
Win installer: fix a bug
---
.../Win32/packaging/installer/ChangeLog.txt|1 +
.../Win32/packaging/installer/setup/uninstall.nsh |3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 73190e3..ba767b8 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -7,6 +7,7 @@
- automatically install LaTeX package necessary for XeTeX in combinations with
document languages like e.g. Georgian
- fix bug that thesaurus for English (AU) was not installed
+- fix bug when JabRef was uninstalled together with LyX
- updated Norwegian, Swedish and Ukrainian translation of the installer
- updated to JabRef 3.7
- updated to ImageMagick 7.0.3-8
diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh
b/development/Win32/packaging/installer/setup/uninstall.nsh
index 3a4777f..1c34a55 100644
--- a/development/Win32/packaging/installer/setup/uninstall.nsh
+++ b/development/Win32/packaging/installer/setup/uninstall.nsh
@@ -94,6 +94,7 @@ Section "un.LyX" un.SecUnProgramFiles
# delete info that programs were installed together with LyX
DeleteRegValue SHCTX "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX"
+ DeleteRegValue SHCTX
"Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef" "OnlyWithLyX"
# for texindy the path to the perl.exe must unfortunately be in Windows'
PATH variable
# so we have to remove it now
@@ -121,7 +122,7 @@ SectionEnd
#-
# MiKTeX
-Section /o "un.MiKTeX" un.SecUnMiKTeX
+Section "un.MiKTeX" un.SecUnMiKTeX
${if} $LaTeXInstalled == "MiKTeX" # only uninstall MiKTeX when it was
installed together with LyX
ReadRegStr $1 SHCTX
"Software\Microsoft\Windows\CurrentVersion\Uninstall\MiKTeX
${MiKTeXDeliveredVersion}" "UninstallString"
[LyX/2.2.x] Win installer: backport recent changes
commit 82b9eb1941b2e9207d555e6c7decf23db3ef0fe6 Author: Uwe Stöhr Date: Sun Nov 27 15:33:51 2016 +0100 Win installer: backport recent changes --- .../Win32/packaging/installer/ChangeLog.txt| 24 ++- development/Win32/packaging/installer/Packages.txt |3 +- .../installer/ThesaurusDictionaryNames.txt |2 + .../Win32/packaging/installer/setup/uninstall.nsh |3 +- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index b954c80..ba767b8 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -3,12 +3,14 @@ (should fix all compilation errors you might have encountered recently with your LyX files) - new spell checker for Tibetan -- correct Arabic translation of the installer (was acidentally in Farsi before) -- automatically install LaTeX package necessary for XeTeX in combintions with +- correct Arabic translation of the installer (was accidentally in Farsi before) +- automatically install LaTeX package necessary for XeTeX in combinations with document languages like e.g. Georgian +- fix bug that thesaurus for English (AU) was not installed +- fix bug when JabRef was uninstalled together with LyX - updated Norwegian, Swedish and Ukrainian translation of the installer - updated to JabRef 3.7 -- updated to Imagemagick 7.0.3-7 +- updated to ImageMagick 7.0.3-8 - updated spell checker dictionary for English (GB) (To benefit from it you must uninstall an already installed LyX 2.2.x and then use this installer.) @@ -22,7 +24,7 @@ Changelog for LyX-222-2: Changelog for LyX-222-1: - installs LyX 2.2.2 - updated to MiKTeX 2.9 build 6069 -- updated to Imagemagick 7.0.3-3 +- updated to ImageMagick 7.0.3-3 - updated to JabRef 3.6 - updated to NSIS 3.0 - updated to Ghostscript 9.20 @@ -43,7 +45,7 @@ Changelog for LyX-221-1: - recompiled LyX using MSVC 2015 update 3 - updated to Qt 5.6.1-1 - updated to MiKTeX 2.9 build 6022 -- updated to Imagemagick 6.9.5 +- updated to ImageMagick 6.9.5 - updated to Python 2.7.12 - updated to JabRef 3.5 @@ -52,20 +54,20 @@ Changelog for LyX-220-3: - updated to Qt 5.6.1 - updated to MiKTeX 2.9 build 5997 - updated to JabRef 3.4 -- updated to Imagemagick 6.9.4-8 +- updated to ImageMagick 6.9.4-8 Changelog for LyX-220-2: - remove also the user dependent LyX settings from the registry if the user preferences should be uninstalled - calculate the required installation size correctly -- updated to Imagemagick 6.9.4-6 (fixes 2 security issues) +- updated to ImageMagick 6.9.4-6 (fixes 2 security issues) Changelog for LyX.220-1: - installs LyX 2.2.0 - updated to MiKTeX 2.9 build 5987 -- updated to Imagemagick 6.9.4-4 +- updated to ImageMagick 6.9.4-4 - updated to JabRef 3.3 - new thesaurus for Norwegian (Nynorsk) - updated thesaurus for English (US) and Norwegian (Bokmal) @@ -77,7 +79,7 @@ Changelog for LyX.220-1: Changelog for LyX.220-RC1-1: - installs LyX 2.2.0 RC1 - updated to Ghostscript 9.19 -- updated to Imagemagick 6.9.3-8 +- updated to ImageMagick 6.9.3-8 - updated to Perl 5.22.1.3 - updated to Python 2.7.11 - updated to Qt 5.6.0 @@ -104,7 +106,7 @@ Changelog for LyX-214-5: - enable the usage of 'texindy' as index generation program in LyX - updated to JabRef 2.11 - updated to Perl 5.22 -- updated to Imagemagick 6.9.2-6 +- updated to ImageMagick 6.9.2-6 Changelog for LyX-214-4: @@ -115,7 +117,7 @@ Changelog for LyX-214-4: Changelog for LyX-214-3: - updated to MiKTeX 2.9 build 5721 -- updated to Imagemagick 6.9.2-3 +- updated to ImageMagick 6.9.2-3 - updated spell-checker dictionaries for English (GB and US) (To benefit from them you must uninstall an already installed LyX 2.1.x and then use this installer.) diff --git a/development/Win32/packaging/installer/Packages.txt b/development/Win32/packaging/installer/Packages.txt index b1088c8..c6af660 100644 --- a/development/Win32/packaging/installer/Packages.txt +++ b/development/Win32/packaging/installer/Packages.txt @@ -258,4 +258,5 @@ elocalloc datetime2 datetime2-german tracklang -acrotex \ No newline at end of file +acrotex +zhmetrics \ No newline at end of file diff --git a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt index 1ee0090..6d19dfa 100644 --- a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt +++ b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt @@ -12,6 +12,8 @@ th_de_DE_v2.dat th_de_DE_v2.idx th_el_GR_v2.dat th_el_GR_v2.idx +th_en_AU_v2.dat +th_en_AU_v2.idx th_en_GB_v2.dat th_en_GB_v2.idx th_en_US_v2.dat diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh index 3a4777f..1c34
[LyX/master] EmbeddedObjects.lyx: fix a typo spotted by a user
commit 5bee5aa095ce80f4cfdde1488867b374f478c777 Author: Uwe Stöhr Date: Tue Nov 29 01:29:25 2016 +0100 EmbeddedObjects.lyx: fix a typo spotted by a user --- lib/doc/EmbeddedObjects.lyx|2 +- lib/doc/de/EmbeddedObjects.lyx |2 +- lib/doc/es/EmbeddedObjects.lyx |2 +- lib/doc/fr/EmbeddedObjects.lyx | 12 lib/doc/ja/EmbeddedObjects.lyx |2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx index dec3ba3..84ff37c 100644 --- a/lib/doc/EmbeddedObjects.lyx +++ b/lib/doc/EmbeddedObjects.lyx @@ -13873,7 +13873,7 @@ NE \series default , \series bold -DE +SE \series default , \series bold diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx index 3b4e175..f44972a 100644 --- a/lib/doc/de/EmbeddedObjects.lyx +++ b/lib/doc/de/EmbeddedObjects.lyx @@ -13923,7 +13923,7 @@ NE \series default , \series bold -DE +SE \series default , \series bold diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx index a0df796..6ce4bcf 100644 --- a/lib/doc/es/EmbeddedObjects.lyx +++ b/lib/doc/es/EmbeddedObjects.lyx @@ -13692,7 +13692,7 @@ NE \series default , \series bold -DE +SE \series default , \series bold diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx index 42e28c1..68f9dc6 100644 --- a/lib/doc/fr/EmbeddedObjects.lyx +++ b/lib/doc/fr/EmbeddedObjects.lyx @@ -13152,8 +13152,6 @@ est utilisé avec 2 arguments \end_inset dans la première cellule: -\lang english - \begin_inset VSpace medskip \end_inset @@ -13162,8 +13160,6 @@ dans la première cellule: \begin_layout Standard \noindent - -\lang english \begin_inset Tabular @@ -13413,7 +13409,7 @@ status collapsed Résultat \begin_inset ERT -status open +status collapsed \begin_layout Plain Layout @@ -13633,7 +13629,7 @@ status collapsed À l'extérieur \begin_inset ERT -status open +status collapsed \begin_layout Plain Layout @@ -13911,7 +13907,7 @@ status collapsed À l'extérieur \begin_inset ERT -status open +status collapsed \begin_layout Plain Layout @@ -13981,7 +13977,7 @@ status collapsed Résultat \begin_inset ERT -status open +status collapsed \begin_layout Plain Layout diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx index 4b6a7d3..cd0e67c 100644 --- a/lib/doc/ja/EmbeddedObjects.lyx +++ b/lib/doc/ja/EmbeddedObjects.lyx @@ -13366,7 +13366,7 @@ NE \series default ・ \series bold -DE +SE \series default ・ \series bold
[LyX/2.2.x] EmbeddedObjects.lyx: fix a typo spotted by a user
commit e4e0f8d357f95cf7349babee973b22d6b84a2236 Author: Uwe Stöhr Date: Tue Nov 29 01:30:18 2016 +0100 EmbeddedObjects.lyx: fix a typo spotted by a user --- lib/doc/EmbeddedObjects.lyx|2 +- lib/doc/de/EmbeddedObjects.lyx |2 +- lib/doc/es/EmbeddedObjects.lyx |2 +- lib/doc/fr/EmbeddedObjects.lyx | 12 lib/doc/ja/EmbeddedObjects.lyx |2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx index b099aca..8b29961 100644 --- a/lib/doc/EmbeddedObjects.lyx +++ b/lib/doc/EmbeddedObjects.lyx @@ -13870,7 +13870,7 @@ NE \series default , \series bold -DE +SE \series default , \series bold diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx index 3b4e175..f44972a 100644 --- a/lib/doc/de/EmbeddedObjects.lyx +++ b/lib/doc/de/EmbeddedObjects.lyx @@ -13923,7 +13923,7 @@ NE \series default , \series bold -DE +SE \series default , \series bold diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx index a0df796..6ce4bcf 100644 --- a/lib/doc/es/EmbeddedObjects.lyx +++ b/lib/doc/es/EmbeddedObjects.lyx @@ -13692,7 +13692,7 @@ NE \series default , \series bold -DE +SE \series default , \series bold diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx index 42e28c1..68f9dc6 100644 --- a/lib/doc/fr/EmbeddedObjects.lyx +++ b/lib/doc/fr/EmbeddedObjects.lyx @@ -13152,8 +13152,6 @@ est utilisé avec 2 arguments \end_inset dans la première cellule: -\lang english - \begin_inset VSpace medskip \end_inset @@ -13162,8 +13160,6 @@ dans la première cellule: \begin_layout Standard \noindent - -\lang english \begin_inset Tabular @@ -13413,7 +13409,7 @@ status collapsed Résultat \begin_inset ERT -status open +status collapsed \begin_layout Plain Layout @@ -13633,7 +13629,7 @@ status collapsed À l'extérieur \begin_inset ERT -status open +status collapsed \begin_layout Plain Layout @@ -13911,7 +13907,7 @@ status collapsed À l'extérieur \begin_inset ERT -status open +status collapsed \begin_layout Plain Layout @@ -13981,7 +13977,7 @@ status collapsed Résultat \begin_inset ERT -status open +status collapsed \begin_layout Plain Layout diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx index 4b6a7d3..cd0e67c 100644 --- a/lib/doc/ja/EmbeddedObjects.lyx +++ b/lib/doc/ja/EmbeddedObjects.lyx @@ -13366,7 +13366,7 @@ NE \series default ・ \series bold -DE +SE \series default ・ \series bold
[LyX/master] Tutorial.lyx: use a simple reference format for the Tutorial
commit 3fee095a9d0d7a62ead40262d430f41564278465
Author: Uwe Stöhr
Date: Tue Nov 29 01:56:11 2016 +0100
Tutorial.lyx: use a simple reference format for the Tutorial
The " on " reference format is too tricky for newbies,
see e.g. bug #10494
- also update the corresponding example files
---
lib/doc/Tutorial.lyx| 40 +++
lib/doc/de/Tutorial.lyx | 26 +---
lib/doc/es/Tutorial.lyx | 44 +++---
lib/doc/fr/Tutorial.lyx | 38 ++---
lib/examples/de/beispiel_gelyxt.lyx |8 ++
lib/examples/es/ejemplo_con_lyx.lyx |6 ++--
lib/examples/example_lyxified.lyx |6 ++--
lib/examples/fr/exemple_lyxifie.lyx |6 ++--
8 files changed, 35 insertions(+), 139 deletions(-)
diff --git a/lib/doc/Tutorial.lyx b/lib/doc/Tutorial.lyx
index a4733d0..a13e2f5 100644
--- a/lib/doc/Tutorial.lyx
+++ b/lib/doc/Tutorial.lyx
@@ -2480,7 +2480,7 @@ Format
\begin_inset Quotes eld
\end_inset
- on page
+
\begin_inset Quotes erd
\end_inset
@@ -2498,7 +2498,7 @@ sec:About-This-Document
\begin_inset Quotes eld
\end_inset
-Ref+Text: sec:About-This-Document
+Ref: sec:About-This-Document
\begin_inset Quotes erd
\end_inset
@@ -2544,7 +2544,7 @@ arg "paste"
).
In the printed document, this reference marker will be replaced with the
- section number and then the page number.
+ section number.
Preview your document and you will see that \SpecialChar LaTeX
has been even cleverer than
that.
@@ -2556,39 +2556,7 @@ Section 2
\begin_inset Quotes erd
\end_inset
- and depending how much text you have between the start of Section
-\begin_inset space ~
-\end_inset
-
-2 and this cross-reference you may see
-\begin_inset Quotes eld
-\end_inset
-
-on this page
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset Quotes eld
-\end_inset
-
-on the previous page
-\begin_inset Quotes erd
-\end_inset
-
- or
-\begin_inset Quotes eld
-\end_inset
-
-on page n
-\begin_inset Quotes erd
-\end_inset
-
- (where
-\emph on
-n
-\emph default
- is the page number).
+.
\end_layout
\begin_layout Standard
diff --git a/lib/doc/de/Tutorial.lyx b/lib/doc/de/Tutorial.lyx
index 3e09c5f..0a6d4c6 100644
--- a/lib/doc/de/Tutorial.lyx
+++ b/lib/doc/de/Tutorial.lyx
@@ -2658,18 +2658,6 @@ sec:Was-das-Tutorium
, markieren ihn mit der Maus, wählen bei
\family sans
Format:
-\begin_inset space \space{}
-\end_inset
-
-auf
-\begin_inset space \space{}
-\end_inset
-
-Seite
-\begin_inset space \space{}
-\end_inset
-
-
\family default
und klicken auf
\family sans
@@ -2680,7 +2668,7 @@ OK
\begin_inset Quotes gld
\end_inset
-Querverweis+Text: sec:Was-das-Tutorium
+Querverweis: sec:Was-das-Tutorium
\begin_inset Quotes grd
\end_inset
@@ -2728,18 +2716,18 @@ Strg+V
\SpecialChar LyX
stellt die Querverweise in einer grauen Schaltfläche dar, die an der aktuellen
Cursor-Position eingefügt wird.
- Später, im ausgedruckten Dokument, werden diese Platzhalter durch die
tatsächli
-chen Werte von Kapitel und Seitennummer ersetzt.
+ Später, im ausgedruckten Dokument, werden diese Platzhalter durch den
tatsächli
+chen Wert des Kapitels ersetzt.
Sehen Sie sich Ihren Text in der Vorschau an, und Sie werden feststellen,
dass der Eintrag durch
\begin_inset Quotes gld
\end_inset
-1.2 auf Seite 3
+1.2
\begin_inset Quotes grd
\end_inset
- (oder wo immer sich dieses Kapitel tatsächlich befindet) ersetzt wurde.
+ ersetzt wurde.
\end_layout
\begin_layout Standard
@@ -2797,7 +2785,7 @@ vor
\begin_inset Quotes gld
\end_inset
-1.3 auf Seite x
+1.3
\begin_inset Quotes grd
\end_inset
@@ -2806,7 +2794,7 @@ vor
\begin_inset Quotes gld
\end_inset
-2 auf Seite y
+2
\begin_inset Quotes grd
\end_inset
diff --git a/lib/doc/es/Tutorial.lyx b/lib/doc/es/Tutorial.lyx
index 2e4bde0..f345f64 100644
--- a/lib/doc/es/Tutorial.lyx
+++ b/lib/doc/es/Tutorial.lyx
@@ -2459,7 +2459,7 @@ Formato
\begin_inset Quotes fld
\end_inset
- en página
+
\begin_inset Quotes frd
\end_inset
@@ -2468,7 +2468,7 @@ Formato
\begin_inset Quotes fld
\end_inset
-Referencia+Texto: sec:Acerca-de-este-documento
+Referencia: sec:Acerca-de-este-documento
\begin_inset Quotes frd
\end_inset
@@ -2518,7 +2518,7 @@ arg "paste"
).
En el documento impreso, cada marcador de referencia será reemplazado por
- el número de página y de sección.
+ el número de sección.
En el documento de salida, \SpecialChar LaTeX
habrá hecho su trabajo y verás cómo aparece
la referencia a la
@@ -2533,43 +2533,7 @@ sección
\begin_inset Quotes frd
\end_inset
-
-\begin_inset Quotes fld
-\end_inset
-
-en esta página
-\begin_inset Quotes frd
-\end_inset
-
-,
-\begin_inset Quotes fld
-\end_inset
-
-en página anterior
-\begin_inset Quotes frd
-\end_inset
-
- o
-\begin_inset Quotes fld
-\end_inset
-
-en la página
-\begin_inset space ~
-\end_inset
-
[LyX/2.2.x] Tutorial.lyx: backport today's changes
commit f31e8ddf8e25774a6f05daef297f8bc4cf5005f7
Author: Uwe Stöhr
Date: Tue Nov 29 01:57:39 2016 +0100
Tutorial.lyx: backport today's changes
---
lib/doc/Tutorial.lyx| 40 +++
lib/doc/de/Tutorial.lyx | 26 +---
lib/doc/es/Tutorial.lyx | 44 +++---
lib/doc/fr/Tutorial.lyx | 38 ++---
lib/examples/de/beispiel_gelyxt.lyx |8 ++
lib/examples/es/ejemplo_con_lyx.lyx |6 ++--
lib/examples/example_lyxified.lyx |6 ++--
lib/examples/fr/exemple_lyxifie.lyx |6 ++--
8 files changed, 35 insertions(+), 139 deletions(-)
diff --git a/lib/doc/Tutorial.lyx b/lib/doc/Tutorial.lyx
index a4733d0..a13e2f5 100644
--- a/lib/doc/Tutorial.lyx
+++ b/lib/doc/Tutorial.lyx
@@ -2480,7 +2480,7 @@ Format
\begin_inset Quotes eld
\end_inset
- on page
+
\begin_inset Quotes erd
\end_inset
@@ -2498,7 +2498,7 @@ sec:About-This-Document
\begin_inset Quotes eld
\end_inset
-Ref+Text: sec:About-This-Document
+Ref: sec:About-This-Document
\begin_inset Quotes erd
\end_inset
@@ -2544,7 +2544,7 @@ arg "paste"
).
In the printed document, this reference marker will be replaced with the
- section number and then the page number.
+ section number.
Preview your document and you will see that \SpecialChar LaTeX
has been even cleverer than
that.
@@ -2556,39 +2556,7 @@ Section 2
\begin_inset Quotes erd
\end_inset
- and depending how much text you have between the start of Section
-\begin_inset space ~
-\end_inset
-
-2 and this cross-reference you may see
-\begin_inset Quotes eld
-\end_inset
-
-on this page
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset Quotes eld
-\end_inset
-
-on the previous page
-\begin_inset Quotes erd
-\end_inset
-
- or
-\begin_inset Quotes eld
-\end_inset
-
-on page n
-\begin_inset Quotes erd
-\end_inset
-
- (where
-\emph on
-n
-\emph default
- is the page number).
+.
\end_layout
\begin_layout Standard
diff --git a/lib/doc/de/Tutorial.lyx b/lib/doc/de/Tutorial.lyx
index 3e09c5f..0a6d4c6 100644
--- a/lib/doc/de/Tutorial.lyx
+++ b/lib/doc/de/Tutorial.lyx
@@ -2658,18 +2658,6 @@ sec:Was-das-Tutorium
, markieren ihn mit der Maus, wählen bei
\family sans
Format:
-\begin_inset space \space{}
-\end_inset
-
-auf
-\begin_inset space \space{}
-\end_inset
-
-Seite
-\begin_inset space \space{}
-\end_inset
-
-
\family default
und klicken auf
\family sans
@@ -2680,7 +2668,7 @@ OK
\begin_inset Quotes gld
\end_inset
-Querverweis+Text: sec:Was-das-Tutorium
+Querverweis: sec:Was-das-Tutorium
\begin_inset Quotes grd
\end_inset
@@ -2728,18 +2716,18 @@ Strg+V
\SpecialChar LyX
stellt die Querverweise in einer grauen Schaltfläche dar, die an der aktuellen
Cursor-Position eingefügt wird.
- Später, im ausgedruckten Dokument, werden diese Platzhalter durch die
tatsächli
-chen Werte von Kapitel und Seitennummer ersetzt.
+ Später, im ausgedruckten Dokument, werden diese Platzhalter durch den
tatsächli
+chen Wert des Kapitels ersetzt.
Sehen Sie sich Ihren Text in der Vorschau an, und Sie werden feststellen,
dass der Eintrag durch
\begin_inset Quotes gld
\end_inset
-1.2 auf Seite 3
+1.2
\begin_inset Quotes grd
\end_inset
- (oder wo immer sich dieses Kapitel tatsächlich befindet) ersetzt wurde.
+ ersetzt wurde.
\end_layout
\begin_layout Standard
@@ -2797,7 +2785,7 @@ vor
\begin_inset Quotes gld
\end_inset
-1.3 auf Seite x
+1.3
\begin_inset Quotes grd
\end_inset
@@ -2806,7 +2794,7 @@ vor
\begin_inset Quotes gld
\end_inset
-2 auf Seite y
+2
\begin_inset Quotes grd
\end_inset
diff --git a/lib/doc/es/Tutorial.lyx b/lib/doc/es/Tutorial.lyx
index 2e4bde0..f345f64 100644
--- a/lib/doc/es/Tutorial.lyx
+++ b/lib/doc/es/Tutorial.lyx
@@ -2459,7 +2459,7 @@ Formato
\begin_inset Quotes fld
\end_inset
- en página
+
\begin_inset Quotes frd
\end_inset
@@ -2468,7 +2468,7 @@ Formato
\begin_inset Quotes fld
\end_inset
-Referencia+Texto: sec:Acerca-de-este-documento
+Referencia: sec:Acerca-de-este-documento
\begin_inset Quotes frd
\end_inset
@@ -2518,7 +2518,7 @@ arg "paste"
).
En el documento impreso, cada marcador de referencia será reemplazado por
- el número de página y de sección.
+ el número de sección.
En el documento de salida, \SpecialChar LaTeX
habrá hecho su trabajo y verás cómo aparece
la referencia a la
@@ -2533,43 +2533,7 @@ sección
\begin_inset Quotes frd
\end_inset
-
-\begin_inset Quotes fld
-\end_inset
-
-en esta página
-\begin_inset Quotes frd
-\end_inset
-
-,
-\begin_inset Quotes fld
-\end_inset
-
-en página anterior
-\begin_inset Quotes frd
-\end_inset
-
- o
-\begin_inset Quotes fld
-\end_inset
-
-en la página
-\begin_inset space ~
-\end_inset
-
-
-\emph on
-n
-\emph default
-
-\begin_inset Quotes frd
-\end_inset
-
- (donde
-\emph on
-n
-\emph default
- es el número de la página en la que aparezca
[LyX/2.2.x] Additional.lyx: backport a change from master
commit af353b521d6ba37aa51db8c66737adfbd21ad095 Author: Uwe Stöhr Date: Mon Jan 9 01:18:51 2017 +0100 Additional.lyx: backport a change from master PLEASE work in branch for the doc files. There is no reason not to release improved manuals with the next bugfix release. Only new features of LyX 2.3 are only for master. --- lib/doc/Additional.lyx |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx index f915810..054dfc6 100644 --- a/lib/doc/Additional.lyx +++ b/lib/doc/Additional.lyx @@ -6911,7 +6911,8 @@ lyxclient -g %1 %2 \end_layout \begin_layout Standard -Reverse search is triggered by double-click. +Reverse search is triggered by double-click or, in more recent versions, + by context menu. \end_layout \begin_layout Subsubsection*
[LyX/2.2.x] linguistics.lyx: 2 minor style fixes
commit 95248c51d263186250b2da97acfe2506dc0e74bf Author: Uwe Stöhr Date: Mon Jan 9 01:19:27 2017 +0100 linguistics.lyx: 2 minor style fixes --- lib/examples/de/linguistics.lyx | 10 +- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/lib/examples/de/linguistics.lyx b/lib/examples/de/linguistics.lyx index 0c21711..fb952d4 100644 --- a/lib/examples/de/linguistics.lyx +++ b/lib/examples/de/linguistics.lyx @@ -188,10 +188,7 @@ Linguistik aus der Liste der verfügbaren Module und drücken auf den Knopf \family sans -\bar under -H -\bar default -inzufügen +Hinzufügen \family default (so wie es für dieses Dokument bereits getan wurde). \end_layout @@ -465,11 +462,6 @@ Das Linguistikmodul stellt zwei Arten von Glossen zur Verfügung. \family sans Einfügen\SpecialChar menuseparator Benutzerdefinierte Einfügungen -\begin_inset space ~ -\end_inset - -\SpecialChar ldots - \family default zugänglich. Die einfache
[LyX/2.2.x] fix last traces of bug #10068
commit 8b2d0af975b1768498b30b9e76cbd000c8cd8b8e Author: Uwe Stöhr Date: Mon Jan 9 01:25:22 2017 +0100 fix last traces of bug #10068 --- lib/doc/es/Math.lyx|7 --- lib/examples/ca/mathed.lyx |4 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx index 4e050f3..1bb6fa2 100644 --- a/lib/doc/es/Math.lyx +++ b/lib/doc/es/Math.lyx @@ -4095,13 +4095,6 @@ dots \end_layout \begin_layout Standard -\begin_inset Separator parbreak -\end_inset - - -\end_layout - -\begin_layout Standard \align center \begin_inset Tabular diff --git a/lib/examples/ca/mathed.lyx b/lib/examples/ca/mathed.lyx index 9260064..64c014d 100644 --- a/lib/examples/ca/mathed.lyx +++ b/lib/examples/ca/mathed.lyx @@ -93,10 +93,6 @@ m . El text es pot acotar per delimitadors o no. Així, si seleccioneu qualsevol de les fórmules següents: -\begin_inset Separator latexpar -\end_inset - - \end_layout \begin_layout Standard
[LyX/master] fix last traces of bug #10068
commit 36cfed9f7f10759aef29d6e7cfeddd0ccdfa99aa Author: Uwe Stöhr Date: Mon Jan 9 01:26:23 2017 +0100 fix last traces of bug #10068 --- lib/doc/es/Math.lyx |7 --- lib/examples/ca/mathed.lyx |4 lib/examples/de/linguistics.lyx | 14 +- 3 files changed, 1 insertions(+), 24 deletions(-) diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx index 4e050f3..1bb6fa2 100644 --- a/lib/doc/es/Math.lyx +++ b/lib/doc/es/Math.lyx @@ -4095,13 +4095,6 @@ dots \end_layout \begin_layout Standard -\begin_inset Separator parbreak -\end_inset - - -\end_layout - -\begin_layout Standard \align center \begin_inset Tabular diff --git a/lib/examples/ca/mathed.lyx b/lib/examples/ca/mathed.lyx index 9260064..64c014d 100644 --- a/lib/examples/ca/mathed.lyx +++ b/lib/examples/ca/mathed.lyx @@ -93,10 +93,6 @@ m . El text es pot acotar per delimitadors o no. Així, si seleccioneu qualsevol de les fórmules següents: -\begin_inset Separator latexpar -\end_inset - - \end_layout \begin_layout Standard diff --git a/lib/examples/de/linguistics.lyx b/lib/examples/de/linguistics.lyx index 64fc41a..fb952d4 100644 --- a/lib/examples/de/linguistics.lyx +++ b/lib/examples/de/linguistics.lyx @@ -188,10 +188,7 @@ Linguistik aus der Liste der verfügbaren Module und drücken auf den Knopf \family sans -\bar under -H -\bar default -inzufügen +Hinzufügen \family default (so wie es für dieses Dokument bereits getan wurde). \end_layout @@ -284,10 +281,6 @@ Bedeutung . Das Paket erlaubt es, kontextsensible Anführungszeichen zu generieren (bspw. je nach aktuell verwendeter Sprache). -\begin_inset Separator latexpar -\end_inset - - \end_layout \begin_deeper @@ -469,11 +462,6 @@ Das Linguistikmodul stellt zwei Arten von Glossen zur Verfügung. \family sans Einfügen\SpecialChar menuseparator Benutzerdefinierte Einfügungen -\begin_inset space ~ -\end_inset - -\SpecialChar ldots - \family default zugänglich. Die einfache
[LyX/2.2.x] pt_BR.po: update from Georger
commit ee5c96149e6963057cb98ae744fd5de5ecc10b8a Author: Uwe Stöhr Date: Mon Jan 23 01:12:09 2017 +0100 pt_BR.po: update from Georger --- po/pt_BR.po | 545 +-- status.22x |4 +- 2 files changed, 274 insertions(+), 275 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index acd56d3..1d5a2f6 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pt_BR 2.2.2\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2017-01-15 11:39-0500\n" -"PO-Revision-Date: 2016-09-13 22:46-0300\n" -"Last-Translator: Georger Araújo \n" "Language-Team: Brazilian Portuguese \n" @@ -52,14 +52,15 @@ msgstr "Notas de Lançamento" #: src/frontends/qt4/ui/AboutUi.ui:159 src/frontends/qt4/ui/CompareUi.ui:163 #: src/frontends/qt4/ui/DelimiterUi.ui:83 #: src/frontends/qt4/ui/ErrorListUi.ui:60 -#: src/frontends/qt4/ui/ExternalUi.ui:620 src/frontends/qt4/ui/IncludeUi.ui:250 +#: src/frontends/qt4/ui/ExternalUi.ui:620 +#: src/frontends/qt4/ui/IncludeUi.ui:250 #: src/frontends/qt4/ui/InsetParamsUi.ui:138 src/frontends/qt4/ui/LogUi.ui:88 #: src/frontends/qt4/ui/ParagraphUi.ui:261 src/frontends/qt4/ui/PrefsUi.ui:90 #: src/frontends/qt4/ui/RefUi.ui:370 src/frontends/qt4/ui/SearchUi.ui:203 #: src/frontends/qt4/ui/ShowFileUi.ui:55 src/frontends/qt4/ui/SymbolsUi.ui:66 -#: src/frontends/qt4/ui/TexinfoUi.ui:58 src/frontends/qt4/ui/ThesaurusUi.ui:138 -#: src/frontends/qt4/ui/WrapUi.ui:173 src/frontends/qt4/GuiParagraph.cpp:163 -#: src/frontends/qt4/GuiView.cpp:2737 +#: src/frontends/qt4/ui/TexinfoUi.ui:58 +#: src/frontends/qt4/ui/ThesaurusUi.ui:138 src/frontends/qt4/ui/WrapUi.ui:173 +#: src/frontends/qt4/GuiParagraph.cpp:163 src/frontends/qt4/GuiView.cpp:2737 msgid "&Close" msgstr "&Fechar" @@ -173,12 +174,13 @@ msgstr "LyX: Adicionar Base de Dados BiBTeX" #: src/frontends/qt4/ui/BibtexAddUi.ui:31 msgid "&Databases found by LaTeX:" -msgstr "" +msgstr "&Bases de dados encontradas pelo LaTeX:" #: src/frontends/qt4/ui/BibtexAddUi.ui:67 -#, fuzzy msgid "Rescan LaTeX's index for new databases and styles" -msgstr "Procurar por estilos e bases de dados recém-adicionados" +msgstr "" +"Reprocessar índice do LaTeX para detectar estilos e bases de dados recém-" +"adicionados" #: src/frontends/qt4/ui/BibtexAddUi.ui:70 src/frontends/qt4/ui/BibtexUi.ui:50 #: src/frontends/qt4/ui/TexinfoUi.ui:94 @@ -189,21 +191,20 @@ msgstr "&Reprocessar" msgid "" "Here you can enter a local BibTeX database name or browse your directory." msgstr "" +"Aqui você pode digitar o nome de uma base de dados BibTeX local ou navegar " +"por sua pasta." #: src/frontends/qt4/ui/BibtexAddUi.ui:84 -#, fuzzy msgid "&Local databases:" -msgstr "Bases de dados:" +msgstr "Bases de dados &locais:" #: src/frontends/qt4/ui/BibtexAddUi.ui:102 -#, fuzzy msgid "Here you can enter a local BibTeX database name" -msgstr "Digite o nome da base de dados BibTeX" +msgstr "Aqui você pode digitar o nome de uma base de dados BibTeX local" #: src/frontends/qt4/ui/BibtexAddUi.ui:109 -#, fuzzy msgid "Browse your local directory" -msgstr "Sem pasta de usuário" +msgstr "Navegar por sua pasta local" #: src/frontends/qt4/ui/BibtexAddUi.ui:112 src/frontends/qt4/ui/BibtexUi.ui:97 #: src/frontends/qt4/ui/CompareUi.ui:50 src/frontends/qt4/ui/ExternalUi.ui:70 @@ -214,15 +215,15 @@ msgstr "&Procurar..." #: src/frontends/qt4/ui/BibtexAddUi.ui:162 #: src/frontends/qt4/ui/BranchesUi.ui:113 -#: src/frontends/qt4/ui/CitationUi.ui:143 src/frontends/qt4/ui/IndicesUi.ui:134 -#: src/CutAndPaste.cpp:374 +#: src/frontends/qt4/ui/CitationUi.ui:143 +#: src/frontends/qt4/ui/IndicesUi.ui:134 src/CutAndPaste.cpp:374 msgid "&Add" msgstr "&Adicionar" -#: src/frontends/qt4/ui/BibtexAddUi.ui:175 src/frontends/qt4/ui/BibtexUi.ui:213 -#: src/frontends/qt4/ui/ChangesUi.ui:91 src/frontends/qt4/ui/SendtoUi.ui:92 -#: src/frontends/qt4/ui/ShortcutUi.ui:65 src/buffer_funcs.cpp:123 -#: src/frontends/qt4/ButtonController.cpp:239 +#: src/frontends/qt4/ui/BibtexAddUi.ui:175 +#: src/frontends/qt4/ui/BibtexUi.ui:213 src/frontends/qt4/ui/ChangesUi.ui:91 +#: src/frontends/qt4/ui/SendtoUi.ui:92 src/frontends/qt4/ui/ShortcutUi.ui:65 +#: src/buffer_funcs.cpp:123 src/frontends/qt4/ButtonController.cpp:239 #: src/frontends/qt4/GuiApplication.cpp:1780 #: src/frontends/qt4/GuiCompare.cpp:192 msgid "Cancel" @@ -273,16 +274,19 @@ msgstr "Adicionar bibliografia ao sumário" msgid "Add bibliography to &TOC" msgstr "Adicionar bibliografia ao s
[LyX/2.2.x] Win installer: fix 2 bugs and update libraries
commit 1265ed2a688e083a3e05264969de94b438248193
Author: Uwe Stöhr
Date: Thu Jan 26 02:16:53 2017 +0100
Win installer: fix 2 bugs and update libraries
---
.../Win32/packaging/installer/ChangeLog.txt| 26 +++
development/Win32/packaging/installer/Readme.txt |2 +-
.../packaging/installer/include/dictionaries.nsh | 26 ++--
.../Win32/packaging/installer/include/init.nsh | 10
development/Win32/packaging/installer/settings.nsh | 12
5 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index ba767b8..b6df3a2 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,18 @@
-Changelog for LyX-222-3:
+Changelog for LyX-222-4:
+- fix bug that spell checker for Vietnamese was not installed
+- fix bug that thesaurus for Ukrainian was not installed
+- updated to MiKTeX 2.9 build 6219 (fixes problems with the update of LaTeX
packages)
+- updated to Python 2.7.13
+- updated to ImageMagick 7.0.4-5
+- updated to JabRef 3.8.1
+- updated to Perl 5.22.3.1
+- updated thesaurus for Ukrainian
+- updated spell checker dictionaries for English (CA, GB and US) and Ukrainian
+ (To benefit from them you must uninstall an already installed LyX 2.2.x and
+ then use this installer.)
+
+
+Changelog for LyX-222-3:
- updated to MiKTeX 2.9 build 6161
(should fix all compilation errors you might have encountered recently
with your LyX files)
@@ -70,8 +84,8 @@ Changelog for LyX.220-1:
- updated to ImageMagick 6.9.4-4
- updated to JabRef 3.3
- new thesaurus for Norwegian (Nynorsk)
-- updated thesaurus for English (US) and Norwegian (Bokmal)
-- updated spell-checker dictionary for English (AU and GB), Norwegian (Bokmal
and Nynorsk) and Scottish
+- updated thesaurus for English (US) and Norwegian (Bokmål)
+- updated spell-checker dictionary for English (AU and GB), Norwegian (Bokmål
and Nynorsk) and Scottish
(To benefit from it you must uninstall an already installed LyX 2.2.0 and
then use this installer.)
@@ -160,7 +174,7 @@ Changelog for LyX-212-2:
- fix problem that some LaTeX language packages were not installed
automatically
leading to LaTeX errors when compiling LyX documents
- new spell checker for Turkish
-- updated spell-checker dictionaries for English, Norwegian(Bokmal), Portuguese
+- updated spell-checker dictionaries for English, Norwegian(Bokmål), Portuguese
and Scottish
(To benefit from them you must uninstall an already installed LyX 2.1.x and
then use this installer.)
@@ -240,7 +254,7 @@ Changelog for LyX-207:
Changelog for LyX-206-3:
- XeTeX support for Arabic and Farsi will now
automatically be installed to MiKTeX
-- updated spell-checker dictionary for Norwegian(Bokmal)
+- updated spell-checker dictionary for Norwegian(Bokmål)
Changelog for LyX-206-2:
@@ -263,7 +277,7 @@ Changelog for LyX-206-1:
Slovakian and Swedish
(To benefit from them you must uninstall an already installed LyX 2.0.x and
then use this installer.)
-- updated thesaurus for Italian, Norwegian(Bokmal), Portuguese, Romanian,
+- updated thesaurus for Italian, Norwegian(Bokmål), Portuguese, Romanian,
Slovakian and Slovenian
(need to reinstall LyX to benefit from this)
- updated to Python 2.7.4
diff --git a/development/Win32/packaging/installer/Readme.txt
b/development/Win32/packaging/installer/Readme.txt
index 46a984e..8ab4e49 100644
--- a/development/Win32/packaging/installer/Readme.txt
+++ b/development/Win32/packaging/installer/Readme.txt
@@ -7,7 +7,7 @@
!define FILES_DEPS "C:\LyX-Installer\LyX2.2x\lyx-windows-deps-msvc2015"
!define FILES_QT "C:\LyX-Installer\LyXPackage\LyX"
3. install the latest version 3.x of NSIS
(http://nsis.sourceforge.net/Download)
-4. install the NSIS Large Strings extension
(http://nsis.sourceforge.net/Special_Builds)
+4. install the NSIS Large Strings build
(http://nsis.sourceforge.net/Special_Builds)
(extract the extension ZIP file in your NSIS installation folder and this
way overwrite some files)
5. open the file FindProcDLL.zip (that is part of this bundle),
extract from it the file FindProc.dll to the folder \Plugins\x86-ansi of
diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh
b/development/Win32/packaging/installer/include/dictionaries.nsh
index efac5c1..242dc18 100644
--- a/development/Win32/packaging/installer/include/dictionaries.nsh
+++ b/development/Win32/packaging/installer/include/dictionaries.nsh
@@ -28,11 +28,11 @@ Function FindDictionaries
# read out the possible spell-checker filenames from the file
FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r
- ${for} $5 1 71
- # the file has 142 lines, but we only need to check for one of the 2
dictionary files
[LyX/master] Win installer: fix 2 bugs and update libraries
commit 7b47b9e11bd3d3eda993e8183a1609112bef047f
Author: Uwe Stöhr
Date: Thu Jan 26 02:19:27 2017 +0100
Win installer: fix 2 bugs and update libraries
---
.../Win32/packaging/installer/ChangeLog.txt| 26 +++
development/Win32/packaging/installer/Readme.txt |2 +-
.../packaging/installer/include/dictionaries.nsh | 26 ++--
.../Win32/packaging/installer/include/init.nsh | 10
development/Win32/packaging/installer/settings.nsh | 12
5 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index ba767b8..b6df3a2 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,18 @@
-Changelog for LyX-222-3:
+Changelog for LyX-222-4:
+- fix bug that spell checker for Vietnamese was not installed
+- fix bug that thesaurus for Ukrainian was not installed
+- updated to MiKTeX 2.9 build 6219 (fixes problems with the update of LaTeX
packages)
+- updated to Python 2.7.13
+- updated to ImageMagick 7.0.4-5
+- updated to JabRef 3.8.1
+- updated to Perl 5.22.3.1
+- updated thesaurus for Ukrainian
+- updated spell checker dictionaries for English (CA, GB and US) and Ukrainian
+ (To benefit from them you must uninstall an already installed LyX 2.2.x and
+ then use this installer.)
+
+
+Changelog for LyX-222-3:
- updated to MiKTeX 2.9 build 6161
(should fix all compilation errors you might have encountered recently
with your LyX files)
@@ -70,8 +84,8 @@ Changelog for LyX.220-1:
- updated to ImageMagick 6.9.4-4
- updated to JabRef 3.3
- new thesaurus for Norwegian (Nynorsk)
-- updated thesaurus for English (US) and Norwegian (Bokmal)
-- updated spell-checker dictionary for English (AU and GB), Norwegian (Bokmal
and Nynorsk) and Scottish
+- updated thesaurus for English (US) and Norwegian (Bokmål)
+- updated spell-checker dictionary for English (AU and GB), Norwegian (Bokmål
and Nynorsk) and Scottish
(To benefit from it you must uninstall an already installed LyX 2.2.0 and
then use this installer.)
@@ -160,7 +174,7 @@ Changelog for LyX-212-2:
- fix problem that some LaTeX language packages were not installed
automatically
leading to LaTeX errors when compiling LyX documents
- new spell checker for Turkish
-- updated spell-checker dictionaries for English, Norwegian(Bokmal), Portuguese
+- updated spell-checker dictionaries for English, Norwegian(Bokmål), Portuguese
and Scottish
(To benefit from them you must uninstall an already installed LyX 2.1.x and
then use this installer.)
@@ -240,7 +254,7 @@ Changelog for LyX-207:
Changelog for LyX-206-3:
- XeTeX support for Arabic and Farsi will now
automatically be installed to MiKTeX
-- updated spell-checker dictionary for Norwegian(Bokmal)
+- updated spell-checker dictionary for Norwegian(Bokmål)
Changelog for LyX-206-2:
@@ -263,7 +277,7 @@ Changelog for LyX-206-1:
Slovakian and Swedish
(To benefit from them you must uninstall an already installed LyX 2.0.x and
then use this installer.)
-- updated thesaurus for Italian, Norwegian(Bokmal), Portuguese, Romanian,
+- updated thesaurus for Italian, Norwegian(Bokmål), Portuguese, Romanian,
Slovakian and Slovenian
(need to reinstall LyX to benefit from this)
- updated to Python 2.7.4
diff --git a/development/Win32/packaging/installer/Readme.txt
b/development/Win32/packaging/installer/Readme.txt
index 46a984e..8ab4e49 100644
--- a/development/Win32/packaging/installer/Readme.txt
+++ b/development/Win32/packaging/installer/Readme.txt
@@ -7,7 +7,7 @@
!define FILES_DEPS "C:\LyX-Installer\LyX2.2x\lyx-windows-deps-msvc2015"
!define FILES_QT "C:\LyX-Installer\LyXPackage\LyX"
3. install the latest version 3.x of NSIS
(http://nsis.sourceforge.net/Download)
-4. install the NSIS Large Strings extension
(http://nsis.sourceforge.net/Special_Builds)
+4. install the NSIS Large Strings build
(http://nsis.sourceforge.net/Special_Builds)
(extract the extension ZIP file in your NSIS installation folder and this
way overwrite some files)
5. open the file FindProcDLL.zip (that is part of this bundle),
extract from it the file FindProc.dll to the folder \Plugins\x86-ansi of
diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh
b/development/Win32/packaging/installer/include/dictionaries.nsh
index efac5c1..242dc18 100644
--- a/development/Win32/packaging/installer/include/dictionaries.nsh
+++ b/development/Win32/packaging/installer/include/dictionaries.nsh
@@ -28,11 +28,11 @@ Function FindDictionaries
# read out the possible spell-checker filenames from the file
FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r
- ${for} $5 1 71
- # the file has 142 lines, but we only need to check for one of the 2
dictionary files
[LyX/master] zh_CN.po: port Zheru's translation updates from branch
commit 3ac7923759f3da10757ddeb51c56ea1125728937 Author: Uwe Stöhr Date: Tue Feb 14 00:22:21 2017 +0100 zh_CN.po: port Zheru's translation updates from branch --- lib/CREDITS |3 + lib/generate_contributions.py |8 + po/zh_CN.po | 608 + 3 files changed, 325 insertions(+), 294 deletions(-) diff --git a/lib/CREDITS b/lib/CREDITS index 9590cfc..2102c71 100644 --- a/lib/CREDITS +++ b/lib/CREDITS @@ -440,6 +440,9 @@ @bThomas Pundt @iE-mail: thomas () pundt ! de initial configure script +@bZheru Qiu +@iE-mail: qzr () mail ! ustc ! edu ! cn + Chinese localisation @bAllan Rae @iE-mail: rae () itee ! uq ! edu ! au GUI-I architect, LyX PR head, LDN, bug reports/fixes, Itemize Bullet Selection, xforms-0.81 + gcc-2.6.3 compatibility diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py index 90be99c..3e94512 100755 --- a/lib/generate_contributions.py +++ b/lib/generate_contributions.py @@ -1511,6 +1511,14 @@ contributors = [ "6 April 2005", u"initial configure script"), + contributor(u"Zheru Qiu", + "qzr () mail ! ustc ! edu ! cn", + "GPL", + "Fwd: Permission of using my translation under GPL", + "m=148702600212546", + "5 February 2017", + u"Chinese localisation"), + contributor(u"Allan Rae", "rae () itee ! uq ! edu ! au", "GPL", diff --git a/po/zh_CN.po b/po/zh_CN.po index 1282ab3..f6ab914 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: zh_CN\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2016-04-24 10:40+0200\n" -"PO-Revision-Date: 2014-04-28 10:00+1000\n" -"Last-Translator: Yihui Xie \n" +"PO-Revision-Date: 2017-02-04 10:00+1000\n" +"Last-Translator: Zheru Qiu \n" "Language-Team: 简体中文 \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -82,11 +82,11 @@ msgstr "关键字(&K)" #: src/frontends/qt4/ui/BiblioUi.ui:19 msgid "Citation Style" -msgstr "文献引用风格" +msgstr "文献引用样式" #: src/frontends/qt4/ui/BiblioUi.ui:28 msgid "Use BibTeX's default numerical styles" -msgstr "使用BibTeX缺省数字风格" +msgstr "使用BibTeX缺省数字样式" #: src/frontends/qt4/ui/BiblioUi.ui:31 msgid "&Default (numerical)" @@ -96,7 +96,7 @@ msgstr "缺省（数字）(&D)" msgid "" "Use the natbib styles for natural sciences and arts. Set additional " "parameters in document class options." -msgstr "为科技文献使用natbib风格。在文档类选项中设置附加参数。" +msgstr "为科技文献使用natbib样式。在文档类选项中设置附加参数。" #: src/frontends/qt4/ui/BiblioUi.ui:41 msgid "&Natbib" @@ -104,15 +104,15 @@ msgstr "&Natbib" #: src/frontends/qt4/ui/BiblioUi.ui:59 msgid "Natbib &style:" -msgstr "Natbib风格(s)" +msgstr "Natbib样式(s)" #: src/frontends/qt4/ui/BiblioUi.ui:97 msgid "Use the jurabib styles for law and humanities" -msgstr "为法律和人文文献使用jurabib风格" +msgstr "为法律和人文文献使用jurabib样式" #: src/frontends/qt4/ui/BiblioUi.ui:100 msgid "&Jurabib" -msgstr "&Jurabib" +msgstr "法律文献样式&Jurabib" #: src/frontends/qt4/ui/BiblioUi.ui:110 #, fuzzy @@ -122,20 +122,22 @@ msgstr "参考书目" #: src/frontends/qt4/ui/BiblioUi.ui:121 #, fuzzy msgid "Default st&yle:" -msgstr "缺省打印机(&p)" +msgstr "缺省样式(&p)" #: src/frontends/qt4/ui/BiblioUi.ui:131 #, fuzzy msgid "Define the default BibTeX style" -msgstr "选择一个BibTeX式样" +msgstr "选择一个BibTeX样式" #: src/frontends/qt4/ui/BiblioUi.ui:140 msgid "Select this if you want to split your bibliography into sections" -msgstr "选择此项按章节划分文献引用" +msgstr "选择此项按章节分段放置文献引用\n" +"每段可以指定不同样式的参考书目\n" +"请参考 bibtopic 套件说明文件" #: src/frontends/qt4/ui/BiblioUi.ui:143 msgid "S&ectioned bibliography" -msgstr "按章节划分的文献引用(&e)" +msgstr "按章节分段放置的文献引用(&e)" #: src/frontends/qt4/ui/BiblioUi.ui:153 msgid "" @@ -268,7 +270,7 @@ msgstr "添加文献引用到目录(&T)" #: src/frontends/qt4/ui/ToggleWarningUi.ui:90 #: src/frontends/qt4/ui/WrapUi.ui:150 msgid "&OK" -msgstr "确认(&O)" +msgstr "确定(&O)" #: src/frontends/qt4/ui/BibtexUi.ui:225 msgid "Move the selected database downwards in the list" @@ -489,7 +491,7 @@ msgstr "ThickLine" #: src/frontends/qt4/ui/BoxUi.ui:338 #, fuzzy msgid "
