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 dvi        dvi     DVI                    D  
"%%"      ""      "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

Reply via email to