Re: new prerelease LyX-1.0.4pre6

[Jose Abilio Oliveira Matos]

On Thu, Aug 26, 1999 at 05:38:19AM +0200, Lars Gullik Bjønnes wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> 
> 
> Docbook support is not quite finished so we will most likely have at
> least one more prerelease before 1.0.4 proper.

  Besides bug hunting, there remains the configuration issue and the
table support.

  Lars, could you apply the patch I send?

  It fixes somes bugs pointed by Horst G. Kausch, the .eps is stripped
from the graphics name (this enables the backend to take care of it),
the generated Docbook is updated to the latest, v3.1

[...]

>       Lgb

  Thanks,
-- 
José

diff -p -N -r -U 4 -X excl.tmp lyx-1_0_x/lib/layouts/docbook.layout 
lyx-1_0_4/lib/layouts/docbook.layout
--- lyx-1_0_x/lib/layouts/docbook.layout        Thu Jul 22 15:13:06 1999
+++ lyx-1_0_4/lib/layouts/docbook.layout        Fri Aug 20 11:04:38 1999
@@ -85,11 +85,14 @@ Style Description
   LatexName            variablelist
 End
 
 # Verbatim style definition
-Style Verbatim
+Style Literal
   LatexType            Environment
   LatexName            literal
+  Font
+    Latex               Latex
+  EndFont                                                                             
+        
 End
 
 # Code style definition
 Style Code
@@ -97,8 +100,11 @@ Style Code
   LatexType            Environment
   LatexName            programlisting
   Preamble
   EndPreamble
+  Font
+    Latex               Latex
+  EndFont                                                                             
+        
 End
 
 # Author style definition
 Style Author
diff -p -N -r -U 4 -X excl.tmp lyx-1_0_x/src/buffer.C lyx-1_0_4/src/buffer.C
--- lyx-1_0_x/src/buffer.C      Thu Aug 19 09:30:33 1999
+++ lyx-1_0_4/src/buffer.C      Tue Aug 24 16:48:57 1999
@@ -2732,9 +2732,9 @@ void Buffer::makeDocBookFile(LString con
    
        //ResetTexRow();
        texrow.reset();
 
-       fprintf(file, "<!doctype %s public \"-//Davenport//DTD DocBook 
V3.0//EN\"",top_element.c_str());
+       fprintf(file, "<!doctype %s public \"-//OASIS//DTD DocBook 
+V3.1//EN\"",top_element.c_str());
 
        if (params.preamble.empty())
                fprintf(file, ">\n\n");
        else
diff -p -N -r -U 4 -X excl.tmp lyx-1_0_x/src/figinset.C lyx-1_0_4/src/figinset.C
--- lyx-1_0_x/src/figinset.C    Mon Jul 26 13:53:31 1999
+++ lyx-1_0_4/src/figinset.C    Tue Aug 24 10:02:21 1999
@@ -1226,9 +1226,14 @@ int InsetFig::Linuxdoc(LString &/*file*/
 
 
 int InsetFig::DocBook(LString &file)
 {
-       file += "@<graphic fileref=\"" + fname.strip('.') + "\"></graphic>";
+       LString figurename=fname;
+
+       if(figurename.suffixIs(".eps"))
+               figurename=figurename.substring(0,fname.length()-5);
+
+       file += "@<graphic fileref=\"" + figurename + "\"></graphic>";
        return 0;
 }