SF.net SVN: geany: [949] trunk

[eht16 at users.sourceforge.net]

Revision: 949
          http://svn.sourceforge.net/geany/?rev=949&view=rev
Author:   eht16
Date:     2006-10-30 15:00:26 -0800 (Mon, 30 Oct 2006)

Log Message:
-----------
Removed "begin" section in symbol list and sort it at environment.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/treeviews.c
    trunk/tagmanager/latex.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-10-30 12:58:58 UTC (rev 948)
+++ trunk/ChangeLog	2006-10-30 23:00:26 UTC (rev 949)
@@ -1,6 +1,8 @@
 2006-10-30  Enrico Tröger  <enrico.troeger at uvena.de>
 
  * src/sci_cb.c: Add extra indentation for Python after a colon.
+ * tagmanager/latex.c, src/treeviews.c:
+   Removed "begin" section in symbol list and sort it at environment.
 
 
 2006-10-29  Enrico Tröger  <enrico.troeger at uvena.de>
@@ -330,7 +332,7 @@
    Implemented simple "shebang" detection. It is used prior to the
    filename extension detection.
  * src/highlighting.c, data/filetypes.latex:
-   Changed foreground colour for LaTeX sytle "math" to differentiate it
+   Changed foreground colour for LaTeX style "math" to differentiate it
    from the "comment" style.
 
 

Modified: trunk/src/treeviews.c
===================================================================
--- trunk/src/treeviews.c	2006-10-30 12:58:58 UTC (rev 948)
+++ trunk/src/treeviews.c	2006-10-30 23:00:26 UTC (rev 949)
@@ -141,8 +141,8 @@
 			gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_variable), 0, _("Subsubsection"), -1);
 			gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_struct), NULL);
 			gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_struct), 0, _("Label"), -1);
-			gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_namespace), NULL);
-			gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_namespace), 0, _("Begin"), -1);
+			//gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_namespace), NULL);
+			//gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_namespace), 0, _("Begin"), -1);
 			gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_other), NULL);
 			gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_other), 0, _("Other"), -1);
 			break;

Modified: trunk/tagmanager/latex.c
===================================================================
--- trunk/tagmanager/latex.c	2006-10-30 12:58:58 UTC (rev 948)
+++ trunk/tagmanager/latex.c	2006-10-30 23:00:26 UTC (rev 949)
@@ -32,7 +32,6 @@
      K_SECTION,
      K_SUBSECTION,
      K_SUBSUBSECTION,
-     K_BEGIN,
      K_LABEL
 } TeXKind;
 
@@ -42,7 +41,6 @@
      { TRUE, 'm', "member",        "labels, sections and bibliography" },
      { TRUE, 'd', "macro",         "subsections" },
      { TRUE, 'v', "variable",      "subsubsections" },
-     { TRUE, 'n', "namespace",     "begin" },
      { TRUE, 's', "struct",        "labels and bibliography" }
 };
 
@@ -143,7 +141,7 @@
  		}
 
  		/* \DeclareMathOperator{\command} */
- 		if (getWord("DeclareMathOperator", &cp))
+ 		else if (getWord("DeclareMathOperator", &cp))
  		{
  		    if (*cp == '*')
  			cp++;
@@ -152,15 +150,16 @@
  		}
 
  		/* \def\command */
- 		if (getWord("def", &cp))
+ 		else if (getWord("def", &cp))
  		{
  		    createTag(TEX_BSLASH, K_COMMAND, cp);
  		    continue;
  		}
 
  		/* \newenvironment{name} */
- 		if ( getWord("newenvironment", &cp)
+ 		else if ( getWord("newenvironment", &cp)
  		    || getWord("newtheorem", &cp)
+ 		    || getWord("begin", &cp)
  		    )
  		{
  		    createTag(TEX_BRACES, K_ENVIRONMENT, cp);
@@ -168,7 +167,7 @@
  		}
 
  		/* \bibitem[label]{key} */
- 		if (getWord("bibitem", &cp))
+ 		else if (getWord("bibitem", &cp))
  		{
  		    while (*cp == ' ')
  			cp++;
@@ -183,35 +182,29 @@
  		}
 
  		/* \label{key} */
- 		if (getWord("label", &cp))
+ 		else if (getWord("label", &cp))
  		{
  		    createTag(TEX_LABEL, K_LABEL, cp);
  		    continue;
  		}
  		/* \section{key} */
- 		if (getWord("section", &cp))
+ 		else if (getWord("section", &cp))
  		{
  		    createTag(TEX_LABEL, K_SECTION, cp);
  		    continue;
  		}
  		/* \subsection{key} */
- 		if (getWord("subsection", &cp))
+ 		else if (getWord("subsection", &cp))
  		{
  		    createTag(TEX_LABEL, K_SUBSECTION, cp);
  		    continue;
  		}
  		/* \subsubsection{key} */
- 		if (getWord("subsubsection", &cp))
+ 		else if (getWord("subsubsection", &cp))
  		{
  		    createTag(TEX_LABEL, K_SUBSUBSECTION, cp);
  		    continue;
  		}
- 		/* \begin{key} */
- 		if (getWord("begin", &cp))
- 		{
- 		    createTag(TEX_LABEL, K_BEGIN, cp);
- 		    continue;
- 		}
  	    }
  	}
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.