make text private in LyXParagraph some changes to import ascii file

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

diff --git a/ChangeLog b/ChangeLog
index 395da9fbdd7099751091fe458a2bcae356aa24a1..9721f52c23f82994a1912e075630a2db0eac885c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2000-03-16  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * src/support/lstrings.C (compare_no_case): some change to make it
+       compile with gcc 2.95.2 and stdlibc++-v3
+
+       * src/text2.C (MeltFootnoteEnvironment): change type o
+       first_footnote_par_is_not_empty to bool.
+
+       * src/lyxparagraph.h: make text private. Changes in other files
+       because of this.
+       (fitToSize): new function
+       (setContentsFromPar): new function
+       (clearContents): new function
+       (SetChar): new function
+
+       * src/paragraph.C (readSimpleWholeFile): deleted.
+
+       * src/lyx_cb.C (InsertAsciiFile): don't use a LyXParagraph to hold
+       the file, just use a simple string instead. Also read the file in
+       a more maintainable manner.
+
+       * src/text2.C (InsertStringA): deleted.
+       (InsertStringB): deleted.
+
 2000-03-15  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * src/text2.C (DeleteEmptyParagraphMechanism): don't run,

diff --git a/po/POTFILES.in b/po/POTFILES.in
index c294a0f54ab6f5f764b1be1d638e7b503992453f..01a4988ba5efe0885e66a65d5dcf144a732c7c74 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -28,6 +28,7 @@ src/insets/figinset.h
 src/insets/form_graphics.C
 src/insets/form_url.C
 src/insets/insetbib.C
+src/insets/inseteditor.C
 src/insets/inseterror.C
 src/insets/inseterror.h
 src/insets/insetert.C
@@ -50,6 +51,7 @@ src/insets/inseturl.h
 src/insets/lyxinset.h
 src/intl.C
 src/kbsequence.C
+src/language.C
 src/LaTeX.C
 src/LaTeXLog.C
 src/latexoptions.C

