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.
This commit is contained in:
Georg Baum 2016-06-25 21:09:21 +02:00
parent deaaf9bfe2
commit 3420910d7b
7 changed files with 21 additions and 143 deletions

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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>"