Remove asciiimage and asciixfig formats

The external templates requested conversion to these formats, but there was no
converter defined, so plain text export did fail, and there are no obvious ways
to create plain text representations for the files used by these templates.
Now we output the file name as for other templates and also the graphics inset.
This fixes bug #7135.

diff --git a/lib/configure.py b/lib/configure.py
index d15b81d82c33eb0f04795b75b5f0f6a7fd1611d2..ccf722604a556b872866028c60330a35f2aaf52f 100644 (file)
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -612,8 +612,6 @@ def checkFormatEntries(dtl_tools):
     checkViewerEditor('a text editor', ['xemacs', 'gvim', 'kedit', 'kwrite', 'kate', \
         'nedit', 'gedit', 'notepad', 'geany', 'leafpad', 'mousepad'],
         rc_entry = [r'''\Format asciichess asc    "Plain text (chess output)"  "" ""   "%%"    ""      ""
-\Format asciiimage asc    "Plain text (image)"         "" ""   "%%"    ""      ""
-\Format asciixfig  asc    "Plain text (Xfig output)"   "" ""   "%%"    ""      ""
 \Format docbook    sgml    DocBook                B  ""        "%%"    "document,menu=export"  ""
 \Format docbook-xml xml   "DocBook (XML)"         "" ""        "%%"    "document,menu=export"  "application/docbook+xml"
 \Format dot        dot    "Graphviz Dot"          "" ""        "%%"    "vector"        "text/vnd.graphviz"

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 45a96d343fda390a1146957c6c3c72b2a1185688..f47e52fdffee6821768698609a0364198a922248 100644 (file)
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -23122,19 +23122,7 @@ Format Ascii
 \end_layout
 
 \begin_layout LyX-Code
-Product "$$Contents(
-\backslash
-"$$AbsPath$$Basename.asc
-\backslash
-")"
-\end_layout
-
-\begin_layout LyX-Code
-UpdateFormat asciixfig
-\end_layout
-
-\begin_layout LyX-Code
-UpdateResult "$$AbsPath$$Basename.asc"
+Product "[XFig: $$FName]"
 \end_layout
 
 \begin_layout LyX-Code
@@ -23177,14 +23165,6 @@ ReferencedFile docbook-xml "$$AbsPath$$Basename.eps"
 FormatEnd
 \end_layout
 
-\begin_layout LyX-Code
-Product "[XFig: $$FName]"
-\end_layout
-
-\begin_layout LyX-Code
-FormatEnd
-\end_layout
-
 \begin_layout LyX-Code
 TemplateEnd
 \end_layout

diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx
index 9c0fee567d2aa71a8bc1405c09dd09614f8aae13..889e77f15226c3e2872585790cef099d65e4048a 100644 (file)
--- a/lib/doc/de/Customization.lyx
+++ b/lib/doc/de/Customization.lyx
@@ -1,5 +1,5 @@
-#LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 508
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 510
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -58,6 +58,7 @@ logicalmkup
 \font_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
+\use_microtype false
 \graphics default
 \default_output_format pdf2
 \output_sync 0
@@ -22188,23 +22189,7 @@ Format Ascii
 \begin_layout LyX-Code
 
 \lang english
-Product "$$Contents(
-\backslash
-"$$AbsPath$$Basename.asc
-\backslash
-")"
-\end_layout
-
-\begin_layout LyX-Code
-
-\lang english
-UpdateFormat asciixfig
-\end_layout
-
-\begin_layout LyX-Code
-
-\lang english
-UpdateResult "$$AbsPath$$Basename.asc"
+Product "[XFig: $$FName]"
 \end_layout
 
 \begin_layout LyX-Code
@@ -22267,18 +22252,6 @@ FormatEnd
 
 \begin_layout LyX-Code
 
-\lang english
-Product "[XFig: $$FName]"
-\end_layout
-
-\begin_layout LyX-Code
-
-\lang english
-FormatEnd
-\end_layout
-
-\begin_layout LyX-Code
-
 \lang english
 TemplateEnd
 \end_layout

diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx
index 0fc3afe76875d9608d3f8070223578a3d32557f1..b6ad99adb7190da99b2982cb333a2619eb48ebba 100644 (file)
--- a/lib/doc/es/Customization.lyx
+++ b/lib/doc/es/Customization.lyx
@@ -1,5 +1,5 @@
-#LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 508
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 510
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -55,6 +55,7 @@ logicalmkup
 \font_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
+\use_microtype false
 \graphics default
 \default_output_format pdf2
 \output_sync 0
@@ -22981,19 +22982,7 @@ Format Ascii
 \end_layout
 
 \begin_layout LyX-Code
-Product "$$Contents(
-\backslash
-"$$AbsPath$$Basename.asc
-\backslash
-")"
-\end_layout
-
-\begin_layout LyX-Code
-UpdateFormat asciixfig
-\end_layout
-
-\begin_layout LyX-Code
-UpdateResult "$$AbsPath$$Basename.asc"
+Product "[XFig: $$FName]"
 \end_layout
 
 \begin_layout LyX-Code
@@ -23036,14 +23025,6 @@ ReferencedFile docbook-xml "$$AbsPath$$Basename.eps"
 FormatEnd
 \end_layout
 
-\begin_layout LyX-Code
-Product "[XFig: $$FName]"
-\end_layout
-
-\begin_layout LyX-Code
-FormatEnd
-\end_layout
-
 \begin_layout LyX-Code
 TemplateEnd
 \end_layout

diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx
index c4089aae85179b2d9902cb150106b8fe7ffd9a8e..93eb7f3739579ef72b417ddad0eadfe8a956bf7d 100644 (file)
--- a/lib/doc/fr/Customization.lyx
+++ b/lib/doc/fr/Customization.lyx
@@ -1,5 +1,5 @@
-#LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 508
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 510
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -55,6 +55,7 @@ logicalmkup
 \font_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
+\use_microtype false
 \graphics default
 \default_output_format pdf2
 \output_sync 0
@@ -25514,23 +25515,7 @@ Format Ascii
 \begin_layout LyX-Code
 
 \lang english
-Product "$$Contents(
-\backslash
-"$$AbsPath$$Basename.asc
-\backslash
-")"
-\end_layout
-
-\begin_layout LyX-Code
-
-\lang english
-UpdateFormat asciixfig
-\end_layout
-
-\begin_layout LyX-Code
-
-\lang english
-UpdateResult "$$AbsPath$$Basename.asc"
+Product "[XFig: $$FName]"
 \end_layout
 
 \begin_layout LyX-Code
@@ -25593,18 +25578,6 @@ FormatEnd
 
 \begin_layout LyX-Code
 
-\lang english
-Product "[XFig: $$FName]"
-\end_layout
-
-\begin_layout LyX-Code
-
-\lang english
-FormatEnd
-\end_layout
-
-\begin_layout LyX-Code
-
 \lang english
 TemplateEnd
 \end_layout

diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx
index 69510dc792747fef6413b84f4b923bea760e7b16..0b4e0c6a4dbeda7167b28c251d512241e04aac00 100644 (file)
--- a/lib/doc/ja/Customization.lyx
+++ b/lib/doc/ja/Customization.lyx
@@ -1,5 +1,5 @@
-#LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 508
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 510
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -99,6 +99,7 @@ End
 \font_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
+\use_microtype false
 \graphics default
 \default_output_format pdf3
 \output_sync 0
@@ -20593,19 +20594,7 @@ Format Ascii
 \end_layout
 
 \begin_layout LyX-Code
-Product "$$Contents(
-\backslash
-"$$AbsPath$$Basename.asc
-\backslash
-")"
-\end_layout
-
-\begin_layout LyX-Code
-UpdateFormat asciixfig
-\end_layout
-
-\begin_layout LyX-Code
-UpdateResult "$$AbsPath$$Basename.asc"
+Product "[XFig: $$FName]"
 \end_layout
 
 \begin_layout LyX-Code
@@ -20648,14 +20637,6 @@ ReferencedFile docbook-xml "$$AbsPath$$Basename.eps"
 FormatEnd
 \end_layout
 
-\begin_layout LyX-Code
-Product "[XFig: $$FName]"
-\end_layout
-
-\begin_layout LyX-Code
-FormatEnd
-\end_layout
-
 \begin_layout LyX-Code
 TemplateEnd
 \end_layout

diff --git a/lib/external_templates b/lib/external_templates
index 026f8837d4af30988d18a4d52239d51ef0c57798..c689920d25c281d87e22d0528c3deb59d8a09bf0 100644 (file)
--- a/lib/external_templates
+++ b/lib/external_templates
@@ -136,9 +136,7 @@ Template RasterImage
                ReferencedFile pdflatex "$$AbsPath$$Basename.$$pngOrjpg"
        FormatEnd
        Format Ascii
-               Product "$$Contents(\"$$AbsPath$$Basename.asc\")"
-               UpdateFormat asciiimage
-               UpdateResult "$$AbsPath$$Basename.asc"
+               Product "[RasterImage: $$FName]"
        FormatEnd
        Format DocBook
                Product "<graphic fileref=\"$$AbsOrRelPathMaster$$Basename.eps\"></graphic>"
@@ -201,9 +199,7 @@ Template VectorGraphics
                ReferencedFile pdflatex "$$AbsPath$$Basename.pdf"
        FormatEnd
        Format Ascii
-               Product "$$Contents(\"$$AbsPath$$Basename.asc\")"
-               UpdateFormat asciiimage
-               UpdateResult "$$AbsPath$$Basename.asc"
+               Product "[VectorGraphics: $$FName]"
        FormatEnd
        Format DocBook
                Product "<graphic fileref=\"$$AbsOrRelPathMaster$$Basename.eps\"></graphic>"
@@ -253,9 +249,7 @@ Template XFig
                ReferencedFile pdflatex "$$AbsPath$$Basename.pdf"
        FormatEnd
        Format Ascii
-               Product "$$Contents(\"$$AbsPath$$Basename.asc\")"
-               UpdateFormat asciixfig
-               UpdateResult "$$AbsPath$$Basename.asc"
+               Product "[XFig: $$FName]"
        FormatEnd
        Format DocBook
                Product "<graphic fileref=\"$$AbsOrRelPathMaster$$Basename.eps\"></graphic>"
@@ -450,9 +444,7 @@ Template Dia
                ReferencedFile pdflatex "$$AbsPath$$Basename.pdf"
        FormatEnd
        Format Ascii
-               Product "$$Contents(\"$$AbsPath$$Basename.asc\")"
-               UpdateFormat asciiimage
-               UpdateResult "$$AbsPath$$Basename.asc"
+               Product "[Dia: $$FName]"
        FormatEnd
        Format DocBook
                Product "<graphic fileref=\"$$AbsOrRelPathMaster$$Basename.eps\"></graphic>"