DocBook fix from Jose'

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

diff --git a/ChangeLog b/ChangeLog
index 8de3819b99a9848cd6946ab6149ebcce0e7445ad..7c73852d8abdf004585cdb108d30afbbe9ef0486 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-12-14  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * src/buffer.C (makeDocBookFile): update version number in output
+       file. 
+       (SimpleDocBookOnePar): fix an assert when trying to a character
+       access beyond string length
+       [Patch from Jose']
+
 1999-12-13  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * po/de.po: fix the Export menu

diff --git a/src/buffer.C b/src/buffer.C
index 76258303f8a0c74e5e31cd54abc1407707688597..ff14fadc6190551ceeb7fc897e6bf4c874b693f9 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -2790,7 +2790,7 @@ void Buffer::makeDocBookFile(string const & filename, int column)
                ofs << "\n [ " << params.preamble << " \n]>\n\n";
 
         string userName(getUserName());
-       ofs << "<!-- DocBook file was created by LyX 1.0 (C) 1995-1999\n"
+       ofs << "<!-- DocBook file was created by LyX 1.1 (C) 1995-1999\n"
            << "by <" << userName << "> " << date() << " -->\n";
 
        if(params.options.empty())
@@ -3107,7 +3107,7 @@ void Buffer::SimpleDocBookOnePar(string & file, string & extra,
                        //         desc_on == 4
                        //
                        if(desc_on!= 3 || i!= 0) {
-                               if(tmp_out[0] == '@') {
+                               if(!tmp_out.empty() && tmp_out[0] == '@') {
                                        if(desc_on == 4)
                                                extra += frontStrip(tmp_out, '@');
                                        else