regroup default type

CHANGELOG.md

@@ -35,6 +35,8 @@
 - [groovy] add .gradle as groovy
 - Use the new shell-posix schema for shell scripts by default
 - [json] highlight JSON object keys
+- rename lib/default.hrc to lib/def.hrc
+- move 'default' type implementation from proto.hrc to base/default.hrc 
 
 ### Added
 - New package type of base - all packed. Hrc and hrd files in one archive. Directory 'auto' not in archive.

hrc/hrc/base/default.hrc

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hrc PUBLIC "-//Cail Lomecb//DTD Colorer HRC take5//EN"
+  "http://colorer.sf.net/2003/hrc.dtd">
+<hrc version="take5" xmlns="http://colorer.sf.net/2003/hrc"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://colorer.sf.net/2003/hrc http://colorer.sf.net/2003/hrc.xsd">
+
+    <type name="default">
+        <scheme name='default' />
+    </type>
+
+</hrc>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is the Colorer Library.
+   -
+   - The Initial Developer of the Original Code is
+   - Cail Lomecb <[email protected]>.
+   - Portions created by the Initial Developer are Copyright (C) 1999-2008
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->

hrc/hrc/proto.hrc

@@ -1085,6 +1085,7 @@
     </prototype>
 
     <prototype name="default" group="other" description="default type">
+        <location link="base/default.hrc" />
         <filename weight='1'>//</filename>
         <parameters>
             <!-- firstline -->
@@ -1093,15 +1094,10 @@
         </parameters>
     </prototype>
 
-    <type name="default">
-        <scheme name='default' />
-    </type>
-
-
     <!--  packages  -->
 
     <package name="def" description="core definitions">
-        <location link="lib/default.hrc" />
+        <location link="lib/def.hrc" />
     </package>
     <package name="uri" description="URI (RFC 2396)">
         <location link="lib/uri.hrc" />