more white spacei changes

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 2b8510668f31c3768a5985e902974f8b7b4239d3..2b24839fdf66e9ba1333835122c20aacfa282f81 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,7 @@
 
        * text.C:
        *       sp_pspell.h:
+       * textclasslist.[Ch]:
        * sp_ispell.h: whitespace change
 
 2002-05-29  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>

diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index 6050c266cba0e2ed98b5a98b7bba41c8178feb0c..ea21f14b0ef57a43ef11bcd0394baa2b624eda51 100644 (file)
--- a/src/lyxtextclasslist.C
+++ b/src/lyxtextclasslist.C
@@ -129,22 +129,17 @@ bool LyXTextClassList::Read ()
                        lyxerr[Debug::TCLASS] << "Fname: " << fname << endl;
                        if (lex.next()) {
                                string const clname = lex.getString();
-                               lyxerr[Debug::TCLASS]
-                                       << "Clname: " << clname << endl;
+                               lyxerr[Debug::TCLASS] << "Clname: " << clname << endl;
                                if (lex.next()) {
-                                             string const desc = lex.getString();
-                                             lyxerr[Debug::TCLASS]
-                                                     << "Desc: " << desc << endl;
-                                             // This code is run when we have
-                                             // fname, clname and desc
-                                             LyXTextClass tmpl(fname,
-                                                               clname,
-                                                               desc);
-                                             if (lyxerr.
-                                                 debugging(Debug::TCLASS)) {
-                                                     tmpl.load();
-                                             }
-                                             Add (tmpl);
+                                       string const desc = lex.getString();
+                                       lyxerr[Debug::TCLASS] << "Desc: " << desc << endl;
+                                       // This code is run when we have
+                                       // fname, clname and desc
+                                       LyXTextClass tmpl(fname, clname, desc);
+                                       if (lyxerr.debugging(Debug::TCLASS)) {
+                                               tmpl.load();
+                                       }
+                                       Add(tmpl);
                                }
                        }
                }

diff --git a/src/lyxtextclasslist.h b/src/lyxtextclasslist.h
index a84a05aac5f609948af3fcd07cd185824559d68a..a5aa7cedb98ffd7b768aeb8691a40afbf13d936a 100644 (file)
--- a/src/lyxtextclasslist.h
+++ b/src/lyxtextclasslist.h
@@ -42,18 +42,14 @@ public:
        ///
        const_iterator end() const { return classlist.end(); }
 
-       /** Gets textclass number from name.
-           Returns -1 if textclass name does not exist
-       */
+       /// Gets textclass number from name, -1 if textclass name does not exist
        std::pair<bool, lyx::textclass_type> const
        NumberOfClass(string const & textclass) const;
 
        ///
        LyXTextClass const & operator[](lyx::textclass_type textclass) const;
 
-       /** Read textclass list.
-           Returns false if this fails
-       */
+       /// Read textclass list.  Returns false if this fails.
        bool Read();
 private:
        ///

diff --git a/src/text.C b/src/text.C
index 3a655e5b049c99d74899f9f5859e0fec0b6bfb13..8dd52d55178f50e9008f3d9fb77408cccae4d1d6 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -317,8 +317,7 @@ void LyXText::computeBidiTables(Buffer const * buf, Row * row) const
        bool rtl0 = false;
        pos_type const main_body = beginningOfMainBody(buf, row->par());
 
-       for (pos_type lpos = bidi_start;
-            lpos <= bidi_end; ++lpos) {
+       for (pos_type lpos = bidi_start; lpos <= bidi_end; ++lpos) {
                bool is_space = row->par()->isLineSeparator(lpos);
                pos_type const pos =
                        (is_space && lpos + 1 <= bidi_end &&
@@ -434,6 +433,7 @@ bool LyXText::isBoundary(Buffer const * buf, Paragraph * par,
        return rtl != rtl2;
 }
 
+
 void LyXText::drawNewline(DrawRowParams & p, pos_type const pos)
 {
        // Draw end-of-line marker

diff --git a/src/text2.C b/src/text2.C
index f51d91178dbb0561bb29a5aeb20eed521fec40e6..a17aa8ed45c7e6190e36bd5d0249784bfbfc877b 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -915,9 +915,9 @@ void LyXText::fullRebreak(BufferView * bview)
 // important for the screen
 
 
-/* the cursor set functions have a special mechanism. When they
- * realize, that you left an empty paragraph, they will delete it.
- * They also delete the corresponding row */
+// the cursor set functions have a special mechanism. When they
+// realize, that you left an empty paragraph, they will delete it.
+// They also delete the corresponding row 
 
 // need the selection cursor:
 void LyXText::setSelection(BufferView * bview)
@@ -1147,11 +1147,11 @@ pos_type LyXText::beginningOfMainBody(Buffer const * buf,
 }
 
 
-/* the DTP switches for paragraphs. LyX will store them in the
-* first physicla paragraph. When a paragraph is broken, the top settings
-* rest, the bottom settings are given to the new one. So I can make shure,
-* they do not duplicate themself and you cannnot make dirty things with
-* them!  */
+// the DTP switches for paragraphs. LyX will store them in the first
+// physicla paragraph. When a paragraph is broken, the top settings rest,
+// the bottom settings are given to the new one. So I can make shure,
+// they do not duplicate themself and you cannnot make dirty things with
+// them!
 
 void LyXText::setParagraph(BufferView * bview,
                           bool line_top, bool line_bottom,
@@ -1339,9 +1339,7 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const
                par->enumdepth = par->depthHook(par->getDepth())->enumdepth;
                par->setCounter(6 + par->enumdepth,
                                par->depthHook(par->getDepth())->getCounter(6 + par->enumdepth));
-               /* reset the counters.
-                * A depth change is like a breaking layout
-                */
+               // reset the counters.A depth change is like a breaking layout
                for (int i = 6 + par->enumdepth + 1; i < 10; ++i)
                        par->setCounter(i, 0);
        }