[LyX master] typo

2013-02-19 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit 05ec893d07fa7849eff6a7a77edc5503763561a6
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Feb 19 09:17:35 2013 +0100

typo

diff --git a/lib/languages b/lib/languages
index c3e121e..4703ad0 100644
--- a/lib/languages
+++ b/lib/languages
@@ -574,7 +574,7 @@ End
 # not globally via class options
 # http://www.lyx.org/trac/ticket/4597#c4
 # Since japanese does not load fontenc, we set
-# Internalencoding to true.
+# InternalEncoding to true.
 Language japanese
GuiName  Japanese
BabelNamejapanese

---

Summary of changes:
 lib/languages |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2013-02-19 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit c741a148c9ee0d99854c3dbfbb003e3ab8cf9100
Merge: 8e4f656 05ec893
Author: Kornel Benko kor...@lyx.org
Date:   Tue Feb 19 09:28:49 2013 +0100

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


commit 8e4f656aa79cb1e39a4b8b3fc18b0d4571b8eee4
Author: Kornel Benko kor...@lyx.org
Date:   Tue Feb 19 09:26:05 2013 +0100

Add new output format dvi4 ( == DVI(pLaTeX)
Add converter for this format (platex without extra parameters)

diff --git a/lib/configure.py b/lib/configure.py
index fa3b8a3..00b2fa7 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -409,6 +409,7 @@ def checkLatex(dtl_tools):
 if cmdOutput(PLATEX + ' chklatex.ltx').find('pLaTeX2e') != -1:
 # We have the Japanese pLaTeX2e
 addToRC(r'\converter platex dvi%s -kanji=$$E $$i 
latex=platex' % PLATEX)
+addToRC(r'\converter platex dvi4   %s $$i
 latex=platex' % PLATEX)
 else:
 PLATEX = ''
 removeFiles(['chklatex.ltx', 'chklatex.log'])
@@ -589,7 +590,8 @@ def checkFormatEntries(dtl_tools):
 #
 checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'yap', 'dviout 
-Set=!m'],
 rc_entry = [r'''\Format dvidvi DVID  
%%document,vector,menu=export   application/x-dvi
-\Format dvi3   dvi DVI (LuaTeX)  V  %%   
document,vector,menu=export   '''])
+\Format dvi3   dvi DVI (LuaTeX)  V  %%   
document,vector,menu=export   
+\Format dvi4   dvi DVI (pLaTeX)  V  %%   
document,vector,menu=export   '''])
 if dtl_tools:
 # Windows only: DraftDVI
 addToRC(r'\Format dvi2   dvi DraftDVI  
  vector')

---

Summary of changes:
 lib/configure.py |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] set default format to dvi4 for japanes example files

2013-02-19 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit 14fed1df7d9b9b57105e0a20f65194f58c5ba125
Author: Kornel Benko kor...@lyx.org
Date:   Tue Feb 19 09:46:17 2013 +0100

set default format to dvi4 for japanes example files

diff --git a/lib/examples/ja/Braille.lyx b/lib/examples/ja/Braille.lyx
index bce0f18..372775c 100644
--- a/lib/examples/ja/Braille.lyx
+++ b/lib/examples/ja/Braille.lyx
@@ -28,7 +28,7 @@ braille
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/examples/ja/FeynmanDiagrams.lyx 
b/lib/examples/ja/FeynmanDiagrams.lyx
index 1e19b9b..5b04311 100644
--- a/lib/examples/ja/FeynmanDiagrams.lyx
+++ b/lib/examples/ja/FeynmanDiagrams.lyx
@@ -55,7 +55,7 @@
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/examples/ja/linguistics.lyx b/lib/examples/ja/linguistics.lyx
index 8540ad4..eadc2ec 100644
--- a/lib/examples/ja/linguistics.lyx
+++ b/lib/examples/ja/linguistics.lyx
@@ -28,7 +28,7 @@ linguistics
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/examples/ja/splash.lyx b/lib/examples/ja/splash.lyx
index 52e9e1e..0e1c049 100644
--- a/lib/examples/ja/splash.lyx
+++ b/lib/examples/ja/splash.lyx
@@ -20,7 +20,7 @@
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/examples/ja/xypic.lyx b/lib/examples/ja/xypic.lyx
index 00c2b69..7360b2f 100644
--- a/lib/examples/ja/xypic.lyx
+++ b/lib/examples/ja/xypic.lyx
@@ -44,7 +44,7 @@
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default

---

Summary of changes:
 lib/examples/ja/Braille.lyx |2 +-
 lib/examples/ja/FeynmanDiagrams.lyx |2 +-
 lib/examples/ja/linguistics.lyx |2 +-
 lib/examples/ja/splash.lyx  |2 +-
 lib/examples/ja/xypic.lyx   |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2013-02-19 Thread Jürgen Spitzmüller 
Am Dienstag 19 Februar 2013, 09:28:58 schrieb Kornel Benko:
 commit 8e4f656aa79cb1e39a4b8b3fc18b0d4571b8eee4
 Author: Kornel Benko kor...@lyx.org
 Date:   Tue Feb 19 09:26:05 2013 +0100
 
 Add new output format dvi4 ( == DVI(pLaTeX)
 Add converter for this format (platex without extra parameters)

As said, I don't think this is correct. Instead, the current platex support 
should be fixed.

Jürgen

[LyX master] Set default format to dvi4 for some japanes doc files. The rest (Tutorial.lyx, Math.lyx, EmbeddedObjects.lyx, UserGuide.lyx, Intro.lyx and Additional.lyx) are left untouched, because stil

2013-02-19 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit c0d4805acf97c28a4628dd7309fbd37d4251f070
Author: Kornel Benko kor...@lyx.org
Date:   Tue Feb 19 09:59:08 2013 +0100

Set default format to dvi4 for some japanes doc files.
The rest (Tutorial.lyx, Math.lyx, EmbeddedObjects.lyx, UserGuide.lyx,
Intro.lyx and Additional.lyx) are left untouched, because
still not compilable with platex

diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx
index 02823c8..65b0f18 100644
--- a/lib/doc/ja/Customization.lyx
+++ b/lib/doc/ja/Customization.lyx
@@ -77,7 +77,7 @@ End
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/ja/DummyDocument1.lyx b/lib/doc/ja/DummyDocument1.lyx
index 7a65186..469ddbd 100644
--- a/lib/doc/ja/DummyDocument1.lyx
+++ b/lib/doc/ja/DummyDocument1.lyx
@@ -20,7 +20,7 @@
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/ja/DummyDocument2.lyx b/lib/doc/ja/DummyDocument2.lyx
index 070e132..4d78ccd 100644
--- a/lib/doc/ja/DummyDocument2.lyx
+++ b/lib/doc/ja/DummyDocument2.lyx
@@ -20,7 +20,7 @@
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/ja/Formula-numbering.lyx b/lib/doc/ja/Formula-numbering.lyx
index 90d4c6b..4e12875 100644
--- a/lib/doc/ja/Formula-numbering.lyx
+++ b/lib/doc/ja/Formula-numbering.lyx
@@ -59,7 +59,7 @@
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/ja/LaTeXConfig.lyx b/lib/doc/ja/LaTeXConfig.lyx
index 65f6e00..23119d5 100644
--- a/lib/doc/ja/LaTeXConfig.lyx
+++ b/lib/doc/ja/LaTeXConfig.lyx
@@ -20,7 +20,7 @@
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/ja/Shortcuts.lyx b/lib/doc/ja/Shortcuts.lyx
index c4c0ad1..a69259e 100644
--- a/lib/doc/ja/Shortcuts.lyx
+++ b/lib/doc/ja/Shortcuts.lyx
@@ -20,7 +20,7 @@
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default

---

Summary of changes:
 lib/doc/ja/Customization.lyx |2 +-
 lib/doc/ja/DummyDocument1.lyx|2 +-
 lib/doc/ja/DummyDocument2.lyx|2 +-
 lib/doc/ja/Formula-numbering.lyx |2 +-
 lib/doc/ja/LaTeXConfig.lyx   |2 +-
 lib/doc/ja/Shortcuts.lyx |2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Make annoying debug message optional

2013-02-19 Thread Jean-Marc Lasgouttes 
The branch, master, has been updated.

- Log -

commit 30cbe535c3b7df8cb0db185e4d70fdbd97230f32
Author: Jean-Marc Lasgouttes lasgout...@lyx.org
Date:   Tue Feb 19 13:48:48 2013 +0100

Make annoying debug message optional

diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index d87f590..ca80409 100644
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -240,7 +240,7 @@ string const parsecmd(string const  incmd, string  
infile, string  outfile,
 int Systemcall::startscript(Starttype how, string const  what,
string const  path, bool process_events)
 {
-   lyxerr  \nRunning:   what  endl;
+   LYXERR(Debug::INFO,Running:   what);
 
string infile;
string outfile;

commit efe06103f3335f24c754bfb78d5fcf1072c3624f
Author: Jean-Marc Lasgouttes lasgout...@lyx.org
Date:   Tue Feb 19 12:36:06 2013 +0100

Add test case for bug #5312

diff --git a/src/tex2lyx/test/test-insets.lyx.lyx 
b/src/tex2lyx/test/test-insets.lyx.lyx
index b9deacb..d0d2da9 100644
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass article
@@ -13,7 +13,7 @@
 \maintain_unincluded_children false
 \language english
 \language_package none
-\inputencoding latin9
+\inputencoding iso8859-15
 \fontencoding T1
 \font_roman default
 \font_sans default
@@ -874,6 +874,20 @@ description uniform resource locator
 \end_layout
 
 \begin_layout Standard
+An URL with strange characters: 
+\begin_inset Flex Flex:URL
+status collapsed
+
+\begin_layout Plain Layout
+http://www.lyx.org/percent%dollar$
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
 link:
 \begin_inset CommandInset href
 LatexCommand href
diff --git a/src/tex2lyx/test/test-insets.tex b/src/tex2lyx/test/test-insets.tex
index 11385dd..28d4301 100644
--- a/src/tex2lyx/test/test-insets.tex
+++ b/src/tex2lyx/test/test-insets.tex
@@ -174,6 +174,8 @@ between~\verbatiminput{foo} or~\verbatiminput*{foo}.
 
 An URL: \url{http://www.lyx.org} \nomenclature{URL2}{uniform resource locator}
 
+An URL with strange characters: \url{http://www.lyx.org/percent%dollar$}
+
 link:\href{http://www.test.test}{www.test.test}
 
 link2:\href{http://www.test.test}{http://www.test.test}

---

Summary of changes:
 src/support/Systemcall.cpp   |2 +-
 src/tex2lyx/test/test-insets.lyx.lyx |   18 --
 src/tex2lyx/test/test-insets.tex |2 ++
 3 files changed, 19 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Adapt tex2lyx testcases to new format

2013-02-19 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit b353a0b03771a9583f8db0c72856c0a3bb794611
Author: Kornel Benko kor...@lyx.org
Date:   Tue Feb 19 15:44:11 2013 +0100

Adapt tex2lyx testcases to new format

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 8f726a5..806e30a 100644
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/src/tex2lyx/test/CJK.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass article
diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx
index 6579600..2cebc0e 100644
--- a/src/tex2lyx/test/CJKutf8.lyx.lyx
+++ b/src/tex2lyx/test/CJKutf8.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass article
@@ -18,7 +18,7 @@
 \maintain_unincluded_children false
 \language chinese-traditional
 \language_package default
-\inputencoding UTF8
+\inputencoding utf8-cjk
 \fontencoding T1
 \font_roman default
 \font_sans default
diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx 
b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
index eef1611..edef540 100644
--- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
+++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass article
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 5ad17d1..1217a70 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 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass article
@@ -42,7 +42,7 @@
 \maintain_unincluded_children false
 \language english
 \language_package none
-\inputencoding latin9
+\inputencoding iso8859-15
 \fontencoding T1
 \font_roman cmr
 \font_sans berasans
diff --git a/src/tex2lyx/test/test-modules.lyx.lyx 
b/src/tex2lyx/test/test-modules.lyx.lyx
index 63a9eda..c76830d 100644
--- a/src/tex2lyx/test/test-modules.lyx.lyx
+++ b/src/tex2lyx/test/test-modules.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass amsart
@@ -14,7 +14,7 @@ theorems-ams
 \maintain_unincluded_children false
 \language english
 \language_package default
-\inputencoding latin9
+\inputencoding iso8859-15
 \fontencoding T1
 \font_roman default
 \font_sans default
diff --git a/src/tex2lyx/test/test-structure.lyx.lyx 
b/src/tex2lyx/test/test-structure.lyx.lyx
index 956a464..7b38535 100644
--- a/src/tex2lyx/test/test-structure.lyx.lyx
+++ b/src/tex2lyx/test/test-structure.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass article
@@ -47,7 +47,7 @@ logicalmkup
 \maintain_unincluded_children false
 \language english
 \language_package default
-\inputencoding latin9
+\inputencoding iso8859-15
 \fontencoding default
 \font_roman default
 \font_sans default
diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx
index 547ddf8..4791fca 100644
--- a/src/tex2lyx/test/test.lyx.lyx
+++ b/src/tex2lyx/test/test.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass article
diff --git a/src/tex2lyx/test/verbatim.lyx.lyx 
b/src/tex2lyx/test/verbatim.lyx.lyx
index 4d813af..b49471c 100644
--- a/src/tex2lyx/test/verbatim.lyx.lyx
+++ b/src/tex2lyx/test/verbatim.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass article

---

Summary of changes:
 src/tex2lyx/test/CJK.lyx.lyx   |2 +-
 src/tex2lyx/test/CJKutf8.lyx.lyx   |4 ++--
 src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx |2 +-
 .../test/box-color-size-space-align.lyx.lyx|4 ++--
 src/tex2lyx/test/test-modules.lyx.lyx  |4 ++--
 src/tex2lyx/test/test-structure.lyx.lyx|4 ++--
 src/tex2lyx/test/test.lyx.lyx  |2 +-
 src/tex2lyx/test/verbatim.lyx.lyx  |2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Extend unicodesymbols force flag

2013-02-19 Thread Georg Baum 
The branch, master, has been updated.

- Log -

commit 9f93983b610bcda27468b62c17867d496114a88d
Author: Georg Baum b...@lyx.org
Date:   Tue Feb 19 22:19:10 2013 +0100

Extend unicodesymbols force flag

As suggested by Günter Milde.

diff --git a/lib/unicodesymbols b/lib/unicodesymbols
index f073844..f4469de 100644
--- a/lib/unicodesymbols
+++ b/lib/unicodesymbols
@@ -35,9 +35,11 @@
 # Therefore it may depend on the whole document contents which feature is 
chosen.
 # Known flags:
 # - combining   This is a combining char that will get combined with a 
base char
-# - force  Always output replacement command except for encodings
-#  with iconv name UTF-8
+# - force  Always output replacement command
 # - force=enc1;enc2... Always output replacement command in the specified 
encodings.
+# - force!=en1;en2...  Always output replacement command in all but the 
specified encodings.
+#  Symbols are never forced in encodings with iconv name
+#  UTF-8 and package none (currently only utf8-plain).
 # - mathalpha   This character is considered as a math variable in mathmode
 # - notermination=text Do not terminate this textcommand (by {} or space).
 #  This is set by default if textcommand ends with }.
diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 98ad851..82f2ea9 100644
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -896,6 +896,7 @@ void Encodings::read(FileName const  encfile, FileName 
const  symbolsfile)
 {
// We must read the symbolsfile first, because the Encoding
// constructor depends on it.
+   CharSetMap forcednotselected;
Lexer symbolslex;
symbolslex.setFile(symbolsfile);
bool getNextToken = true;
@@ -947,6 +948,12 @@ void Encodings::read(FileName const  encfile, FileName 
const  symbolsfile)
for (size_t i = 0; i  encodings.size(); ++i)

forcedselected[encodings[i]].insert(symbol);
info.flags |= CharInfoForceSelected;
+   } else if (prefixIs(flag, force!=)) {
+   vectorstring encodings =
+   getVectorFromString(flag.substr(7), 
;);
+   for (size_t i = 0; i  encodings.size(); ++i)
+   
forcednotselected[encodings[i]].insert(symbol);
+   info.flags |= CharInfoForceSelected;
} else if (flag == mathalpha) {
mathalpha.insert(symbol);
} else if (flag == notermination=text) {
@@ -1094,6 +1101,15 @@ void Encodings::read(FileName const  encfile, FileName 
const  symbolsfile)
break;
}
}
+
+   // Move all information from forcednotselected to forcedselected
+   for (CharSetMap::const_iterator it1 = forcednotselected.begin(); it1 != 
forcednotselected.end(); ++it1) {
+   for (CharSetMap::iterator it2 = forcedselected.begin(); it2 != 
forcedselected.end(); ++it2) {
+   if (it2-first != it1-first)
+   it2-second.insert(it1-second.begin(), 
it1-second.end());
+   }
+   }
+
 }
 
 

---

Summary of changes:
 lib/unicodesymbols |6 --
 src/Encoding.cpp   |   16 
 2 files changed, 20 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] typo

2013-02-19 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit 05ec893d07fa7849eff6a7a77edc5503763561a6
Author: Juergen Spitzmueller 
Date:   Tue Feb 19 09:17:35 2013 +0100

typo

diff --git a/lib/languages b/lib/languages
index c3e121e..4703ad0 100644
--- a/lib/languages
+++ b/lib/languages
@@ -574,7 +574,7 @@ End
 # not globally via class options
 # http://www.lyx.org/trac/ticket/4597#c4
 # Since japanese does not load fontenc, we set
-# Internalencoding to true.
+# InternalEncoding to true.
 Language japanese
GuiName  "Japanese"
BabelNamejapanese

---

Summary of changes:
 lib/languages |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2013-02-19 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit c741a148c9ee0d99854c3dbfbb003e3ab8cf9100
Merge: 8e4f656 05ec893
Author: Kornel Benko 
Date:   Tue Feb 19 09:28:49 2013 +0100

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


commit 8e4f656aa79cb1e39a4b8b3fc18b0d4571b8eee4
Author: Kornel Benko 
Date:   Tue Feb 19 09:26:05 2013 +0100

Add new output format dvi4 ( == DVI(pLaTeX)
Add converter for this format (platex without extra parameters)

diff --git a/lib/configure.py b/lib/configure.py
index fa3b8a3..00b2fa7 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -409,6 +409,7 @@ def checkLatex(dtl_tools):
 if cmdOutput(PLATEX + ' chklatex.ltx').find('pLaTeX2e') != -1:
 # We have the Japanese pLaTeX2e
 addToRC(r'\converter platex dvi"%s -kanji=$$E $$i" 
"latex=platex"' % PLATEX)
+addToRC(r'\converter platex dvi4   "%s $$i"
 "latex=platex"' % PLATEX)
 else:
 PLATEX = ''
 removeFiles(['chklatex.ltx', 'chklatex.log'])
@@ -589,7 +590,8 @@ def checkFormatEntries(dtl_tools):
 #
 checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'yap', 'dviout 
-Set=!m'],
 rc_entry = [r'''\Format dvidvi DVID  
"%%"  ""  "document,vector,menu=export"   "application/x-dvi"
-\Format dvi3   dvi "DVI (LuaTeX)"  V  "%%" ""  
"document,vector,menu=export"   ""'''])
+\Format dvi3   dvi "DVI (LuaTeX)"  V  "%%" ""  
"document,vector,menu=export"   ""
+\Format dvi4   dvi "DVI (pLaTeX)"  V  "%%" ""  
"document,vector,menu=export"   ""'''])
 if dtl_tools:
 # Windows only: DraftDVI
 addToRC(r'\Format dvi2   dvi DraftDVI   "" ""  
""  "vector"""')

---

Summary of changes:
 lib/configure.py |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] set default format to dvi4 for japanes example files

