From 81420e405fb3ab0e3ee24bd952e570fcf9baba15 Mon Sep 17 00:00:00 2001
From: Julien Rioux <jrioux@lyx.org>
Date: Sun, 11 Sep 2011 18:23:15 +0000
Subject: [PATCH] Merge the preview mechanism for japanese with the standard
 one.

  - Japanese is now handled by passing the option --latex=platex
    to the standard lyxpreview script. This is done in PreviewLoader.
  - Remove obsoleted file lyxpreview-platex2bitmap.py and the
    corresponding lines in the configure script.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39659 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/scons/scons_manifest.py     |  1 -
 lib/Makefile.am                         |  1 -
 lib/configure.py                        |  3 +--
 lib/scripts/lyxpreview-platex2bitmap.py | 35 -------------------------
 src/graphics/PreviewLoader.cpp          |  6 ++---
 5 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 lib/scripts/lyxpreview-platex2bitmap.py

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 89ecbd2fd9..42e6d39660 100644
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -3014,7 +3014,6 @@ lib_scripts_files = Split('''
     listerrors
     lyxpak.py
     lyxpreview2bitmap.py
-    lyxpreview-platex2bitmap.py
     lyxpreview_tools.py
     lyxstangle.R
     lyxsweave.R
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a7a74ce83a..39b5900a46 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1505,7 +1505,6 @@ dist_scripts_PYTHON = \
 	scripts/listerrors \
 	scripts/lyxpak.py \
 	scripts/lyxpreview2bitmap.py \
-	scripts/lyxpreview-platex2bitmap.py \
 	scripts/lyxpreview_tools.py \
 	scripts/prefs2prefs.py \
 	scripts/prefs2prefs_lfuns.py \
diff --git a/lib/configure.py b/lib/configure.py
index e2cdb97ec0..522da331c1 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -596,7 +596,6 @@ def checkFormatEntries(dtl_tools):
 \Format jlyx       cjklyx "CJK LyX 1.4.x (euc-jp)" "" ""	""	"document"
 \Format klyx       cjklyx "CJK LyX 1.4.x (euc-kr)" "" ""	""	"document"
 \Format lyxpreview lyxpreview "LyX Preview"       "" ""	""	""
-\Format lyxpreview-platex lyxpreview-platex "LyX Preview (pLaTeX)"       "" ""	""	""
 \Format pdftex     pdftex_t PDFTEX                "" ""	""	""
 \Format program    ""      Program                "" ""	""	""
 \Format pstex      pstex_t PSTEX                  "" ""	""	""
@@ -895,7 +894,7 @@ def checkConverterEntries(java='', perl=''):
     # checkProg('Image converter', ['convert $$i $$o'])
     #
     # Entries that do not need checkProg
-    addToRC(r'''\converter lyxpreview-platex ppm        "python -tt $$s/scripts/lyxpreview-platex2bitmap.py"	""
+    addToRC(r'''
 \converter csv        lyx        "python -tt $$s/scripts/csv2lyx.py $$i $$o"	""
 \converter date       dateout    "python -tt $$s/scripts/date.py %d-%m-%Y > $$o"	""
 \converter docbook    docbook-xml "cp $$i $$o"	"xml"
diff --git a/lib/scripts/lyxpreview-platex2bitmap.py b/lib/scripts/lyxpreview-platex2bitmap.py
deleted file mode 100644
index 6f6b491e05..0000000000
--- a/lib/scripts/lyxpreview-platex2bitmap.py
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /usr/bin/env python
-
-# This script takes a pLaTeX file and generates a collection of
-# png or ppm image files, one per previewed snippet.
-# Example usage:
-# lyxpreview-platex2bitmap.py ppm 0lyxpreview.tex 128 000000 faf0e6
-
-# This script takes five arguments:
-# FORMAT:   The desired output format. 'ppm'.
-# TEXFILE:  the name of the .tex file to be converted.
-# DPI:      a scale factor, used to ascertain the resolution of the
-#           generated image which is then passed to gs.
-# FG_COLOR: the foreground color as a hexadecimal string, eg '000000'.
-# BG_COLOR: the background color as a hexadecimal string, eg 'faf0e6'.
-
-import sys
-from legacy_lyxpreview2ppm import legacy_conversion
-
-def usage(prog_name):
-    return "Usage: %s <format> <latex file> <dpi> <fg color> <bg color>\n"\
-           "\twhere the colors are hexadecimal strings, eg 'faf0e6'"\
-           % prog_name
-
-def main(argv):
-    # Parse and manipulate the command line arguments.
-    if len(argv) != 6 and len(argv) != 7:
-        error(usage(argv[0]))
-    # The arguments of legacy_conversion are the same as 
-    # those used in LyX 1.3.x, except for the 6th argument.
-    # The 7th argument is just ignored, since we use platex always
-    vec = [ argv[0], argv[2], argv[3], argv[1], argv[4], argv[5], "platex"]
-    return legacy_conversion(vec)
-
-if __name__ == "__main__":
-    main(sys.argv)
diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index 38eb1d8b82..feadc45c9e 100644
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -388,9 +388,7 @@ namespace graphics {
 PreviewLoader::Impl::Impl(PreviewLoader & p, Buffer const & b)
 	: parent_(p), buffer_(b)
 {
-	if (b.params().encoding().package() == Encoding::japanese)
-		pconverter_ = setConverter("lyxpreview-platex");
-	else
+	if (!pconverter_)
 		pconverter_ = setConverter("lyxpreview");
 }
 
@@ -602,6 +600,8 @@ void PreviewLoader::Impl::startLoading(bool wait)
 	// FIXME what about LuaTeX?
 	if (buffer_.params().useNonTeXFonts)
 		cs << " --latex=xelatex";
+	if (buffer_.params().encoding().package() == Encoding::japanese)
+		cs << " --latex=platex";
 	if (buffer_.params().bufferFormat() == "lilypond-book")
 		cs << " --lilypond";