jedit-cvs

[ jEdit-commits ] SF.net SVN: jedit:[25765] jEdit/trunk

[<ker...@us...>]

Revision: 25765
          http://sourceforge.net/p/jedit/svn/25765
Author:   kerik-sf
Date:     2024-10-23 17:27:36 +0000 (Wed, 23 Oct 2024)
Log Message:
-----------
fix Run_Script macro on beanshell under windows (#641)

See https://sourceforge.net/p/jedit/patches/641/

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/macros/Misc/Run_Script.bsh

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2024-10-23 17:18:36 UTC (rev 25764)
+++ jEdit/trunk/doc/CHANGES.txt	2024-10-23 17:27:36 UTC (rev 25765)
@@ -13,6 +13,7 @@
 - fixes for GenericGUIUtilities in macros (patch #636, #637, #638, Robert
   Schwenn)
 - fix for SyntaxUtilities in Color_Picker macro (patch #639, Robert Schwenn)
+- fix Run_Script macro beanshell under windows (patch #641, Robert Schwenn)
 
 }}}
 {{{ Miscellaneous

Modified: jEdit/trunk/macros/Misc/Run_Script.bsh
===================================================================
--- jEdit/trunk/macros/Misc/Run_Script.bsh	2024-10-23 17:18:36 UTC (rev 25764)
+++ jEdit/trunk/macros/Misc/Run_Script.bsh	2024-10-23 17:27:36 UTC (rev 25765)
@@ -48,13 +48,16 @@
 		buffer.saveAs(view, true);
 	else
 		buffer.save(view, buffer.getPath());
+
 	mode = buffer.getMode().getName();
 	path = buffer.getPath() ;
 	os = System.getProperty("os.name");
 	if(os.indexOf("Windows") != -1)
 		path = "\"" + path + "\"";
+
 	if(mode.equals("beanshell")) {
-		source(path);
+		// Double quotes (under Windows, see above) prevent this from execution
+		source(buffer.getPath());
 	}
 	else if(mode.equals("awk")) {
 		execScript("awk", "awk -f " + path);

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

[ jEdit-commits ] SF.net SVN: jedit:[25764] jEdit/trunk

[<ker...@us...>]

Revision: 25764
          http://sourceforge.net/p/jedit/svn/25764
Author:   kerik-sf
Date:     2024-10-23 17:18:36 +0000 (Wed, 23 Oct 2024)
Log Message:
-----------
fix for SyntaxUtilities in Color_Picker macro

See https://sourceforge.net/p/jedit/patches/639/

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/macros/Text/Color_Picker.bsh

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2024-10-23 17:18:24 UTC (rev 25763)
+++ jEdit/trunk/doc/CHANGES.txt	2024-10-23 17:18:36 UTC (rev 25764)
@@ -12,6 +12,7 @@
  brackets (Eric Le Lay)
 - fixes for GenericGUIUtilities in macros (patch #636, #637, #638, Robert
   Schwenn)
+- fix for SyntaxUtilities in Color_Picker macro (patch #639, Robert Schwenn)
 
 }}}
 {{{ Miscellaneous

Modified: jEdit/trunk/macros/Text/Color_Picker.bsh
===================================================================
--- jEdit/trunk/macros/Text/Color_Picker.bsh	2024-10-23 17:18:24 UTC (rev 25763)
+++ jEdit/trunk/macros/Text/Color_Picker.bsh	2024-10-23 17:18:36 UTC (rev 25764)
@@ -27,7 +27,7 @@
 // Process 
 selection = textArea.getSelectedText();
 if (selection != null)
-    color = GUIUtilities.parseColor(selection);
+    color = SyntaxUtilities.parseColor(selection);
 else
     color = null;
 

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

[ jEdit-commits ] SF.net SVN: jedit:[25763] jEdit/trunk

[<ker...@us...>]

Revision: 25763
          http://sourceforge.net/p/jedit/svn/25763
Author:   kerik-sf
Date:     2024-10-23 17:18:24 +0000 (Wed, 23 Oct 2024)
Log Message:
-----------
fixes for GenericGUIUtilities in macros

See
 - https://sourceforge.net/p/jedit/patches/636/
 - https://sourceforge.net/p/jedit/patches/637/
 - https://sourceforge.net/p/jedit/patches/638/

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/macros/Misc/Display_Abbreviations.bsh
    jEdit/trunk/macros/Misc/Display_Actions.bsh
    jEdit/trunk/macros/Properties/Insert_Buffer_Properties.bsh

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2024-10-21 19:37:36 UTC (rev 25762)
+++ jEdit/trunk/doc/CHANGES.txt	2024-10-23 17:18:24 UTC (rev 25763)
@@ -4,12 +4,14 @@
 
 {{{ Version 5.8pre1
 
-Thanks to Björn Kautler and Eric Le Lay for contributing to this release.
+Thanks to Robert Schwenn, Björn Kautler and Eric Le Lay for contributing to this release.
 
 {{{ Bug Fixes
 
 - allow '(re)' glob in edit mode to contain alternative without enclosing
  brackets (Eric Le Lay)
+- fixes for GenericGUIUtilities in macros (patch #636, #637, #638, Robert
+  Schwenn)
 
 }}}
 {{{ Miscellaneous

Modified: jEdit/trunk/macros/Misc/Display_Abbreviations.bsh
===================================================================
--- jEdit/trunk/macros/Misc/Display_Abbreviations.bsh	2024-10-21 19:37:36 UTC (rev 25762)
+++ jEdit/trunk/macros/Misc/Display_Abbreviations.bsh	2024-10-23 17:18:24 UTC (rev 25763)
@@ -153,7 +153,7 @@
 	columnNames.addElement(new String(AbbreviationLabel));
 	columnNames.addElement(new String(ExpansionLabel));
 	table = new JTable();
-	table.setRowHeight(GUIUtilities.defaultRowHeight());
+	table.setRowHeight(GenericGUIUtilities.defaultRowHeight());
 	table.setModel(new DefaultTableModel(data, columnNames));
 	table.setRowSelectionAllowed(true);
 	/* 	The next line prevents the table from being edited.

Modified: jEdit/trunk/macros/Misc/Display_Actions.bsh
===================================================================
--- jEdit/trunk/macros/Misc/Display_Actions.bsh	2024-10-21 19:37:36 UTC (rev 25762)
+++ jEdit/trunk/macros/Misc/Display_Actions.bsh	2024-10-23 17:18:24 UTC (rev 25763)
@@ -52,7 +52,7 @@
 			if(label == null)
 				label = NoLabelLabel;
 			else
-				label = GUIUtilities.prettifyMenuLabel(label);
+				label = GenericGUIUtilities.prettifyMenuLabel(label);
 			buf.append(name + " : " + label + "\n");
 		}
 		buf.append("}}}\n\n");

Modified: jEdit/trunk/macros/Properties/Insert_Buffer_Properties.bsh
===================================================================
--- jEdit/trunk/macros/Properties/Insert_Buffer_Properties.bsh	2024-10-21 19:37:36 UTC (rev 25762)
+++ jEdit/trunk/macros/Properties/Insert_Buffer_Properties.bsh	2024-10-23 17:18:24 UTC (rev 25763)
@@ -97,7 +97,7 @@
 	_entries.copyInto(entries);
 
 	checkBox = new JCheckBoxList(entries);
-	checkBox.setRowHeight(GUIUtilities.defaultRowHeight());
+	checkBox.setRowHeight(GenericGUIUtilities.defaultRowHeight());
 	checkBox.addKeyListener(this);
 	content.add(new JScrollPane(checkBox),
 		BorderLayout.CENTER);

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

[ jEdit-commits ] SF.net SVN: jedit:[25762] plugins/QDocSideKick/trunk/ src/sidekick/qdoc

[<dal...@us...>]

Revision: 25762
          http://sourceforge.net/p/jedit/svn/25762
Author:   daleanson
Date:     2024-10-21 19:37:36 +0000 (Mon, 21 Oct 2024)
Log Message:
-----------
add "missing" nodes to the tree so it is easy to find where they need to be inserted into the qdoc

Modified Paths:
--------------
    plugins/QDocSideKick/trunk/src/sidekick/qdoc/QdocNode.java
    plugins/QDocSideKick/trunk/src/sidekick/qdoc/QdocSideKickParser.java

Modified: plugins/QDocSideKick/trunk/src/sidekick/qdoc/QdocNode.java
===================================================================
--- plugins/QDocSideKick/trunk/src/sidekick/qdoc/QdocNode.java	2024-10-19 20:27:36 UTC (rev 25761)
+++ plugins/QDocSideKick/trunk/src/sidekick/qdoc/QdocNode.java	2024-10-21 19:37:36 UTC (rev 25762)
@@ -43,10 +43,6 @@
      */
     private int ordinal = 0;
 
-    private QdocNode parent = null;
-
-    private List<QdocNode> children = null;
-
     // ordinal definitions
     public static int TITLE = 0;
 
@@ -58,6 +54,10 @@
 
     public static int SECTION4 = 4;
 
+    private QdocNode parent = null;
+    
+    private List<QdocNode> children = null;
+    
 
     public QdocNode() {
         super("");
@@ -66,6 +66,11 @@
     public QdocNode(String name) {
         super(name);
     }
+    
+    public QdocNode(String name, int ordinal) {
+        super(name);
+        this.ordinal = ordinal;    
+    }
 
     public void setStartLocation(Location start) {
         startLocation = start;

Modified: plugins/QDocSideKick/trunk/src/sidekick/qdoc/QdocSideKickParser.java
===================================================================
--- plugins/QDocSideKick/trunk/src/sidekick/qdoc/QdocSideKickParser.java	2024-10-19 20:27:36 UTC (rev 25761)
+++ plugins/QDocSideKick/trunk/src/sidekick/qdoc/QdocSideKickParser.java	2024-10-21 19:37:36 UTC (rev 25762)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Dale Anson
+ * Copyright (c) 2024, Dale Anson
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -52,9 +52,8 @@
 
     public static boolean showAll = false;
 
-
     public QdocSideKickParser() {
-        super(NAME);
+        super( NAME );
     }
 
     /**
@@ -62,8 +61,8 @@
      * TODO: is this used anymore?
      */
     public void parse() {
-        if (currentView != null) {
-            parse(currentView.getBuffer(), null);
+        if ( currentView != null ) {
+            parse( currentView.getBuffer(), null );
         }
     }
 
@@ -75,103 +74,146 @@
      * section2's below that and so on. There is nothing in the specification that
      * requires this, so it is a huge assumption to think this will always be the case,
      * but that is what I'm assuming here. The sidekick tree could look really funky
-     * if the qdoc author doesn't follow this hierarchy.
+     * if the qdoc author doesn't follow this hierarchy. -> Exactly this has been
+     * reported by Alan, he suggests inserting empty nodes as needed, so, for example,
      *
+     *
      * @param buffer the buffer to parse
      * @param errorSource where to send any error messages
      * @return data for the tree
      */
-    public SideKickParsedData parse(Buffer buffer, DefaultErrorSource errorSource) {
+    public SideKickParsedData parse( Buffer buffer, DefaultErrorSource errorSource ) {
         String filename = buffer.getPath();
-        SideKickParsedData parsedData = new QdocSideKickParsedData(filename);
-        ImageIcon section1Icon = EclipseIconsPlugin.getIcon("action1.gif");
-        ImageIcon section2Icon = EclipseIconsPlugin.getIcon("action2.gif");
-        ImageIcon section3Icon = EclipseIconsPlugin.getIcon("action3.gif");
-        ImageIcon section4Icon = EclipseIconsPlugin.getIcon("activity.gif");
+        SideKickParsedData parsedData = new QdocSideKickParsedData( filename );
+        ImageIcon titleIcon = EclipseIconsPlugin.getIcon( "text.gif" );
+        ImageIcon section1Icon = EclipseIconsPlugin.getIcon( "action1.gif" );
+        ImageIcon section2Icon = EclipseIconsPlugin.getIcon( "action2.gif" );
+        ImageIcon section3Icon = EclipseIconsPlugin.getIcon( "action3.gif" );
+        ImageIcon section4Icon = EclipseIconsPlugin.getIcon( "activity.gif" );
+        ImageIcon missingIcon = EclipseIconsPlugin.getIcon( "delete.gif" );
         try {
-            if (buffer.getLength() <= 0) {
+            if ( buffer.getLength() <= 0 ) {
                 return parsedData;
             }
             int lineCount = buffer.getLineCount();
             // end of buffer location/position
-            Location eofLocation = new Location(lineCount - 1, buffer.getLineEndOffset(lineCount - 1));
-            SideKickPosition eofPosition = new SideKickPosition(buffer.getLineEndOffset(lineCount - 1));
-            List<QdocNode> nodes = new ArrayList<QdocNode>();
+            Location eofLocation = new Location( lineCount - 1, buffer.getLineEndOffset( lineCount - 1 ) );
+            SideKickPosition eofPosition = new SideKickPosition( buffer.getLineEndOffset( lineCount - 1 ) );
+            // gather the desired nodes here
+            ArrayList<QdocNode> nodes = new ArrayList<QdocNode>();
+            // node info
             Location startLocation;
             SideKickPosition startPosition;
             int length;
-            // there should only be one title node, but of course, the qdoc spec
-            // doesn't enforce that, and doesn't require that there is a title node.
-            // Alan says there can be multiple titles, they should immediately follow
-            // a \page
-            QdocNode titleNode = null;
 
-            // parse the buffer
-            for (int lineNumber = 0; lineNumber < lineCount; lineNumber++) {
-                String lineText = buffer.getLineText(lineNumber);
-                int index = lineText.indexOf("\\section");
+            // parse the buffer - read the buffer line by line, look for \title and \section,
+            // put them in a list to keep the order of appearance
+            for ( int lineNumber = 0; lineNumber < lineCount; lineNumber++ ) {
+                String lineText = buffer.getLineText( lineNumber );
+                int index = lineText.indexOf( "\\section" );
                 length = "\\sectionx".length();
 
-                if (index == -1) {
-                    index = lineText.indexOf("\\title");
+                if ( index == -1 ) {
+                    index = lineText.indexOf( "\\title" );
                     length = "\\title".length();
                 }
 
-                if (index > -1) {
-                    String section = lineText.substring(index, index + length);
-                    String title = lineText.substring(index + length, lineText.length());
-                    startLocation = new Location(lineNumber, index);
-                    startPosition = new SideKickPosition(buffer.getLineStartOffset(lineNumber) + index);
-                    QdocNode node = new QdocNode(title);
-                    node.setStartLocation(startLocation);
-                    node.setStartPosition(startPosition);
-                    node.setEndLocation(eofLocation);
-                    node.setEndPosition(eofPosition);
-                    switch (section) {
+                if ( index > -1 ) {
+                    String section = lineText.substring( index, length );
+                    String text = lineText.substring( index + length, lineText.length() );
+                    startLocation = new Location( lineNumber, index );
+                    startPosition = new SideKickPosition( buffer.getLineStartOffset( lineNumber ) + index );
+                    QdocNode node = new QdocNode( text );
+                    node.setStartLocation( startLocation );
+                    node.setStartPosition( startPosition );
+                    node.setEndLocation( eofLocation );
+                    node.setEndPosition( eofPosition );
+                    switch ( section ) {
                         case "\\title":
-
-                            if (titleNode == null) {
-                                node.setIcon(null);
-                                node.setOrdinal(TITLE);
-                                titleNode = node;
-                            }
+                            node.setIcon( titleIcon );
+                            node.setOrdinal( TITLE );
                             break;
                         case "\\section1":
-                            node.setIcon(section1Icon);
-                            node.setOrdinal(SECTION1);
+                            node.setIcon( section1Icon );
+                            node.setOrdinal( SECTION1 );
                             break;
                         case "\\section2":
-                            node.setIcon(section2Icon);
-                            node.setOrdinal(SECTION2);
+                            node.setIcon( section2Icon );
+                            node.setOrdinal( SECTION2 );
                             break;
                         case "\\section3":
-                            node.setIcon(section3Icon);
-                            node.setOrdinal(SECTION3);
+                            node.setIcon( section3Icon );
+                            node.setOrdinal( SECTION3 );
                             break;
                         case "\\section4":
-                            node.setIcon(section4Icon);
-                            node.setOrdinal(SECTION4);
+                            node.setIcon( section4Icon );
+                            node.setOrdinal( SECTION4 );
                             break;
                     }
-                    nodes.add(node);
+                    nodes.add( node );
                 }
             }
 
+            /* check for missing nodes -- for example, maybe the list looks like this:
+             * \title text
+             * \section2 text
+             *
+             * insert dummy nodes so it looks like this:
+             * \title text
+             * \section1 <missing section 1>
+             * \section2 text
+             */
+            // make sure there is a title node
+            if ( nodes.get( 0 ).getOrdinal() != 0 ) {
+                QdocNode missingTitle = new QdocNode("<missing title>");
+                missingTitle.setIcon(missingIcon);
+                missingTitle.setOrdinal(QdocNode.TITLE);
+                nodes.add( 0, missingTitle );
+                startLocation = new Location( 0, 0 );
+                startPosition = new SideKickPosition( 0 );
+                missingTitle.setStartLocation( startLocation );
+                missingTitle.setStartPosition( startPosition );
+                missingTitle.setEndLocation( eofLocation );
+                missingTitle.setEndPosition( eofPosition );
+            }
+    
+            ArrayList<QdocNode> newNodes = new ArrayList<QdocNode>();
+            for ( int i = 0; i < nodes.size() - 1; i++ ) {
+                QdocNode current = nodes.get( i );
+                newNodes.add(current);
+                QdocNode next = nodes.get( i + 1 );
+                if ( current.getOrdinal() == next.getOrdinal() || current.getOrdinal() == next.getOrdinal() + 1 ) {
+                    continue;
+                }
+    
+                for ( int j = current.getOrdinal() + 1; j < next.getOrdinal(); j++ ) {
+                    QdocNode missingSection = new QdocNode("<missing section " + j + ">");
+                    missingSection.setIcon(missingIcon);
+                    missingSection.setOrdinal(j);
+                    newNodes.add( missingSection );
+                    missingSection.setStartLocation( current.getStartLocation() );
+                    missingSection.setStartPosition( current.getStartPosition() );
+                    missingSection.setEndLocation( eofLocation );
+                    missingSection.setEndPosition( eofPosition );
+                }
+            }
+            newNodes.add(nodes.get(nodes.size() - 1));
+            nodes = newNodes;
+            
             // reset the end location/position of the nodes
-            for (int i = 0; i < nodes.size(); i++) {
-                QdocNode node = nodes.get(i);
-                // get the ordinal of the current node
+            for ( int i = 0; i < nodes.size(); i++ ) {
+                QdocNode node = nodes.get( i );
                 int ordinal = node.getOrdinal();
 
                 // go down the list to find the next node with the same or smaller ordinal
-                for (int j = i + 1; j < nodes.size(); j++) {
-                    QdocNode nextNode = nodes.get(j);
+                for ( int j = i + 1; j < nodes.size(); j++ ) {
+                    QdocNode nextNode = nodes.get( j );
 
-                    if (nextNode.getOrdinal() <= ordinal) {
+                    if ( nextNode.getOrdinal() <= ordinal ) {
                         // set the end location/position of the current node to be the same as the
                         // start location/position of the next node.
-                        node.setEndLocation(nextNode.getStartLocation());
-                        node.setEndPosition(nextNode.getStartPosition());
+                        node.setEndLocation( nextNode.getStartLocation() );
+                        node.setEndPosition( nextNode.getStartPosition() );
                         break;
                     }
                 }
@@ -178,7 +220,7 @@
             }
 
             // arrange the parent/child relationship of the nodes
-            if (nodes.size() > 0) {
+            if ( nodes.size() > 0 ) {
                 Deque<QdocNode> deck = new ArrayDeque<QdocNode>();
                 QdocNode previous0 = null;
                 QdocNode previous1 = null;
@@ -185,94 +227,82 @@
                 QdocNode previous2 = null;
                 QdocNode previous3 = null;
 
-                for ( QdocNode node : nodes) {
-                    if (node.getOrdinal() == TITLE) {
+                for (  QdocNode node : nodes ) {
+                    if ( node.getOrdinal() == TITLE ) {
                         previous0 = node;
-                        deck.add(node);
+                        deck.add( node );
                         continue;
                     }
 
-                    if (node.getOrdinal() == SECTION1) {
-                        if (previous0 != null) {
-                            previous0.addChild(node);
+                    if ( node.getOrdinal() == SECTION1 ) {
+                        if ( previous0 != null ) {
+                            previous0.addChild( node );
                         }
                         else {
-                            deck.add(node);
+                            deck.add( node );
                         }
                         previous1 = node;
                         continue;
                     }
 
-                    if (node.getOrdinal() == SECTION2) {
-                        if (previous1 != null) {
-                            previous1.addChild(node);
+                    if ( node.getOrdinal() == SECTION2 ) {
+                        if ( previous1 != null ) {
+                            previous1.addChild( node );
                         }
                         else {
-                            deck.add(node);
+                            deck.add( node );
                         }
                         previous2 = node;
                         continue;
                     }
 
-                    if (node.getOrdinal() == SECTION3) {
-                        if (previous2 != null) {
-                            previous2.addChild(node);
+                    if ( node.getOrdinal() == SECTION3 ) {
+                        if ( previous2 != null ) {
+                            previous2.addChild( node );
                         }
                         else {
-                            deck.add(node);
+                            deck.add( node );
                         }
                         previous3 = node;
                         continue;
                     }
 
-                    if (node.getOrdinal() == SECTION4) {
-                        if (previous3 != null) {
-                            previous3.addChild(node);
+                    if ( node.getOrdinal() == SECTION4 ) {
+                        if ( previous3 != null ) {
+                            previous3.addChild( node );
                         }
                         else {
-                            deck.add(node);
+                            deck.add( node );
                         }
                         continue;
                     }
                 }
 
-                if (titleNode == null) {
-                    String title = "Untitled";
-                    startLocation = new Location(0, 0);
-                    startPosition = new SideKickPosition(buffer.getLineStartOffset(0));
-                    titleNode = new QdocNode(title);
-                    titleNode.setStartLocation(startLocation);
-                    titleNode.setStartPosition(startPosition);
-                    titleNode.setEndLocation(eofLocation);    
-                    titleNode.setEndPosition(eofPosition);
-                }
                 // make a tree for sidekick out of the nodes
                 DefaultMutableTreeNode root = parsedData.root;
-                for ( QdocNode node : deck) {
-                    DefaultMutableTreeNode treeNode = new DefaultMutableTreeNode(node);
-                    root.add(treeNode);
-
-                    if (node.hasChildren()) {
-                        addChildNodes(treeNode);
+                for (  QdocNode node : deck ) {
+                    DefaultMutableTreeNode treeNode = new DefaultMutableTreeNode( node );
+                    root.add( treeNode );
+                    if ( node.hasChildren() ) {
+                        addChildNodes( treeNode );
                     }
                 }
             }
         }
-        catch ( Exception e) {
+        catch (  Exception e ) {
             e.printStackTrace();
         }
         return parsedData;
     }
 
-    private void addChildNodes(DefaultMutableTreeNode parent) {
-        QdocNode node = (QdocNode) parent.getUserObject();
+    private void addChildNodes( DefaultMutableTreeNode parent ) {
+        QdocNode node = ( QdocNode ) parent.getUserObject();
+        for (  QdocNode child : node.getChildren() ) {
+            DefaultMutableTreeNode childTreeNode = new DefaultMutableTreeNode( child );
+            parent.add( childTreeNode );
 
-        for ( QdocNode child : node.getChildren()) {
-            DefaultMutableTreeNode childTreeNode = new DefaultMutableTreeNode(child);
-            parent.add(childTreeNode);
-
-            if (child.hasChildren()) {
-                addChildNodes(childTreeNode);
+            if ( child.hasChildren() ) {
+                addChildNodes( childTreeNode );
             }
         }
     }

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

[ jEdit-commits ] SF.net SVN: jedit:[25761] plugins/TaskList/tags/TaskL ist_2_7_0/

[<dal...@us...>]

Revision: 25761
          http://sourceforge.net/p/jedit/svn/25761
Author:   daleanson
Date:     2024-10-19 20:27:36 +0000 (Sat, 19 Oct 2024)
Log Message:
-----------
Tag for release, provides compatibility with jEdit 5.7.

Added Paths:
-----------
    plugins/TaskList/tags/TaskList_2_7_0/

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

[ jEdit-commits ] SF.net SVN: jedit:[25760] plugins/TaskList/trunk/Task List.props

[<dal...@us...>]

Revision: 25760
          http://sourceforge.net/p/jedit/svn/25760
Author:   daleanson
Date:     2024-10-19 20:26:28 +0000 (Sat, 19 Oct 2024)
Log Message:
-----------
Updated minimum jEdit version to 5.7.

Modified Paths:
--------------
    plugins/TaskList/trunk/TaskList.props

Modified: plugins/TaskList/trunk/TaskList.props
===================================================================
--- plugins/TaskList/trunk/TaskList.props	2024-10-19 20:26:03 UTC (rev 25759)
+++ plugins/TaskList/trunk/TaskList.props	2024-10-19 20:26:28 UTC (rev 25760)
@@ -8,7 +8,7 @@
 plugin.tasklist.TaskListPlugin.version=2.7
 plugin.tasklist.TaskListPlugin.docs=docs/index.html
 plugin.tasklist.TaskListPlugin.depend.0=jdk 1.7
-plugin.tasklist.TaskListPlugin.depend.1=jedit 05.03.00.00
+plugin.tasklist.TaskListPlugin.depend.1=jedit 05.07.00.00
 plugin.tasklist.TaskListPlugin.depend.2=plugin CommonControlsPlugin 1.7.4
 plugin.tasklist.TaskListPlugin.depend.3=optional plugin projectviewer.ProjectPlugin 3.5.3
 plugin.tasklist.TaskListPlugin.usePluginHome=true

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

[ jEdit-commits ] SF.net SVN: jedit:[25759] plugins/TaskList/tags/TaskL ist_2_7_0/

[<dal...@us...>]

Revision: 25759
          http://sourceforge.net/p/jedit/svn/25759
Author:   daleanson
Date:     2024-10-19 20:26:03 +0000 (Sat, 19 Oct 2024)
Log Message:
-----------
Forgot to update the minimum jEdit version, will retag.

Removed Paths:
-------------
    plugins/TaskList/tags/TaskList_2_7_0/

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

[ jEdit-commits ] SF.net SVN: jedit:[25758] plugins/TaskList/tags/TaskList_2_7_0/

[<dal...@us...>]

Revision: 25758
          http://sourceforge.net/p/jedit/svn/25758
Author:   daleanson
Date:     2024-10-19 20:22:48 +0000 (Sat, 19 Oct 2024)
Log Message:
-----------
Tag for release, provides compatibility with jEdit 5.7.

Added Paths:
-----------
    plugins/TaskList/tags/TaskList_2_7_0/

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

[ jEdit-commits ] SF.net SVN: jedit:[25757] plugins/TaskList/trunk

[<dal...@us...>]

Revision: 25757
          http://sourceforge.net/p/jedit/svn/25757
Author:   daleanson
Date:     2024-10-19 19:10:36 +0000 (Sat, 19 Oct 2024)
Log Message:
-----------
Updated version number, prepping for release.

Modified Paths:
--------------
    plugins/TaskList/trunk/TaskList.props
    plugins/TaskList/trunk/docs/index.html

Modified: plugins/TaskList/trunk/TaskList.props
===================================================================
--- plugins/TaskList/trunk/TaskList.props	2024-08-31 10:54:18 UTC (rev 25756)
+++ plugins/TaskList/trunk/TaskList.props	2024-10-19 19:10:36 UTC (rev 25757)
@@ -5,7 +5,7 @@
 
 plugin.tasklist.TaskListPlugin.name=TaskList
 plugin.tasklist.TaskListPlugin.author=Ollie Rutherfurd, John Gellene, Dale Anson
-plugin.tasklist.TaskListPlugin.version=2.6
+plugin.tasklist.TaskListPlugin.version=2.7
 plugin.tasklist.TaskListPlugin.docs=docs/index.html
 plugin.tasklist.TaskListPlugin.depend.0=jdk 1.7
 plugin.tasklist.TaskListPlugin.depend.1=jedit 05.03.00.00

Modified: plugins/TaskList/trunk/docs/index.html
===================================================================
--- plugins/TaskList/trunk/docs/index.html	2024-08-31 10:54:18 UTC (rev 25756)
+++ plugins/TaskList/trunk/docs/index.html	2024-10-19 19:10:36 UTC (rev 25757)
@@ -7,7 +7,7 @@
 <strong>Ollie Rutherfurd</strong><br>
 <strong>John Gellene</strong><br>
 <strong>Dale Anson</strong><br>
-<strong>Version 2.1</strong><br>
+<strong>Version 2.7</strong><br>
 <p>Copyright (C) 2002 John Gellene, 2003-2004 Ollie Rutherfurd, 2009 Dale Anson<p>
 <a name="summary"></a>
 <h2>Summary</h2>
@@ -301,9 +301,7 @@
 COPYING.DOC.txt included with the jEdit distribution.<p>
 <a name="feedback"></a>
 <h2>Feedback</h2>
-<p>Bug reports, comments and suggestions regarding TaskList may be sent to
-Ollie Rutherfurd at <ulink url="mailto:ol...@je...">ol...@je...</ulink> or posted on the jedit-users
-mailing list (for which membership is required).<p>
+<p>Bug reports, comments and suggestions regarding TaskList may be entered in the tracking system at <a>https://sourceforge.net/p/jedit/plugin-bugs/</a>.<p>
 <a name="version-history"></a>
 <h2>Version History</h2>
 <h2>Version 2.5</h2>

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

[ jEdit-commits ] SF.net SVN: jedit:[25756] jEdit/trunk/test/org/gjt/sp /jedit

[<ker...@us...>]

Revision: 25756
          http://sourceforge.net/p/jedit/svn/25756
Author:   kerik-sf
Date:     2024-08-31 10:54:18 +0000 (Sat, 31 Aug 2024)
Log Message:
-----------
fix test file name in r5755

Added Paths:
-----------
    jEdit/trunk/test/org/gjt/sp/jedit/ModeTest.java

Removed Paths:
-------------
    jEdit/trunk/test/org/gjt/sp/jedit/BufferTest.java

Deleted: jEdit/trunk/test/org/gjt/sp/jedit/BufferTest.java
===================================================================
--- jEdit/trunk/test/org/gjt/sp/jedit/BufferTest.java	2024-08-31 10:52:26 UTC (rev 25755)
+++ jEdit/trunk/test/org/gjt/sp/jedit/BufferTest.java	2024-08-31 10:54:18 UTC (rev 25756)
@@ -1,46 +0,0 @@
-/*
- * jEdit - Programmer's Text Editor
- * :tabSize=8:indentSize=8:noTabs=false:
- * :folding=explicit:collapseFolds=1:
- *
- * Copyright © 2024 jEdit contributors
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-package org.gjt.sp.jedit;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import static org.junit.Assert.*;
-
-@RunWith(MockitoJUnitRunner.class)
-public class BufferTest
-{
-
-	/**
-	 * verify that a re filenameGlob consisting in an alternative without enclosing brackets
-	 * works in Mode.acceptFile()
-	 */
-	@Test
-	public void acceptFileREAlternatives()
-	{
-		Mode m = new Mode("shellscript");
-		m.setProperty("filenameGlob", "(re)(.+\\.sh)|PKGBUILD");
-		m.init();
-		assertTrue(m.acceptFile("/tmp/PKGBUILD", ""));
-	}
-}
\ No newline at end of file

Copied: jEdit/trunk/test/org/gjt/sp/jedit/ModeTest.java (from rev 25755, jEdit/trunk/test/org/gjt/sp/jedit/BufferTest.java)
===================================================================
--- jEdit/trunk/test/org/gjt/sp/jedit/ModeTest.java	                        (rev 0)
+++ jEdit/trunk/test/org/gjt/sp/jedit/ModeTest.java	2024-08-31 10:54:18 UTC (rev 25756)
@@ -0,0 +1,46 @@
+/*
+ * jEdit - Programmer's Text Editor
+ * :tabSize=8:indentSize=8:noTabs=false:
+ * :folding=explicit:collapseFolds=1:
+ *
+ * Copyright © 2024 jEdit contributors
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+package org.gjt.sp.jedit;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.junit.Assert.*;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ModeTest
+{
+
+	/**
+	 * verify that a re filenameGlob consisting in an alternative without enclosing brackets
+	 * works in Mode.acceptFile()
+	 */
+	@Test
+	public void acceptFileREAlternatives()
+	{
+		Mode m = new Mode("shellscript");
+		m.setProperty("filenameGlob", "(re)(.+\\.sh)|PKGBUILD");
+		m.init();
+		assertTrue(m.acceptFile("/tmp/PKGBUILD", ""));
+	}
+}
\ No newline at end of file

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

[ jEdit-commits ] SF.net SVN: jedit:[25755] jEdit/trunk

[<ker...@us...>]

Revision: 25755
          http://sourceforge.net/p/jedit/svn/25755
Author:   kerik-sf
Date:     2024-08-31 10:52:26 +0000 (Sat, 31 Aug 2024)
Log Message:
-----------
allow (re) glob in edit mode to contain alternative without enclosing brackets

example: '(re)(.+\.sh)|PKGBUILD' was not working due to path-matching regex being prepended,
resulting in regexp '.*[/\\]?(.+\.sh)|PKGBUILD'.
Regex alternatives:
 - '.*[/\\]?(.+\.sh)'
 - PKGBUILD
It was looking for a path consisting only of PKGBUILD (incorrect).

Always enclosing given regexp in brackets solves the issue

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/org/gjt/sp/jedit/Mode.java

Added Paths:
-----------
    jEdit/trunk/test/org/gjt/sp/jedit/BufferTest.java

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2024-08-29 17:25:47 UTC (rev 25754)
+++ jEdit/trunk/doc/CHANGES.txt	2024-08-31 10:52:26 UTC (rev 25755)
@@ -4,10 +4,12 @@
 
 {{{ Version 5.8pre1
 
-Thanks to Björn Kautler for contributing to this release.
+Thanks to Björn Kautler and Eric Le Lay for contributing to this release.
 
 {{{ Bug Fixes
 
+- allow '(re)' glob in edit mode to contain alternative without enclosing
+ brackets (Eric Le Lay)
 
 }}}
 {{{ Miscellaneous

Modified: jEdit/trunk/org/gjt/sp/jedit/Mode.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/Mode.java	2024-08-29 17:25:47 UTC (rev 25754)
+++ jEdit/trunk/org/gjt/sp/jedit/Mode.java	2024-08-31 10:52:26 UTC (rev 25755)
@@ -89,8 +89,11 @@
 				else
 				{
 					// glob is for a filename without path, prepend the regex with
-					// an optional path prefix to be able to match against full paths
-					filepathRE = String.format("(?:.*[/\\\\])?%s", filepathRE);
+					// an optional path prefix to be able to match against full paths.
+					// Enclose regexp in non-capturing group to work with 'a|b'
+					// regexp, where the path prefix would otherwise only match with
+					// the eft part of the alternative.
+					filepathRE = String.format("(?:.*[/\\\\])?(?:%s)", filepathRE);
 				}
 				this.filepathMatcher = Pattern.compile(filepathRE, Pattern.CASE_INSENSITIVE).matcher("");
 			}

Added: jEdit/trunk/test/org/gjt/sp/jedit/BufferTest.java
===================================================================
--- jEdit/trunk/test/org/gjt/sp/jedit/BufferTest.java	                        (rev 0)
+++ jEdit/trunk/test/org/gjt/sp/jedit/BufferTest.java	2024-08-31 10:52:26 UTC (rev 25755)
@@ -0,0 +1,46 @@
+/*
+ * jEdit - Programmer's Text Editor
+ * :tabSize=8:indentSize=8:noTabs=false:
+ * :folding=explicit:collapseFolds=1:
+ *
+ * Copyright © 2024 jEdit contributors
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+package org.gjt.sp.jedit;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.junit.Assert.*;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BufferTest
+{
+
+	/**
+	 * verify that a re filenameGlob consisting in an alternative without enclosing brackets
+	 * works in Mode.acceptFile()
+	 */
+	@Test
+	public void acceptFileREAlternatives()
+	{
+		Mode m = new Mode("shellscript");
+		m.setProperty("filenameGlob", "(re)(.+\\.sh)|PKGBUILD");
+		m.init();
+		assertTrue(m.acceptFile("/tmp/PKGBUILD", ""));
+	}
+}
\ No newline at end of file


Property changes on: jEdit/trunk/test/org/gjt/sp/jedit/BufferTest.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id Author Revision Date
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[ jEdit-commits ] SF.net SVN: jedit:[25754] www/trunk/htdocs/features .html

[<vam...@us...>]

Revision: 25754
          http://sourceforge.net/p/jedit/svn/25754
Author:   vampire0
Date:     2024-08-29 17:25:47 +0000 (Thu, 29 Aug 2024)
Log Message:
-----------
Update edit mode list on features page

Modified Paths:
--------------
    www/trunk/htdocs/features.html

Modified: www/trunk/htdocs/features.html
===================================================================
--- www/trunk/htdocs/features.html	2024-08-03 19:08:14 UTC (rev 25753)
+++ www/trunk/htdocs/features.html	2024-08-29 17:25:47 UTC (rev 25754)
@@ -35,45 +35,48 @@
 
 <a name="modes">
 <h2>Syntax Highlighting Modes</h2> </a>
-<h3> Supported File Types / Languages in jEdit 5.1: 211</h3>
+<h3> Supported Languages / File Types in jEdit 5.7.0: 233</h3>
  <table><tbody><tr>
-	<td>actionscript</td>	<td>ada</td>	<td>ada95</td>	<td>ant</td>	<td>antlr</td>	<td>apacheconf</td>  </tr><tr>
-	<td>apdl</td>	<td>applescript</td>	<td>asp</td>	<td>aspect-j</td>	<td>assembly-agc</td>	<td>assembly-ags</td>  </tr><tr>
-	<td>assembly-m68k</td>	<td>assembly-macro32</td>	<td>assembly-mcs51</td>	<td>assembly-r2000</td>	<td>assembly-parrot</td>	<td>assembly-x86</td>  </tr><tr>
-	<td>avro</td>	<td>awk</td>	<td>b</td>	<td>batch</td>	<td>bbj</td>	<td>bcel</td>  </tr><tr>
-	<td>beanshell</td>	<td>bibtex</td>	<td>binsource-agc</td>	<td>c</td>	<td>cfscript</td>	<td>chill</td>  </tr><tr>
-	<td>cil</td>	<td>clips</td>	<td>clojure</td>	<td>cmake</td>	<td>cobol</td>	<td>coffeescript</td>  </tr><tr>
-	<td>coldfusion</td>	<td>cplex-lp</td>	<td>c++</td>	<td>c#</td>	<td>css</td>	<td>csv</td>  </tr><tr>
-	<td>cvs-commit</td>	<td>d</td>	<td>dart</td>	<td>django</td>	<td>dot</td>	<td>doxygen</td>  </tr><tr>
-	<td>dsssl</td>	<td>embperl</td>	<td>erlang</td>	<td>eiffel</td>	<td>fhtml</td>	<td>factor</td>  </tr><tr>
-	<td>jflex</td>	<td>forth</td>	<td>fortran</td>	<td>fortran90</td>	<td>foxpro</td>	<td>freemarker</td>  </tr><tr>
-	<td>gcbasic</td>	<td>gettext</td>	<td>gnuplot</td>	<td>go</td>	<td>gradle</td>	<td>groovy</td>  </tr><tr>
-	<td>gsp</td>	<td>haskell</td>	<td>haxe</td>	<td>hxml</td>	<td>hex</td>	<td>hlsl</td>  </tr><tr>
-	<td>htaccess</td>	<td>html</td>	<td>i4gl</td>	<td>icalendar</td>	<td>icon</td>	<td>idl</td>  </tr><tr>
-	<td>inform</td>	<td>inno-setup</td>	<td>ini</td>	<td>interlis</td>	<td>io</td>	<td>jamon</td>  </tr><tr>
-	<td>javacc</td>	<td>java</td>	<td>javafx</td>	<td>javascript</td>	<td>jcl</td>	<td>jedit-actions</td>  </tr><tr>
-	<td>jhtml</td>	<td>jmk</td>	<td>json</td>	<td>jsp</td>	<td>latex</td>	<td>lex</td>  </tr><tr>
-	<td>lilypond</td>	<td>lisp</td>	<td>literate-haskell</td>	<td>logs</td>	<td>logtalk</td>	<td>lotos</td>  </tr><tr>
-	<td>lua</td>	<td>macroscheduler</td>	<td>mail</td>	<td>makefile</td>	<td>maple</td>	<td>maven</td>  </tr><tr>
-	<td>metapost</td>	<td>mxml</td>	<td>ml</td>	<td>modula3</td>	<td>moin</td>	<td>mqsc</td>  </tr><tr>
-	<td>myghty</td>	<td>mysql</td>	<td>n3</td>	<td>netrexx</td>	<td>nqc</td>	<td>nsis2</td>  </tr><tr>
-	<td>objective-c</td>	<td>objectrexx</td>	<td>occam</td>	<td>omnimark</td>	<td>outline</td>	<td>pascal</td>  </tr><tr>
-	<td>patch</td>	<td>perl</td>	<td>php</td>	<td>pike</td>	<td>plaintex</td>	<td>PostgreSQL</td>  </tr><tr>
-	<td>pl-sql</td>	<td>pl-sql9</td>	<td>pl1</td>	<td>pop11</td>	<td>postscript</td>	<td>povray</td>  </tr><tr>
-	<td>powerdynamo</td>	<td>powershell</td>	<td>prolog</td>	<td>progress</td>	<td>properties</td>	<td>psp</td>  </tr><tr>
-	<td>ptl</td>	<td>pure</td>	<td>pvwave</td>	<td>pyrex</td>	<td>python</td>	<td>rebol</td>  </tr><tr>
-	<td>redcode</td>	<td>relax-ng-compact</td>	<td>renderman-rib</td>	<td>rd</td>	<td>rest</td>	<td>rhtml</td>  </tr><tr>
-	<td>roff</td>	<td>rpm-spec</td>	<td>rtf</td>	<td>rakefile</td>	<td>ruby</td>	<td>rview</td>  </tr><tr>
-	<td>s+</td>	<td>s#</td>	<td>sas</td>	<td>sbt</td>	<td>scala</td>	<td>scheme</td>  </tr><tr>
-	<td>sgml</td>	<td>sip</td>	<td>rcp</td>	<td>shellscript</td>	<td>shtml</td>	<td>slate</td>  </tr><tr>
-	<td>slax</td>	<td>smalltalk</td>	<td>smarty</td>	<td>sdl/pr</td>	<td>sql-loader</td>	<td>smi-mib</td>  </tr><tr>
-	<td>sqr</td>	<td>squidconf</td>	<td>stata</td>	<td>svn-commit</td>	<td>swig</td>	<td>tcl</td>  </tr><tr>
-	<td>texinfo</td>	<td>tex</td>	<td>text</td>	<td>rfc</td>	<td>tld</td>	<td>tsp</td>  </tr><tr>
-	<td>transact-sql</td>	<td>template-toolkit</td>	<td>twiki</td>	<td>typoscript</td>	<td>url</td>	<td>uscript</td>  </tr><tr>
-	<td>vala</td>	<td>vbscript</td>	<td>velocity</td>	<td>verilog</td>	<td>vhdl</td>	<td>visualbasic</td>  </tr><tr>
-	<td>vrml2</td>	<td>xml</td>	<td>xq</td>	<td>xsl</td>	<td>yab</td>	<td>yaml</td>  </tr></tbody></table>
-<p>Using jEdit 5.1pre1 on Fri Apr 26 02:20:09 PDT 2013 with Oracle Corporation Java 1.7.0_03 on Linux 3.1.0-1-amd64
- Generated from macro <tt>Misc/Generate Modes List.bsh</tt> </p>
+	<td>actionscript</td>	<td>ada</td>	<td>ada95</td>	<td>ans-forth94</td>	<td>ant</td>	<td>antlr</td>  </tr><tr>
+	<td>antlr4</td>	<td>apacheconf</td>	<td>apdl</td>	<td>applescript</td>	<td>asp</td>	<td>aspect-j</td>  </tr><tr>
+	<td>assembly-agc</td>	<td>assembly-ags</td>	<td>assembly-arm32</td>	<td>assembly-m68k</td>	<td>assembly-macro32</td>	<td>assembly-mcs51</td>  </tr><tr>
+	<td>assembly-parrot</td>	<td>assembly-r2000</td>	<td>assembly-x86</td>	<td>avro</td>	<td>awk</td>	<td>b</td>  </tr><tr>
+	<td>batch</td>	<td>bbj</td>	<td>bcel</td>	<td>beanshell</td>	<td>bibtex</td>	<td>binsource-agc</td>  </tr><tr>
+	<td>c</td>	<td>c#</td>	<td>c++</td>	<td>cfscript</td>	<td>chill</td>	<td>cil</td>  </tr><tr>
+	<td>clips</td>	<td>clojure</td>	<td>cmake</td>	<td>cobol</td>	<td>coffeescript</td>	<td>coldfusion</td>  </tr><tr>
+	<td>cplex-lp</td>	<td>css</td>	<td>csv</td>	<td>cvs-commit</td>	<td>d</td>	<td>dart</td>  </tr><tr>
+	<td>django</td>	<td>dockerfile</td>	<td>dot</td>	<td>doxygen</td>	<td>drawj2d</td>	<td>dsssl</td>  </tr><tr>
+	<td>eiffel</td>	<td>embperl</td>	<td>erlang</td>	<td>factor</td>	<td>fhtml</td>	<td>forth</td>  </tr><tr>
+	<td>fortran</td>	<td>fortran90</td>	<td>foxpro</td>	<td>freemarker</td>	<td>gcbasic</td>	<td>gettext</td>  </tr><tr>
+	<td>gherkin</td>	<td>gnuplot</td>	<td>go</td>	<td>gradle</td>	<td>groovy</td>	<td>gsp</td>  </tr><tr>
+	<td>haskell</td>	<td>haxe</td>	<td>hex</td>	<td>hl7v2</td>	<td>hlsl</td>	<td>htaccess</td>  </tr><tr>
+	<td>html</td>	<td>hxml</td>	<td>i4gl</td>	<td>icalendar</td>	<td>icon</td>	<td>idl</td>  </tr><tr>
+	<td>inform</td>	<td>ini</td>	<td>inno-setup</td>	<td>interlis</td>	<td>io</td>	<td>jamon</td>  </tr><tr>
+	<td>java</td>	<td>java module-info</td>	<td>javacc</td>	<td>javafx</td>	<td>javascript</td>	<td>jcl</td>  </tr><tr>
+	<td>jedit-actions</td>	<td>jflex</td>	<td>jhtml</td>	<td>jmk</td>	<td>json</td>	<td>jsp</td>  </tr><tr>
+	<td>kotlin</td>	<td>latex</td>	<td>lex</td>	<td>lilypond</td>	<td>lisp</td>	<td>literate-haskell</td>  </tr><tr>
+	<td>logs</td>	<td>logtalk</td>	<td>lotos</td>	<td>lua</td>	<td>m4</td>	<td>macroscheduler</td>  </tr><tr>
+	<td>mail</td>	<td>makefile</td>	<td>maple</td>	<td>markdown</td>	<td>maven</td>	<td>mavscript</td>  </tr><tr>
+	<td>metapost</td>	<td>ml</td>	<td>modula3</td>	<td>moin</td>	<td>mqsc</td>	<td>mustache-template</td>  </tr><tr>
+	<td>mxml</td>	<td>myghty</td>	<td>mysql</td>	<td>n3</td>	<td>netrexx</td>	<td>nqc</td>  </tr><tr>
+	<td>nsis2</td>	<td>objective-c</td>	<td>objectrexx</td>	<td>occam</td>	<td>omnimark</td>	<td>opensips</td>  </tr><tr>
+	<td>outline</td>	<td>pascal</td>	<td>patch</td>	<td>perl</td>	<td>php</td>	<td>pike</td>  </tr><tr>
+	<td>pl-sql</td>	<td>pl-sql9</td>	<td>pl1</td>	<td>plaintex</td>	<td>plantuml</td>	<td>pop11</td>  </tr><tr>
+	<td>PostgreSQL</td>	<td>postscript</td>	<td>povray</td>	<td>PowerCenter Parameter File</td>	<td>powerdynamo</td>	<td>powershell</td>  </tr><tr>
+	<td>progress</td>	<td>prolog</td>	<td>properties</td>	<td>protobuf</td>	<td>psp</td>	<td>ptl</td>  </tr><tr>
+	<td>pure</td>	<td>pvwave</td>	<td>pyrex</td>	<td>python</td>	<td>qdoc</td>	<td>rakefile</td>  </tr><tr>
+	<td>rcp</td>	<td>rd</td>	<td>rebol</td>	<td>redcode</td>	<td>relax-ng-compact</td>	<td>renderman-rib</td>  </tr><tr>
+	<td>rest</td>	<td>rfc</td>	<td>rhtml</td>	<td>roff</td>	<td>rpm-spec</td>	<td>rtf</td>  </tr><tr>
+	<td>ruby</td>	<td>rust</td>	<td>rview</td>	<td>s#</td>	<td>s+</td>	<td>sas</td>  </tr><tr>
+	<td>sbt</td>	<td>scala</td>	<td>scheme</td>	<td>sdl/pr</td>	<td>sgml</td>	<td>shellscript</td>  </tr><tr>
+	<td>shtml</td>	<td>sip</td>	<td>sipp</td>	<td>slate</td>	<td>slax</td>	<td>smalltalk</td>  </tr><tr>
+	<td>smarty</td>	<td>smi-mib</td>	<td>sql-loader</td>	<td>sqr</td>	<td>squidconf</td>	<td>stata</td>  </tr><tr>
+	<td>svn-commit</td>	<td>swift</td>	<td>swig</td>	<td>tcl</td>	<td>template-toolkit</td>	<td>tex</td>  </tr><tr>
+	<td>texinfo</td>	<td>text</td>	<td>tld</td>	<td>transact-sql</td>	<td>tsp</td>	<td>twiki</td>  </tr><tr>
+	<td>typoscript</td>	<td>url</td>	<td>uscript</td>	<td>vala</td>	<td>vbscript</td>	<td>velocity</td>  </tr><tr>
+	<td>verilog</td>	<td>vhdl</td>	<td>visualbasic</td>	<td>vrml2</td>	<td>wellknowntext</td>	<td>xml</td>  </tr><tr>
+	<td>xq</td>	<td>xsl</td>	<td>yab</td>	<td>yaml</td>	<td>zpt</td></tr></tbody></table>
+ <p> Generated from macro <tt>Misc/Generate_Modes_List.bsh</tt> </p>
 
 <p> 
 There are even more contributed syntax highlighting modes at the

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

[ jEdit-commits ] SF.net SVN: jedit:[25753] jEdit/trunk

[<vam...@us...>]

Revision: 25753
          http://sourceforge.net/p/jedit/svn/25753
Author:   vampire0
Date:     2024-08-03 19:08:14 +0000 (Sat, 03 Aug 2024)
Log Message:
-----------
Update the version number to 5.8pre1

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/org/gjt/sp/jedit/jEdit.java

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2024-08-03 18:46:43 UTC (rev 25752)
+++ jEdit/trunk/doc/CHANGES.txt	2024-08-03 19:08:14 UTC (rev 25753)
@@ -1,148 +1,26 @@
-jEdit 5.7 version history
-       (changes since jEdit 5.6.0)
+jEdit 5.8 version history
+       (changes since jEdit 5.7.0)
 :encoding=UTF-8:
 
-{{{ Version 5.7.0
+{{{ Version 5.8pre1
 
-Thanks to Björn Kautler, Matthieu Casanova, Dale Anson, and Eric Le Lay
-for contributing to this release.
+Thanks to Björn Kautler for contributing to this release.
 
 {{{ Bug Fixes
 
-- Support arm64 Java installations in the macOS launcher (#4123 - Björn Kautler)
 
-- Do not forward the --verbose parameter in the macOS launcher to jEdit
-  during investigating startup problems (Björn Kautler)
-
-- Show Temurin download link in macOS launcher if no compatible Java version
-  was found instead of java.com and oracle.com where Java 8 is promoted
-  (Björn Kautler)
-
-- Support Java installations with paths that are not following the old naming
-  conventions regarding their version in the macOS launcher (Björn Kautler)
-
-- Bundle the new MacOS 1.5 plugin instead of the old MacOSX 1.3 plugin
-  to become compatible with newer Java versions (Björn Kautler)
-
-- Fix NullPointerException during saving autosave settings if no previous
-  autosave directory was set (Björn Kautler)
-
-- BeanShell snippets and macros now work consistently and not suddenly change
-  behaviour anymore just because some BeanShell snippet defined a class.
-  This now disables reflective access to otherwise inaccessible fields through
-  simple syntax though, that used to work after a snippet with a class
-  definition was loaded. (#4118 - Björn Kautler)
-
-- Fix the installation of plugins trying to use invalid file names
-  (Björn Kautler)
-
-- VFSManager.canReadFile() was returning true only for directories
-  (#4102 - Matthieu Casanova)
-
-- Allow user to choose filename when printing to pdf
-  (partial fix for #4115 - Dale Anson)
-
-- Key handling in the Errors dialog uses current keymap (#4128 - Eric Le Lay)
-
-- Delete at the end of the line does not delete newline on java20, java21
-  (#4125 - Eric Le Lay)
-
-- Freeze when deleting a directory and some children (race condition)
-  (#4132 - Eric Le Lay)
-
 }}}
 {{{ Miscellaneous
 
-- Improve logging of startup errors in the macOS launcher with --verbose option
-  (Björn Kautler)
 
-- Update launch4j to version 3.50 and also search in PATH environment
-  variable for a Java runtime from the EXE launcher (Björn Kautler)
-
-- Update macOS app bundler to version 1.3.0 (Björn Kautler)
-
-- Status bar design updated with the ability to add widgets to the left
-  and the right of the bar (Matthieu Casanova)
-
-- Make building possible when using Java 15+ (Björn Kautler)
-
 }}}
 {{{ API Changes
 
-- Added new methods in SegmentBuffer for append and insert text
-  (Matthieu Casanova)
 
-- New service org.jedit.util.CleanerService replacing use of finalize()
-  (Matthieu Casanova)
-
-- New methods JEditBuffer.getWordWrap() and JeditBuffer.setWordWrap()
-  (Matthieu Casanova)
-
-- New method DialogChooser.openChooserWindow() showing a chooser dialog
-  (Matthieu Casanova)
-
-- New method DialogChooser.openListChooserWindow() showing a chooser dialog list
-  (Matthieu Casanova)
-
-- New method Buffer.setLineSeparator() (Matthieu Casanova)
-
-- New method Buffer.reloadWithEncoding() (Matthieu Casanova)
-
-- New method StatusBar.updateEvent() (Matthieu Casanova)
-
-- New method BufferSet.contains() (Matthieu Casanova)
-
-- Deprecated methods removed
-    StandardUtilities.objectsEqual()
-    TextArea.showPopupMenu()
-    Mode.acceptFilename()
-    OperatingSystem.isDOSDerived()
-    OperatingSystem.hasJava17()
-    MiscUtilities.getFileNameNoExtension()
-    GUIUtilities.prettifyMenuLabel()
-    GUIUtilities.setAutoMnemonic()
-    GUIUtilities.parseColor()
-    GUIUtilities.parseStyle()
-    GUIUtilities.adjustForScreenBounds()
-    GUIUtilities.requestFocus()
-    GUIUtilities.isPopupTrigger()
-    GUIUtilities.isMiddleButton()
-    GUIUtilities.isRightButton()
-    GUIUtilities.getScreenBounds()
-    GUIUtilities.showPopupMenu()
-    GUIUtilities.showPopupMenu()
-    GUIUtilities.isAncestorOf()
-    GUIUtilities.getParentDialog()
-    GUIUtilities.setEnabledRecursively()
-    GUIUtilities.setButtonContentMargin()
-    GUIUtilities.makeSameSize()
-    GUIUtilities.defaultTableCellSize()
-    GUIUtilities.defaultColumnWidth()
-    GUIUtilities.defaultRowHeight()
-    Buffer.getFile()
-    VFSManager.runInAWTThread()
-    VFSManager.runInWorkThread() (Matthieu Casanova)
-
 }}}
 {{{ Editing
 
-- Never mark empty untitled buffers dirty, independent of settings
-  (Björn Kautler)
 
-- Never mark buffers dirty if contents are unchanged is now also properly
-  supported for untitled buffers (Björn Kautler)
-
-- New edit mode for Dockerfile (Matthieu Casanova)
-
-- New edit mode for QDoc (Dale Anson)
-
-- Status bar encoding widget allow to choose between updating the encoding
-  or reloading with a new encoding (Matthieu Casanova)
-
-- Updated java mode for new keywords introduced up to Java 17. (Dale Anson)
-
-- Add match index to beanshell replace context (#554 - Eric Le Lay)
-
 }}}
 
 }}}

Modified: jEdit/trunk/org/gjt/sp/jedit/jEdit.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2024-08-03 18:46:43 UTC (rev 25752)
+++ jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2024-08-03 19:08:14 UTC (rev 25753)
@@ -105,7 +105,7 @@
 	public static String getBuild()
 	{
 		// (major).(minor).(<99 = preX, 99 = "final").(bug fix)
-		return "05.07.99.00";
+		return "05.08.01.00";
 	} //}}}
 
 	//{{{ main() method

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

[ jEdit-commits ] SF.net SVN: jedit:[25752] www/trunk/htdocs

[<vam...@us...>]

Revision: 25752
          http://sourceforge.net/p/jedit/svn/25752
Author:   vampire0
Date:     2024-08-03 18:46:43 +0000 (Sat, 03 Aug 2024)
Log Message:
-----------
Update for 5.7.0 release

Modified Paths:
--------------
    www/trunk/htdocs/devel.html
    www/trunk/htdocs/download.html
    www/trunk/htdocs/index.php
    www/trunk/htdocs/jEdit-version.txt

Added Paths:
-----------
    www/trunk/htdocs/CHANGES57.txt

Added: www/trunk/htdocs/CHANGES57.txt
===================================================================
--- www/trunk/htdocs/CHANGES57.txt	                        (rev 0)
+++ www/trunk/htdocs/CHANGES57.txt	2024-08-03 18:46:43 UTC (rev 25752)
@@ -0,0 +1,152 @@
+jEdit 5.7 version history
+       (changes since jEdit 5.6.0)
+:encoding=UTF-8:
+
+{{{ Version 5.7.0
+
+Thanks to Björn Kautler, Matthieu Casanova, Dale Anson, and Eric Le Lay
+for contributing to this release.
+
+{{{ Bug Fixes
+
+- Support arm64 Java installations in the macOS launcher (#4123 - Björn Kautler)
+
+- Do not forward the --verbose parameter in the macOS launcher to jEdit
+  during investigating startup problems (Björn Kautler)
+
+- Show Temurin download link in macOS launcher if no compatible Java version
+  was found instead of java.com and oracle.com where Java 8 is promoted
+  (Björn Kautler)
+
+- Support Java installations with paths that are not following the old naming
+  conventions regarding their version in the macOS launcher (Björn Kautler)
+
+- Bundle the new MacOS 1.5 plugin instead of the old MacOSX 1.3 plugin
+  to become compatible with newer Java versions (Björn Kautler)
+
+- Fix NullPointerException during saving autosave settings if no previous
+  autosave directory was set (Björn Kautler)
+
+- BeanShell snippets and macros now work consistently and not suddenly change
+  behaviour anymore just because some BeanShell snippet defined a class.
+  This now disables reflective access to otherwise inaccessible fields through
+  simple syntax though, that used to work after a snippet with a class
+  definition was loaded. (#4118 - Björn Kautler)
+
+- Fix the installation of plugins trying to use invalid file names
+  (Björn Kautler)
+
+- VFSManager.canReadFile() was returning true only for directories
+  (#4102 - Matthieu Casanova)
+
+- Allow user to choose filename when printing to pdf
+  (partial fix for #4115 - Dale Anson)
+
+- Key handling in the Errors dialog uses current keymap (#4128 - Eric Le Lay)
+
+- Delete at the end of the line does not delete newline on java20, java21
+  (#4125 - Eric Le Lay)
+
+- Freeze when deleting a directory and some children (race condition)
+  (#4132 - Eric Le Lay)
+
+}}}
+{{{ Miscellaneous
+
+- Improve logging of startup errors in the macOS launcher with --verbose option
+  (Björn Kautler)
+
+- Update launch4j to version 3.50 and also search in PATH environment
+  variable for a Java runtime from the EXE launcher (Björn Kautler)
+
+- Update macOS app bundler to version 1.3.0 (Björn Kautler)
+
+- Status bar design updated with the ability to add widgets to the left
+  and the right of the bar (Matthieu Casanova)
+
+- Make building possible when using Java 15+ (Björn Kautler)
+
+}}}
+{{{ API Changes
+
+- Added new methods in SegmentBuffer for append and insert text
+  (Matthieu Casanova)
+
+- New service org.jedit.util.CleanerService replacing use of finalize()
+  (Matthieu Casanova)
+
+- New methods JEditBuffer.getWordWrap() and JeditBuffer.setWordWrap()
+  (Matthieu Casanova)
+
+- New method DialogChooser.openChooserWindow() showing a chooser dialog
+  (Matthieu Casanova)
+
+- New method DialogChooser.openListChooserWindow() showing a chooser dialog list
+  (Matthieu Casanova)
+
+- New method Buffer.setLineSeparator() (Matthieu Casanova)
+
+- New method Buffer.reloadWithEncoding() (Matthieu Casanova)
+
+- New method StatusBar.updateEvent() (Matthieu Casanova)
+
+- New method BufferSet.contains() (Matthieu Casanova)
+
+- Deprecated methods removed
+    StandardUtilities.objectsEqual()
+    TextArea.showPopupMenu()
+    Mode.acceptFilename()
+    OperatingSystem.isDOSDerived()
+    OperatingSystem.hasJava17()
+    MiscUtilities.getFileNameNoExtension()
+    GUIUtilities.prettifyMenuLabel()
+    GUIUtilities.setAutoMnemonic()
+    GUIUtilities.parseColor()
+    GUIUtilities.parseStyle()
+    GUIUtilities.adjustForScreenBounds()
+    GUIUtilities.requestFocus()
+    GUIUtilities.isPopupTrigger()
+    GUIUtilities.isMiddleButton()
+    GUIUtilities.isRightButton()
+    GUIUtilities.getScreenBounds()
+    GUIUtilities.showPopupMenu()
+    GUIUtilities.showPopupMenu()
+    GUIUtilities.isAncestorOf()
+    GUIUtilities.getParentDialog()
+    GUIUtilities.setEnabledRecursively()
+    GUIUtilities.setButtonContentMargin()
+    GUIUtilities.makeSameSize()
+    GUIUtilities.defaultTableCellSize()
+    GUIUtilities.defaultColumnWidth()
+    GUIUtilities.defaultRowHeight()
+    Buffer.getFile()
+    VFSManager.runInAWTThread()
+    VFSManager.runInWorkThread() (Matthieu Casanova)
+
+}}}
+{{{ Editing
+
+- Never mark empty untitled buffers dirty, independent of settings
+  (Björn Kautler)
+
+- Never mark buffers dirty if contents are unchanged is now also properly
+  supported for untitled buffers (Björn Kautler)
+
+- New edit mode for Dockerfile (Matthieu Casanova)
+
+- New edit mode for QDoc (Dale Anson)
+
+- Status bar encoding widget allow to choose between updating the encoding
+  or reloading with a new encoding (Matthieu Casanova)
+
+- Updated java mode for new keywords introduced up to Java 17. (Dale Anson)
+
+- Add match index to beanshell replace context (#554 - Eric Le Lay)
+
+}}}
+
+}}}
+
+jEdit buffer local properties:
+:maxLineLen=80:wrap=hard:autoIndent=simple:noTabs=true:indentSize=2:tabSize=2:
+:folding=explicit:collapseFolds=2:

Modified: www/trunk/htdocs/devel.html
===================================================================
--- www/trunk/htdocs/devel.html	2024-08-03 17:51:56 UTC (rev 25751)
+++ www/trunk/htdocs/devel.html	2024-08-03 18:46:43 UTC (rev 25752)
@@ -75,6 +75,7 @@
 <li> <b>jEdit 5.4.0</b>: March 18, 2017</li>
 <li> <b>jEdit 5.5.0</b>: April 10, 2018</li>
 <li> <b>jEdit 5.6.0</b>: September 03, 2020</li>
+<li> <b>jEdit 5.7.0</b>: August 03, 2024</li>
 </ul>
 
 <a name="help" >

Modified: www/trunk/htdocs/download.html
===================================================================
--- www/trunk/htdocs/download.html	2024-08-03 17:51:56 UTC (rev 25751)
+++ www/trunk/htdocs/download.html	2024-08-03 18:46:43 UTC (rev 25752)
@@ -38,7 +38,7 @@
 
 <table cellpadding="0" cellspacing="5" border="0">
 
-<?php/* * /?><tr class="hilite">
+<?php /* * /?><tr class="hilite">
 <td></td>
 <td colspan="3"><b>Latest version: jEdit 5.2pre1 (pre-release) <a href="CHANGES52.txt">Changes </a></b></td>
 </tr>
@@ -117,18 +117,18 @@
 
 <tr>
 <td colspan="4"><hr></td>
-</tr><?php/**/?>
+</tr><?php /* */?>
 
 <tr class="hilite">
 <td></td>
-<td colspan="3"><b>Stable version: jEdit 5.6.0 <a href="CHANGES56.txt">Changes </a> </b></td>
+<td colspan="3"><b>Stable version: jEdit 5.7.0 <a href="CHANGES57.txt">Changes </a> </b></td>
 </tr>
 
 
 <tr class="hilite">
 <td>Download: </td>
-<td><a href="https://sourceforge.net/projects/jedit/files/jedit/5.6.0/jedit5.6.0install.jar/download">Java-based installer</a></td>
-<td>3.7 MiB</td>
+<td><a href="https://sourceforge.net/projects/jedit/files/jedit/5.7.0/jedit5.7.0install.jar/download">Java-based installer</a></td>
+<td>3.8 MiB</td>
 <td>(For any operating system)</td>
 </tr>
 
@@ -137,8 +137,8 @@
     echo ' class="hilite"';
 ?>>
 <td></td>
-<td><a href="https://sourceforge.net/projects/jedit/files/jedit/5.6.0/jedit5.6.0install.exe/download">Windows Installer</a></td>
-<td>4.8 MiB</td>
+<td><a href="https://sourceforge.net/projects/jedit/files/jedit/5.7.0/jedit5.7.0install.exe/download">Windows Installer</a></td>
+<td>5.0 MiB</td>
 <td></td>
 </tr>
 
@@ -147,8 +147,8 @@
     echo ' class="hilite"';
 ?>>
 <td></td>
-<td><a href="https://sourceforge.net/projects/jedit/files/jedit/5.6.0/jedit5.6.0install.dmg/download">OS X package</a></td>
-<td>5.5 MiB</td>
+<td><a href="https://sourceforge.net/projects/jedit/files/jedit/5.7.0/jedit5.7.0install.dmg/download">OS X package</a></td>
+<td>5.6 MiB</td>
 <td></td>
 </tr>
 
@@ -167,7 +167,7 @@
     echo ' class="hilite"';
 ?>>
 <td></td>
-<td><a href="https://sourceforge.net/projects/jedit/files/jedit/5.6.0/jedit-5.6.0-noarch-1sao.tgz/download">Slackware package</a></td>
+<td><a href="https://sourceforge.net/projects/jedit/files/jedit/5.7.0/jedit-5.7.0-noarch-1sao.tgz/download">Slackware package</a></td>
 <td>4.9 MiB</td>
 <td></td>
 </tr>
@@ -174,15 +174,15 @@
 
 <tr>
 <td></td>
-<td><a href="https://sourceforge.net/projects/jedit/files/jedit/5.6.0/jedit5.6.0manual-a4.pdf/download">User's guide</a></td>
+<td><a href="https://sourceforge.net/projects/jedit/files/jedit/5.7.0/jedit5.7.0manual-a4.pdf/download">User's guide</a></td>
 <td>0.6 MiB</td>
-<td>(PDF with A4 paper, 149 pages)</td>
+<td>(PDF with A4 paper, 150 pages)</td>
 <td></td>
 </tr>
 
 <tr>
 <td></td>
-<td><a href="https://sourceforge.net/projects/jedit/files/jedit/5.6.0/jedit5.6.0manual-letter.pdf/download">User's guide</a></td>
+<td><a href="https://sourceforge.net/projects/jedit/files/jedit/5.7.0/jedit5.7.0manual-letter.pdf/download">User's guide</a></td>
 <td>0.6 MiB</td>
 <td>(PDF with US letter paper, 159 pages)</td>
 <td></td>
@@ -190,12 +190,12 @@
 
 <tr>
 <td></td>
-<td><a href="https://sourceforge.net/projects/jedit/files/jedit/5.6.0/jedit5.6.0source.tar.bz2/download">Source code</a></td>
-<td>2.5 MiB</td>
+<td><a href="https://sourceforge.net/projects/jedit/files/jedit/5.7.0/jedit5.7.0source.tar.bz2/download">Source code</a></td>
+<td>2.6 MiB</td>
 <td></td>
 </tr>
 
-<tr>
+<!--tr>
 <td colspan="4"><hr></td>
 </tr>
 
@@ -207,7 +207,7 @@
 <tr class="hilite">
 <td>Download: </td>
 <td colspan=3><a href="http://www.tellurianring.com/projects/jedit-daily/">Daily Builds</a></td>
-</tr>
+</tr-->
 
 </table>
 
@@ -262,15 +262,15 @@
 add the following line to your <code>/etc/apt/sources.list</code>:</p>
 
 <pre>deb https://&lt;mirror&gt;.dl.sourceforge.net/project/jedit /
-<?php/*<deb-src https://&lt;mirror&gt;.dl.sourceforge.net/project/jedit />*/?></pre>
+<?php /*<deb-src https://&lt;mirror&gt;.dl.sourceforge.net/project/jedit />*/?></pre>
 
 e. g.
 
 <pre>deb https://freefr.dl.sourceforge.net/project/jedit /
-<?php/*<deb-src https://freefrs.dl.sourceforge.net/project/jedit />*/?></pre>
+<?php /*<deb-src https://freefrs.dl.sourceforge.net/project/jedit />*/?></pre>
 
 <p>Then, just run <code>apt-get update</code>, followed by
-<code>apt-get install jedit</code><?php/*
+<code>apt-get install jedit</code><?php /*
 or <code>apt-get source jedit</code>*/?>.</p>
 <p>The repository is now also secured and signed. To verify the packages
 you have to install the public key with which the repository is signed.
@@ -277,7 +277,7 @@
 This can be done by invoking
 <code>apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E6A233DBE3AFBEFC</code></p>
 <p>If you prefer manual installation of .deb files you can also download the
-<a href="https://sourceforge.net/projects/jedit/files/jedit/5.6.0/jedit_5.6.0_all.deb/download">Debian package</a>
+<a href="https://sourceforge.net/projects/jedit/files/jedit/5.7.0/jedit_5.7.0_all.deb/download">Debian package</a>
 manually.</p>
 </li>
 

Modified: www/trunk/htdocs/index.php
===================================================================
--- www/trunk/htdocs/index.php	2024-08-03 17:51:56 UTC (rev 25751)
+++ www/trunk/htdocs/index.php	2024-08-03 18:46:43 UTC (rev 25752)
@@ -1,11 +1,18 @@
+<?php
+if (($_SERVER['HTTPS'] ?: 'off') != 'on') {
+    header('HTTP/1.0 301 Moved Permanently');
+    header("Location: https://www.jedit.org{$_SERVER['REQUEST_URI']}");
+    exit;
+}
+?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <?php
-        $page = trim($_GET['page']);
+        $page = trim($_GET['page'] ?: '');
 
-        if ($page == "")
+        if ($page == "" || !preg_match("/^[a-z]+$/", $page))
             $page = "main";
 ?>
 <title> jEdit - Programmer's Text Editor -
@@ -19,7 +26,7 @@
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr align="center" valign="middle" bgcolor="#DDDDDD">
     <td colspan="7" nowrap="nowrap"><center>
-      <p class="header_text">Last Site Update: 03 September 2020 | <?php /* * /?>Latest Version: <a class="header_text" href="CHANGES52.txt">5.2pre1</a> | <?php/**/?>Stable Version: <a class="header_text" href="CHANGES56.txt">5.6.0</a></p>
+      <p class="header_text">Last Site Update: 03 August 2024 | <?php /* * /?>Latest Version: <a class="header_text" href="CHANGES52.txt">5.2pre1</a> | <?php/**/?>Stable Version: <a class="header_text" href="CHANGES57.txt">5.7.0</a></p>
     </center></td>
   </tr>
   <tr bgcolor="#666666">
@@ -108,10 +115,10 @@
               <td width="12"><img src="images/button.png" width="12" height="12" /></td>
               <td><a class="menu_links" href="http://community.jedit.org/">jEdit Community</a></td>
             </tr>
-            <tr>
+            <!--tr>
               <td width="12"><img src="images/button.png" width="12" height="12" /></td>
               <td><a class="menu_links" href="http://community.jedit.org/wiki/">jEdit Wiki</a></td>
-            </tr>
+            </tr-->
             <tr bgcolor="#BBBBBB">
               <td colspan="2"><span class="menu_headings">Help</span></td>
             </tr>
@@ -136,16 +143,16 @@
             </tr>
             <tr>
               <td width="12"><img src="images/button.png" width="12" height="12" /></td>
-              <td><a class="menu_links" href="http://www.sourceforge.net/projects/jedit/">SourceForge Project</a></td>
+              <td><a class="menu_links" href="https://www.sourceforge.net/projects/jedit/">SourceForge Project</a></td>
             </tr>
             <tr>
               <td colspan="2" class="menu_links" align="center">
-                <a href="http://sourceforge.net/projects/jedit"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=588&amp;type=10" border="0" width="80" height="15" alt="Get jEdit at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a>
+                <a href="https://sourceforge.net/projects/jedit"><img src="https://sflogo.sourceforge.net/sflogo.php?group_id=588&amp;type=10" border="0" width="80" height="15" alt="Get jEdit at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a>
               </td>
             </tr>
             <tr>
               <td colspan="2" class="menu_links" align="center">
-                <A href="http://www.jetbrains.com/idea/"><IMG
+                <A href="https://www.jetbrains.com/idea/"><IMG
                    src="images/logo_intellij_idea.png"
                    title="IntelliJ IDEA license provided free to jEdit developers for improving jEdit."
                    width="100" height="20" border="0" alt="IntelliJ IDEA Logo"></A>
@@ -153,7 +160,7 @@
             </tr>
             <tr>
               <td colspan="2" class="menu_links" align="center">
-                <A href="http://www.ej-technologies.com/products/jprofiler/overview.html"><IMG
+                <A href="https://www.ej-technologies.com/products/jprofiler/overview.html"><IMG
                    src="images/jProfiler.png"
                    title="JProfiler license provided free to jEdit developers for improving jEdit."
                    width="100" height="26" border="0" alt="JProfiler Logo"></A>
@@ -164,7 +171,7 @@
             </tr>
             <tr>
               <td colspan="2" class="menu_links" align="center">
-                <a href="http://sourceforge.net/project/project_donations.php?group_id=588"><img border="0" width="72" height="29" src="http://sourceforge.net/images/x-click-but7.gif"
+                <a href="https://sourceforge.net/project/project_donations.php?group_id=588"><img border="0" width="72" height="29" src="https://sourceforge.net/images/x-click-but7.gif"
                 title="Make a donation with PayPal - it's fast, free and secure!" /></a>
               </td>
             </tr>

Modified: www/trunk/htdocs/jEdit-version.txt
===================================================================
--- www/trunk/htdocs/jEdit-version.txt	2024-08-03 17:51:56 UTC (rev 25751)
+++ www/trunk/htdocs/jEdit-version.txt	2024-08-03 18:46:43 UTC (rev 25752)
@@ -1,8 +1,8 @@
-.version 5.6.0
-.build 05.06.99.00
-.stablebuild 05.06.99.00
+.version 5.7.0
+.build 05.07.99.00
+.stablebuild 05.07.99.00
 
 There is currently no development version
 
-The current stable version is 5.6.0. You can find a list of major
-changes since 5.5 at www.jedit.org/CHANGES56.txt
+The current stable version is 5.7.0. You can find a list of major
+changes since 5.6.0 at www.jedit.org/CHANGES57.txt

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

[ jEdit-commits ] SF.net SVN: jedit:[25751] jEdit/tags/jedit-5-7-0/

[<vam...@us...>]

Revision: 25751
          http://sourceforge.net/p/jedit/svn/25751
Author:   vampire0
Date:     2024-08-03 17:51:56 +0000 (Sat, 03 Aug 2024)
Log Message:
-----------
Tagging 5.7.0 for release.

Added Paths:
-----------
    jEdit/tags/jedit-5-7-0/

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

[ jEdit-commits ] SF.net SVN: jedit:[25750] jEdit/trunk

[<vam...@us...>]

Revision: 25750
          http://sourceforge.net/p/jedit/svn/25750
Author:   vampire0
Date:     2024-08-03 17:48:33 +0000 (Sat, 03 Aug 2024)
Log Message:
-----------
Increase version to 5.7.0

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/org/gjt/sp/jedit/jEdit.java

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2024-08-03 17:42:21 UTC (rev 25749)
+++ jEdit/trunk/doc/CHANGES.txt	2024-08-03 17:48:33 UTC (rev 25750)
@@ -2,7 +2,7 @@
        (changes since jEdit 5.6.0)
 :encoding=UTF-8:
 
-{{{ Version 5.7pre1
+{{{ Version 5.7.0
 
 Thanks to Björn Kautler, Matthieu Casanova, Dale Anson, and Eric Le Lay
 for contributing to this release.

Modified: jEdit/trunk/org/gjt/sp/jedit/jEdit.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2024-08-03 17:42:21 UTC (rev 25749)
+++ jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2024-08-03 17:48:33 UTC (rev 25750)
@@ -105,7 +105,7 @@
 	public static String getBuild()
 	{
 		// (major).(minor).(<99 = preX, 99 = "final").(bug fix)
-		return "05.07.01.00";
+		return "05.07.99.00";
 	} //}}}
 
 	//{{{ main() method

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

[ jEdit-commits ] SF.net SVN: jedit:[25749] jEdit/trunk/doc/CHANGES.t xt

[<vam...@us...>]

Revision: 25749
          http://sourceforge.net/p/jedit/svn/25749
Author:   vampire0
Date:     2024-08-03 17:42:21 +0000 (Sat, 03 Aug 2024)
Log Message:
-----------
Add Eric Le Lay to contributors

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2024-07-31 16:27:34 UTC (rev 25748)
+++ jEdit/trunk/doc/CHANGES.txt	2024-08-03 17:42:21 UTC (rev 25749)
@@ -4,8 +4,8 @@
 
 {{{ Version 5.7pre1
 
-Thanks to Björn Kautler, Matthieu Casanova and Dale Anson for contributing to
-this release.
+Thanks to Björn Kautler, Matthieu Casanova, Dale Anson, and Eric Le Lay
+for contributing to this release.
 
 {{{ Bug Fixes
 

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

[ jEdit-commits ] SF.net SVN: jedit:[25748] plugins/QDocSideKick/tags/1 .0/

[<ker...@us...>]

Revision: 25748
          http://sourceforge.net/p/jedit/svn/25748
Author:   kerik-sf
Date:     2024-07-31 16:27:34 +0000 (Wed, 31 Jul 2024)
Log Message:
-----------
Tag 1.0 for release

Added Paths:
-----------
    plugins/QDocSideKick/tags/1.0/

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

[ jEdit-commits ] SF.net SVN: jedit:[25747] plugins/QDocSideKick/tags/1 .0/

[<ker...@us...>]

Revision: 25747
          http://sourceforge.net/p/jedit/svn/25747
Author:   kerik-sf
Date:     2024-07-31 16:26:41 +0000 (Wed, 31 Jul 2024)
Log Message:
-----------
will retag 1.0

Removed Paths:
-------------
    plugins/QDocSideKick/tags/1.0/

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

[ jEdit-commits ] SF.net SVN: jedit:[25746] plugins/QDocSideKick/trunk/ src/sidekick/qdoc/QdocSideKickParser.java

[<ker...@us...>]

Revision: 25746
          http://sourceforge.net/p/jedit/svn/25746
Author:   kerik-sf
Date:     2024-07-31 16:20:40 +0000 (Wed, 31 Jul 2024)
Log Message:
-----------
Fix parsing of indented text

See https://sourceforge.net/p/jedit/plugin-central-submission/1082/ discussion

Modified Paths:
--------------
    plugins/QDocSideKick/trunk/src/sidekick/qdoc/QdocSideKickParser.java

Modified: plugins/QDocSideKick/trunk/src/sidekick/qdoc/QdocSideKickParser.java
===================================================================
--- plugins/QDocSideKick/trunk/src/sidekick/qdoc/QdocSideKickParser.java	2024-07-19 20:52:31 UTC (rev 25745)
+++ plugins/QDocSideKick/trunk/src/sidekick/qdoc/QdocSideKickParser.java	2024-07-31 16:20:40 UTC (rev 25746)
@@ -118,7 +118,7 @@
                 }
 
                 if (index > -1) {
-                    String section = lineText.substring(index, length);
+                    String section = lineText.substring(index, index + length);
                     String title = lineText.substring(index + length, lineText.length());
                     startLocation = new Location(lineNumber, index);
                     startPosition = new SideKickPosition(buffer.getLineStartOffset(lineNumber) + index);

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

[ jEdit-commits ] SF.net SVN: jedit:[25745] plugins/QDocSideKick/tags/1 .0/

[<dal...@us...>]

Revision: 25745
          http://sourceforge.net/p/jedit/svn/25745
Author:   daleanson
Date:     2024-07-19 20:52:31 +0000 (Fri, 19 Jul 2024)
Log Message:
-----------
Tag for release

Added Paths:
-----------
    plugins/QDocSideKick/tags/1.0/

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

[ jEdit-commits ] SF.net SVN: jedit:[25744] plugins/QDocSideKick/tags/1 .0/

[<dal...@us...>]

Revision: 25744
          http://sourceforge.net/p/jedit/svn/25744
Author:   daleanson
Date:     2024-07-19 20:52:01 +0000 (Fri, 19 Jul 2024)
Log Message:
-----------
Deleting to replace

Removed Paths:
-------------
    plugins/QDocSideKick/tags/1.0/

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

[ jEdit-commits ] SF.net SVN: jedit:[25743] plugins/QDocSideKick/trunk

[<dal...@us...>]

Revision: 25743
          http://sourceforge.net/p/jedit/svn/25743
Author:   daleanson
Date:     2024-07-19 20:51:05 +0000 (Fri, 19 Jul 2024)
Log Message:
-----------
Update docs, use the name "QDocSideKick" consistently.

Modified Paths:
--------------
    plugins/QDocSideKick/trunk/QDocSideKick.props
    plugins/QDocSideKick/trunk/build.xml
    plugins/QDocSideKick/trunk/src/sidekick/qdoc/QdocSideKickPlugin.java

Modified: plugins/QDocSideKick/trunk/QDocSideKick.props
===================================================================
--- plugins/QDocSideKick/trunk/QDocSideKick.props	2024-07-19 20:26:33 UTC (rev 25742)
+++ plugins/QDocSideKick/trunk/QDocSideKick.props	2024-07-19 20:51:05 UTC (rev 25743)
@@ -2,7 +2,7 @@
 plugin.sidekick.qdoc.QdocSideKickPlugin.activate=defer
 plugin.sidekick.qdoc.QdocSideKickPlugin.author=Dale Anson, Alan Ezust
 plugin.sidekick.qdoc.QdocSideKickPlugin.description=SideKick for QDoc files
-plugin.sidekick.qdoc.QdocSideKickPlugin.docs=docs/qdoc.html
+plugin.sidekick.qdoc.QdocSideKickPlugin.docs=docs/QDocSideKick.html
 plugin.sidekick.qdoc.QdocSideKickPlugin.longdescription=description.html
 plugin.sidekick.qdoc.QdocSideKickPlugin.name=QDocSideKick
 plugin.sidekick.qdoc.QdocSideKickPlugin.usePluginHome=false

Modified: plugins/QDocSideKick/trunk/build.xml
===================================================================
--- plugins/QDocSideKick/trunk/build.xml	2024-07-19 20:26:33 UTC (rev 25742)
+++ plugins/QDocSideKick/trunk/build.xml	2024-07-19 20:51:05 UTC (rev 25743)
@@ -25,7 +25,7 @@
    <selector id="packageFiles">
       <and>
          <or>
-            <filename name="**/qdoc.html" />
+            <filename name="**/QDocSideKick.html" />
          </or>
       </and>
    </selector>

Modified: plugins/QDocSideKick/trunk/src/sidekick/qdoc/QdocSideKickPlugin.java
===================================================================
--- plugins/QDocSideKick/trunk/src/sidekick/qdoc/QdocSideKickPlugin.java	2024-07-19 20:26:33 UTC (rev 25742)
+++ plugins/QDocSideKick/trunk/src/sidekick/qdoc/QdocSideKickPlugin.java	2024-07-19 20:51:05 UTC (rev 25743)
@@ -8,7 +8,6 @@
 
 
     public void start() {
-    // TODO: see EditModesPane.java around line 265 for how to load the qdoc edit mode dynamically
     }
 
     public void stop() {

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

[ jEdit-commits ] SF.net SVN: jedit:[25742] plugins

[<dal...@us...>]

Revision: 25742
          http://sourceforge.net/p/jedit/svn/25742
Author:   daleanson
Date:     2024-07-19 20:26:33 +0000 (Fri, 19 Jul 2024)
Log Message:
-----------
Renaming from QDoc to QDocSideKick

Added Paths:
-----------
    plugins/QDocSideKick/

Removed Paths:
-------------
    plugins/QDoc/

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

[ jEdit-commits ] SF.net SVN: jedit:[25741] plugins/QDoc/trunk

[<dal...@us...>]

Revision: 25741
          http://sourceforge.net/p/jedit/svn/25741
Author:   daleanson
Date:     2024-07-19 20:13:37 +0000 (Fri, 19 Jul 2024)
Log Message:
-----------
renamed from qdoc.props to QDocSideKick.props

Added Paths:
-----------
    plugins/QDoc/trunk/QDocSideKick.props

Removed Paths:
-------------
    plugins/QDoc/trunk/qdoc.props

Copied: plugins/QDoc/trunk/QDocSideKick.props (from rev 25740, plugins/QDoc/trunk/qdoc.props)
===================================================================
--- plugins/QDoc/trunk/QDocSideKick.props	                        (rev 0)
+++ plugins/QDoc/trunk/QDocSideKick.props	2024-07-19 20:13:37 UTC (rev 25741)
@@ -0,0 +1,19 @@
+# Basic Plugin Information
+plugin.sidekick.qdoc.QdocSideKickPlugin.activate=defer
+plugin.sidekick.qdoc.QdocSideKickPlugin.author=Dale Anson, Alan Ezust
+plugin.sidekick.qdoc.QdocSideKickPlugin.description=SideKick for QDoc files
+plugin.sidekick.qdoc.QdocSideKickPlugin.docs=docs/qdoc.html
+plugin.sidekick.qdoc.QdocSideKickPlugin.longdescription=description.html
+plugin.sidekick.qdoc.QdocSideKickPlugin.name=QDocSideKick
+plugin.sidekick.qdoc.QdocSideKickPlugin.usePluginHome=false
+plugin.sidekick.qdoc.QdocSideKickPlugin.version=1.0
+
+# Dependencies
+plugin.sidekick.qdoc.QdocSideKickPlugin.depend.0=jedit 05.04.00.00
+plugin.sidekick.qdoc.QdocSideKickPlugin.depend.1=jdk 11
+plugin.sidekick.qdoc.QdocSideKickPlugin.depend.2=plugin eclipseicons.EclipseIconsPlugin 1.0
+plugin.sidekick.qdoc.QdocSideKickPlugin.depend.3=plugin sidekick.SideKickPlugin 1.7
+
+# set mode to 'qdoc' for this sidekick
+sidekick.parser.qdoc.label=qdoc
+mode.qdoc.sidekick.parser=qdoc

Deleted: plugins/QDoc/trunk/qdoc.props
===================================================================
--- plugins/QDoc/trunk/qdoc.props	2024-07-19 20:12:06 UTC (rev 25740)
+++ plugins/QDoc/trunk/qdoc.props	2024-07-19 20:13:37 UTC (rev 25741)
@@ -1,19 +0,0 @@
-# Basic Plugin Information
-plugin.sidekick.qdoc.QdocSideKickPlugin.activate=defer
-plugin.sidekick.qdoc.QdocSideKickPlugin.author=Dale Anson, Alan Ezust
-plugin.sidekick.qdoc.QdocSideKickPlugin.description=SideKick for QDoc files
-plugin.sidekick.qdoc.QdocSideKickPlugin.docs=docs/qdoc.html
-plugin.sidekick.qdoc.QdocSideKickPlugin.longdescription=description.html
-plugin.sidekick.qdoc.QdocSideKickPlugin.name=QDocSideKick
-plugin.sidekick.qdoc.QdocSideKickPlugin.usePluginHome=false
-plugin.sidekick.qdoc.QdocSideKickPlugin.version=1.0
-
-# Dependencies
-plugin.sidekick.qdoc.QdocSideKickPlugin.depend.0=jedit 05.04.00.00
-plugin.sidekick.qdoc.QdocSideKickPlugin.depend.1=jdk 11
-plugin.sidekick.qdoc.QdocSideKickPlugin.depend.2=plugin eclipseicons.EclipseIconsPlugin 1.0
-plugin.sidekick.qdoc.QdocSideKickPlugin.depend.3=plugin sidekick.SideKickPlugin 1.7
-
-# set mode to 'qdoc' for this sidekick
-sidekick.parser.qdoc.label=qdoc
-mode.qdoc.sidekick.parser=qdoc

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