2013-02-19 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit 14fed1df7d9b9b57105e0a20f65194f58c5ba125
Author: Kornel Benko 
Date:   Tue Feb 19 09:46:17 2013 +0100

set default format to dvi4 for japanes example files

diff --git a/lib/examples/ja/Braille.lyx b/lib/examples/ja/Braille.lyx
index bce0f18..372775c 100644
--- a/lib/examples/ja/Braille.lyx
+++ b/lib/examples/ja/Braille.lyx
@@ -28,7 +28,7 @@ braille
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/examples/ja/FeynmanDiagrams.lyx 
b/lib/examples/ja/FeynmanDiagrams.lyx
index 1e19b9b..5b04311 100644
--- a/lib/examples/ja/FeynmanDiagrams.lyx
+++ b/lib/examples/ja/FeynmanDiagrams.lyx
@@ -55,7 +55,7 @@
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/examples/ja/linguistics.lyx b/lib/examples/ja/linguistics.lyx
index 8540ad4..eadc2ec 100644
--- a/lib/examples/ja/linguistics.lyx
+++ b/lib/examples/ja/linguistics.lyx
@@ -28,7 +28,7 @@ linguistics
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/examples/ja/splash.lyx b/lib/examples/ja/splash.lyx
index 52e9e1e..0e1c049 100644
--- a/lib/examples/ja/splash.lyx
+++ b/lib/examples/ja/splash.lyx
@@ -20,7 +20,7 @@
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/examples/ja/xypic.lyx b/lib/examples/ja/xypic.lyx
index 00c2b69..7360b2f 100644
--- a/lib/examples/ja/xypic.lyx
+++ b/lib/examples/ja/xypic.lyx
@@ -44,7 +44,7 @@
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default