diff --git a/src/BufferView.C b/src/BufferView.C
index b1134650ad0f27ac59a9df29838ff84f17915411..fd4ea687087b7be80ecbf01dc4fdafd3795e4250 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -1252,9 +1252,9 @@ void BufferView::workAreaSelectionNotify(Window win, XEvent * event)
        string clb = fromClipboard(win, event);
        if (!clb.empty()) {
                if (!ascii_type)
-                       text->InsertStringA(clb.c_str());
+                       text->InsertStringA(clb);
                else
-                       text->InsertStringB(clb.c_str());
+                       text->InsertStringB(clb);
 
                update(1);
                

diff --git a/src/Chktex.C b/src/Chktex.C
index 9b112ed1f5d34035edc641d4c4e7a27fc1035276..7779e14e2f2b352bf2953b02bf56554d5ccb54a6 100644 (file)
--- a/src/Chktex.C
+++ b/src/Chktex.C
@@ -3,7 +3,7 @@
  * 
  *           LyX, The Document Processor        
  *          Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  *           This file is Copyright 1997-1998
  *           Asger Alstrup

diff --git a/src/ImportLaTeX.C b/src/ImportLaTeX.C
index 8083ea5e8502ed0d57cba8854cd11059cfbe66b0..0ada1dc76fb68afab113e0426887be4209bffbdf 100644 (file)
--- a/src/ImportLaTeX.C
+++ b/src/ImportLaTeX.C
@@ -3,7 +3,7 @@
  * 
  *           LyX, The Document Processor        
  *          Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  *           This file is Copyright 1998
  *           Asger Alstrup

diff --git a/src/ImportNoweb.C b/src/ImportNoweb.C
index 6af54667abb55cb02c6f41b8a3f43d10fea9dff1..dfee627f82aba564c3d9678e91e22ca6d373f541 100644 (file)
--- a/src/ImportNoweb.C
+++ b/src/ImportNoweb.C
@@ -3,7 +3,7 @@
  * 
  *           LyX, The Document Processor        
  *          Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  *           This file is Copyright 1999
  *           Kayvan A. Sylvan

diff --git a/src/LString.h b/src/LString.h
index 46ec80c097766c170f5c29d809668c8792bced2f..0f2eccc8cdeaeb8538f7058a89ae37ef2b9b8c89 100644 (file)
--- a/src/LString.h
+++ b/src/LString.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/LaTeX.C b/src/LaTeX.C
index 7018a24737796c83d195316cd4c9b222424c953d..f4224242c3cd29c8bb9ee7ca7aa35caa946c0d24 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -3,9 +3,9 @@
  * 
  *           LyX, The Document Processor        
  *          Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
- *           This file is Copyright 1996-1999
+ *           This file is Copyright 1996-2000
  *           Lars Gullik Bjønnes
  *
  * ====================================================== 

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 0adfcbcb98319f3833492550e242dfa6f21989e1..90c752cad794ec18e7398b5da3d054957b79b49d 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 the LyX Team.
+ *           Copyright 1995-2000 the LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/Literate.C b/src/Literate.C
index 0aa06d5eced2b719c1dba2d893bdbd2b875ca662..7ae33243b2eaf648fa8513ac881b87511e749aaf 100644 (file)
--- a/src/Literate.C
+++ b/src/Literate.C
@@ -3,7 +3,7 @@
  * 
  *           LyX, The Document Processor        
  *          Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== 
  */

diff --git a/src/LyXAction.C b/src/LyXAction.C
index a1077e2ab5cd0cf0b6bc8077109a03cf3be7c241..51ed29f183b5ebda6147bcf98637ff441471709d 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/LyXView.C b/src/LyXView.C
index 7875922b7ba7ce0406b40542d2ef55ae1eee7c92..86316604667a70e7a74d9ada5f8c7166bf83f22c 100644 (file)
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/Painter.h b/src/Painter.h
index 780aad225bf97f5eec43d2dcf5692d759f99a5a9..bb2048395c865274608900e1e21fef1aa2d1b007 100644 (file)
--- a/src/Painter.h
+++ b/src/Painter.h
@@ -4,7 +4,7 @@
  * 
  *           LyX, The Document Processor
  *      
- *         Copyright 1999-2000 The LyX Team
+ *         Copyright 1995-2000 The LyX Team
  *
  * ======================================================*/
 
@@ -25,7 +25,7 @@
 #include "PainterBase.h"
 #include "LColor.h"
 
-using std::less;
+//using std::less;
 
 class LyXFont;
 class WorkArea;

diff --git a/src/WorkArea.C b/src/WorkArea.C
index 8059d8a3c428abc6a1c09a67f67ba2f46ebdf087..b6b82313700b35ded283d9267250302356552b16 100644 (file)
--- a/src/WorkArea.C
+++ b/src/WorkArea.C
@@ -24,6 +24,10 @@
 
 FL_OBJECT * figinset_canvas;
 
+// need to make the c++ compiler fint the correct version of abs.
+// This is at least true for g++.
+using std::abs;
+
 static inline
 void waitForX()
 {

diff --git a/src/buffer.C b/src/buffer.C
index cbb04c2793392672d5e1a9a7d72f1a559bad3c7b..daf0403f1ba0328afeeb29fbddd282c95e43f458 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *
  *          Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  *           This file is Copyright 1996-1999
  *           Lars Gullik Bjønnes
@@ -305,7 +305,7 @@ bool Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
                if (!return_par) 
                        return_par = par;
                else {
-                       par->text.resize(par->text.size());
+                       par->fitToSize();
                        par = new LyXParagraph(par);
                }
                pos = 0;
@@ -336,7 +336,7 @@ bool Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
                if (!return_par) 
                        return_par = par;
                else {
-                       par->text.resize(par->text.size());
+                       par->fitToSize();
                        par = new LyXParagraph(par);
                }
                footnotekind = LyXParagraph::FOOTNOTE;

diff --git a/src/bufferparams.C b/src/bufferparams.C
index b81d1395cf7665dc5f74725643b08970eddbedf3..9ab6982ac9335f842139408ec9ebfded9346bfdd 100644 (file)
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *          Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/filedlg.C b/src/filedlg.C
index 80dc5fd49c047fba3eedd74d28e18447b233c9d9..043e17ca97faca83c7bcaca700789375f17caa69 100644 (file)
--- a/src/filedlg.C
+++ b/src/filedlg.C
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/filedlg.h b/src/filedlg.h
index 79a9058a4abf212635980e6d72cfdc59af079b5d..a68a2a107add625b4e1b16ebbf0eb4d2c79803f2 100644 (file)
--- a/src/filedlg.h
+++ b/src/filedlg.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/insets/inset.C b/src/insets/inset.C
index d0da2ce83aa2ef0aa7181257224d6f033c2763b7..fa452cb95f5d9b4d24558425f64299a7f9a45c86 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index 576b3077798ddccc77fa33427f10eb83e7feff69..ae90a45ccfb2e2ade0febd11b7856ff6d3daaa93 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/insets/inseterror.C b/src/insets/inseterror.C
index 2b34768f0a7f42ccc439a7bb7df1f83feacb4ed8..aae2d7c7c36c72537299a06f524b8bf1bebcc7c2 100644 (file)
--- a/src/insets/inseterror.C
+++ b/src/insets/inseterror.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/insets/insetindex.h b/src/insets/insetindex.h
index 4b9610b8447acf6723767de3c17d21e211c40ea9..87148cf7fb2cc7d809271bdf030aa7cea248d323 100644 (file)
--- a/src/insets/insetindex.h
+++ b/src/insets/insetindex.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1996-1999 the LyX Team.
+ *          Copyright 1996-2000 the LyX Team.
  * 
  * ====================================================== */
 

diff --git a/src/insets/insetinfo.C b/src/insets/insetinfo.C
index 0cb762b2db139bf2bf5487f216b0d8d491310462..53f580e2307cd67799d61a191a6cd14737242a9e 100644 (file)
--- a/src/insets/insetinfo.C
+++ b/src/insets/insetinfo.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/insets/insetinfo.h b/src/insets/insetinfo.h
index b01321acce5e16d272a256b0daf8c232248a2a15..8b436325b8e855033230161501a9b72e7f550f27 100644 (file)
--- a/src/insets/insetinfo.h
+++ b/src/insets/insetinfo.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 the LyX Team.
+ *           Copyright 1995-2000 the LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C
index 200b52ee195a0fd1875a4a40f74280e0ae616801..977cb58f529facdb4187ab54b4bd1e8a7c3a51bd 100644 (file)
--- a/src/insets/insetlabel.C
+++ b/src/insets/insetlabel.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/insets/insetlabel.h b/src/insets/insetlabel.h
index a3f0614d75128f3f8801068fadd9c5e30181322f..e906b866c9277b3b117316a69cd78297ec14536c 100644 (file)
--- a/src/insets/insetlabel.h
+++ b/src/insets/insetlabel.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team
+ *           Copyright 1995-2000 The LyX Team
  *
  * ====================================================== */
 

diff --git a/src/insets/insetloa.h b/src/insets/insetloa.h
index 6853205e0ab290818c1b40317b19f208a8907dc2..1341d0b860a5c8b9efd94ae793693ce16638bd91 100644 (file)
--- a/src/insets/insetloa.h
+++ b/src/insets/insetloa.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1996-1999 the LyX Team.
+ *           Copyright 1996-2000 the LyX Team.
  * 
  * ====================================================== */
 

diff --git a/src/insets/insetlof.h b/src/insets/insetlof.h
index 4eea16c155fe2b99eee734e6dd73dcb59f33b9d7..3259c16d8533cfb4eed2b658f097833dd6b4bfc1 100644 (file)
--- a/src/insets/insetlof.h
+++ b/src/insets/insetlof.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1996-1999 the LyX Team.
+ *           Copyright 1996-2000 the LyX Team.
  * 
  * ====================================================== */
 

diff --git a/src/insets/insetlot.h b/src/insets/insetlot.h
index ba6ce17f79509fda57c4a809fd48abc69e491066..4fffb7ba4df228a5cde24da2703faf48610ecb12 100644 (file)
--- a/src/insets/insetlot.h
+++ b/src/insets/insetlot.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1996-1999 LyX Team
+ *           Copyright 1996-2000 LyX Team
  * 
  * ====================================================== */
 

diff --git a/src/insets/insetparent.h b/src/insets/insetparent.h
index 3b746b3987dcf4d1f095983cd5212cbd1732280d..a3302987fa7293edbddd7122263d281326c9f563 100644 (file)
--- a/src/insets/insetparent.h
+++ b/src/insets/insetparent.h
@@ -4,7 +4,7 @@
  *
  *           LyX, The Document Processor
  *      
- *           Copyright 1997-1999 LyX Team
+ *           Copyright 1997-2000 LyX Team
  * 
  * ====================================================== */
 

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 0982214fe2d525bf0b6403d99690af1a9532b510..9d98098b4781bde126bba70e6f0216ac0238f8af 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/insets/insetquotes.h b/src/insets/insetquotes.h
index 968dc2557b3bc80ea3129b1b62ca044810a86003..99dedc71ec709357261b2e07a5bc6620f8072f04 100644 (file)
--- a/src/insets/insetquotes.h
+++ b/src/insets/insetquotes.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team
+ *          Copyright 1995-2000 The LyX Team
  *
  * ====================================================== */
 

diff --git a/src/insets/insettoc.h b/src/insets/insettoc.h
index 8bdf50b256f698ceeae85cbfbd3f6e762f17d3ff..794c49ffe62b996456f49de5ce0917eef5a2a6d6 100644 (file)
--- a/src/insets/insettoc.h
+++ b/src/insets/insettoc.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Word Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1996-1999 The LyX Team.
+ *           Copyright 1996-2000 The LyX Team.
  * 
  * ====================================================== */
 

diff --git a/src/insets/lyxinset.h b/src/insets/lyxinset.h
index cf2857c9d7b2132fbaa4a6d823c1cc0c805c8d76..6665370371b0dd82f67b4e3abd481b219c6e07ef 100644 (file)
--- a/src/insets/lyxinset.h
+++ b/src/insets/lyxinset.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 the LyX Team.
+ *           Copyright 1995-2000 the LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/intl.C b/src/intl.C
index 868500ca676caf75006e9120fc2fb78cb1193e07..19a4fefd5eaab91be92981ff79d811b1bf787853 100644 (file)
--- a/src/intl.C
+++ b/src/intl.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/lastfiles.C b/src/lastfiles.C
index 82365f5eac09923f5139a04b679df4cc6d6ddff0..144066da602703189d58b99e771b51d691785add 100644 (file)
--- a/src/lastfiles.C
+++ b/src/lastfiles.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/lastfiles.h b/src/lastfiles.h
index 163ba40a1170f915739a5fc3d028a3990f5e8e0f..487fcffc925c8a8ee0352cebe97642b945102cb1 100644 (file)
--- a/src/lastfiles.h
+++ b/src/lastfiles.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/layout.C b/src/layout.C
index b36c1c47e84d43116b8d370e5fbe003d34f38be5..06e011331804ebf1024ed28293c12d36d7f676ed 100644 (file)
--- a/src/layout.C
+++ b/src/layout.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *          Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/layout.h b/src/layout.h
index 530943defe6ca13fd1005cbb7d257e59062f8d2d..9125c3fc44e3d45beaac99827814c62e2d6d60a6 100644 (file)
--- a/src/layout.h
+++ b/src/layout.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 326dfd8b6e069efd0a5113b97377e628098a3981..973504fecb47e4015cc78912756de7bc4a0d40d9 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -11,6 +11,7 @@
 #include <config.h>
 
 #include <fstream>
+
 using std::ifstream;
 
 #include "LString.h"
@@ -1154,26 +1155,22 @@ void InsertAsciiFile(string const & f, bool asParagraph)
                             MakeDisplayPath(fname, 50));
                return;
        }
