commit 3420910d7bfb09f65354fb93b8146e5eaf1393c6
Author: Georg Baum <[email protected]>
Date: Sat Jun 25 21:09:21 2016 +0200
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.
---
lib/configure.py | 2 --
lib/doc/Customization.lyx | 22 +---------------------
lib/doc/de/Customization.lyx | 35 ++++-------------------------------
lib/doc/es/Customization.lyx | 27 ++++-----------------------
lib/doc/fr/Customization.lyx | 35 ++++-------------------------------
lib/doc/ja/Customization.lyx | 27 ++++-----------------------
lib/external_templates | 16 ++++------------
7 files changed, 21 insertions(+), 143 deletions(-)
diff --git a/lib/configure.py b/lib/configure.py
index d15b81d..ccf7226 100644
--- 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 45a96d3..f47e52f 100644
--- 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
@@ -23178,14 +23166,6 @@ 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 9c0fee5..889e77f 100644
--- 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
@@ -22268,18 +22253,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 0fc3afe..b6ad99a 100644
--- 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
@@ -23037,14 +23026,6 @@ 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 c4089aa..93eb7f3 100644
--- 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
@@ -25594,18 +25579,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 69510dc..0b4e0c6 100644
--- 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
@@ -20649,14 +20638,6 @@ 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 026f883..c689920 100644
--- 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>"
