[LyX 2.0.x] ia.po: translations from Giovanni
The branch, 2.0.x, has been updated.
- Log -
commit 46db6873cb210c2ecc6a01c57480d5b0376ed415
Author: Uwe Stöhr
Date: Sun Jan 13 04:46:43 2013 +0100
ia.po: translations from Giovanni
diff --git a/po/ia.po b/po/ia.po
index 5cfd16a..ed06376 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -2,20 +2,20 @@
# Copyright (C) 2011 LyX Developers
# basate sur le version initial in italiano
# g.sora , 2011.
-# Giovanni Sora, 2011, 2012.
+# Giovanni Sora, 2011, 2012, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ia\n"
"Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
"POT-Creation-Date: 2013-01-03 12:06-0500\n"
-"PO-Revision-Date: 2012-06-28 13:29+0200\n"
+"PO-Revision-Date: 2013-01-10 09:41+0100\n"
"Last-Translator: Giovanni Sora \n"
"Language-Team: Interlingua LyX Team \n"
"Language: ia\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.4\n"
"X-Poedit-Basepath: C:/cygwin/usr/local/src/lyx/lyx-devel\n"
"X-Poedit-SourceCharset: iso-8859-1\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
@@ -6397,14 +6397,12 @@ msgid "Phone:"
msgstr "Telephono:"
#: lib/layouts/achemso.layout:136
-#, fuzzy
msgid "Abbreviations"
-msgstr "Relationes AMS"
+msgstr "Abbreviationes"
#: lib/layouts/achemso.layout:142
-#, fuzzy
msgid "Abbreviations:"
-msgstr "Variation:"
+msgstr "Abbreviationes:"
#: lib/layouts/achemso.layout:151 lib/layouts/apa6.layout:264
#: lib/layouts/ectaart.layout:120 lib/layouts/elsarticle.layout:265
@@ -6441,22 +6439,20 @@ msgid "List of Graphs"
msgstr "Lista de graphicos"
#: lib/layouts/achemso.layout:240
-#, fuzzy
msgid "SupplementalInfo"
-msgstr "Supplemento"
+msgstr "Information supplementari"
#: lib/layouts/achemso.layout:243
msgid "Supporting Information Available"
-msgstr ""
+msgstr "Supportante information disponibile"
#: lib/layouts/achemso.layout:246
-#, fuzzy
msgid "TOC entry"
-msgstr "Autor indice general"
+msgstr "Entrata de indice general"
#: lib/layouts/achemso.layout:250
msgid "Graphical TOC Entry"
-msgstr ""
+msgstr "Entrata de Indice general graphic"
#: lib/layouts/achemso.layout:254
msgid "Bibnote"
@@ -6671,34 +6667,28 @@ msgid "(\\alph{enumii})"
msgstr "(\\alph{enumii})"
#: lib/layouts/apa6.layout:111
-#, fuzzy
msgid "FiveAuthors"
-msgstr "Autores"
+msgstr "Cinque Autores"
#: lib/layouts/apa6.layout:118
-#, fuzzy
msgid "SixAuthors"
-msgstr "Autores"
+msgstr "Sex Autores"
#: lib/layouts/apa6.layout:125
-#, fuzzy
msgid "LeftHeader"
msgstr "Capite sinistre"
#: lib/layouts/apa6.layout:134
-#, fuzzy
msgid "Left header:"
msgstr "Capite sinistre:"
#: lib/layouts/apa6.layout:189
-#, fuzzy
msgid "FiveAffiliations"
-msgstr "Affiliation"
+msgstr "Cinque Affiliationes"
#: lib/layouts/apa6.layout:196
-#, fuzzy
msgid "SixAffiliations"
-msgstr "Affiliation"
+msgstr "Sex Affiliationes"
#: lib/layouts/apa6.layout:204 lib/layouts/elsart.layout:392
#: lib/layouts/iopart.layout:95 lib/layouts/llncs.layout:362
@@ -6725,12 +6715,10 @@ msgid "Note:"
msgstr "Nota:"
#: lib/layouts/apa6.layout:272
-#, fuzzy
msgid "AuthorNote"
-msgstr "Autor"
+msgstr "Nota de Autor"
#: lib/layouts/apa6.layout:291
-#, fuzzy
msgid "Author Note:"
msgstr "Apostilla de autor:"
@@ -6740,9 +6728,8 @@ msgstr "Jornal"
#: lib/layouts/apa6.layout:306 lib/layouts/apa6.layout:314
#: lib/layouts/apa6.layout:323 lib/layouts/apa6.layout:331
-#, fuzzy
msgid "Preamble"
-msgstr "Solmente preambulo"
+msgstr "Preambulo"
#: lib/layouts/apa6.layout:322
msgid "CopNum"
@@ -8926,11 +8913,11 @@ msgstr "Titulo LaTeX currente"
#: lib/layouts/llncs.layout:172 lib/layouts/svcommon.inc:371
msgid "TOC Title"
-msgstr "Titulo Indice general"
+msgstr "Titulo de Indice general"
#: lib/layouts/llncs.layout:176 lib/layouts/svcommon.inc:382
msgid "TOC title:"
-msgstr "Titulo Indice general:"
+msgstr "Titulo de Indice general:"
#: lib/layouts/llncs.layout:200
msgid "Author Running"
@@ -8942,11 +8929,11 @@ msgstr "Autor currente:"
#: lib/layouts/llncs.layout:208 lib/layouts/svcommon.inc:389
msgid "TOC Author"
-msgstr "Autor indice general"
+msgstr "Autor de indice general"
#: lib/layouts/llncs.layout:212
msgid "TOC Author:"
-msgstr "Autor indice general:"
+msgstr "Autor de indice general:"
#: lib/layouts/llncs.layout:300
msgid "Case #."
@@ -9029,69 +9016,60 @@ msgid "Legend"
msgstr "Legenda"
#: lib/layouts/moderncv.layout:34
-#, fuzzy
msgid "CVStyle"
-msgstr "Stilo"
+msgstr "Stilo de CV"
#: lib/layouts/moderncv.layout:43
-#, fuzzy
msgid "CV style:"
-msgstr "St&ilo de citation:"
+msgstr "Stilo de CV:"
#: lib/layouts/moderncv.layout:50
-#, fuzzy
msgid "CVColor"
-msgstr "Color"
+msgstr "Color de CV"
#: lib/layouts/moderncv.layout:53
msgid "CV color scheme:"
-msgstr ""
+msgstr "Schema de color de CV:"
#: lib/layouts/moderncv.layout:56 lib/layouts/db_stdtitle.inc:94
msgi
[LyX master] cmake/build.bat: update build script for installations
The branch, master, has been updated. - Log - commit 409f384e2177856471e9bf783153457b19b3f37a Author: Uwe Stöhr Date: Sun Jan 13 20:16:06 2013 +0100 cmake/build.bat: update build script for installations diff --git a/development/cmake/build.bat b/development/cmake/build.bat index c08865e..0a2b609 100755 --- a/development/cmake/build.bat +++ b/development/cmake/build.bat @@ -5,7 +5,6 @@ echo - echo Usage build.bat devel/install/deploy STUDIO(optional) echo devel - Builds Visual Studio project files for development on LyX echo install - Builds Visual Studio project files with all enabled for installation -echo deploy - Builds Makefiles and installs LyX echo STUDIO - Used Visual Studio version, default is "Visual Studio 10" echo use "Visual Studio 9 2008" for Visual Studio 9 echo @@ -86,9 +85,9 @@ 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% -G%USED_STUDIO% -DLYX_MERGE_REBUILD=0 -DLYX_MERGE_FILES=0 -DLYX_INSTALL=1 %DEPENDENCIES_DOWNLOAD% + cmake %LYX_SOURCE% -G%USED_STUDIO% -DLYX_MERGE_REBUILD=0 -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF %DEPENDENCIES_DOWNLOAD% msbuild lyx.sln /p:Configuration=Release /t:ALL_BUILD - msbuild INSTALL.vcxproj /p:Configuration=Release + msbuild INSTALL.vcxproj /p:Configuration=Release ) REM go back to the dir where the script was called from --- Summary of changes: development/cmake/build.bat |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] some refinements for paper class example and templates
The branch, master, has been updated. - Log - commit ab8365b3ed8aaf76e782f975f0a45b44ce9540e2 Author: Uwe Stöhr Date: Sun Jan 13 22:59:16 2013 +0100 some refinements for paper class example and templates - update fileformats - sigplanconf.layout: fix a bug and improve a command diff --git a/lib/examples/R-S-statements.lyx b/lib/examples/R-S-statements.lyx index a64df19..5548ad5 100644 --- a/lib/examples/R-S-statements.lyx +++ b/lib/examples/R-S-statements.lyx @@ -49,7 +49,7 @@ rsphrase \pdf_bookmarksopenlevel 1 \pdf_breaklinks false \pdf_pdfborder false -\pdf_colorlinks 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" diff --git a/lib/examples/achemso.lyx b/lib/examples/achemso.lyx index 903563f..53d3520 100644 --- a/lib/examples/achemso.lyx +++ b/lib/examples/achemso.lyx @@ -1,5 +1,5 @@ #LyX 2.1 created this file. For more info see http://www.lyx.org/ -\lyxformat 446 +\lyxformat 459 \begin_document \begin_header \textclass achemso @@ -45,6 +45,8 @@ theorems-ams \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 numerical @@ -430,7 +432,7 @@ sideways false status open \begin_layout Plain Layout -\begin_inset Caption +\begin_inset Caption Standard \begin_layout Plain Layout An example scheme @@ -453,7 +455,7 @@ sideways false status open \begin_layout Plain Layout -\begin_inset Caption +\begin_inset Caption Standard \begin_layout Plain Layout An example chart @@ -476,7 +478,7 @@ sideways false status open \begin_layout Plain Layout -\begin_inset Caption +\begin_inset Caption Standard \begin_layout Plain Layout An example graph diff --git a/lib/examples/europeCV.lyx b/lib/examples/europeCV.lyx index c32b876..cbc4493 100644 --- a/lib/examples/europeCV.lyx +++ b/lib/examples/europeCV.lyx @@ -1,5 +1,5 @@ #LyX 2.1 created this file. For more info see http://www.lyx.org/ -\lyxformat 449 +\lyxformat 459 \begin_document \begin_header \textclass europecv @@ -41,6 +41,8 @@ \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 numerical diff --git a/lib/examples/modernCV.lyx b/lib/examples/modernCV.lyx index 0e376d4..cb9f1fd 100644 --- a/lib/examples/modernCV.lyx +++ b/lib/examples/modernCV.lyx @@ -1,5 +1,5 @@ #LyX 2.1 created this file. For more info see http://www.lyx.org/ -\lyxformat 447 +\lyxformat 459 \begin_document \begin_header \textclass moderncv @@ -44,6 +44,8 @@ \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 numerical diff --git a/lib/layouts/sigplanconf.layout b/lib/layouts/sigplanconf.layout index 8447966..1b6573b 100644 --- a/lib/layouts/sigplanconf.layout +++ b/lib/layouts/sigplanconf.layout @@ -77,6 +77,7 @@ Style Conference Align Left Argument 1 Mandatory 1 + AutoInsert1 LabelString "Name" Tooltip "Name of the conference" EndArgument @@ -175,7 +176,7 @@ End Style Keywords - CopyStyle CopyrightYear + CopyStyle Terms LatexName keywords LabelString "Keywords:" End diff --git a/lib/templates/ACM-siggraph.lyx b/lib/templates/ACM-siggraph.lyx index 128ae5a..7fcae18 100644 --- a/lib/templates/ACM-siggraph.lyx +++ b/lib/templates/ACM-siggraph.lyx @@ -1,5 +1,5 @@ #LyX 2.1 created this file. For more info see http://www.lyx.org/ -\lyxformat 449 +\lyxformat 459 \begin_document \begin_header \textclass acmsiggraph @@ -36,6 +36,8 @@ \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 numerical @@ -401,7 +403,7 @@ Optional \end_inset -\begin_inset Caption +\begin_inset Caption Standard \begin_layout Plain Layout \begin_inset Note Note diff --git a/lib/templates/ACM-sigplan.lyx b/lib/templates/ACM-sigplan.lyx index 5e5f6fe..d478e22 100644 --- a/lib/templates/ACM-sigplan.lyx +++ b/lib/templates/ACM-sigplan.lyx @@ -1,5 +1,5 @@ #LyX 2.1 created this file. For more info see http://www.lyx.org/ -\lyxformat 449 +\lyxformat 459 \begin_document \begin_header \textclass sigplanconf @@ -37,6 +37,8 @@ \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 numerical diff --git
[LyX master] installer: fix bug that MiKTeX is not found on some 64bit Windows
The branch, master, has been updated.
- Log -
commit 6182ca208b4dfe4befa4a489acebb2265bf55321
Author: Uwe Stöhr
Date: Mon Jan 14 01:45:42 2013 +0100
installer: fix bug that MiKTeX is not found on some 64bit Windows
- LaTeX.nsh: fixe http://nsis.sourceforge.net/Download
- settings.nsh: adapt path so that one needs to adapt less when using the
installer source zip file
- add a readme how to build the installer
diff --git a/development/Win32/packaging/installer/Readme.txt
b/development/Win32/packaging/installer/Readme.txt
new file mode 100644
index 000..3996dc4
--- /dev/null
+++ b/development/Win32/packaging/installer/Readme.txt
@@ -0,0 +1,19 @@
+To build the installer do the following:
+
+1. extract the source zip-file to e.g. the path "C:\LyX"
+2. open the file settings.nsh with a text editor
+ and adapt there the following paths to the one on your PC:
+ !define FILES_LYX "C:\LyX\LyXPackage\LyX"
+ !define FILES_DEPS "C:\LyX\LyX2.0x\lyx-windows-deps-msvc2008"
+ !define FILES_QT "C:\LyX\LyXPackage\LyX"
+3. install NSIS (http://nsis.sourceforge.net/Download)
+4. open the file FindProc.zip (that is part of this bundle),
+ extract from it the file FindProc.dll to the Plugins folder of
+ NSIS's installation folder
+5. open the file InetLoad.zip (that is part of this bundle),
+ extract from it the file InetLoad.dll to the Plugins folder of
+ NSIS's installation folder
+6. right-click on the file lyx-standard.nsi and choose "Compile NSIS script"
+ to compile the standard installer
+7. right-click on the file lyx-bundle.nsi and choose "Compile NSIS script"
+ to compile the bundle installer
\ 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 1acdd66..9f5f82f 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -27,6 +27,9 @@ Handling of LaTeX distributions
Function LaTeXActions
# checks if MiKTeX or TeXLive is installed
+ ${if} ${RunningX64}
+ SetRegView 64
+ ${endif}
# test if MiKTeX is installed
# reads the PATH variable via the registry because NSIS' "$%Path%" variable
is not updated when the PATH changes
ReadRegStr $String HKLM "SYSTEM\CurrentControlSet\Control\Session
Manager\Environment" "Path"
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index e95bfbf..c04673b 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 5
!define APP_VERSION_EMERGENCY "1" # 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 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
@@ -37,10 +37,9 @@ These typically need to be modified for each LyX release
# File locations
# !!! you need to adjust them to the folders in your Windows system !!!
-!define FILES_LYX "C:\LyX\lyx-20-install"
-!define FILES_DEPS "C:\LyX\lyx-20-build\msvc2010-deps\deps20"
-!define FILES_BUNDLE "C:\LyX\depsbundle"
-!define FILES_QT "C:\Qt\qt-everywhere-opensource-src-4.8.3"
+!define FILES_LYX "C:\LyX\LyXPackage\LyX"
+!define FILES_DEPS "C:\LyX\LyX2.0x\lyx-windows-deps-msvc2008"
+!define FILES_QT "C:\LyX\LyXPackage\LyX"
!define ClassFileDir "${FILES_LYX}\Resources\tex"
!define DVIPostFileDir "${FILES_DEPS}\tex"
---
Summary of changes:
development/Win32/packaging/installer/Readme.txt | 19 +++
.../Win32/packaging/installer/include/LaTeX.nsh|3 +++
development/Win32/packaging/installer/settings.nsh |9 -
3 files changed, 26 insertions(+), 5 deletions(-)
create mode 100644 development/Win32/packaging/installer/Readme.txt
hooks/post-receive
--
The LyX Source Repository
[LyX 2.0.x] German splash.lyx: fix a typo
The branch, 2.0.x, has been updated. - Log - commit 9702aa3d3f349fb915c919feb1049613f9a03217 Author: Uwe Stöhr Date: Mon Jan 14 21:53:51 2013 +0100 German splash.lyx: fix a typo diff --git a/lib/examples/de/splash.lyx b/lib/examples/de/splash.lyx index db598bc..ac76d1f 100644 --- a/lib/examples/de/splash.lyx +++ b/lib/examples/de/splash.lyx @@ -147,7 +147,7 @@ LyX für LaTeX-Benutzer \begin_layout Enumerate LyX bietet ausführliche Unterstützung für all diejenigen, die eine andere Sprache als Englisch lesen und schreiben. - Darüberhinaus sind Dinge wie Tastaturbelegung, Werkzeugleiste und viele + Darüber hinaus sind Dinge wie Tastaturbelegung, Werkzeugleiste und viele weitere Sachen frei konfigurierbar. Näheres erläutert \family sans --- Summary of changes: lib/examples/de/splash.lyx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] German splash.lyx: fix a typo
The branch, master, has been updated. - Log - commit 6bedd093c8d3993e2773f5130625eedd53571bb5 Author: Uwe Stöhr Date: Mon Jan 14 21:54:48 2013 +0100 German splash.lyx: fix a typo diff --git a/lib/examples/de/splash.lyx b/lib/examples/de/splash.lyx index db598bc..ac76d1f 100644 --- a/lib/examples/de/splash.lyx +++ b/lib/examples/de/splash.lyx @@ -147,7 +147,7 @@ LyX für LaTeX-Benutzer \begin_layout Enumerate LyX bietet ausführliche Unterstützung für all diejenigen, die eine andere Sprache als Englisch lesen und schreiben. - Darüberhinaus sind Dinge wie Tastaturbelegung, Werkzeugleiste und viele + Darüber hinaus sind Dinge wie Tastaturbelegung, Werkzeugleiste und viele weitere Sachen frei konfigurierbar. Näheres erläutert \family sans --- Summary of changes: lib/examples/de/splash.lyx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] installer: ChangeLog for latest release
The branch, master, has been updated. - Log - commit de59722ba43ab3dfb3c53a357d0571ebae7ce62b Author: Uwe Stöhr Date: Tue Jan 15 00:53:37 2013 +0100 installer: ChangeLog for latest release diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 81b6538..231225e 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,4 +1,17 @@ -Changelog for LyX-205-5: +Changelog for LyX-2051-2: +Bugfix: +- fix bug that an installed MiKTeX was not found on Windows 7 and 8 with 64 bit + +New feature: +- adapt the source package to make it easier to comple the installer; + added a Readme file describing how to compile + + +Changelog for LyX-2051-1: +Nothing changed except of LyX. + + +Changelog for LyX-205-5: Bugfixes: - fix bug that installer stopped working if LyX was installed the first time on a computer @@ -52,7 +65,7 @@ Changelog for LyX-205-2: - fixed detection for already installed Ghostscript and GSview on 64bit Windows - fixed detection for jEdit, Vim, WinEdt and TeXnicCenter as LaTeX source file editor - fixed detection of Gimp and Photoshop as image manipulating program -- updated spell-checker dictionaries for German and Belorussion +- updated spell-checker dictionaries for German and Belorussian (To benefit from them you must uninstall an already installed LyX 2.0.x and then use this installer.) - updated thesaurus for German --- Summary of changes: .../Win32/packaging/installer/ChangeLog.txt| 17 +++-- 1 files changed, 15 insertions(+), 2 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] installer: further fixes for MiKTeX
The branch, master, has been updated.
- Log -
commit 744de62e22489a674e04cd2258b9e2514a27af12
Author: Uwe Stöhr
Date: Thu Jan 17 01:12:38 2013 +0100
installer: further fixes for MiKTeX
LaTeX.nsh:
- fix a MiKTeX configuration Problem on 64bit Windows issue discovered in
#8417
- don't overwrite MiKTeX's package repository the user might have set
purposely
- remove some unused code and simplify some code
- update to JabRef 2.9.2
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 231225e..8c54f37 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,8 +1,11 @@
-Changelog for LyX-2051-2:
-Bugfix:
-- fix bug that an installed MiKTeX was not found on Windows 7 and 8 with 64 bit
+Changelog for LyX-2051-3:
+- fix bug that MiKTeX was not correctly configures on somme 64bit versions of
Windows 7
+- don't overwrite the MiKTeX package repository from where missing packages
will be installed
+- updated to JabRef 2.9.2
+
-New feature:
+Changelog for LyX-2051-2:
+- fix bug that an installed MiKTeX was not found on Windows 7 and 8 with 64 bit
- adapt the source package to make it easier to comple the installer;
added a Readme file describing how to compile
diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh
b/development/Win32/packaging/installer/include/LaTeX.nsh
index 9f5f82f..e0bcfc6 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -28,7 +28,7 @@ Function LaTeXActions
# checks if MiKTeX or TeXLive is installed
${if} ${RunningX64}
- SetRegView 64
+ SetRegView 64 # the PATH is in the 64bit registry section
${endif}
# test if MiKTeX is installed
# reads the PATH variable via the registry because NSIS' "$%Path%" variable
is not updated when the PATH changes
@@ -36,16 +36,44 @@ Function LaTeXActions
StrCpy $Search "miktex"
Call LaTeXCheck # sets the path to the latex.exe to $PathLaTeX # Function
from LyXUtils.nsh
+ # check for 32bit MiKTeX
${if} $PathLaTeX != ""
+ ${if} ${RunningX64}
+SetRegView 32
+ ${endif}
# check if MiKTeX 2.8 or newer is installed
StrCpy $0 0
- loopA:
+ loop32:
EnumRegKey $1 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" $0 # check the last subkey
-StrCmp $1 "" doneA
+StrCmp $1 "" done32
StrCpy $String $1
IntOp $0 $0 + 1
-Goto loopA
- doneA:
+Goto loop32
+ done32:
+ ${if} $String == "2.8"
+StrCpy $MiKTeXVersion "2.8"
+StrCpy $LaTeXName "MiKTeX 2.8"
+ ${endif}
+ ${if} $String == "2.9"
+StrCpy $MiKTeXVersion "2.9"
+StrCpy $LaTeXName "MiKTeX 2.9"
+ ${endif}
+ ${endif}
+
+ # check for 64bit MiKTeX
+ ${if} $PathLaTeX == ""
+ ${if} ${RunningX64}
+SetRegView 64
+ ${endif}
+ # check if MiKTeX 2.8 or newer is installed
+ StrCpy $0 0
+ loop64:
+EnumRegKey $1 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" $0 # check the last subkey
+StrCmp $1 "" done64
+StrCpy $String $1
+IntOp $0 $0 + 1
+Goto loop64
+ done64:
${if} $String == "2.8"
StrCpy $MiKTeXVersion "2.8"
StrCpy $LaTeXName "MiKTeX 2.8"
@@ -59,6 +87,9 @@ Function LaTeXActions
${if} $PathLaTeX != ""
StrCpy $MiKTeXUser "HKLM" # needed later to configure MiKTeX
${else} # check if MiKTeX is installed only for the current user
+ ${if} ${RunningX64}
+SetRegView 64 # the PATH is in the 64bit registry section
+ ${endif}
ReadRegStr $String HKCU "Environment" "Path"
StrCpy $Search "miktex"
Call LaTeXCheck # function from LyXUtils.nsh
@@ -98,6 +129,9 @@ Function LaTeXActions
# test if TeXLive is installed
# TeXLive can be installed so that it appears in the PATH variable and/or
only as current user.
# The safest method is to first check for the PATH because this is
independent of the TeXLive version.
+ ${if} ${RunningX64}
+ SetRegView 64 # the PATH is in the 64bit registry section
+ ${endif}
${if} $PathLaTeX == ""
ReadRegStr $String HKLM "SYSTEM\CurrentControlSet\Control\Session
Manager\Environment" "Path"
StrCpy $Search "TeXLive"
@@ -111,6 +145,9 @@ Function LaTeXActions
Call LaTeXCheck # function from LyXUtils.nsh
${endif}
# check if it was installed to the system
+ ${if} ${RunningX64}
+ SetRegView 32 # TeXLive is a 32bit application
+ ${endif}
${if} $PathLaTeX == ""
ReadRegStr $String HKLM
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2012"
"UninstallString"
${if} $String == ""
@@ -158,6 +195,9 @@ FunctionEnd
ExecWait ${MiKTeXInstall}
# test if MiKTeX is installed
Call LaTeXActions
+ ${if} ${RunningX64}
+SetRegView 32 # we install the 32bit version of MiKTeX
+ ${endif}
${if} $PathLaTeX != ""
# special entry that it was installed
[LyX master] layout/module files: some whitespace uniformications
The branch, master, has been updated. - Log - commit 2bd368fd6b276663b327e64acc6b46c87cc3c7a9 Author: Uwe Stöhr Date: Sun Jan 20 16:44:05 2013 +0100 layout/module files: some whitespace uniformications diff --git a/lib/layouts/braille.module b/lib/layouts/braille.module index 3334c04..93fb232 100644 --- a/lib/layouts/braille.module +++ b/lib/layouts/braille.module @@ -20,164 +20,164 @@ EndPreamble # default Braille Style Braille_(default) - LatexType command - LatexName braillenormal - NextNoIndent1 - LeftMargin XBraille: - LabelSepxx - ParSkip 0.0 - ItemSep 0.2 - TopSep 0.7 - BottomSep 0.7 - ParSep 0.3 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString "Braille:" + LatexType command + LatexName braillenormal + NextNoIndent1 + LeftMargin XBraille: + LabelSepxx + ParSkip 0.0 + ItemSep 0.2 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.3 + Align Block + AlignPossible Block, Left + LabelType Static + LabelString "Braille:" LabelFont - Shape Italic - Color Blue + Shape Italic + Color Blue EndFont End # Braille in text size Style Braille_(textsize) - LatexType command - LatexName brailletext - NextNoIndent1 - LeftMargin XBraille: - LabelSepxx - ParSkip 0.0 - ItemSep 0.2 - TopSep 0.7 - BottomSep 0.7 - ParSep 0.3 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString "Braille:" + LatexType command + LatexName brailletext + NextNoIndent1 + LeftMargin XBraille: + LabelSepxx + ParSkip 0.0 + ItemSep 0.2 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.3 + Align Block + AlignPossible Block, Left + LabelType Static + LabelString "Braille:" LabelFont - Shape Italic - Color Blue + Shape Italic + Color Blue EndFont End # turn on dots Style Braille_(dots_on) - LatexType command - LatexName brailleputtinydotstrue - NextNoIndent1 - KeepEmpty 1 - LeftMargin XBraille_dots_on - LabelSepxx - ParSkip 0.0 - ItemSep 0.2 - TopSep 0.7 - BottomSep 0.7 - ParSep 0.3 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString "Braille_dots_on" + LatexType command + LatexName brailleputtinydotstrue + NextNoIndent1 + KeepEmpty 1 + LeftMargin XBraille_dots_on + LabelSepxx + ParSkip 0.0 + ItemSep 0.2 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.3 + Align Block + AlignPossible Block, Left + LabelType Static + LabelString "Braille_dots_on" LabelFont - Shape Italic - Color Green + Shape Italic + Color Green EndFont End # turn off dots Style Braille_(dots_off) - LatexType command - LatexName brailleputtinydotsfalse - NextNoIndent1 - KeepEmpty 1 - LeftMargin XBraille_dots_off - LabelSepxx - ParSkip 0.0 - ItemSep 0.2 - TopSep 0.7 - BottomSep 0.7 - ParSep 0.3 - Align Block - AlignPossible Block, Left - LabelType Static - LabelString "Braille_dots_off" + LatexType command + LatexName brailleputtinydotsfalse + NextNoIndent1 + KeepEmpty 1 + LeftMargin XBraille_dots_off + LabelSep
[LyX master] add some AutoInsert for layouts
The branch, master, has been updated. - Log - commit 1a0e43faffa309aa45128f233e86f08a19ceaebd Author: Uwe Stöhr Date: Sun Jan 20 17:56:28 2013 +0100 add some AutoInsert for layouts diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout index 9c61ef2..596f56a 100644 --- a/lib/layouts/IEEEtran.layout +++ b/lib/layouts/IEEEtran.layout @@ -165,6 +165,7 @@ Style Page_headings AlignCenter Argument 1 Mandatory 1 +AutoInsert 1 LabelString"Left Side" Tooltip"Left side of the header line" EndArgument @@ -286,6 +287,7 @@ Style Biography EndArgument Argument 2 Mandatory 1 +AutoInsert 1 LabelString"Name" Tooltip"Name of the author" EndArgument @@ -302,6 +304,7 @@ Style Biography_without_photo ResetArgs1 Argument 1 Mandatory 1 +AutoInsert 1 LabelString"Name" Tooltip"Name of the author" EndArgument diff --git a/lib/layouts/europecv.layout b/lib/layouts/europecv.layout index ddc96d8..d8bf98f 100644 --- a/lib/layouts/europecv.layout +++ b/lib/layouts/europecv.layout @@ -160,6 +160,7 @@ Style Item EndArgument Argument 2 Mandatory 1 + AutoInsert1 LabelString "Summary" Tooltip "Summary of the item, can also be the time" EndArgument diff --git a/lib/layouts/ijmpc.layout b/lib/layouts/ijmpc.layout index 0a39e1d..bc39fd8 100644 --- a/lib/layouts/ijmpc.layout +++ b/lib/layouts/ijmpc.layout @@ -70,6 +70,7 @@ Style MarkBoth AlignCenter Argument 1 Mandatory 1 +AutoInsert 1 LabelString"Author Names" Tooltip"Author names that will appear in the header line" EndArgument diff --git a/lib/layouts/ijmpd.layout b/lib/layouts/ijmpd.layout index f948946..3a009c8 100644 --- a/lib/layouts/ijmpd.layout +++ b/lib/layouts/ijmpd.layout @@ -75,6 +75,7 @@ Style MarkBoth AlignCenter Argument 1 Mandatory 1 +AutoInsert 1 LabelString"Author Names" Tooltip"Author names that will appear in the header line" EndArgument --- Summary of changes: lib/layouts/IEEEtran.layout |3 +++ lib/layouts/europecv.layout |1 + lib/layouts/ijmpc.layout|1 + lib/layouts/ijmpd.layout|1 + 4 files changed, 6 insertions(+), 0 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] moderncv.layout: add some AutoInsert
The branch, master, has been updated. - Log - commit b6ce3e10b27ed2b959c05c14de6f5c2b201d4a12 Author: Uwe Stöhr Date: Sun Jan 20 21:22:55 2013 +0100 moderncv.layout: add some AutoInsert diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout index 57aa0bd..575ca7d 100644 --- a/lib/layouts/moderncv.layout +++ b/lib/layouts/moderncv.layout @@ -104,6 +104,7 @@ Style Address TopSep 0 Argument 1 Mandatory 1 + AutoInsert1 LabelString "Street" EndArgument End @@ -257,6 +258,7 @@ Style Item LatexName cvitem Argument 1 Mandatory 1 + AutoInsert1 LabelString "Summary" Tooltip "Summary" EndArgument @@ -337,6 +339,7 @@ Style DoubleListItem ResetArgs 1 Argument 1 Mandatory 1 + AutoInsert1 LabelString "First Item" Tooltip "First Item" EndArgument @@ -442,6 +445,7 @@ Style Recipient CategoryLetter Argument 1 Mandatory 1 + AutoInsert1 LabelString "Company name" Tooltip "Company name" #Font --- Summary of changes: lib/layouts/moderncv.layout |4 1 files changed, 4 insertions(+), 0 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] Additional.lyx: correct a description
The branch, master, has been updated. - Log - commit 67dcc67daeba31ee48723c56193881d475e7c72d Author: Uwe Stöhr Date: Sun Jan 20 22:49:22 2013 +0100 Additional.lyx: correct a description - also use another paragraph shape to fix #8512 diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx index b3a8d81..dfbf656 100644 --- a/lib/doc/Additional.lyx +++ b/lib/doc/Additional.lyx @@ -24103,8 +24103,8 @@ arg "specialchar-insert hyphenation" \end_layout \begin_layout Standard -Shapepar paragraphs are always placed on the page that their left border - touches the left page margin. +Shapepar paragraphs are either always centered or placed on the page so + that their left border touches the left page margin. You can therefore not use the paragraph dialog to align such paragraphs. A solution is to put the paragraph into a minipage or parbox and align the box. @@ -24112,8 +24112,8 @@ Shapepar paragraphs are always placed on the page that their left border Because if it is too wide and you center the box, the paragraph is not centered too because it sticks at the left side of the box. So you might have to play a bit with the width until it fits. - Here are two triangular paragraphs, the first one is not aligned, the second - one is centered: + Here are two heart-shaped paragraphs, the first one is not aligned, the + second one is right-aligned: \end_layout \begin_layout Standard @@ -24123,7 +24123,8 @@ Shapepar paragraphs are always placed on the page that their left border \end_layout -\begin_layout Triangle up +\begin_layout Heart +\noindent \lang latin Lo\SpecialChar \- @@ -24143,7 +24144,8 @@ rem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy \end_layout \begin_layout Standard -\align center +\noindent +\align right \begin_inset Box Frameless position "t" hor_pos "c" @@ -24157,7 +24159,8 @@ height "1in" height_special "totalheight" status open -\begin_layout Triangle up +\begin_layout Heart +\noindent \lang latin Lo\SpecialChar \- diff --git a/lib/doc/de/Additional.lyx b/lib/doc/de/Additional.lyx index 0396a3c..8dfdcdd 100644 --- a/lib/doc/de/Additional.lyx +++ b/lib/doc/de/Additional.lyx @@ -26358,8 +26358,8 @@ nungsmechanismus für Text in den Spitzen versagt. \end_layout \begin_layout Standard -Shapepar-Absätze werden immer so auf die Seite platziert, dass ihre linke - Kante den linken Seitenrand berührt. +Shapepar-Absätze werden immer entweder zentriert oder so auf die Seite platziert +, dass ihre linke Kante den linken Seitenrand berührt. Man kann daher nicht den Absatzdialog verwenden, um solche Absätze auszurichten. Eine Lösung ist den Absatz in eine Minipage oder Parbox zu setzen und dann die Box auszurichten. @@ -26367,8 +26367,8 @@ Shapepar-Absätze werden immer so auf die Seite platziert, dass ihre linke Denn ist sie zu breit und man zentriert die Box, ist der Absatz nicht ebenfalls zentriert, da er an der linken Seite der Box haftet. Daher muss man eventuell etwas mit der Breite spielen bis es passt. - Hier sind zwei dreieckige Absätze, der erste ist nicht ausgerichtet, der - zweite ist zentriert: + Hier sind zwei herzförmige Absätze, der erste ist nicht ausgerichtet, der + zweite ist rechts ausgerichtet: \end_layout \begin_layout Standard @@ -26378,7 +26378,8 @@ Shapepar-Absätze werden immer so auf die Seite platziert, dass ihre linke \end_layout -\begin_layout Triangle up +\begin_layout Heart +\noindent \lang latin Lo\SpecialChar \- @@ -26398,7 +26399,8 @@ rem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy \end_layout \begin_layout Standard -\align center +\noindent +\align right \begin_inset Box Frameless position "t" hor_pos "c" @@ -26412,7 +26414,8 @@ height "1in" height_special "totalheight" status open -\begin_layout Triangle up +\begin_layout Heart +\noindent \lang latin Lo\SpecialChar \- diff --git a/lib/doc/es/Additional.lyx b/lib/doc/es/Additional.lyx index 27d1f96..7c1eb49 100644 --- a/lib/doc/es/Additional.lyx +++ b/lib/doc/es/Additional.lyx @@ -25922,17 +25922,17 @@ arg "specialchar-insert hyphenation" \begin_layout Standard \lang english -Shapepar paragraphs are always placed on the page that their left border - touches the left page margin. - You can therefore not use the paragraph dialog to align such paragraphs. +Shapepar paragraphs are either always centered or placed on the page so + that their left border touches the left page margin.You can therefore not + use the paragraph dialog to align such paragraphs. A solution is to put the paragraph into a minipage or parbox and align the box. The problem is hereby to find the right width for the box. Because if it is too wide and you center the box, the paragraph is not centered too because it sticks at the left side of the box. So you might have to play a bit with the width until it fi
[LyX 2.0.x] Revert "achemso: complete revision of layout and example"
The branch, 2.0.x, has been updated.
- Log -
commit 2b671572604dc62a642ab4ac22d3182b5a56ee69
Author: Uwe Stöhr
Date: Tue Jan 22 00:20:51 2013 +0100
Revert "achemso: complete revision of layout and example"
This reverts commit 56da307e19a8d3ddb60b8963b4cd710269d0930c.
Revert the achemso.layout changes because they were not that pressing
(preamble stuff was supported via styles).
For modernCV I don't see another way than to let it in because it is not
working as it was, neither with TeXLive 2012 nor with MiKTeX and therefore in
most cases unusable
diff --git a/lib/examples/achemso.lyx b/lib/examples/achemso.lyx
index 88bac72..4647554 100644
--- a/lib/examples/achemso.lyx
+++ b/lib/examples/achemso.lyx
@@ -4,10 +4,37 @@
\begin_header
\textclass achemso
\begin_preamble
-% If issues arise when submitting your manuscript, you may want to
-% un-comment the next line. This provides information on the
-% version of every file you have used.
-%\listfiles
+% Each author should be given as a separate \author command.
+%
+% Corresponding authors should have an e-mail given after the author
+% name as an \email command.
+%
+% The affiliation of authors is given after the authors; each
+% \affiliation command applies to all preceding authors not already
+% assigned an affiliation.
+%
+% The affiliation takes an option argument for the short name. This
+% will typically be something like "University of Somewhere".
+%
+% Notice that \alsoaffiliation is used when one (or more) authors work
+% at multiple institutions, while \altaffiliation is intended for previous
+% addresses (or other notes). Only \affiliation applies to multiple
+% authors: both \alsoaffiliation and \altaffiliation are set on a per
+% author basis.
+
+\author{Author Person}
+\author{Second Bloke}
+\email{second.bloke@some.place}
+\affiliation[University of Sometown]{University of Somewhere, Sometown, USA}
+\altaffiliation{Previous address: Minute University, Nowhereville, USA}
+\author{Indus Trialguy}
+\email{i.trial...@sponsor.co}
+\affiliation[SponsoCo]{Research Department, SponsorCo, BigCity, USA}
+\alsoaffiliation{University of Somewhere, Sometown, USA}
+
+% A short title can be given as a *suggestion* for running headers.
+\title[\texttt{achemso} demonstration]
+{A demonstration of the \textsf{achemso} \LaTeX class}
\end_preamble
\options journal=jacsat,manuscript=article
\use_default_options false
@@ -105,36 +132,8 @@ status open
\series bold
Note:
\series default
- The journal where you want to submit is specified in the document class
- options of this file.
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Title
-A demonstration of the achemso LaTeX class
-\begin_inset Argument
-status open
-
-\begin_layout Plain Layout
-
-\family sans
-achemso
-\family default
- demonstration
-\end_layout
-
-\end_inset
-
-
-\begin_inset Foot
-status open
-
-\begin_layout Plain Layout
-A footnote for the title
+ The author, affiliation, email addresses, and the document title have to
+ set up in the LaTeX preamble of this document!
\end_layout
\end_inset
@@ -142,100 +141,17 @@ A footnote for the title
\end_layout
-\begin_layout Author
-Andrew N.
- Other
-\end_layout
-
-\begin_layout Alt Affiliation
-A shared footnote
-\end_layout
-
-\begin_layout Author
-Fred T.
- Secondauthor
-\end_layout
-
-\begin_layout Affiliation
-Current address: Some other place, Othertöwn, Germany
-\end_layout
-
-\begin_layout Author
-I.
- Ken Groupleader
-\end_layout
-
-\begin_layout Affiliation
-A shared footnote
-\end_layout
-
\begin_layout Standard
\begin_inset Note Note
status open
\begin_layout Plain Layout
-The affiliation of authors is given after the authors; each
-\family sans
-Affiliation
-\family default
- applies to all preceding authors not already assigned an affiliation.
-\end_layout
-
-\begin_layout Plain Layout
-
-\family sans
-Altaffiliation
-\family default
- should be used for new address, etc.
-\end_layout
-
-\begin_layout Plain Layout
-\family sans
-Alsoaffiliation
-\family default
- is used on a per author basis when authors are associated with multiple
- institutions.
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Email
-i.k.grouplea...@unknown.uu
-\end_layout
-
-\begin_layout Phone
-+123 (0)123 4445556
-\end_layout
-
-\begin_layout Fax
-+123 (0)123 4445557
-\end_layout
-
-\begin_layout Affiliation
-Department of Chemistry, Unknown University, Unknown Town
-\begin_inset Argument
-status open
-
-\begin_layout Plain Layout
-Unknown University
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Also Affiliation
-Department of Chemistry, Second University, Nearby Town
-\begin_inset Argument
-status open
-
-\begin_layout Plain Layout
-Second University
+\series bold
+Note:
+\series default
+ The journal where you want to sumit is specified in the document class
+ options of this file.
\end_layout
[LyX 2.0.x] status.20x: adaption for achemso reversion
The branch, 2.0.x, has been updated. - Log - commit 313c2b6416db11c6d058b5b1f301a2d397f2000f Author: Uwe Stöhr Date: Tue Jan 22 01:05:18 2013 +0100 status.20x: adaption for achemso reversion diff --git a/status.20x b/status.20x index 5455051..d3bb1f4 100644 --- a/status.20x +++ b/status.20x @@ -44,12 +44,10 @@ What's new - Show a symbol on collapsed branches indicating whether they are active. -- completely revised layout and example files for - - achemso (You don't have to specify the personal information anymore in - in the document preamble, see the achemso.lyx example file) - - modernCV (Note: Due to massive changes in the modernCV document class - you need to adapt your existing files according to the new - example file to keep them compilable.) +- completely revised layout and example files for modernCV + (Note: Due to massive changes in the modernCV document class + you need to adapt your existing files according to the new + example file to keep them compilable.) * DOCUMENTATION AND LOCALIZATION --- Summary of changes: status.20x | 10 -- 1 files changed, 4 insertions(+), 6 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX 2.0.x] tex2lyx: support for listings with options (bug 8066)
The branch, 2.0.x, has been updated.
- Log -
commit 09e2b217dba1741483e9e7ad72dd804d72773992
Author: Uwe Stöhr
Date: Tue Jan 22 01:07:52 2013 +0100
tex2lyx: support for listings with options (bug 8066)
diff --git a/src/tex2lyx/Parser.cpp b/src/tex2lyx/Parser.cpp
index 3d09e01..0067f88 100644
--- a/src/tex2lyx/Parser.cpp
+++ b/src/tex2lyx/Parser.cpp
@@ -492,6 +492,49 @@ string const Parser::verbatimEnvironment(string const &
name)
}
+string const Parser::plainEnvironment(string const & name)
+{
+ if (!good())
+ return string();
+
+ ostringstream os;
+ for (Token t = get_token(); good(); t = get_token()) {
+ if (t.asInput() == "\\end") {
+ string const end = getArg('{', '}');
+ if (end == name)
+ return os.str();
+ else
+ os << "\\end{" << end << '}';
+ } else
+ os << t.asInput();
+ }
+ cerr << "unexpected end of input" << endl;
+ return os.str();
+}
+
+
+string const Parser::plainCommand(char left, char right, string const & name)
+{
+ if (!good())
+ return string();
+ // ceck if first token is really the start character
+ Token tok = get_token();
+ if (tok.character() != left) {
+ cerr << "first character does not match start character of
command \\" << name << endl;
+ return string();
+ }
+ ostringstream os;
+ for (Token t = get_token(); good(); t = get_token()) {
+ if (t.character() == right) {
+ return os.str();
+ } else
+ os << t.asInput();
+ }
+ cerr << "unexpected end of input" << endl;
+ return os.str();
+}
+
+
void Parser::tokenize_one()
{
catInit();
diff --git a/src/tex2lyx/Parser.h b/src/tex2lyx/Parser.h
index 3ddb9df..c82988b 100644
--- a/src/tex2lyx/Parser.h
+++ b/src/tex2lyx/Parser.h
@@ -202,6 +202,19 @@ public:
* is parsed but not returned.
*/
std::string const verbatimEnvironment(std::string const & name);
+ /*
+ * The same as verbatimEnvironment(std::string const & name) but
+ * \begin and \end commands inside the name environment are not parsed.
+ * This function is designed to parse verbatim environments.
+ */
+ std::string const plainEnvironment(std::string const & name);
+ /*
+ * Basically the same as plainEnvironment(std::string const & name) but
+ * instead of \begin and \end commands the parsing is started/stopped
+ * at given characters.
+ * This function is designed to parse verbatim commands.
+ */
+ std::string const plainCommand(char left, char right, std::string const
& name);
/*!
* Returns the character of the current token and increments
* the token position.
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 3e38367..55b746b 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -1110,7 +1110,7 @@ void parse_outer_box(Parser & p, ostream & os, unsigned
flags, bool outer,
}
-void parse_listings(Parser & p, ostream & os, Context & parent_context)
+void parse_listings(Parser & p, ostream & os, Context & parent_context, bool
in_line)
{
parent_context.check_layout(os);
begin_inset(os, "listings\n");
@@ -1118,14 +1118,26 @@ void parse_listings(Parser & p, ostream & os, Context &
parent_context)
string arg = p.verbatimOption();
os << "lstparams " << '"' << arg << '"' << '\n';
if (arg.find("\\color") != string::npos)
- preamble.registerAutomaticallyLoadedPackage("color");
+ preamble.registerAutomaticallyLoadedPackage("color");
+ }
+ if (p.hasOpt()) {
+ string arg = p.verbatimOption();
+ os << "lstparams " << '"' << arg << '"' << '\n';
}
- os << "inline false\n"
- << "status collapsed\n";
+ if (in_line)
+ os << "inline true\n";
+ else
+ os << "inline false\n";
+ os << "status collapsed\n";
Context context(true, parent_context.textclass);
context.layout = &parent_context.textclass.plainLayout();
- context.check_layout(os);
- string const s = p.verbatimEnvironment("lstlisting");
+ string s;
+ if (in_line) {
+ s = p.plainCommand('!', '!', "lstinline");
+ context.new_paragraph(os);
+ context.check_layout(os);
+ } else
+ s = p.plainEnvironment("lstlisting");
for (string::const_iterator it = s.begin(), et = s.end(); it != et;
++it) {
if (*it == '\\')
os << "\n\\backslash\n";
@@ -
[LyX master] lyx_2_1.py: support fir initial.module
The branch, master, has been updated. - Log - commit b42604c7aa0551c4761605f1e9131b05522c98b5 Author: Uwe Stöhr Date: Tue Jan 22 23:27:18 2013 +0100 lyx_2_1.py: support fir initial.module - in [ff718eba/lyxgit] I forgot to force the lyx2lyx conversion, fixes #8515 diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py index 944a8f9..d921cbb 100644 --- a/lib/lyx2lyx/lyx_2_1.py +++ b/lib/lyx2lyx/lyx_2_1.py @@ -1859,6 +1859,33 @@ def convert_EuropeCV(document): return +def revert_Initials(document): + " Reverts InsetArgument of Initial to TeX-code " + i = 0 + while True: +if i != -1: + i = find_token(document.body, "\\begin_layout Initial", i) +if i != -1: + # first arg (optional) and second arg (first mandatory) are supported in LyX 2.0.x + revert_Argument_to_TeX_brace(document, i, 3, 3, False) + i = i + 1 +if i == -1: + return + + +def convert_Initials(document): + " Converts ERT of Initial to InsetArgument " + i = 0 + while True: +if i != -1: + i = find_token(document.body, "\\begin_layout Initial", i) +if i != -1: + convert_TeX_brace_to_Argument(document, i, 3, 3, False, False) + i = i + 1 +if i == -1: + return + + def revert_literate(document): " Revert Literate document to old format " if del_token(document.header, "noweb", 0): @@ -3408,7 +3435,7 @@ convert = [ [444, []], [445, []], [446, [convert_latexargs]], - [447, [convert_IEEEtran, convert_AASTeX, convert_AGUTeX, convert_IJMP, convert_SIGPLAN, convert_SIGGRAPH, convert_EuropeCV]], + [447, [convert_IEEEtran, convert_AASTeX, convert_AGUTeX, convert_IJMP, convert_SIGPLAN, convert_SIGGRAPH, convert_EuropeCV, convert_Initials]], [448, [convert_literate]], [449, []], [450, []], @@ -3436,7 +3463,7 @@ revert = [ [449, [revert_garamondx, revert_garamondx_newtxmath]], [448, [revert_itemargs]], [447, [revert_literate]], - [446, [revert_IEEEtran, revert_AASTeX, revert_AGUTeX, revert_IJMP, revert_SIGPLAN, revert_SIGGRAPH, revert_EuropeCV]], + [446, [revert_IEEEtran, revert_AASTeX, revert_AGUTeX, revert_IJMP, revert_SIGPLAN, revert_SIGGRAPH, revert_EuropeCV, revert_Initials]], [445, [revert_latexargs]], [444, [revert_uop]], [443, [revert_biolinum]], --- Summary of changes: lib/lyx2lyx/lyx_2_1.py | 31 +-- 1 files changed, 29 insertions(+), 2 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX 2.0.x] chkconfig.ltx: correct check for cbgreek
The branch, 2.0.x, has been updated.
- Log -
commit 6b0e79a6acd80194de032d197d360b8ffe43184a
Author: Uwe Stöhr
Date: Wed Jan 23 21:52:47 2013 +0100
chkconfig.ltx: correct check for cbgreek
fixes #8522
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 8a5e902..fd24fe8 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -349,7 +349,7 @@
% Other font packages
\TestPackage{ae}
\TestPackage{bera}
-\TestPackage{cbgreek}% for Greek
+\TestPackage[glic1000.tfm]{cbgreek}% for Greek
\TestPackage{ccfonts}
\TestPackage{cmbright}
\TestPackage{eco}
---
Summary of changes:
lib/chkconfig.ltx |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] chkconfig.ltx: correct check for cbgreek
The branch, master, has been updated.
- Log -
commit 6958af5979839aa4730d3270b0187413a7989631
Author: Uwe Stöhr
Date: Wed Jan 23 21:54:48 2013 +0100
chkconfig.ltx: correct check for cbgreek
fixes #8522
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 76ece71..3c170c8 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -400,7 +400,7 @@
\TestPackage{ae}
\TestPackage{bera}
\TestPackage{biolinum-type1}
-\TestPackage{cbgreek}% for Greek
+\TestPackage[glic1000]{cbgreek}% for Greek
\TestPackage{ccfonts}
\TestPackage{cmbright}
\TestPackage{eco}
---
Summary of changes:
lib/chkconfig.ltx |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] chkconfig.ltx: check for wasy
The branch, master, has been updated.
- Log -
commit 3cba8fa9be09cefdbb145415fe6132383d27aa88
Author: Uwe Stöhr
Date: Wed Jan 23 22:01:06 2013 +0100
chkconfig.ltx: check for wasy
In unicodesymbols we use the wasy fonts intensively. So we also need to
check for them. (wasysym is not the font package itself, only a package to
support it: "LaTeX support file to use the WASY-2 fonts. The wasysym package
implements and easy to use interface for these symbols.")
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 3c170c8..052e250 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -444,6 +444,7 @@
\TestPackage{marvosym}
\TestPackage{pmboxdraw}
\TestPackage{textgreek}
+\TestPackage{wasy}
\TestPackage{wasysym}
% These packages are disabled in the unicodesymbols file
% see comment there
---
Summary of changes:
lib/chkconfig.ltx |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] chkconfig.ltx: correct check for wasy and cbgreek
The branch, master, has been updated.
- Log -
commit e20f78c4b09f896437113ad93e6ac5f2ecc97cbf
Author: Uwe Stöhr
Date: Wed Jan 23 23:21:39 2013 +0100
chkconfig.ltx: correct check for wasy and cbgreek
- we need to check for a font, not a package
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 052e250..1974848 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -358,7 +358,6 @@
\TestPackage{units}
\TestPackage{url}
\TestPackage{varioref}
-\TestPackage{wasy}
\TestPackage{wrapfig}
\TestPackage{xargs}
\TestPackage{xcolor}
@@ -400,7 +399,7 @@
\TestPackage{ae}
\TestPackage{bera}
\TestPackage{biolinum-type1}
-\TestPackage[glic1000]{cbgreek}% for Greek
+\TestFont[glic1000]{cbgreek}% for Greek
\TestPackage{ccfonts}
\TestPackage{cmbright}
\TestPackage{eco}
@@ -444,7 +443,7 @@
\TestPackage{marvosym}
\TestPackage{pmboxdraw}
\TestPackage{textgreek}
-\TestPackage{wasy}
+\TestFont[wasy10]{wasy}
\TestPackage{wasysym}
% These packages are disabled in the unicodesymbols file
% see comment there
---
Summary of changes:
lib/chkconfig.ltx |5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX 2.0.x] chkconfig.ltx: remove check for cbgreek
The branch, 2.0.x, has been updated.
- Log -
commit 873d5ebc27d7c0f8949d1f6abef1d396b67498a2
Author: Uwe Stöhr
Date: Wed Jan 23 23:24:53 2013 +0100
chkconfig.ltx: remove check for cbgreek
- we would need to check for a font but this doesn't work in branch. To
Thus the current check is senseless because it will always fail, see #8522.
Therefore I revert its addition to keep branch clean.
Note the check for wasy in branch shows the same problematic but it is
there for ages.
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index fd24fe8..caa4208 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -349,7 +349,6 @@
% Other font packages
\TestPackage{ae}
\TestPackage{bera}
-\TestPackage[glic1000.tfm]{cbgreek}% for Greek
\TestPackage{ccfonts}
\TestPackage{cmbright}
\TestPackage{eco}
---
Summary of changes:
lib/chkconfig.ltx |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] installer: update to latest MiKTeX to fix a bug
The branch, master, has been updated.
- Log -
commit 0b791d49f52d0e0271b9f189e0561cbb314f81e1
Author: Uwe Stöhr
Date: Thu Jan 24 23:57:40 2013 +0100
installer: update to latest MiKTeX to fix a bug
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 8c54f37..dcbee05 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -2,6 +2,7 @@
- fix bug that MiKTeX was not correctly configures on somme 64bit versions of
Windows 7
- don't overwrite the MiKTeX package repository from where missing packages
will be installed
- updated to JabRef 2.9.2
+- updated to MiKTeX 2.9 build 4757
Changelog for LyX-2051-2:
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index ce2925d..90aa745 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -59,6 +59,6 @@ These typically need to be modified for each LyX release
!if ${SETUPTYPE} == BUNDLE
!define JabRefInstall "external\JabRef-2.9.2-setup.exe"
!define SIZE_JABREF 14100
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4521.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4757.exe"
!endif
---
Summary of changes:
.../Win32/packaging/installer/ChangeLog.txt|1 +
development/Win32/packaging/installer/settings.nsh |2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] installer: fixed typos in changelog
The branch, master, has been updated. - Log - commit 73fe65543d47287d5b6e59bcd5b9c40390790f6d Author: Uwe Stöhr Date: Fri Jan 25 01:44:09 2013 +0100 installer: fixed typos in changelog diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index dcbee05..2c55e5b 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,5 +1,5 @@ Changelog for LyX-2051-3: -- fix bug that MiKTeX was not correctly configures on somme 64bit versions of Windows 7 +- fix bug that MiKTeX was not correctly configured on some 64bit versions of Windows - don't overwrite the MiKTeX package repository from where missing packages will be installed - updated to JabRef 2.9.2 - updated to MiKTeX 2.9 build 4757 @@ -7,7 +7,7 @@ Changelog for LyX-2051-2: - fix bug that an installed MiKTeX was not found on Windows 7 and 8 with 64 bit -- adapt the source package to make it easier to comple the installer; +- adapt the source package to make it easier to compile the installer; added a Readme file describing how to compile --- Summary of changes: .../Win32/packaging/installer/ChangeLog.txt|4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] Encoding.cpp: make it compilable again after [2eea1590/lyxgit]
The branch, master, has been updated.
- Log -
commit 9e29dc2338842568de166cef8cee88de9210a84b
Author: Uwe Stöhr
Date: Fri Jan 25 23:24:26 2013 +0100
Encoding.cpp: make it compilable again after [2eea1590/lyxgit]
diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 3a27a7b..1c5e93c 100644
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -37,8 +37,6 @@ using namespace lyx::support;
namespace lyx {
-int const Encoding::any;
-
Encodings encodings;
Encodings::MathCommandSet Encodings::mathcmd;
---
Summary of changes:
src/Encoding.cpp |2 --
1 files changed, 0 insertions(+), 2 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] EmbeddedObjects.lyx: cleanup
The branch, master, has been updated.
- Log -
commit ef2071f2c824cbda2ba4256840261ee70f891e49
Author: Uwe Stöhr
Date: Sat Jan 26 03:43:08 2013 +0100
EmbeddedObjects.lyx: cleanup
- use standard bullets
- formatting fixes
diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 7f8e2f1..4dc2aa5 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -243,9 +243,6 @@ initials
\papercolumns 1
\papersides 2
\paperpagestyle default
-\bullet 1 1 34 -1
-\bullet 2 2 35 -1
-\bullet 3 2 7 -1
\tracking_changes true
\output_changes false
\html_math_output 0
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 46c4edd..72d29b6 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -244,9 +244,6 @@ initials
\papercolumns 1
\papersides 2
\paperpagestyle default
-\bullet 1 0 9 -1
-\bullet 2 2 35 -1
-\bullet 3 2 7 -1
\tracking_changes false
\output_changes false
\html_math_output 0
@@ -37839,13 +37836,6 @@ Kapitälchen
\end_layout
\begin_layout Standard
-\begin_inset Newpage newpage
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
Hier sind einige Beispiele:
\end_layout
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index f4920ed..af86c78 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -251,9 +251,6 @@ initials
\papercolumns 1
\papersides 2
\paperpagestyle default
-\bullet 1 1 34 -1
-\bullet 2 2 35 -1
-\bullet 3 2 7 -1
\tracking_changes false
\output_changes false
\html_math_output 0
@@ -37431,7 +37428,11 @@ was in the spring of the year 1894 that all London was
interested, and the
\end_deeper
\begin_layout Enumerate
-Magenta, capital colgada sobre tres lÃneas en tipografÃa matemática
+Magenta, capital colgada sobre tres lÃneas en tipografÃa matemática
+\begin_inset Newline newline
+\end_inset
+
+
\begin_inset Formula $\mathcal{CALLIGRAPHIC}$
\end_inset
diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index db435ea..0ff6fce 100644
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -247,9 +247,6 @@ initials
\papercolumns 1
\papersides 2
\paperpagestyle default
-\bullet 1 1 34 -1
-\bullet 2 2 35 -1
-\bullet 3 2 7 -1
\tracking_changes false
\output_changes false
\html_math_output 0
@@ -38931,7 +38928,11 @@ Initiale descendante sur 3
\begin_inset space ~
\end_inset
-lignes en magenta en police mathématique
+lignes en magenta en police mathématique
+\begin_inset Newline newline
+\end_inset
+
+
\begin_inset Formula $\mathcal{CALLIGRAPHIC}$
\end_inset
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index 3e70af0..8ebfa5e 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -257,9 +257,6 @@ initials
\papercolumns 1
\papersides 2
\paperpagestyle default
-\bullet 1 1 34 -1
-\bullet 2 2 35 -1
-\bullet 3 2 7 -1
\tracking_changes false
\output_changes false
\html_math_output 0
---
Summary of changes:
lib/doc/EmbeddedObjects.lyx|3 ---
lib/doc/de/EmbeddedObjects.lyx | 10 --
lib/doc/es/EmbeddedObjects.lyx |9 +
lib/doc/fr/EmbeddedObjects.lyx |9 +
lib/doc/ja/EmbeddedObjects.lyx |3 ---
5 files changed, 10 insertions(+), 24 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX 2.0.x] EmbeddedObjects.lyx: cleanup
The branch, 2.0.x, has been updated.
- Log -
commit cfaa02972285e37e8fc98f11071c0d2c9674fa66
Author: Uwe Stöhr
Date: Sat Jan 26 03:45:09 2013 +0100
EmbeddedObjects.lyx: cleanup
- use standard bullets
- formatting fixes and reduction of ERT
diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index ad7fad4..44725a5 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -235,9 +235,6 @@ initials
\papercolumns 1
\papersides 2
\paperpagestyle default
-\bullet 1 1 34 -1
-\bullet 2 2 35 -1
-\bullet 3 2 7 -1
\tracking_changes false
\output_changes false
\html_math_output 0
@@ -37770,16 +37767,19 @@ key "lettrine"
small caps
\shape default
.
- To tell LaTeX where this word is finished, add a closing brace '
-\series bold
-}
-\series default
-' as TeX-Code behind it.
- At the end of the style there must be an opening brace '
+ To tell LaTeX where this word is finished, add
+\begin_inset Quotes eld
+\end_inset
+
+
\series bold
-{
+}{
\series default
-' as TeX-Code.
+
+\begin_inset Quotes erd
+\end_inset
+
+ as TeX-Code behind it.
\end_layout
\begin_layout Standard
@@ -37844,7 +37844,7 @@ status collapsed
\begin_layout Plain Layout
-}
+}{
\end_layout
\end_inset
@@ -37856,17 +37856,6 @@ status collapsed
out in the police investigation, but a good deal was suppressed upon that
occasion, since the case for the prosecution was so overwhelmingly strong
that it was not necessary to bring forward all the facts.
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{
-\end_layout
-
-\end_inset
-
-
\begin_inset Newpage newpage
\end_inset
@@ -37906,7 +37895,7 @@ status collapsed
\begin_layout Plain Layout
-}
+}{
\end_layout
\end_inset
@@ -37918,17 +37907,6 @@ status collapsed
out in the police investigation, but a good deal was suppressed upon that
occasion, since the case for the prosecution was so overwhelmingly strong
that it was not necessary to bring forward all the facts.
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{
-\end_layout
-
-\end_inset
-
-
\end_layout
\end_deeper
@@ -38120,7 +38098,7 @@ status collapsed
\begin_layout Plain Layout
-}
+}{
\end_layout
\end_inset
@@ -38132,17 +38110,6 @@ status collapsed
out in the police investigation, but a good deal was suppressed upon that
occasion, since the case for the prosecution was so overwhelmingly strong
that it was not necessary to bring forward all the facts.
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{
-\end_layout
-
-\end_inset
-
-
\end_layout
\end_deeper
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 921a0b6..5bfff6f 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -236,9 +236,6 @@ initials
\papercolumns 1
\papersides 2
\paperpagestyle default
-\bullet 1 0 9 -1
-\bullet 2 2 35 -1
-\bullet 3 2 7 -1
\tracking_changes false
\output_changes false
\html_math_output 0
@@ -37810,24 +37807,19 @@ key "lettrine"
Kapitälchen
\shape default
gedruckt wird.
- Um LaTeX zu sagen, wo dieses Wort endet, fügt man an dieser Stelle eine
- schlieÃende geschweifte Klammer '
-\series bold
-}
-\series default
-' als TeX-Code ein.
- Am Ende des Stils muss eine öffnende geschweifte Klammer '
+ Um LaTeX zu sagen, wo dieses Wort endet, fügt man an dieser Stelle
+\begin_inset Quotes gld
+\end_inset
+
+
\series bold
-{
+}{
\series default
-' als TeX-Code stehen.
-\end_layout
-\begin_layout Standard
-\begin_inset Newpage newpage
+\begin_inset Quotes grd
\end_inset
-
+ als TeX-Code ein.
\end_layout
\begin_layout Standard
@@ -37893,7 +37885,7 @@ status collapsed
\begin_layout Plain Layout
-}
+}{
\end_layout
\end_inset
@@ -37907,19 +37899,6 @@ was in the spring of the year 1894 that all London was
interested, and the
out in the police investigation, but a good deal was suppressed upon that
occasion, since the case for the prosecution was so overwhelmingly strong
that it was not necessary to bring forward all the facts.
-\lang ngerman
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{
-\end_layout
-
-\end_inset
-
-
\end_layout
\end_deeper
@@ -37959,7 +37938,7 @@ status collapsed
\begin_layout Plain Layout
-}
+}{
\end_layout
\end_inset
@@ -37973,19 +37952,6 @@ was in the spring of the year 1894 that all London was
interested, and the
out in the police investigation, but a good deal was suppressed upon that
occasion, since the case for the prosecution was so overwhelmingly strong
that it was not necessary to bring forward all the facts.
-\lang ngerman
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-{
-\end_layout
-
-\end_inset
-
-
\end_layout
\end_deeper
@@ -38006,9 +37972,9 @@ Zeilen in der Mathe-Schrift
\begin_inset Quotes gld
\end_inset
-t
+
\lang engl
[LyX 2.0.x] Revert "modernCV: complete revision of layout and example"
The branch, 2.0.x, has been updated.
- Log -
commit fb180204badb785118e29d771178c63ab3185c77
Author: Uwe Stöhr
Date: Sat Jan 26 17:27:42 2013 +0100
Revert "modernCV: complete revision of layout and example"
This reverts commit 58f6767e2c3fa92f4ddc45d1075837f2ef25681c.
- additionally add the new requirement "suffix.sty"
diff --git a/lib/examples/modernCV.lyx b/lib/examples/modernCV.lyx
index 5eb03ef..5b053e9 100644
--- a/lib/examples/modernCV.lyx
+++ b/lib/examples/modernCV.lyx
@@ -4,13 +4,46 @@
\begin_header
\textclass moderncv
\begin_preamble
-%\renewcommand{\familydefault}{\sfdefault}% to set the default font; use
'\sfdefault' for the default sans serif font, '\rmdefault' for the default
roman one, or any tex font name
-%\nopagenumbers{} % uncomment to suppress
automatic page numbering for CVs longer than one page
-
% adjust the page margins
\usepackage[scale=0.75]{geometry}
-%\setlength{\hintscolumnwidth}{3cm} % if you want to change the
width of the column with the dates
-%\setlength{\makecvtitlenamewidth}{10cm} % for the 'classic' style, if
you want to force the width allocated to your name and avoid line breaks. be
careful though, the length is normally calculated to avoid any overlap with
your personal info; use this at your own typographical risks...
+
+% required
+\moderncvtheme[blue]{classic}
+% possible themes are "classic" and "casual"
+% optional argument are 'blue' (default), 'orange', 'red', 'green', 'grey' and
'roman' (for roman fonts, instead of sans serif fonts)
+
+% required
+\firstname{Paul}
+% required
+\familyname{Testman}
+
+% optional, remove the line if not wanted
+\title{Curriculum Vitae}
+
+% optional
+% \address{street and number}{postcode city}
+% '\\' adds a line break
+\address{Teststreet 17}{0 Nicecity\protect\\[0.1em]
Switzerland\protect\\[0.2em]}
+
+% optional
+\phone{+43(0)999 }
+% optional
+\mobile{+43(0)999 888}
+% optional
+\fax{+43(0)999 }
+% optional
+\email{test...@testman.xx}
+% optional
+\extrainfo{www.lyx.org}
+
+% optional
+% \photo[height]{name}
+% 'height' is the height the picture is resized to
+% 'name' is the name of the picture file
+\photo[64pt]{CV-image}
+
+% optional
+\quote{"You only live twice." (an optional quote)}
\end_preamble
\use_default_options false
\maintain_unincluded_children false
@@ -74,28 +107,12 @@
status open
\begin_layout Plain Layout
-The moderncv class offers lots of customization possibilities; some are
- explained in the preamble of this document; for more information look at
- the documentation of the LaTeX-package
+
\series bold
-moderncv
+Note:
\series default
-:
-\begin_inset Newline newline
-\end_inset
-
-
-\begin_inset Flex URL
-status open
-
-\begin_layout Plain Layout
-
-http://mirrors.ctan.org/macros/latex/contrib/moderncv/examples/template.tex
-\end_layout
-
-\end_inset
-
-
+ The personal data like your name, image, address, etc.
+ are set in the document preamble.
\end_layout
\end_inset
@@ -103,153 +120,44 @@
http://mirrors.ctan.org/macros/latex/contrib/moderncv/examples/template.tex
\end_layout
-\begin_layout CVStyle
-casual
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-required, possible styles are 'casual' (default), 'classic', 'oldstyle'
- and 'banking'
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout CVColor
-blue
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-required, possible colors are 'blue' (default), 'orange', 'green', 'red',
- 'purple', 'grey' and 'black'
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout FirstName
-Paul
-\end_layout
-
-\begin_layout FamilyName
-Testman
-\end_layout
-
-\begin_layout Title
-Curriculum Vitae
-\end_layout
-
\begin_layout Standard
\begin_inset Note Note
status open
\begin_layout Plain Layout
-The following personal entries are optional.
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Address
-\begin_inset Argument
-status open
-
-\begin_layout Plain Layout
-Teststreet 17
+The moderncv class offers lots of customization possibilities; some are
+ explained in the preamble of this document; for more information look at
+ the documentation of the LaTeX-package
+\series bold
+moderncv
+\series default
+.
\end_layout
\end_inset
-0 Nicecity -- Switzerland
-\end_layout
-
-\begin_layout Mobile
-+43(0)999 888
-\end_layout
-
-\begin_layout Phone
-+43(0)999
-\end_layout
-
-\begin_layout Fax
-+43(0)999
-\end_layout
-
-\begin_layout Email
-test...@testman.xx
-\end_layout
-
-\begin_layout Homepage
-www.johndoe.com
-\end_layout
-\begin_layout ExtraInfo
-www.lyx.org
\end_layout
-\begin_layout Photo
-\begin_inset Argument
-status open
-
-\begin_layout Plain Layout
-64pt
-\end_layout
-
-\end_inset
-
-
-\begin_inset Argument
-status open
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
\begin_
[LyX 2.0.x] europecv.layout: whitespace and categorization
The branch, 2.0.x, has been updated.
- Log -
commit f9e06bdfe38271559c8dec8639fbd2af1fc4e37d
Author: Uwe Stöhr
Date: Sat Jan 26 17:31:21 2013 +0100
europecv.layout: whitespace and categorization
- additionally fix 2 formatting issues
No new styles or compatibility changes!
diff --git a/lib/layouts/europecv.layout b/lib/layouts/europecv.layout
index c6c2fa3..11547b8 100644
--- a/lib/layouts/europecv.layout
+++ b/lib/layouts/europecv.layout
@@ -6,149 +6,158 @@
# General textclass parameters
Format 35
- Columns 1
- Sides 1
- SecNumDepth -1
- TocDepth-1
+ Columns 1
+ Sides 1
+ SecNumDepth -1
+ TocDepth-1
# Standard style definition
Style Standard
- Margin Static
- LatexType Paragraph
- LatexName dummy
- ParIndent MM
- ParSkip 0.4
- Align Block
- LabelType No_Label
+ Margin Static
+ LatexType Paragraph
+ LatexName dummy
+ ParIndent MM
+ ParSkip 0.4
+ Align Block
+ LabelType No_Label
End
Input stdcounters.inc
Input stdinsets.inc
Style Section
- Margin Dynamic
- LatexType Command
- LatexName ecvsection
- NeedProtect 1
- NextNoIndent1
- OptionalArgs1
- ParSkip 0.4
- TopSep 1.3
- BottomSep 0.7
- ParSep 0.7
- Align Block
- LabelSepxxx
- LabelType No_Label
+ Margin Dynamic
+ LatexType Command
+ LatexName ecvsection
+ CategoryMainText
+ NeedProtect 1
+ NextNoIndent1
+ OptionalArgs1
+ ParSkip 0.4
+ TopSep 1.3
+ BottomSep 0.7
+ ParSep 0.7
+ Align Block
+ LabelSepxxx
+ LabelType No_Label
Font
- FamilySans
- SeriesBold
+ FamilySans
+ SeriesBold
EndFont
- TocLevel 1
+ TocLevel1
End
Style Item
- Margin Dynamic
- LatexType Command
- LatexName ecvitem
- OptionalArgs1
- ParSkip 0.4
- Align Block
- LabelSepxx
- LabelType Static
- LabelString "Item:"
+ Margin Dynamic
+ LatexType Command
+ LatexName ecvitem
+ CategoryMainText
+ OptionalArgs1
+ ParSkip 0.4
+ Align Block
+ LabelSepxx
+ LabelType Static
+ LabelString "Item:"
LabelFont
- SeriesBold
- Color Blue
+ SeriesBold
+ Color Blue
EndFont
End
Style BulletedItem
- CopyStyle Item
- LatexName ecvitem*
- LabelString "Bulleted Item:"
+ CopyStyle Item
+ LatexName ecvitem*
+ LabelString "Bulleted Item:"
End
Style Begin
- Margin Dynamic
- LatexType Command
- LatexName begin{europecv}
- KeepEmpty 1
- BottomSep 1
- ParSkip 0.4
- Align Block
- LabelSepxx
- LabelType Static
- LabelString "Begin of CV"
+ Margin Dynamic
+ LatexType Command
+ LatexName begin{europecv}
+ CategoryFrontMatter
+ KeepEmpty 1
+ TopSep 1
+ BottomSep 1
+ ParSkip 0.4
+ Align Block
+ LabelSepxx
+ LabelType Static
+ LabelString "Begin of CV"
LabelFont
- SeriesBold
- Color Green
+ SeriesBold
+ Color Green
EndFont
End
Style PersonalInfo
- CopyStyle Begin
- LatexName ecvpersonalinfo{}
- BottomSep 0
- LabelString "Personal Info"
+ CopyStyle Begin
+ LatexName ecvpersonalinfo{}
+ TopSep 0
+ BottomSep 0
+ LabelString "Personal Info"
End
Style MotherTongue
- Margin
[LyX master] modernCV.layout: add requirement "suffix.sty"
The branch, master, has been updated.
- Log -
commit 51cea817100d451981763b2c66185cc35a9726f3
Author: Uwe Stöhr
Date: Sat Jan 26 18:48:31 2013 +0100
modernCV.layout: add requirement "suffix.sty"
diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index 575ca7d..c94d630 100644
--- a/lib/layouts/moderncv.layout
+++ b/lib/layouts/moderncv.layout
@@ -1,7 +1,7 @@
#% Do not delete the line below; configure depends on this
-#
\DeclareLaTeXClass[moderncv,color.sty,fancyhdr.sty,hyperref.sty,ifpdf.sty,marvosym.sty]{Modern
CV}
+#
\DeclareLaTeXClass[moderncv,color.sty,fancyhdr.sty,hyperref.sty,ifpdf.sty,marvosym.sty,suffix.sty]{Modern
CV}
# \DeclareCategory{Curricula Vitae}
-# textclass definition file for modernCV 1.2.0
+# textclass definition file for modernCV 1.2.1
# Author : Uwe Stöhr (uwesto...@web.de)
---
Summary of changes:
lib/layouts/moderncv.layout |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX 2.0.x] moderncv.layout: section some styles
The branch, 2.0.x, has been updated. - Log - commit 171445fe53e7b8b9702feef0ff279b863e33ad18 Author: Uwe Stöhr Date: Sun Jan 27 05:22:36 2013 +0100 moderncv.layout: section some styles diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout index 5858a1e..332a526 100644 --- a/lib/layouts/moderncv.layout +++ b/lib/layouts/moderncv.layout @@ -17,6 +17,7 @@ Provides url 1 # Standard style definition Style Standard + CategoryMainText Margin Static LatexType Paragraph LatexName dummy @@ -31,6 +32,7 @@ Input stdcounters.inc Input stdinsets.inc Style Section + CategorySectioning Margin Dynamic LatexType Command LatexName section @@ -148,6 +150,7 @@ Style CloseSection End Style Bibliography + CategoryBackMatter Margin First_Dynamic LatexType Bib_Environment LatexName thebibliography --- Summary of changes: lib/layouts/moderncv.layout |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] - lyx_2_1.py: support for modernCV - moderncv.layout: whitespace fixes
The branch, master, has been updated. - Log - commit a68122d6900bb675270b1526fcce53e2b48425da Author: Uwe Stöhr Date: Sun Jan 27 05:25:00 2013 +0100 - lyx_2_1.py: support for modernCV - moderncv.layout: whitespace fixes diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout index c94d630..208c7dd 100644 --- a/lib/layouts/moderncv.layout +++ b/lib/layouts/moderncv.layout @@ -173,7 +173,7 @@ Style Quote End Style Section - CategorySectioning + CategorySectioning Margin Dynamic LatexType Command LatexName section @@ -397,7 +397,7 @@ Style MakeLetterClosing End Style Bibliography - CategoryBackMatter + CategoryBackMatter Margin First_Dynamic LatexType Bib_Environment LatexName thebibliography diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py index d921cbb..1c7ca48 100644 --- a/lib/lyx2lyx/lyx_2_1.py +++ b/lib/lyx2lyx/lyx_2_1.py @@ -1456,43 +1456,6 @@ def revert_Argument_to_TeX_brace(document, line, n, nmax, environment): n = n + 1 -def revert_IEEEtran(document): - ''' - Reverts InsetArgument of - Page headings - Biography - Biography without photo - to TeX-code - ''' - if document.textclass == "IEEEtran": -i = 0 -j = 0 -k = 0 -while True: - if i != -1: -i = find_token(document.body, "\\begin_layout Page headings", i) - if i != -1: -revert_Argument_to_TeX_brace(document, i, 1, 1, False) -i = i + 1 - if j != -1: -j = find_token(document.body, "\\begin_layout Biography without photo", j) - if j != -1: -revert_Argument_to_TeX_brace(document, j, 1, 1, True) -j = j + 1 - if k != -1: -k = find_token(document.body, "\\begin_layout Biography", k) -kA = find_token(document.body, "\\begin_layout Biography without photo", k) -if k == kA and k != -1: - k = k + 1 - continue - if k != -1: -# start with the second argument, therefore 2 -revert_Argument_to_TeX_brace(document, k, 2, 2, True) -k = k + 1 - if i == -1 and j == -1 and k == -1: -return - - def convert_TeX_brace_to_Argument(document, line, n, nmax, inset, environment): ''' Converts TeX code for mandatory arguments to an InsetArgument @@ -1605,6 +1568,43 @@ def convert_TeX_brace_to_Argument(document, line, n, nmax, inset, environment): lineERT = lineERT + 1 +def revert_IEEEtran(document): + ''' + Reverts InsetArgument of + Page headings + Biography + Biography without photo + to TeX-code + ''' + if document.textclass == "IEEEtran": +i = 0 +j = 0 +k = 0 +while True: + if i != -1: +i = find_token(document.body, "\\begin_layout Page headings", i) + if i != -1: +revert_Argument_to_TeX_brace(document, i, 1, 1, False) +i = i + 1 + if j != -1: +j = find_token(document.body, "\\begin_layout Biography without photo", j) + if j != -1: +revert_Argument_to_TeX_brace(document, j, 1, 1, True) +j = j + 1 + if k != -1: +k = find_token(document.body, "\\begin_layout Biography", k) +kA = find_token(document.body, "\\begin_layout Biography without photo", k) +if k == kA and k != -1: + k = k + 1 + continue + if k != -1: +# start with the second argument, therefore 2 +revert_Argument_to_TeX_brace(document, k, 2, 2, True) +k = k + 1 + if i == -1 and j == -1 and k == -1: +return + + def convert_IEEEtran(document): ''' Converts ERT of @@ -1728,7 +1728,7 @@ def convert_IJMP(document): def revert_SIGPLAN(document): - " Reverts InsetArgument of MarkBoth to TeX-code " + " Reverts InsetArguments of SIGPLAN to TeX-code " if document.textclass == "sigplanconf": i = 0 j = 0 @@ -1748,7 +1748,7 @@ def revert_SIGPLAN(document): def convert_SIGPLAN(document): - " Converts ERT of MarkBoth to InsetArgument " + " Converts ERT of SIGPLAN to InsetArgument " if document.textclass == "sigplanconf": i = 0 j = 0 @@ -1796,7 +1796,7 @@ def convert_SIGGRAPH(document): def revert_EuropeCV(document): - " Reverts InsetArgument of Flex CRcat to TeX-code " + " Reverts InsetArguments of europeCV to TeX-code " if document.textclass == "europecv": i = 0 j = 0 @@ -1828,7 +1828,7 @@ def revert_EuropeCV(document): def convert_EuropeCV(document): - " Converts ERT of Flex CRcat to InsetArgument " + " Converts ERT of europeCV to InsetArgument " if document.textclass == "europecv": i = 0 j = 0 @@ -1859,6 +1859,80 @@ def convert_EuropeCV(document): return +def revert_ModernCV(document): + " Reverts InsetArguments of modernCV to TeX-code " + if document.textclass == "moderncv"
[LyX 2.0.x] modernCV.lyx: correct sign of a vspace
The branch, 2.0.x, has been updated. - Log - commit 261f494dcf50b9545488aac6d2425b7c4815fd7a Author: Uwe Stöhr Date: Sun Jan 27 05:28:45 2013 +0100 modernCV.lyx: correct sign of a vspace diff --git a/lib/examples/modernCV.lyx b/lib/examples/modernCV.lyx index 5b053e9..57ae534 100644 --- a/lib/examples/modernCV.lyx +++ b/lib/examples/modernCV.lyx @@ -309,7 +309,7 @@ Title of the thesis \end_layout \begin_layout Standard -\begin_inset VSpace -0.5cm +\begin_inset VSpace 0.5cm \end_inset --- Summary of changes: lib/examples/modernCV.lyx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] chkconfig.ltx: check for KOMA and caption
The branch, master, has been updated.
- Log -
commit 0d5f5d107eac5fb3645d65ead597be0262ef7db2
Author: Uwe Stöhr
Date: Mon Jan 28 02:49:52 2013 +0100
chkconfig.ltx: check for KOMA and caption
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 471299c..0721af6 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -367,11 +367,13 @@
\TestPackage{arydshln}
\TestPackage{braket}
\TestPackage{cancel}
+\TestPackage{caption}
\TestPackage{colortbl}
\TestPackage{diagbox}
\TestPackage{etoolbox}
\TestPackage{eurosym}
\TestPackage{fp}
+\TestPackage{koma-script}
\TestPackage{marginnote}
\TestPackage{picinpar}
\TestPackage{pict2e}
---
Summary of changes:
lib/chkconfig.ltx |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] installer: new method to install LaTeX-packages
The branch, master, has been updated.
- Log -
commit 82b9f919aa36c2f53653e74da5eb600d9513792b
Author: Uwe Stöhr
Date: Mon Jan 28 02:54:31 2013 +0100
installer: new method to install LaTeX-packages
LyX 2.0.x supports currently 147 LaTeX-packages. When LyX is first
installed on a PC it took therefore about 10 minutes to install all supported
and required packages. With the new installation method the installation speed
only depends on the Internet speed and lasts with an average bandwidth now only
3.5 minutes.
(chkconfig.ltx asks LaTeX for each package separately and after each
package installation the file name database of LaTeX was rebuild. And that cost
a lot of time/CPU power)
diff --git a/development/Win32/packaging/installer/Packages.txt
b/development/Win32/packaging/installer/Packages.txt
new file mode 100644
index 000..ea25357
--- /dev/null
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -0,0 +1,148 @@
+l3kernel
+l3packages
+mptopdf
+bezos
+algorithms
+arabi
+bibtopic
+booktabs
+braille
+breakurl
+cjk
+covington
+csquotes
+cyrillic
+endnotes
+enumitem
+esint
+eso-pic
+greek-inputenc
+fancybox
+fancyhdr
+framed
+hyphenat
+jurabib
+lettrine
+listings
+lithuanian
+genmisc
+mhchem
+mongolian-babel
+natbib
+units
+nomencl
+polyglossia
+pdfpages
+prettyref
+preview
+refstyle
+rotating
+rotfloat
+setspace
+soul
+splitindex
+subfig
+turkmen
+ulem
+undertilde
+units
+url
+wrapfig
+xargs
+xcolor
+arydshln
+braket
+cancel
+caption
+colortbl
+diagbox
+etoolbox
+fp
+koma-script
+marginnote
+picinpar
+pict2e
+sidecap
+was
+charter
+mathpazo
+bera
+ccfonts
+cmbright
+eco
+feyn
+fourier
+luxi
+symbol
+tipa
+wasy
+zhmetrics
+ascii
+bbding
+ifsym
+marvosym
+textgreek
+txfonts
+wasysym
+aastex
+achemso
+aguplus
+apa6
+apacite
+apa
+arabtex
+beamer
+bigfoot
+changepage
+cite
+cleveref
+ctex
+dinbrief
+dtk
+elsarticle
+endfloat
+epsf
+europecv
+extsizes
+fancyvrb
+filecontents
+footmisc
+frletter
+g-brief
+harvard
+ieeetran
+ifmtarg
+kluwer
+lastpage
+lettre
+lineno
+mciteplus
+memoir
+microtype
+moderncv
+ms
+mwcls
+paper
+paralist
+pgf
+placeins
+powerdot
+pst-grad
+pst-node
+revtex4
+sauerj
+savesym
+seminar
+simplecv
+skak
+spie
+sttools
+textcase
+titlesec
+tufte-latex
+tugboat
+type1cm
+ucs
+upquote
+xecjk
+xifthen
\ No newline at end of file
diff --git a/development/Win32/packaging/installer/setup/configure.nsh
b/development/Win32/packaging/installer/setup/configure.nsh
index 1c1446f..8df91d6 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -193,20 +193,29 @@ Var ConfigureReturn
Section -ConfigureScript
SetOutPath "$INSTDIR\Resources"
- DetailPrint $(TEXT_CONFIGURE_LYX)
- nsExec::ExecToLog '"$INSTDIR\Python\python.exe"
"$INSTDIR\Resources\configure.py"'
- # $ConfigureReturn is "0" if successful, otherwise "1"
- Pop $ConfigureReturn # Return value
-
+
# ask to update MiKTeX
${if} $LaTeXInstalled == "MiKTeX"
Call UpdateMiKTeX # function from latex.nsh
- # especially for new installations a second run is necessary to install all
missing package
- # the reason for this is unknown, most probably it is a timeout problem,
because with a fast
- # Internet connection one run is sometimes sufficient
- # a new installed MiKTeX needs some time until it is ready to install
packages
- nsExec::ExecToLog '"$INSTDIR\Python\python.exe"
"$INSTDIR\Resources\configure.py"'
+ # install all necessary packages at once
+ DetailPrint $(TEXT_CONFIGURE_LYX)
+ ${if} $MultiUser.Privileges != "Admin"
+ ${andif} $MultiUser.Privileges != "Power"
+# call the non-admin version
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
+ ${else}
+${if} $MiKTeXUser != "HKCU" # call the admin version
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
+${else}
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
+${endif}
+ ${endif}
${endif}
+
+ DetailPrint $(TEXT_CONFIGURE_LYX)
+ nsExec::ExecToLog '"$INSTDIR\Python\python.exe"
"$INSTDIR\Resources\configure.py"'
+ # $ConfigureReturn is "0" if successful, otherwise "1"
+ Pop $ConfigureReturn # Return value
SectionEnd
---
Summary of changes:
development/Win32/packaging/installer/Packages.txt | 148
.../Win32/packaging/installer/setup/configure.nsh | 29 +++--
2 files changed, 167 insertions(+), 10 deletions(-)
create mode 100644 development/Win32/packaging/installer/Packages.txt
hooks/post-receive
--
The LyX Source Repository
[LyX master] chkconfig.ltx: remove check for KOMA-script
The branch, master, has been updated.
- Log -
commit b8c0cba47287d344a82719f9d03fca8fc52a366c
Author: Uwe Stöhr
Date: Mon Jan 28 23:13:18 2013 +0100
chkconfig.ltx: remove check for KOMA-script
this is a class already checked in the layout file section
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 0721af6..74e1214 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -373,7 +373,6 @@
\TestPackage{etoolbox}
\TestPackage{eurosym}
\TestPackage{fp}
-\TestPackage{koma-script}
\TestPackage{marginnote}
\TestPackage{picinpar}
\TestPackage{pict2e}
---
Summary of changes:
lib/chkconfig.ltx |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] modernCV.lyx: add important compilation notes
The branch, master, has been updated. - Log - commit a2672f8c7e80bea55793576de56e5f09bbe8586e Author: Uwe Stöhr Date: Tue Jan 29 00:08:31 2013 +0100 modernCV.lyx: add important compilation notes - thanks to Jürgen, I could now resolve the bug why the compilation of modernCV failed for certain themes diff --git a/lib/examples/modernCV.lyx b/lib/examples/modernCV.lyx index cb9f1fd..a3f990b 100644 --- a/lib/examples/modernCV.lyx +++ b/lib/examples/modernCV.lyx @@ -177,6 +177,41 @@ Teststreet 17 \end_inset 0 Nicecity -- Switzerland +\begin_inset Note Note +status collapsed + +\begin_layout Plain Layout + +\series bold +Note: +\series default + Only when you use the +\emph on +classic +\emph default + theme, you can add a line break with: +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +protect +\backslash + +\backslash + +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + \end_layout \begin_layout Mobile @@ -468,6 +503,24 @@ Maintainer of Open Source projects \end_inset Maintainer of the xxx documentation +\begin_inset Note Note +status open + +\begin_layout Plain Layout + +\series bold +Note: +\series default + If you use the +\emph on +banking +\emph default + theme, no linebreaks are allowed in entries. +\end_layout + +\end_inset + + \end_layout \begin_layout Entry --- Summary of changes: lib/examples/modernCV.lyx | 53 + 1 files changed, 53 insertions(+), 0 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX 2.0.x] modernCV.lyx: add important compilation notes
The branch, 2.0.x, has been updated.
- Log -
commit caa1387dceaec2fa72f64599fe7e95ef4dbc250e
Author: Uwe Stöhr
Date: Tue Jan 29 00:17:35 2013 +0100
modernCV.lyx: add important compilation notes
- thanks to Jürgen, I could now resolve the bug why the compilation of
modernCV failed for certain themes
- moderncv.layout: a whitespace fix
diff --git a/lib/examples/modernCV.lyx b/lib/examples/modernCV.lyx
index 57ae534..80bf1cb 100644
--- a/lib/examples/modernCV.lyx
+++ b/lib/examples/modernCV.lyx
@@ -9,7 +9,7 @@
% required
\moderncvtheme[blue]{classic}
-% possible themes are "classic" and "casual"
+% possible themes are 'classic', 'casual', 'oldstyle' and 'banking'
% optional argument are 'blue' (default), 'orange', 'red', 'green', 'grey' and
'roman' (for roman fonts, instead of sans serif fonts)
% required
@@ -22,8 +22,9 @@
% optional
% \address{street and number}{postcode city}
-% '\\' adds a line break
-\address{Teststreet 17}{0 Nicecity\protect\\[0.1em]
Switzerland\protect\\[0.2em]}
+% only with the classic theme you can add a line break with
+% \protect\\
+\address{Teststreet 17}{0 Nicecity Switzerland}
% optional
\phone{+43(0)999 }
@@ -422,6 +423,24 @@ status collapsed
\end_inset
Maintainer of the xxx documentation
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Note:
+\series default
+ If you use the
+\emph on
+banking
+\emph default
+ theme, no linebreaks are allowed in entries.
+\end_layout
+
+\end_inset
+
+
\end_layout
\begin_layout Entry
diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index 332a526..84c4e2d 100644
--- a/lib/layouts/moderncv.layout
+++ b/lib/layouts/moderncv.layout
@@ -69,7 +69,7 @@ Style Entry
Margin Dynamic
LatexType Command
LatexName cventry
- OptionalArgs1
+ OptionalArgs1
ParSkip 0.4
Align Block
LabelSepxx
diff --git a/status.20x b/status.20x
index edff7cc..6818b73 100644
--- a/status.20x
+++ b/status.20x
@@ -125,6 +125,8 @@ What's new
- Make the thesis template compilable again.
+- Fix compilation of modernCV example file for all themes.
+
* LYXHTML
---
Summary of changes:
lib/examples/modernCV.lyx | 25 ++---
lib/layouts/moderncv.layout |2 +-
status.20x |2 ++
3 files changed, 25 insertions(+), 4 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] installer: release new installer version
The branch, master, has been updated.
- Log -
commit c229163a3be6a231f8f9ee4e93447183d9a1b2ab
Author: Uwe Stöhr
Date: Tue Jan 29 01:03:16 2013 +0100
installer: release new installer version
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 2c55e5b..c11d58a 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,10 @@
-Changelog for LyX-2051-3:
+Changelog for LyX-2051-4:
+- If LyX is installed together with MiKTeX (bundle installer) the installation
of
+ LaTeX-packages required by LyX takes now much less time and you get a visual
feedback
+ about the installation process.
+
+
+Changelog for LyX-2051-3:
- fix bug that MiKTeX was not correctly configured on some 64bit versions of
Windows
- don't overwrite the MiKTeX package repository from where missing packages
will be installed
- updated to JabRef 2.9.2
diff --git a/development/Win32/packaging/installer/Packages.txt
b/development/Win32/packaging/installer/Packages.txt
index ea25357..951ec33 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -100,6 +100,7 @@ ctex
dinbrief
dtk
elsarticle
+elsevier
endfloat
epsf
europecv
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 90aa745..9b350ae 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 5
!define APP_VERSION_EMERGENCY "1" # 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 4 # 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
---
Summary of changes:
.../Win32/packaging/installer/ChangeLog.txt|8 +++-
development/Win32/packaging/installer/Packages.txt |1 +
development/Win32/packaging/installer/settings.nsh |2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] chkconfig.ltx: add lh fonts
The branch, master, has been updated.
- Log -
commit 870121fc22a2225896e5fb9a23f1d09b5c286f5f
Author: Uwe Stöhr
Date: Tue Jan 29 23:24:24 2013 +0100
chkconfig.ltx: add lh fonts
- these fonts are necessary to compile our Russian and Ukrainian doc files
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 74e1214..12ceb3f 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -409,6 +409,7 @@
\TestPackage{fourier}
\TestPackage{garamondx}
\TestFont[zgmr8r]{garamondx-fonts}
+\TestPackage{lh-lcy}
\TestPackage{libertine}
\TestPackage{libertine-type1}
\TestPackage{lmodern}
---
Summary of changes:
lib/chkconfig.ltx |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] installer: add cbgreek and lh fonts to the package list
The branch, master, has been updated. - Log - commit b9a4db06bf74e169b1c62e15d79e7f21dc66db59 Author: Uwe Stöhr Date: Tue Jan 29 23:25:14 2013 +0100 installer: add cbgreek and lh fonts to the package list diff --git a/development/Win32/packaging/installer/Packages.txt b/development/Win32/packaging/installer/Packages.txt index 951ec33..6964cea 100644 --- a/development/Win32/packaging/installer/Packages.txt +++ b/development/Win32/packaging/installer/Packages.txt @@ -67,11 +67,13 @@ was charter mathpazo bera +cbgreek ccfonts cmbright eco feyn fourier +lh luxi symbol tipa --- Summary of changes: development/Win32/packaging/installer/Packages.txt |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] French Intro.lyx: a typo, spotted by a user
The branch, master, has been updated. - Log - commit 15d21d80e12d2ae90b48666218a0af4744cf5e64 Author: Uwe Stöhr Date: Sun Feb 3 16:46:08 2013 +0100 French Intro.lyx: a typo, spotted by a user diff --git a/lib/doc/fr/Intro.lyx b/lib/doc/fr/Intro.lyx index 03d24ac..b12e76f 100644 --- a/lib/doc/fr/Intro.lyx +++ b/lib/doc/fr/Intro.lyx @@ -2205,7 +2205,7 @@ Guide de L'Utilisateur \emph default , il explique en détail comment utiliser les tableaux, les graphiques, les - objets flottants, les notes et le boîtes. + objets flottants, les notes et les boîtes. Il inclut également de nombreuses astuces connus des spécialistes de LaTeX. \end_layout --- Summary of changes: lib/doc/fr/Intro.lyx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX 2.0.x] French Intro.lyx: a typo, spotted by a user
The branch, 2.0.x, has been updated. - Log - commit 9b697fa4473aa45756c6793f37f389d00f63d224 Author: Uwe Stöhr Date: Sun Feb 3 16:57:30 2013 +0100 French Intro.lyx: a typo, spotted by a user diff --git a/lib/doc/fr/Intro.lyx b/lib/doc/fr/Intro.lyx index 03d24ac..b12e76f 100644 --- a/lib/doc/fr/Intro.lyx +++ b/lib/doc/fr/Intro.lyx @@ -2205,7 +2205,7 @@ Guide de L'Utilisateur \emph default , il explique en détail comment utiliser les tableaux, les graphiques, les - objets flottants, les notes et le boîtes. + objets flottants, les notes et les boîtes. Il inclut également de nombreuses astuces connus des spécialistes de LaTeX. \end_layout --- Summary of changes: lib/doc/fr/Intro.lyx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] tex2lyx: update fileformat of LyX files
The branch, master, has been updated. - Log - commit 793dd3b9c01117e7855f8b7eacb3889e9d250a8a Author: Uwe Stöhr Date: Mon Feb 4 01:39:49 2013 +0100 tex2lyx: update fileformat of LyX files diff --git a/src/tex2lyx/test/Dummy Document.lyx b/src/tex2lyx/test/Dummy Document.lyx index 37f658c..5721713 100644 --- a/src/tex2lyx/test/Dummy Document.lyx +++ b/src/tex2lyx/test/Dummy Document.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 458 +\lyxformat 459 \begin_document \begin_header \textclass article diff --git a/src/tex2lyx/test/DummyDocument.lyx b/src/tex2lyx/test/DummyDocument.lyx index 9b39116..494fcd4 100644 --- a/src/tex2lyx/test/DummyDocument.lyx +++ b/src/tex2lyx/test/DummyDocument.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 458 +\lyxformat 459 \begin_document \begin_header \textclass article @@ -63,7 +63,7 @@ \secnumdepth 3 \tocdepth 3 \paragraph_separation indent -\paragraph_indentation 3mm +\paragraph_indentation default \quotes_language english \papercolumns 1 \papersides 1 diff --git a/src/tex2lyx/test/Dummy~Document.lyx b/src/tex2lyx/test/Dummy~Document.lyx index 12bcb19..53ca775 100644 --- a/src/tex2lyx/test/Dummy~Document.lyx +++ b/src/tex2lyx/test/Dummy~Document.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 458 +\lyxformat 459 \begin_document \begin_header \textclass article @@ -63,7 +63,7 @@ \secnumdepth 3 \tocdepth 3 \paragraph_separation indent -\paragraph_indentation 3mm +\paragraph_indentation default \quotes_language english \papercolumns 1 \papersides 1 --- Summary of changes: src/tex2lyx/test/Dummy Document.lyx |2 +- src/tex2lyx/test/DummyDocument.lyx |4 ++-- src/tex2lyx/test/Dummy~Document.lyx |4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] tex2lyx: support refstyle and its commands
The branch, master, has been updated.
- Log -
commit 49c887761ac18571153d944682cf00d9ada5a82f
Author: Uwe Stöhr
Date: Mon Feb 4 01:41:56 2013 +0100
tex2lyx: support refstyle and its commands
fixes #4288
diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 33175ab..b6f31e7 100644
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -32,6 +32,7 @@ TEST_FILES = \
test/test-insets.tex \
test/test.ltx \
test/test-modules.tex \
+ test/test-refstyle-references.tex \
test/test-structure.tex \
test/XeTeX-polyglossia.tex \
test/xfigtest.fig \
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 15f8103..484b009 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -698,6 +698,9 @@ void Preamble::handle_package(Parser &p, string const &
name,
if (name == "eco")
h_font_osf = "true";
+ if (name == "refstyle")
+ h_use_refstyle = "1";
+
// after the detection and handling of special cases, we can remove the
// fonts, otherwise they would appear in the preamble, see bug #7856
if (is_known(name, known_roman_fonts) || is_known(name,
known_sans_fonts)
diff --git a/src/tex2lyx/Preamble.h b/src/tex2lyx/Preamble.h
index aef8953..e10c96d 100644
--- a/src/tex2lyx/Preamble.h
+++ b/src/tex2lyx/Preamble.h
@@ -39,6 +39,8 @@ public:
///
std::string notefontcolor() const { return h_notefontcolor; }
///
+ std::string refstyle() const { return h_use_refstyle; }
+ ///
bool fontCJKSet() const { return h_font_cjk_set; }
///
std::string fontCJK() const { return h_font_cjk; }
diff --git a/src/tex2lyx/test/test-refstyle-references.tex
b/src/tex2lyx/test/test-refstyle-references.tex
new file mode 100644
index 000..ee81b0f
--- /dev/null
+++ b/src/tex2lyx/test/test-refstyle-references.tex
@@ -0,0 +1,210 @@
+\documentclass[english]{book}
+\usepackage[T1]{fontenc}
+\usepackage[latin9]{inputenc}
+\usepackage{refstyle}
+\usepackage{amsthm}
+
+\makeatletter
+
+%% LyX specific LaTeX commands.
+
+\AtBeginDocument{\providecommand\partref[1]{\ref{part:#1}}}
+\AtBeginDocument{\providecommand\chapref[1]{\ref{chap:#1}}}
+\AtBeginDocument{\providecommand\secref[1]{\ref{sec:#1}}}
+\AtBeginDocument{\providecommand\subref[1]{\ref{sub:#1}}}
+\AtBeginDocument{\providecommand\parref[1]{\ref{par:#1}}}
+\AtBeginDocument{\providecommand\Staref[1]{\ref{Sta:#1}}}
+\AtBeginDocument{\providecommand\fnref[1]{\ref{fn:#1}}}
+\AtBeginDocument{\providecommand\enuref[1]{\ref{enu:#1}}}
+\AtBeginDocument{\providecommand\eqref[1]{\ref{eq:#1}}}
+\AtBeginDocument{\providecommand\lemref[1]{\ref{lem:#1}}}
+\AtBeginDocument{\providecommand\thmref[1]{\ref{thm:#1}}}
+\AtBeginDocument{\providecommand\corref[1]{\ref{cor:#1}}}
+\AtBeginDocument{\providecommand\propref[1]{\ref{prop:#1}}}
+\RS@ifundefined{subref}
+ {\def\RSsubtxt{section~}\newref{sub}{name = \RSsubtxt}}
+ {}
+\RS@ifundefined{thmref}
+ {\def\RSthmtxt{theorem~}\newref{thm}{name = \RSthmtxt}}
+ {}
+\RS@ifundefined{lemref}
+ {\def\RSlemtxt{lemma~}\newref{lem}{name = \RSlemtxt}}
+ {}
+
+
+%% Textclass specific LaTeX commands.
+\theoremstyle{plain}
+\newtheorem{thm}{\protect\theoremname}
+\theoremstyle{plain}
+\newtheorem{lem}[thm]{\protect\lemmaname}
+\theoremstyle{plain}
+\newtheorem{cor}[thm]{\protect\corollaryname}
+\theoremstyle{plain}
+\newtheorem{prop}[thm]{\protect\propositionname}
+\theoremstyle{plain}
+\newtheorem{conjecture}[thm]{\protect\conjecturename}
+\theoremstyle{plain}
+\newtheorem{fact}[thm]{\protect\factname}
+\theoremstyle{definition}
+\newtheorem{defn}[thm]{\protect\definitionname}
+\theoremstyle{definition}
+\newtheorem{example}[thm]{\protect\examplename}
+\theoremstyle{definition}
+\newtheorem{problem}[thm]{\protect\problemname}
+\theoremstyle{definition}
+\newtheorem{xca}[thm]{\protect\exercisename}
+\theoremstyle{remark}
+\newtheorem{rem}[thm]{\protect\remarkname}
+\theoremstyle{remark}
+\newtheorem{claim}[thm]{\protect\claimname}
+\ifx\proof\undefined
+\newenvironment{proof}[1][\protect\proofname]{\par
+\normalfont\topsep6\p@\@plus6\p@\relax
+\trivlist
+\itemindent\parindent
+\item[\hskip\labelsep\scshape #1]\ignorespaces
+}{%
+\endtrivlist\@endpefalse
+}
+\providecommand{\proofname}{Proof}
+\fi
+
+\makeatother
+
+\usepackage{babel}
+\providecommand{\claimname}{Claim}
+\providecommand{\conjecturename}{Conjecture}
+\providecommand{\corollaryname}{Corollary}
+\providecommand{\definitionname}{Definition}
+\providecommand{\examplename}{Example}
+\providecommand{\exercisename}{Exercise}
+\providecommand{\factname}{Fact}
+\providecommand{\lemmaname}{Lemma}
+\providecommand{\problemname}{Problem}
+\providecommand{\propositionname}{Proposition}
+\providecommand{\remarkname}{Remark}
+\providecommand{\theoremname}{Theorem}
[LyX master] tex2lyx: test also for algorithm floats
The branch, master, has been updated.
- Log -
commit ede866f67a6b760b22656a72281c7b7ab4242caa
Author: Uwe Stöhr
Date: Mon Feb 4 02:19:54 2013 +0100
tex2lyx: test also for algorithm floats
diff --git a/src/tex2lyx/test/test-refstyle-references.tex
b/src/tex2lyx/test/test-refstyle-references.tex
index ee81b0f..f2bb0e6 100644
--- a/src/tex2lyx/test/test-refstyle-references.tex
+++ b/src/tex2lyx/test/test-refstyle-references.tex
@@ -2,6 +2,7 @@
\usepackage[T1]{fontenc}
\usepackage[latin9]{inputenc}
\usepackage{refstyle}
+\usepackage{float}
\usepackage{amsthm}
\makeatletter
@@ -135,6 +136,13 @@ Ref to \subref{Subsubsection}.
\Staref{table}
+\begin{algorithm}
+\protect\caption{algorithm\label{Sta:algorithm}}
+\end{algorithm}
+
+
+\Staref{algorithm}
+
\footnote{foot\label{fn:foot}%
}
---
Summary of changes:
src/tex2lyx/test/test-refstyle-references.tex |8
1 files changed, 8 insertions(+), 0 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] tex2lyx/Makefile.am: fix a typo
The branch, master, has been updated. - Log - commit 387a6ba09a447e4a2e83e45943161f5acd901823 Author: Uwe Stöhr Date: Mon Feb 4 20:14:22 2013 +0100 tex2lyx/Makefile.am: fix a typo diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index b1f5675..41eb9d1 100644 --- a/src/tex2lyx/Makefile.am +++ b/src/tex2lyx/Makefile.am @@ -52,7 +52,7 @@ TEST_RESULTS = \ test/test-modules.lyx.lyx \ test/test-refstyle-references.lyx.lyx \ test/test-structure.lyx.lyx \ - test/verbatim..lyx.lyx \ + test/verbatim.lyx.lyx \ test/XeTeX-polyglossia.lyx.lyx TESTS = test/runtests.py --- Summary of changes: src/tex2lyx/Makefile.am |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] tex2lyx: adapt refstyle support aft the fix for bug #8536
The branch, master, has been updated.
- Log -
commit f2eb5004de527c54740e858c2c60abb6990ad1cf
Author: Uwe Stöhr
Date: Mon Feb 4 21:37:14 2013 +0100
tex2lyx: adapt refstyle support aft the fix for bug #8536
diff --git a/src/tex2lyx/test/test-refstyle-references.tex
b/src/tex2lyx/test/test-refstyle-references.tex
index f2bb0e6..70ad4c6 100644
--- a/src/tex2lyx/test/test-refstyle-references.tex
+++ b/src/tex2lyx/test/test-refstyle-references.tex
@@ -14,7 +14,9 @@
\AtBeginDocument{\providecommand\secref[1]{\ref{sec:#1}}}
\AtBeginDocument{\providecommand\subref[1]{\ref{sub:#1}}}
\AtBeginDocument{\providecommand\parref[1]{\ref{par:#1}}}
-\AtBeginDocument{\providecommand\Staref[1]{\ref{Sta:#1}}}
+\AtBeginDocument{\providecommand\figref[1]{\ref{fig:#1}}}
+\AtBeginDocument{\providecommand\tabref[1]{\ref{tab:#1}}}
+\AtBeginDocument{\providecommand\algref[1]{\ref{alg:#1}}}
\AtBeginDocument{\providecommand\fnref[1]{\ref{fn:#1}}}
\AtBeginDocument{\providecommand\enuref[1]{\ref{enu:#1}}}
\AtBeginDocument{\providecommand\eqref[1]{\ref{eq:#1}}}
@@ -22,6 +24,10 @@
\AtBeginDocument{\providecommand\thmref[1]{\ref{thm:#1}}}
\AtBeginDocument{\providecommand\corref[1]{\ref{cor:#1}}}
\AtBeginDocument{\providecommand\propref[1]{\ref{prop:#1}}}
+\floatstyle{ruled}
+\newfloat{algorithm}{tbp}{loa}[chapter]
+\providecommand{\algorithmname}{Algorithm}
+\floatname{algorithm}{\protect\algorithmname}
\RS@ifundefined{subref}
{\def\RSsubtxt{section~}\newref{sub}{name = \RSsubtxt}}
{}
@@ -123,25 +129,25 @@ Ref to \subref{Subsubsection}.
\parref{subparagraph}
\begin{figure}
-\protect\caption{\label{Sta:figure}figure}
+\protect\caption{figure\label{fig:figure}}
\end{figure}
-\Staref{figure}
+\figref{figure}
\begin{table}
-\protect\caption{\label{Sta:table}table}
+\protect\caption{table\label{tab:table}}
\end{table}
-\Staref{table}
+\tabref{table}
\begin{algorithm}
-\protect\caption{algorithm\label{Sta:algorithm}}
+\protect\caption{algorithm\label{alg:algorithm}}
\end{algorithm}
-\Staref{algorithm}
+\algref{algorithm}
\footnote{foot\label{fn:foot}%
}
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index e7d38cc..fb09aa8 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -117,13 +117,13 @@ char const * const known_ref_commands[] = { "ref",
"pageref", "vref",
char const * const known_coded_ref_commands[] = { "ref", "pageref", "vref",
"vpageref", "formatted", "eqref", 0 };
-char const * const known_refstyle_commands[] = { "chapref", "corref", "eqref",
- "enuref", "fnref", "lemref", "parref", "partref", "propref", "secref",
"Staref",
- "subref", "thmref", 0 };
+char const * const known_refstyle_commands[] = { "algref", "chapref", "corref",
+ "eqref", "enuref", "figref", "fnref", "lemref", "parref", "partref",
"propref",
+ "secref", "subref", "tabref", "thmref", 0 };
-char const * const known_refstyle_prefixes[] = { "chap", "cor", "eq",
- "enu", "fn", "lem", "par", "part", "prop", "sec", "Sta",
- "sub", "thm", 0 };
+char const * const known_refstyle_prefixes[] = { "alg", "chap", "cor",
+ "eq", "enu", "fig", "fn", "lem", "par", "part", "prop",
+ "sec", "sub", "tab", "thm", 0 };
/**
---
Summary of changes:
src/tex2lyx/test/test-refstyle-references.tex | 20 +---
src/tex2lyx/text.cpp | 12 ++--
2 files changed, 19 insertions(+), 13 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX 2.0.x] Math.lyx, Tutorial.lyx: fix some typos spotted by a user
The branch, 2.0.x, has been updated. - Log - commit cd20635e81020132713cbcbbae34ed32cceb51ca Author: Uwe Stöhr Date: Tue Feb 5 01:55:56 2013 +0100 Math.lyx, Tutorial.lyx: fix some typos spotted by a user diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx index 38f5ac4..5acf792 100644 --- a/lib/doc/Math.lyx +++ b/lib/doc/Math.lyx @@ -29178,7 +29178,7 @@ Formula ! multiline ! align environment \end_layout \begin_layout Standard -This Align environment is created by presssing +This Align environment is created by pressing \begin_inset Info type "shortcut" arg "newline-insert newline" diff --git a/lib/doc/Tutorial.lyx b/lib/doc/Tutorial.lyx index dad023b..3b8bb28 100644 --- a/lib/doc/Tutorial.lyx +++ b/lib/doc/Tutorial.lyx @@ -1064,7 +1064,7 @@ It gets better. \begin_inset Quotes eld \end_inset -my first LyX document +my first LyX document. \begin_inset Quotes erd \end_inset @@ -1456,7 +1456,7 @@ arg "layout Standard" \end_layout \begin_layout Standard -You have got a beautiful itemized list. +You now have a beautiful itemized list. You might want to run LaTeX to see how the list looks when printed out. But what if you wanted to number the reasons? Well, just select the whole list diff --git a/lib/doc/es/Tutorial.lyx b/lib/doc/es/Tutorial.lyx index 85a4557..a50626c 100644 --- a/lib/doc/es/Tutorial.lyx +++ b/lib/doc/es/Tutorial.lyx @@ -1060,7 +1060,7 @@ La cosa mejora. \begin_inset Quotes fld \end_inset -mi primer documento LyX +mi primer documento LyX. \begin_inset Quotes frd \end_inset --- Summary of changes: lib/doc/Math.lyx|2 +- lib/doc/Tutorial.lyx|4 ++-- lib/doc/es/Tutorial.lyx |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] Math.lyx, Tutorial.lyx: fix some typos spotted by a user
The branch, master, has been updated. - Log - commit 11c56abc5bc6dc4822d4d70341567540dfd3fafd Author: Uwe Stöhr Date: Tue Feb 5 01:56:30 2013 +0100 Math.lyx, Tutorial.lyx: fix some typos spotted by a user diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx index 38f5ac4..5acf792 100644 --- a/lib/doc/Math.lyx +++ b/lib/doc/Math.lyx @@ -29178,7 +29178,7 @@ Formula ! multiline ! align environment \end_layout \begin_layout Standard -This Align environment is created by presssing +This Align environment is created by pressing \begin_inset Info type "shortcut" arg "newline-insert newline" diff --git a/lib/doc/Tutorial.lyx b/lib/doc/Tutorial.lyx index dad023b..3b8bb28 100644 --- a/lib/doc/Tutorial.lyx +++ b/lib/doc/Tutorial.lyx @@ -1064,7 +1064,7 @@ It gets better. \begin_inset Quotes eld \end_inset -my first LyX document +my first LyX document. \begin_inset Quotes erd \end_inset @@ -1456,7 +1456,7 @@ arg "layout Standard" \end_layout \begin_layout Standard -You have got a beautiful itemized list. +You now have a beautiful itemized list. You might want to run LaTeX to see how the list looks when printed out. But what if you wanted to number the reasons? Well, just select the whole list diff --git a/lib/doc/es/Tutorial.lyx b/lib/doc/es/Tutorial.lyx index 85a4557..a50626c 100644 --- a/lib/doc/es/Tutorial.lyx +++ b/lib/doc/es/Tutorial.lyx @@ -1060,7 +1060,7 @@ La cosa mejora. \begin_inset Quotes fld \end_inset -mi primer documento LyX +mi primer documento LyX. \begin_inset Quotes frd \end_inset --- Summary of changes: lib/doc/Math.lyx|2 +- lib/doc/Tutorial.lyx|4 ++-- lib/doc/es/Tutorial.lyx |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] German Math.lyx: some missing translations
The branch, master, has been updated.
- Log -
commit 139d99d347fe6406bc00aca3fcbe5646ee90bebf
Author: Uwe Stöhr
Date: Wed Feb 6 01:31:24 2013 +0100
German Math.lyx: some missing translations
diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx
index 31bd34d..eb6b708 100644
--- a/lib/doc/de/Math.lyx
+++ b/lib/doc/de/Math.lyx
@@ -1230,7 +1230,7 @@ sp
\begin_inset Text
\begin_layout Plain Layout
-scaled point (65536
+skalierter Punkt(65536
\begin_inset space \thinspace{}
\end_inset
@@ -1258,7 +1258,7 @@ bp
\begin_inset Text
\begin_layout Plain Layout
-big point (72
+groÃer Punkt (72
\begin_inset space \thinspace{}
\end_inset
@@ -1394,7 +1394,7 @@ mu
\begin_inset Text
\begin_layout Plain Layout
-math unit (1
+Mathe-Einheit (1
\begin_inset space \thinspace{}
\end_inset
---
Summary of changes:
lib/doc/de/Math.lyx |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX 2.0.x] German Math.lyx: some missing translations
The branch, 2.0.x, has been updated.
- Log -
commit 859b2cbb0ba2db6e7f622a7b338ec3a88ae1e34e
Author: Uwe Stöhr
Date: Wed Feb 6 01:31:55 2013 +0100
German Math.lyx: some missing translations
diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx
index 31bd34d..eb6b708 100644
--- a/lib/doc/de/Math.lyx
+++ b/lib/doc/de/Math.lyx
@@ -1230,7 +1230,7 @@ sp
\begin_inset Text
\begin_layout Plain Layout
-scaled point (65536
+skalierter Punkt(65536
\begin_inset space \thinspace{}
\end_inset
@@ -1258,7 +1258,7 @@ bp
\begin_inset Text
\begin_layout Plain Layout
-big point (72
+groÃer Punkt (72
\begin_inset space \thinspace{}
\end_inset
@@ -1394,7 +1394,7 @@ mu
\begin_inset Text
\begin_layout Plain Layout
-math unit (1
+Mathe-Einheit (1
\begin_inset space \thinspace{}
\end_inset
---
Summary of changes:
lib/doc/de/Math.lyx |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX 2.0.x] Intro.lyx: style fixes by John Hudson
The branch, 2.0.x, has been updated. - Log - commit 65be4017faf2fc1b3858f7020e3d591a82b178e2 Author: Uwe Stöhr Date: Wed Feb 6 01:35:06 2013 +0100 Intro.lyx: style fixes by John Hudson diff --git a/lib/doc/Intro.lyx b/lib/doc/Intro.lyx index 86a897c..42cb3ff 100644 --- a/lib/doc/Intro.lyx +++ b/lib/doc/Intro.lyx @@ -113,8 +113,8 @@ status collapsed \begin_layout Plain Layout \noindent -If you have comments or error corrections, please send them to the LyX Documenta -tion mailing list: +If you have comments on or corrections to this documentation, please send + them to the LyX Documentation mailing list: \begin_inset CommandInset href LatexCommand href target "lyx-d...@lists.lyx.org" @@ -150,10 +150,10 @@ What is LyX? \begin_layout Standard LyX is a document preparation system. It excels at letting you create complex technical and scientific articles - with mathematics, cross-references, bibliographies, indices, etc. + with mathematics, cross-references, bibliographies, indexes, etc. It is very good for working with documents of any length in which the usual processing abilities are required: automatic sectioning and pagination, - spell checking, and so forth. + spell checking and so forth. It can also be used to write a letter to your mom, though granted, there are probably simpler programs available for that. It is definitely not the best tool for creating banners, flyers, or advertiseme @@ -291,9 +291,9 @@ Introduction . Of course, if you later decide that this section belongs someplace else - in the document, or if you insert a new section before it, you need to - change the numbering for this and all following sections, as well as any - entry in the table of contents. + in the document or if you insert a new section before it, you need to change + the numbering for this and all following sections, as well as any entry + in the table of contents. \end_layout \begin_layout Standard @@ -360,8 +360,7 @@ Here's another example. that label should be, how many blank lines to put between each item, and so on. Under LyX, you have only two concerns: what kind of list is this, and what - do I want to put in it. - That's it. + do I want to put in it? That is it. \end_layout \begin_layout Standard @@ -488,7 +487,7 @@ Space Tab stops, along with a ruler showing you the position of things on the page, are useless in LyX. The program worries about where things go on the page, not you. - Extra whitespace is similar; LyX adds them where necessary, depending on + Extra whitespace is similar; LyX adds it where necessary, depending on context. Not being able to type two blank lines in a row will be annoying at first, but it makes more sense once you're thinking in WYSIWYM terms. @@ -612,18 +611,10 @@ status collapsed \begin_layout Plain Layout The source for the info in this section is -\begin_inset Quotes eld -\end_inset - - \emph on A Guide to LaTeX2e \emph default -, -\begin_inset Quotes erd -\end_inset - - by Helmut Kopka and Patrick Daly, which has an entry in the bibliography +, by Helmut Kopka and Patrick Daly, which has an entry in the bibliography of the \emph on User's Guide @@ -647,7 +638,7 @@ tricks \end_inset of the printing trade were modeled by Knuth as computer algorithms and - incorporated into TeX, thus its excellent printed appearance. + incorporated into TeX, hence its excellent printed appearance. What comes directly out of TeX is the portable document format \emph on pdf @@ -739,23 +730,22 @@ LaTeX: Macro package built upon TeX\SpecialChar \@. \end_layout \begin_layout Description -classes: Descriptions of a type of document, using LaTeX\SpecialChar \@. +classes: Descriptions of types of document used with LaTeX\SpecialChar \@. \end_layout \begin_layout Description -styles: Alters the default behavior of LaTeX in some way. +styles: Descriptions of the default behavior of particular elements of LaTeX. \end_layout \begin_layout Description -LyX: Visual, WYSIWYM word-processor that uses LaTeX to do its typesetting. +LyX: Visual, WYSIWYM document processor that uses LaTeX to do its typesetting. \end_layout \begin_layout Standard -This section attempts to account for the difference between LyX and other - word processors. +This section attempts to explain the difference between LyX and a word processor. Simply put, LaTeX is the difference. - By using LaTeX as its backend, LyX helps you think more about + By using LaTeX as its backend, LyX helps you to think more about \emph on what \emph default @@ -785,8 +775,8 @@ To make it easier to answer your questions and describe all of the features \end_layout \begin_layout Standard -The developing of LyX will hopefully never stop, so that some of the documentati -on may be incomplete or a bit out of date, though we try to keep up. +Hopefully, the development of LyX will never stop;
[LyX master] Intro.lyx: style fixes by John Hudson
The branch, master, has been updated. - Log - commit e7c5ded51661f0d6bd12f499a36b137e7684950f Author: Uwe Stöhr Date: Wed Feb 6 01:36:58 2013 +0100 Intro.lyx: style fixes by John Hudson diff --git a/lib/doc/Intro.lyx b/lib/doc/Intro.lyx index 86a897c..42cb3ff 100644 --- a/lib/doc/Intro.lyx +++ b/lib/doc/Intro.lyx @@ -113,8 +113,8 @@ status collapsed \begin_layout Plain Layout \noindent -If you have comments or error corrections, please send them to the LyX Documenta -tion mailing list: +If you have comments on or corrections to this documentation, please send + them to the LyX Documentation mailing list: \begin_inset CommandInset href LatexCommand href target "lyx-d...@lists.lyx.org" @@ -150,10 +150,10 @@ What is LyX? \begin_layout Standard LyX is a document preparation system. It excels at letting you create complex technical and scientific articles - with mathematics, cross-references, bibliographies, indices, etc. + with mathematics, cross-references, bibliographies, indexes, etc. It is very good for working with documents of any length in which the usual processing abilities are required: automatic sectioning and pagination, - spell checking, and so forth. + spell checking and so forth. It can also be used to write a letter to your mom, though granted, there are probably simpler programs available for that. It is definitely not the best tool for creating banners, flyers, or advertiseme @@ -291,9 +291,9 @@ Introduction . Of course, if you later decide that this section belongs someplace else - in the document, or if you insert a new section before it, you need to - change the numbering for this and all following sections, as well as any - entry in the table of contents. + in the document or if you insert a new section before it, you need to change + the numbering for this and all following sections, as well as any entry + in the table of contents. \end_layout \begin_layout Standard @@ -360,8 +360,7 @@ Here's another example. that label should be, how many blank lines to put between each item, and so on. Under LyX, you have only two concerns: what kind of list is this, and what - do I want to put in it. - That's it. + do I want to put in it? That is it. \end_layout \begin_layout Standard @@ -488,7 +487,7 @@ Space Tab stops, along with a ruler showing you the position of things on the page, are useless in LyX. The program worries about where things go on the page, not you. - Extra whitespace is similar; LyX adds them where necessary, depending on + Extra whitespace is similar; LyX adds it where necessary, depending on context. Not being able to type two blank lines in a row will be annoying at first, but it makes more sense once you're thinking in WYSIWYM terms. @@ -612,18 +611,10 @@ status collapsed \begin_layout Plain Layout The source for the info in this section is -\begin_inset Quotes eld -\end_inset - - \emph on A Guide to LaTeX2e \emph default -, -\begin_inset Quotes erd -\end_inset - - by Helmut Kopka and Patrick Daly, which has an entry in the bibliography +, by Helmut Kopka and Patrick Daly, which has an entry in the bibliography of the \emph on User's Guide @@ -647,7 +638,7 @@ tricks \end_inset of the printing trade were modeled by Knuth as computer algorithms and - incorporated into TeX, thus its excellent printed appearance. + incorporated into TeX, hence its excellent printed appearance. What comes directly out of TeX is the portable document format \emph on pdf @@ -739,23 +730,22 @@ LaTeX: Macro package built upon TeX\SpecialChar \@. \end_layout \begin_layout Description -classes: Descriptions of a type of document, using LaTeX\SpecialChar \@. +classes: Descriptions of types of document used with LaTeX\SpecialChar \@. \end_layout \begin_layout Description -styles: Alters the default behavior of LaTeX in some way. +styles: Descriptions of the default behavior of particular elements of LaTeX. \end_layout \begin_layout Description -LyX: Visual, WYSIWYM word-processor that uses LaTeX to do its typesetting. +LyX: Visual, WYSIWYM document processor that uses LaTeX to do its typesetting. \end_layout \begin_layout Standard -This section attempts to account for the difference between LyX and other - word processors. +This section attempts to explain the difference between LyX and a word processor. Simply put, LaTeX is the difference. - By using LaTeX as its backend, LyX helps you think more about + By using LaTeX as its backend, LyX helps you to think more about \emph on what \emph default @@ -785,8 +775,8 @@ To make it easier to answer your questions and describe all of the features \end_layout \begin_layout Standard -The developing of LyX will hopefully never stop, so that some of the documentati -on may be incomplete or a bit out of date, though we try to keep up. +Hopefully, the development of LyX will never stop;
[LyX 2.0.x] German and Japanese Intro.lyx: fix a link
The branch, 2.0.x, has been updated. - Log - commit 421053c60caafce969b42e25f5f7a4cd5a9eb3c3 Author: Uwe Stöhr Date: Wed Feb 6 01:48:15 2013 +0100 German and Japanese Intro.lyx: fix a link diff --git a/lib/doc/de/Intro.lyx b/lib/doc/de/Intro.lyx index 5f4d065..91267b8 100644 --- a/lib/doc/de/Intro.lyx +++ b/lib/doc/de/Intro.lyx @@ -2400,22 +2400,21 @@ Wie alle anderen Bereiche von LyX kann auch das Dokumentationsteam Hilfe \end_layout \begin_layout Enumerate -Besorgen Sie sich die neueste Version der LyX-Quellen. - Packen Sie das Archiv aus. -\begin_inset Foot +Besorgen Sie sich die neueste Version der LyX-Quellen von +\begin_inset Newline newline +\end_inset + + +\begin_inset Flex URL status collapsed \begin_layout Plain Layout -Sie können sich die aktuellste Version auch aus dem LyX-SVN-Archiv besorgen. +http://www.lyx.org/trac/browser/lyxgit/lib/doc?rev=master \end_layout \end_inset - Im Hauptverzeichnis finden Sie das Unterverzeichnis -\family typewriter -lib/doc -\family default -. + \end_layout \begin_layout Enumerate diff --git a/lib/doc/ja/Intro.lyx b/lib/doc/ja/Intro.lyx index d190ed1..1b0278c 100644 --- a/lib/doc/ja/Intro.lyx +++ b/lib/doc/ja/Intro.lyx @@ -3844,7 +3844,7 @@ status collapsed \begin_layout Plain Layout -http://www.lyx.org/trac/browser/lyx-devel/trunk/lib/doc +http://www.lyx.org/trac/browser/lyxgit/lib/doc?rev=master \end_layout \end_inset --- Summary of changes: lib/doc/de/Intro.lyx | 17 - lib/doc/ja/Intro.lyx |2 +- 2 files changed, 9 insertions(+), 10 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] German and Japanese Intro.lyx: fix a link
The branch, master, has been updated. - Log - commit 40b487c4774872941e56eefc1d3b1c056b462ff5 Author: Uwe Stöhr Date: Wed Feb 6 01:48:43 2013 +0100 German and Japanese Intro.lyx: fix a link diff --git a/lib/doc/de/Intro.lyx b/lib/doc/de/Intro.lyx index 5f4d065..91267b8 100644 --- a/lib/doc/de/Intro.lyx +++ b/lib/doc/de/Intro.lyx @@ -2400,22 +2400,21 @@ Wie alle anderen Bereiche von LyX kann auch das Dokumentationsteam Hilfe \end_layout \begin_layout Enumerate -Besorgen Sie sich die neueste Version der LyX-Quellen. - Packen Sie das Archiv aus. -\begin_inset Foot +Besorgen Sie sich die neueste Version der LyX-Quellen von +\begin_inset Newline newline +\end_inset + + +\begin_inset Flex URL status collapsed \begin_layout Plain Layout -Sie können sich die aktuellste Version auch aus dem LyX-SVN-Archiv besorgen. +http://www.lyx.org/trac/browser/lyxgit/lib/doc?rev=master \end_layout \end_inset - Im Hauptverzeichnis finden Sie das Unterverzeichnis -\family typewriter -lib/doc -\family default -. + \end_layout \begin_layout Enumerate diff --git a/lib/doc/ja/Intro.lyx b/lib/doc/ja/Intro.lyx index d190ed1..1b0278c 100644 --- a/lib/doc/ja/Intro.lyx +++ b/lib/doc/ja/Intro.lyx @@ -3844,7 +3844,7 @@ status collapsed \begin_layout Plain Layout -http://www.lyx.org/trac/browser/lyx-devel/trunk/lib/doc +http://www.lyx.org/trac/browser/lyxgit/lib/doc?rev=master \end_layout \end_inset --- Summary of changes: lib/doc/de/Intro.lyx | 17 - lib/doc/ja/Intro.lyx |2 +- 2 files changed, 9 insertions(+), 10 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] IEEEtran-CompSoc: new layout to support the IEEE "computer science" journals
The branch, master, has been updated.
- Log -
commit 20f1ba109ec100fe8081af69ec322e7a5a3c413b
Author: Uwe Stöhr
Date: Thu Feb 7 02:13:44 2013 +0100
IEEEtran-CompSoc: new layout to support the IEEE "computer science" journals
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f45724d..7a25325 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1898,6 +1898,7 @@ dist_layouts_DATA =\
layouts/heb-letter.layout \
layouts/hollywood.layout \
layouts/IEEEtran.layout \
+ layouts/IEEEtran-CompSoc.layout \
layouts/ijmpc.layout \
layouts/ijmpd.layout \
layouts/initials.module \
@@ -2072,6 +2073,7 @@ dist_templates_DATA = \
templates/g-brief-en.lyx \
templates/hollywood.lyx \
templates/IEEEtran.lyx \
+ templates/IEEEtran-CompSoc.lyx \
templates/IJMPC.lyx \
templates/IJMPD.lyx \
templates/IOP-article.lyx \
diff --git a/lib/layouts/IEEEtran-CompSoc.layout
b/lib/layouts/IEEEtran-CompSoc.layout
new file mode 100644
index 000..345a7e3
--- /dev/null
+++ b/lib/layouts/IEEEtran-CompSoc.layout
@@ -0,0 +1,61 @@
+#% Do not delete he line below; configure depends on this
+# \DeclareLaTeXClass[IEEEtran]{IEEE Transactions Computer Society}
+# \DeclareCategory{Articles}
+# Author: Uwe Stöhr (uwesto...@web.de)
+#
+# IEEtran compsoc textclass definition file.
+
+
+Format 43
+
+Input IEEEtran.layout
+
+ClassOptions
+ FontSize 12
+ Othercompsoc
+end
+
+
+Style Standard_in_Title
+ CopyStyleStandard
+ Category FrontMatter
+ InTitle 1
+End
+
+
+InsetLayout Flex:Author_Footnote
+ LyxType custom
+ LatexTypecommand
+ Decoration Classic
+ LaTeXNameIEEEcompsocitemizethanks
+ LabelString "Author foot"
+ Font
+Size Small
+ EndFont
+ LabelFont
+Color blue
+Size Small
+ EndFont
+End
+
+
+Style Abstract
+ InTitle 1
+ TopSep 0.1
+End
+
+
+Style Keywords
+ InTitle 1
+ BottomSep0.1
+End
+
+
+Style Nontitle_Abstract_Index_Text
+ CopyStyleAppendices
+ LatexNameIEEEdisplaynontitleabstractindextext
+ Category FrontMatter
+ TopSep 1
+ LabelString "NontitleAbstractIndexText"
+End
+
diff --git a/lib/templates/IEEEtran-CompSoc.lyx
b/lib/templates/IEEEtran-CompSoc.lyx
new file mode 100644
index 000..7dfc77d
--- /dev/null
+++ b/lib/templates/IEEEtran-CompSoc.lyx
@@ -0,0 +1,919 @@
+#LyX 2.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 459
+\begin_document
+\begin_header
+\textclass IEEEtran-CompSoc
+\begin_preamble
+% for subfigures/subtables
+\ifCLASSOPTIONcompsoc
+\usepackage[caption=false,font=normalsize,labelfont=sf,textfont=sf]{subfig}
+%\usepackage[nocompress]{cite} %optional
+\else
+\usepackage[caption=false,font=footnotesize]{subfig}
+%\usepackage{cite} %optional
+\fi
+\end_preamble
+\options journal
+\use_default_options false
+\maintain_unincluded_children false
+\language english
+\language_package default
+\inputencoding default
+\fontencoding global
+\font_roman default
+\font_sans default
+\font_typewriter default
+\font_math auto
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_osf false
+\font_sf_scale 100
+\font_tt_scale 100
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement tbh
+\paperfontsize default
+\spacing single
+\use_hyperref true
+\pdf_title "Your Title"
+\pdf_author "Your Name"
+\pdf_bookmarks true
+\pdf_bookmarksnumbered true
+\pdf_bookmarksopen true
+\pdf_bookmarksopenlevel 1
+\pdf_breaklinks false
+\pdf_pdfborder true
+\pdf_colorlinks false
+\pdf_backref false
+\pdf_pdfusetitle false
+\pdf_quoted_options "pdfpagelayout=OneColumn, pdfnewwindow=true,
pdfstartview=XYZ, plainpages=false"
+\papersize default
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\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 numerical
+\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 english
+\papercolumns 2
+\papersides 1
+\paperpagestyle default
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+This is a template LyX file for articles to be submitted to
+\begin_inset Quotes eld
+\end_inset
+
+Computer Science
+\begin_inset Quotes erd
+\end_inset
+
+ journals of the
[LyX 2.0.x] IEEEtran.lyx: fix typos
The branch, 2.0.x, has been updated. - Log - commit 0b6a9cc8769aac0f87c4ac8cf0e2c9b78eddcb60 Author: Uwe Stöhr Date: Thu Feb 7 02:15:01 2013 +0100 IEEEtran.lyx: fix typos - IEEEtran.layout: fix a whitespace diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout index 58b82db..8c1b3f2 100644 --- a/lib/layouts/IEEEtran.layout +++ b/lib/layouts/IEEEtran.layout @@ -10,7 +10,7 @@ Format 35 -Sides 1 +Sides 1 SecNumDepth3 TocDepth 3 DefaultStyle Standard diff --git a/lib/templates/IEEEtran.lyx b/lib/templates/IEEEtran.lyx index 00a26cd..76c82ea 100644 --- a/lib/templates/IEEEtran.lyx +++ b/lib/templates/IEEEtran.lyx @@ -382,7 +382,7 @@ only if you have one \end_layout \begin_layout Abstract -This ist the abstact text. +This is the abstract text. \end_layout \begin_layout Keywords --- Summary of changes: lib/layouts/IEEEtran.layout |2 +- lib/templates/IEEEtran.lyx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] elsarticle.layout: force plain layout for some flex insets
The branch, master, has been updated. - Log - commit f3c407e7b9f57ee913fef68fb6d4229f0c5ec2e8 Author: Uwe Stöhr Date: Sat Feb 9 02:50:54 2013 +0100 elsarticle.layout: force plain layout for some flex insets - This prevents LaTeX errors because some commands don't allow to include commands. - also simplified some code diff --git a/lib/layouts/elsarticle.layout b/lib/layouts/elsarticle.layout index 812f210..45774d7 100644 --- a/lib/layouts/elsarticle.layout +++ b/lib/layouts/elsarticle.layout @@ -103,6 +103,7 @@ End InsetLayout "Flex:Titlenotemark" LyxType custom LatexType command + ForcePlain 1 LatexName tnoteref LabelString "Titlenote mark" Font @@ -171,6 +172,7 @@ End InsetLayout "Flex:Authormark" LyxType custom LatexType command + ForcePlain 1 LatexName fnref LabelString "Author mark" Font @@ -202,23 +204,11 @@ End InsetLayout "Flex:CorAuthormark" - LyxType custom - LatexType command + CopyStyle "Flex:Authormark" LatexName corref LabelString "CorAuthor mark" - Font - Color foreground - Size Small - FamilyRoman - Shape Up - SeriesMedium - Misc No_Emph - Misc No_Noun - Misc No_Bar - EndFont LabelFont Color blue - Size Small EndFont End --- Summary of changes: lib/layouts/elsarticle.layout | 16 +++- 1 files changed, 3 insertions(+), 13 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] IEEEtran-CompSoc.layout: force plain layout
The branch, master, has been updated. - Log - commit 0c993b513588454e9bbfecb27b6f160c79188d21 Author: Uwe Stöhr Date: Sat Feb 9 02:52:39 2013 +0100 IEEEtran-CompSoc.layout: force plain layout diff --git a/lib/layouts/IEEEtran-CompSoc.layout b/lib/layouts/IEEEtran-CompSoc.layout index 345a7e3..39c2f92 100644 --- a/lib/layouts/IEEEtran-CompSoc.layout +++ b/lib/layouts/IEEEtran-CompSoc.layout @@ -27,6 +27,7 @@ InsetLayout Flex:Author_Footnote LyxType custom LatexTypecommand Decoration Classic + ForcePlain 1 LaTeXNameIEEEcompsocitemizethanks LabelString "Author foot" Font --- Summary of changes: lib/layouts/IEEEtran-CompSoc.layout |1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] IEEEtran.layout: support for conference articles
The branch, master, has been updated.
- Log -
commit 33e185e5edf8e0601a0902f0fee48574ba4db6dc
Author: Uwe Stöhr
Date: Sat Feb 9 03:23:34 2013 +0100
IEEEtran.layout: support for conference articles
- IEEEtran-Conference.lyx: new template for conference articles of the IEEE
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7a25325..808a0af 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2074,6 +2074,7 @@ dist_templates_DATA = \
templates/hollywood.lyx \
templates/IEEEtran.lyx \
templates/IEEEtran-CompSoc.lyx \
+ templates/IEEEtran-Conference.lyx \
templates/IJMPC.lyx \
templates/IJMPD.lyx \
templates/IOP-article.lyx \
diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout
index b0d960e..45bf24e 100644
--- a/lib/layouts/IEEEtran.layout
+++ b/lib/layouts/IEEEtran.layout
@@ -86,6 +86,7 @@ End
InsetLayout Flex:IEEE_membership
LyxType custom
LatexTypecommand
+ ForcePlain 1
LatexNameIEEEmembership
LabelString "IEEE membership"
Font
@@ -136,6 +137,60 @@ Style Author
End
+InsetLayout Flex:Author_Name
+ LyxType custom
+ LatexTypecommand
+ Decoration Classic
+ ForcePlain 1
+ LaTeXNameIEEEauthorblockN
+ LabelString "Author name"
+ Font
+Size Large
+ EndFont
+ LabelFont
+Color blue
+Size Small
+ EndFont
+End
+
+
+InsetLayout Flex:Author_Affiliation
+ CopyStyleFlex:Author_Name
+ LaTeXNameIEEEauthorblockA
+ LabelString "Author affiliation"
+ Font
+Size Normal
+ EndFont
+ LabelFont
+Color blue
+Size Small
+ EndFont
+End
+
+
+InsetLayout Flex:Author_Mark
+ LyxType custom
+ LatexType command
+ ForcePlain 1
+ LatexName IEEEauthorrefmark
+ LabelString "Author mark"
+ Font
+ Color foreground
+ Size Small
+ FamilyRoman
+ Shape Up
+ SeriesMedium
+ Misc No_Emph
+ Misc No_Noun
+ Misc No_Bar
+ EndFont
+ LabelFont
+ Color latex
+ Size Small
+ EndFont
+End
+
+
Style Special_Paper_Notice
CopyStyleTitle
LatexNameIEEEspecialpapernotice
@@ -259,6 +314,16 @@ Style Appendices
EndFont
End
+
+Style Peer_Review_Title
+ CopyStyleAppendices
+ LatexNameIEEEpeerreviewmaketitle
+ Category FrontMatter
+ TopSep 1
+ LabelString "PeerReviewTitle"
+End
+
+
Style Appendix
CopyStyleAppendices
LatexNameappendix
diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index d5b507a..e632c1b 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -3494,6 +3494,40 @@ def revert_newframes(document):
i = j
+def revert_IEEEtran_3(document):
+ '''
+ Reverts Flex Insets to TeX-code
+ '''
+ if document.textclass == "IEEEtran":
+h = 0
+i = 0
+j = 0
+while True:
+ if h != -1:
+h = find_token(document.body, "\\begin_inset Flex Author Mark", h)
+ if h != -1:
+endh = find_end_of_inset(document.body, h)
+document.body[endh - 2 : endh + 1] = put_cmd_in_ert("}")
+document.body[h : h + 4] = put_cmd_in_ert("\\IEEEauthorrefmark{")
+h = h + 5
+ if i != -1:
+i = find_token(document.body, "\\begin_inset Flex Author Name", i)
+ if i != -1:
+endi = find_end_of_inset(document.body, i)
+document.body[endi - 2 : endi + 1] = put_cmd_in_ert("}")
+document.body[i : i + 4] = put_cmd_in_ert("\\IEEEauthorblockN{")
+i = i + 5
+ if j != -1:
+j = find_token(document.body, "\\begin_inset Flex Author Affiliation",
j)
+ if j != -1:
+endj = find_end_of_inset(document.body, j)
+document.body[endj - 2 : endj + 1] = put_cmd_in_ert("}")
+document.body[j : j + 4] = put_cmd_in_ert("\\IEEEauthorblockA{")
+j = j + 5
+ if i == -1 and j == -1 and h == -1:
+return
+
+
##
# Conversion hub
#
@@ -3545,10 +3579,12 @@ convert = [
[456, [convert_epigraph]],
[457, [convert_use_stackrel]],
[458, [convert_captioninsets, convert_captionlayouts]],
- [459, []]
+ [459, []],
+ [460, []]
]
revert = [
+ [459, [revert_IEEEtran_3]],
[458, [revert_fragileframe, revert_newframes]],
[457, [revert_captioninsets, revert_captionlayouts]],
[456, [revert_use_stackrel]],
diff --git a/lib/templates/IEEEtran-CompSoc.lyx
b/lib/templates/IEEEtran-CompSoc.lyx
index 7dfc77d..15179d0 100644
--- a/lib/templates/IEEEtran-CompSoc.lyx
+++ b/lib/templates/IEEEtran-CompSoc.lyx
@@ -1,5 +1,5 @@
#LyX 2.1 created this file. For more info see http://www.lyx.org/
-\lyxformat 459
+\lyxformat 460
\begin_document
[LyX master] IEEEtran: dome corrections and additional info
The branch, master, has been updated.
- Log -
commit 59e13e6df602e2f4ed2b135043c68322af1f6a54
Author: Uwe Stöhr
Date: Sat Feb 9 17:53:34 2013 +0100
IEEEtran: dome corrections and additional info
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 808a0af..f01463c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2072,7 +2072,7 @@ dist_templates_DATA = \
templates/g-brief-de.lyx \
templates/g-brief-en.lyx \
templates/hollywood.lyx \
- templates/IEEEtran.lyx \
+ templates/IEEEtran-Journal.lyx \
templates/IEEEtran-CompSoc.lyx \
templates/IEEEtran-Conference.lyx \
templates/IJMPC.lyx \
diff --git a/lib/layouts/IEEEtran-CompSoc.layout
b/lib/layouts/IEEEtran-CompSoc.layout
index 39c2f92..411f191 100644
--- a/lib/layouts/IEEEtran-CompSoc.layout
+++ b/lib/layouts/IEEEtran-CompSoc.layout
@@ -3,7 +3,7 @@
# \DeclareCategory{Articles}
# Author: Uwe Stöhr (uwesto...@web.de)
#
-# IEEtran compsoc textclass definition file.
+# IEEtran Computer Society textclass definition file.
Format 43
@@ -23,6 +23,12 @@ Style Standard_in_Title
End
+# enable this if bug #8545 is fixed
+#NoStyle Author_Name
+#NoStyle Flex:Author_Affiliation
+#NoStyle Flex:Author_Mark
+
+
InsetLayout Flex:Author_Footnote
LyxType custom
LatexTypecommand
diff --git a/lib/templates/IEEEtran-CompSoc.lyx
b/lib/templates/IEEEtran-CompSoc.lyx
index 15179d0..0c10316 100644
--- a/lib/templates/IEEEtran-CompSoc.lyx
+++ b/lib/templates/IEEEtran-CompSoc.lyx
@@ -133,11 +133,11 @@ Computer Science
\begin_inset Quotes erd
\end_inset
- journals use the
+ journals use one of the other
\emph on
-IEEEtran.lyx
+IEEEtran-*.lyx
\emph default
-template file instead of this one!
+template files instead of this one!
\end_layout
\end_inset
@@ -152,7 +152,7 @@ status open
\begin_layout Plain Layout
It is important that you use the correct document class options for your
document..
- These are explained in the IEEEtran document class documentation:
+ These are explained in the IEEEtran documentation:
\begin_inset Flex URL
status open
@@ -475,7 +475,7 @@ copyright
\begin_inset space ~
\end_inset
-2007 IEEE
+2012 IEEE
\begin_inset Note Note
status open
@@ -566,18 +566,37 @@ status open
\begin_layout Plain Layout
This style is only necessary when using the document class option
-\begin_inset Quotes eld
-\end_inset
-
-
\family sans
conference
\family default
+.
+\end_layout
-\begin_inset Quotes erd
\end_inset
-.
+
+\end_layout
+
+\begin_layout Peer Review Title
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Don't add text here!
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+required if you use the document class option
+\family sans
+peerreview
+\family default
+, must otherwise not be used
\end_layout
\end_inset
diff --git a/lib/templates/IEEEtran-Conference.lyx
b/lib/templates/IEEEtran-Conference.lyx
index 81754ac..c5aa973 100644
--- a/lib/templates/IEEEtran-Conference.lyx
+++ b/lib/templates/IEEEtran-Conference.lyx
@@ -99,7 +99,7 @@ This is a template LyX file for conference articles of
conferences organized
by the Institute of Electrical and Electronics Engineers (IEEE).
For IEEE journal articles, see the template file
\emph on
-IEEEtran.lyx
+IEEEtran-Journal.lyx
\emph default
.
For general info see
@@ -121,6 +121,32 @@ http://wiki.lyx.org/Examples/IEEE
\end_layout
+\begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+It is important that you use the correct document class options for your
+ document..
+ These are explained in the IEEEtran documentation:
+\begin_inset Flex URL
+status open
+
+\begin_layout Plain Layout
+
+http://mirror.ctan.org/macros/latex/contrib/IEEEtran/IEEEtran_HOWTO.pdf
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
\begin_layout Title
Your Title
\end_layout
@@ -544,7 +570,11 @@ Don't add text here!
status open
\begin_layout Plain Layout
-optional, only useful for peer review papers
+required if you use the document class option
+\family sans
+peerreview
+\family default
+, must otherwise not be used
\end_layout
\end_inset
diff --git a/lib/templates/IEEEtran.lyx b/lib/templates/IEEEtran-Journal.lyx
similarity index 96%
rename from lib/templates/IEEEtran.lyx
rename to lib/templates/IEEEtran-Journal.lyx
index dc1f4fc..2f22894 100644
--- a/lib/templates/IEEEtran.lyx
+++ b/lib/templates/IEEEtran-Journal.lyx
@@ -11,6 +11,7 @@
\usepackage[caption=false,font=footnotesize]{subfig}
\fi
\end_preamble
+\options journal
\use_default_options false
\maintain_unincluded_children false
\language english
@@ -127,7 +128,7 @@ status open
\begin_layout Plain Layout
It is important that you use the correct document class options for your
document..
- These are explained in the IEEE
[LyX master] IEEEtran templates: some preamble simplifications and fixes
The branch, master, has been updated.
- Log -
commit 6c922c80297c75464e74c3bdc1d45decf928606d
Author: Uwe Stöhr
Date: Sat Feb 9 18:08:12 2013 +0100
IEEEtran templates: some preamble simplifications and fixes
diff --git a/lib/templates/IEEEtran-CompSoc.lyx
b/lib/templates/IEEEtran-CompSoc.lyx
index 0c10316..dc780e9 100644
--- a/lib/templates/IEEEtran-CompSoc.lyx
+++ b/lib/templates/IEEEtran-CompSoc.lyx
@@ -5,16 +5,11 @@
\textclass IEEEtran-CompSoc
\begin_preamble
% for subfigures/subtables
-\ifCLASSOPTIONcompsoc
\usepackage[caption=false,font=normalsize,labelfont=sf,textfont=sf]{subfig}
%\usepackage[nocompress]{cite} %optional
-\else
-\usepackage[caption=false,font=footnotesize]{subfig}
-%\usepackage{cite} %optional
-\fi
\end_preamble
\options journal
-\use_default_options false
+\use_default_options true
\maintain_unincluded_children false
\language english
\language_package default
diff --git a/lib/templates/IEEEtran-Conference.lyx
b/lib/templates/IEEEtran-Conference.lyx
index c5aa973..bc77368 100644
--- a/lib/templates/IEEEtran-Conference.lyx
+++ b/lib/templates/IEEEtran-Conference.lyx
@@ -5,11 +5,7 @@
\textclass IEEEtran
\begin_preamble
% for subfigures/subtables
-\ifCLASSOPTIONcompsoc
-\usepackage[caption=false,font=normalsize,labelfont=sf,textfont=sf]{subfig}
-\else
\usepackage[caption=false,font=footnotesize]{subfig}
-\fi
\end_preamble
\options conference
\use_default_options false
diff --git a/lib/templates/IEEEtran-Journal.lyx
b/lib/templates/IEEEtran-Journal.lyx
index 2f22894..c4b554d 100644
--- a/lib/templates/IEEEtran-Journal.lyx
+++ b/lib/templates/IEEEtran-Journal.lyx
@@ -5,11 +5,7 @@
\textclass IEEEtran
\begin_preamble
% for subfigures/subtables
-\ifCLASSOPTIONcompsoc
-\usepackage[caption=false,font=normalsize,labelfont=sf,textfont=sf]{subfig}
-\else
\usepackage[caption=false,font=footnotesize]{subfig}
-\fi
\end_preamble
\options journal
\use_default_options false
---
Summary of changes:
lib/templates/IEEEtran-CompSoc.lyx|7 +--
lib/templates/IEEEtran-Conference.lyx |4
lib/templates/IEEEtran-Journal.lyx|4
3 files changed, 1 insertions(+), 14 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] IEEE: support for Transactions on Magnetics
The branch, master, has been updated.
- Log -
commit d8a6e0ab70962134792c5eca585fdcd013204649
Author: Uwe Stöhr
Date: Sat Feb 9 18:18:21 2013 +0100
IEEE: support for Transactions on Magnetics
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f01463c..2b620d3 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1899,6 +1899,7 @@ dist_layouts_DATA =\
layouts/hollywood.layout \
layouts/IEEEtran.layout \
layouts/IEEEtran-CompSoc.layout \
+ layouts/IEEEtran-TransMag.layout \
layouts/ijmpc.layout \
layouts/ijmpd.layout \
layouts/initials.module \
@@ -2072,9 +2073,10 @@ dist_templates_DATA = \
templates/g-brief-de.lyx \
templates/g-brief-en.lyx \
templates/hollywood.lyx \
- templates/IEEEtran-Journal.lyx \
templates/IEEEtran-CompSoc.lyx \
templates/IEEEtran-Conference.lyx \
+ templates/IEEEtran-Journal.lyx \
+ templates/IEEEtran-TransMag.lyx \
templates/IJMPC.lyx \
templates/IJMPD.lyx \
templates/IOP-article.lyx \
diff --git a/lib/layouts/IEEEtran-TransMag.layout
b/lib/layouts/IEEEtran-TransMag.layout
new file mode 100644
index 000..2a9e228
--- /dev/null
+++ b/lib/layouts/IEEEtran-TransMag.layout
@@ -0,0 +1,46 @@
+#% Do not delete he line below; configure depends on this
+# \DeclareLaTeXClass[IEEEtran]{IEEE Transactions on Magnetics}
+# \DeclareCategory{Articles}
+# Author: Uwe Stöhr (uwesto...@web.de)
+#
+# IEEtran Magnetics textclass definition file.
+
+
+Format 43
+
+Input IEEEtran.layout
+
+NoStyle Special_Paper_Notice
+
+ClassOptions
+ Othertransmag
+end
+
+
+Style Standard_in_Title
+ CopyStyleStandard
+ Category FrontMatter
+ InTitle 1
+End
+
+
+Style Abstract
+ InTitle 1
+ TopSep 0.1
+End
+
+
+Style Keywords
+ InTitle 1
+ BottomSep0.1
+End
+
+
+Style Nontitle_Abstract_Index_Text
+ CopyStyleAppendices
+ LatexNameIEEEdisplaynontitleabstractindextext
+ Category FrontMatter
+ TopSep 1
+ LabelString "NontitleAbstractIndexText"
+End
+
diff --git a/lib/templates/IEEEtran-TransMag.lyx
b/lib/templates/IEEEtran-TransMag.lyx
new file mode 100644
index 000..d34f463
--- /dev/null
+++ b/lib/templates/IEEEtran-TransMag.lyx
@@ -0,0 +1,883 @@
+#LyX 2.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 460
+\begin_document
+\begin_header
+\textclass IEEEtran-TransMag
+\begin_preamble
+% for subfigures/subtables
+\usepackage[caption=false,font=normalsize,labelfont=sf,textfont=sf]{subfig}
+%\usepackage[nocompress]{cite} %optional
+\end_preamble
+\options journal
+\use_default_options true
+\maintain_unincluded_children false
+\language english
+\language_package default
+\inputencoding default
+\fontencoding global
+\font_roman default
+\font_sans default
+\font_typewriter default
+\font_math auto
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_osf false
+\font_sf_scale 100
+\font_tt_scale 100
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement tbh
+\paperfontsize default
+\spacing single
+\use_hyperref true
+\pdf_title "Your Title"
+\pdf_author "Your Name"
+\pdf_bookmarks true
+\pdf_bookmarksnumbered true
+\pdf_bookmarksopen true
+\pdf_bookmarksopenlevel 1
+\pdf_breaklinks false
+\pdf_pdfborder true
+\pdf_colorlinks false
+\pdf_backref false
+\pdf_pdfusetitle false
+\pdf_quoted_options "pdfpagelayout=OneColumn, pdfnewwindow=true,
pdfstartview=XYZ, plainpages=false"
+\papersize default
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\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 numerical
+\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 english
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+This is a template LyX file for articles to be submitted to
+\begin_inset Quotes eld
+\end_inset
+
+Transactions on Magnetics
+\begin_inset Quotes erd
+\end_inset
+
+ journals of the Institute of Electrical and Electronics Engineers (IEEE).
+ For general info see
+\begin_inset Flex URL
+status open
+
+\begin_layout Plain Layout
+
+http://wiki.lyx.org/Examples/IEEE
+\end_layout
+
+\end_inset
+
+.
+\end_layout
+
+\begin
[LyX master] tex2lyx/Preamble.cpp: fix bug #8525 temporarily
The branch, master, has been updated.
- Log -
commit a69fcde0726450d696081ed5c21506d42a90b103
Author: Uwe Stöhr
Date: Sun Feb 10 23:31:38 2013 +0100
tex2lyx/Preamble.cpp: fix bug #8525 temporarily
- this might break some tex2lyx features but tex2lyx was completely broken
- not even the simplest TeX file could be imported and compiles
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 8d82f6c..02469a2 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -802,11 +802,20 @@ void Preamble::handle_package(Parser &p, string const &
name,
// Therefore check for the "," character.
// It is also only set when there is not more than one babel
// language option.
- if (opts.find(",") == string::npos && one_language == true)
- h_inputencoding = opts;
- if (!options.empty())
- p.setEncoding(options.back(), Encoding::inputenc);
- options.clear();
+ if (!opts.empty()) {
+ if (opts.find(",") == string::npos && one_language ==
true) {
+ h_inputencoding = opts;
+ // FIXME: if this line is used, tex2lyx
swallows the next character
+ // in the file behind "{inputenc}"
+ //p.setEncoding(opts);
+ } else {
+ h_preamble << "\\usepackage[" << opts << "}{"
<< name << "}\n";
+ // FIXME: enabling this introduces bug #8525
+ //p.setEncoding(options.back(),
Encoding::inputenc);
+ }
+ options.clear();
+ } else
+ h_preamble << "\\usepackage{" << name << "}\n";
}
else if (name == "srcltx") {
---
Summary of changes:
src/tex2lyx/Preamble.cpp | 19 ++-
1 files changed, 14 insertions(+), 5 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] support for the kurier sansserif fonts
The branch, master, has been updated.
- Log -
commit 487d3bffab0320deac76dc842696b397496317ee
Author: Uwe Stöhr
Date: Mon Feb 11 00:47:09 2013 +0100
support for the kurier sansserif fonts
- fileformat change
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 12ceb3f..d3a43ca 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -409,6 +409,7 @@
\TestPackage{fourier}
\TestPackage{garamondx}
\TestFont[zgmr8r]{garamondx-fonts}
+\TestPackage{kurier}
\TestPackage{lh-lcy}
\TestPackage{libertine}
\TestPackage{libertine-type1}
diff --git a/lib/latexfonts b/lib/latexfonts
index b840784..281b3f8 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -442,6 +442,46 @@ Font helvet
Requires psnfss
EndFont
+Font kurier
+ GuiName "Kurier"
+ Family sf
+ SwitchDefault 1
+ Preamble
+ \renewcommand{\bfdefault}{b}
+ EndPreamble
+EndFont
+
+Font kurierl
+ GuiName "Kurier (light)"
+ Family sf
+ SwitchDefault 1
+ Preamble
+ \renewcommand{\bfdefault}{b}
+ EndPreamble
+EndFont
+
+Font kurier-condensed
+ GuiName "Kurier (condensed)"
+ Family sf
+ Requireskurier
+ Preamble
+ \renewcommand{\sfdefault}{kurier}
+ \edef\sfdefault{\sfdefault c}
+ \renewcommand{\bfdefault}{b}
+ EndPreamble
+EndFont
+
+Font kurier-light-condensed
+ GuiName "Kurier (light condensed)"
+ Family sf
+ Requireskurier
+ Preamble
+ \renewcommand{\sfdefault}{kurierl}
+ \edef\sfdefault{\sfdefault c}
+ \renewcommand{\bfdefault}{b}
+ EndPreamble
+EndFont
+
Font lmss
GuiName "Latin Modern Sans"
Family sf
@@ -547,6 +587,17 @@ Font garamondx-ntxm
Provides amssymb,amsfonts
EndFont
+Font kurier-math
+ GuiName "Kurier (math)"
+ Family math
+ Requireskurier
+ Preamble
+ \let\Myrmdefault\rmdefault
+ \usepackage[math]{kurier}
+ \renewcommand{\rmdefault}{\Myrmdefault}
+ EndPreamble
+EndFont
+
Font libertine-ntxm
GuiName "Libertine (New TX)"
Family math
diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index e632c1b..ff89312 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -3528,6 +3528,50 @@ def revert_IEEEtran_3(document):
return
+def revert_kurier_fonts(document):
+ " Revert kurier font definition to LaTeX "
+
+ i = find_token(document.header, "\\font_math", 0)
+ if i != -1:
+if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1:
+ val = get_value(document.header, "\\font_math", i)
+ if val == "kurier-math":
+add_to_preamble(document, "\\let\\Myrmdefault\\rmdefault\n" \
+ "\\usepackage[math]{kurier}\n" \
+ "\\renewcommand{\\rmdefault}{\\Myrmdefault}")
+document.header[i] = "\\font_math auto"
+
+ if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1:
+k = find_token(document.header, "\\font_sans kurierl", 0)
+if k != -1:
+ add_to_preamble(document, "\\renewcommand{\\sfdefault}{kurierl}\n" \
+"\\renewcommand{\\bfdefault}{b}")
+ document.header[k] = "\\font_sans default"
+
+ if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1:
+l = find_token(document.header, "\\font_sans kurier-condensed", 0)
+if l != -1:
+ add_to_preamble(document, "\\renewcommand{\\sfdefault}{kurier}\n" \
+"\\edef\\sfdefault{\\sfdefault c}\n" \
+"\\renewcommand{\\bfdefault}{b}")
+ document.header[l] = "\\font_sans default"
+
+ if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1:
+m = find_token(document.header, "\\font_sans kurier-light-condensed", 0)
+if m != -1:
+ add_to_preamble(document, "\\renewcommand{\\sfdefault}{kurierl}\n" \
+"\\edef\\sfdefault{\\sfdefault c}\n" \
+"\\renewcommand{\\bfdefault}{b}")
+ document.header[m] = "\\font_sans default"
+
+ if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1:
+j = find_token(document.header, "\\font_sans kurier", 0)
+if j != -1:
+ add_to_preamble(document, "\\renewcommand{\\sfdefault}{kurier}\n" \
+"\\renewcommand{\\bfdefault}{b}")
+ document.header[j] = "\\font_sans default"
+
+
##
# Conversion hub
#
@@ -3580,10 +3624,12 @@ convert = [
[457, [convert_use_stackrel]],
[458, [convert_captioninsets, convert_captionlayouts]],
[459, []],
- [460, []]
+ [460, []],
+ [461, []]
]
revert = [
+ [460, [revert_kurier_fonts]],
[459, [revert_IEEEtra
[LyX master] tex2lyx: add test for font settings
The branch, master, has been updated.
- Log -
commit 690d9b68f2bd468ed9bcd8a89869d3568f05b396
Author: Uwe Stöhr
Date: Mon Feb 11 00:49:20 2013 +0100
tex2lyx: add test for font settings
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 cdd1dad..92a123f 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.1.0dev
-\lyxformat 459
+\lyxformat 461
\begin_document
\begin_header
\textclass article
@@ -44,11 +44,11 @@
\language_package none
\inputencoding latin9
\fontencoding T1
-\font_roman default
-\font_sans default
+\font_roman cmr
+\font_sans berasans
\font_typewriter default
\font_math auto
-\font_default_family default
+\font_default_family sfdefault
\use_non_tex_fonts false
\font_sc false
\font_osf false
diff --git a/src/tex2lyx/test/box-color-size-space-align.tex
b/src/tex2lyx/test/box-color-size-space-align.tex
index b44e038..b3a6d00 100644
--- a/src/tex2lyx/test/box-color-size-space-align.tex
+++ b/src/tex2lyx/test/box-color-size-space-align.tex
@@ -2,6 +2,10 @@
%% Do not edit unless you really know what you are doing.
\documentclass[b4paper,twoside, twocolumn,12pt]{article}
+\renewcommand{\rmdefault}{cmr}
+\usepackage{berasans}
+\renewcommand{\familydefault}{\sfdefault}
+
\usepackage[T1]{fontenc}
\usepackage[latin9]{inputenc}
---
Summary of changes:
.../test/box-color-size-space-align.lyx.lyx|8
src/tex2lyx/test/box-color-size-space-align.tex|4
2 files changed, 8 insertions(+), 4 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] tex2lyx: support for mathdesign
The branch, master, has been updated.
- Log -
commit c466916a250caccb72ae4648a7b8a91d445b2534
Author: Uwe Stöhr
Date: Mon Feb 11 01:40:13 2013 +0100
tex2lyx: support for mathdesign
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 09ef31b..6e6e3d0 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -124,8 +124,8 @@ const char * const known_old_language_packages[] =
{"french", "frenchle",
char const * const known_fontsizes[] = { "10pt", "11pt", "12pt", 0 };
const char * const known_roman_fonts[] = { "ae", "beraserif", "bookman",
-"ccfonts", "chancery", "charter", "cmr", "fourier", "lmodern", "mathpazo",
-"mathptmx", "newcent", "utopia", 0};
+"ccfonts", "chancery", "charter", "cmr", "fourier", "lmodern",
+"mathdesign", "mathpazo", "mathptmx", "newcent", "utopia", 0};
const char * const known_sans_fonts[] = { "avant", "berasans", "cmbr", "cmss",
"helvet", "kurier", "kurierl", "lmss", 0};
@@ -669,6 +669,20 @@ void Preamble::handle_package(Parser &p, string const &
name,
h_font_sc = "true";
}
+ if (name == "mathdesign") {
+ // when font uses real small capitals
+ if (opts.find("charter") != string::npos)
+ h_font_roman = "md-charter";
+ if (opts.find("garamond") != string::npos)
+ h_font_roman = "md-garamond";
+ if (opts.find("utopia") != string::npos)
+ h_font_roman = "md-utopia";
+ if (opts.find("expert") != string::npos) {
+ h_font_sc = "true";
+ h_font_osf = "true";
+ }
+ }
+
else if (name == "mathpazo")
h_font_roman = "palatino";
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 9a8459e..4bb98cd 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -64,7 +64,6 @@ Format LaTeX featureLyX feature
434libertine-type1, libertine.sty, \font_osf, \font_roman
libertine-legacy.sty
435txtt LaTeX font \font_typewriter
-436mathdesign.sty \font_roman
437TeX Gyre LaTeX fonts \font_*
438\tone{51}, \tone{15}, \tone{45}, InsetTIPA
\tone{12}, \tone{454}, \toptiebar,
---
Summary of changes:
src/tex2lyx/Preamble.cpp | 18 --
src/tex2lyx/TODO.txt |1 -
2 files changed, 16 insertions(+), 3 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] tex2lyx: support for garamondx
The branch, master, has been updated.
- Log -
commit 6a3acd336b55049100e4e243fa5faaf5cdca20d9
Author: Uwe Stöhr
Date: Mon Feb 11 01:46:03 2013 +0100
tex2lyx: support for garamondx
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 6e6e3d0..d02c1fb 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -124,7 +124,7 @@ const char * const known_old_language_packages[] =
{"french", "frenchle",
char const * const known_fontsizes[] = { "10pt", "11pt", "12pt", 0 };
const char * const known_roman_fonts[] = { "ae", "beraserif", "bookman",
-"ccfonts", "chancery", "charter", "cmr", "fourier", "lmodern",
+"ccfonts", "chancery", "charter", "cmr", "fourier", "garamondx", "lmodern",
"mathdesign", "mathpazo", "mathptmx", "newcent", "utopia", 0};
const char * const known_sans_fonts[] = { "avant", "berasans", "cmbr", "cmss",
@@ -669,8 +669,13 @@ void Preamble::handle_package(Parser &p, string const &
name,
h_font_sc = "true";
}
+ if (name == "garamondx") {
+ h_font_roman = "garamondx";
+ if (opts == "osfI")
+ h_font_osf = "true";
+ }
+
if (name == "mathdesign") {
- // when font uses real small capitals
if (opts.find("charter") != string::npos)
h_font_roman = "md-charter";
if (opts.find("garamond") != string::npos)
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 4bb98cd..a57f6ff 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -81,7 +81,7 @@ Format LaTeX featureLyX feature
447
448
449\item[] \begin_inset Argument item:
-450garamondx.sty, ugm LaTeX font, \font_roman, \font_osf,
+450ugm LaTeX font, \font_roman, \font_osf,
[garamondx]{newtxmath} \font_math
451beamer overlay arguments InsetArgument
\command, \begin{env}
---
Summary of changes:
src/tex2lyx/Preamble.cpp |9 +++--
src/tex2lyx/TODO.txt |2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] tex2lyx: support for libertine-type1
The branch, master, has been updated.
- Log -
commit d27dac3efc6ca81a7b42836be47fa96ec34bdaf9
Author: Uwe Stöhr
Date: Mon Feb 11 01:56:47 2013 +0100
tex2lyx: support for libertine-type1
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index d02c1fb..d3f985e 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -124,8 +124,8 @@ const char * const known_old_language_packages[] =
{"french", "frenchle",
char const * const known_fontsizes[] = { "10pt", "11pt", "12pt", 0 };
const char * const known_roman_fonts[] = { "ae", "beraserif", "bookman",
-"ccfonts", "chancery", "charter", "cmr", "fourier", "garamondx", "lmodern",
-"mathdesign", "mathpazo", "mathptmx", "newcent", "utopia", 0};
+"ccfonts", "chancery", "charter", "cmr", "fourier", "garamondx",
"libertine-type1",
+"lmodern", "mathdesign", "mathpazo", "mathptmx", "newcent", "utopia", 0};
const char * const known_sans_fonts[] = { "avant", "berasans", "cmbr", "cmss",
"helvet", "kurier", "kurierl", "lmss", 0};
@@ -675,6 +675,14 @@ void Preamble::handle_package(Parser &p, string const &
name,
h_font_osf = "true";
}
+ if (name == "libertine-type1") {
+ h_font_roman = "libertine";
+ if (opts == "lining")
+ h_font_osf = "false";
+ else
+ h_font_osf = "true";
+ }
+
if (name == "mathdesign") {
if (opts.find("charter") != string::npos)
h_font_roman = "md-charter";
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index a57f6ff..53d676c 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -61,7 +61,7 @@ Format LaTeX featureLyX feature
411support for polyglossia \language_package (the cases of
no package, of babel and of custom package is supported)
415undertilde.sty fonts
427tipa.sty \begin{IPA}, \textipa InsetTIPA
-434libertine-type1, libertine.sty, \font_osf, \font_roman
+434libertine.sty, \font_osf, \font_roman
libertine-legacy.sty
435txtt LaTeX font \font_typewriter
437TeX Gyre LaTeX fonts \font_*
---
Summary of changes:
src/tex2lyx/Preamble.cpp | 12 ++--
src/tex2lyx/TODO.txt |2 +-
2 files changed, 11 insertions(+), 3 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] tex2lyx: support for TeX Gyre fonts
The branch, master, has been updated.
- Log -
commit 999fd86dcfefd348aab39ce52eeae611cc921879
Author: Uwe Stöhr
Date: Mon Feb 11 02:07:22 2013 +0100
tex2lyx: support for TeX Gyre fonts
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index d3f985e..df026cb 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -125,17 +125,18 @@ char const * const known_fontsizes[] = { "10pt", "11pt",
"12pt", 0 };
const char * const known_roman_fonts[] = { "ae", "beraserif", "bookman",
"ccfonts", "chancery", "charter", "cmr", "fourier", "garamondx",
"libertine-type1",
-"lmodern", "mathdesign", "mathpazo", "mathptmx", "newcent", "utopia", 0};
+"lmodern", "mathdesign", "mathpazo", "mathptmx", "newcent", "tgbonum",
+"tgchorus", "tgpagella", "tgschola", "tgtermes", "utopia", 0};
const char * const known_sans_fonts[] = { "avant", "berasans", "cmbr", "cmss",
-"helvet", "kurier", "kurierl", "lmss", 0};
+"helvet", "kurier", "kurierl", "lmss", "tgadventor", "tgheros", 0};
const char * const known_kurier_fonts[] = { "kurier", "kurierl",
"kurier-condensed",
"kurier-light-condensed", 0};
const char * const known_typewriter_fonts[] = { "beramono", "cmtl", "cmtt",
"courier", "lmtt", "luximono", "fourier", "lmodern", "mathpazo", "mathptmx",
-"newcent", 0};
+"newcent", "tgcursor", 0};
const char * const known_paper_sizes[] = { "a0paper", "b0paper", "c0paper",
"a1paper", "b1paper", "c1paper", "a2paper", "b2paper", "c2paper", "a3paper",
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 53d676c..33f1f94 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -64,7 +64,6 @@ Format LaTeX featureLyX feature
434libertine.sty, \font_osf, \font_roman
libertine-legacy.sty
435txtt LaTeX font \font_typewriter
-437TeX Gyre LaTeX fonts \font_*
438\tone{51}, \tone{15}, \tone{45}, InsetTIPA
\tone{12}, \tone{454}, \toptiebar,
\bottomtiebar
---
Summary of changes:
src/tex2lyx/Preamble.cpp |7 ---
src/tex2lyx/TODO.txt |1 -
2 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] tex2lyx: support for biolinum-type1
The branch, master, has been updated.
- Log -
commit 407cc9a62d60153ba9d52d6632278f62a7d5622d
Author: Uwe Stöhr
Date: Mon Feb 11 02:14:53 2013 +0100
tex2lyx: support for biolinum-type1
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index df026cb..255ffd2 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -128,8 +128,8 @@ const char * const known_roman_fonts[] = { "ae",
"beraserif", "bookman",
"lmodern", "mathdesign", "mathpazo", "mathptmx", "newcent", "tgbonum",
"tgchorus", "tgpagella", "tgschola", "tgtermes", "utopia", 0};
-const char * const known_sans_fonts[] = { "avant", "berasans", "cmbr", "cmss",
-"helvet", "kurier", "kurierl", "lmss", "tgadventor", "tgheros", 0};
+const char * const known_sans_fonts[] = { "avant", "berasans",
"biolinum-type1",
+"cmbr", "cmss", "helvet", "kurier", "kurierl", "lmss", "tgadventor",
"tgheros", 0};
const char * const known_kurier_fonts[] = { "kurier", "kurierl",
"kurier-condensed",
"kurier-light-condensed", 0};
@@ -712,6 +712,9 @@ void Preamble::handle_package(Parser &p, string const &
name,
}
}
+ if (name == "biolinum-type1")
+ h_font_sans = "biolinum";
+
// typewriter fonts
if (is_known(name, known_typewriter_fonts)) {
// fourier can be set as roman font _only_
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 33f1f94..5e358c4 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -71,7 +71,7 @@ Format LaTeX featureLyX feature
440MinionPro.sty, eulervm.sty \font_math
442newtxmath.sty, \font_math
443unicode-math.sty InsetMath*
-444biolinum-type1.sty, libertine.sty, \font_osf, \font_sans
+444libertine.sty, \font_osf, \font_sans
libertine-legacy.sty
445URW Classico LaTeX font \font_sans uop
\renewcommand{\sffamily}{uop}
---
Summary of changes:
src/tex2lyx/Preamble.cpp |7 +--
src/tex2lyx/TODO.txt |2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] tex2lyx: support for txtt font
The branch, master, has been updated.
- Log -
commit 0be810ac44f4805a95c9b75773c0414ceec524af
Author: Uwe Stöhr
Date: Mon Feb 11 02:24:31 2013 +0100
tex2lyx: support for txtt font
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 255ffd2..b8ce4f3 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -136,7 +136,7 @@ const char * const known_kurier_fonts[] = { "kurier",
"kurierl", "kurier-condens
const char * const known_typewriter_fonts[] = { "beramono", "cmtl", "cmtt",
"courier", "lmtt", "luximono", "fourier", "lmodern", "mathpazo", "mathptmx",
-"newcent", "tgcursor", 0};
+"newcent", "tgcursor", "txtt", 0};
const char * const known_paper_sizes[] = { "a0paper", "b0paper", "c0paper",
"a1paper", "b1paper", "c1paper", "a2paper", "b2paper", "c2paper", "a3paper",
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 5e358c4..704e2b5 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -63,7 +63,6 @@ Format LaTeX featureLyX feature
427tipa.sty \begin{IPA}, \textipa InsetTIPA
434libertine.sty, \font_osf, \font_roman
libertine-legacy.sty
-435txtt LaTeX font \font_typewriter
438\tone{51}, \tone{15}, \tone{45}, InsetTIPA
\tone{12}, \tone{454}, \toptiebar,
\bottomtiebar
---
Summary of changes:
src/tex2lyx/Preamble.cpp |2 +-
src/tex2lyx/TODO.txt |1 -
2 files changed, 1 insertions(+), 2 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] tex2lyx: support for eulervm
The branch, master, has been updated.
- Log -
commit 87fe26e5ebc3325767c44c8ed9865fd40f563330
Author: Uwe Stöhr
Date: Mon Feb 11 02:34:03 2013 +0100
tex2lyx: support for eulervm
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index b8ce4f3..1e14cef 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -138,6 +138,8 @@ const char * const known_typewriter_fonts[] = { "beramono",
"cmtl", "cmtt",
"courier", "lmtt", "luximono", "fourier", "lmodern", "mathpazo", "mathptmx",
"newcent", "tgcursor", "txtt", 0};
+const char * const known_math_fonts[] = { "eulervm", 0};
+
const char * const known_paper_sizes[] = { "a0paper", "b0paper", "c0paper",
"a1paper", "b1paper", "c1paper", "a2paper", "b2paper", "c2paper", "a3paper",
"b3paper", "c3paper", "a4paper", "b4paper", "c4paper", "a5paper", "b5paper",
@@ -732,13 +734,17 @@ void Preamble::handle_package(Parser &p, string const &
name,
if (name == "eco")
h_font_osf = "true";
+ // math fonts
+ if (is_known(name, known_math_fonts))
+ h_font_math = name;
+
if (name == "refstyle")
h_use_refstyle = "1";
// after the detection and handling of special cases, we can remove the
// fonts, otherwise they would appear in the preamble, see bug #7856
if (is_known(name, known_roman_fonts) || is_known(name,
known_sans_fonts)
- || is_known(name, known_typewriter_fonts))
+ || is_known(name, known_typewriter_fonts) ||
is_known(name, known_math_fonts))
;
else if (name == "amsmath" || name == "amssymb" ||
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 704e2b5..d452969 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -67,7 +67,7 @@ Format LaTeX featureLyX feature
\tone{12}, \tone{454}, \toptiebar,
\bottomtiebar
439MinionPro.sty\font_roman, \font_osf
-440MinionPro.sty, eulervm.sty \font_math
+440MinionPro.sty, \font_math
442newtxmath.sty, \font_math
443unicode-math.sty InsetMath*
444libertine.sty, \font_osf, \font_sans
---
Summary of changes:
src/tex2lyx/Preamble.cpp |8 +++-
src/tex2lyx/TODO.txt |2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] tex2lyx: support for newtxmath
The branch, master, has been updated.
- Log -
commit a9504b806015d9747949eae79c161cb21cdb3d32
Author: Uwe Stöhr
Date: Mon Feb 11 02:56:48 2013 +0100
tex2lyx: support for newtxmath
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 1e14cef..7d71f33 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -138,7 +138,7 @@ const char * const known_typewriter_fonts[] = { "beramono",
"cmtl", "cmtt",
"courier", "lmtt", "luximono", "fourier", "lmodern", "mathpazo", "mathptmx",
"newcent", "tgcursor", "txtt", 0};
-const char * const known_math_fonts[] = { "eulervm", 0};
+const char * const known_math_fonts[] = { "eulervm", "newtxmath", 0};
const char * const known_paper_sizes[] = { "a0paper", "b0paper", "c0paper",
"a1paper", "b1paper", "c1paper", "a2paper", "b2paper", "c2paper", "a3paper",
@@ -738,6 +738,17 @@ void Preamble::handle_package(Parser &p, string const &
name,
if (is_known(name, known_math_fonts))
h_font_math = name;
+ if (name == "newtxmath") {
+ if (opts.empty())
+ h_font_math = "newtxmath";
+ else if (opts == "garamondx")
+ h_font_math = "garamondx-ntxm";
+ else if (opts == "libertine")
+ h_font_math = "libertine-ntxm";
+ else if (opts == "minion")
+ h_font_math = "minion-ntxm";
+ }
+
if (name == "refstyle")
h_use_refstyle = "1";
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index d452969..ebaa56d 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -68,7 +68,6 @@ Format LaTeX featureLyX feature
\bottomtiebar
439MinionPro.sty\font_roman, \font_osf
440MinionPro.sty, \font_math
-442newtxmath.sty, \font_math
443unicode-math.sty InsetMath*
444libertine.sty, \font_osf, \font_sans
libertine-legacy.sty
@@ -80,7 +79,6 @@ Format LaTeX featureLyX feature
448
449\item[] \begin_inset Argument item:
450ugm LaTeX font, \font_roman, \font_osf,
- [garamondx]{newtxmath} \font_math
451beamer overlay arguments InsetArgument
\command, \begin{env}
452beamer block arguments InsetArgument
---
Summary of changes:
src/tex2lyx/Preamble.cpp | 13 -
src/tex2lyx/TODO.txt |2 --
2 files changed, 12 insertions(+), 3 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] Revert "tex2lyx/Preamble.cpp: fix bug #8525 temporarily"
The branch, master, has been updated.
- Log -
commit 5db148d22c2e323dc1166ffece9359cf1686da38
Author: Uwe Stöhr
Date: Mon Feb 11 11:56:27 2013 +0100
Revert "tex2lyx/Preamble.cpp: fix bug #8525 temporarily"
This reverts commit a69fcde0726450d696081ed5c21506d42a90b103.
The commit causing #8525 is [2f7f0c76/lyxgit]
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 7d71f33..d4c0b03 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -853,20 +853,11 @@ void Preamble::handle_package(Parser &p, string const &
name,
// Therefore check for the "," character.
// It is also only set when there is not more than one babel
// language option.
- if (!opts.empty()) {
- if (opts.find(",") == string::npos && one_language ==
true) {
- h_inputencoding = opts;
- // FIXME: if this line is used, tex2lyx
swallows the next character
- // in the file behind "{inputenc}"
- //p.setEncoding(opts);
- } else {
- h_preamble << "\\usepackage[" << opts << "}{"
<< name << "}\n";
- // FIXME: enabling this introduces bug #8525
- //p.setEncoding(options.back(),
Encoding::inputenc);
- }
- options.clear();
- } else
- h_preamble << "\\usepackage{" << name << "}\n";
+ if (opts.find(",") == string::npos && one_language == true)
+ h_inputencoding = opts;
+ if (!options.empty())
+ p.setEncoding(options.back(), Encoding::inputenc);
+ options.clear();
}
else if (name == "srcltx") {
---
Summary of changes:
src/tex2lyx/Preamble.cpp | 19 +--
1 files changed, 5 insertions(+), 14 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] chkconfig.ltx: check for binhex.tex
The branch, master, has been updated.
- Log -
commit 127b170175ff894e34628c15a92120949776fe4f
Author: Uwe Stöhr
Date: Mon Feb 11 12:00:56 2013 +0100
chkconfig.ltx: check for binhex.tex
Without this file the newtxmath fonts supported by LyX cannot be used;
fixes bug #8549.
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index d3a43ca..e5928cf 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -422,6 +422,7 @@
\TestPackage{MinionPro}
\TestFont[rzmnr]{minion2newtx}
\TestPackage{newtxmath}
+\TestPackage[binhex.tex]{binhex}
\TestFont[psyr]{symbol}
\TestPackage{tgadventor}
\TestPackage{tgbonum}
---
Summary of changes:
lib/chkconfig.ltx |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] chkconfig.ltx: add missing comment from last commit
The branch, master, has been updated.
- Log -
commit cff42250c0ad34b28f04810d62a2a70529abc8ad
Author: Uwe Stöhr
Date: Mon Feb 11 12:03:07 2013 +0100
chkconfig.ltx: add missing comment from last commit
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index e5928cf..775dd3d 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -422,7 +422,7 @@
\TestPackage{MinionPro}
\TestFont[rzmnr]{minion2newtx}
\TestPackage{newtxmath}
-\TestPackage[binhex.tex]{binhex}
+\TestPackage[binhex.tex]{binhex} % required by newtxmath
\TestFont[psyr]{symbol}
\TestPackage{tgadventor}
\TestPackage{tgbonum}
---
Summary of changes:
lib/chkconfig.ltx |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] tex2lyx/TODO.txt: update todo list
The branch, master, has been updated. - Log - commit 1ddcbbdf92258ee2d6ea568c0422a50dd1e5e13b Author: Uwe Stöhr Date: Mon Feb 11 12:13:44 2013 +0100 tex2lyx/TODO.txt: update todo list listings support was added a year ago by r40856 and r40860 diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt index ebaa56d..eee8571 100644 --- a/src/tex2lyx/TODO.txt +++ b/src/tex2lyx/TODO.txt @@ -21,7 +21,6 @@ Format LaTeX featureLyX feature 232bibtopic InsetBibTeX 254esint.sty\use_esint 267XeTeXutf8 encoding -269listings.sty (inline, with args) InsetListings 270\alert, \structure (beamer) layout 281?modules 293?InsetInfo --- Summary of changes: src/tex2lyx/TODO.txt |1 - 1 files changed, 0 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX 2.0.x] tex2lyx/TODO.txt: update todo list
The branch, 2.0.x, has been updated. - Log - commit d36965c55c4ed7e43b217cc0b3d14f4766ccd71a Author: Uwe Stöhr Date: Mon Feb 11 12:16:57 2013 +0100 tex2lyx/TODO.txt: update todo list listings support was added for branch by [09e2b217/lyxgit] diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt index 658220f..62e3634 100644 --- a/src/tex2lyx/TODO.txt +++ b/src/tex2lyx/TODO.txt @@ -23,7 +23,6 @@ Format LaTeX featureLyX feature 266armenian \language, \lang 267XeTeXutf8 encoding 268CJK.sty CJK encodings, languages -269listings.sty (inline, with args) InsetListings 270\alert, \structure (beamer) layout 281?modules 292japanese japanese-plain --- Summary of changes: src/tex2lyx/TODO.txt |1 - 1 files changed, 0 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] chkconfig.ltx: check for fonts and packages required by fonts
The branch, master, has been updated.
- Log -
commit 8332ceb4e8527b580940efde0c996162a40f43c2
Author: Uwe Stöhr
Date: Mon Feb 11 14:19:08 2013 +0100
chkconfig.ltx: check for fonts and packages required by fonts
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 775dd3d..9d21ac2 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -402,6 +402,9 @@
\TestPackage{biolinum-type1}
\TestFont[glic1000]{cbgreek}% for Greek
\TestPackage{ccfonts}
+\TestFont[ccr10]{concrete} % required by ccfonts
+\TestFont[eorm10]{ecc} % required by ccfonts
+\TestPackage[ot1ccr.fd]{concmath} % required by ccfonts
\TestPackage{cmbright}
\TestPackage{eco}
\TestPackage{eulervm}
@@ -412,6 +415,7 @@
\TestPackage{kurier}
\TestPackage{lh-lcy}
\TestPackage{libertine}
+\TestPackage{fontaxes} % required by libertine
\TestPackage{libertine-type1}
\TestPackage{lmodern}
\TestPackage{luximono}
---
Summary of changes:
lib/chkconfig.ltx |4
1 files changed, 4 insertions(+), 0 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] tex2lyx: support for libertine
The branch, master, has been updated.
- Log -
commit 2066b57ca2a348a4f527d288fd0a1c60a9d1ec4c
Author: Uwe Stöhr
Date: Mon Feb 11 14:22:56 2013 +0100
tex2lyx: support for libertine
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index d4c0b03..58cf930 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -124,9 +124,9 @@ const char * const known_old_language_packages[] =
{"french", "frenchle",
char const * const known_fontsizes[] = { "10pt", "11pt", "12pt", 0 };
const char * const known_roman_fonts[] = { "ae", "beraserif", "bookman",
-"ccfonts", "chancery", "charter", "cmr", "fourier", "garamondx",
"libertine-type1",
-"lmodern", "mathdesign", "mathpazo", "mathptmx", "newcent", "tgbonum",
-"tgchorus", "tgpagella", "tgschola", "tgtermes", "utopia", 0};
+"ccfonts", "chancery", "charter", "cmr", "fourier", "garamondx", "libertine",
+"libertine-type1", "lmodern", "mathdesign", "mathpazo", "mathptmx", "newcent",
+"tgbonum", "tgchorus", "tgpagella", "tgschola", "tgtermes", "utopia", 0};
const char * const known_sans_fonts[] = { "avant", "berasans",
"biolinum-type1",
"cmbr", "cmss", "helvet", "kurier", "kurierl", "lmss", "tgadventor",
"tgheros", 0};
@@ -678,6 +678,12 @@ void Preamble::handle_package(Parser &p, string const &
name,
h_font_osf = "true";
}
+ if (name == "libertine") {
+ h_font_roman = "libertine-legacy";
+ if (opts == "osf")
+ h_font_osf = "true";
+ }
+
if (name == "libertine-type1") {
h_font_roman = "libertine";
if (opts == "lining")
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index eee8571..28298b6 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -60,8 +60,6 @@ Format LaTeX featureLyX feature
411support for polyglossia \language_package (the cases of
no package, of babel and of custom package is supported)
415undertilde.sty fonts
427tipa.sty \begin{IPA}, \textipa InsetTIPA
-434libertine.sty, \font_osf, \font_roman
- libertine-legacy.sty
438\tone{51}, \tone{15}, \tone{45}, InsetTIPA
\tone{12}, \tone{454}, \toptiebar,
\bottomtiebar
---
Summary of changes:
src/tex2lyx/Preamble.cpp | 12 +---
src/tex2lyx/TODO.txt |2 --
2 files changed, 9 insertions(+), 5 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] tex2lyx: support for fileformat change 444
The branch, master, has been updated.
- Log -
commit 348b5e6610e690539e3e114f6573b9c93f14a9c1
Author: Uwe Stöhr
Date: Mon Feb 11 14:40:35 2013 +0100
tex2lyx: support for fileformat change 444
biolinum is used if libertine is detected
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 58cf930..7f48bfb 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -680,12 +680,16 @@ void Preamble::handle_package(Parser &p, string const &
name,
if (name == "libertine") {
h_font_roman = "libertine-legacy";
+ // this automatically invokes biolinum
+ h_font_sans = "biolinum";
if (opts == "osf")
h_font_osf = "true";
}
if (name == "libertine-type1") {
h_font_roman = "libertine";
+ // this automatically invokes biolinum
+ h_font_sans = "biolinum";
if (opts == "lining")
h_font_osf = "false";
else
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 28298b6..3db0090 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -66,8 +66,6 @@ Format LaTeX featureLyX feature
439MinionPro.sty\font_roman, \font_osf
440MinionPro.sty, \font_math
443unicode-math.sty InsetMath*
-444libertine.sty, \font_osf, \font_sans
- libertine-legacy.sty
445URW Classico LaTeX font \font_sans uop
\renewcommand{\sffamily}{uop}
446Optional and required arguments InsetArgument
---
Summary of changes:
src/tex2lyx/Preamble.cpp |4
src/tex2lyx/TODO.txt |2 --
2 files changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] FORMAT: add missing fileformat changes
The branch, master, has been updated.
- Log -
commit b6e4c709e3106c4e97d7ba4bb93ab8a60095c02d
Author: Uwe Stöhr
Date: Fri Feb 15 16:11:30 2013 +0100
FORMAT: add missing fileformat changes
diff --git a/development/FORMAT b/development/FORMAT
index e2b090c..ef67c3c 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -20,9 +20,15 @@ adjustments are made to tex2lyx and bugs are fixed in
lyx2lyx.
\usepackage[scaled=$val]{biolinum-type1}
=> \font_sans biolinum
-FORMAT 461 (uwestoehr): UNDOCUMENTED!
-
-FORMAT 460 (uwestoehr): UNDOCUMENTED!
+2013-02-11 Uwe Stöhr
+ * Format incremented to 461: support for kurier fonts
+ new supported sansserif fonts "kurier", "kurierl", "kurierc"
+ and "kurierlc" and the math font "kurier-math"
+
+2013-02-09 Uwe Stöhr
+ * Format incremented to 460: support for IEEE conference articles
+ No changes in the file format
+ This format change was added for the lyx2lyx conversion
2012-12-31 Jürgen Spitzmüller
* Format incremented to 459: Introduce new beamer frames:
---
Summary of changes:
development/FORMAT | 12 +---
1 files changed, 9 insertions(+), 3 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] Merge branch 'master' of git.lyx.org:lyx
The branch, master, has been updated. - Log - commit 78be5467e1eec376bbe2dc38cd5ae87284834f80 Merge: ac7d08c a1edd7b Author: Uwe Stöhr Date: Fri Feb 15 16:28:38 2013 +0100 Merge branch 'master' of git.lyx.org:lyx commit ac7d08cb327115630ee0a160d416d2ad7283046f Author: Uwe Stöhr Date: Fri Feb 15 16:28:02 2013 +0100 environment.cpp: MSVC compile fix MSVC told me "environment.cpp(139): error C4716: 'lyx::support::unsetEnv' : must return a value" diff --git a/src/support/environment.cpp b/src/support/environment.cpp index 6deb230..dfdc2d4 100644 --- a/src/support/environment.cpp +++ b/src/support/environment.cpp @@ -132,7 +132,7 @@ bool unsetEnv(string const & name) return unsetenv(name.c_str()) == 0; #elif defined(HAVE_PUTENV) // This is OK with MSVC and MinGW at least. - putenv((name + "=").c_str()) == 0; + return putenv((name + "=").c_str()) == 0; #else #error No environment-unsetting function has been defined. #endif --- Summary of changes: src/support/environment.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] IEEEtran-CompSoc.layout: use the new NoInsetLayout tag
The branch, master, has been updated. - Log - commit 77affc996763e50a8f20bf45004a559e140d7da9 Author: Uwe Stöhr Date: Sat Feb 16 00:48:21 2013 +0100 IEEEtran-CompSoc.layout: use the new NoInsetLayout tag diff --git a/lib/layouts/IEEEtran-CompSoc.layout b/lib/layouts/IEEEtran-CompSoc.layout index a0f65a8..6d63e6b 100644 --- a/lib/layouts/IEEEtran-CompSoc.layout +++ b/lib/layouts/IEEEtran-CompSoc.layout @@ -23,10 +23,9 @@ Style Standard_in_Title End -# enable this if bug #8545 is fixed -#NoStyle Author_Name -#NoStyle Flex:Author_Affiliation -#NoStyle Flex:Author_Mark +NoInsetLayout Flex:Author_Name +NoInsetLayout Flex:Author_Affiliation +NoInsetLayout Flex:Author_Mark InsetLayout Flex:Author_Footnote --- Summary of changes: lib/layouts/IEEEtran-CompSoc.layout |7 +++ 1 files changed, 3 insertions(+), 4 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] moderncv.layout: update to modernCV 1.3
The branch, master, has been updated.
- Log -
commit eabe77839bd1e348f3fa728d758ecdc779921da1
Author: Uwe Stöhr
Date: Sat Feb 16 01:02:32 2013 +0100
moderncv.layout: update to modernCV 1.3
- this new modernCV version fixes the annoying linebreak bug I was
suffering so long, it moreover adds 2 new features
- lyx2lyx/lyx_2_1.py: updated to revert the new features
diff --git a/lib/examples/modernCV.lyx b/lib/examples/modernCV.lyx
index a3f990b..6d162ea 100644
--- a/lib/examples/modernCV.lyx
+++ b/lib/examples/modernCV.lyx
@@ -1,5 +1,5 @@
#LyX 2.1 created this file. For more info see http://www.lyx.org/
-\lyxformat 459
+\lyxformat 462
\begin_document
\begin_header
\textclass moderncv
@@ -141,6 +141,22 @@ required, possible colors are 'blue' (default), 'orange',
'green', 'red',
\end_layout
+\begin_layout PDF Page Mode
+UseOutlines
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+optional, controls how the PDF will be shown; use either 'UseNone' (only
+ the document), 'UseThumbs' (show thumbnails), 'UseOutlines' (show bookmarks)
+ or 'FullScreen' (open in fullscreen mode).
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
\begin_layout FirstName
Paul
\end_layout
@@ -151,6 +167,16 @@ Testman
\begin_layout Title
Curriculum Vitae
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+optional
+\end_layout
+
+\end_inset
+
+
\end_layout
\begin_layout Standard
@@ -171,42 +197,41 @@ The following personal entries are optional.
status open
\begin_layout Plain Layout
-Teststreet 17
+Teststreet
+\begin_inset space ~
+\end_inset
+
+17
\end_layout
\end_inset
-0 Nicecity -- Switzerland
-\begin_inset Note Note
-status collapsed
-
-\begin_layout Plain Layout
-\series bold
-Note:
-\series default
- Only when you use the
-\emph on
-classic
-\emph default
- theme, you can add a line break with:
-\begin_inset ERT
-status collapsed
+\begin_inset Argument 2
+status open
\begin_layout Plain Layout
+0
+\begin_inset space ~
+\end_inset
-
-\backslash
-protect
-\backslash
-
-\backslash
-
+Nicecity
\end_layout
\end_inset
+Switzerland
+\begin_inset Note Note
+status collapsed
+\begin_layout Plain Layout
+the optional lines are only important for the styles
+\emph on
+classic
+\emph default
+ and
+\emph on
+oldstyle
\end_layout
\end_inset
@@ -960,15 +985,115 @@ subsection item
\end_layout
\begin_layout Section
-Section with your own content
+Section with a column
\end_layout
-\begin_layout CloseSection
+\begin_layout Columns
+\begin_inset Flex Column
+status open
+
+\begin_layout Plain Layout
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+0.5
+\end_layout
+
+\end_inset
+
+
\begin_inset Note Note
status collapsed
\begin_layout Plain Layout
-This ends the section formatting.
+the optional width is a number in the range 0 - 1 and specifies the fraction
+ of the line length; if no width is given all available width is used for
+ the column
+\end_layout
+
+\end_inset
+
+
+\begin_inset Argument 2
+status open
+
+\begin_layout Plain Layout
+header 1
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+Everything can be the content
+\end_layout
+
+\begin_layout Plain Layout
+\noindent
+\begin_inset Tabular
+
+
+
+
+
+\begin_inset Text
+
+\begin_layout Plain Layout
+even a table
+\end_layout
+
+\end_inset
+
+
+
+
+\end_inset
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Note:
+\series default
+ paragraph alignments are not allowed, so e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g.
+\begin_inset space \space{}
+\end_inset
+
+centering the table is not possible
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\begin_inset Flex Column
+status open
+
+\begin_layout Plain Layout
+\begin_inset Argument 2
+status open
+
+\begin_layout Plain Layout
+header 2
+\end_layout
+
+\end_inset
+
+the second column
\end_layout
\end_inset
@@ -976,10 +1101,21 @@ This ends the section formatting.
\end_layout
+\begin_layout Section
+Section with your own content
+\end_layout
+
\begin_layout Standard
Your content here, inside an unformatted environment.
- You can use here e.g.
- mathematics
+ You can use here e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g.
+\begin_inset space \space{}
+\end_inset
+
+mathematics
\begin_inset Formula
\[
E=mc^{2}
@@ -992,7 +1128,7 @@ put some table or figure, etc.
\begin_layout EmptySection
\begin_inset Note Note
-status collapsed
+status open
\begin_layout Plain Layout
Creates a section without a section heading.
@@ -1001,6 +1137,16 @@ Creates a section without a section heading.
\end_inset
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+Keep entries with green labels empty!
+\end_layout
+
+\end_inset
+
+
\end_layout
\begin_layout Item
@@ -1016,10 +1162,6 @@ Now
Back to mo
[LyX 2.0.x] GuiTabular.cpp: fix bug #8285 for branch
The branch, 2.0.x, has been updated.
- Log -
commit cae6397b69a5adf2c8b3f634428784d1820b1df4
Author: Uwe Stöhr
Date: Sat Feb 16 01:44:02 2013 +0100
GuiTabular.cpp: fix bug #8285 for branch
fixes:
- LyX uses for a decimal alignment a multicolumn and having for a cell a
multicolumn _and_ a multirow is invalid LaTeX. Therefore do not allow to set
table cells to this in the dialog.
- It was impossible to unset a decimal alignment via the context menu or
toolbar button.
diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp
index 2a011e4..f79c05c 100644
--- a/src/frontends/qt4/GuiTabular.cpp
+++ b/src/frontends/qt4/GuiTabular.cpp
@@ -204,6 +204,13 @@ void GuiTabular::checkEnabled()
hAlignCO->setEnabled(!(multirowCB->isChecked()
&& !widgetsToLength(columnWidthED, columnWidthUnitLC).empty())
&& specialAlignmentED->text().isEmpty());
+ // decimal alignment is only possible for non-multicol and non-multirow
cells
+ if ((multicolumnCB->isChecked() || multirowCB->isChecked())
+ && hAlignCO->findData(toqstr("decimal")))
+ hAlignCO->removeItem(hAlignCO->findData(toqstr("decimal")));
+ else if (!multicolumnCB->isChecked() && !multirowCB->isChecked()
+ && hAlignCO->findData(toqstr("decimal")) == -1)
+ hAlignCO->addItem(qt_("At Decimal Separator"),
toqstr("decimal"));
bool const dalign =
hAlignCO->itemData(hAlignCO->currentIndex()).toString() ==
QString("decimal");
decimalPointED->setEnabled(dalign);
@@ -215,9 +222,12 @@ void GuiTabular::checkEnabled()
tabularWidthED->setEnabled(setwidth);
tabularWidthUnitLC->setEnabled(setwidth);
- vAlignCO->setEnabled(!multirowCB->isChecked()
+ bool const enable_valign =
+ !multirowCB->isChecked()
&& !widgetsToLength(columnWidthED, columnWidthUnitLC).empty()
- && specialAlignmentED->text().isEmpty());
+ && specialAlignmentED->text().isEmpty();
+ vAlignCO->setEnabled(enable_valign);
+ vAlignLA->setEnabled(enable_valign);
topspaceED->setEnabled(topspaceCO->currentIndex() == 2);
topspaceED->setEnabled(topspaceCO->currentIndex() == 2);
@@ -283,10 +293,14 @@ void GuiTabular::checkEnabled()
captionStatusCB->setEnabled(funcEnabled(Tabular::TOGGLE_LTCAPTION)
&& longtabular);
- multicolumnCB->setEnabled(funcEnabled(Tabular::MULTICOLUMN));
- multirowCB->setEnabled(funcEnabled(Tabular::MULTIROW));
- multirowOffsetED->setEnabled(multirowCB->isChecked());
- multirowOffsetUnitLC->setEnabled(multirowCB->isChecked());
+ multicolumnCB->setEnabled(funcEnabled(Tabular::MULTICOLUMN)
+ && !dalign && !multirowCB->isChecked());
+ multirowCB->setEnabled(funcEnabled(Tabular::MULTIROW)
+ && !dalign && !multicolumnCB->isChecked());
+ bool const enable_mr = multirowCB->isChecked();
+ multirowOffsetLA->setEnabled(enable_mr);
+ multirowOffsetED->setEnabled(enable_mr);
+ multirowOffsetUnitLC->setEnabled(enable_mr);
changed();
}
@@ -790,7 +804,7 @@ void GuiTabular::paramsToDialog(Inset const * inset)
hAlignCO->addItem(qt_("Right"), toqstr("right"));
if (!multicol && !pwidth.zero())
hAlignCO->addItem(qt_("Justified"), toqstr("justified"));
- if (!multicol)
+ if (!multicol && !multirow)
hAlignCO->addItem(qt_("At Decimal Separator"),
toqstr("decimal"));
string align;
@@ -812,7 +826,7 @@ void GuiTabular::paramsToDialog(Inset const * inset)
}
case LYX_ALIGN_DECIMAL:
{
- if (!multicol)
+ if (!multicol && !multirow)
align = "decimal";
break;
}
diff --git a/status.20x b/status.20x
index 6bf6592..fa15490 100644
--- a/status.20x
+++ b/status.20x
@@ -123,6 +123,9 @@ What's new
- Fix a few selection bugs in tabular (bugs 4981, 7988).
+- Fix several issues when using multicolumns/multirows and decimal alignment in
+ table cells (bug 8285).
+
- Show the output of configure.py while the LaTeX packages are being checked
rather than all at once at the end of the check (bug 8477).
@@ -132,8 +135,8 @@ What's new
- File format viewer & editor combo boxes are correctly initialized (bug 8237).
-- Do not create an empty environment variable LC_ALL when launching
- external processes (bug 8537).
+- Do not create an empty environment variable LC_ALL when launching
+ external processes (bug 8537).
* DOCUMENTATION AND LOCALIZATION
---
Summary of changes:
src/frontends/qt4/GuiTabular.cpp | 30
[LyX 2.0.x] status.20x: add missing entry for fix of bug #6389
The branch, 2.0.x, has been updated. - Log - commit 56195740004258a7704c5f043f3dc06767bd0a04 Author: Uwe Stöhr Date: Sat Feb 16 02:00:18 2013 +0100 status.20x: add missing entry for fix of bug #6389 (fixedinbranch: http://www.lyx.org/trac/changeset/51cc0a9b8/lyxgit) diff --git a/status.20x b/status.20x index fa15490..dfd247b 100644 --- a/status.20x +++ b/status.20x @@ -116,6 +116,9 @@ What's new - When selecting text and then using the menu Insert -> Preview, immediately display the preview (bug 8075). + +- If 2 columns are chosen for the document they are now also displayed RTL + if the document language is a RTL language (bug 6389). - Allow arguments in PassThru environments (bug 7646). --- Summary of changes: status.20x |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX 2.0.x] status.20x: add missing entry for fix of bug #8391
The branch, 2.0.x, has been updated. - Log - commit 186d955e8692de38c0a60657f7f107aa0f630499 Author: Uwe Stöhr Date: Sat Feb 16 02:05:04 2013 +0100 status.20x: add missing entry for fix of bug #8391 (fixedinbranch: http://www.lyx.org/trac/changeset/fcb49729/lyxgit) - also some formatting fixes diff --git a/status.20x b/status.20x index dfd247b..0feba06 100644 --- a/status.20x +++ b/status.20x @@ -28,15 +28,16 @@ What's new * DOCUMENT INPUT/OUTPUT +- New layout file for the document class APA6 (bug 8391). -- Output BibTeX metadata in LyXHTML output (bug #8451). +- Output BibTeX metadata in LyXHTML output (bug 8451). * TEX2LYX IMPROVEMENTS -- support for listings with options (bug #8066). +- support for listings with options (bug 8066). -- add new option -m to select needed modules (bug #8393). +- add new option -m to select needed modules (bug 8393). * USER INTERFACE --- Summary of changes: status.20x |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] tex2lyx/TODO.txt: update
The branch, master, has been updated. - Log - commit 4159f05cede688a2b64cb47a130ad6227990f91f Author: Uwe Stöhr Date: Sat Feb 16 03:14:21 2013 +0100 tex2lyx/TODO.txt: update refstyle support was added by http://www.lyx.org/trac/changeset/49c88776/lyxgit diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt index d6e25f9..fcc5ce1 100644 --- a/src/tex2lyx/TODO.txt +++ b/src/tex2lyx/TODO.txt @@ -55,7 +55,6 @@ Format LaTeX featureLyX feature 399automatic mathdots loading \use_mathdots 401feyn.sty InsetMathDiagram 402\addcontentsline InsetBibtex bibtotoc option -404refstyle.sty InsetRef 407vertical offset for multirowsInsetTabular 411support for polyglossia \language_package (the cases of no package, of babel and of custom package is supported) 415undertilde.sty fonts --- Summary of changes: src/tex2lyx/TODO.txt |1 - 1 files changed, 0 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository
[LyX master] tex2lyx/TODO.txt: update again
The branch, master, has been updated.
- Log -
commit 8e2d727e36555d3784c97a29bd09a0fcf23ac1c0
Author: Uwe Stöhr
Date: Sat Feb 16 04:04:49 2013 +0100
tex2lyx/TODO.txt: update again
- nothing needs to be done for feyn.sty - it is already recognized as
simple feature and the roundtrip using the feynman example file works
- update entry for undertilde to be uniform
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index fcc5ce1..0ac04bf 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -53,11 +53,10 @@ Format LaTeX featureLyX feature
392new beamer formatInsetLayout
396nameref.sty InsetRef
399automatic mathdots loading \use_mathdots
-401feyn.sty InsetMathDiagram
402\addcontentsline InsetBibtex bibtotoc option
407vertical offset for multirowsInsetTabular
411support for polyglossia \language_package (the cases of
no package, of babel and of custom package is supported)
-415undertilde.sty fonts
+415automatic undertilde loading \use_package undertilde
427tipa.sty \begin{IPA}, \textipa InsetTIPA
438\tone{51}, \tone{15}, \tone{45}, InsetTIPA
\tone{12}, \tone{454}, \toptiebar,
---
Summary of changes:
src/tex2lyx/TODO.txt |3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] tex2lyx: support for \addcontentsline in BibTeX inset
The branch, master, has been updated.
- Log -
commit 72a44b3c75f8a078f796b973f93617b0339800cc
Author: Uwe Stöhr
Date: Sat Feb 16 05:51:23 2013 +0100
tex2lyx: support for \addcontentsline in BibTeX inset
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 0ac04bf..70e4c07 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -53,7 +53,6 @@ Format LaTeX featureLyX feature
392new beamer formatInsetLayout
396nameref.sty InsetRef
399automatic mathdots loading \use_mathdots
-402\addcontentsline InsetBibtex bibtotoc option
407vertical offset for multirowsInsetTabular
411support for polyglossia \language_package (the cases of
no package, of babel and of custom package is supported)
415automatic undertilde loading \use_package undertilde
diff --git a/src/tex2lyx/test/Dummy Document.lyx b/src/tex2lyx/test/Dummy
Document.lyx
index 5721713..22e0ee6 100644
--- a/src/tex2lyx/test/Dummy Document.lyx
+++ b/src/tex2lyx/test/Dummy Document.lyx
@@ -1,5 +1,5 @@
#LyX file created by tex2lyx 2.1.0dev
-\lyxformat 459
+\lyxformat 462
\begin_document
\begin_header
\textclass article
diff --git a/src/tex2lyx/test/DummyDocument.lyx
b/src/tex2lyx/test/DummyDocument.lyx
index 494fcd4..948e959 100644
--- a/src/tex2lyx/test/DummyDocument.lyx
+++ b/src/tex2lyx/test/DummyDocument.lyx
@@ -1,5 +1,5 @@
#LyX file created by tex2lyx 2.1.0dev
-\lyxformat 459
+\lyxformat 462
\begin_document
\begin_header
\textclass article
@@ -63,7 +63,7 @@
\secnumdepth 3
\tocdepth 3
\paragraph_separation indent
-\paragraph_indentation default
+\paragraph_indentation 3mm
\quotes_language english
\papercolumns 1
\papersides 1
diff --git a/src/tex2lyx/test/Dummy~Document.lyx
b/src/tex2lyx/test/Dummy~Document.lyx
index 53ca775..a879813 100644
--- a/src/tex2lyx/test/Dummy~Document.lyx
+++ b/src/tex2lyx/test/Dummy~Document.lyx
@@ -1,5 +1,5 @@
#LyX file created by tex2lyx 2.1.0dev
-\lyxformat 459
+\lyxformat 462
\begin_document
\begin_header
\textclass article
@@ -63,7 +63,7 @@
\secnumdepth 3
\tocdepth 3
\paragraph_separation indent
-\paragraph_indentation default
+\paragraph_indentation 3mm
\quotes_language english
\papercolumns 1
\papersides 1
diff --git a/src/tex2lyx/test/test-insets.lyx.lyx
b/src/tex2lyx/test/test-insets.lyx.lyx
index 910d8af..a1d9236 100644
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -1019,11 +1019,7 @@ inline false
status collapsed
\begin_layout Plain Layout
-#
-\end_layout
-
-\begin_layout Plain Layout
- Example listing float
+# Example listing float
\end_layout
\begin_layout Plain Layout
@@ -1107,11 +1103,7 @@ inline false
status collapsed
\begin_layout Plain Layout
-d
-\end_layout
-
-\begin_layout Plain Layout
-ef func(param):
+def func(param):
\end_layout
\begin_layout Plain Layout
@@ -1159,11 +1151,7 @@ inline false
status collapsed
\begin_layout Plain Layout
-h
-\end_layout
-
-\begin_layout Plain Layout
-ello
+hello
\end_layout
\end_inset
@@ -6115,6 +6103,82 @@ $
\begin_layout Standard
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+addcontentsline{toc}{section}{test}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\begin_inset CommandInset bibtex
+LatexCommand bibtex
+bibfiles "IEEEexample"
+options "bibtotoc,test"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\begin_inset CommandInset bibtex
+LatexCommand bibtex
+bibfiles "IEEEexample"
+options "test"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+bibliographystyle{test}
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+addcontentsline{toc}{section}{test}
+\end_layout
+
+\end_inset
+
+
+\begin_inset CommandInset bibtex
+LatexCommand bibtex
+bibfiles "IEEEexample"
+options "test"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
\begin_inset CommandInset index_print
LatexCommand printindex
type "idx"
diff --git a/src/tex2lyx/test/test-insets.tex b/src/tex2lyx/test/test-insets.tex
index 2a476a2..95bfebd 100644
--- a/src/tex2lyx/test/test-insets.tex
+++ b/src/tex2lyx/test/test-insets.tex
@@ -572,6 +572,19 @@ Let $f:\left[ a,b\right] \rightarrow%
%EndExpansion
$.
+\addcontentsline{toc}{section}{test}
+
+\bibliographystyle{test}
+\addcontentsline{toc}{section}{\refname}
+\bibliography{IEEEexample}
+
+\bibliographystyle{test}
+\bibliography{IEEEexample}
+
+\bibliographystyle{test}
+\addcontentsline{toc}{section}{test}
+\bibliography{IEEEexample}
+
\printindex{}
\printnomenclature hello
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index fb09aa8..07cb077 100644
---
[LyX 2.0.x] xypic.lyx: use a default font except a special one is available
The branch, 2.0.x, has been updated.
- Log -
commit 6b03804c68e0d07bf634f478f3a992c015fda981
Author: Uwe Stöhr
Date: Sat Feb 16 18:17:01 2013 +0100
xypic.lyx: use a default font except a special one is available
- also add our documentation preamble disclaimer
diff --git a/lib/examples/xypic.lyx b/lib/examples/xypic.lyx
index 2a6ecc0..31d42c4 100644
--- a/lib/examples/xypic.lyx
+++ b/lib/examples/xypic.lyx
@@ -4,6 +4,15 @@
\begin_header
\textclass scrartcl
\begin_preamble
+% DO NOT ALTER THIS PREAMBLE!!!
+%
+% This preamble is designed to ensure that the file prints
+% out as advertised. If you mess with this preamble,
+% parts of this 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
+
\usepackage[all]{xy}
% define new commands used in sec. 5.1
@@ -24,6 +33,16 @@
\def\LyX{\texorpdfstring{%
L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}
{LyX}}
+
+% if pdflatex is used
+\usepackage{ifpdf}
+\ifpdf
+
+% set fonts for nicer pdf view
+\IfFileExists{lmodern.sty}
+ {\usepackage{lmodern}}{}
+
+\fi % end if pdflatex is used
\end_preamble
\options BCOR7.5mm
\use_default_options false
@@ -32,7 +51,7 @@
\language_package default
\inputencoding auto
\fontencoding global
-\font_roman ae
+\font_roman default
\font_sans default
\font_typewriter default
\font_default_family default
---
Summary of changes:
lib/examples/xypic.lyx | 21 -
1 files changed, 20 insertions(+), 1 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX 2.0.x] xypic.lyx: many formatting fixes
The branch, 2.0.x, has been updated.
- Log -
commit f82b17f2e282f030315cd1d9729c5594cc6a87ff
Author: Uwe Stöhr
Date: Sat Feb 16 19:33:01 2013 +0100
xypic.lyx: many formatting fixes
- fixes all occurrences (there were many of them) of the LyX console
warnings
"unusual contents found: [formula equation [grid [row [cell [xymatrix [grid
[row..."
when the document is opened
- style and formattig fixes for consistency
diff --git a/lib/examples/xypic.lyx b/lib/examples/xypic.lyx
index 31d42c4..edf2dc7 100644
--- a/lib/examples/xypic.lyx
+++ b/lib/examples/xypic.lyx
@@ -493,7 +493,10 @@ instant-preview
\end_inset
g.
-
+\begin_inset space \space{}
+\end_inset
+
+
\begin_inset Formula $a+b=c$
\end_inset
@@ -886,12 +889,12 @@ ar[d]
ar[r] & Z }
\end_layout
-\begin_layout Standard
-\begin_inset Formula \xymatrix{ U \ar[ddr] \ar[drr] \ar[dr]\\
- & X \times_{Z} Y \ar[d] \ar[r] & X \ar[d]\\
- & Y \ar[r] & Z
+\begin_layout LyX-Code
+\begin_inset Formula $\xymatrix{U\ar[ddr]\ar[drr]\ar[dr]\\
+ & X\times_{Z}Y\ar[d]\ar[r] & X\ar[d]\\
+ & Y\ar[r] & Z
}
-
+$
\end_inset
@@ -1051,11 +1054,11 @@ ar[r]^g & Z }
\end_layout
\begin_layout LyX-Code
-\begin_inset Formula \xymatrix{ U
\ar[ddr]_{\psi}\ar[drr]^{\varphi}\ar[dr]|-{(x,y)}\\
- & X \times_{Z} Y \ar[d]^{q} \ar[r]_{p} & X \ar[d]_{f}\\
- & Y \ar[r]^{g} & Z
+\begin_inset Formula
$\xymatrix{U\ar[ddr]_{\psi}\ar[drr]^{\varphi}\ar[dr]|-{(x,y)}\\
+ & X\times_{Z}Y\ar[d]^{q}\ar[r]_{p} & X\ar[d]_{f}\\
+ & Y\ar[r]^{g} & Z
}
-
+$
\end_inset
@@ -1080,7 +1083,10 @@ Xy
\end_inset
g.
-
+\begin_inset space \space{}
+\end_inset
+
+
\family typewriter
(.3)
\family default
@@ -1119,7 +1125,10 @@ Xy
\end_inset
g.
-
+\begin_inset space \space{}
+\end_inset
+
+
\family typewriter
\backslash
@@ -1225,17 +1234,14 @@ $
\backslash
ar@{^(->}[r].
-\begin_inset Newline newline
-\end_inset
-
-
\end_layout
\begin_layout Standard
+\align center
\begin_inset Tabular
-
-
+
+
@@ -1262,11 +1268,11 @@ Source code in LyX
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar[r] & \ }
+$
\end_inset
-
+
\end_layout
\end_inset
@@ -1290,11 +1296,11 @@ ar
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar@{-->}[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar@{-->}[r] & \ }
+$
\end_inset
-
+
\end_layout
\end_inset
@@ -1318,11 +1324,11 @@ ar@{-->}
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar@{..>}[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar@{..>}[r] & \ }
+$
\end_inset
-
+
\end_layout
\end_inset
@@ -1346,11 +1352,11 @@ ar@{..>}
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar@{~>}[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar@{~>}[r] & \ }
+$
\end_inset
-
+
\end_layout
\end_inset
@@ -1374,8 +1380,8 @@ ar@{~>}
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar@{->>}[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar@{->>}[r] & \ }
+$
\end_inset
@@ -1402,8 +1408,8 @@ ar@{->>}
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar@{-->>}[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar@{-->>}[r] & \ }
+$
\end_inset
@@ -1430,8 +1436,8 @@ ar@{-->>}
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar@{>->>}[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar@{>->>}[r] & \ }
+$
\end_inset
@@ -1458,8 +1464,8 @@ ar@{>->>}
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar@{_{(}->}[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar@{_{(}->}[r] & \ }
+$
\end_inset
@@ -1486,8 +1492,8 @@ ar@{_(->}
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar@{^{(}->}[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar@{^{(}->}[r] & \ }
+$
\end_inset
@@ -1514,8 +1520,8 @@ ar@{^(->}
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar@{|-|}[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar@{|-|}[r] & \ }
+$
\end_inset
@@ -1546,33 +1552,30 @@ ar@{|-|}
\begin_layout Standard
\noindent
-Following the @-character by either a 2, 3, _,or a ^, we can produce arrows
+Following the @-character by either a 2, 3, _ or a ^, we can produce arrows
with double, triple shaft or arrows showing only the lower or upper half
of their tips and ends.
- Arrows need not have tips nor ends, as the last example shows :
-\begin_inset Newline newline
-\end_inset
-
-
+ Arrows need not have tips nor ends, as the last example shows:
\end_layout
\begin_layout Standard
+\align center
\begin_inset Tabular
-
+
-
+
\begin_inset Text
\begin_layout Plain Layout
-Result
+Result
\end_layout
\end_ins
[LyX master] xypic.lyx: port recent fixes from branch
The branch, master, has been updated.
- Log -
commit 5ddf0bfbaad8f4beaa1e3271135b2b5c415b4ad1
Author: Uwe Stöhr
Date: Sat Feb 16 19:34:16 2013 +0100
xypic.lyx: port recent fixes from branch
- use a default font except a special one is available
- add our documentation preamble disclaimer
- fixes all occurrences (there were many of them) of the LyX console
warnings
"unusual contents found: [formula equation [grid [row [cell [xymatrix [grid
[row..."
when the document is opened
- style and formatting fixes for consistency
diff --git a/lib/examples/xypic.lyx b/lib/examples/xypic.lyx
index 2a6ecc0..edf2dc7 100644
--- a/lib/examples/xypic.lyx
+++ b/lib/examples/xypic.lyx
@@ -4,6 +4,15 @@
\begin_header
\textclass scrartcl
\begin_preamble
+% DO NOT ALTER THIS PREAMBLE!!!
+%
+% This preamble is designed to ensure that the file prints
+% out as advertised. If you mess with this preamble,
+% parts of this 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
+
\usepackage[all]{xy}
% define new commands used in sec. 5.1
@@ -24,6 +33,16 @@
\def\LyX{\texorpdfstring{%
L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}
{LyX}}
+
+% if pdflatex is used
+\usepackage{ifpdf}
+\ifpdf
+
+% set fonts for nicer pdf view
+\IfFileExists{lmodern.sty}
+ {\usepackage{lmodern}}{}
+
+\fi % end if pdflatex is used
\end_preamble
\options BCOR7.5mm
\use_default_options false
@@ -32,7 +51,7 @@
\language_package default
\inputencoding auto
\fontencoding global
-\font_roman ae
+\font_roman default
\font_sans default
\font_typewriter default
\font_default_family default
@@ -474,7 +493,10 @@ instant-preview
\end_inset
g.
-
+\begin_inset space \space{}
+\end_inset
+
+
\begin_inset Formula $a+b=c$
\end_inset
@@ -867,12 +889,12 @@ ar[d]
ar[r] & Z }
\end_layout
-\begin_layout Standard
-\begin_inset Formula \xymatrix{ U \ar[ddr] \ar[drr] \ar[dr]\\
- & X \times_{Z} Y \ar[d] \ar[r] & X \ar[d]\\
- & Y \ar[r] & Z
+\begin_layout LyX-Code
+\begin_inset Formula $\xymatrix{U\ar[ddr]\ar[drr]\ar[dr]\\
+ & X\times_{Z}Y\ar[d]\ar[r] & X\ar[d]\\
+ & Y\ar[r] & Z
}
-
+$
\end_inset
@@ -1032,11 +1054,11 @@ ar[r]^g & Z }
\end_layout
\begin_layout LyX-Code
-\begin_inset Formula \xymatrix{ U
\ar[ddr]_{\psi}\ar[drr]^{\varphi}\ar[dr]|-{(x,y)}\\
- & X \times_{Z} Y \ar[d]^{q} \ar[r]_{p} & X \ar[d]_{f}\\
- & Y \ar[r]^{g} & Z
+\begin_inset Formula
$\xymatrix{U\ar[ddr]_{\psi}\ar[drr]^{\varphi}\ar[dr]|-{(x,y)}\\
+ & X\times_{Z}Y\ar[d]^{q}\ar[r]_{p} & X\ar[d]_{f}\\
+ & Y\ar[r]^{g} & Z
}
-
+$
\end_inset
@@ -1061,7 +1083,10 @@ Xy
\end_inset
g.
-
+\begin_inset space \space{}
+\end_inset
+
+
\family typewriter
(.3)
\family default
@@ -1100,7 +1125,10 @@ Xy
\end_inset
g.
-
+\begin_inset space \space{}
+\end_inset
+
+
\family typewriter
\backslash
@@ -1206,17 +1234,14 @@ $
\backslash
ar@{^(->}[r].
-\begin_inset Newline newline
-\end_inset
-
-
\end_layout
\begin_layout Standard
+\align center
\begin_inset Tabular
-
-
+
+
@@ -1243,11 +1268,11 @@ Source code in LyX
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar[r] & \ }
+$
\end_inset
-
+
\end_layout
\end_inset
@@ -1271,11 +1296,11 @@ ar
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar@{-->}[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar@{-->}[r] & \ }
+$
\end_inset
-
+
\end_layout
\end_inset
@@ -1299,11 +1324,11 @@ ar@{-->}
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar@{..>}[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar@{..>}[r] & \ }
+$
\end_inset
-
+
\end_layout
\end_inset
@@ -1327,11 +1352,11 @@ ar@{..>}
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar@{~>}[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar@{~>}[r] & \ }
+$
\end_inset
-
+
\end_layout
\end_inset
@@ -1355,8 +1380,8 @@ ar@{~>}
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar@{->>}[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar@{->>}[r] & \ }
+$
\end_inset
@@ -1383,8 +1408,8 @@ ar@{->>}
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar@{-->>}[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar@{-->>}[r] & \ }
+$
\end_inset
@@ -1411,8 +1436,8 @@ ar@{-->>}
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar@{>->>}[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar@{>->>}[r] & \ }
+$
\end_inset
@@ -1439,8 +1464,8 @@ ar@{>->>}
\begin_inset Text
\begin_layout Plain Layout
-\begin_inset Formula \xymatrix{\ \ar@{_{(}->}[r] & \ }
-
+\begin_inset Formula $\xymatrix{\ \ar@{_{(}->}[r] & \ }
+$
[LyX 2.0.x] xypic.lyx: update description of spacings
The branch, 2.0.x, has been updated.
- Log -
commit a67cd78556c2a6a0f091ce18472a48636e84ad1e
Author: Uwe Stöhr
Date: Sat Feb 16 21:48:12 2013 +0100
xypic.lyx: update description of spacings
- also update all web links and squash all LaTeX warnings
diff --git a/lib/examples/xypic.lyx b/lib/examples/xypic.lyx
index edf2dc7..b3e227c 100644
--- a/lib/examples/xypic.lyx
+++ b/lib/examples/xypic.lyx
@@ -82,7 +82,7 @@
\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, pdfpagelabels"
+\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue,
filecolor=blue,pdfpagelayout=OneColumn, pdfnewwindow=true,pdfstartview=XYZ,
plainpages=false"
\papersize a4paper
\use_geometry false
\use_amsmath 1
@@ -95,6 +95,7 @@
\paperorientation portrait
\suppress_date false
\use_refstyle 0
+\notefontcolor #ff
\index Index
\shortcut idx
\color #008000
@@ -230,8 +231,6 @@ xypic
\begin_inset Graphics
filename xyfigure.png
width 75col%
- BoundingBox 0bp 0bp 580bp 440bp
- clip
\end_inset
@@ -2860,7 +2859,14 @@ Xy
\end_inset
--manual, for instance,
+-manual,
+\begin_inset CommandInset citation
+LatexCommand cite
+key "xypic manual"
+
+\end_inset
+
+, for instance,
\family typewriter
\backslash
@@ -2884,7 +2890,11 @@ Xy
\end_inset
--matrix with row spacing of 1 pica.
+-matrix with row spacing of 1
+\begin_inset space ~
+\end_inset
+
+pica.
Similarly,
\family typewriter
@@ -2902,26 +2912,32 @@ xymatrix@C=
}
\family default
allows to modify the space between columns.
- Unfortunately, these commands do currently not work inside LyX, as the
- @-character is interpreted by LyX as ending the
-\begin_inset ERT
-status collapsed
+ Unfortunately, one cannot type
+\begin_inset Quotes eld
+\end_inset
-\begin_layout Plain Layout
+\family typewriter
\backslash
-Xy
-\end_layout
+xymatrix@R=1pc
+\family default
+\begin_inset Quotes erd
\end_inset
--matrix-macro.
-
+ into a formula to get the desired matrix because the @-character is
interpreted
+ by LyX as ending the
+\family typewriter
+
+\backslash
+xymatrix
+\family default
+ command.
+ But there is another way of getting the desired matrix:
\end_layout
\begin_layout Standard
-Knowing that
\begin_inset ERT
status collapsed
@@ -2938,7 +2954,11 @@ Xy
\begin_inset space ~
\end_inset
- stores the values for row-spacing and column-spacing in the variables
+ stores the values for row-spacing and column-spacing in the variables
+\begin_inset Newline newline
+\end_inset
+
+
\family typewriter
\backslash
@@ -2950,17 +2970,14 @@ xymatrixrowsep@
\backslash
xymatrixrowsep@
\family default
-, add the following macro to the preamble (
+.
+ So one can add the following macro to the preamble (
\family sans
Layout\SpecialChar \menuseparator
Document\SpecialChar \menuseparator
Preamble
\family default
):
-\begin_inset Newpage pagebreak
-\end_inset
-
-
\end_layout
\begin_layout LyX-Code
@@ -2968,7 +2985,7 @@ Preamble
\backslash
newcommand{
\backslash
-xyR}[1]{%
+xyR}[1]{%
\end_layout
\begin_layout LyX-Code
@@ -2979,10 +2996,6 @@ xydef@
xymatrixrowsep@{#1}}
\end_layout
-\begin_layout LyX-Code
-
-\end_layout
-
\begin_layout Standard
A macro
\family typewriter
@@ -3005,7 +3018,7 @@ xymatrixcolsep@
.
Now, a figure can be scaled by entering
\backslash
-xyR{...} into the
+xyR{ into the formula before the
\begin_inset ERT
status collapsed
@@ -3040,9 +3053,51 @@ xyC
Don't forget the backslashes and remember, that the closing brace is
automatica
lly supplied by LyX.
Inside the braces enter the dimensions.
- The default is
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Note:
+\series default
+ These commands affect all following
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+Xy
+\end_layout
+
+\end_inset
+
+-matrices.
+ Therefore don't forget to reset the values to default after the usage of
+
+\family typewriter
+
+\backslash
+xyR
+\family default
+ etc..
+\end_layout
+
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+The default is
\family typewriter
-2pt
+2pc
\family default
.
Here you see a diagram which is squashed vertically and stretched horizontally
@@ -3050,17 +3105,14 @@ lly supplied by LyX.
\family typewriter
\backslash
-xyR{9pc}
+xyR{0.5pc}
\backslash
-xyC{.5pc}
+xyC{9pc}
\family default
:
-\end_layout
-
-\begin_layout Standard
\begin_inset Formula
\[
-\xyC{.5pc}\xyC{9pc}\xymatrix{A\ar[r]\ar[d] & B\\
+\xyR{.5pc}\xyC{9pc}\xymatrix{A\ar[r]\ar[d] & B\\
C\ar@{}[ur]|{\text{{horizontal stretch}}}
}
\]
@@ -3068,6 +3120,20 @@ C\ar@{}[ur]|{\text{{h
[LyX master] xypic.lyx: update description of spacings for LyX 2.1
The branch, master, has been updated.
- Log -
commit d320df30b72beae36270cb032f9a8aacd72016d6
Author: Uwe Stöhr
Date: Sat Feb 16 21:49:57 2013 +0100
xypic.lyx: update description of spacings for LyX 2.1
- update the spacing description to reflect the new features in LyX 2.1
- also update all web links and squash all LaTeX warnings (ported from
branch)
diff --git a/lib/examples/xypic.lyx b/lib/examples/xypic.lyx
index edf2dc7..5144f9d 100644
--- a/lib/examples/xypic.lyx
+++ b/lib/examples/xypic.lyx
@@ -1,5 +1,5 @@
-#LyX 2.0 created this file. For more info see http://www.lyx.org/
-\lyxformat 413
+#LyX 2.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 462
\begin_document
\begin_header
\textclass scrartcl
@@ -54,13 +54,13 @@
\font_roman default
\font_sans default
\font_typewriter default
+\font_math auto
\font_default_family default
\use_non_tex_fonts false
\font_sc false
\font_osf false
\font_sf_scale 100
\font_tt_scale 100
-
\graphics default
\default_output_format default
\output_sync 0
@@ -82,19 +82,28 @@
\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, pdfpagelabels"
+\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue,
filecolor=blue,pdfpagelayout=OneColumn, pdfnewwindow=true,pdfstartview=XYZ,
plainpages=false"
\papersize a4paper
\use_geometry false
-\use_amsmath 1
-\use_esint 0
-\use_mhchem 1
-\use_mathdots 1
+\use_package amsmath 1
+\use_package amssymb 1
+\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 numerical
+\biblio_style plain
\use_bibtopic false
\use_indices false
\paperorientation portrait
\suppress_date false
+\justification true
\use_refstyle 0
+\notefontcolor #ff
\index Index
\shortcut idx
\color #008000
@@ -230,8 +239,6 @@ xypic
\begin_inset Graphics
filename xyfigure.png
width 75col%
- BoundingBox 0bp 0bp 580bp 440bp
- clip
\end_inset
@@ -1240,7 +1247,7 @@ ar@{^(->}[r].
\align center
\begin_inset Tabular
-
+
@@ -1562,7 +1569,7 @@ Following the @-character by either a 2, 3, _ or a ^, we
can produce arrows
\align center
\begin_inset Tabular
-
+
@@ -2860,7 +2867,14 @@ Xy
\end_inset
--manual, for instance,
+-manual,
+\begin_inset CommandInset citation
+LatexCommand cite
+key "xypic manual"
+
+\end_inset
+
+, for instance,
\family typewriter
\backslash
@@ -2884,7 +2898,11 @@ Xy
\end_inset
--matrix with row spacing of 1 pica.
+-matrix with row spacing of 1
+\begin_inset space ~
+\end_inset
+
+pica.
Similarly,
\family typewriter
@@ -2902,26 +2920,125 @@ xymatrix@C=
}
\family default
allows to modify the space between columns.
- Unfortunately, these commands do currently not work inside LyX, as the
- @-character is interpreted by LyX as ending the
-\begin_inset ERT
-status collapsed
+ Unfortunately, one cannot type
+\begin_inset Quotes eld
+\end_inset
-\begin_layout Plain Layout
+\family typewriter
\backslash
-Xy
+xymatrix@R=1pc
+\family default
+
+\begin_inset Quotes erd
+\end_inset
+
+ into a formula to get the desired matrix because the @-character is
interpreted
+ by LyX as ending the
+\family typewriter
+
+\backslash
+xymatrix
+\family default
+ command.
+ But there are two other ways of getting the desired matrix:
\end_layout
+\begin_layout Itemize
+One types e.g.
+\begin_inset space \space{}
+\end_inset
+
+
+\family typewriter
+
+\backslash
+xymatrix@R=1pc
+\family default
+ as normal document text, then either highlight it and press
+\begin_inset Info
+type "shortcut"
+arg "math-mode"
\end_inset
--matrix-macro.
+ to get a formula, or copy it into an existing formula.
+ You can now continue as normal.
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Note:
+\series default
+ This method only works for single spacing settings, so using
+\begin_inset Newline newline
+\end_inset
+
+
+\family typewriter
+
+\backslash
+xymatrix@M=1pt
+\family default
+ is possible while
+\family typewriter
+
+\backslash
+xymatrix@M=1pt@C=1dd
+\family default
+ is not.
+ The method also don't work if you use '!' to get a fixed grid with a defined
+ dimension, e.g.
+\begin_inset space \space{}
+\end_inset
+
+
+\family typewriter
+
+\backslash
+xymatrix@!R=3pt
+\family default
+ fails while
+\family typewriter
+\backslash
+xymatrix@!R
+\family default
+ works.
\end_layout
-\begin_layout Standard
-Knowing that
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+For the following matrix, the command
+\family typewr
[LyX master] tex2lyx/TODO.txt: update
The branch, master, has been updated.
- Log -
commit 16eaf36436830f4e98ce1a97e8f00055fcf103c5
Author: Uwe Stöhr
Date: Sat Feb 16 22:34:28 2013 +0100
tex2lyx/TODO.txt: update
- there is nothing to do for xymatrix, the Xy-pic manual roundtrip works
fine
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 70e4c07..0301bd6 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -46,7 +46,6 @@ Format LaTeX featureLyX feature
377multirow.sty InsetTabular
378revision infoInsetInfo
380?InsetPreview
-381\xymatrix@!{0,R,C} InsetMathXYMatrix
386LyX version InsetInfo
390forward/reverse search \forward_search, \forward_macro
391decimal alignment in tables InsetTabular
---
Summary of changes:
src/tex2lyx/TODO.txt |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX 2.0.x] tex2lyx/TODO.txt: update for branch
The branch, 2.0.x, has been updated.
- Log -
commit e996c65319fd6749e5eab504591b9fce39de11e3
Author: Uwe Stöhr
Date: Sat Feb 16 22:42:36 2013 +0100
tex2lyx/TODO.txt: update for branch
- there is nothing to do for \xymatrix and feyn.sty. - our example files
containing these features work correctly in a roundtrip
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 62e3634..e5093c0 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -52,14 +52,12 @@ Format LaTeX featureLyX feature
377multirow.sty InsetTabular
378revision infoInsetInfo
380?InsetPreview
-381\xymatrix@!{0,R,C} InsetMathXYMatrix
386LyX version InsetInfo
390forward/reverse search \forward_search, \forward_macro
391decimal alignment in tables InsetTabular
392new beamer formatInsetLayout
396nameref.sty InsetRef
399automatic mathdots loading \use_mathdots
-401feyn.sty InsetMathDiagram
402\addcontentsline InsetBibtex bibtotoc option
404refstyle.sty InsetRef
407vertical offset for multirowsInsetTabular
---
Summary of changes:
src/tex2lyx/TODO.txt |2 --
1 files changed, 0 insertions(+), 2 deletions(-)
hooks/post-receive
--
The LyX Source Repository
[LyX master] tex2lyx: support for the \textipa inset
The branch, master, has been updated.
- Log -
commit ec09560cb8ea5b5ea7cccf8b05eba72fa0110c63
Author: Uwe Stöhr
Date: Sun Feb 17 02:11:54 2013 +0100
tex2lyx: support for the \textipa inset
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 82135a8..b643c90 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -131,8 +131,8 @@ const char * const known_roman_fonts[] = { "ae",
"beraserif", "bookman",
const char * const known_sans_fonts[] = { "avant", "berasans",
"biolinum-type1",
"cmbr", "cmss", "helvet", "kurier", "kurierl", "lmss", "tgadventor",
"tgheros", 0};
-const char * const known_kurier_fonts[] = { "kurier", "kurierl",
"kurier-condensed",
-"kurier-light-condensed", 0};
+const char * const known_kurier_fonts[] = { "kurier", "kurierl",
+"kurier-condensed", "kurier-light-condensed", 0};
const char * const known_typewriter_fonts[] = { "beramono", "cmtl", "cmtt",
"courier", "lmtt", "luximono", "fourier", "lmodern", "mathpazo", "mathptmx",
@@ -164,8 +164,8 @@ const char * const known_if_commands[] = {"if",
"ifarydshln", "ifbraket",
const char * const known_basic_colors[] = {"blue", "black", "cyan", "green",
"magenta", "red", "white", "yellow", 0};
-const char * const known_basic_color_codes[] = {"#ff", "#00",
"#00", "#00ff00",
-"#ff00ff", "#ff", "#ff", "#00", 0};
+const char * const known_basic_color_codes[] = {"#ff", "#00",
"#00",
+"#00ff00", "#ff00ff", "#ff", "#ff", "#00", 0};
/// conditional commands with three arguments like \@ifundefined{}{}{}
const char * const known_if_3arg_commands[] = {"@ifundefined", "IfFileExists",
@@ -179,11 +179,11 @@ const char * const known_xetex_packages[] = {"arabxetex",
"fixlatvian",
/// packages that are automatically skipped if loaded by LyX
const char * const known_lyx_packages[] = {"amsbsy", "amsmath", "amssymb",
-"amstext", "amsthm", "array", "babel", "booktabs", "calc", "CJK", "color",
"float",
-"fontspec", "graphicx", "hhline", "ifthen", "longtable", "makeidx", "multirow",
-"nomencl", "pdfpages", "rotating", "rotfloat", "splitidx", "setspace",
-"subscript", "textcomp", "ulem", "url", "varioref", "verbatim", "wrapfig",
-"xunicode", 0};
+"amstext", "amsthm", "array", "babel", "booktabs", "calc", "CJK", "color",
+"float", "fontspec", "graphicx", "hhline", "ifthen", "longtable", "makeidx",
+"multirow", "nomencl", "pdfpages", "rotating", "rotfloat", "splitidx",
+"setspace", "subscript", "textcomp", "tipa", "tipx", "ulem", "url", "varioref",
+"verbatim", "wrapfig", "xunicode", 0};
// codes used to remove packages that are loaded automatically by LyX.
// Syntax: package_beg_seppackage_mid_seppackage_end_sep
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 0301bd6..2985608 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -55,7 +55,7 @@ Format LaTeX featureLyX feature
407vertical offset for multirowsInsetTabular
411support for polyglossia \language_package (the cases of
no package, of babel and of custom package is supported)
415automatic undertilde loading \use_package undertilde
-427tipa.sty \begin{IPA}, \textipa InsetTIPA
+427tipa.sty \begin{IPA} InsetTIPA
438\tone{51}, \tone{15}, \tone{45}, InsetTIPA
\tone{12}, \tone{454}, \toptiebar,
\bottomtiebar
diff --git a/src/tex2lyx/test/test-insets.lyx.lyx
b/src/tex2lyx/test/test-insets.lyx.lyx
index a1d9236..bfc85c3 100644
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -5683,6 +5683,40 @@
test\phantom{\textcolor{green}{W}\mathbf{ow}\textsuperscript{Wow}}test
\end_layout
\begin_layout Subsection
+TIPA
+\end_layout
+
+\begin_layout Standard
+
+\begin_inset IPA
+
+\begin_layout Standard
+[@n IÉ¡"zA:mpl]
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\begin_inset IPA
+
+\begin_layout Standard
+[@n Ig"zA
+\color red
+:m
+\color inherit
+pl]
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Subsection
Line breaks
\begin_inset Index breaks
status collapsed
diff --git a/src/tex2lyx/test/test-insets.tex b/src/tex2lyx/test/test-insets.tex
index 95bfebd..ff2251a 100644
--- a/src/tex2lyx/test/test-insets.tex
+++ b/src/tex2lyx/test/test-insets.tex
@@ -512,6 +512,13 @@
test\phantom{\textcolor{green}{W}\mathbf{ow}\textsuperscript{Wow}}test
$test\vphantom{Wow\&\%}test$
+\subsection{TIPA}
+
+\textipa{[@n I\textscriptg "zA:mpl]}
+
+\textipa{[@n Ig"zA\textcolor{red}{:m}pl]}
+
+
\subsection{Line breaks\sindex[breaks]{Line breaks}}
They can also or be broken by a newline\\
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 2bf2c5a..4908e88 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -3208,6 +3208,16 @@ void parse_text(Parser & p, ostream & os, unsigned
flags, bool outer,