-       LyXParagraph * tmppar = new LyXParagraph;
-       tmppar->readSimpleWholeFile(ifs);
-       
-       // set the end of the string
-#ifdef WITH_WARNINGS
-#warning why do we do this?
-#endif
-       // I don't think this is needed. Actually it might be plain wrong.
-       tmppar->InsertChar(tmppar->text.size() - 1, '\0');
 
+       ifs.unsetf(std::ios::skipws);
+       std::istream_iterator<char> ii(ifs);
+       std::istream_iterator<char> end;
+       string tmpstr(ii, end); // yet a reason for using std::string
+       // alternate approach to get the file into a string:
+       //copy(ii, end, back_inserter(tmpstr));
        // insert the string
        current_view->hideCursor();
        
        // clear the selection
        current_view->beforeChange();
        if (!asParagraph)
-               current_view->text->InsertStringA(tmppar->text);
+               current_view->text->InsertStringA(tmpstr);
        else
-               current_view->text->InsertStringB(tmppar->text);
-       delete tmppar;
+               current_view->text->InsertStringB(tmpstr);
        current_view->update(1);
 }
 

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index c5f78cad630419226b9fa5738f3f7177ca0e3cf2..24dead7b1be23db213f800cdcaf1117ec2e1b9bc 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/lyx_gui_misc.C b/src/lyx_gui_misc.C
index b29cdd7ac8c378d1aa8bb26b1523e7e56dd05b33..beee7bc0f098e6d4cc0436450fb1533723cd6a0b 100644 (file)
--- a/src/lyx_gui_misc.C
+++ b/src/lyx_gui_misc.C
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/lyx_gui_misc.h b/src/lyx_gui_misc.h
index ad620e66d6f57d6b3d0b3eacca0b4fe158aad746..9a3bc65d89b5353f30b7017aacd585a712903567 100644 (file)
--- a/src/lyx_gui_misc.h
+++ b/src/lyx_gui_misc.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 1996 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team
+ *           Copyright 1995-2000 The LyX Team
  *
  * ====================================================== */
 

