headers
Uwe Stöhr | 1 Jul 2012 01:43
Favicon

[LyX 2.0.x] Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x

The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit 7f2ed491de6c650ae25a253fcaa384918d2bd7b2
Merge: e516a9f 4d8fa3a
Author: Uwe Stöhr <uwestoehr <at> lyx.org>
Date:   Sun Jul 1 01:42:54 2012 +0200

    Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x

commit e516a9f9e5e8c201c6f80e88adc9b80a110e83e5
Author: Uwe Stöhr <uwestoehr <at> lyx.org>
Date:   Sun Jul 1 01:42:32 2012 +0200

    make tex2lyx in branch compilable again

    - Preamble.cpp/:
     - move list definition out of anon namespace
     - declare lists and a function in the class
     - remove ancientgreek since this is LyX 2.1-only

    - XeTeX-polyglossia.tex: remove ancientgreek

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index da4a50f..746e216 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
 <at>  <at>  -88,41 +88,6  <at>  <at>  const char * const known_coded_languages[] = {"french", "afrikaans", "albanian",
 "uppersorbian", "uppersorbian", "english", "english", "vietnamese", "welsh",
(Continue reading)

Permalink | Reply | 0 comments |
headers
Uwe Stöhr | 1 Jul 2012 01:47
Favicon

[LyX master] polyglossia tex2lyx coding style improvement

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit d10063fd20c151cfc580e24b1b8c2e58b406f97c
Author: Uwe Stöhr <uwestoehr <at> lyx.org>
Date:   Sun Jul 1 01:47:39 2012 +0200

    polyglossia tex2lyx coding style improvement

    - Preamble.cpp/:
     - move list definition out of anon namespace
     - declare lists and a function in the class

    - text.cpp: remove the now already defined list

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 70fc2e6..4dc363b 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
 <at>  <at>  -88,41 +88,6  <at>  <at>  const char * const known_coded_languages[] = {"french", "afrikaans", "albanian",
 "uppersorbian", "uppersorbian", "english", "english", "vietnamese", "welsh",
 0};

-/**
- * known polyglossia language names (including variants)
- */
-const char * const polyglossia_languages[] = {
-"albanian", "croatian", "hebrew", "norsk", "swedish", "amharic", "czech", "hindi",
-"nynorsk", "syriac", "arabic", "danish", "icelandic", "occitan", "tamil",
(Continue reading)

Permalink | Reply | 0 comments |
headers
Uwe Stöhr | 1 Jul 2012 02:13
Favicon

[LyX master] tex2lyx/Parser.cpp: refine \verb handling

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 56f0e0c4fce0256a09f5f111e2d32e364996865b
Author: Uwe Stöhr <uwestoehr <at> lyx.org>
Date:   Sun Jul 1 02:12:56 2012 +0200

    tex2lyx/Parser.cpp: refine \verb handling

diff --git a/src/tex2lyx/Parser.cpp b/src/tex2lyx/Parser.cpp
index fc3b4d2..6cd727c 100644
--- a/src/tex2lyx/Parser.cpp
+++ b/src/tex2lyx/Parser.cpp
 <at>  <at>  -402,9 +402,9  <at>  <at>  Parser::Arg Parser::getFullArg(char left, char right)
 		// for \verb a single '\' is allowed no matter what the delimiter is
 		// for example "\verb+\+" (reported as bug #4468)
 		// To support this, we allow single '\' if it is the only character
-		// within the delimiters
+		// within equal delimiters
 		if (next_token().cat() == catEscape)
-			if (next_token().character() == c)
+			if (next_token().character() == right && right == left)
 				result += '\\';
 		while ((c = getChar()) != right && good()) {
 			// Ignore comments

-----------------------------------------------------------------------

Summary of changes:
(Continue reading)

Permalink | Reply | 0 comments |
headers
Juergen Spitzmueller | 1 Jul 2012 08:39
Favicon

[LyX master] Whitespace

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 507302b4449cf0afc055fbb0c984ed7eacc62777
Author: Juergen Spitzmueller <spitz <at> lyx.org>
Date:   Sun Jul 1 08:38:54 2012 +0200

    Whitespace

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 6882883..f89f0b4 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
 <at>  <at>  -1745,14 +1745,15  <at>  <at>  bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 		IndicesList::const_iterator iend = indiceslist().end();
 		for (; iit != iend; ++iit) {
 			pair<docstring, docstring> indexname_latex =
-				features.runparams().encoding->latexString(iit->index(), features.runparams().dryrun);
+				features.runparams().encoding->latexString(iit->index(),
+									   features.runparams().dryrun);
 			if (!indexname_latex.second.empty()) {
 				// issue a warning about omitted characters
 				// FIXME: should be passed to the error dialog
 				frontend::Alert::warning(_("Uncodable characters"),
 					bformat(_("The following characters that are used in an index name are not\n"
-							  "representable in the current encoding and therefore have been omitted:\n%1$s."),
-							indexname_latex.second));
+						  "representable in the current encoding and therefore have been omitted:\n%1$s."),
+						indexname_latex.second));
(Continue reading)

Permalink | Reply | 0 comments |
headers
Juergen Spitzmueller | 1 Jul 2012 11:27
Favicon

[LyX master] Set the appropriate quote style when switching the main language

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 11f7efe2eb000620ad32c3db594d13cf118b6c27
Author: Juergen Spitzmueller <spitz <at> lyx.org>
Date:   Sun Jul 1 11:27:42 2012 +0200

    Set the appropriate quote style when switching the main language

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index f89f0b4..128b9ec 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
 <at>  <at>  -2257,6 +2257,12  <at>  <at>  Font const BufferParams::getFont() const
 }

 
+InsetQuotes::QuoteLanguage BufferParams::getQuoteStyle(string const qs) const
+{
+	return quoteslangtranslator().find(qs);
+}
+
+
 bool BufferParams::isLatex() const
 {
 	return documentClass().outputType() == LATEX;
diff --git a/src/BufferParams.h b/src/BufferParams.h
index dac9a4a..560ccef 100644
--- a/src/BufferParams.h
(Continue reading)

Permalink | Reply | 11 comments |
headers
Juergen Spitzmueller | 1 Jul 2012 14:48
Favicon

[LyX master] update tex2lyx TODO

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 555ae019b8940ee837f7a13dabb9e2b0c53b0131
Author: Juergen Spitzmueller <spitz <at> lyx.org>
Date:   Sun Jul 1 14:48:20 2012 +0200

    update tex2lyx TODO

diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index b52d1f6..a1efc09 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
 <at>  <at>  -63,3 +63,9  <at>  <at>  Format LaTeX feature                        LyX feature
 415    undertilde.sty                       fonts
 427    tipa.sty \begin{IPA}, \textipa       InsetTIPA

+
+General
+
+* Use the language information provided by Language.cpp and the languages file (for
babel/lyx/polyglossia name, quote style etc.)
+  instead of hardcoding this information in Preamble.cpp.
+

-----------------------------------------------------------------------

Summary of changes:
 src/tex2lyx/TODO.txt |    6 ++++++
(Continue reading)

Permalink | Reply | 0 comments |
headers
Uwe Stöhr | 1 Jul 2012 16:16
Favicon

[LyX master] Merge branch 'master' of git.lyx.org:lyx

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 00833efd10ab44385813a2a48cc8590ab1ca030d
Merge: e4018a3 555ae01
Author: Uwe Stöhr <uwestoehr <at> lyx.org>
Date:   Sun Jul 1 16:15:55 2012 +0200

    Merge branch 'master' of git.lyx.org:lyx

commit e4018a327e04804ec06f86f8aa27e78a1c62a8af
Author: Uwe Stöhr <uwestoehr <at> lyx.org>
Date:   Sun Jul 1 16:15:42 2012 +0200

    elsarticle already provides refstyle

    - elsarticle.layout: elsarticle already provides refstyle thus the document becomes uncompilable if we
don't declare this in the layout

    Also OK for branch?

diff --git a/lib/layouts/elsarticle.layout b/lib/layouts/elsarticle.layout
index 4e77b63..f7102ad 100644
--- a/lib/layouts/elsarticle.layout
+++ b/lib/layouts/elsarticle.layout
 <at>  <at>  -11,6 +11,7  <at>  <at>  SecNumDepth		3
 TocDepth		3
 DefaultStyle		Standard
 Provides natbib		1
(Continue reading)

Permalink | Reply | 1 comment |
headers
Pavel Sanda | 1 Jul 2012 23:06
Favicon

[LyX 2.0.x] Another attempt to fix #8203.

The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit 7fa9017f0fc8d6a0771d2f3e40a48c628b3845fd
Author: Pavel Sanda <sanda <at> lyx.org>
Date:   Sun Jul 1 23:01:18 2012 +0200

    Another attempt to fix #8203.

    Get rid of updateDialogs() altogether as in r39880.

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index d4d9e5f..df9dfe8 100644
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
 <at>  <at>  -1349,7 +1349,6  <at>  <at>  void GuiWorkArea::setReadOnly(bool read_only)
 		return;
 	read_only_ = read_only;
 	updateWindowTitle();
-	lyx_view_->updateDialogs();
 }

-----------------------------------------------------------------------

Summary of changes:
 src/frontends/qt4/GuiWorkArea.cpp |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

hooks/post-receive
(Continue reading)

Permalink | Reply | 0 comments |
headers
Juergen Spitzmueller | 2 Jul 2012 10:50
Favicon

[LyX master] Document QuoteStyle options

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 11ac5b78f3a942da3f0e3b167e171dd809a941e1
Author: Juergen Spitzmueller <spitz <at> lyx.org>
Date:   Mon Jul 2 10:50:06 2012 +0200

    Document QuoteStyle options

diff --git a/lib/languages b/lib/languages
index 5d7cdd6..a922cb8 100644
--- a/lib/languages
+++ b/lib/languages
 <at>  <at>  -10,7 +10,7  <at>  <at> 
 #	PolyglossiaName    <polyglossianame>
 #	PolyglossiaOpts    "<language-specific options>"
 #	Encoding           <encoding>
-#	QuoteStyle         <quotation mark style>
+#	QuoteStyle         <danish|english|french|german|polish|swedish>
 #	InternalEncoding   <true|false>
 #	RTL                <true|false>
 #	AsBabelOptions     <true|false>
 <at>  <at>  -26,10 +26,20  <at>  <at> 
 # End
 #
 #
-# NOTE:
+# NOTES:
 #
(Continue reading)

Permalink | Reply | 0 comments |
headers
rgheck | 2 Jul 2012 15:59
Favicon

r40933 - in www-user/trunk: announce farm/cookbook/LyX

Author: rgheck
Date: Mon Jul  2 15:59:56 2012
New Revision: 40933
URL: http://www.lyx.org/trac/changeset/40933

Log:
Add announcement and news for 2.0.4.

Added:
   www-user/trunk/announce/2_0_4.txt
Modified:
   www-user/trunk/farm/cookbook/LyX/news.inc

Added: www-user/trunk/announce/2_0_4.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ www-user/trunk/announce/2_0_4.txt	Mon Jul  2 15:59:56 2012	(r40933)
 <at>  <at>  -0,0 +1,325  <at>  <at> 
+Public release of LyX version 2.0.4
+===================================
+
+We are pleased to announce the release of LyX 2.0.4. This is the fourth
+maintenance release in the 2.0.x series.
+
+LyX 2.0.4 is the result of on-going efforts to make our stable version
+even more reliable and stable. We have fixed a number of bugs and made
+a number of improvements. These are detailed below. We encourage all
+LyX users to upgrade to this version.
+
+LyX is a document processor that encourages an approach to writing based
(Continue reading)

Permalink | Reply | 0 comments |

Gmane