Small fixes:

  linuxdoc_ export ascii text if not supporte natively.
  docbook _ some changes for docbook 4.

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 8ad8cc60fd626b6b67a83d745147abfbd65aaf27..3d4a915e5721702ee985bba7e7b0e69d711a55dc 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-16  José Matos  <jamatos@fep.up.pt>
+
+       * layouts/db_stdlayouts.inc: Fix name for caption.
+
 2002-01-15  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * examples/mathed.lyx: a bit of a clean-up. Corrected the contents

diff --git a/lib/layouts/db_stdlayouts.inc b/lib/layouts/db_stdlayouts.inc
index fc3a14d60800efdc2644c5fcf285054b3dbe93f3..55626bed417f21c0fd00409dd475d17fc593a213 100644 (file)
--- a/lib/layouts/db_stdlayouts.inc
+++ b/lib/layouts/db_stdlayouts.inc
@@ -44,5 +44,5 @@ NoStyle Verse
 
 Style Caption
   LatexType            Paragraph
-  LatexName            caption
+  LatexName            title
 End
\ No newline at end of file

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 3ecc8d642539388dd8aa41281aeef03dddc7c3d8..20d4e8fca1245b18be57752b4dbfc9e013434fb9 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,13 @@
+2002-01-16  José Matos  <jamatos@fep.up.pt>
+
+       * figinset.C (docbook): removed a old place holder "@".
+       * insetgraphics.C (docbook): remove the file sufix if graphic is eps.
+       * insetinclude.C (linuxdoc): if include is verbatim, then export the
+       ascii text version, clearly guarded inside a CDATA section.
+       (docbook): in docbook 4, inlinegraphics is empty.
+       * insettabular.C (linuxdoc): export the ascii version of the table
+       inside a CDATA section.
+
 2002-01-14  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * insetparent.C (InsetParent): 

diff --git a/src/insets/figinset.C b/src/insets/figinset.C
index e961aec7767c7c7ea6517b91a59bba61d48e25d5..4737f6e739ce6143fe04bb2cc4b02cbca6d12484 100644 (file)
--- a/src/insets/figinset.C
+++ b/src/insets/figinset.C
@@ -1188,7 +1188,7 @@ int InsetFig::docbook(Buffer const *, ostream & os) const
        if (suffixIs(figurename, ".eps"))
                figurename.erase(figurename.length() - 4);
 
-       os << "@<graphic fileref=\"" << figurename << "\"></graphic>";
+       os << "<graphic fileref=\"" << figurename << "\"></graphic>";
        return 0;
 } 
 

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index b2b1e46e9f6b592472d6bd960cfb37525a737849..4e19504f5a784b12cc5f25913778a07d02813024 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -773,8 +773,11 @@ int InsetGraphics::docbook(Buffer const * buf, ostream & os) const
 {
        // Change the path to be relative to the main file.
        string const buffer_dir = buf->filePath();
-       string const filename = RemoveExtension(
-                                  MakeRelPath(params.filename, buffer_dir));
+       string filename = RemoveExtension(
+               MakeRelPath(params.filename, buffer_dir));
+
+       if (suffixIs(filename, ".eps"))
+               filename.erase(filename.length() - 4);
 
        // In DocBook v5.0, the graphic tag will be eliminated from DocBook, will 
        // need to switch to MediaObject. However, for now this is sufficient and 

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index e4f207a1a549a13a44a56cb3e5d983ca0d0e1266..20bca653ca357e3b7a8e266294b71180f76d6e0a 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -332,9 +332,9 @@ int InsetInclude::linuxdoc(Buffer const * buffer, ostream & os) const
        }
 
        if (isVerbatim()) {
-               os << "<inlinegraphic fileref=\"" << '&' << include_label << ';'
-                  << "\" format=\"linespecific\">"
-                  << "</inlinegraphic>";
+               os << "<![CDATA["
+                  << GetFileContents(getFileName())
+                  << "]]>";
        } else
                os << '&' << include_label << ';';
        
@@ -370,9 +370,9 @@ int InsetInclude::docbook(Buffer const * buffer, ostream & os) const
        }
 
        if (isVerbatim()) {
-               os << "<inlinegraphic fileref=\"" << '&' << include_label << ';'
+               os << "<inlinegraphic fileref=\""
+                  << '&' << include_label << ';'
                   << "\" format=\"linespecific\">"
-                  << "</inlinegraphic>";
        } else
                os << '&' << include_label << ';';
        

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 222ae6dc8a891dbfb348228d64b63e88b24a540b..1f53d1dd96afb074660cb5ca92f8c01e0c23ab9e 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -1226,7 +1226,12 @@ int InsetTabular::ascii(Buffer const * buf, ostream & os, int ll) const
 
 int InsetTabular::linuxdoc(Buffer const * buf, ostream & os) const
 {
-       return tabular->ascii(buf,os, (int)parOwner()->params().depth(), false, 0);
+       os << "<![CDATA[";
+       int const ret = tabular->ascii(buf,os,
+                                      (int)parOwner()->params().depth(),
+                                      false, 0);
+       os << "]]>";
+       return ret;
 }