diff --git a/src/lyx_sty.C b/src/lyx_sty.C
index afa9f6a725c011e2f8ce82e1bbdbd923aee08b16..85e5662813ec07ee5f256deb3d6cadbe105252ad 100644 (file)
--- a/src/lyx_sty.C
+++ b/src/lyx_sty.C
@@ -5,7 +5,7 @@
   LyX, The Document Processor
   
   Copyright 1995 Matthias Ettrich
-  Copyright 1995-1999 The LyX Team.
+  Copyright 1995-2000 The LyX Team.
   ====================================================== 
   */
 

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 7babecf2fa7ee242fea9928f2017146306ae669a..aebdd0756f5d4e9840eccde94065924fb74c8bd7 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/lyxfr0.C b/src/lyxfr0.C
index d397968b3e660594607b53c5e855fd30b47ea38a..24a22dad9642a2a6bc791489db2c783eb72de82e 100644 (file)
--- a/src/lyxfr0.C
+++ b/src/lyxfr0.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich,
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/lyxfr1.C b/src/lyxfr1.C
index 57c2cb33089aa8b18728af4343931036d0687635..7fd124624db6520abba3633fdf844c85d68e7531 100644 (file)
--- a/src/lyxfr1.C
+++ b/src/lyxfr1.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich,
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 3bd5c4766a9eb24d9df4f8ce386ec1c28fcfa001..89c5c441d47be203c484686d7b0a0277d83370f6 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -1958,8 +1958,11 @@ string LyXFunc::Dispatch(int ac,
                LyXParagraph::size_type pos = 
                        owner->view()->text->cursor.pos;
                if(pos < owner->view()->text->cursor.par->size())
-                       dispatch_buffer = owner->view()->text->
-                               cursor.par->text[pos];
+                       //dispatch_buffer = owner->view()->text->
+                       //      cursor.par->text[pos];
+                       dispatch_buffer =
+                               owner->view()->text->
+                               cursor.par->GetChar(pos);
                else
                        dispatch_buffer = "EOF";
        }

diff --git a/src/lyxlex.h b/src/lyxlex.h
index dcfca5eb9b932157ea3711f08ff17ffa2c3854a2..0bd9d6f414ac41f10da6a08588076ac3f6e4c8d8 100644 (file)
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -15,6 +15,7 @@
 using std::filebuf;
 
 #include "support/LIstream.h"
+#include "support/LOstream.h"
 
 #include "LString.h"
 

diff --git a/src/lyxlookup.C b/src/lyxlookup.C
index 4e0d1f94942bc08c671abe7847ddf4bf3b373983..3dc265bb5fa27d4bc293ca974ae62b6956a9d879 100644 (file)
--- a/src/lyxlookup.C
+++ b/src/lyxlookup.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich 
- *           Copyright 1995-1999 The LyX team.
+ *           Copyright 1995-2000 The LyX team.
  *
  * ====================================================== */
 

