Add converter to plain text and fix child format buglet

	* src/graph.C
	(Graph::getReachable): Only add a child format to only viewable
	formats if the child or parent has a viewer. Previously a child
	format was also added when there was no viewer at all.

	* lib/configure.py
	(checkFormatEntries): add text2, text3 and text4 formats
	(checkConverterEntries): add ps2ascii , pstotext and catdvi converters

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14528 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/configure.py b/lib/configure.py
index 84253fa8b80e08e1494463c3c249e99ca637dcb2..0ab15c7a800f69614f165bc8f2c2ee1c5fb068a2 100644 (file)
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -240,6 +240,9 @@ def checkFormatEntries():
 \Format linuxdoc   sgml    LinuxDoc               x  ""        "%%"    "document"
 \Format pdflatex   tex    "LaTeX (pdflatex)"      "" ""        "%%"    "document"
 \Format text       txt    "Plain text"            a  ""        "%%"    "document"
+\Format text2      txt    "Plain text (pstotext)" "" ""        "%%"    "document"
+\Format text3      txt    "Plain text (ps2ascii)" "" ""        "%%"    "document"
+\Format text4      txt    "Plain text (catdvi)"   "" ""        "%%"    "document"
 \Format textparagraph txt "Plain text (paragraphs)"    "" ""   "%%"    "document"''' ])
     #
     #checkProg('a Postscript interpreter', ['gs'],
@@ -325,6 +328,15 @@ def checkConverterEntries():
     checkProg('a PS to PDF converter', ['ps2pdf13 $$i $$o'],
         rc_entry = [ r'\converter ps         pdf        "%%"   ""' ])
     #
+    checkProg('a PS to TXT converter', ['pstotext $$i > $$o'],
+        rc_entry = [ r'\converter ps         text2      "%%"   ""' ])
+    #
+    checkProg('a PS to TXT converter', ['ps2ascii $$i $$o'],
+        rc_entry = [ r'\converter ps         text3      "%%"   ""' ])
+    #
+    checkProg('a DVI to TXT converter', ['catdvi $$i > $$o'],
+        rc_entry = [ r'\converter dvi        text4      "%%"   ""' ])
+    #
     checkProg('a DVI to PS converter', ['dvips -o $$o $$i'],
         rc_entry = [ r'\converter dvi        ps         "%%"   ""' ])
     #

diff --git a/src/graph.C b/src/graph.C
index 2b34bf08575b16d51434df22a0cd88dc1fb87f6f..87c67fc0758f989088f24fcd50a8f622c6bb425d 100644 (file)
--- a/src/graph.C
+++ b/src/graph.C
@@ -77,9 +77,14 @@ Graph::getReachable(int from, bool only_viewable,
                int const i = Q_.front();
                Q_.pop();
                Format const & format = formats.get(i);
-               if (!only_viewable || !format.viewer().empty() ||
-                   format.isChildFormat())
+               if (!only_viewable || !format.viewer().empty())
                        result.push_back(i);
+               else if (format.isChildFormat()) {
+                       Format const * const parent =
+                               formats.getFormat(format.parentFormat());
+                       if (parent && !parent->viewer().empty())
+                               result.push_back(i);
+               }
 
                vector<int>::const_iterator cit =
                        vertices_[i].out_vertices.begin();