@@ -20,7 +20,7 @@ deps.append ({'lib': 'libglade-2.0', 'ver': '2.5.0'}) deps.append ({'lib': 'libgnomeui-2.0', 'ver': '2.12.0'}) deps.append ({'lib': 'libxml-2.0', 'ver': '2.6.0'}) deps.append ({'lib': 'libgnomecanvas-2.0', 'ver': '2.12.0'}) -deps.append ({'lib': 'gtksourceview-1.0', 'ver': '1.0'}) +deps.append ({'lib': 'gtksourceview-2.0', 'ver': '2.0'}) deps.append ({'lib': 'cairo', 'ver': '1.2.0'}) # CUSTOM CHECK FUNC # SConstruct @@ -1,5 +1,12 @@ +import os Import ('CEnv') +resources = Split (""" + netlist.lang + """) + +CEnv.Alias('install', CEnv.Install (os.path.join (CEnv['INSTALL_DIR'], 'share/oregano/language-specs'), resources)) + SConscript ('libraries/SConscript'); SConscript ('dialogs/SConscript') SConscript ('models/SConscript') data/SConscript @@ -1,54 +1,72 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE language SYSTEM "language.dtd"> -<language _name="Netlist" version="1.0" _section="Markup" mimetypes="text/xml"> - <block-comment _name="Block Comment" style="Comment"> - <start-regex>^\*</start-regex> - <end-regex>\n</end-regex> - </block-comment> - - <pattern-item _name = "Decimal" style = "Decimal"> - <regex>\b([1-9][0-9]*|0)([Uu]([Ll]|LL|ll)?|([Ll]|LL|ll)[Uu]?)?\b</regex> - </pattern-item> - - <pattern-item _name = "Floating Point Number" style = "Floating Point"> - <regex>\b([0-9]+[Ee][-]?[0-9]+|([0-9]*\.[0-9]+|[0-9]+\.)([Ee][-]?[0-9]+)?)[fFlL]?</regex> - </pattern-item> +<language id="netlist" _name="Netlist" version="2.0" _section="Markup"> + <metadata> + <property name="mimetypes">application/x-oregano</property> + <property name="globs">*.netlist</property> + </metadata> - <keyword-list _name = "Keywords" style = "Keyword" case-sensitive="TRUE"> - <keyword>print</keyword> - <keyword>tran</keyword> - <keyword>op</keyword> - <keyword>dc</keyword> - <keyword>options</keyword> - <keyword>end</keyword> - <keyword>ac</keyword> - <keyword>fourier</keyword> - </keyword-list> + <styles> + <style id="comment" _name="Comment" map-to="def:comment"/> + <style id="floating-point" _name="Floating Point" map-to="def:floating-point"/> + <style id="decimal" _name="Decimal" map-to="def:decimal"/> + <style id="preprocessor" _name="Preprocessor" map-to="def:identifier"/> + <style id="keyword" _name="Keyword" map-to="def:keyword"/> + <style id="values" _name="Values" map-to="def:special-char"/> + </styles> - <pattern-item _name="Entity" style="Preprocessor"> - <regex>(v|i)(\(.\))</regex> - </pattern-item> - - <keyword-list _name = "Common Macro" style = "Preprocessor" case-sensitive="TRUE"> - <keyword>UIC</keyword> - <keyword>OUT</keyword> - <keyword>TEMP</keyword> - <keyword>GMIN</keyword> - <keyword>ABSTOL</keyword> - <keyword>CHGTOL</keyword> - <keyword>RELTOL</keyword> - <keyword>VNTOL</keyword> - <keyword>ITL1</keyword> - <keyword>ITL2</keyword> - <keyword>ITL4</keyword> - <keyword>PIVREL</keyword> - <keyword>PIVTOL</keyword> - <keyword>TNOM</keyword> - <keyword>TRTOL</keyword> - <keyword>DEFAD</keyword> - <keyword>DEFAS</keyword> - <keyword>DEFL</keyword> - <keyword>DEFW</keyword> - </keyword-list> + <definitions> + <context id="block-comment" style-ref="comment" end-at-line-end="true"> + <start>\*</start> + </context> + <context id="decimal" style-ref="decimal"> + <match>\b([1-9][0-9]*|0)([Uu]([Ll]|LL|ll)?|([Ll]|LL|ll)[Uu]?)?\b</match> + </context> + <context id="floating-point-number" style-ref="floating-point"> + <match>\b([0-9]+[Ee][-]?[0-9]+|([0-9]*\.[0-9]+|[0-9]+\.)([Ee][-]?[0-9]+)?)[fFlL]?</match> + </context> + <context id="keywords" style-ref="keyword"> + <keyword>print</keyword> + <keyword>tran</keyword> + <keyword>op</keyword> + <keyword>dc</keyword> + <keyword>options</keyword> + <keyword>end</keyword> + <keyword>ac</keyword> + <keyword>fourier</keyword> + </context> + <context id="entity" style-ref="values"> + <match>(v|i)(\(.*\))</match> + </context> + <context id="common-macro" style-ref="preprocessor"> + <keyword>UIC</keyword> + <keyword>OUT</keyword> + <keyword>TEMP</keyword> + <keyword>GMIN</keyword> + <keyword>ABSTOL</keyword> + <keyword>CHGTOL</keyword> + <keyword>RELTOL</keyword> + <keyword>VNTOL</keyword> + <keyword>ITL1</keyword> + <keyword>ITL2</keyword> + <keyword>ITL4</keyword> + <keyword>PIVREL</keyword> + <keyword>PIVTOL</keyword> + <keyword>TNOM</keyword> + <keyword>TRTOL</keyword> + <keyword>DEFAD</keyword> + <keyword>DEFAS</keyword> + <keyword>DEFL</keyword> + <keyword>DEFW</keyword> + </context> + <context id="netlist"> + <include> + <context ref="block-comment"/> + <context ref="decimal"/> + <context ref="floating-point-number"/> + <context ref="keywords"/> + <context ref="entity"/> + <context ref="common-macro"/> + </include> + </context> + </definitions> </language> - data/netlist.lang @@ -7,6 +7,7 @@ LocaleDir = '-DGNOMELOCALEDIR=\\""'+SrcEnv['DATADIR']+'/locale"\\"' OreganoGladeDir = '-DOREGANO_GLADEDIR=\\""'+SrcEnv['OREGANODIR']+'/dialogs"\\"' OreganoLibraryDir = '-DOREGANO_LIBRARYDIR=\\""'+SrcEnv['OREGANODIR']+'/libraries"\\"' OreganoModelDir = '-DOREGANO_MODELDIR=\\""'+SrcEnv['OREGANODIR']+'/models"\\"' +OreganoLangDir = '-DOREGANO_LANGDIR=\\""'+SrcEnv['OREGANODIR']+'"/language-specs\\"' VersionFlag = '-DVERSION=\\"'+SrcEnv['VERSION']+'\\"' DataDir = '-DDATADIR=\\"'+SrcEnv['DATADIR']+'\\"' Package = '-DPACKAGE=\\"oregano\\"' @@ -22,7 +23,8 @@ SrcEnv.Append (CCFLAGS = [ LocaleDir, OreganoGladeDir, OreganoLibraryDir, - OreganoModelDir + OreganoModelDir, + OreganoLangDir ]) Export ('SrcEnv') src/SConscript @@ -33,7 +33,7 @@ #include <stdio.h> #include <stdlib.h> #include <gnome.h> -#include <gtksourceview/gtksourceprintjob.h> +#include <gtksourceview/gtksourceprintcompositor.h> static void netlist_editor_finalize (GObject *object); static void netlist_editor_dispose (GObject *object); @@ -47,7 +47,7 @@ struct _NetlistEditorPriv { SchematicView *sv; gchar * font; GdkColor bgcolor, selectcolor, textcolor; - GtkSourceLanguagesManager *lm; + GtkSourceLanguageManager *lm; GtkTextView *view; GtkSourceBuffer *buffer; GtkWindow *toplevel; @@ -283,12 +283,13 @@ netlist_editor_save (GtkWidget * widget, NetlistEditor * nle) NetlistEditor * netlist_editor_new (GtkSourceBuffer * textbuffer) { + gchar* lang_files[3]; NetlistEditor * nle; GladeXML * gui; GtkWidget * toplevel; GtkScrolledWindow * scroll; GtkSourceView * source_view; - GtkSourceLanguagesManager * lm; + GtkSourceLanguageManager * lm; GtkButton * save, * sim, * close, * print; GtkSourceLanguage *lang=NULL; const GSList *list; @@ -319,24 +320,26 @@ netlist_editor_new (GtkSourceBuffer * textbuffer) { scroll = GTK_SCROLLED_WINDOW (glade_xml_get_widget (gui, "netlist-scrolled-window")); source_view = GTK_SOURCE_VIEW (gtk_source_view_new ()); - lm = GTK_SOURCE_LANGUAGES_MANAGER (gtk_source_languages_manager_new ()); + lm = GTK_SOURCE_LANGUAGE_MANAGER (gtk_source_language_manager_new ()); + + lang_files[0] = OREGANO_LANGDIR; + /* FIXME : This is needed because RealxNG files are required. */ + lang_files[1] = "/usr/share/gtksourceview-2.0/language-specs/"; + lang_files[2] = NULL; + + gtk_source_language_manager_set_search_path (lm, lang_files); - g_object_set_data_full (G_OBJECT (source_view), "languages-manager", + g_object_set_data_full (G_OBJECT (source_view), "language-manager", lm, (GDestroyNotify) g_object_unref); - list = gtk_source_languages_manager_get_available_languages (lm); - while (list) { - GtkSourceLanguage *l = (GtkSourceLanguage *)list->data; - if (!g_strcasecmp(gtk_source_language_get_name (l), "netlist")) { - lang = l; - break; - } - list = list->next; - } + lang = gtk_source_language_manager_get_language (lm, "netlist"); if (lang) { gtk_source_buffer_set_language (GTK_SOURCE_BUFFER (textbuffer), lang); - gtk_source_buffer_set_highlight (GTK_SOURCE_BUFFER (textbuffer), TRUE); + gtk_source_buffer_set_highlight_syntax (GTK_SOURCE_BUFFER (textbuffer), TRUE); + gtk_source_buffer_set_highlight_matching_brackets (GTK_SOURCE_BUFFER (textbuffer), TRUE); + } else { + g_warning ("Can't load netlist.lang in %s", OREGANO_LANGDIR "/netlist.lang"); } gtk_text_view_set_editable (GTK_TEXT_VIEW (source_view), TRUE); src/netlist-editor.c @@ -31,7 +31,7 @@ #include <gconf/gconf-client.h> #include <gtk/gtk.h> #include <gtksourceview/gtksourceview.h> -#include <gtksourceview/gtksourcelanguagesmanager.h> +#include <gtksourceview/gtksourcelanguagemanager.h> #include "schematic-view.h" #include "errors.h" #include "engine.h" src/netlist-editor.h 3bca995f1e63e11bc3e35b816361e03c4d647f6d Ricardo Markiewicz gazer.arg@gmail.com http://github.com/Gazer/oregano/commit/92e871ff5ec30281d950255fbe467a15506a27ff 92e871ff5ec30281d950255fbe467a15506a27ff 2009-06-16T09:45:27-07:00 2009-06-16T09:45:27-07:00 Upgrade GtkSourceView to version 2.0 Closes #1332. e93803e322004e251fccde532e0003c85687354c Ricardo Markiewicz gazer.arg@gmail.com