diff --git a/src/lyxparagraph.h b/src/lyxparagraph.h
index 9c72dae44dcd38d4f9b1caa3d670ce0a539a0151..29b50c59adbe621f7d2eb4d17215a3db2484848b 100644 (file)
--- a/src/lyxparagraph.h
+++ b/src/lyxparagraph.h
@@ -147,9 +147,6 @@ public:
        ///
        void read();
 
-       ///
-       void readSimpleWholeFile(istream &);
-
        ///
        LyXParagraph * TeXOnePar(ostream &, TexRow & texrow,
                                 ostream & foot, TexRow & foot_texrow,
@@ -182,10 +179,23 @@ public:
        /// proof environment
        int GetEndLabel() const;
 
+private:
        ///
        TextContainer text;
+public:
        ///
        size_type size() const { return text.size(); }
+       ///
+       void fitToSize() {
+               text.resize(text.size());
+       }
+       void setContentsFromPar(LyXParagraph * par) {
+               text = par->text;
+       }
+       void clearContents() {
+               text.clear();
+       }
+       
        /// 
        VSpace added_space_top;
        
@@ -366,6 +376,11 @@ public:
        char GetChar(size_type pos);
        ///
        char GetChar(size_type pos) const;
+       /// The position must already exist.
+       void SetChar(size_type pos, char c) {
+               text[pos] = c;
+       }
+       
        ///
        void SetFont(size_type pos, LyXFont const & font);
        ///

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 6a28a6dd20994d680d280ff7063beb3706c429a8..552267fc4a82b626952f8dd30d183469d2d1c017 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -16,6 +16,8 @@
 
 #include <fstream>
 #include <iomanip>
+#include <iostream>
+
 using std::ofstream;
 using std::cout;
 using std::ios;

diff --git a/src/lyxrow.h b/src/lyxrow.h
index 199ca99f3063f7c2f2e95a55d0c793d791090320..12c2b835b71e47ebe181935c369bb8f478681947 100644 (file)
--- a/src/lyxrow.h
+++ b/src/lyxrow.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/lyxserver.C b/src/lyxserver.C
index 28197299fb4e22e90470d977371f393253a97277..c80f52bcfe38f3c5453fb6351c81378b1a54e60e 100644 (file)
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 352828694305ee15721fce089b85974b0b99b7f8..c6620eeb79fe7701ff819a6ca67c4b5ef8a1e593 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -381,13 +381,9 @@ public:
        bool SearchBackward(char const * str) const;
 
        /// needed to insert the selection
-       void InsertStringA(LyXParagraph::TextContainer const & text);
+       void InsertStringA(string const & str);
        /// needed to insert the selection
-       void InsertStringB(LyXParagraph::TextContainer const & text);
-       /// needed to insert the selection
-       void InsertStringA(char const * str);
-       /// needed to insert the selection
-       void InsertStringB(char const * str);
+       void InsertStringB(string const & str);
 
        /// usefull when texing from within LyX
        bool GotoNextError() const;

diff --git a/src/minibuffer.C b/src/minibuffer.C
index a2d8e22df15e59f3bc4a4cfb29224aff720b5ab5..f365325f3141da1a1ae92256223e435858313b42 100644 (file)
--- a/src/minibuffer.C
+++ b/src/minibuffer.C
@@ -5,7 +5,7 @@
  *                 information.
  * 
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.  
+ *           Copyright 1995-2000 The LyX Team.  
  * 
  * ###########################################################################
  */

diff --git a/src/paragraph.C b/src/paragraph.C
index 7ca560321608aff88d7e9616ca6fffd5e35f92ea..e348d52f2c0ceda795767265ea333abcfdafa391 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -1894,17 +1894,6 @@ int LyXParagraph::GetPositionOfInset(Inset * inset) const
 }
 
 
-void LyXParagraph::readSimpleWholeFile(istream & is)
-{
-       is.seekg(0);
-       char c = 0;
-       while(!is.eof()) {
-               is.get(c);
-               InsertChar(text.size(), c);
-       };
-}
-
-
 LyXParagraph * LyXParagraph::TeXOnePar(ostream & os, TexRow & texrow,
                                       ostream & foot, TexRow & foot_texrow,
                                       int & foot_count)

diff --git a/src/print_form.h b/src/print_form.h
index 5d5c3928b776b4a3ac9c50dc1623de6944aa4c62..98c73e55b9361670a65666e4d1600d0d2474d464 100644 (file)
--- a/src/print_form.h
+++ b/src/print_form.h
@@ -1,4 +1,4 @@
-/** Header file generated with fdesign on Mon Apr 12 19:09:43 1999.**/
+/** Header file generated with fdesign on Mon Apr 12 19:09:43 2000.**/
 
 #ifndef FD_form_print_h_
 #define FD_form_print_h_

diff --git a/src/stl_string_fwd.h b/src/stl_string_fwd.h
index 61a541e01b80234a798263993e94366fb4dcef87..f27ab3ab301003919510bc1bcb03dbf143982b4e 100644 (file)
--- a/src/stl_string_fwd.h
+++ b/src/stl_string_fwd.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/support/DebugStream.h b/src/support/DebugStream.h
index 946f7173afefdc74ae2341f66597d32aabbb7089..cff7affaf4794b59d5c394248a586889bacee18d 100644 (file)
--- a/src/support/DebugStream.h
+++ b/src/support/DebugStream.h
@@ -2,7 +2,7 @@
 
 // Created by Lars Gullik Bjønnes
 // Copyright 1999 Lars Gullik Bjønnes (larsbj@lyx.org)
-// Released under the Gnu General Public License
+// Released into the public domain.
 
 // Implemented and tested on g++ 2.7.2.3
 

diff --git a/src/support/FileInfo.C b/src/support/FileInfo.C
index 79e33e839698a78ef02985f5b78aac5012860856..e19d1377d0c98483e930cb2a3d60c9ca433a96fe 100644 (file)
--- a/src/support/FileInfo.C
+++ b/src/support/FileInfo.C
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/support/FileInfo.h b/src/support/FileInfo.h
index 614a8b159660d7368a0b727d96890e7094470634..711987f3e863972475692e3b9619ae9ec56b76d8 100644 (file)
--- a/src/support/FileInfo.h
+++ b/src/support/FileInfo.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/support/LSubstring.C b/src/support/LSubstring.C
index 1369434ab5784225b66b44928442dd99abbade3f..7624dda2bfd08109941f86e49da4ce4499526120 100644 (file)
--- a/src/support/LSubstring.C
+++ b/src/support/LSubstring.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/support/filetools.h b/src/support/filetools.h
index f171e94d8e1ba0c7dd246f430581c62a65461311..efe21a5f49b9160c9a378e34d64e5efdd07c88b0 100644 (file)
--- a/src/support/filetools.h
+++ b/src/support/filetools.h
@@ -1,7 +1,7 @@
 // -*- C++-*-
 /* lyx-filetool.h : tools functions for file/path handling
    this file is part of LyX, the High Level Word Processor
-   Copyright 1995-1999, Matthias Ettrich and the LyX Team
+   Copyright 1995-2000, Matthias Ettrich and the LyX Team
 */
 
 #ifndef LYX_FILETOOL_H

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index 6ac6cbb2931d134151e8990b6487e66c445c3f7c..efc8df4165953f2767c41a304fd70f3031589673 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -2,11 +2,7 @@
 
 #include <algorithm>
 
-#ifdef __GLIBCPP__
-#include <ctype.h>
-#else
 #include <cctype>
-#endif
 #include <cstdlib>
 
 #include "LString.h"
@@ -15,9 +11,12 @@
 
 using std::count;
 using std::transform;
+#ifndef __GLIBCPP__
+// The new glibstdc++-v3 has not worked out all the quirks regarding cctype
+// yet. So currently it failes if the to using lines below are stated.
 using std::tolower;
 using std::toupper;
-
+#endif
        
 int compare_no_case(string const & s, string const & s2)
 {

diff --git a/src/support/lyxstring.C b/src/support/lyxstring.C
index 3f8deedfb55a18595f9b722aced6ae17ab750b37..606e689304baf35e3e50f1fcd10a990edd6352d2 100644 (file)
--- a/src/support/lyxstring.C
+++ b/src/support/lyxstring.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/support/lyxstring.h b/src/support/lyxstring.h
index 4d3339e95edc7b4795e3af400705e3298fdaa09d..1e2572f20361768ebbbe1737ed27a9fcef0ba2da 100644 (file)
--- a/src/support/lyxstring.h
+++ b/src/support/lyxstring.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/text.C b/src/text.C
index e8cc5e4dd0c7c56d51db3a4f9dda6a3e5dd345c8..4ffba1da89e803c8dcca1fcb7f0b2124649c8146 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -1647,7 +1647,7 @@ void LyXText::BreakParagraph(char keep_layout)
    if (cursor.par->table) {
        int cell = NumberOfCell(cursor.par, cursor.pos);
        if (cursor.par->table->ShouldBeVeryLastCell(cell))
-           SetCursor(cursor.par, cursor.par->text.size());
+           SetCursor(cursor.par, cursor.par->size());
    }
    /* table stuff -- end */
    
@@ -1750,7 +1750,7 @@ void LyXText::OpenFootnote()
        cursor.par->ParFromPos(cursor.pos) != par; cursor.pos++);
    /* now the cursor is at the beginning of the physical par */
    SetCursor(cursor.par,
-            cursor.pos + cursor.par->ParFromPos(cursor.pos)->text.size());
+            cursor.pos + cursor.par->ParFromPos(cursor.pos)->size());
    
    /* the cursor must be exactly before the footnote */ 
    par = cursor.par->ParFromPos(cursor.pos);
@@ -2086,7 +2086,7 @@ void LyXText::TableFeatures(int feature) const
           // dummy-paragraph !! 
           // not necessar anymore with UNDO :)
           for (LyXParagraph::size_type i = 
-                      cursor.par->text.size() - 1; i >= 0; --i)
+                      cursor.par->size() - 1; i >= 0; --i)
              cursor.par->Erase(i);
           RedoParagraph();
           return;