---

Summary of changes:
 lib/examples/ja/Braille.lyx |2 +-
 lib/examples/ja/FeynmanDiagrams.lyx |2 +-
 lib/examples/ja/linguistics.lyx |2 +-
 lib/examples/ja/splash.lyx  |2 +-
 lib/examples/ja/xypic.lyx   |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2013-02-19 Thread Jürgen Spitzmüller 
Am Dienstag 19 Februar 2013, 09:28:58 schrieb Kornel Benko:
> commit 8e4f656aa79cb1e39a4b8b3fc18b0d4571b8eee4
> Author: Kornel Benko 
> Date:   Tue Feb 19 09:26:05 2013 +0100
> 
> Add new output format dvi4 ( == DVI(pLaTeX)
> Add converter for this format (platex without extra parameters)

As said, I don't think this is correct. Instead, the current platex support 
should be fixed.

Jürgen

[LyX master] Set default format to dvi4 for some japanes doc files. The rest (Tutorial.lyx, Math.lyx, EmbeddedObjects.lyx, UserGuide.lyx, Intro.lyx and Additional.lyx) are left untouched, because stil

2013-02-19 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit c0d4805acf97c28a4628dd7309fbd37d4251f070
Author: Kornel Benko 
Date:   Tue Feb 19 09:59:08 2013 +0100

Set default format to dvi4 for some japanes doc files.
The rest (Tutorial.lyx, Math.lyx, EmbeddedObjects.lyx, UserGuide.lyx,
Intro.lyx and Additional.lyx) are left untouched, because
still not compilable with platex

diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx
index 02823c8..65b0f18 100644
--- a/lib/doc/ja/Customization.lyx
+++ b/lib/doc/ja/Customization.lyx
@@ -77,7 +77,7 @@ End
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/ja/DummyDocument1.lyx b/lib/doc/ja/DummyDocument1.lyx
index 7a65186..469ddbd 100644
--- a/lib/doc/ja/DummyDocument1.lyx
+++ b/lib/doc/ja/DummyDocument1.lyx
@@ -20,7 +20,7 @@
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/ja/DummyDocument2.lyx b/lib/doc/ja/DummyDocument2.lyx
index 070e132..4d78ccd 100644
--- a/lib/doc/ja/DummyDocument2.lyx
+++ b/lib/doc/ja/DummyDocument2.lyx
@@ -20,7 +20,7 @@
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/ja/Formula-numbering.lyx b/lib/doc/ja/Formula-numbering.lyx
index 90d4c6b..4e12875 100644
--- a/lib/doc/ja/Formula-numbering.lyx
+++ b/lib/doc/ja/Formula-numbering.lyx
@@ -59,7 +59,7 @@
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/ja/LaTeXConfig.lyx b/lib/doc/ja/LaTeXConfig.lyx
index 65f6e00..23119d5 100644
--- a/lib/doc/ja/LaTeXConfig.lyx
+++ b/lib/doc/ja/LaTeXConfig.lyx
@@ -20,7 +20,7 @@
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/ja/Shortcuts.lyx b/lib/doc/ja/Shortcuts.lyx
index c4c0ad1..a69259e 100644
--- a/lib/doc/ja/Shortcuts.lyx
+++ b/lib/doc/ja/Shortcuts.lyx
@@ -20,7 +20,7 @@
 \font_tt_scale 100
 
 \graphics default
-\default_output_format default
+\default_output_format dvi4
 \output_sync 0
 \bibtex_command default
 \index_command default

---

Summary of changes:
 lib/doc/ja/Customization.lyx |2 +-
 lib/doc/ja/DummyDocument1.lyx|2 +-
 lib/doc/ja/DummyDocument2.lyx|2 +-
 lib/doc/ja/Formula-numbering.lyx |2 +-
 lib/doc/ja/LaTeXConfig.lyx   |2 +-
 lib/doc/ja/Shortcuts.lyx |2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Make annoying debug message optional

2013-02-19 Thread Jean-Marc Lasgouttes 
The branch, master, has been updated.

- Log -

commit 30cbe535c3b7df8cb0db185e4d70fdbd97230f32
Author: Jean-Marc Lasgouttes 
Date:   Tue Feb 19 13:48:48 2013 +0100

Make annoying debug message optional

diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index d87f590..ca80409 100644
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -240,7 +240,7 @@ string const parsecmd(string const & incmd, string & 
infile, string & outfile,
 int Systemcall::startscript(Starttype how, string const & what,
string const & path, bool process_events)
 {
-   lyxerr << "\nRunning: " << what << endl;
+   LYXERR(Debug::INFO,"Running: " << what);
 
string infile;
string outfile;

commit efe06103f3335f24c754bfb78d5fcf1072c3624f
Author: Jean-Marc Lasgouttes 
Date:   Tue Feb 19 12:36:06 2013 +0100

Add test case for bug #5312

diff --git a/src/tex2lyx/test/test-insets.lyx.lyx 
b/src/tex2lyx/test/test-insets.lyx.lyx
index b9deacb..d0d2da9 100644
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass article
@@ -13,7 +13,7 @@
 \maintain_unincluded_children false
 \language english
 \language_package none
-\inputencoding latin9
+\inputencoding iso8859-15
 \fontencoding T1
 \font_roman default
 \font_sans default
@@ -874,6 +874,20 @@ description "uniform resource locator"
 \end_layout
 
 \begin_layout Standard
+An URL with strange characters: 
+\begin_inset Flex Flex:URL
+status collapsed
+
+\begin_layout Plain Layout
+http://www.lyx.org/percent%dollar$
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
 link:
 \begin_inset CommandInset href
 LatexCommand href
diff --git a/src/tex2lyx/test/test-insets.tex b/src/tex2lyx/test/test-insets.tex
index 11385dd..28d4301 100644
--- a/src/tex2lyx/test/test-insets.tex
+++ b/src/tex2lyx/test/test-insets.tex
@@ -174,6 +174,8 @@ between~\verbatiminput{foo} or~\verbatiminput*{foo}.
 
 An URL: \url{http://www.lyx.org} \nomenclature{URL2}{uniform resource locator}
 
+An URL with strange characters: \url{http://www.lyx.org/percent%dollar$}
+
 link:\href{http://www.test.test}{www.test.test}
 
 link2:\href{http://www.test.test}{http://www.test.test}

---

Summary of changes:
 src/support/Systemcall.cpp   |2 +-
 src/tex2lyx/test/test-insets.lyx.lyx |   18 --
 src/tex2lyx/test/test-insets.tex |2 ++
 3 files changed, 19 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Adapt tex2lyx testcases to new format

2013-02-19 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit b353a0b03771a9583f8db0c72856c0a3bb794611
Author: Kornel Benko 
Date:   Tue Feb 19 15:44:11 2013 +0100

Adapt tex2lyx testcases to new format

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 8f726a5..806e30a 100644
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/src/tex2lyx/test/CJK.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass article
diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx
index 6579600..2cebc0e 100644
--- a/src/tex2lyx/test/CJKutf8.lyx.lyx
+++ b/src/tex2lyx/test/CJKutf8.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass article
@@ -18,7 +18,7 @@
 \maintain_unincluded_children false
 \language chinese-traditional
 \language_package default
-\inputencoding UTF8
+\inputencoding utf8-cjk
 \fontencoding T1
 \font_roman default
 \font_sans default
diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx 
b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
index eef1611..edef540 100644
--- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
+++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass article
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 5ad17d1..1217a70 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 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass article
@@ -42,7 +42,7 @@
 \maintain_unincluded_children false
 \language english
 \language_package none
-\inputencoding latin9
+\inputencoding iso8859-15
 \fontencoding T1
 \font_roman cmr
 \font_sans berasans
diff --git a/src/tex2lyx/test/test-modules.lyx.lyx 
b/src/tex2lyx/test/test-modules.lyx.lyx
index 63a9eda..c76830d 100644
--- a/src/tex2lyx/test/test-modules.lyx.lyx
+++ b/src/tex2lyx/test/test-modules.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass amsart
@@ -14,7 +14,7 @@ theorems-ams
 \maintain_unincluded_children false
 \language english
 \language_package default
-\inputencoding latin9
+\inputencoding iso8859-15
 \fontencoding T1
 \font_roman default
 \font_sans default
diff --git a/src/tex2lyx/test/test-structure.lyx.lyx 
b/src/tex2lyx/test/test-structure.lyx.lyx
index 956a464..7b38535 100644
--- a/src/tex2lyx/test/test-structure.lyx.lyx
+++ b/src/tex2lyx/test/test-structure.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass article
@@ -47,7 +47,7 @@ logicalmkup
 \maintain_unincluded_children false
 \language english
 \language_package default
-\inputencoding latin9
+\inputencoding iso8859-15
 \fontencoding default
 \font_roman default
 \font_sans default
diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx
index 547ddf8..4791fca 100644
--- a/src/tex2lyx/test/test.lyx.lyx
+++ b/src/tex2lyx/test/test.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass article
diff --git a/src/tex2lyx/test/verbatim.lyx.lyx 
b/src/tex2lyx/test/verbatim.lyx.lyx
index 4d813af..b49471c 100644
--- a/src/tex2lyx/test/verbatim.lyx.lyx
+++ b/src/tex2lyx/test/verbatim.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
 \begin_document
 \begin_header
 \textclass article

---

Summary of changes:
 src/tex2lyx/test/CJK.lyx.lyx   |2 +-
 src/tex2lyx/test/CJKutf8.lyx.lyx   |4 ++--
 src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx |2 +-
 .../test/box-color-size-space-align.lyx.lyx|4 ++--
 src/tex2lyx/test/test-modules.lyx.lyx  |4 ++--
 src/tex2lyx/test/test-structure.lyx.lyx|4 ++--
 src/tex2lyx/test/test.lyx.lyx  |2 +-
 src/tex2lyx/test/verbatim.lyx.lyx  |2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Extend unicodesymbols force flag

2013-02-19 Thread Georg Baum 
The branch, master, has been updated.

- Log -

commit 9f93983b610bcda27468b62c17867d496114a88d
Author: Georg Baum 
Date:   Tue Feb 19 22:19:10 2013 +0100

Extend unicodesymbols force flag

As suggested by Günter Milde.

diff --git a/lib/unicodesymbols b/lib/unicodesymbols
index f073844..f4469de 100644
--- a/lib/unicodesymbols
+++ b/lib/unicodesymbols
@@ -35,9 +35,11 @@
 # Therefore it may depend on the whole document contents which feature is 
chosen.
 # Known flags:
 # - combining   This is a combining char that will get combined with a 
base char
-# - force  Always output replacement command except for encodings
-#  with iconv name "UTF-8"
+# - force  Always output replacement command
 # - force=enc1;enc2... Always output replacement command in the specified 
encodings.
+# - force!=en1;en2...  Always output replacement command in all but the 
specified encodings.
+#  Symbols are never forced in encodings with iconv name
+#  UTF-8 and package none (currently only utf8-plain).
 # - mathalpha   This character is considered as a math variable in mathmode
 # - notermination=text Do not terminate this textcommand (by {} or space).
 #  This is set by default if textcommand ends with }.
diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 98ad851..82f2ea9 100644
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -896,6 +896,7 @@ void Encodings::read(FileName const & encfile, FileName 
const & symbolsfile)
 {
// We must read the symbolsfile first, because the Encoding
// constructor depends on it.
+   CharSetMap forcednotselected;
Lexer symbolslex;
symbolslex.setFile(symbolsfile);
bool getNextToken = true;
@@ -947,6 +948,12 @@ void Encodings::read(FileName const & encfile, FileName 
const & symbolsfile)
for (size_t i = 0; i < encodings.size(); ++i)

forcedselected[encodings[i]].insert(symbol);
info.flags |= CharInfoForceSelected;
+   } else if (prefixIs(flag, "force!=")) {
+   vector encodings =
+   getVectorFromString(flag.substr(7), 
";");
+   for (size_t i = 0; i < encodings.size(); ++i)
+   
forcednotselected[encodings[i]].insert(symbol);
+   info.flags |= CharInfoForceSelected;
} else if (flag == "mathalpha") {
mathalpha.insert(symbol);
} else if (flag == "notermination=text") {
@@ -1094,6 +1101,15 @@ void Encodings::read(FileName const & encfile, FileName 
const & symbolsfile)
break;
}
}
+
+   // Move all information from forcednotselected to forcedselected
+   for (CharSetMap::const_iterator it1 = forcednotselected.begin(); it1 != 
forcednotselected.end(); ++it1) {
+   for (CharSetMap::iterator it2 = forcedselected.begin(); it2 != 
forcedselected.end(); ++it2) {
+   if (it2->first != it1->first)
+   it2->second.insert(it1->second.begin(), 
it1->second.end());
+   }
+   }
+
 }
 
 

---

Summary of changes:
 lib/unicodesymbols |6 --
 src/Encoding.cpp   |   16 
 2 files changed, 20 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository