anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 22:06:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small fixes:

Browse Source 
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
This commit is contained in:
José Matox 2002-01-16 12:04:16 +00:00
parent 52dbc44bfe
commit 54a38db2b2
7 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ChangeLog
View File

@ -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> 2002-01-15 Angus Leeming <a.leeming@ic.ac.uk>
* examples/mathed.lyx: a bit of a clean-up. Corrected the contents * examples/mathed.lyx: a bit of a clean-up. Corrected the contents

2
lib/layouts/db_stdlayouts.inc
View File

@ -44,5 +44,5 @@ NoStyle Verse
Style Caption Style Caption
LatexType Paragraph LatexType Paragraph
LatexName caption LatexName title
End End

10
src/insets/ChangeLog
View File

@ -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> 2002-01-14 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* insetparent.C (InsetParent): * insetparent.C (InsetParent):

2
src/insets/figinset.C
View File

@ -1188,7 +1188,7 @@ int InsetFig::docbook(Buffer const *, ostream & os) const
if (suffixIs(figurename, ".eps")) if (suffixIs(figurename, ".eps"))
figurename.erase(figurename.length() - 4); figurename.erase(figurename.length() - 4);
os << "@<graphic fileref=\"" << figurename << "\"></graphic>"; os << "<graphic fileref=\"" << figurename << "\"></graphic>";
return 0; return 0;
} }

7
src/insets/insetgraphics.C
View File

@ -773,8 +773,11 @@ int InsetGraphics::docbook(Buffer const * buf, ostream & os) const
{ {
// Change the path to be relative to the main file. // Change the path to be relative to the main file.
string const buffer_dir = buf->filePath(); string const buffer_dir = buf->filePath();
string const filename = RemoveExtension( string filename = RemoveExtension(
MakeRelPath(params.filename, buffer_dir)); 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 // 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 // need to switch to MediaObject. However, for now this is sufficient and

10
src/insets/insetinclude.C
View File

@ -332,9 +332,9 @@ int InsetInclude::linuxdoc(Buffer const * buffer, ostream & os) const
} }
if (isVerbatim()) { if (isVerbatim()) {
os << "<inlinegraphic fileref=\"" << '&' << include_label << ';' os << "<![CDATA["
<< "\" format=\"linespecific\">" << GetFileContents(getFileName())
<< "</inlinegraphic>"; << "]]>";
} else } else
os << '&' << include_label << ';'; os << '&' << include_label << ';';
@ -370,9 +370,9 @@ int InsetInclude::docbook(Buffer const * buffer, ostream & os) const
} }
if (isVerbatim()) { if (isVerbatim()) {
os << "<inlinegraphic fileref=\"" << '&' << include_label << ';' os << "<inlinegraphic fileref=\""
<< '&' << include_label << ';'
<< "\" format=\"linespecific\">" << "\" format=\"linespecific\">"
<< "</inlinegraphic>";
} else } else
os << '&' << include_label << ';'; os << '&' << include_label << ';';

7
src/insets/insettabular.C
View File

@ -1226,7 +1226,12 @@ int InsetTabular::ascii(Buffer const * buf, ostream & os, int ll) const
int InsetTabular::linuxdoc(Buffer const * buf, ostream & os) 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;
} }