The branch, master, has been updated.

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

commit 6c03b1ff744d827f40ccb0d9332c065bb59b6642
Author: Kornel Benko <[email protected]>
Date:   Fri Feb 22 12:06:31 2013 +0100

    Revert changes for output format dvi4
    This affects commits c0d4805acf97c28a4628dd7309fbd37d4251f070,
                         14fed1df7d9b9b57105e0a20f65194f58c5ba125
                         8e4f656aa79cb1e39a4b8b3fc18b0d4571b8eee4

diff --git a/lib/configure.py b/lib/configure.py
index 00b2fa7..fa3b8a3 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -409,7 +409,6 @@ 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'])
@@ -590,8 +589,7 @@ 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 dvi4       dvi     "DVI (pLaTeX)"          V  "%%"     ""      
"document,vector,menu=export"   ""'''])
+\Format dvi3       dvi     "DVI (LuaTeX)"          V  "%%"     ""      
"document,vector,menu=export"   ""'''])
     if dtl_tools:
         # Windows only: DraftDVI
         addToRC(r'\Format dvi2       dvi     DraftDVI               "" ""      
""      "vector"        ""')
diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx
index 65b0f18..02823c8 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 dvi4
+\default_output_format default
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/ja/DummyDocument1.lyx b/lib/doc/ja/DummyDocument1.lyx
index 469ddbd..7a65186 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 dvi4
+\default_output_format default
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/ja/DummyDocument2.lyx b/lib/doc/ja/DummyDocument2.lyx
index 4d78ccd..070e132 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 dvi4
+\default_output_format default
 \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 4e12875..90d4c6b 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 dvi4
+\default_output_format default
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/ja/LaTeXConfig.lyx b/lib/doc/ja/LaTeXConfig.lyx
index 23119d5..65f6e00 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 dvi4
+\default_output_format default
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/doc/ja/Shortcuts.lyx b/lib/doc/ja/Shortcuts.lyx
index a69259e..c4c0ad1 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 dvi4
+\default_output_format default
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/examples/ja/Braille.lyx b/lib/examples/ja/Braille.lyx
index 372775c..bce0f18 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 dvi4
+\default_output_format default
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/examples/ja/FeynmanDiagrams.lyx 
b/lib/examples/ja/FeynmanDiagrams.lyx
index 5b04311..1e19b9b 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 dvi4
+\default_output_format default
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/examples/ja/linguistics.lyx b/lib/examples/ja/linguistics.lyx
index eadc2ec..8540ad4 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 dvi4
+\default_output_format default
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/examples/ja/splash.lyx b/lib/examples/ja/splash.lyx
index 0e1c049..52e9e1e 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 dvi4
+\default_output_format default
 \output_sync 0
 \bibtex_command default
 \index_command default
diff --git a/lib/examples/ja/xypic.lyx b/lib/examples/ja/xypic.lyx
index 7360b2f..00c2b69 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 dvi4
+\default_output_format default
 \output_sync 0
 \bibtex_command default
 \index_command default

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

Summary of changes:
 lib/configure.py                    |    4 +---
 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 +-
 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 +-
 12 files changed, 12 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to