@@ -3225,7 +3225,8 @@ void LyXText::ChangeWordCase(LyXText::TextCase action)
        LyXParagraph::size_type tmppos = 
                cursor.par->PositionInParFromPos(cursor.pos);
        while (tmppos < tmppar->size()) {
-               unsigned char c = tmppar->text[tmppos];
+               //unsigned char c = tmppar->text[tmppos];
+               unsigned char c = tmppar->GetChar(tmppos);
                if (IsKommaChar(c) || IsLineSeparatorChar(c))
                        break;
                if (c != LyXParagraph::META_INSET) {
@@ -3243,7 +3244,8 @@ void LyXText::ChangeWordCase(LyXText::TextCase action)
                        }
                }
                
-               tmppar->text[tmppos] = c;
+               //tmppar->text[tmppos] = c;
+               tmppar->SetChar(tmppos, c);
                ++tmppos;
        }
        CheckParagraph(tmppar, tmppos);

diff --git a/src/text2.C b/src/text2.C
index 1aaf90d43ecdddc990cd275766646b8ee4d22727..317038b85828c71d9dd06d469dc199db1a01e174 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -390,7 +390,7 @@ void LyXText::CloseFootnote()
                // now the cursor is at the beginning of the physical par
                SetCursor(cursor.par,
                          cursor.pos +
-                         cursor.par->ParFromPos(cursor.pos)->text.size());
+                         cursor.par->ParFromPos(cursor.pos)->size());
        } else  {
                /* we are in a footnote, so let us move at the beginning */ 
                /* this is just faster than using just CursorLeft() */ 
@@ -1128,7 +1128,7 @@ void LyXText::MeltFootnoteEnvironment()
        tmppar = firsttmppar;
        /* tmppar is now the paragraph right before the footnote */
 
-       char first_footnote_par_is_not_empty = tmppar->next->text.size();
+       bool first_footnote_par_is_not_empty = tmppar->next->size();
    
        while (tmppar->next
               && tmppar->next->footnoteflag == LyXParagraph::OPEN_FOOTNOTE) {
@@ -1172,8 +1172,8 @@ void LyXText::MeltFootnoteEnvironment()
         * (only if the previous par and the footnotepar are not empty!) */
        if ((!firsttmppar->next->GetLayout() && !firsttmppar->next->table)
            || firsttmppar->HasSameLayout(firsttmppar->next)) {
-               if (firsttmppar->text.size()
-                   && !firsttmppar->IsSeparator(firsttmppar->text.size() - 1)
+               if (firsttmppar->size()
+                   && !firsttmppar->IsSeparator(firsttmppar->size() - 1)
                    && first_footnote_par_is_not_empty) {
                        firsttmppar->next->InsertChar(0, ' ');
                }
@@ -2236,7 +2236,7 @@ void LyXText::CopySelection()
      
                tmpi2 = sel_end_cursor.par->PositionInParFromPos(sel_end_cursor.pos);
                while (tmppar2->size() > tmpi2) {
-                       tmppar2->Erase(tmppar2->text.size() - 1);
+                       tmppar2->Erase(tmppar2->size() - 1);
                }
        }
 }
@@ -2301,7 +2301,7 @@ void LyXText::PasteSelection()
                /* table stuff -- begin */
                bool table_too_small = false;
                if (tmpcursor.par->table) {
-                       while (simple_cut_buffer->text.size()
+                       while (simple_cut_buffer->size()
                               && !table_too_small) {
                                if (simple_cut_buffer->IsNewline(0)){
                                        while(tmpcursor.pos < tmpcursor.par->Last() && !tmpcursor.par->IsNewline(tmpcursor.pos))
@@ -2341,7 +2341,7 @@ void LyXText::PasteSelection()
                        // of the text to insert and we are inserting at
                        // the beginning of the paragraph the space should
                        // be removed.
-                       while (simple_cut_buffer->text.size()) {
+                       while (simple_cut_buffer->size()) {
 #ifdef FIX_DOUBLE_SPACE
                                // This is an attempt to fix the
                                // "never insert a space at the
@@ -2622,20 +2622,9 @@ bool LyXText::SearchBackward(char const * string) const
 }
 
 
-void LyXText::InsertStringA(LyXParagraph::TextContainer const & text)
-{
-       char * str = new char[text.size() + 1];
-       copy(text.begin(), text.end(), str);
-       str[text.size()] = '\0';
-       InsertStringA(str);
-       delete [] str;
-}
-
-
 // needed to insert the selection
-void LyXText::InsertStringA(char const * s)
+void LyXText::InsertStringA(string const & str)
 {
-       string str(s);
        LyXParagraph * par = cursor.par;
        LyXParagraph::size_type pos = cursor.pos;
        LyXParagraph::size_type a = 0;
@@ -2695,7 +2684,7 @@ void LyXText::InsertStringA(char const * s)
 #endif
                                }
                                pos = a;
-                       } else if (str[i]!= 13 && 
+                       } else if (str[i] != 13 && 
                                   // Ignore unprintables
                                   (str[i] & 127) >= ' ') {
                                par->InsertChar(pos, str[i]);
@@ -2725,7 +2714,7 @@ void LyXText::InsertStringA(char const * s)
                                         // no more fields to fill skip the rest
                                         break;
                         } else {
-                                if (!par->text.size()) {
+                                if (!par->size()) { // par is empty
 #if 1
                                        InsetSpecialChar * new_inset =
                                                new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
@@ -2752,21 +2741,11 @@ void LyXText::InsertStringA(char const * s)
 }
 
 
-void LyXText::InsertStringB(LyXParagraph::TextContainer const & text)
-{
-       char * str = new char[text.size() + 1];
-       copy(text.begin(), text.end(), str);
-       str[text.size()] = '\0';
-       InsertStringB(str);
-       delete [] str;
-}
-
-
 /* turns double-CR to single CR, others where converted into one blank and 13s 
  * that are ignored .Double spaces are also converted into one. Spaces at
  * the beginning of a paragraph are forbidden. tabs are converted into one
  * space. then InsertStringA is called */ 
-void LyXText::InsertStringB(char const * s)
+void LyXText::InsertStringB(string const & s)
 {
        string str(s);
        LyXParagraph * par = cursor.par;
@@ -2794,7 +2773,7 @@ void LyXText::InsertStringB(char const * s)
                }
                ++i;
        }
-       InsertStringA(str.c_str());
+       InsertStringA(str);
 }
 
 
@@ -3027,12 +3006,12 @@ void LyXText::SetCursorIntern(LyXParagraph * par,
                        par = par->previous ;
                        if (par->IsDummy() &&
                            par->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
-                               pos += par->text.size() + 1;
+                               pos += par->size() + 1;
                }
                if (par->previous) {
                        par = par->previous;
                }
-               pos += par->text.size() + 1;
+               pos += par->size() + 1;
        }
 
        cursor.par = par;
@@ -3525,8 +3504,6 @@ bool LyXText::TextHandleUndo(Undo * undo)
                        GetParFromID(undo->number_of_behind_par); 
                LyXParagraph * tmppar;
                LyXParagraph * tmppar2;
-               LyXParagraph * tmppar3;
-               LyXParagraph * tmppar4;
                LyXParagraph * endpar;
                LyXParagraph * tmppar5;
     
@@ -3537,9 +3514,9 @@ bool LyXText::TextHandleUndo(Undo * undo)
 
                // replace the paragraphs with the undo informations
 
-               tmppar3 = undo->par;
+               LyXParagraph * tmppar3 = undo->par;
                undo->par = 0; // otherwise the undo destructor would delete the paragraph
-               tmppar4 = tmppar3;
+               LyXParagraph * tmppar4 = tmppar3;
                if (tmppar4){
                        while (tmppar4->next)
                                tmppar4 = tmppar4->next;
@@ -3557,9 +3534,11 @@ bool LyXText::TextHandleUndo(Undo * undo)
                                tmppar5 = tmppar5->next;
                                // a memory optimization for edit: Only layout information
                                // is stored in the undo. So restore the text informations.
-                               if (undo->kind == Undo::EDIT){
-                                       tmppar2->text = tmppar->text;
-                                       tmppar->text.clear();
+                               if (undo->kind == Undo::EDIT) {
+                                       tmppar2->setContentsFromPar(tmppar);
+                                       tmppar->clearContents();
+                                       //tmppar2->text = tmppar->text;
+                                       //tmppar->text.clear();
                                        tmppar2 = tmppar2->next;
                                }
                                if ( currentrow && currentrow->par == tmppar )
@@ -3592,7 +3571,7 @@ bool LyXText::TextHandleUndo(Undo * undo)
     
     
                // Set the cursor for redoing
-               if (before){
+               if (before) {
                        SetCursorIntern(before->FirstSelfrowPar(), 0);
                        // check wether before points to a closed float and open it if necessary
                        if (before && before->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE
@@ -3736,7 +3715,8 @@ Undo * LyXText::CreateUndo(Undo::undo_kind kind, LyXParagraph const * before,
                // a memory optimization: Just store the layout information
                // when only edit
                if (kind == Undo::EDIT){
-                       tmppar2->text.clear();
+                       //tmppar2->text.clear();
+                       tmppar2->clearContents();
                }
 
                undopar = tmppar2;
@@ -3748,7 +3728,8 @@ Undo * LyXText::CreateUndo(Undo::undo_kind kind, LyXParagraph const * before,
                        // a memory optimization: Just store the layout
                        // information when only edit
                        if (kind == Undo::EDIT){
-                               tmppar2->next->text.clear();
+                               //tmppar2->next->text.clear();
+                               tmppar2->clearContents();
                        }
                        tmppar2->next->previous = tmppar2;
                        tmppar2 = tmppar2->next;

diff --git a/src/toolbar.C b/src/toolbar.C
index 41a4b5d0f6c27a7246148ebdef47ae454e299e65..a3889ecf53936670c9c700c3198d2bc4b3742495 100644 (file)
--- a/src/toolbar.C
+++ b/src/toolbar.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  *           This file is Copyright 1996-1998
  *           Lars Gullik Bjønnes

diff --git a/src/undo.C b/src/undo.C
index 22b318117661d8bf2891ab120a8bd907302daa4f..b177deb8d444a9c9a5b9aab94b9c673d3ae9080a 100644 (file)
--- a/src/undo.C
+++ b/src/undo.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 

diff --git a/src/undo.h b/src/undo.h
index d7361477aae42e338c8feb24a7aed90b3665dbca..83cd0db60d570bd18b0aab40dc78c4d07ba01a98 100644 (file)
--- a/src/undo.h
+++ b/src/undo.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */