Update kate synatax highlighting files

This closes Bug 764

78 files changed, 20813 insertions, 5059 deletions

diff --git a/kate/data/CMakeLists.txt b/kate/data/CMakeLists.txt
index 212dfafcd..1a8384ca2 100644
--- a/kate/data/CMakeLists.txt
+++ b/kate/data/CMakeLists.txt
@@ -56,6 +56,13 @@ install( FILES
     noweb.xml objectivecpp.xml opal.xml pgn.xml rapidq.xml
     scala.xml sisu.xml systemc.xml texinfo.xml xorg.xml
     xul.xml yaml.xml zonnon.xml
+    alert_indent.xml ample.xml asm-dsp56k.xml asm-m68k.xml
+    clojure.xml coffee.xml crk.xml dosbat.xml fsharp.xml
+    gdb.xml glosstex.xml go.xml grammar.xml jam.xml m4.xml
+    mel.xml oors.xml pango.xml qmake.xml qml.xml relaxng.xml
+    relaxngcompact.xml rest.xml sed.xml systemverilog.xml
+    tads3.xml tcsh.xml valgrind-suppression.xml vera.xml
+    wml.xml zsh.xml
     ${CMAKE_CURRENT_BINARY_DIR}/html-php.xml
     ${CMAKE_CURRENT_BINARY_DIR}/css-php.xml
     ${CMAKE_CURRENT_BINARY_DIR}/javascript-php.xml
diff --git a/kate/data/alert_indent.xml b/kate/data/alert_indent.xml
new file mode 100644
index 000000000..c000e2b66
--- /dev/null
+++ b/kate/data/alert_indent.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!--
+  This file is part of TDE's kate project.
+
+  copyright   : (C) 2004 by Dominik Haumann
+  email       : dhdev at gmx dot de
+
+ **********************************************************************
+ * This library is free software; you can redistribute it and/or      *
+ * modify it under the terms of the GNU Library General Public        *
+ * License as published by the Free Software Foundation; either       *
+ * version 2 of the License, or (at your option) any later version.   *
+ *                                                                    *
+ * This library 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  *
+ * Library General Public License for more details.                   *
+ *                                                                    *
+ * You should have received a copy of the GNU Library General Public  *
+ * License along with this library; if not, write to the              *
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,   *
+ * Boston, MA  02110-1301, USA.                                       *
+ **********************************************************************
+
+ This file is included in every file that highlights the "alerts" keywords.
+ That's why extensions and mimetype are empty.
+-->
+<language version="1.08" kateversion="2.3" name="Alerts_indent" section="Other" extensions="" mimetype="" author="Dominik Haumann ([email protected])" license="LGPL" hidden="true">
+  <highlighting>
+    <list name="alerts">
+      <item> ### </item>
+      <item> ALERT </item>
+      <item> BUG </item>
+      <item> DANGER </item>
+      <item> DEPRECATED </item>
+      <item> FIXME </item>
+      <item> HACK </item>
+      <item> NOTE </item>
+      <item> NOTICE </item>
+      <item> SECURITY </item>
+      <item> TASK </item>
+      <item> TEST </item>
+      <item> TESTING </item>
+      <item> TODO </item>
+      <item> WARNING </item>
+    </list>
+    <contexts>
+      <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
+        <keyword attribute="Alert" context="#stay" String="alerts" />
+      </context>
+    </contexts>
+    <itemDatas>
+      <itemData name="Normal Text" defStyleNum="dsNormal"/>
+      <itemData name="Alert" defStyleNum="dsAlert"/>
+    </itemDatas>
+  </highlighting>
+  <general>
+    <folding indentationsensitive="1" />
+    <keywords casesensitive="1"/>
+  </general>
+</language>
diff --git a/kate/data/ample.xml b/kate/data/ample.xml
new file mode 100644
index 000000000..d5298f15c
--- /dev/null
+++ b/kate/data/ample.xml
@@ -0,0 +1,3813 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<language name="AMPLE" version="0.2" kateversion="2.4" section="Scripts" extensions="*.ample;*.menu;*.startup" mimetype="text/x-amplesrc" priority="5" author="Christian Parg ([email protected])" license="Apache &amp; LGPL" >
+<!--
+#################################################################################################
+## AMPLE Highlight file by Christian Parg (cparg_(at)_gmx_de)
+## Note:
+##   - AMPLE ist the Scripting Language of Mentor Graphics' IC-Station Full Custom IC Tools
+##   - used c.xml as starting point
+## v0.2
+##   - added several function lists
+##   - added Spice 'f' suffix
+## This file comes without any warranty and is licensed under Apache License or LGPL V2 or later
+#################################################################################################
+
+Note: I used this hack to extract the functions from the reference documentation:
+   strings icstn_ref.pdf | fgrep '/Title ' | fgrep '\(' | sed -e 's#/Title (#    <item> #' -e 's#)$# </item>#' -e 's#\\##g' -e 's#()##' > ~/tmp/bla2
+
+-->
+  <highlighting>
+    <list name="keywords">
+      <item> break </item>
+      <item> builtin </item>
+      <item> case </item>
+      <item> continue </item>
+      <item> do </item>
+      <item> else </item>
+      <item> extern </item>
+      <item> local </item>
+      <item> for </item>
+      <item> function </item>
+      <item> if </item>
+      <item> return </item>
+      <item> switch </item>
+      <item> while </item>
+    </list>
+    <list name="resvar">
+      <item> void </item>
+      <item> undefined </item>
+      <item> $abort_enable </item>
+      <item> $dofile_arg1 </item>
+      <item> $dofile_arg2 </item>
+      <item> $dofile_arg3 </item>
+      <item> $dofile_arg4 </item>
+      <item> $dofile_arg5 </item>
+      <item> $dofile_arg6 </item>
+      <item> $dofile_arg7 </item>
+      <item> $dofile_arg8 </item>
+      <item> $dofile_arg9 </item>
+      <item> $dofile_arg10 </item>
+      <item> $dofile_arg11 </item>
+      <item> $dofile_arg12 </item>
+      <item> $dofile_arg13 </item>
+      <item> $dofile_arg14 </item>
+      <item> $dofile_arg15 </item>
+      <item> $dofile_arg16 </item>
+      <item> $dofile_arg17 </item>
+      <item> $dofile_arg18 </item>
+      <item> $dofile_arg19 </item>
+      <item> $dofile_arg20 </item>
+      <item> $dofile_arg_count </item>
+      <item> $dofile_result </item>
+      <item> false </item>
+      <item> off </item>
+      <item> on </item>
+      <item> pi </item>
+      <item> $stderr </item>
+      <item> $stdin </item>
+      <item> $stdout </item>
+      <item> true </item>
+      <item> two_pi </item>
+    </list>
+
+    <!-- plain IC AMPLE builtin Functions -->
+
+    <list name="builtinfct">
+      <item> abs </item>
+      <item> acos </item>
+      <item> $add_complex </item>
+      <item> $add_status_args </item>
+      <item> asin </item>
+      <item> atan </item>
+      <item> atan2 </item>
+      <item> $bad_status </item>
+      <item> ceil </item>
+      <item> $clear_file_error </item>
+      <item> $close_file </item>
+      <item> $complex_imaginary </item>
+      <item> $complex_real </item>
+      <item> $conjugate_complex </item>
+      <item> $constrain_value </item>
+      <item> cos </item>
+      <item> cosh </item>
+      <item> cot </item>
+      <item> $create_complex </item>
+      <item> $create_string_registry </item>
+      <item> $create_vector </item>
+      <item> csc </item>
+      <item> $current_user </item>
+      <item> $cvt_exist_file </item>
+      <item> $cvt_read_variable </item>
+      <item> $cvt_type </item>
+      <item> $cvt_write_variable </item>
+      <item> $date </item>
+      <item> deg </item>
+      <item> $divide_complex </item>
+      <item> $dofile </item>
+      <item> $e </item>
+      <item> $eof </item>
+      <item> exp </item>
+      <item> $expand_rest </item>
+      <item> $f </item>
+      <item> $file_error </item>
+      <item> $file_exist </item>
+      <item> $file_pos </item>
+      <item> $file_status </item>
+      <item> floor </item>
+      <item> $flush_file </item>
+      <item> $format </item>
+      <item> $free_stream_id </item>
+      <item> $function_help </item>
+      <item> $function_ref_help </item>
+      <item> $function_signature </item>
+      <item> $g </item>
+      <item> $generate_rand </item>
+      <item> $get_ample_status </item>
+      <item> $get_app_name </item>
+      <item> $get_app_ver </item>
+      <item> $get_env </item>
+      <item> $i </item>
+      <item> $integer_divide </item>
+      <item> length </item>
+      <item> $list_overwritten_functions </item>
+      <item> $load_library </item>
+      <item> log </item>
+      <item> log10 </item>
+      <item> $lower_string </item>
+      <item> $magnitude_complex </item>
+      <item> $multiply_complex </item>
+      <item> $n </item>
+      <item> $number_string </item>
+      <item> $open_file </item>
+      <item> $ord_to_string </item>
+      <item> $phase_complex </item>
+      <item> $pop_ample_status </item>
+      <item> pow </item>
+      <item> $qsort </item>
+      <item> rad </item>
+      <item> $raise_status </item>
+      <item> $read_file </item>
+      <item> $reads_file </item>
+      <item> $real_time </item>
+      <item> $register_alias </item>
+      <item> $register_args </item>
+      <item> $register_command </item>
+      <item> $resolve_mgc_path </item>
+      <item> $round </item>
+      <item> $round_prec </item>
+      <item> $s </item>
+      <item> sec </item>
+      <item> $seek_file </item>
+      <item> $set_function_status </item>
+      <item> $set_rand </item>
+      <item> $set_status </item>
+      <item> $set_thousands </item>
+      <item> $set_transcript_mode </item>
+      <item> sin </item>
+      <item> sinh </item>
+      <item> sqrt </item>
+      <item> $sscanf </item>
+      <item> $strcat </item>
+      <item> $strftime </item>
+      <item> $string_locate </item>
+      <item> $string_status </item>
+      <item> $string_to_ord </item>
+      <item> $subtract_complex </item>
+      <item> $suspend </item>
+      <item> $sys_time </item>
+      <item> $system </item>
+      <item> tan </item>
+      <item> tanh </item>
+      <item> $time </item>
+      <item> $traceback </item>
+      <item> $truncate </item>
+      <item> $type </item>
+      <item> $undefine_id </item>
+      <item> $upper_string </item>
+      <item> $vector_count_range </item>
+      <item> $vector_element_divide </item>
+      <item> $vector_element_multiply </item>
+      <item> $vector_find </item>
+      <item> $vector_histogram </item>
+      <item> $vector_integrate </item>
+      <item> $vector_max </item>
+      <item> $vector_min </item>
+      <item> $vector_search </item>
+      <item> $vector_slope </item>
+      <item> $vector_sum </item>
+      <item> $vendor_cpu </item>
+      <item> $where_is </item>
+      <item> $write_file </item>
+      <item> $writeln_file </item>
+      <item> $writes_file </item>
+    </list>
+    <list name="icstnfct">
+      <item> $acquire_license </item>
+      <item> $activate_net </item>
+      <item> $activate_net_by_handle </item>
+      <item> $activate_net_by_name </item>
+      <item> $activate_port </item>
+      <item> $activate_port_by_handle </item>
+      <item> $activate_port_by_name </item>
+      <item> $add_cell </item>
+      <item> $add_contacts </item>
+      <item> $add_device </item>
+      <item> $add_fp_shape </item>
+      <item> $add_group_property </item>
+      <item> $add_metal </item>
+      <item> $add_multiple_text </item>
+      <item> $add_net_members_to_ports </item>
+      <item> $add_overflow </item>
+      <item> $add_overflow_by_handle </item>
+      <item> $add_panel </item>
+      <item> $add_path </item>
+      <item> $add_path_device </item>
+      <item> $add_point_device </item>
+      <item> $add_property </item>
+      <item> $add_property_group_members </item>
+      <item> $add_property_group_selections </item>
+      <item> $add_property_text </item>
+      <item> $add_route </item>
+      <item> $add_row </item>
+      <item> $add_rows_by_area </item>
+      <item> $add_ruler </item>
+      <item> $add_shape </item>
+      <item> $add_shape_device </item>
+      <item> $add_text </item>
+      <item> $add_text_on_ports </item>
+      <item> $add_to_library </item>
+      <item> $add_to_net </item>
+      <item> $add_to_port </item>
+      <item> $add_via </item>
+      <item> $align </item>
+      <item> $apply_print_vector_attributes </item>
+      <item> $attach_library </item>
+      <item> $autofloorplan </item>
+      <item> $autoplace_blocks </item>
+      <item> $autoplace_corner_cells </item>
+      <item> $autoplace_group </item>
+      <item> $autoplace_pins </item>
+      <item> $autoplace_ports </item>
+      <item> $autoplace_power_vias </item>
+      <item> $autoplace_standard_cells </item>
+      <item> $autoroute_all </item>
+      <item> $autoroute_nets </item>
+      <item> $autoroute_overflow </item>
+      <item> $backannotate_net_parameters </item>
+      <item> $build_hotplot_setup </item>
+      <item> $build_lib </item>
+      <item> $build_ports </item>
+      <item> $build_ports_shapes </item>
+      <item> $build_ports_text_location </item>
+      <item> $build_power_strap_shapes </item>
+      <item> $build_power_straps </item>
+      <item> $build_read_gdsii_optfile </item>
+      <item> $change_array </item>
+      <item> $change_aspect </item>
+      <item> $change_cursor_status </item>
+      <item> $change_device </item>
+      <item> $change_from_object_template </item>
+      <item> $change_group_property </item>
+      <item> $change_layer </item>
+      <item> $change_net </item>
+      <item> $change_object_attributes </item>
+      <item> $change_object_template </item>
+      <item> $change_overflow </item>
+      <item> $change_overflow_by_handle </item>
+      <item> $change_path </item>
+      <item> $change_port </item>
+      <item> $change_property </item>
+      <item> $change_property_group_members </item>
+      <item> $change_property_group_selections </item>
+      <item> $change_property_text </item>
+      <item> $change_row </item>
+      <item> $change_text </item>
+      <item> $change_via_type </item>
+      <item> $change_window </item>
+      <item> $checkpoint_cell </item>
+      <item> $checkpoint_cell_by_name </item>
+      <item> $check_drc </item>
+      <item> $check_fn </item>
+      <item> $check_instances </item>
+      <item> $check_overflows </item>
+      <item> $check_polygons </item>
+      <item> $check_power_pins </item>
+      <item> $check_preconditions </item>
+      <item> $check_shorts_all </item>
+      <item> $check_shorts_selected </item>
+      <item> $clear_clipboard </item>
+      <item> $close_layout_library </item>
+      <item> $close_logic </item>
+      <item> $close_selection </item>
+      <item> $close_session </item>
+      <item> $close_window </item>
+      <item> $compact </item>
+      <item> $compose_groups </item>
+      <item> $compose_layer_geometries </item>
+      <item> $compose_layer_selections </item>
+      <item> $connect_instance </item>
+      <item> $convert_dracula </item>
+      <item> $copy </item>
+      <item> $copy_edit_hotkey_settings </item>
+      <item> $copy_relative </item>
+      <item> $copy_to_clipboard </item>
+      <item> $copy_to_fp_layer </item>
+      <item> $copy_to_layer </item>
+      <item> $create_cell </item>
+      <item> $create_def_from_layout_view </item>
+      <item> $create_layout_library </item>
+      <item> $create_layout_view </item>
+      <item> $create_layout_view_from_def </item>
+      <item> $create_layout_view_from_lef </item>
+      <item> $create_layout_view_from_verilog </item>
+      <item> $create_lef_from_layout_library </item>
+      <item> $create_lef_from_layout_view </item>
+      <item> $create_library </item>
+      <item> $create_process </item>
+      <item> $create_toolbar </item>
+      <item> $create_via_cell </item>
+      <item> $create_viewpoint </item>
+      <item> $cut </item>
+      <item> $cut_stretch </item>
+      <item> $deactivate </item>
+      <item> $define_hotkey </item>
+      <item> $define_layer_alias </item>
+      <item> $define_layer_name </item>
+      <item> $define_layer_set </item>
+      <item> $define_max_gate_width </item>
+      <item> $define_mos_site_type </item>
+      <item> $define_must_connect </item>
+      <item> $define_net_pair </item>
+      <item> $define_net_shield </item>
+      <item> $define_route_transform </item>
+      <item> $delete </item>
+      <item> $delete_area </item>
+      <item> $delete_connectivity </item>
+      <item> $delete_drc_all </item>
+      <item> $delete_drc_area </item>
+      <item> $delete_drc_check </item>
+      <item> $delete_drc_current </item>
+      <item> $delete_drc_point </item>
+      <item> $delete_drc_scan </item>
+      <item> $delete_from_library </item>
+      <item> $delete_group_property </item>
+      <item> $delete_lvs_results </item>
+      <item> $delete_panel </item>
+      <item> $delete_property </item>
+      <item> $delete_property_group_members </item>
+      <item> $delete_property_group_selections </item>
+      <item> $delete_routing </item>
+      <item> $delete_ruler </item>
+      <item> $delete_rulers_all </item>
+      <item> $detach_library </item>
+      <item> $display_channels </item>
+      <item> $does_cell_exist </item>
+      <item> $edit_library </item>
+      <item> $edit_process </item>
+      <item> $edit_process_override </item>
+      <item> $enable_edit_layout_library </item>
+      <item> $export_drc_check </item>
+      <item> $extract_cell_connectivity </item>
+      <item> $extract_direct_distributed_parameters </item>
+      <item> $extract_direct_lumped_parameters </item>
+      <item> $extract_mask_distributed_parameters </item>
+      <item> $extract_mask_lumped_parameters </item>
+      <item> $fillet </item>
+      <item> $fillet_area </item>
+      <item> $filter_group </item>
+      <item> $fit_fp_shape </item>
+      <item> $flatten </item>
+      <item> $flatten_hierarchy </item>
+      <item> $flip </item>
+      <item> $flip_in_place </item>
+      <item> $flip_on_axis </item>
+      <item> $form_ic_action_buttons_gadget </item>
+      <item> $form_ic_color_paint_chip_gadget </item>
+      <item> $form_ic_display_gadget </item>
+      <item> $form_ic_layer_palette_gadget </item>
+      <item> $form_ic_patterns_list_box_gadget </item>
+      <item> $form_single_check_box_gadget </item>
+      <item> $fracture </item>
+      <item> $freeze_window </item>
+      <item> $get_absolute_points </item>
+      <item> $get_acap_info </item>
+      <item> $get_active_ic_window </item>
+      <item> $get_active_net </item>
+      <item> $get_active_port </item>
+      <item> $get_arc </item>
+      <item> $get_area </item>
+      <item> $get_area_estimate </item>
+      <item> $get_array_value </item>
+      <item> $get_auto_checkpoint </item>
+      <item> $get_basepoint </item>
+      <item> $get_bottom_orient_set </item>
+      <item> $get_boundary </item>
+      <item> $get_cap_extent </item>
+      <item> $get_cap_neg_pin </item>
+      <item> $get_cap_pos_pin </item>
+      <item> $get_cell_boundary </item>
+      <item> $get_cell_configuration </item>
+      <item> $get_cell_equivalents </item>
+      <item> $get_cell_info </item>
+      <item> $get_cell_list_dts </item>
+      <item> $get_cell_path </item>
+      <item> $get_cell_refs </item>
+      <item> $get_cell_xrefs </item>
+      <item> $get_circle </item>
+      <item> $get_closed_polygon </item>
+      <item> $get_closest_object_location </item>
+      <item> $get_closest_object_points </item>
+      <item> $get_compact_add_blkgs </item>
+      <item> $get_compact_jog_power </item>
+      <item> $get_compose_layer_geometries </item>
+      <item> $get_compose_layer_selections </item>
+      <item> $get_connectivity_layers </item>
+      <item> $get_containment </item>
+      <item> $get_context_contrast </item>
+      <item> $get_context_from_world </item>
+      <item> $get_crosshair_target_radius </item>
+      <item> $get_crosshair_target_style </item>
+      <item> $get_def_bus_bit_characters </item>
+      <item> $get_def_bus_bit_characters </item>
+      <item> $get_def_divider_character </item>
+      <item> $get_def_divider_character </item>
+      <item> $get_def_non_orthogonal </item>
+      <item> $set_def_non_orthogonal </item>
+      <item> $get_design_layers </item>
+      <item> $get_design_path </item>
+      <item> $get_design_refs </item>
+      <item> $get_dev_info </item>
+      <item> $get_dev_layer </item>
+      <item> $get_dev_rule </item>
+      <item> $get_device_alias </item>
+      <item> $get_device_iobj </item>
+      <item> $get_device_name </item>
+      <item> $get_drc_check_current_count </item>
+      <item> $get_drc_check_original_count </item>
+      <item> $get_drc_check_polygon_count </item>
+      <item> $get_drc_check_scan_count </item>
+      <item> $get_drc_current_result_check_name </item>
+      <item> $get_drc_current_result_number </item>
+      <item> $get_drc_current_result_points </item>
+      <item> $get_drc_current_result_type </item>
+      <item> $get_drc_default_layer_directory_name </item>
+      <item> $get_drc_default_summary_report_file_name </item>
+      <item> $get_drc_results_database_check_count </item>
+      <item> $get_drc_results_database_check_names </item>
+      <item> $get_drc_results_database_nonempty_check_names </item>
+      <item> $get_drc_results_database_result_count </item>
+      <item> $get_drc_results_database_scan_check_names </item>
+      <item> $get_drc_results_database_scan_result_count </item>
+      <item> $get_endangered_nets </item>
+      <item> $get_externals_info </item>
+      <item> $get_fp_compute_num_rows </item>
+      <item> $get_fp_compute_route_area_ratio </item>
+      <item> $get_fp_extend_row </item>
+      <item> $get_fractured_rectangles </item>
+      <item> $get_gadget_value </item>
+      <item> $get_graphic_preempt_list </item>
+      <item> $get_group_members </item>
+      <item> $get_group_names </item>
+      <item> $get_group_property_names </item>
+      <item> $get_highlight_count </item>
+      <item> $get_hotkey_settings </item>
+      <item> $get_ic_cell_windows </item>
+      <item> $get_ic_location </item>
+      <item> $get_ic_window_names </item>
+      <item> $get_instance_extent </item>
+      <item> $get_instance_fp_extent </item>
+      <item> $get_instance_version </item>
+      <item> $get_internal_row_layout </item>
+      <item> $get_internal_row_sequence </item>
+      <item> $get_layer_info </item>
+      <item> $get_layer_minimum_spacing </item>
+      <item> $get_layer_minimum_width </item>
+      <item> $get_layer_names </item>
+      <item> $get_layer_number </item>
+      <item> $get_layer_palette_height </item>
+      <item> $get_layers </item>
+      <item> $get_layout_counterpart </item>
+      <item> $get_layout_window </item>
+      <item> $get_lef_bus_bit_characters </item>
+      <item> $get_lef_bus_bit_characters </item>
+      <item> $get_lef_divider_character </item>
+      <item> $get_lef_divider_character </item>
+      <item> $get_lef_non_orthogonal </item>
+      <item> $set_lef_non_orthogonal </item>
+      <item> $get_lef_overlap_boundary </item>
+      <item> $set_lef_overlap_boundary </item>
+      <item> $get_left_orient_set </item>
+      <item> $get_library_cells </item>
+      <item> $get_licenses </item>
+      <item> $get_loaded_logic </item>
+      <item> $get_logic_counterpart </item>
+      <item> $get_mark </item>
+      <item> $get_mask_device_count </item>
+      <item> $get_mask_discrepancy_count </item>
+      <item> $get_mask_net_count </item>
+      <item> $get_mos_gate_pin </item>
+      <item> $get_mos_sd_extent </item>
+      <item> $get_mos_sd_pin </item>
+      <item> $get_nearest_edge </item>
+      <item> $get_net_members </item>
+      <item> $get_new_object_handles </item>
+      <item> $get_object_extent </item>
+      <item> $get_object_info </item>
+      <item> $get_outdated_cells </item>
+      <item> $get_outline </item>
+      <item> $get_panel_extent </item>
+      <item> $get_panel_names </item>
+      <item> $get_parameter_default </item>
+      <item> $get_peek_protected </item>
+      <item> $get_perimeter </item>
+      <item> $get_pid </item>
+      <item> $get_pin_members </item>
+      <item> $get_pins </item>
+      <item> $get_points </item>
+      <item> $get_port_members </item>
+      <item> $get_process </item>
+      <item> $get_process_override </item>
+      <item> $get_property_handles </item>
+      <item> $get_property_names </item>
+      <item> $get_property_value </item>
+      <item> $get_report_obj_types </item>
+      <item> $get_report_options </item>
+      <item> $get_res_extent </item>
+      <item> $get_res_neg_pin </item>
+      <item> $get_res_pos_pin </item>
+      <item> $get_reserved </item>
+      <item> $get_right_orient_set </item>
+      <item> $get_rotation_point </item>
+      <item> $get_router_add_blkgs </item>
+      <item> $get_router_align_cells </item>
+      <item> $get_router_align_mode </item>
+      <item> $get_router_block_feed_percent </item>
+      <item> $get_router_block_stub_mode </item>
+      <item> $get_router_cell_feed_percent </item>
+      <item> $get_router_channel_ocr </item>
+      <item> $get_router_connect_blk_pwr </item>
+      <item> $get_router_constrain_power </item>
+      <item> $get_router_create_power_grid </item>
+      <item> $get_router_limit_area </item>
+      <item> $get_router_overflow_mode </item>
+      <item> $get_router_pre_route </item>
+      <item> $get_router_preserve_power_width </item>
+      <item> $get_router_probe_extent_margin </item>
+      <item> $get_router_x_margin </item>
+      <item> $get_router_y_margin </item>
+      <item> $get_row_members </item>
+      <item> $get_rule_file_check_count </item>
+      <item> $get_rule_file_check_names </item>
+      <item> $get_rule_file_select_check_count </item>
+      <item> $get_rule_file_select_check_names </item>
+      <item> $get_select_area </item>
+      <item> $get_select_cell </item>
+      <item> $get_select_count </item>
+      <item> $get_select_extent </item>
+      <item> $get_select_set </item>
+      <item> $get_selectable_layers </item>
+      <item> $get_selected_edges </item>
+      <item> $get_short_segment </item>
+      <item> $get_snapped_points </item>
+      <item> $get_status_line_info </item>
+      <item> $get_top_orient_set </item>
+      <item> $get_traced_properties_numeric </item>
+      <item> $get_traced_properties_string </item>
+      <item> $get_visible_layers </item>
+      <item> $get_window_cell </item>
+      <item> $get_window_info </item>
+      <item> $get_world_from_context </item>
+      <item> $get_world_from_screen </item>
+      <item> $group </item>
+      <item> $group_by_name </item>
+      <item> $group_by_property </item>
+      <item> $group_on_selected </item>
+      <item> $group_text </item>
+      <item> $hide_layer_palette </item>
+      <item> $hide_status_line </item>
+      <item> $hide_system_toolbar </item>
+      <item> $hide_toolbar </item>
+      <item> $hide_tooltips </item>
+      <item> $highlight_all </item>
+      <item> $highlight_all_discrepancies </item>
+      <item> $highlight_all_incorrect </item>
+      <item> $highlight_all_unmatched </item>
+      <item> $highlight_by_location </item>
+      <item> $highlight_by_name </item>
+      <item> $highlight_by_property </item>
+      <item> $highlight_current_discrepancy </item>
+      <item> $highlight_discrepancy </item>
+      <item> $highlight_first_discrepancy </item>
+      <item> $highlight_group </item>
+      <item> $highlight_hierarchical_net </item>
+      <item> $highlight_next_discrepancy </item>
+      <item> $highlight_on_selected </item>
+      <item> $highlight_previous_discrepancy </item>
+      <item> $highlight_protected </item>
+      <item> $hotplot </item>
+      <item> $hotplot_invoke </item>
+      <item> $insert_posts </item>
+      <item> $iroute </item>
+      <item> $is_cell_outdated </item>
+      <item> $is_cell_reserved </item>
+      <item> $is_cell_salvage_pending </item>
+      <item> $is_edge_selected </item>
+      <item> $is_history_active </item>
+      <item> $is_layer_palette_visible </item>
+      <item> $is_library_reserved </item>
+      <item> $is_licensed </item>
+      <item> $is_process_reserved </item>
+      <item> $is_select_set_closed </item>
+      <item> $is_status_line_visible </item>
+      <item> $is_toolbar_visible </item>
+      <item> $link_floorplan_shape </item>
+      <item> $list_drc_all </item>
+      <item> $list_drc_check </item>
+      <item> $list_drc_selected </item>
+      <item> $load_design_hierarchy </item>
+      <item> $load_hotkey_settings </item>
+      <item> $load_logic </item>
+      <item> $load_mask_results </item>
+      <item> $load_process </item>
+      <item> $load_rules </item>
+      <item> $loc </item>
+      <item> $lvs_direct </item>
+      <item> $lvs_mask </item>
+      <item> $make_array </item>
+      <item> $make_cell </item>
+      <item> $make_font </item>
+      <item> $make_keypad_panels </item>
+      <item> $make_net </item>
+      <item> $make_port </item>
+      <item> $mark_instances_as_ignored </item>
+      <item> $measure_distance </item>
+      <item> $merge </item>
+      <item> $mgc_scope_name_pre_init </item>
+      <item> $minimize_levels </item>
+      <item> $minimize_vias </item>
+      <item> $modify_centerline </item>
+      <item> $move </item>
+      <item> $move_acap </item>
+      <item> $move_cursor_down </item>
+      <item> $move_cursor_left </item>
+      <item> $move_cursor_right </item>
+      <item> $move_cursor_up </item>
+      <item> $move_in_row </item>
+      <item> $move_on_row </item>
+      <item> $move_relative </item>
+      <item> $msg_cell_route_hierarchy_mode </item>
+      <item> $notch </item>
+      <item> $notch_special </item>
+      <item> $open_cell </item>
+      <item> $open_cell_map </item>
+      <item> $open_clipboard </item>
+      <item> $open_context_cell </item>
+      <item> $open_group_window </item>
+      <item> $open_hierarchy_window </item>
+      <item> $open_layout_library </item>
+      <item> $open_layout_view </item>
+      <item> $open_logic </item>
+      <item> $open_logic_by_name </item>
+      <item> $open_mask_logic </item>
+      <item> $open_selected_cell </item>
+      <item> $partition_hierarchy </item>
+      <item> $paste </item>
+      <item> $peek </item>
+      <item> $peek_area </item>
+      <item> $place </item>
+      <item> $place_on_row </item>
+      <item> $place_schematic_instances </item>
+      <item> $place_schematic_ports </item>
+      <item> $polygon_to_path </item>
+      <item> $print_cell </item>
+      <item> $prompt_for_ic_line </item>
+      <item> $prompt_for_ic_location </item>
+      <item> $prompt_for_ic_polygon </item>
+      <item> $prompt_for_ic_polyline </item>
+      <item> $prompt_for_ic_rectangle </item>
+      <item> $prompt_for_ic_route </item>
+      <item> $protect </item>
+      <item> $protect_group </item>
+      <item> $protect_nets </item>
+      <item> $read_def </item>
+      <item> $read_gdsii </item>
+      <item> $read_lef </item>
+      <item> $read_spice </item>
+      <item> $read_verilog </item>
+      <item> $read_xml </item>
+      <item> $redo </item>
+      <item> $redraw </item>
+      <item> $redraw_area </item>
+      <item> $regenerate_device </item>
+      <item> $release_license </item>
+      <item> $reload_cell </item>
+      <item> $reload_cell_by_name </item>
+      <item> $remove_contacts_by_area </item>
+      <item> $remove_contacts_by_m2 </item>
+      <item> $remove_contacts_by_via </item>
+      <item> $remove_from_net </item>
+      <item> $remove_from_port </item>
+      <item> $remove_metal_by_area </item>
+      <item> $reopen_selection </item>
+      <item> $repeat_fn </item>
+      <item> $repeat_objects </item>
+      <item> $replace_cell </item>
+      <item> $replace_toolbar </item>
+      <item> $report_active_context </item>
+      <item> $report_all_mask_devices </item>
+      <item> $report_all_mask_nets </item>
+      <item> $report_capacitor_type </item>
+      <item> $report_cell </item>
+      <item> $report_cell_list_dts </item>
+      <item> $report_current_direct_net </item>
+      <item> $report_current_discrepancy </item>
+      <item> $report_current_mask_device </item>
+      <item> $report_current_mask_discrepancy </item>
+      <item> $report_current_mask_net </item>
+      <item> $report_design_layers </item>
+      <item> $report_design_tree </item>
+      <item> $report_design_xref </item>
+      <item> $report_direct_thresholds </item>
+      <item> $report_drc_all </item>
+      <item> $report_drc_area </item>
+      <item> $report_drc_check </item>
+      <item> $report_drc_current </item>
+      <item> $report_drc_point </item>
+      <item> $report_drc_scan </item>
+      <item> $report_eco_results </item>
+      <item> $report_gb_type </item>
+      <item> $report_group </item>
+      <item> $report_group_names </item>
+      <item> $report_hotkey_settings </item>
+      <item> $report_layer_attributes </item>
+      <item> $report_layer_sets </item>
+      <item> $report_library </item>
+      <item> $report_licenses </item>
+      <item> $report_logic </item>
+      <item> $report_lvs_results </item>
+      <item> $report_mask_results </item>
+      <item> $report_mask_thresholds </item>
+      <item> $report_mos_type </item>
+      <item> $report_net_parameters </item>
+      <item> $report_nets </item>
+      <item> $report_outdated_cells </item>
+      <item> $report_panels </item>
+      <item> $report_paired_nets </item>
+      <item> $report_peek_protected </item>
+      <item> $report_place_route </item>
+      <item> $report_ports </item>
+      <item> $report_process </item>
+      <item> $report_property_names </item>
+      <item> $report_reserved </item>
+      <item> $report_resistor_type </item>
+      <item> $report_row_capacity </item>
+      <item> $report_scoring </item>
+      <item> $report_selected </item>
+      <item> $report_shown_mask_devices </item>
+      <item> $report_shown_mask_discrepancies </item>
+      <item> $report_shown_mask_nets </item>
+      <item> $report_text_file </item>
+      <item> $report_via_type </item>
+      <item> $report_windows </item>
+      <item> $reselect </item>
+      <item> $reserve_cell </item>
+      <item> $reserve_cell_by_name </item>
+      <item> $reserve_library </item>
+      <item> $reserve_process </item>
+      <item> $reset_basepoint </item>
+      <item> $reset_licensing </item>
+      <item> $resize </item>
+      <item> $restore_defaults </item>
+      <item> $restore_drc_results </item>
+      <item> $restructure_nets </item>
+      <item> $resync_cell </item>
+      <item> $resync_cell_by_name </item>
+      <item> $resync_library </item>
+      <item> $resync_viewpoint </item>
+      <item> $rotate </item>
+      <item> $route_point_to_point </item>
+      <item> $rule_file_loaded </item>
+      <item> $run_eco </item>
+      <item> $salvage_cell </item>
+      <item> $salvage_reference </item>
+      <item> $save_cell </item>
+      <item> $save_cell_as </item>
+      <item> $save_cell_by_name </item>
+      <item> $save_drc_results </item>
+      <item> $save_layout_library </item>
+      <item> $save_library </item>
+      <item> $save_process </item>
+      <item> $save_process_by_name </item>
+      <item> $save_setup </item>
+      <item> $scale_cells </item>
+      <item> $scale_context </item>
+      <item> $scan_drc_all </item>
+      <item> $scan_drc_check </item>
+      <item> $sdl_cleanup </item>
+      <item> $sdl_create_cell </item>
+      <item> $select_all </item>
+      <item> $select_area </item>
+      <item> $select_area_polygon </item>
+      <item> $select_by_name </item>
+      <item> $select_by_property </item>
+      <item> $select_drc_all </item>
+      <item> $select_drc_check </item>
+      <item> $select_edge </item>
+      <item> $select_fixed_routes </item>
+      <item> $select_folds </item>
+      <item> $select_group </item>
+      <item> $select_highlighted </item>
+      <item> $select_ignored_instances </item>
+      <item> $select_on_selected </item>
+      <item> $select_one </item>
+      <item> $select_range </item>
+      <item> $select_text </item>
+      <item> $select_unplaced_schematic_instances </item>
+      <item> $select_unplaced_schematic_ports </item>
+      <item> $send_to_prompt </item>
+      <item> $set_active_port_style </item>
+      <item> $get_active_port_style </item>
+      <item> $set_active_ruler_layer </item>
+      <item> $get_active_ruler_layer </item>
+      <item> $set_add_route_alignment </item>
+      <item> $get_add_route_alignment </item>
+      <item> $set_add_route_checking </item>
+      <item> $get_add_route_checking </item>
+      <item> $set_add_route_padding </item>
+      <item> $get_add_route_padding </item>
+      <item> $set_angle_mode </item>
+      <item> $set_angle_mode_enforcement </item>
+      <item> $get_angle_mode_enforcement </item>
+      <item> $set_anneal_cooling_factor </item>
+      <item> $get_anneal_cooling_factor </item>
+      <item> $set_arc_segments </item>
+      <item> $get_arc_segments </item>
+      <item> $set_array_display_style </item>
+      <item> $get_array_display_style </item>
+      <item> $set_auto_focus_active_window </item>
+      <item> $get_auto_focus_active_window </item>
+      <item> $set_auto_outline_mode </item>
+      <item> $get_auto_outline_mode </item>
+      <item> $set_auto_restructure </item>
+      <item> $get_auto_restructure </item>
+      <item> $set_autonotch </item>
+      <item> $get_autonotch </item>
+      <item> $set_autoselect </item>
+      <item> $get_autoselect </item>
+      <item> $set_basepoint </item>
+      <item> $set_cell_configuration </item>
+      <item> $set_cell_logical_name </item>
+      <item> $set_cell_origin </item>
+      <item> $set_cell_process </item>
+      <item> $set_cell_route_hierarchy_mode </item>
+      <item> $set_cell_type </item>
+      <item> $set_check_drc_message_mode </item>
+      <item> $set_circle_input_style </item>
+      <item> $get_circle_input_style </item>
+      <item> $set_click_distance </item>
+      <item> $get_click_distance </item>
+      <item> $set_compact_center_wires </item>
+      <item> $get_compact_center_wires </item>
+      <item> $set_compact_corner_spacing </item>
+      <item> $get_compact_corner_spacing </item>
+      <item> $set_compact_cost_factor </item>
+      <item> $get_compact_cost_factor </item>
+      <item> $set_compact_ext_cells </item>
+      <item> $get_compact_ext_cells </item>
+      <item> $set_compact_ext_rows </item>
+      <item> $get_compact_ext_rows </item>
+      <item> $set_compact_jogs </item>
+      <item> $get_compact_jogs </item>
+      <item> $set_compact_offset_vias </item>
+      <item> $get_compact_offset_vias </item>
+      <item> $set_compact_path_mini </item>
+      <item> $get_compact_path_mini </item>
+      <item> $set_compact_route_levels </item>
+      <item> $get_compact_route_levels </item>
+      <item> $set_compact_suppress_output </item>
+      <item> $get_compact_suppress_output </item>
+      <item> $set_compact_to </item>
+      <item> $get_compact_to </item>
+      <item> $set_compact_wires_mode </item>
+      <item> $get_compact_wires_mode </item>
+      <item> $set_contact_count </item>
+      <item> $set_context </item>
+      <item> $set_context_up </item>
+      <item> $set_copy_ports_on_copy </item>
+      <item> $get_copy_ports_on_copy </item>
+      <item> $set_cross_probe </item>
+      <item> $get_cross_probe </item>
+      <item> $set_cross_probe_mode </item>
+      <item> $set_crosshair_style </item>
+      <item> $get_crosshair_style </item>
+      <item> $set_crosshair_target </item>
+      <item> $set_crosshair_target_radius </item>
+      <item> $set_cull </item>
+      <item> $set_def_bus_bit_characters </item>
+      <item> $set_def_divider_character </item>
+      <item> $set_def_non_orthogonal </item>
+      <item> $set_direct_thresholds </item>
+      <item> $set_display_window_title </item>
+      <item> $get_display_window_title </item>
+      <item> $set_drag_complexity </item>
+      <item> $get_drag_complexity </item>
+      <item> $set_drag_ruler_mode </item>
+      <item> $get_drag_ruler_mode </item>
+      <item> $set_drc_check </item>
+      <item> $set_drc_first </item>
+      <item> $set_drc_fit_factor </item>
+      <item> $set_drc_jump </item>
+      <item> $set_drc_last </item>
+      <item> $set_drc_next </item>
+      <item> $set_drc_previous </item>
+      <item> $set_drc_result </item>
+      <item> $set_drc_skip </item>
+      <item> $set_duplicate_ports_policy </item>
+      <item> $set_dynamic_drc </item>
+      <item> $get_dynamic_drc </item>
+      <item> $set_dynamic_drc_complexity </item>
+      <item> $get_dynamic_drc_complexity </item>
+      <item> $set_dynamic_hotkey_mode </item>
+      <item> $get_dynamic_hotkey_mode </item>
+      <item> $set_dynamic_loading </item>
+      <item> $get_dynamic_loading </item>
+      <item> $set_dynamic_message_mode </item>
+      <item> $get_dynamic_message_mode </item>
+      <item> $set_dynamic_pre_locations </item>
+      <item> $set_error_handling </item>
+      <item> $get_error_handling </item>
+      <item> $set_fill_display </item>
+      <item> $get_fill_display </item>
+      <item> $set_filled_layers </item>
+      <item> $get_filled_layers </item>
+      <item> $set_first_direct_net </item>
+      <item> $set_first_mask_device </item>
+      <item> $set_first_mask_discrepancy </item>
+      <item> $set_first_mask_net </item>
+      <item> $set_fp_bottom_gap </item>
+      <item> $get_fp_bottom_gap </item>
+      <item> $set_fp_left_gap </item>
+      <item> $get_fp_left_gap </item>
+      <item> $set_fp_lower_aspect </item>
+      <item> $get_fp_lower_aspect </item>
+      <item> $set_fp_max_height </item>
+      <item> $get_fp_max_height </item>
+      <item> $set_fp_max_width </item>
+      <item> $get_fp_max_width </item>
+      <item> $set_fp_num_rows </item>
+      <item> $get_fp_num_rows </item>
+      <item> $set_fp_right_gap </item>
+      <item> $get_fp_right_gap </item>
+      <item> $set_fp_route_area_ratio </item>
+      <item> $get_fp_route_area_ratio </item>
+      <item> $set_fp_top_gap </item>
+      <item> $get_fp_top_gap </item>
+      <item> $set_fp_upper_aspect </item>
+      <item> $get_fp_upper_aspect </item>
+      <item> $set_fractured_route </item>
+      <item> $get_fractured_route </item>
+      <item> $set_gadget_value </item>
+      <item> $set_gate_size </item>
+      <item> $set_gds_allanglefracture </item>
+      <item> $get_gds_allanglefracture </item>
+      <item> $set_gds_anglemode </item>
+      <item> $get_gds_anglemode </item>
+      <item> $set_gds_auto_identify_vias </item>
+      <item> $get_gds_auto_identify_vias </item>
+      <item> $set_gds_cellnamecase </item>
+      <item> $get_gds_cellnamecase </item>
+      <item> $set_gds_cellnamelength </item>
+      <item> $get_gds_cellnamelength </item>
+      <item> $set_gds_cellnamemap </item>
+      <item> $get_gds_cellnamemap </item>
+      <item> $set_gds_fixpolygons </item>
+      <item> $get_gds_fixpolygons </item>
+      <item> $set_gds_layerfilter </item>
+      <item> $get_gds_layerfilter </item>
+      <item> $set_gds_layermap </item>
+      <item> $get_gds_layermap </item>
+      <item> $set_gds_library </item>
+      <item> $get_gds_library </item>
+      <item> $set_gds_lockcells </item>
+      <item> $get_gds_lockcells </item>
+      <item> $set_gds_logfile </item>
+      <item> $get_gds_logfile </item>
+      <item> $set_gds_process </item>
+      <item> $get_gds_process </item>
+      <item> $set_gds_properties </item>
+      <item> $get_gds_properties </item>
+      <item> $set_gds_read_scale </item>
+      <item> $get_gds_read_scale </item>
+      <item> $set_gds_replace </item>
+      <item> $get_gds_replace </item>
+      <item> $set_gds_save_cells </item>
+      <item> $get_gds_save_cells </item>
+      <item> $set_gds_skipunmapped </item>
+      <item> $get_gds_skipunmapped </item>
+      <item> $set_gds_textheightmap </item>
+      <item> $get_gds_textheightmap </item>
+      <item> $set_gds_transcript </item>
+      <item> $get_gds_transcript </item>
+      <item> $set_graphic_interrupt </item>
+      <item> $get_graphic_interrupt </item>
+      <item> $set_gravity_distance </item>
+      <item> $get_gravity_distance </item>
+      <item> $set_grid </item>
+      <item> $set_guideline_net_size </item>
+      <item> $get_guideline_net_size </item>
+      <item> $set_guideline_width_limit </item>
+      <item> $get_guideline_width_limit </item>
+      <item> $set_hocr </item>
+      <item> $get_hocr </item>
+      <item> $set_hotkey_mode </item>
+      <item> $get_hotkey_mode </item>
+      <item> $set_ic_array_columns </item>
+      <item> $get_ic_array_columns </item>
+      <item> $set_ic_array_rows </item>
+      <item> $get_ic_array_rows </item>
+      <item> $set_ic_aspect </item>
+      <item> $get_ic_aspect </item>
+      <item> $set_ic_cell_flip </item>
+      <item> $get_ic_cell_flip </item>
+      <item> $set_ic_cell_orientation </item>
+      <item> $get_ic_cell_orientation </item>
+      <item> $set_ic_cell_rotation </item>
+      <item> $get_ic_cell_rotation </item>
+      <item> $set_ic_cell_scale </item>
+      <item> $get_ic_cell_scale </item>
+      <item> $set_ic_layer </item>
+      <item> $get_ic_layer </item>
+      <item> $set_ic_path_end_style </item>
+      <item> $get_ic_path_end_style </item>
+      <item> $set_ic_path_old_style </item>
+      <item> $get_ic_path_old_style </item>
+      <item> $set_ic_path_padding </item>
+      <item> $get_ic_path_padding </item>
+      <item> $set_ic_path_style </item>
+      <item> $get_ic_path_style </item>
+      <item> $set_ic_path_width </item>
+      <item> $get_ic_path_width </item>
+      <item> $set_ic_property_owner </item>
+      <item> $get_ic_property_owner </item>
+      <item> $set_ic_property_replace </item>
+      <item> $get_ic_property_replace </item>
+      <item> $set_ic_property_text_height </item>
+      <item> $get_ic_property_text_height </item>
+      <item> $set_ic_property_text_horz_just </item>
+      <item> $get_ic_property_text_horz_just </item>
+      <item> $set_ic_property_text_orientation </item>
+      <item> $get_ic_property_text_orientation </item>
+      <item> $set_ic_property_text_vert_just </item>
+      <item> $get_ic_property_text_vert_just </item>
+      <item> $set_ic_row_auto_resize </item>
+      <item> $get_ic_row_auto_resize </item>
+      <item> $set_ic_row_justification </item>
+      <item> $get_ic_row_justification </item>
+      <item> $set_ic_row_site </item>
+      <item> $get_ic_row_site </item>
+      <item> $set_ic_row_slideable </item>
+      <item> $get_ic_row_slideable </item>
+      <item> $set_instance_extent_display </item>
+      <item> $get_instance_extent_display </item>
+      <item> $set_instance_name_display </item>
+      <item> $get_instance_name_display </item>
+      <item> $set_instance_origin_display </item>
+      <item> $get_instance_origin_display </item>
+      <item> $set_instance_route_hierarchy_mode </item>
+      <item> $set_iobj_points </item>
+      <item> $set_iroute_accept_at_current_loc </item>
+      <item> $set_iroute_auto_shield </item>
+      <item> $set_iroute_checking </item>
+      <item> $set_iroute_push_mode </item>
+      <item> $set_iroute_route_transforms </item>
+      <item> $set_iroute_select_with_active_layer </item>
+      <item> $set_iroute_show_alignment </item>
+      <item> $set_iroute_show_ortho_path </item>
+      <item> $set_iroute_via_generator_is_default </item>
+      <item> $set_iroute_width_change </item>
+      <item> $set_join_on_move </item>
+      <item> $get_join_on_move </item>
+      <item> $set_layer_appearance </item>
+      <item> $set_layer_palette_height </item>
+      <item> $get_layer_palette_height </item>
+      <item> $set_layer_path_width </item>
+      <item> $set_lef_bus_bit_characters </item>
+      <item> $get_lef_bus_bit_characters </item>
+      <item> $set_lef_divider_character </item>
+      <item> $get_lef_divider_character </item>
+      <item> $set_lef_non_orthogonal </item>
+      <item> $get_lef_non_orthogonal </item>
+      <item> $set_lef_overlap_boundary </item>
+      <item> $get_lef_overlap_boundary </item>
+      <item> $set_library_cell_type </item>
+      <item> $set_library_site_types </item>
+      <item> $set_location_mode </item>
+      <item> $get_location_mode </item>
+      <item> $set_logic_source </item>
+      <item> $set_logical_correspondence </item>
+      <item> $set_lvs_all_capacitor_pins_swappable </item>
+      <item> $get_lvs_all_capacitor_pins_swappable </item>
+      <item> $set_lvs_component_subtype_property </item>
+      <item> $get_lvs_component_subtype_property </item>
+      <item> $set_lvs_component_type_properties </item>
+      <item> $get_lvs_component_type_properties </item>
+      <item> $set_lvs_default_direct_source_subname </item>
+      <item> $get_lvs_default_direct_source_subname </item>
+      <item> $set_lvs_default_mask_source_subname </item>
+      <item> $get_lvs_default_mask_source_subname </item>
+      <item> $set_lvs_default_report_name </item>
+      <item> $get_lvs_default_report_name </item>
+      <item> $set_lvs_filter_unused_bipolar_transistors </item>
+      <item> $get_lvs_filter_unused_bipolar_transistors </item>
+      <item> $set_lvs_filter_unused_mos_transistors </item>
+      <item> $get_lvs_filter_unused_mos_transistors </item>
+      <item> $set_lvs_ground_names </item>
+      <item> $get_lvs_ground_names </item>
+      <item> $set_lvs_ignore_ports </item>
+      <item> $get_lvs_ignore_ports </item>
+      <item> $set_lvs_pin_name_properties </item>
+      <item> $get_lvs_pin_name_properties </item>
+      <item> $set_lvs_power_names </item>
+      <item> $get_lvs_power_names </item>
+      <item> $set_lvs_recognize_gates </item>
+      <item> $get_lvs_recognize_gates </item>
+      <item> $set_lvs_recognize_only_simple_gates </item>
+      <item> $get_lvs_recognize_only_simple_gates </item>
+      <item> $set_lvs_reduce_parallel_bipolar_transistors </item>
+      <item> $get_lvs_reduce_parallel_bipolar_transistors </item>
+      <item> $set_lvs_reduce_parallel_capacitors </item>
+      <item> $get_lvs_reduce_parallel_capacitors </item>
+      <item> $set_lvs_reduce_parallel_diodes </item>
+      <item> $get_lvs_reduce_parallel_diodes </item>
+      <item> $set_lvs_reduce_parallel_mos_transistors </item>
+      <item> $get_lvs_reduce_parallel_mos_transistors </item>
+      <item> $set_lvs_reduce_parallel_resistors </item>
+      <item> $get_lvs_reduce_parallel_resistors </item>
+      <item> $set_lvs_reduce_series_capacitors </item>
+      <item> $get_lvs_reduce_series_capacitors </item>
+      <item> $set_lvs_reduce_series_resistors </item>
+      <item> $get_lvs_reduce_series_resistors </item>
+      <item> $set_lvs_reduce_split_gates </item>
+      <item> $get_lvs_reduce_split_gates </item>
+      <item> $set_lvs_report_list_limit </item>
+      <item> $get_lvs_report_list_limit </item>
+      <item> $set_lvs_write_instance_cross_reference </item>
+      <item> $get_lvs_write_instance_cross_reference </item>
+      <item> $set_lvs_write_net_cross_reference </item>
+      <item> $get_lvs_write_net_cross_reference </item>
+      <item> $set_mark </item>
+      <item> $set_mask_auto_view </item>
+      <item> $set_mask_default_database_name </item>
+      <item> $get_mask_default_database_name </item>
+      <item> $set_mask_thresholds </item>
+      <item> $get_mask_thresholds </item>
+      <item> $set_max_auto_display </item>
+      <item> $get_max_auto_display </item>
+      <item> $set_modify_distance </item>
+      <item> $get_modify_distance </item>
+      <item> $set_mos_cell_type </item>
+      <item> $get_mos_cell_type </item>
+      <item> $set_mos_share </item>
+      <item> $get_mos_share </item>
+      <item> $set_net_priority </item>
+      <item> $set_new_window_cull </item>
+      <item> $get_new_window_cull </item>
+      <item> $set_new_window_grid </item>
+      <item> $get_new_window_grid </item>
+      <item> $set_next_direct_net </item>
+      <item> $set_next_mask_device </item>
+      <item> $set_next_mask_discrepancy </item>
+      <item> $set_next_mask_net </item>
+      <item> $set_packed_vias </item>
+      <item> $set_padding_grid </item>
+      <item> $set_path_display_style </item>
+      <item> $get_path_display_style </item>
+      <item> $set_peek_on_view </item>
+      <item> $get_peek_on_view </item>
+      <item> $set_peek_protect </item>
+      <item> $set_pex_backannotation_distributed </item>
+      <item> $get_pex_backannotation_distributed </item>
+      <item> $set_pex_backannotation_lumped </item>
+      <item> $get_pex_backannotation_lumped </item>
+      <item> $set_pex_capacitance_scale </item>
+      <item> $get_pex_capacitance_scale </item>
+      <item> $set_pex_coupled_distributed </item>
+      <item> $get_pex_coupled_distributed </item>
+      <item> $set_pex_delay </item>
+      <item> $get_pex_delay </item>
+      <item> $set_pex_exclude_distributed </item>
+      <item> $get_pex_exclude_distributed </item>
+      <item> $set_pex_include_distributed </item>
+      <item> $get_pex_include_distributed </item>
+      <item> $set_pex_netlist_distributed </item>
+      <item> $get_pex_netlist_distributed </item>
+      <item> $set_pex_netlist_lumped </item>
+      <item> $get_pex_netlist_lumped </item>
+      <item> $set_pex_netlist_simple </item>
+      <item> $get_pex_netlist_simple </item>
+      <item> $set_pex_options_lumped </item>
+      <item> $get_pex_options_lumped </item>
+      <item> $set_pex_report_distributed </item>
+      <item> $get_pex_report_distributed </item>
+      <item> $set_pex_report_lumped </item>
+      <item> $get_pex_report_lumped </item>
+      <item> $set_pin_shape_editing </item>
+      <item> $set_placement_select_mode </item>
+      <item> $get_placement_select_mode </item>
+      <item> $set_point_select_mode </item>
+      <item> $get_point_select_mode </item>
+      <item> $set_point_select_reset_basepoint </item>
+      <item> $get_point_select_reset_basepoint </item>
+      <item> $set_port_pin_name_display </item>
+      <item> $get_port_pin_name_display </item>
+      <item> $set_preferred_overflow_layers </item>
+      <item> $get_preferred_overflow_layers </item>
+      <item> $set_previous_direct_net </item>
+      <item> $set_previous_mask_device </item>
+      <item> $set_previous_mask_discrepancy </item>
+      <item> $set_previous_mask_net </item>
+      <item> $set_print_appearance </item>
+      <item> $set_print_array_style </item>
+      <item> $get_print_array_style </item>
+      <item> $set_print_cull </item>
+      <item> $get_print_cull </item>
+      <item> $set_print_grid </item>
+      <item> $get_print_grid </item>
+      <item> $set_print_layers </item>
+      <item> $get_print_layers </item>
+      <item> $set_print_levels </item>
+      <item> $get_print_levels </item>
+      <item> $set_print_peeked_only </item>
+      <item> $get_print_peeked_only </item>
+      <item> $set_process_override </item>
+      <item> $set_push_count_limit </item>
+      <item> $set_query_on_merge </item>
+      <item> $get_query_on_merge </item>
+      <item> $set_query_on_placement </item>
+      <item> $get_query_on_placement </item>
+      <item> $set_redraw_controls </item>
+      <item> $get_redraw_controls </item>
+      <item> $set_redraw_level </item>
+      <item> $get_redraw_level </item>
+      <item> $set_redraw_precision </item>
+      <item> $get_redraw_precision </item>
+      <item> $set_redraw_queue_control </item>
+      <item> $get_redraw_queue_control </item>
+      <item> $set_report_target </item>
+      <item> $get_report_target </item>
+      <item> $set_restrict_visible </item>
+      <item> $get_restrict_visible </item>
+      <item> $set_resync_on_peek </item>
+      <item> $get_resync_on_peek </item>
+      <item> $set_route_center_wires </item>
+      <item> $get_route_center_wires </item>
+      <item> $set_route_hierarchy_mode </item>
+      <item> $set_route_net_order </item>
+      <item> $get_route_net_order </item>
+      <item> $set_route_objects </item>
+      <item> $get_route_objects </item>
+      <item> $set_route_one_pass </item>
+      <item> $get_route_one_pass </item>
+      <item> $set_route_overflow_order </item>
+      <item> $get_route_overflow_order </item>
+      <item> $set_route_pack_wires </item>
+      <item> $get_route_pack_wires </item>
+      <item> $set_route_protection </item>
+      <item> $set_route_same_net_checking </item>
+      <item> $get_route_same_net_checking </item>
+      <item> $set_route_stub_direction </item>
+      <item> $get_route_stub_direction </item>
+      <item> $set_route_trim_nets </item>
+      <item> $get_route_trim_nets </item>
+      <item> $set_route_via_rotation </item>
+      <item> $get_route_via_rotation </item>
+      <item> $set_router_channel_size_variation </item>
+      <item> $get_router_channel_size_variation </item>
+      <item> $set_router_cleanup </item>
+      <item> $get_router_cleanup </item>
+      <item> $set_router_compound_path </item>
+      <item> $get_router_compound_path </item>
+      <item> $set_router_conn_order </item>
+      <item> $get_router_conn_order </item>
+      <item> $set_router_do_net_rules_check </item>
+      <item> $get_router_do_net_rules_check </item>
+      <item> $set_router_feed_bias </item>
+      <item> $get_router_feed_bias </item>
+      <item> $set_router_h_grid_size </item>
+      <item> $get_router_h_grid_size </item>
+      <item> $set_router_improve_global_val </item>
+      <item> $get_router_improve_global_val </item>
+      <item> $set_router_initial_global_val </item>
+      <item> $get_router_initial_global_val </item>
+      <item> $set_router_max_bends </item>
+      <item> $get_router_max_bends </item>
+      <item> $set_router_max_iters </item>
+      <item> $get_router_max_iters </item>
+      <item> $set_router_max_vias </item>
+      <item> $get_router_max_vias </item>
+      <item> $set_router_minimized_layers </item>
+      <item> $get_router_minimized_layers </item>
+      <item> $set_router_mode_type </item>
+      <item> $get_router_mode_type </item>
+      <item> $set_router_num_extra_tracks </item>
+      <item> $get_router_num_extra_tracks </item>
+      <item> $set_router_oper_mode_type </item>
+      <item> $get_router_oper_mode_type </item>
+      <item> $set_router_primary_layer_used </item>
+      <item> $get_router_primary_layer_used </item>
+      <item> $set_router_probe_layers </item>
+      <item> $get_router_probe_layers </item>
+      <item> $set_router_restricted_layers </item>
+      <item> $get_router_restricted_layers </item>
+      <item> $set_router_step_size </item>
+      <item> $get_router_step_size </item>
+      <item> $set_router_use_gridded_mode </item>
+      <item> $get_router_use_gridded_mode </item>
+      <item> $set_router_v_grid_size </item>
+      <item> $get_router_v_grid_size </item>
+      <item> $set_router_view_probes </item>
+      <item> $get_router_view_probes </item>
+      <item> $set_router_wrong_direction </item>
+      <item> $get_router_wrong_direction </item>
+      <item> $set_ruler_angle_mode </item>
+      <item> $get_ruler_angle_mode </item>
+      <item> $set_ruler_select_state </item>
+      <item> $get_ruler_select_state </item>
+      <item> $set_ruler_text_height </item>
+      <item> $get_ruler_text_height </item>
+      <item> $set_sd_hv_contact </item>
+      <item> $set_sdl_filter </item>
+      <item> $get_sdl_filter </item>
+      <item> $set_sdl_preserve_orientation </item>
+      <item> $get_sdl_preserve_orientation </item>
+      <item> $set_sdl_quiet </item>
+      <item> $get_sdl_quiet </item>
+      <item> $set_search_path </item>
+      <item> $get_search_path </item>
+      <item> $set_select_via_pin </item>
+      <item> $get_select_via_pin </item>
+      <item> $set_selectable_area </item>
+      <item> $get_selectable_area </item>
+      <item> $set_selectable_layers </item>
+      <item> $set_selectable_types </item>
+      <item> $get_selectable_types </item>
+      <item> $set_site_type </item>
+      <item> $set_snap_basepoint_to_grid </item>
+      <item> $get_snap_basepoint_to_grid </item>
+      <item> $set_target_mode </item>
+      <item> $get_target_mode </item>
+      <item> $set_text_cull_basis </item>
+      <item> $get_text_cull_basis </item>
+      <item> $set_text_display </item>
+      <item> $get_text_display </item>
+      <item> $set_text_origin_display </item>
+      <item> $get_text_origin_display </item>
+      <item> $set_timer </item>
+      <item> $set_toolbar_alignment </item>
+      <item> $get_toolbar_alignment </item>
+      <item> $set_toolbar_keep_items_visible </item>
+      <item> $get_toolbar_keep_items_visible </item>
+      <item> $set_undo_level </item>
+      <item> $get_undo_level </item>
+      <item> $set_undo_object_limit </item>
+      <item> $get_undo_object_limit </item>
+      <item> $set_unselect_empty </item>
+      <item> $get_unselect_empty </item>
+      <item> $set_update_connected </item>
+      <item> $get_update_connected </item>
+      <item> $set_verilog_array_delimiters </item>
+      <item> $get_verilog_array_delimiters </item>
+      <item> $set_verilog_supply0 </item>
+      <item> $get_verilog_supply0 </item>
+      <item> $set_verilog_supply1 </item>
+      <item> $get_verilog_supply1 </item>
+      <item> $set_view_controls </item>
+      <item> $get_view_controls </item>
+      <item> $set_visible_layers </item>
+      <item> $set_working_directory </item>
+      <item> $get_working_directory </item>
+      <item> $set_xml_group_protection </item>
+      <item> $get_xml_group_protection </item>
+      <item> $set_xml_logfile </item>
+      <item> $get_xml_logfile </item>
+      <item> $set_xml_other_protection </item>
+      <item> $get_xml_other_protection </item>
+      <item> $set_xml_read_cell_path_style </item>
+      <item> $get_xml_read_cell_path_style </item>
+      <item> $set_xml_replace </item>
+      <item> $get_xml_replace </item>
+      <item> $set_xml_style </item>
+      <item> $get_xml_style </item>
+      <item> $set_xml_write_cell_path_style </item>
+      <item> $get_xml_write_cell_path_style </item>
+      <item> $setup_auto_checkpoint </item>
+      <item> $setup_ic </item>
+      <item> $setup_ic_dynamics </item>
+      <item> $setup_new_windows </item>
+      <item> $setup_print </item>
+      <item> $setup_redraw_controls </item>
+      <item> $setup_reports </item>
+      <item> $setup_rulers </item>
+      <item> $get_active_ruler_bgd_color </item>
+      <item> $get_active_ruler_color </item>
+      <item> $get_active_ruler_font </item>
+      <item> $setup_sdl </item>
+      <item> $setup_select_filter </item>
+      <item> $setup_session </item>
+      <item> $setup_status_line </item>
+      <item> $show_all_mask_devices </item>
+      <item> $show_all_mask_discrepancies </item>
+      <item> $show_all_mask_nets </item>
+      <item> $show_aspect </item>
+      <item> $show_contact_gaps </item>
+      <item> $show_context </item>
+      <item> $show_current_mask_device </item>
+      <item> $show_current_mask_discrepancy </item>
+      <item> $show_current_mask_net </item>
+      <item> $show_drc_all </item>
+      <item> $show_drc_area </item>
+      <item> $show_drc_check </item>
+      <item> $show_drc_current </item>
+      <item> $show_drc_scan </item>
+      <item> $show_group </item>
+      <item> $show_guidelines </item>
+      <item> $show_layer_palette </item>
+      <item> $show_mask_device_id </item>
+      <item> $show_mask_device_name </item>
+      <item> $show_mask_device_point </item>
+      <item> $show_mask_discrepancy </item>
+      <item> $show_mask_net_id </item>
+      <item> $show_mask_net_name </item>
+      <item> $show_mask_net_point </item>
+      <item> $show_panel </item>
+      <item> $show_status_line </item>
+      <item> $show_system_toolbar </item>
+      <item> $show_toolbar </item>
+      <item> $show_tooltips </item>
+      <item> $show_unplaced_instances </item>
+      <item> $slice </item>
+      <item> $slice_array </item>
+      <item> $slice_with_polygon </item>
+      <item> $slide_route </item>
+      <item> $snap_to_grid </item>
+      <item> $snap_to_row </item>
+      <item> $startup </item>
+      <item> $stretch </item>
+      <item> $stretch_relative </item>
+      <item> $swap_logically_equivalent_nets </item>
+      <item> $toolbar_context_glyph_item </item>
+      <item> $toolbar_glyph_item </item>
+      <item> $tooltips_visible </item>
+      <item> $trace_property_numeric </item>
+      <item> $trace_property_string </item>
+      <item> $trim_invalid_nets </item>
+      <item> $trim_nets </item>
+      <item> $trim_nets_options </item>
+      <item> $undefine_layer_alias </item>
+      <item> $undefine_layer_name </item>
+      <item> $undefine_layer_set </item>
+      <item> $undefine_must_connect </item>
+      <item> $undefine_net_pairs </item>
+      <item> $undelete_drc </item>
+      <item> $undo </item>
+      <item> $unfreeze_window </item>
+      <item> $ungroup </item>
+      <item> $unhighlight_all </item>
+      <item> $unhighlight_group </item>
+      <item> $unhighlight_hierarchical_net </item>
+      <item> $unlink_floorplan_shape </item>
+      <item> $unload_closed_cells </item>
+      <item> $unload_mask_results </item>
+      <item> $unload_viewpoint </item>
+      <item> $unmake_port </item>
+      <item> $unmark_all_ignored </item>
+      <item> $unmark_instances_as_ignored </item>
+      <item> $unpeek </item>
+      <item> $unpeek_area </item>
+      <item> $unplace </item>
+      <item> $unprotect_all </item>
+      <item> $unprotect_group </item>
+      <item> $unprotect_nets </item>
+      <item> $unreserve_cell </item>
+      <item> $unreserve_cell_by_name </item>
+      <item> $unreserve_library </item>
+      <item> $unreserve_process </item>
+      <item> $unselect_all </item>
+      <item> $unselect_all_edges </item>
+      <item> $unselect_area </item>
+      <item> $unselect_area_polygon </item>
+      <item> $unselect_by_name </item>
+      <item> $unselect_by_property </item>
+      <item> $unselect_drc </item>
+      <item> $unselect_edge </item>
+      <item> $unselect_group </item>
+      <item> $unselect_range </item>
+      <item> $unset_cell_process </item>
+      <item> $unset_logic_source </item>
+      <item> $unset_process_override </item>
+      <item> $unshow_all_mask_devices </item>
+      <item> $unshow_all_mask_discrepancies </item>
+      <item> $unshow_all_mask_nets </item>
+      <item> $unshow_all_mask_results </item>
+      <item> $unshow_current_mask_device </item>
+      <item> $unshow_current_mask_discrepancy </item>
+      <item> $unshow_current_mask_net </item>
+      <item> $unshow_drc </item>
+      <item> $unshow_guidelines </item>
+      <item> $untrace_all_properties </item>
+      <item> $update_cell </item>
+      <item> $update_cell_by_name </item>
+      <item> $update_gadget </item>
+      <item> $update_group_window </item>
+      <item> $update_hier_window </item>
+      <item> $update_layout_view </item>
+      <item> $update_layout_config_view </item>
+      <item> $update_library </item>
+      <item> $view_all </item>
+      <item> $view_all_mask_devices </item>
+      <item> $view_all_mask_discrepancies </item>
+      <item> $view_all_mask_nets </item>
+      <item> $view_area </item>
+      <item> $view_centered </item>
+      <item> $view_context </item>
+      <item> $view_current_mask_device </item>
+      <item> $view_current_mask_discrepancy </item>
+      <item> $view_current_mask_net </item>
+      <item> $view_drc </item>
+      <item> $view_highlighted </item>
+      <item> $view_next </item>
+      <item> $view_panel </item>
+      <item> $view_previous </item>
+      <item> $view_selected </item>
+      <item> $write_calibre </item>
+      <item> $write_def </item>
+      <item> $write_design_lef </item>
+      <item> $write_direct_cnet </item>
+      <item> $write_direct_netlist </item>
+      <item> $write_gdsii </item>
+      <item> $write_hierarchical_netlist </item>
+      <item> $write_lef </item>
+      <item> $write_mask_cnet </item>
+      <item> $write_mask_netlist </item>
+      <item> $write_source_cnet </item>
+      <item> $write_xml </item>
+      <item> $zoom_in </item>
+      <item> $zoom_out </item>
+      <item> $zoom_to_grid </item>
+    </list>
+    <list name="daicfct">
+      <item> $$add_arc </item>
+      <item> $add_border </item>
+      <item> $add_bus </item>
+      <item> $add_circle </item>
+      <item> $add_dot </item>
+      <item> $add_fb_def </item>
+      <item> $add_fb_inst </item>
+      <item> $add_fb_pins </item>
+      <item> $add_frame </item>
+      <item> $add_ic_viewpoint_type </item>
+      <item> $add_instance </item>
+      <item> $add_line </item>
+      <item> $add_net </item>
+      <item> $add_panel </item>
+      <item> $add_parameters </item>
+      <item> $add_pin </item>
+      <item> $add_polygon </item>
+      <item> $add_polyline </item>
+      <item> $add_property </item>
+      <item> $add_property_to_handle </item>
+      <item> $add_rectangle </item>
+      <item> $add_selected_instance </item>
+      <item> $add_settings_block </item>
+      <item> $add_sheet_border </item>
+      <item> $add_text </item>
+      <item> $add_wire </item>
+      <item> $align </item>
+      <item> $allow_resizable_instances </item>
+      <item> $apply_edits </item>
+      <item> $auto_sequence_text </item>
+      <item> $begin_edit_symbol </item>
+      <item> $change_color </item>
+      <item> $change_compiled_pin_name </item>
+      <item> $change_group_visibility </item>
+      <item> $change_instance_resize_factor </item>
+      <item> $change_line_style </item>
+      <item> $change_line_width </item>
+      <item> $change_net_style </item>
+      <item> $change_net_width </item>
+      <item> $change_polygon_fill </item>
+      <item> $change_property_color </item>
+      <item> $change_property_font </item>
+      <item> $change_property_height </item>
+      <item> $change_property_justification </item>
+      <item> $change_property_name </item>
+      <item> $change_property_offset </item>
+      <item> $change_property_orientation </item>
+      <item> $change_property_stability_switch </item>
+      <item> $change_property_type </item>
+      <item> $change_property_value </item>
+      <item> $change_property_visibility </item>
+      <item> $change_property_visibility_switch </item>
+      <item> $change_text_font </item>
+      <item> $change_text_height </item>
+      <item> $change_text_justification </item>
+      <item> $change_text_value </item>
+      <item> $change_variant_display </item>
+      <item> $$check </item>
+      <item> $check_and_save </item>
+      <item> $clear_unattached_annotations </item>
+      <item> $close_design_configuration </item>
+      <item> $close_selection </item>
+      <item> $close_window </item>
+      <item> $comp_name </item>
+      <item> $connect </item>
+      <item> $connect_area </item>
+      <item> $construct_frame </item>
+      <item> $convert_fb_inst_to_def </item>
+      <item> $convert_to_comment </item>
+      <item> $convert_to_new_technology </item>
+      <item> $copy </item>
+      <item> $copy_edit_hotkey_settings </item>
+      <item> $copy_multiple </item>
+      <item> $copy_to_array </item>
+      <item> $create_design_configuration </item>
+      <item> $create_design_sheet </item>
+      <item> $create_entity </item>
+      <item> $create_fb_inst_from_def </item>
+      <item> $create_implicit_pins </item>
+      <item> $create_pin_list </item>
+      <item> $create_sheet </item>
+      <item> $create_symbol </item>
+      <item> $create_variant_viewpoint </item>
+      <item> $da_ic_crossprobe </item>
+      <item> $da_ic_crossprobe_diff </item>
+      <item> $define_hotkey </item>
+      <item> $delete </item>
+      <item> $delete_ba_property </item>
+      <item> $delete_interfaces </item>
+      <item> $delete_multiple_ba_properties </item>
+      <item> $delete_panel </item>
+      <item> $delete_parameter </item>
+      <item> $delete_property </item>
+      <item> $delete_property_owner </item>
+      <item> $delete_sheet </item>
+      <item> $delete_template_name </item>
+      <item> $direct_to_active_window </item>
+      <item> $disconnect </item>
+      <item> $disconnect_area </item>
+      <item> $disconnect_ba </item>
+      <item> $display_next_sheet </item>
+      <item> $display_prev_sheet </item>
+      <item> $display_spec_sheet </item>
+      <item> $does_selection_exist </item>
+      <item> $$dump_sim_values </item>
+      <item> $end_edit_symbol </item>
+      <item> $$exit_sim_mode </item>
+      <item> $expand_template_name </item>
+      <item> $export_spice </item>
+      <item> $export_verilog </item>
+      <item> $export_vhdl </item>
+      <item> $filter_property_check </item>
+      <item> $flip </item>
+      <item> $freeze_window </item>
+      <item> $generate_symbol </item>
+      <item> $get_active_symbol </item>
+      <item> $get_active_symbol_history </item>
+      <item> $get_apply_edits_needed </item>
+      <item> $get_attached_objects </item>
+      <item> $get_attributes </item>
+      <item> $get_auto_update_inst_handles </item>
+      <item> $get_basepoint </item>
+      <item> $get_body_text_restriction </item>
+      <item> $get_bundle_members </item>
+      <item> $get_check_schematic_status </item>
+      <item> $get_check_status </item>
+      <item> $get_comment_graphics_attributes </item>
+      <item> $get_comment_handles </item>
+      <item> $get_comment_text_attributes </item>
+      <item> $get_comment_text_restriction </item>
+      <item> $get_comment_visibility </item>
+      <item> $get_default_interface_name </item>
+      <item> $get_design_sheets </item>
+      <item> $get_diagram_location </item>
+      <item> $get_edit_mode </item>
+      <item> $get_evaluations </item>
+      <item> $get_fb_line_style_by_handle </item>
+      <item> $get_frame_attributes </item>
+      <item> $get_frame_handles </item>
+      <item> $get_grid </item>
+      <item> $get_hotkey_settings </item>
+      <item> $get_in_design_context </item>
+      <item> $get_instance_attributes </item>
+      <item> $get_instance_handles </item>
+      <item> $get_instance_models </item>
+      <item> $get_instance_pathname </item>
+      <item> $get_instance_resize_factor </item>
+      <item> $get_item_type </item>
+      <item> $get_model_path </item>
+      <item> $get_net_attributes </item>
+      <item> $get_net_handles </item>
+      <item> $get_next_active_symbol </item>
+      <item> $get_object_property_attributes </item>
+      <item> $get_objects </item>
+      <item> $get_objects_in_area </item>
+      <item> $get_origin </item>
+      <item> $get_owned_property_names </item>
+      <item> $get_parameter </item>
+      <item> $get_pathname </item>
+      <item> $get_pin_attributes </item>
+      <item> $get_pin_handles </item>
+      <item> $get_pin_names </item>
+      <item> $get_prop_text_restriction </item>
+      <item> $get_property </item>
+      <item> $get_property_attributes </item>
+      <item> $get_property_handles </item>
+      <item> $get_property_names </item>
+      <item> $get_property_owners </item>
+      <item> $get_schematic_sheets </item>
+      <item> $get_search_path </item>
+      <item> $get_select_count </item>
+      <item> $get_select_count_type </item>
+      <item> $get_select_design_paths </item>
+      <item> $get_select_extent </item>
+      <item> $get_select_handles </item>
+      <item> $get_select_handles_type </item>
+      <item> $get_select_identical </item>
+      <item> $get_select_text_exists </item>
+      <item> $get_select_text_handle </item>
+      <item> $get_select_text_name </item>
+      <item> $get_select_text_origin </item>
+      <item> $get_select_text_value </item>
+      <item> $get_sheet_design_pathname </item>
+      <item> $get_sheet_extent </item>
+      <item> $get_sheetname_viewed </item>
+      <item> $$get_sim_value </item>
+      <item> $$get_sim_version </item>
+      <item> $get_simulation_mode </item>
+      <item> $get_source_edit_allowed </item>
+      <item> $get_symbol_name </item>
+      <item> $get_text_information </item>
+      <item> $get_type_present </item>
+      <item> $get_vertex_attributes </item>
+      <item> $get_vertex_handles </item>
+      <item> $get_view_area </item>
+      <item> $get_viewpoint </item>
+      <item> $get_window_names </item>
+      <item> $get_window_sheet_list </item>
+      <item> $group </item>
+      <item> $hide_active_symbol_window </item>
+      <item> $hide_annotations </item>
+      <item> $hide_comment </item>
+      <item> $hide_context_window </item>
+      <item> $hide_panel_border </item>
+      <item> $hide_status_line </item>
+      <item> $hide_system_toolbar </item>
+      <item> $hide_toolbar </item>
+      <item> $highlight_by_handle </item>
+      <item> $highlight_by_name </item>
+      <item> $highlight_property_owner </item>
+      <item> $$hotplot_submit </item>
+      <item> $import_verilog </item>
+      <item> $insert_template </item>
+      <item> $is_active_symbol_window_visible </item>
+      <item> $is_context_window_visible </item>
+      <item> $is_handle_valid </item>
+      <item> $is_selection_open </item>
+      <item> $is_status_line_visible </item>
+      <item> $is_system_toolbar_visible </item>
+      <item> $is_toolbar_visible </item>
+      <item> $load_hotkey_settings </item>
+      <item> $make_fb </item>
+      <item> $make_polygon </item>
+      <item> $make_polyline </item>
+      <item> $make_symbol </item>
+      <item> $mark_property_attributes </item>
+      <item> $mark_property_value </item>
+      <item> $measure_distance </item>
+      <item> $merge_annotations </item>
+      <item> $modify_frame </item>
+      <item> $move </item>
+      <item> $move_cursor_incrementally </item>
+      <item> $$move_settings_block </item>
+      <item> $name_instances </item>
+      <item> $name_instances_auto </item>
+      <item> $open_design_configuration </item>
+      <item> $open_design_sheet </item>
+      <item> $open_down </item>
+      <item> $open_schematic </item>
+      <item> $open_sheet </item>
+      <item> $open_source_code </item>
+      <item> $open_symbol </item>
+      <item> $open_top </item>
+      <item> $open_up </item>
+      <item> $pivot </item>
+      <item> $place_active_symbol </item>
+      <item> $pop_to_front </item>
+      <item> $print_all_schematics </item>
+      <item> $print_design_sheets </item>
+      <item> $protect </item>
+      <item> $protect_area </item>
+      <item> $push_to_back </item>
+      <item> $recalculate_properties </item>
+      <item> $reconnect_annotations </item>
+      <item> $redo </item>
+      <item> $remove_comment_status </item>
+      <item> $reopen_selection </item>
+      <item> $replace </item>
+      <item> $replace_with_alternate_symbol </item>
+      <item> $report_broken_annotations </item>
+      <item> $$report_check </item>
+      <item> $report_default_property_settings </item>
+      <item> $report_groups </item>
+      <item> $report_hotkey_settings </item>
+      <item> $report_interfaces </item>
+      <item> $report_interfaces_selected </item>
+      <item> $report_object </item>
+      <item> $$report_object_name </item>
+      <item> $report_panels </item>
+      <item> $report_parameter </item>
+      <item> $report_unattached_annotations </item>
+      <item> $reselect </item>
+      <item> $reset_instance_colors </item>
+      <item> $resize_fb </item>
+      <item> $revalidate_models </item>
+      <item> $rotate </item>
+      <item> $route </item>
+      <item> $save_setup </item>
+      <item> $save_sheet </item>
+      <item> $save_sheet_as </item>
+      <item> $save_symbol </item>
+      <item> $save_symbol_as </item>
+      <item> $save_variant_viewpoint </item>
+      <item> $scale </item>
+      <item> $scroll_down_by_unit </item>
+      <item> $scroll_down_by_window </item>
+      <item> $scroll_hz </item>
+      <item> $scroll_left_by_unit </item>
+      <item> $scroll_left_by_window </item>
+      <item> $scroll_right_by_unit </item>
+      <item> $scroll_right_by_window </item>
+      <item> $scroll_up_by_unit </item>
+      <item> $scroll_up_by_window </item>
+      <item> $scroll_vt </item>
+      <item> $select_all </item>
+      <item> $select_area </item>
+      <item> $select_branches </item>
+      <item> $select_by_design_path </item>
+      <item> $select_by_handle </item>
+      <item> $select_by_name </item>
+      <item> $select_by_property </item>
+      <item> $select_by_property_type </item>
+      <item> $select_fb </item>
+      <item> $select_group </item>
+      <item> $select_instances </item>
+      <item> $select_nets </item>
+      <item> $select_pins </item>
+      <item> $select_property_owner </item>
+      <item> $select_template_name </item>
+      <item> $select_text </item>
+      <item> $select_vertices </item>
+      <item> $sequence_text </item>
+      <item> $set_active_symbol </item>
+      <item> $set_active_symbol_history </item>
+      <item> $set_basepoint </item>
+      <item> $set_color </item>
+      <item> $set_color_config </item>
+      <item> $set_compiler_options </item>
+      <item> $set_default_parts_menu </item>
+      <item> $set_edit_mode </item>
+      <item> $set_evaluations </item>
+      <item> $set_grid </item>
+      <item> $set_hotkey_mode </item>
+      <item> $set_next_active_symbol </item>
+      <item> $set_origin </item>
+      <item> $set_out_of_view_warn </item>
+      <item> $set_parameter </item>
+      <item> $set_previous_active_symbol </item>
+      <item> $set_property_owner </item>
+      <item> $set_property_type </item>
+      <item> $set_search_path </item>
+      <item> $set_sel_name_display </item>
+      <item> $$set_sim_value </item>
+      <item> $set_simulation_mode </item>
+      <item> $set_template_directory </item>
+      <item> $set_toolbar_alignment </item>
+      <item> $set_userrule_error </item>
+      <item> $set_userrule_warning </item>
+      <item> $set_variant_properties </item>
+      <item> $set_viewpoint </item>
+      <item> $$settings_block_visible </item>
+      <item> $setup_annotated_property_text </item>
+      <item> $setup_check_schematic </item>
+      <item> $setup_check_schematic_sheet </item>
+      <item> $$setup_check_sheet </item>
+      <item> $setup_check_symbol </item>
+      <item> $setup_color </item>
+      <item> $setup_comment </item>
+      <item> $setup_default_viewpoint </item>
+      <item> $setup_display </item>
+      <item> $setup_function_block </item>
+      <item> $setup_grid </item>
+      <item> $setup_hspice_alter </item>
+      <item> $setup_net </item>
+      <item> $setup_object_template </item>
+      <item> $setup_page </item>
+      <item> $setup_property_display </item>
+      <item> $setup_property_text </item>
+      <item> $setup_report </item>
+      <item> $setup_ripper </item>
+      <item> $setup_selection </item>
+      <item> $setup_select_filter </item>
+      <item> $setup_sim_config </item>
+      <item> $setup_sim_model_editor </item>
+      <item> $setup_symbol_body </item>
+      <item> $setup_text_restriction </item>
+      <item> $setup_unselect_filter </item>
+      <item> $show_active_symbol_window </item>
+      <item> $show_annotations </item>
+      <item> $show_comment </item>
+      <item> $show_context_window </item>
+      <item> $show_panel_border </item>
+      <item> $show_registration </item>
+      <item> $show_status_line </item>
+      <item> $show_system_toolbar </item>
+      <item> $show_toolbar </item>
+      <item> $sim_add_dspf </item>
+      <item> $sim_add_sdf </item>
+      <item> $sim_choose_library </item>
+      <item> $sim_copy_configuration_as </item>
+      <item> $sim_delete_converter </item>
+      <item> $sim_edit_commands </item>
+      <item> $sim_edit_measurements </item>
+      <item> $sim_edit_sdf </item>
+      <item> $sim_export_spice </item>
+      <item> $sim_get_adms_ini_file </item>
+      <item> $sim_hide_dcop </item>
+      <item> $sim_insert_converter_default </item>
+      <item> $sim_insert_converter_inst </item>
+      <item> $sim_insert_converter_net </item>
+      <item> $sim_insert_converter_pin </item>
+      <item> $sim_invoke </item>
+      <item> $sim_invoke_mr </item>
+      <item> $sim_invoke_ms </item>
+      <item> $$sim_merge_annotations </item>
+      <item> $sim_open_language </item>
+      <item> $sim_open_lang_model </item>
+      <item> $sim_process_extracted_netlist </item>
+      <item> $sim_restore_setup_from </item>
+      <item> $sim_run </item>
+      <item> $sim_save_selected </item>
+      <item> $sim_save_setup_as </item>
+      <item> $sim_set_additional_commands </item>
+      <item> $sim_set_include_paths </item>
+      <item> $sim_set_initial_condition </item>
+      <item> $sim_set_temperature </item>
+      <item> $sim_setup_analysis </item>
+      <item> $sim_setup_analysis_ac </item>
+      <item> $sim_setup_analysis_dc </item>
+      <item> $sim_setup_analysis_dcop </item>
+      <item> $sim_setup_analysis_mc </item>
+      <item> $sim_setup_analysis_mod_steadystate </item>
+      <item> $sim_setup_analysis_noise </item>
+      <item> $sim_setup_analysis_noisetran </item>
+      <item> $sim_setup_analysis_steadystate </item>
+      <item> $sim_setup_analysis_steadystateac </item>
+      <item> $sim_setup_analysis_steadystatenoise </item>
+      <item> $sim_setup_analysis_steadystateoscil </item>
+      <item> $sim_setup_analysis_tran </item>
+      <item> $sim_setup_netlister </item>
+      <item> $sim_setup_sim_environ </item>
+      <item> $$sim_setup_simulator_viewer </item>
+      <item> $$sim_setup_simulator_viewer_advance </item>
+      <item> $sim_simulate </item>
+      <item> $sim_view_measurements </item>
+      <item> $sim_view_output_file </item>
+      <item> $sim_write_commands </item>
+      <item> $sim_write_setup_file </item>
+      <item> $slice </item>
+      <item> $snap_to_grid </item>
+      <item> $sort_handles </item>
+      <item> $sort_handles_by_property </item>
+      <item> $stretch </item>
+      <item> $string_to_literal </item>
+      <item> $symb_name </item>
+      <item> $undo </item>
+      <item> $unfreeze_window </item>
+      <item> $ungroup </item>
+      <item> $unhighlight_by_handle </item>
+      <item> $unhighlight_by_name </item>
+      <item> $unhighlight_property_owner </item>
+      <item> $unmake_fb </item>
+      <item> $unprotect </item>
+      <item> $unprotect_area </item>
+      <item> $unselect_all </item>
+      <item> $unselect_area </item>
+      <item> $unselect_by_design_path </item>
+      <item> $unselect_by_handle </item>
+      <item> $unselect_by_property </item>
+      <item> $unselect_by_property_type </item>
+      <item> $unselect_fb </item>
+      <item> $unselect_property_owner </item>
+      <item> $unselect_vertices </item>
+      <item> $update </item>
+      <item> $update_all </item>
+      <item> $update_all_schematics </item>
+      <item> $update_border </item>
+      <item> $update_from_interface </item>
+      <item> $$update_settings_blocks </item>
+      <item> $update_title_block </item>
+      <item> $view_all </item>
+      <item> $view_area </item>
+      <item> $view_centered </item>
+      <item> $view_panel </item>
+      <item> $view_selected </item>
+      <item> $vpt_needs_save </item>
+      <item> $was_saved </item>
+      <item> $zoom_in </item>
+      <item> $zoom_out </item>
+      <item> $get_auto_name_net </item>
+      <item> $get_auto_place_instance_name </item>
+      <item> $get_check_busshorts </item>
+      <item> $get_check_functionblocks </item>
+      <item> $get_check_schematicbusshorts </item>
+      <item> $get_check_schematicnetio </item>
+      <item> $get_fb_def_color </item>
+      <item> $get_fb_def_line_style </item>
+      <item> $get_fb_inst_color </item>
+      <item> $get_fb_inst_line_style </item>
+      <item> $get_fb_int_change_popup </item>
+      <item> $get_fb_passthru </item>
+      <item> $get_fb_popupwin </item>
+      <item> $set_annotation_color </item>
+      <item> $set_annotation_visibility </item>
+      <item> $set_auto_name_net </item>
+      <item> $set_auto_place_instance_name </item>
+      <item> $set_auto_update_mode </item>
+      <item> $set_autoripper </item>
+      <item> $set_autoroute </item>
+      <item> $set_autoselect </item>
+      <item> $set_bus_width </item>
+      <item> $set_check_annotations </item>
+      <item> $set_check_busshorts </item>
+      <item> $set_check_closedots </item>
+      <item> $set_check_dangle </item>
+      <item> $set_check_expression </item>
+      <item> $set_check_filemode </item>
+      <item> $set_check_filename </item>
+      <item> $set_check_frame </item>
+      <item> $set_check_functionblocks </item>
+      <item> $set_check_initprops </item>
+      <item> $set_check_instance </item>
+      <item> $set_check_net </item>
+      <item> $set_check_notdots </item>
+      <item> $set_check_overlap </item>
+      <item> $set_check_owner </item>
+      <item> $set_check_parameter </item>
+      <item> $set_check_pins </item>
+      <item> $set_check_schematicbusshorts </item>
+      <item> $set_check_schematicinstance </item>
+      <item> $set_check_schematicinterface </item>
+      <item> $set_check_schematicnet </item>
+      <item> $set_check_schematicnetio </item>
+      <item> $set_check_schematicspecial </item>
+      <item> $set_check_schematicuserrule </item>
+      <item> $set_check_special </item>
+      <item> $set_check_symbolbody </item>
+      <item> $set_check_symbolinterface </item>
+      <item> $set_check_symbolpin </item>
+      <item> $set_check_symbolspecial </item>
+      <item> $set_check_symboluserrule </item>
+      <item> $set_check_transcript </item>
+      <item> $set_check_userrule </item>
+      <item> $set_check_window </item>
+      <item> $set_close_dot </item>
+      <item> $set_closeness_criteria </item>
+      <item> $set_dot_size </item>
+      <item> $set_dot_style </item>
+      <item> $set_dynamic_cursor </item>
+      <item> $set_dynamic_rounding_precision </item>
+      <item> $set_environment_dofile_pathname </item>
+      <item> $set_fb_def_color </item>
+      <item> $set_fb_def_line_style </item>
+      <item> $set_fb_inst_color </item>
+      <item> $set_fb_inst_line_style </item>
+      <item> $set_fb_int_change_popup </item>
+      <item> $set_fb_passthru </item>
+      <item> $set_fb_popupwin </item>
+      <item> $set_hidden_symbol_prop_display </item>
+      <item> $set_implicit_ripper </item>
+      <item> $set_line_style </item>
+      <item> $set_line_width </item>
+      <item> $set_modify_multiple_prop_filter </item>
+      <item> $set_net_style </item>
+      <item> $set_net_width </item>
+      <item> $set_new_annotation_visibility </item>
+      <item> $set_orthogonal </item>
+      <item> $set_orthogonal_angle </item>
+      <item> $set_pin_spacing </item>
+      <item> $set_polygon_fill </item>
+      <item> $set_property_font </item>
+      <item> $set_property_height </item>
+      <item> $set_property_hjustification </item>
+      <item> $set_property_orientation </item>
+      <item> $set_property_stability_switch </item>
+      <item> $set_property_transparency </item>
+      <item> $set_property_visibility </item>
+      <item> $set_property_visibility_switch </item>
+      <item> $set_property_vjustification </item>
+      <item> $set_report_filemode </item>
+      <item> $set_report_filename </item>
+      <item> $set_report_transcript </item>
+      <item> $set_report_window </item>
+      <item> $set_ripper_dot </item>
+      <item> $set_ripper_mode </item>
+      <item> $set_ripper_query </item>
+      <item> $set_ripper_symbol_pathname </item>
+      <item> $set_schem_check_mode </item>
+      <item> $set_schematicuserrules_file </item>
+      <item> $set_segment_select_mode </item>
+      <item> $set_select_aperture </item>
+      <item> $set_select_comment </item>
+      <item> $set_select_exterior </item>
+      <item> $set_select_frame </item>
+      <item> $set_select_instance </item>
+      <item> $set_select_net </item>
+      <item> $set_select_pin </item>
+      <item> $set_select_property </item>
+      <item> $set_select_segment </item>
+      <item> $set_select_symbolbody </item>
+      <item> $set_select_symbolpin </item>
+      <item> $set_select_text </item>
+      <item> $set_select_vertex </item>
+      <item> $set_selection_color </item>
+      <item> $set_selection_model </item>
+      <item> $set_snap </item>
+      <item> $set_symboluserrules_file </item>
+      <item> $set_text_font </item>
+      <item> $set_text_height </item>
+      <item> $set_text_hjustification </item>
+      <item> $set_text_orientation </item>
+      <item> $set_text_transparency </item>
+      <item> $set_text_vjustification </item>
+      <item> $set_undo_level </item>
+      <item> $set_unselect_comment </item>
+      <item> $set_unselect_exterior </item>
+      <item> $set_unselect_frame </item>
+      <item> $set_unselect_instance </item>
+      <item> $set_unselect_net </item>
+      <item> $set_unselect_pin </item>
+      <item> $set_unselect_property </item>
+      <item> $set_unselect_segment </item>
+      <item> $set_unselect_symbolbody </item>
+      <item> $set_unselect_symbolpin </item>
+      <item> $set_unselect_text </item>
+      <item> $set_unselect_vertex </item>
+      <item> $set_userrules_file </item>
+      <item> $set_user_units </item>
+    </list>
+    <list name="iccuifct">
+      <item> $add_menu_item </item>
+      <item> $ask_color </item>
+      <item> $ask_frame_name </item>
+      <item> $ask_integer </item>
+      <item> $ask_number </item>
+      <item> $ask_pathname </item>
+      <item> $ask_pattern </item>
+      <item> $ask_save_edits </item>
+      <item> $ask_scope_builtin_name </item>
+      <item> $ask_scope_callable_name </item>
+      <item> $ask_scope_form_name </item>
+      <item> $ask_scope_frame_name </item>
+      <item> $ask_scope_function_name </item>
+      <item> $ask_scope_keydef_name </item>
+      <item> $ask_scope_menu_name </item>
+      <item> $ask_scope_stroke_name </item>
+      <item> $ask_string </item>
+      <item> $ask_yes_no </item>
+      <item> $ask_yes_no_cancel </item>
+      <item> $bell </item>
+      <item> $bottom_y </item>
+      <item> $c_ask_string </item>
+      <item> $change_location_map_entry </item>
+      <item> $change_workspace </item>
+      <item> $cleanup_icons </item>
+      <item> $cleanup_windows </item>
+      <item> $clear_message </item>
+      <item> $clear_saved_prompt </item>
+      <item> $close_application_windows </item>
+      <item> $close_physical_transcript </item>
+      <item> $close_session </item>
+      <item> $close_window </item>
+      <item> $collapse_dockable </item>
+      <item> $compile_userware </item>
+      <item> $create_form </item>
+      <item> $create_menu </item>
+      <item> $create_notepad </item>
+      <item> $create_prompt </item>
+      <item> $create_toolbar </item>
+      <item> $define_color </item>
+      <item> $define_userware </item>
+      <item> $delete_menu_item </item>
+      <item> $delete_stroke </item>
+      <item> $disable_interrupt </item>
+      <item> $disable_softkey_update </item>
+      <item> $dock_dockable </item>
+      <item> $dockable_collapsed </item>
+      <item> $dockable_docked </item>
+      <item> $dockable_permission </item>
+      <item> $dockable_pinned </item>
+      <item> $dockable_visible </item>
+      <item> $dockables_all_hidden </item>
+      <item> $dockables_all_shown </item>
+      <item> $dockables_locked </item>
+      <item> $double_click_distance </item>
+      <item> $edit_source </item>
+      <item> $enable_help </item>
+      <item> $enable_interrupt </item>
+      <item> $enable_ref_help </item>
+      <item> $enable_softkey_update </item>
+      <item> $eval </item>
+      <item> $execute </item>
+      <item> $execute_dynamic </item>
+      <item> $execute_last_menu </item>
+      <item> $execute_promptbar </item>
+      <item> $execute_ref </item>
+      <item> $execute_stroke </item>
+      <item> $expand_command </item>
+      <item> $float_dockable </item>
+      <item> $forget </item>
+      <item> $forget_all_promptbars </item>
+      <item> $forget_promptbar </item>
+      <item> $form_action </item>
+      <item> $form_action_buttons_gadget </item>
+      <item> $form_actual_value </item>
+      <item> $form_argument </item>
+      <item> $form_argument_gadget </item>
+      <item> $form_argument_integer_entry_gadget </item>
+      <item> $form_argument_number_entry_gadget </item>
+      <item> $form_argument_string_entry_gadget </item>
+      <item> $form_argument_value </item>
+      <item> $form_button </item>
+      <item> $form_check_boxes_gadget </item>
+      <item> $form_choice_buttons_gadget </item>
+      <item> $form_choice_stepper_gadget </item>
+      <item> $form_click_button_gadget </item>
+      <item> $form_color_paint_chip_gadget </item>
+      <item> $form_colors_list_box_gadget </item>
+      <item> $form_column </item>
+      <item> $form_display_only </item>
+      <item> $form_display_text_gadget </item>
+      <item> $form_dynamic_list_box_gadget </item>
+      <item> $form_entry_box_gadget </item>
+      <item> $form_execute_buttons </item>
+      <item> $form_gadget_value </item>
+      <item> $form_horiz_dynamic_list_box_gadget </item>
+      <item> $form_horiz_list_box_gadget </item>
+      <item> $form_item </item>
+      <item> $form_label </item>
+      <item> $form_left_justified_column </item>
+      <item> $form_list_box_gadget </item>
+      <item> $form_mouse_tracking </item>
+      <item> $form_named_argument </item>
+      <item> $form_named_argument_gadget </item>
+      <item> $form_navigator_entry </item>
+      <item> $form_navigator_gadget </item>
+      <item> $form_number_entry_box_gadget </item>
+      <item> $form_patterns_list_box_gadget </item>
+      <item> $form_prompt_text_gadget </item>
+      <item> $form_push_button_gadget </item>
+      <item> $form_radio_buttons_gadget </item>
+      <item> $form_repeat </item>
+      <item> $form_right_justified_column </item>
+      <item> $form_row </item>
+      <item> $form_scope_list_box_gadget </item>
+      <item> $form_set_no_enter </item>
+      <item> $form_single_check_box_gadget </item>
+      <item> $form_string_entry_box_gadget </item>
+      <item> $form_switch </item>
+      <item> $form_target_action </item>
+      <item> $form_target_button </item>
+      <item> $form_text_entry_box_gadget </item>
+      <item> $form_variable </item>
+      <item> $form_variable_gadget </item>
+      <item> $frame_maximized </item>
+      <item> $frame_window </item>
+      <item> $get_action_bar_bgd_color </item>
+      <item> $get_action_bar_fgd_color </item>
+      <item> $get_active_color </item>
+      <item> $get_active_window </item>
+      <item> $get_additional_workspaces </item>
+      <item> $get_app_name_and_version </item>
+      <item> $get_app_name_no_version </item>
+      <item> $get_auto_pop </item>
+      <item> $get_auto_refresh </item>
+      <item> $get_auto_resize_palette </item>
+      <item> $get_autosave </item>
+      <item> $get_base_window </item>
+      <item> $get_bgd_color </item>
+      <item> $get_border_width </item>
+      <item> $get_current_profile </item>
+      <item> $get_cursor_colors </item>
+      <item> $get_cursor_shape </item>
+      <item> $get_default_method </item>
+      <item> $get_default_notepad_font </item>
+      <item> $get_double_click_interval </item>
+      <item> $get_expanded_pathname </item>
+      <item> $get_fgd_color </item>
+      <item> $get_focus_follows_mouse </item>
+      <item> $get_focus_follows_mouse_delay </item>
+      <item> $get_font_nominal_width </item>
+      <item> $get_form_gadget_value </item>
+      <item> $get_frame_collapsed </item>
+      <item> $get_graphic_device </item>
+      <item> $get_keyboard_type </item>
+      <item> $get_last_window </item>
+      <item> $get_message_lines </item>
+      <item> $get_message_popup </item>
+      <item> $get_message_reply </item>
+      <item> $get_message_transcript </item>
+      <item> $get_notepad_document_status </item>
+      <item> $get_open_windows </item>
+      <item> $get_palette_menu_visible </item>
+      <item> $get_pattern </item>
+      <item> $get_prompt_fonts </item>
+      <item> $get_server_switch </item>
+      <item> $get_sidetab_color </item>
+      <item> $get_tabbed_workspace_trim_right </item>
+      <item> $get_text_cursor_blink </item>
+      <item> $get_transcript_output </item>
+      <item> $get_window_border_width </item>
+      <item> $get_window_frame_extent </item>
+      <item> $get_window_frame_width </item>
+      <item> $get_workspace </item>
+      <item> $graphic_x </item>
+      <item> $graphic_y </item>
+      <item> $grow_window </item>
+      <item> $help </item>
+      <item> $help_context </item>
+      <item> $help_enabled </item>
+      <item> $hide_all_dockables </item>
+      <item> $hide_command_shell </item>
+      <item> $hide_dockable </item>
+      <item> $hide_menu_bar </item>
+      <item> $hide_message_area </item>
+      <item> $hide_palette </item>
+      <item> $hide_palette_scrolls </item>
+      <item> $hide_scrolls </item>
+      <item> $hide_softkey_labels </item>
+      <item> $hide_softkeys </item>
+      <item> $hide_transcript </item>
+      <item> $hide_window_title </item>
+      <item> $identify_interrupt </item>
+      <item> $insert_menu_item </item>
+      <item> $key_ </item>
+      <item> $left_x </item>
+      <item> $load_profile </item>
+      <item> $load_userware </item>
+      <item> $location </item>
+      <item> $lock_dockables </item>
+      <item> $mark </item>
+      <item> $maximize_window </item>
+      <item> $menu_bar_item </item>
+      <item> $menu_bar_visible </item>
+      <item> $menu_context_item </item>
+      <item> $menu_name </item>
+      <item> $menu_parent_name </item>
+      <item> $menu_registered_item </item>
+      <item> $menu_separator_item </item>
+      <item> $menu_special_text_item </item>
+      <item> $menu_text_item </item>
+      <item> $menu_title_item </item>
+      <item> $message </item>
+      <item> $message_area_visible </item>
+      <item> $minimize_window </item>
+      <item> $move_cursor </item>
+      <item> $move_dockable </item>
+      <item> $move_dockable_into </item>
+      <item> $move_palette </item>
+      <item> $move_window </item>
+      <item> $next_field </item>
+      <item> $next_field_promptbar </item>
+      <item> $next_icon </item>
+      <item> $next_window </item>
+      <item> $open_notepad </item>
+      <item> $open_physical_transcript </item>
+      <item> $open_text_report </item>
+      <item> $option_form_promptbar </item>
+      <item> $palette_visible </item>
+      <item> $pause </item>
+      <item> $pin_dockable </item>
+      <item> $pop_window </item>
+      <item> $pop_window_to_top </item>
+      <item> $popup_command_line </item>
+      <item> $popup_last_menu </item>
+      <item> $popup_menu </item>
+      <item> $popup_menu_at_cursor </item>
+      <item> $popup_menu_bar </item>
+      <item> $popup_window_menu </item>
+      <item> $prev_field </item>
+      <item> $prev_field_promptbar </item>
+      <item> $prompt </item>
+      <item> $prompt_arg </item>
+      <item> $prompt_display </item>
+      <item> $prompt_dynamic </item>
+      <item> $prompt_for_location </item>
+      <item> $prompt_for_polylocation </item>
+      <item> $prompt_for_polyrectangle </item>
+      <item> $prompt_for_rectangle </item>
+      <item> $prompt_options </item>
+      <item> $read_cpu_timer </item>
+      <item> $read_cpu_timer_total </item>
+      <item> $read_map </item>
+      <item> $read_timer </item>
+      <item> $read_timer_total </item>
+      <item> $redirect_to_active_window </item>
+      <item> $ref_help </item>
+      <item> $ref_help_enabled </item>
+      <item> $refresh </item>
+      <item> $relative_location </item>
+      <item> $remove_profile </item>
+      <item> $replace_palette </item>
+      <item> $replay_physical_transcript </item>
+      <item> $report_color </item>
+      <item> $report_key </item>
+      <item> $report_stroke </item>
+      <item> $reposition_window </item>
+      <item> $reset </item>
+      <item> $reset_defaults </item>
+      <item> $reset_timer </item>
+      <item> $resize_palette </item>
+      <item> $restore_default_profile </item>
+      <item> $result </item>
+      <item> $resume </item>
+      <item> $right_x </item>
+      <item> $save_profile </item>
+      <item> $save_profile_as </item>
+      <item> $screen_x </item>
+      <item> $screen_y </item>
+      <item> $scroll_down_by_unit </item>
+      <item> $scroll_down_by_window </item>
+      <item> $scroll_hz </item>
+      <item> $scroll_left_by_unit </item>
+      <item> $scroll_left_by_window </item>
+      <item> $scroll_right_by_unit </item>
+      <item> $scroll_right_by_window </item>
+      <item> $scroll_to_bottom </item>
+      <item> $scroll_to_left </item>
+      <item> $scroll_to_right </item>
+      <item> $scroll_to_top </item>
+      <item> $scroll_up_by_unit </item>
+      <item> $scroll_up_by_window </item>
+      <item> $scroll_vt </item>
+      <item> $scrolls_visible </item>
+      <item> $select </item>
+      <item> $select_active_window </item>
+      <item> $send_ipc </item>
+      <item> $session_window_active </item>
+      <item> $set_action_bar_bgd_color </item>
+      <item> $set_action_bar_fgd_color </item>
+      <item> $set_active_color </item>
+      <item> $set_active_window </item>
+      <item> $set_additional_workspaces </item>
+      <item> $set_auto_pop </item>
+      <item> $set_auto_refresh </item>
+      <item> $set_auto_resize_palette </item>
+      <item> $set_autosave </item>
+      <item> $set_base_window </item>
+      <item> $set_bgd_color </item>
+      <item> $set_border_width </item>
+      <item> $set_cmd_line_font </item>
+      <item> $set_cursor_colors </item>
+      <item> $set_cursor_shape </item>
+      <item> $set_default_method </item>
+      <item> $set_default_notepad_font </item>
+      <item> $set_default_position </item>
+      <item> $set_double_click_distance </item>
+      <item> $set_double_click_interval </item>
+      <item> $set_fgd_color </item>
+      <item> $set_focus_follows_mouse </item>
+      <item> $set_focus_follows_mouse_delay </item>
+      <item> $set_form_gadget_value </item>
+      <item> $set_form_position </item>
+      <item> $set_frame_width </item>
+      <item> $set_graphic_device </item>
+      <item> $set_invert_text_color_on_highlight </item>
+      <item> $set_ipc_port </item>
+      <item> $set_ipc_wakeup_interval </item>
+      <item> $set_left_justify_palette_text </item>
+      <item> $set_list_gadget_double_click_action </item>
+      <item> $set_menu_rollover_color </item>
+      <item> $set_message_font_resize </item>
+      <item> $set_message_lines </item>
+      <item> $set_message_popup </item>
+      <item> $set_message_reply </item>
+      <item> $set_message_transcript </item>
+      <item> $set_palette_width </item>
+      <item> $set_pattern </item>
+      <item> $set_prompt_fonts </item>
+      <item> $set_sidetab_color </item>
+      <item> $set_softkey_bgd_color </item>
+      <item> $set_softkey_fgd_color </item>
+      <item> $set_softkey_font </item>
+      <item> $set_tabbed_workspace_trim_right </item>
+      <item> $set_text_cursor_blink </item>
+      <item> $set_transcript_output </item>
+      <item> $set_window_border_width </item>
+      <item> $set_window_frame_width </item>
+      <item> $set_working_directory </item>
+      <item> setup_registered_commands </item>
+      <item> $show_all_dockables </item>
+      <item> $show_command_shell </item>
+      <item> $show_dockable </item>
+      <item> $show_location_map </item>
+      <item> $show_menu_bar </item>
+      <item> $show_message_area </item>
+      <item> $show_palette </item>
+      <item> $show_palette_scrolls </item>
+      <item> $show_parent_palette </item>
+      <item> $show_scrolls </item>
+      <item> $show_softkey_labels </item>
+      <item> $show_softkeys </item>
+      <item> $show_sub_palette </item>
+      <item> $show_toolbar_icons </item>
+      <item> $show_toolbar_text </item>
+      <item> $show_top_palette </item>
+      <item> $show_transcript </item>
+      <item> $show_window_title </item>
+      <item> $show_workspace_tab </item>
+      <item> $softkey_bgd_color </item>
+      <item> $softkey_fgd_color </item>
+      <item> $softkey_font </item>
+      <item> $softkeys_visible </item>
+      <item> $source </item>
+      <item> $start_stroke </item>
+      <item> $start_stroke_location </item>
+      <item> $start_timer </item>
+      <item> $stop </item>
+      <item> $stop_stroke </item>
+      <item> $stop_stroke_location </item>
+      <item> $stop_timer </item>
+      <item> $stroke_extent </item>
+      <item> $stroke_identity </item>
+      <item> $stroke_ </item>
+      <item> $target_name </item>
+      <item> $title_visible </item>
+      <item> $toolbar_action_selector_item </item>
+      <item> $toolbar_add_item </item>
+      <item> $toolbar_associative_item </item>
+      <item> $toolbar_combo_box_item </item>
+      <item> $toolbar_insert_item </item>
+      <item> $toolbar_label_item </item>
+      <item> $toolbar_n_state_item </item>
+      <item> $toolbar_registered_item </item>
+      <item> $toolbar_remove_item </item>
+      <item> $toolbar_separator_item </item>
+      <item> $toolbar_text_field_item </item>
+      <item> $toolbar_text_icon_item </item>
+      <item> $top_y </item>
+      <item> $transcript_visible </item>
+      <item> $ui_message_ask_yes_no </item>
+      <item> $ui_message_fail </item>
+      <item> $update_menu_bar </item>
+      <item> $update_palette </item>
+      <item> $update_softkey_labels </item>
+      <item> $update_toolbars </item>
+      <item> $use_animations </item>
+      <item> $user_init </item>
+      <item> $user_pre_init </item>
+      <item> $user_window_init </item>
+      <item> $using_animations </item>
+      <item> $version </item>
+      <item> $wait </item>
+      <item> $window_class_name </item>
+      <item> $window_extent </item>
+      <item> $window_init </item>
+      <item> $window_interior_extent </item>
+      <item> $window_scope_name </item>
+      <item> $window_visible </item>
+      <item> $writeln </item>
+    </list>
+    <list name="dveicfct">
+      <item> $add_back_annotation </item>
+      <item> $add_multiple_properties </item>
+      <item> $add_parameter </item>
+      <item> $add_primitive </item>
+      <item> $add_property </item>
+      <item> $add_substitute </item>
+      <item> $add_visible_property </item>
+      <item> $change_model </item>
+      <item> $change_property </item>
+      <item> $check_design </item>
+      <item> $clear_global_parameter </item>
+      <item> $close_design_viewpoint </item>
+      <item> $connect_back_annotation </item>
+      <item> $delete_invalid_entries </item>
+      <item> $delete_parameter </item>
+      <item> $delete_primitive </item>
+      <item> $delete_property </item>
+      <item> $delete_substitute </item>
+      <item> $delete_visible_property </item>
+      <item> $disconnect_back_annotation </item>
+      <item> $erc_check </item>
+      <item> $export_back_annotation </item>
+      <item> $export_design_configuration </item>
+      <item> $filter_property_check </item>
+      <item> $get_viewpoint_name </item>
+      <item> $import_back_annotation </item>
+      <item> $is_ba_readonly </item>
+      <item> $is_function_defined </item>
+      <item> $latch_using_label </item>
+      <item> $latch_version </item>
+      <item> $maintain_back_annotation_window </item>
+      <item> $open_back_annotation </item>
+      <item> $open_design_configuration </item>
+      <item> $open_design_viewpoint </item>
+      <item> $preset_global_parameter </item>
+      <item> $reload_model </item>
+      <item> $report_select_counts </item>
+      <item> $report_viewpoint_references </item>
+      <item> $save_design_viewpoint </item>
+      <item> $select_back_annotation </item>
+      <item> $select_design_configuration </item>
+      <item> $select_parameter </item>
+      <item> $select_primitive </item>
+      <item> $select_substitute </item>
+      <item> $select_visible_property </item>
+      <item> $unlatch_version </item>
+      <item> $unselect_back_annotation </item>
+      <item> $unselect_design_configuration </item>
+      <item> $unselect_parameter </item>
+      <item> $unselect_primitive </item>
+      <item> $unselect_substitute </item>
+      <item> $unselect_visible_property </item>
+      <item> $update_latched_version </item>
+    </list>
+    <!-- Schematic Generator Functions -->
+    <list name="sgfct">
+      <item> $add_bundle </item>
+      <item> $add_bundle_members </item>
+      <item> $classify_all_genlib </item>
+      <item> $classify_symbol </item>
+      <item> $close_window </item>
+      <item> $delete_bundle </item>
+      <item> $delete_bundle_members </item>
+      <item> $delete_parameter </item>
+      <item> $generate </item>
+      <item> $get_bundle </item>
+      <item> $get_bundle_list </item>
+      <item> $get_bundle_members </item>
+      <item> $get_components </item>
+      <item> $get_instances </item>
+      <item> $get_nets </item>
+      <item> $get_parameter </item>
+      <item> $get_partition_setup </item>
+      <item> $get_property_list </item>
+      <item> $get_property_setup </item>
+      <item> $get_schematics </item>
+      <item> $get_sheets </item>
+      <item> $get_symbols </item>
+      <item> $get_symbol_classification </item>
+      <item> $get_symbol_setup </item>
+      <item> $open_component_from_model </item>
+      <item> $open_component_from_tfnf </item>
+      <item> $open_design_from_viewpoint </item>
+      <item> $report_bundle_members </item>
+      <item> $report_design_info </item>
+      <item> $report_property_setup </item>
+      <item> $report_setup </item>
+      <item> $report_status_bundles </item>
+      <item> $report_symbol_classifications </item>
+      <item> $save </item>
+      <item> $save_as </item>
+      <item> $set_parameter </item>
+      <item> $set_symbol_transcript </item>
+      <item> $setup_partition </item>
+      <item> $setup_placement </item>
+      <item> $setup_property </item>
+      <item> $setup_symbol_generation </item>
+      <item> $view_all </item>
+      <item> $view_sheet </item>
+      <item> $view_symbol </item>
+      <item> $zoom_in </item>
+      <item> $zoom_out </item>
+      <item> $set_balance </item>
+      <item> $set_bundle_mode </item>
+      <item> $set_bus_partition </item>
+      <item> $set_cluster </item>
+      <item> $set_cluster_spacing </item>
+      <item> $set_connector_spacing </item>
+      <item> $set_ground_placement </item>
+      <item> $set_instance_spacing </item>
+      <item> $set_iterate </item>
+      <item> $set_lrflow </item>
+      <item> $set_net_name_prefix </item>
+      <item> $set_net_spacing </item>
+      <item> $set_partition_by_name </item>
+      <item> $set_partition_by_property </item>
+      <item> $set_partition_density </item>
+      <item> $set_partition_mode </item>
+      <item> $set_partition_sheet_count </item>
+      <item> $set_partition_sheet_size </item>
+      <item> $set_placement_technique </item>
+      <item> $set_power_placement </item>
+    </list>
+
+    <list name="dvafct">
+      <item> $add_bus </item>
+      <item> $add_comment_flag </item>
+      <item> $add_group </item>
+      <item> $add_synonym </item>
+      <item> $clear_name </item>
+      <item> $clear_selection_filter </item>
+      <item> $close_all_windows </item>
+      <item> $close_selection </item>
+      <item> $delete_bus </item>
+      <item> $delete_comment_flag </item>
+      <item> $delete_group </item>
+      <item> $delete_synonym </item>
+      <item> $end_object_selection </item>
+      <item> $end_object_unselection </item>
+      <item> $freeze_window </item>
+      <item> $get_all_instance_properties </item>
+      <item> $get_all_net_properties </item>
+      <item> $get_all_pin_properties </item>
+      <item> $get_all_types </item>
+      <item> $get_average_connected_pin </item>
+      <item> $get_average_primitive_instance </item>
+      <item> $get_average_selected </item>
+      <item> $get_best_case </item>
+      <item> $get_bottom_visible </item>
+      <item> $get_bundle_names </item>
+      <item> $get_bus_parts </item>
+      <item> $get_bus_width </item>
+      <item> $get_buses </item>
+      <item> $get_comment_flags </item>
+      <item> $get_component_path </item>
+      <item> $get_connected </item>
+      <item> $get_connected_instance </item>
+      <item> $get_connected_net </item>
+      <item> $get_connected_net_name </item>
+      <item> $get_connected_pin </item>
+      <item> $get_contained </item>
+      <item> $get_default_monitor_flag_font </item>
+      <item> $get_default_monitor_flag_height </item>
+      <item> $get_effective_context </item>
+      <item> $get_equivalent_nets </item>
+      <item> $get_full_pathname </item>
+      <item> $get_groups </item>
+      <item> $get_highlighted </item>
+      <item> $get_instance_property </item>
+      <item> $get_instance_viewed </item>
+      <item> $get_last_created_window </item>
+      <item> $get_maximum_connected_pin </item>
+      <item> $get_maximum_primitive_instance </item>
+      <item> $get_maximum_selected </item>
+      <item> $get_minimum_connected_pin </item>
+      <item> $get_minimum_primitive_instance </item>
+      <item> $get_minimum_selected </item>
+      <item> $get_monitor_flag_font </item>
+      <item> $get_monitor_flag_height </item>
+      <item> $get_naming_context </item>
+      <item> $get_nearest_instance </item>
+      <item> $get_nearest_net </item>
+      <item> $get_nearest_pin </item>
+      <item> $get_nearest_property_and_owner </item>
+      <item> $get_nearest_vertex </item>
+      <item> $get_net_property </item>
+      <item> $get_pin_property </item>
+      <item> $get_protected </item>
+      <item> $get_select_count </item>
+      <item> $get_selected </item>
+      <item> $get_selected_types </item>
+      <item> $get_selection_filter </item>
+      <item> $get_sheetname_viewed </item>
+      <item> $get_source_type </item>
+      <item> $get_sum_connected_pin </item>
+      <item> $get_sum_primitive_instance </item>
+      <item> $get_sum_selected </item>
+      <item> $get_synonyms </item>
+      <item> $get_top_visible </item>
+      <item> $get_total_width_of </item>
+      <item> $get_triplet_mode </item>
+      <item> $get_typical </item>
+      <item> $get_undo_depth </item>
+      <item> $get_view_window_names </item>
+      <item> $get_window_names </item>
+      <item> $get_window_titles </item>
+      <item> $get_window_type </item>
+      <item> $get_worst_case </item>
+      <item> $goto_highlight </item>
+      <item> $highlight_instance </item>
+      <item> $highlight_net </item>
+      <item> $highlight_pin </item>
+      <item> $instance_annotated_property </item>
+      <item> $instance_exists </item>
+      <item> $instance_has_annotations </item>
+      <item> $instance_source_property </item>
+      <item> $invalidate_window </item>
+      <item> $is_window_valid </item>
+      <item> $net_annotated_property </item>
+      <item> $net_exists </item>
+      <item> $net_has_annotations </item>
+      <item> $net_source_property </item>
+      <item> $open_down </item>
+      <item> $open_selected </item>
+      <item> $open_sheet </item>
+      <item> $open_up </item>
+      <item> $pin_annotated_property </item>
+      <item> $pin_exists </item>
+      <item> $pin_has_annotations </item>
+      <item> $pin_source_property </item>
+      <item> $primitive_instance </item>
+      <item> $primitive_net </item>
+      <item> $primitive_pin </item>
+      <item> $protect </item>
+      <item> $redirect_to_all_windows </item>
+      <item> $redo </item>
+      <item> $reopen_selection </item>
+      <item> $report_buses </item>
+      <item> $report_groups </item>
+      <item> $report_highlighted </item>
+      <item> $report_interfaces </item>
+      <item> $report_naming_context </item>
+      <item> $report_objects </item>
+      <item> $report_parts_list </item>
+      <item> $report_protected </item>
+      <item> $report_synonyms </item>
+      <item> $report_wire_list </item>
+      <item> $reselect </item>
+      <item> $select_by_name </item>
+      <item> $select_by_property </item>
+      <item> $select_connected </item>
+      <item> $select_contained </item>
+      <item> $select_group </item>
+      <item> $select_messages </item>
+      <item> $select_statement </item>
+      <item> $select_whole_window </item>
+      <item> $selection_closed </item>
+      <item> $selection_filter_active </item>
+      <item> $send_to_active_window </item>
+      <item> $set_auto_locate </item>
+      <item> $set_default_method </item>
+      <item> $set_default_monitor_flag_font </item>
+      <item> $set_default_monitor_flag_height </item>
+      <item> $set_effective_context </item>
+      <item> $set_monitor_flag_font </item>
+      <item> $set_monitor_flag_height </item>
+      <item> $set_naming_context </item>
+      <item> $set_selection_filter </item>
+      <item> $set_triplet_mode </item>
+      <item> $set_undo_depth </item>
+      <item> $setup_icon </item>
+      <item> $setup_icon_font </item>
+      <item> $setup_name </item>
+      <item> $setup_window_location </item>
+      <item> $undo </item>
+      <item> $unfreeze_window </item>
+      <item> $unhighlight_all </item>
+      <item> $unhighlight_instance </item>
+      <item> $unhighlight_net </item>
+      <item> $unhighlight_pin </item>
+      <item> $unprotect </item>
+      <item> $unselect_all </item>
+      <item> $unselect_by_name </item>
+      <item> $unselect_by_property </item>
+      <item> $unselect_except_by_property </item>
+      <item> $unselect_except_group </item>
+      <item> $unselect_group </item>
+      <item> $unselect_statement </item>
+      <item> $unselect_whole_window </item>
+      <item> $update_window </item>
+      <item> $write_report </item>
+    </list>
+    <list name="icprops">
+      <item> __da_hdl_arch_name </item>
+      <item> __da_hdl_entity_name </item>
+      <item> __da_hdl_lib_name </item>
+      <item> __da_hdl_libraries </item>
+      <item> __da_hdl_packages </item>
+      <item> __da_hdl_port_init </item>
+      <item> __da_hdl_port_mode </item>
+      <item> __da_hdl_port_type </item>
+      <item> __da_hdl_signal_type </item>
+      <item> __da_suppress_units </item>
+      <item> Addr_width </item>
+      <item> Afall, Bfall, Qfall, Qbfall, Tfall, Tbfall </item>
+      <item> Area </item>
+      <item> Arise, Brise, Qrise, Qbrise, Trise, Tbrise </item>
+      <item> Asim_coupling </item>
+      <item> Asim_param </item>
+      <item> Asim_pinorder </item>
+      <item> Asim_model </item>
+      <item> Asim_model Property in Element Statements </item>
+      <item> Asim_model_keyword </item>
+      <item> Attribute_file_required </item>
+      <item> Basic_container </item>
+      <item> Block_dir </item>
+      <item> Brd_loc </item>
+      <item> Bres_value </item>
+      <item> Buildmode </item>
+      <item> Bundle_cover_thickness </item>
+      <item> Bundle_diameter </item>
+      <item> Bundle_height </item>
+      <item> Bundle_length </item>
+      <item> Bundle_min_bend_radius </item>
+      <item> Bundle_type </item>
+      <item> Bundle_width </item>
+      <item> Cap_coupled </item>
+      <item> Cap_drive </item>
+      <item> Cap_drive1 </item>
+      <item> Cap_drive2 </item>
+      <item> Cap_net </item>
+      <item> Cap_nets_coupled </item>
+      <item> Cap_pin </item>
+      <item> Class </item>
+      <item> Cntm_bdry_model </item>
+      <item> Comp </item>
+      <item> $Compaction-group </item>
+      <item> Component_type </item>
+      <item> $Con-edge </item>
+      <item> $Con-obj </item>
+      <item> Conn_order </item>
+      <item> Conn_type </item>
+      <item> Contention </item>
+      <item> Convect_h </item>
+      <item> Convect_rank </item>
+      <item> Corr_formula </item>
+      <item> Corr_formula_rad </item>
+      <item> Cover_thickness </item>
+      <item> Cpl_cap_net </item>
+      <item> Creating_tool </item>
+      <item> Current_drive </item>
+      <item> Current_load </item>
+      <item> Data_width </item>
+      <item> DCinit </item>
+      <item> Ddms_versioned_object </item>
+      <item> Decay </item>
+      <item> Dec_cap </item>
+      <item> Default_plot_typ </item>
+      <item> Default_tool </item>
+      <item> Diff_pair </item>
+      <item> Dme_config_ignore_type </item>
+      <item> Dme_config_include_container </item>
+      <item> Do_not_jog </item>
+      <item> dont_delete </item>
+      <item> dont_shrink </item>
+      <item> Drive </item>
+      <item> Dtime </item>
+      <item> Dual_footprint </item>
+      <item> Elec_class </item>
+      <item> Element </item>
+      <item> Emissivity </item>
+      <item> Except_assy </item>
+      <item> Fall </item>
+      <item> Fall_adj </item>
+      <item> Fall_slope </item>
+      <item> Fileset_def </item>
+      <item> First_addr </item>
+      <item> Fpin_no_sci </item>
+      <item> Frexp </item>
+      <item> From_location_map </item>
+      <item> From_path </item>
+      <item> From_version </item>
+      <item> Func </item>
+      <item> $G </item>
+      <item> $Gg </item>
+      <item> Gate_class </item>
+      <item> Gate_id </item>
+      <item> Gatemode </item>
+      <item> Gdsii_cell </item>
+      <item> Gdsii_datatype </item>
+      <item> Gdsii_error </item>
+      <item> Gdsii_no_output </item>
+      <item> Gdsii_plex </item>
+      <item> Gdsii_property_# </item>
+      <item> Gdsii_text </item>
+      <item> Requirements for DRACULA II </item>
+      <item> Gdsii_textinfo </item>
+      <item> Geom </item>
+      <item> Global </item>
+      <item> Globalin </item>
+      <item> Globalinout </item>
+      <item> Global_net_cap </item>
+      <item> Globalout </item>
+      <item> Group_abut </item>
+      <item> Group_name </item>
+      <item> Group_place </item>
+      <item> Group_prio </item>
+      <item> Group_seed </item>
+      <item> Icap_net </item>
+      <item> Ignore_net </item>
+      <item> Iih </item>
+      <item> Iil </item>
+      <item> Init </item>
+      <item> Initial_Condition </item>
+      <item> Ink_id </item>
+      <item> Input_data </item>
+      <item> Inst </item>
+      <item> Instpar </item>
+      <item> Instpartol </item>
+      <item> Ioh </item>
+      <item> Ioh1, Ioh2 </item>
+      <item> Iol </item>
+      <item> Iol1, Iol2 </item>
+      <item> Iozh </item>
+      <item> Iozl </item>
+      <item> Junction_max_t </item>
+      <item> Key_file </item>
+      <item> Kfall </item>
+      <item> Krise </item>
+      <item> Large_icon </item>
+      <item> Laser </item>
+      <item> Lms_cat </item>
+      <item> Lms_component_path </item>
+      <item> Lms_geometries </item>
+      <item> Lms_index </item>
+      <item> Lms_symbols </item>
+      <item> Load </item>
+      <item> M </item>
+      <item> Mass_density </item>
+      <item> Master_pin </item>
+      <item> Match_group </item>
+      <item> Matched_net_length </item>
+      <item> Mating_connector </item>
+      <item> Max_addr </item>
+      <item> Max_cap_pin </item>
+      <item> Max_stub </item>
+      <item> Max_wire_length </item>
+      <item> Mfg </item>
+      <item> Mgc_cat </item>
+      <item> Mgc_comps </item>
+      <item> Mgc_component_path </item>
+      <item> Mgc_geoms </item>
+      <item> Mgc_index </item>
+      <item> Mgc_lib </item>
+      <item> Mgc_map_path </item>
+      <item> Mgc_models </item>
+      <item> Mgc_prop_file_index </item>
+      <item> Mgc_prop_file_path </item>
+      <item> Mgc_refine_level </item>
+      <item> Mgc_symbols </item>
+      <item> Min_node </item>
+      <item> Min_stub </item>
+      <item> Min_wire_length </item>
+      <item> Model </item>
+      <item> Modelfile </item>
+      <item> Modeltype </item>
+      <item> Ms_* </item>
+      <item> Multi_assay </item>
+      <item> Must_jog </item>
+      <item> My_net </item>
+      <item> N </item>
+      <item> Net </item>
+      <item> Net_comp </item>
+      <item> Net_comp_count </item>
+      <item> Net_comp_place </item>
+      <item> Netdelay </item>
+      <item> Spike Model Data </item>
+      <item> Example </item>
+      <item> Net_length </item>
+      <item> Net_order </item>
+      <item> Net_prio </item>
+      <item> Net_prio_protected </item>
+      <item> Net_tp_min_clearance </item>
+      <item> Net_tp_req </item>
+      <item> Net_type </item>
+      <item> Nmos_bulk_node </item>
+      <item> Node </item>
+      <item> Nodeset </item>
+      <item> Nofault </item>
+      <item> Note </item>
+      <item> Npn_sub_node </item>
+      <item> Num_blocks </item>
+      <item> Omit_wire_list </item>
+      <item> Part_no </item>
+      <item> Pcb_group </item>
+      <item> Pcb_ignore </item>
+      <item> Pcb_inst </item>
+      <item> Pcb_net </item>
+      <item> Pcb_pin </item>
+      <item> Pcb_pin_loc </item>
+      <item> Pcb_pin_pad </item>
+      <item> Phy_comp </item>
+      <item> Phy_pin </item>
+      <item> Pin </item>
+      <item> Pin_driver </item>
+      <item> Pin_gauge </item>
+      <item> Pin_group </item>
+      <item> Pin_no </item>
+      <item> Pin_order </item>
+      <item> Pin_swap </item>
+      <item> Pin_tp_req </item>
+      <item> Pins </item>
+      <item> Pins_out </item>
+      <item> Pins_spare </item>
+      <item> Pintech </item>
+      <item> Pintype </item>
+      <item> Pintype_override </item>
+      <item> Place </item>
+      <item> Placement_net_cap </item>
+      <item> Placement_region </item>
+      <item> Pmos_bulk_node </item>
+      <item> Pnp_sub_node </item>
+      <item> $Pn_ext </item>
+      <item> Portdir </item>
+      <item> Porttype </item>
+      <item> Pow_del_max </item>
+      <item> Pow_del_typ </item>
+      <item> Pow_derating </item>
+      <item> Pow_den </item>
+      <item> Pow_max </item>
+      <item> Pow_max_symb </item>
+      <item> Pow_min </item>
+      <item> Pow_typ </item>
+      <item> Pow_typ_symb </item>
+      <item> Power_nets </item>
+      <item> Power_pins </item>
+      <item> Power_route_style </item>
+      <item> Pwr </item>
+      <item> Prio </item>
+      <item> Process_var </item>
+      <item> R </item>
+      <item> Radiate_h </item>
+      <item> Rc_feedthrough </item>
+      <item> Ref </item>
+      <item> Ref_group </item>
+      <item> Refloc </item>
+      <item> Rel_preplacement </item>
+      <item> Release_comments </item>
+      <item> Release_date </item>
+      <item> Release_date_string </item>
+      <item> Released_by </item>
+      <item> Released_location_map </item>
+      <item> Released_to_path </item>
+      <item> Res_net </item>
+      <item> Res_path </item>
+      <item> Res_source </item>
+      <item> Restrict </item>
+      <item> R_hat_len </item>
+      <item> R_hat_width </item>
+      <item> Rise </item>
+      <item> Rise_adj </item>
+      <item> Rise_slope </item>
+      <item> R_len </item>
+      <item> R_min_dim </item>
+      <item> Rn_sub_node </item>
+      <item> Route_set </item>
+      <item> Rp_sub_node </item>
+      <item> R_shape </item>
+      <item> R_width </item>
+      <item> Rule </item>
+      <item> S_des </item>
+      <item> Seed </item>
+      <item> Shape </item>
+      <item> Shared </item>
+      <item> Side_pref </item>
+      <item> Size </item>
+      <item> Small_icon </item>
+      <item> Source </item>
+      <item> Source_edit_allowed </item>
+      <item> Spec_heat </item>
+      <item> Spicepar </item>
+      <item> Ss_num </item>
+      <item> Stub_dir </item>
+      <item> Substrate </item>
+      <item> Surface </item>
+      <item> Surface_area </item>
+      <item> Swapping </item>
+      <item> Swap_set </item>
+      <item> Syn_donttouch </item>
+      <item> Syn_dontuse </item>
+      <item> Syn_libname </item>
+      <item> Target_net_cap </item>
+      <item> Tech </item>
+      <item> Tegas5_lib </item>
+      <item> Temp </item>
+      <item> Terminator </item>
+      <item> Therm_cond </item>
+      <item> Therm_jc </item>
+      <item> Therm_r </item>
+      <item> _tid </item>
+      <item> Timefile </item>
+      <item> Toler </item>
+      <item> Tool_reference </item>
+      <item> Tphz, Tplz, Tpzh, Tpzl </item>
+      <item> Trace_shielding </item>
+      <item> Transmode </item>
+      <item> Trim </item>
+      <item> Undriven </item>
+      <item> Value </item>
+      <item> Variant </item>
+      <item> Version_depth </item>
+      <item> Vhdl_type </item>
+      <item> Vih </item>
+      <item> Vil </item>
+      <item> Voh </item>
+      <item> Voh1, Voh2 </item>
+      <item> Vol </item>
+      <item> Vol1, Vol2 </item>
+      <item> Voltage </item>
+      <item> Vtype </item>
+      <item> Wire_auto_calc_length </item>
+      <item> Zif_model </item>
+      <item> Zycad_type </item>
+    </list>
+
+    <list name="dmefct">
+      <item> $$add_configuration_entry </item>
+      <item> $add_configuration_entry </item>
+      <item> $$add_container </item>
+      <item> $add_container </item>
+      <item> $$add_directory </item>
+      <item> $add_directory </item>
+      <item> $add_link </item>
+      <item> $add_object_property </item>
+      <item> $$add_reference </item>
+      <item> $add_reference </item>
+      <item> $add_reference_property </item>
+      <item> $add_toolbox </item>
+      <item> $$add_type </item>
+      <item> $add_versions </item>
+      <item> $browse_for_object </item>
+      <item> $$build_configuration </item>
+      <item> $build_configuration </item>
+      <item> $$change_configuration_references </item>
+      <item> $change_configuration_references </item>
+      <item> $$change_design_object_references </item>
+      <item> $change_design_object_references </item>
+      <item> $change_link_text </item>
+      <item> $change_location_map_entry </item>
+      <item> $$change_object_name </item>
+      <item> $change_object_name </item>
+      <item> $change_object_property </item>
+      <item> $$change_object_references </item>
+      <item> $change_object_references </item>
+      <item> $change_password </item>
+      <item> $change_protection </item>
+      <item> $change_reference_property </item>
+      <item> $change_reference_state </item>
+      <item> $change_version_depth </item>
+      <item> $check_references </item>
+      <item> $check_registries </item>
+      <item> $$clear_entry_filter </item>
+      <item> $$clear_global_status </item>
+      <item> $$clear_monitor </item>
+      <item> $$close_configuration </item>
+      <item> $close_hierarchy </item>
+      <item> $$close_versioned_object </item>
+      <item> $close_window </item>
+      <item> $$convert_configuration_references </item>
+      <item> $convert_configuration_references </item>
+      <item> $$convert_object_references </item>
+      <item> $convert_object_references </item>
+      <item> $$copy_configuration </item>
+      <item> $copy_configuration </item>
+      <item> $$copy_design_object </item>
+      <item> $copy_design_object </item>
+      <item> $$copy_object </item>
+      <item> $copy_object </item>
+      <item> $copy_version </item>
+      <item> $$create_configuration </item>
+      <item> $create_dm_category </item>
+      <item> $create_dm_cell </item>
+      <item> $create_dm_ext_lib </item>
+      <item> $create_dm_library </item>
+      <item> $create_dm_project </item>
+      <item> $create_dm_tech_category </item>
+      <item> $create_dm_tech_lib </item>
+      <item> $create_tech_config_object </item>
+      <item> $$create_versioned_object </item>
+      <item> $$delete_configuration </item>
+      <item> $delete_configuration </item>
+      <item> $delete_design_object </item>
+      <item> $delete_excess_versions </item>
+      <item> $$delete_object </item>
+      <item> $delete_object </item>
+      <item> $$delete_object_property </item>
+      <item> $delete_object_property </item>
+      <item> $$delete_reference </item>
+      <item> $delete_reference </item>
+      <item> $$delete_reference_handle </item>
+      <item> $$delete_reference_property </item>
+      <item> $delete_reference_property </item>
+      <item> $$delete_reference_property_handle </item>
+      <item> $$delete_version </item>
+      <item> $delete_version </item>
+      <item> $$delete_version_property </item>
+      <item> $descend_hierarchy_one_level </item>
+      <item> $descend_hierarchy_specify_level </item>
+      <item> $$duplicate_object </item>
+      <item> $edit_file </item>
+      <item> $empty_trash </item>
+      <item> $explore_contents </item>
+      <item> $explore_parent </item>
+      <item> $explore_reference_parent </item>
+      <item> $explore_references </item>
+      <item> $export_configuration_entries </item>
+      <item> $export_library </item>
+      <item> $export_location_map </item>
+      <item> $find_external_deps </item>
+      <item> $find_references </item>
+      <item> $$fix_relative_path </item>
+      <item> $$freeze_configuration </item>
+      <item> $freeze_configuration </item>
+      <item> $$freeze_version </item>
+      <item> $freeze_version </item>
+      <item> $get_area_selected_objects </item>
+      <item> $$get_children </item>
+      <item> $$get_configuration_entries </item>
+      <item> $$get_configuration_path </item>
+      <item> $$get_container_contents </item>
+      <item> $$get_date_last_modified </item>
+      <item> $get_default_tool </item>
+      <item> $$get_entry_version </item>
+      <item> $$get_fileset_members </item>
+      <item> $$get_hard_name </item>
+      <item> $$get_location_map </item>
+      <item> $$get_monitor_error_count </item>
+      <item> $$get_monitor_flag </item>
+      <item> $$get_monitor_verbosity </item>
+      <item> $$get_monitor_warning_count </item>
+      <item> $get_navigator_directory </item>
+      <item> $get_navigator_directory_hard </item>
+      <item> $get_next_tool_env </item>
+      <item> $$get_object_current_version </item>
+      <item> $$get_object_parent_path </item>
+      <item> $$get_object_path_filter </item>
+      <item> $get_object_pathname </item>
+      <item> $$get_object_properties </item>
+      <item> $$get_object_property_filter </item>
+      <item> $$get_object_property_value </item>
+      <item> $$get_object_protection </item>
+      <item> $$get_object_references </item>
+      <item> $$get_object_type </item>
+      <item> $get_object_type </item>
+      <item> $$get_object_type_filter </item>
+      <item> $get_object_version </item>
+      <item> $$get_object_versions </item>
+      <item> $$get_parent_entry </item>
+      <item> $$get_primaries </item>
+      <item> $$get_reference_properties </item>
+      <item> $$get_reference_properties_handle </item>
+      <item> $$get_reference_property_filter </item>
+      <item> $$get_reference_traversal </item>
+      <item> $$get_secondaries </item>
+      <item> $$get_soft_name </item>
+      <item> $$get_status_code </item>
+      <item> $$get_status_code_stack </item>
+      <item> $$get_status_messages </item>
+      <item> $get_subinvoke_mode </item>
+      <item> $$get_target_path </item>
+      <item> $get_technology </item>
+      <item> $get_toolbox_search_path </item>
+      <item> $get_tool_pathname </item>
+      <item> $get_tool_script </item>
+      <item> $get_tool_type </item>
+      <item> $$get_type_properties </item>
+      <item> $$get_type_property_value </item>
+      <item> $$get_version_depth </item>
+      <item> $$get_version_properties </item>
+      <item> $$get_working_directory </item>
+      <item> $goto_directory </item>
+      <item> $$handle_map_error </item>
+      <item> $$has_object_property </item>
+      <item> $$has_reference_property </item>
+      <item> $$has_reference_property_handle </item>
+      <item> $hide_secondary_entries </item>
+      <item> $hide_monitor </item>
+      <item> $import_classic_data </item>
+      <item> $import_custom_view </item>
+      <item> $import_design_kit </item>
+      <item> $import_ext_lib </item>
+      <item> $import_icstudio_library </item>
+      <item> $import_icstudio_project </item>
+      <item> $include_external_library </item>
+      <item> $invoke_bgd_tool </item>
+      <item> $invoke_tool </item>
+      <item> $$is_build_consistent </item>
+      <item> $$is_build_valid </item>
+      <item> $$is_configuration_edited </item>
+      <item> $$is_configuration_frozen </item>
+      <item> $$is_configuration_locked </item>
+      <item> $$is_container </item>
+      <item> $$is_directory </item>
+      <item> $$is_entry_container </item>
+      <item> $$is_entry_fixed </item>
+      <item> $$is_entry_primary </item>
+      <item> $$is_entry_retargetable </item>
+      <item> $$is_object_released </item>
+      <item> $$is_object_versioned </item>
+      <item> $$is_read_protected </item>
+      <item> $$is_relative_path </item>
+      <item> $$is_type_versioned </item>
+      <item> $$is_writable </item>
+      <item> $$is_write_protected </item>
+      <item> $list_references </item>
+      <item> $load_registry </item>
+      <item> $$lock_configuration </item>
+      <item> $lock_configuration </item>
+      <item> $$lock_object </item>
+      <item> $login_admin </item>
+      <item> $logged_in </item>
+      <item> $logout_admin </item>
+      <item> $maintain_hierarchy </item>
+      <item> $$monitor_global_status </item>
+      <item> $$move_design_object </item>
+      <item> $move_design_object </item>
+      <item> $$move_object </item>
+      <item> $move_object </item>
+      <item> $$object_complete </item>
+      <item> $$object_exists </item>
+      <item> $$open_configuration </item>
+      <item> $open_configuration_window </item>
+      <item> $$open_hierarchy </item>
+      <item> $open_navigator </item>
+      <item> $open_object </item>
+      <item> $open_read_only_editor </item>
+      <item> $open_session_monitor </item>
+      <item> $$open_tool </item>
+      <item> $open_tool </item>
+      <item> $open_tools_window </item>
+      <item> $open_trash_window </item>
+      <item> $open_types_window </item>
+      <item> $$open_versioned_object </item>
+      <item> $$prune_design_hierarchy </item>
+      <item> $$read_map </item>
+      <item> $read_map </item>
+      <item> $refresh_all </item>
+      <item> $$release_configuration </item>
+      <item> $release_configuration </item>
+      <item> $$release_object </item>
+      <item> $release_object </item>
+      <item> $$remove_configuration_entry </item>
+      <item> $remove_configuration_entry </item>
+      <item> $remove_external_library </item>
+      <item> $remove_toolbox </item>
+      <item> $report_configuration_info </item>
+      <item> $$report_configuration_references </item>
+      <item> $report_configuration_references </item>
+      <item> $report_entry_info </item>
+      <item> $$report_entry_verification </item>
+      <item> $report_entry_verification </item>
+      <item> $$report_global_status </item>
+      <item> $report_object_info </item>
+      <item> $report_reference_info </item>
+      <item> $report_tool_info </item>
+      <item> $report_type_info </item>
+      <item> $report_version_info </item>
+      <item> $$resolve_path </item>
+      <item> $$revert_version </item>
+      <item> $revert_version </item>
+      <item> $$salvage_object </item>
+      <item> $salvage_object </item>
+      <item> $$save_configuration </item>
+      <item> $save_configuration </item>
+      <item> $$save_configuration_as </item>
+      <item> $save_configuration_as </item>
+      <item> $$save_object </item>
+      <item> $save_toolbox_search_path </item>
+      <item> $search </item>
+      <item> $search_again </item>
+      <item> $select_all </item>
+      <item> $select_by_name </item>
+      <item> $select_by_library </item>
+      <item> $select_by_type </item>
+      <item> $select_config_entry </item>
+      <item> $select_object </item>
+      <item> $select_reference </item>
+      <item> $select_tool </item>
+      <item> $select_toolbox </item>
+      <item> $select_trash_object </item>
+      <item> $select_version </item>
+      <item> $set_build_rules </item>
+      <item> $$set_location_map_entry </item>
+      <item> $$set_monitor_flag </item>
+      <item> $$set_monitor_verbosity </item>
+      <item> $set_next_tool_env </item>
+      <item> $$set_object_path_filter </item>
+      <item> $$set_object_property </item>
+      <item> $$set_object_property_filter </item>
+      <item> $$set_object_type_filter </item>
+      <item> $set_project_refresh_heartbeat </item>
+      <item> $$set_protection </item>
+      <item> $$set_protection_numeric </item>
+      <item> $$set_reference_property </item>
+      <item> $$set_reference_property_filter </item>
+      <item> $$set_reference_property_handle </item>
+      <item> $$set_reference_traversal </item>
+      <item> $set_subinvoke_mode </item>
+      <item> $$set_target_path </item>
+      <item> $set_target_path </item>
+      <item> $set_technology </item>
+      <item> $set_toolbox_search_path </item>
+      <item> $$set_version_depth </item>
+      <item> $$set_version_property </item>
+      <item> $$set_working_directory </item>
+      <item> $set_working_directory </item>
+      <item> $setup_filter_active </item>
+      <item> $setup_filter_all </item>
+      <item> $setup_default_editor </item>
+      <item> $setup_iconic_window_layout </item>
+      <item> $setup_invoke_tool </item>
+      <item> $$setup_monitor </item>
+      <item> $setup_monitor </item>
+      <item> $setup_session_defaults </item>
+      <item> $setup_startup_windows </item>
+      <item> $show_all_files </item>
+      <item> $show_compiled_libs </item>
+      <item> $show_component_hierarchy </item>
+      <item> $show_custom_views </item>
+      <item> $show_directories </item>
+      <item> $show_ext_libs </item>
+      <item> $show_language_views </item>
+      <item> $show_layout_views </item>
+      <item> $$show_location_map </item>
+      <item> $show_location_map </item>
+      <item> $show_logic_views </item>
+      <item> $show_references </item>
+      <item> $show_monitor </item>
+      <item> $show_tech_libs </item>
+      <item> $show_versions </item>
+      <item> $trash_object </item>
+      <item> $$unfreeze_configuration </item>
+      <item> $unfreeze_configuration </item>
+      <item> $$unfreeze_version </item>
+      <item> $unfreeze_version </item>
+      <item> $$unlock_configuration </item>
+      <item> $unlock_configuration </item>
+      <item> $$unlock_object </item>
+      <item> $unselect_all </item>
+      <item> $unselect_by_name </item>
+      <item> $unselect_by_type </item>
+      <item> $unselect_config_entry </item>
+      <item> $unselect_object </item>
+      <item> $unselect_reference </item>
+      <item> $unselect_tool </item>
+      <item> $unselect_toolbox </item>
+      <item> $unselect_trash_object </item>
+      <item> $unselect_version </item>
+      <item> $unset_next_tool_env </item>
+      <item> $untrash_object </item>
+      <item> $$update_type </item>
+      <item> $update_window </item>
+      <item> $validate_technology </item>
+      <item> $view_by_icon </item>
+      <item> $view_by_name </item>
+      <item> $view_containment_hierarchy </item>
+      <item> $view_primary_hierarchy </item>
+      <item> $view_secondary_entries </item>
+      <item> $view_toolboxes </item>
+      <item> $view_tools </item>
+      <item> $write_default_startup_file </item>
+      <item> $$writeln_monitor </item>
+    </list>
+    <list name="idmefct">
+      <item> $get_current_obj_hier_path </item>
+      <item> $get_current_obj_inst_list </item>
+      <item> $idw_dh_setup_display </item>
+      <item> $idw_report_hier </item>
+      <item> $idw_open_hierarchy_window </item>
+      <item> $inst_area_extend_selection </item>
+      <item> $inst_area_select_all_items </item>
+      <item> $inst_area_select_item </item>
+      <item> $inst_area_show_instances </item>
+      <item> $inst_area_unselect_all_items </item>
+      <item> $make_obj_current </item>
+      <item> $open_new_comp_hierarchy </item>
+      <item> $open_new_hierarchy </item>
+      <item> $select_obj </item>
+      <item> $show_instance </item>
+      <item> $show_n_levels </item>
+      <item> $set_font </item>
+      <item> $setup_comp_hierarchy_display </item>
+      <item> $setup_hierarchy_selection </item>
+      <item> $write_default_startup_file </item>
+      <item> $add_components </item>
+      <item> $add_labels_to_models </item>
+      <item> $collapse_object </item>
+      <item> $delete_labels_from_models </item>
+      <item> $delete_part_interfaces </item>
+      <item> $expand_object </item>
+      <item> $forget_components_edits </item>
+      <item> $hide_body_props </item>
+      <item> $hide_labels </item>
+      <item> $hide_model </item>
+      <item> $hide_pin_properties </item>
+      <item> $hide_pins </item>
+      <item> $register_models </item>
+      <item> $remove_components </item>
+      <item> $rename_part_interface </item>
+      <item> $report_body_prop_info </item>
+      <item> $report_component_info </item>
+      <item> $report_model_entry_info </item>
+      <item> $report_models_for_each_label </item>
+      <item> $report_model_info </item>
+      <item> $report_models_with_all_labels </item>
+      <item> $report_pin_info </item>
+      <item> $save_components_edits </item>
+      <item> $select_model_object </item>
+      <item> $select_object </item>
+      <item> $set_bgd_color </item>
+      <item> $set_bgd_color_title_items </item>
+      <item> $set_bgd_color_titles </item>
+      <item> $set_constraints </item>
+      <item> $set_default_part_interface </item>
+      <item> $set_fgd_color </item>
+      <item> $set_fgd_color_title_items </item>
+      <item> $set_fgd_color_titles </item>
+      <item> $set_font </item>
+      <item> $set_part_interface_font </item>
+      <item> $show_body_props </item>
+      <item> $show_labels </item>
+      <item> $show_model </item>
+      <item> $show_pins </item>
+      <item> $show_pin_properties </item>
+      <item> $unselect_model_object </item>
+      <item> $unselect_object </item>
+      <item> $validate_models </item>
+    </list>
+    <list name="fctattr">
+      <item> quick_help </item>
+      <item> ref_help </item>
+    </list>
+
+    <list name="argqualifier">
+      <item> optional </item>
+      <item> default </item>
+    </list>
+
+    <!-- plain IC AMPLE builtin types -->
+    <list name="types">
+      <item> name </item>
+      <item> callable </item>
+      <item> enum </item>
+      <item> integer </item>
+      <item> location </item>
+      <item> name </item>
+      <item> number </item>
+      <item> pathname </item>
+      <item> polylocation </item>
+      <item> polyrectangle </item>
+      <item> real </item>
+      <item> rectangle </item>
+      <item> status </item>
+      <item> string </item>
+      <item> vector </item>
+    </list>
+
+    <contexts>
+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
+        <DetectSpaces />
+	<!-- org C definition: <RegExpr attribute="Preprocessor" context="Outscoped" String="#\s*if\s+0" beginRegion="PP" firstNonSpace="true" /> -->
+        <RegExpr attribute="Preprocessor" context="#stay" String="#pragma"  firstNonSpace="true" />
+        <keyword attribute="Keyword" context="#stay" String="keywords"/>
+
+
+        <!-- use same coloring attributes of "Data Type" for now -->
+        <keyword attribute="Data Type" context="#stay" String="types"/>
+        <keyword attribute="Data Type" context="#stay" String="argqualifier"/>
+        <keyword attribute="Reserved Variables" context="#stay" String="resvar"/>
+        <keyword attribute="Base Functions"   context="#stay" insensitive="true" String="fctattr" />
+
+        <keyword attribute="Base Functions"      context="#stay" String="builtinfct" />
+        <keyword attribute="CUI Functions"       context="#stay" String="iccuifct" />
+        <keyword attribute="Layout Functions"    context="#stay" String="icstnfct" />
+        <keyword attribute="Schematic Functions" context="#stay" String="daicfct" />
+        <keyword attribute="DVE Functions"       context="#stay" String="dveicfct" />
+
+        <keyword attribute="CUI Functions"       context="#stay" String="idmefct" />
+        <keyword attribute="CUI Functions"       context="#stay" String="dmefct" />
+
+        <DetectIdentifier />
+        <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
+        <DetectChar attribute="Symbol" context="#stay" char="}"   endRegion="Brace1" />
+        <Float attribute="Float" context="#stay">
+          <StringDetect attribute="Decimal" context="#stay" String="meg" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="f" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="p" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="n" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="u" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="m" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="k" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="g" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="t" insensitive="TRUE"/>
+        </Float>
+
+        <Int attribute="Decimal" context="#stay" >
+          <StringDetect attribute="Decimal" context="#stay" String="meg" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="f" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="p" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="n" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="u" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="m" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="k" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="g" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="t" insensitive="TRUE"/>
+        </Int>
+        <HlCChar      attribute="Char"    context="#stay"/>
+        <DetectChar   attribute="String"  context="String" char="&quot;"/>
+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
+        <AnyChar      attribute="Symbol"  context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
+      </context>
+
+      <context attribute="String" lineEndContext="#pop" name="String">
+        <LineContinue  attribute="String"      context="#stay"/>
+        <HlCStringChar attribute="String Char" context="#stay"/>
+        <DetectChar    attribute="String"      context="#pop" char="&quot;"/>
+      </context>
+
+      <context attribute="Region Marker" lineEndContext="#pop" name="Region Marker">
+      </context>
+
+      <context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
+        <LineContinue attribute="Comment" context="#stay"/>
+        <IncludeRules context="##Alerts" />
+      </context>
+
+      <context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
+        <IncludeRules context="##Alerts" />
+      </context>
+
+      <context attribute="Error" lineEndContext="#pop" name="AfterHash">
+        <!-- define, elif, else, endif, error, if, ifdef, ifndef, include, include_next, line, pragma, undef, warning -->
+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*if(?:def|ndef)?(?=\s+\S)" insensitive="true" beginRegion="PP" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*endif" insensitive="true" endRegion="PP" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Define" String="#\s*define.*((?=\\))" insensitive="true" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*(?:el(?:se|if)|include(?:_next)?|define|undef|line|error|warning|pragma)" insensitive="true" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s+[0-9]+" insensitive="true" firstNonSpace="true" />
+      </context>
+
+      <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor">
+        <LineContinue attribute="Preprocessor" context="#stay"/>
+        <RangeDetect attribute="Prep. Lib" context="#stay" char="&quot;" char1="&quot;"/>
+        <RangeDetect attribute="Prep. Lib" context="#stay" char="&lt;" char1="&gt;"/>
+        <IncludeRules context="##Doxygen" />
+        <Detect2Chars attribute="Comment" context="Commentar/Preprocessor" char="/" char1="*" beginRegion="Comment2" />
+      </context>
+
+      <context attribute="Preprocessor" lineEndContext="#pop" name="Define">
+        <LineContinue attribute="Preprocessor" context="#stay"/>
+      </context>
+
+      <context attribute="Comment" lineEndContext="#stay" name="Commentar/Preprocessor">
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment2" />
+      </context>
+
+      <context attribute="Comment" lineEndContext="#stay" name="Outscoped" >
+        <DetectSpaces />
+        <IncludeRules context="##Alerts" />
+        <DetectIdentifier />
+        <DetectChar attribute="String" context="String" char="&quot;"/>
+        <IncludeRules context="##Doxygen" />
+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
+        <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="PP" firstNonSpace="true" />
+      </context>
+
+      <context attribute="Comment" lineEndContext="#stay" name="Outscoped intern">
+        <DetectSpaces />
+        <DetectIdentifier />
+        <DetectChar attribute="String" context="String" char="&quot;"/>
+        <!-- <DetectChar attribute="String" context="String" char="&at;"/> -->
+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
+        <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="PP" firstNonSpace="true" />
+        <RegExpr attribute="Comment" context="#pop" String="#\s*endif" endRegion="PP" firstNonSpace="true" />
+      </context>
+    </contexts>
+    <itemDatas>
+      <itemData name="Normal Text"  defStyleNum="dsNormal"/>
+      <itemData name="Keyword"      defStyleNum="dsKeyword"/>
+      <itemData name="Data Type"    defStyleNum="dsDataType"/>
+      <itemData name="Decimal"      defStyleNum="dsDecVal"/>
+      <itemData name="Float"        defStyleNum="dsFloat"/>
+      <itemData name="Char"         defStyleNum="dsChar"/>
+      <itemData name="String"       defStyleNum="dsString"/>
+      <itemData name="String Char"  defStyleNum="dsChar"/>
+      <itemData name="Comment"      defStyleNum="dsComment"/>
+
+      <itemData name="Reserved Variables"  defStyleNum="dsNormal" color="#FF0000" />
+      <itemData name="Base Functions"      defStyleNum="dsNormal" color="#0A7700" />
+      <itemData name="CUI Functions"       defStyleNum="dsNormal" color="#0A7700" />
+      <itemData name="Layout Functions"    defStyleNum="dsNormal" color="#007720" />
+      <itemData name="Schematic Functions" defStyleNum="dsNormal" color="#0A7701" />
+      <itemData name="DVE Functions"       defStyleNum="dsNormal" color="#0A775C" />
+
+      <itemData name="Preprocessor" defStyleNum="dsOthers"/>
+      <itemData name="Prep. Lib"    defStyleNum="dsOthers"/>
+      <itemData name="Alert"        defStyleNum="dsAlert" />
+      <itemData name="Region Marker" defStyleNum="dsRegionMarker" />
+      <itemData name="Error"        defStyleNum="dsError" />
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name="singleLine" start="//" />
+      <comment name="multiLine" start="/*" end="*/" />
+    </comments>
+    <keywords casesensitive="1" />
+  </general>
+</language>
diff --git a/kate/data/asm-dsp56k.xml b/kate/data/asm-dsp56k.xml
new file mode 100644
index 000000000..e1640d992
--- /dev/null
+++ b/kate/data/asm-dsp56k.xml
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+
+<language name="Motorola DSP56k" section="Assembler" version="1.00" kateversion="2.4"  extensions="*.asm;*.inc;*.ASM;*.INC" author="Miro Kropacek ([email protected])" license="LGPL">
+
+  <highlighting>
+    <list name="Data Registers">
+      <item>x</item>
+      <item>x0</item>
+      <item>x1</item>
+      <item>y</item>
+      <item>y0</item>
+      <item>y1</item>
+      <item>a2</item>
+      <item>a1</item>
+      <item>a0</item>
+      <item>a</item>
+      <item>a10</item>
+      <item>ab</item>
+      <item>b2</item>
+      <item>b1</item>
+      <item>b0</item>
+      <item>b</item>
+      <item>b10</item>
+      <item>ba</item>
+    </list>
+
+    <list name="Address Registers">
+      <item>r0</item>
+      <item>r1</item>
+      <item>r2</item>
+      <item>r3</item>
+      <item>r4</item>
+      <item>r5</item>
+      <item>r6</item>
+      <item>r7</item>
+    </list>
+
+    <list name="Offset Registers">
+	    <item>n0</item>
+	    <item>n1</item>
+	    <item>n2</item>
+	    <item>n3</item>
+	    <item>n4</item>
+	    <item>n5</item>
+	    <item>n6</item>
+	    <item>n7</item>
+    </list>
+
+    <list name="Modifier Registers">
+	    <item>m0</item>
+	    <item>m1</item>
+	    <item>m2</item>
+	    <item>m3</item>
+	    <item>m4</item>
+	    <item>m5</item>
+	    <item>m6</item>
+	    <item>m7</item>
+    </list>
+
+    <list name="Control Registers">
+	    <item>la</item>
+	    <item>lc</item>
+	    <item>pc</item>
+	    <item>ssh</item>
+	    <item>ssl</item>
+	    <item>omr</item>
+	    <item>sr</item>
+	    <item>sp</item>
+	    <item>mr</item>
+	    <item>ccr</item>
+    </list>
+
+    <list name="Instructions">
+	    <item>abs</item>
+	    <item>adc</item>
+	    <item>add</item>
+	    <item>addl</item>
+	    <item>addr</item>
+	    <item>and</item>
+	    <item>andi</item>
+	    <item>asl</item>
+	    <item>asr</item>
+	    <item>bchg</item>
+	    <item>bclr</item>
+	    <item>bset</item>
+	    <item>btst</item>
+	    <item>clr</item>
+	    <item>cmp</item>
+	    <item>cmpm</item>
+	    <item>div</item>
+	    <item>do</item>
+	    <item>enddo</item>
+	    <item>eor</item>
+	    <item>illegal</item>
+	    <item>jcc</item>
+	    <item>jhs</item>
+	    <item>jcs</item>
+	    <item>jls</item>
+	    <item>jec</item>
+	    <item>jeq</item>
+	    <item>jes</item>
+	    <item>jge</item>
+	    <item>jgt</item>
+	    <item>jlc</item>
+	    <item>jle</item>
+	    <item>jls</item>
+	    <item>jlt</item>
+	    <item>jmi</item>
+	    <item>jne</item>
+	    <item>jnr</item>
+	    <item>jpl</item>
+	    <item>jnn</item>
+	    <item>jclr</item>
+	    <item>jmp</item>
+	    <item>jscc</item>
+	    <item>jshs</item>
+	    <item>jscs</item>
+	    <item>jsls</item>
+	    <item>jsec</item>
+	    <item>jseq</item>
+	    <item>jses</item>
+	    <item>jsge</item>
+	    <item>jsgt</item>
+	    <item>jslc</item>
+	    <item>jsle</item>
+	    <item>jsls</item>
+	    <item>jslt</item>
+	    <item>jsmi</item>
+	    <item>jsne</item>
+	    <item>jsnr</item>
+	    <item>jspl</item>
+	    <item>jsnn</item>
+	    <item>jsclr</item>
+	    <item>jset</item>
+	    <item>jsr</item>
+	    <item>jsset</item>
+	    <item>lsl</item>
+	    <item>lsr</item>
+	    <item>lua</item>
+	    <item>mac</item>
+	    <item>macr</item>
+	    <item>move</item>
+	    <item>movec</item>
+	    <item>movem</item>
+	    <item>movep</item>
+	    <item>mpy</item>
+	    <item>mpyr</item>
+	    <item>neg</item>
+	    <item>nop</item>
+	    <item>norm</item>
+	    <item>not</item>
+	    <item>or</item>
+	    <item>ori</item>
+	    <item>rep</item>
+	    <item>reset</item>
+	    <item>rnd</item>
+	    <item>rol</item>
+	    <item>ror</item>
+	    <item>rti</item>
+	    <item>rts</item>
+	    <item>sbc</item>
+	    <item>stop</item>
+	    <item>sub</item>
+	    <item>subl</item>
+	    <item>subr</item>
+	    <item>swi</item>
+	    <item>tcc</item>
+	    <item>ths</item>
+	    <item>tcs</item>
+	    <item>tls</item>
+	    <item>tec</item>
+	    <item>teq</item>
+	    <item>tes</item>
+	    <item>tge</item>
+	    <item>tgt</item>
+	    <item>tlc</item>
+	    <item>tle</item>
+	    <item>tls</item>
+	    <item>tlt</item>
+	    <item>tmi</item>
+	    <item>tne</item>
+	    <item>tnr</item>
+	    <item>tpl</item>
+	    <item>snn</item>
+	    <item>tfr</item>
+	    <item>tst</item>
+	    <item>wait</item>
+    </list>
+
+    <list name="Directives">
+	    <item>endif</item>
+	    <item>endc</item>
+	    <item>else</item>
+	    <item>ifne</item>
+	    <item>if</item>
+	    <item>ifeq</item>
+	    <item>ifle</item>
+	    <item>iflt</item>
+	    <item>ifge</item>
+	    <item>ifgt</item>
+	    <item>include</item>
+	    <item>incbin</item>
+	    <item>printval</item>
+	    <item>pass1val</item>
+	    <item>pass2val</item>
+	    <item>fail</item>
+	    <item>endm</item>
+	    <item>end</item>
+	    <item>org</item>
+	    <item>ds</item>
+	    <item>dsm</item>
+	    <item>list</item>
+	    <item>nolist</item>
+	    <item>macro</item>
+	    <item>dc</item>
+	    <item>equ</item>
+    </list>
+
+    <contexts>
+      <!-- name = name of context, attribute = name of item data -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
+	<RegExpr attribute="Memory" context="#pop" String="[xylpXYLP]:"/>
+	<keyword attribute="Data Registers" context="#pop" String="Data Registers"/>
+	<keyword attribute="Address Registers" context="#pop" String="Address Registers"/>
+	<keyword attribute="Offset Registers" context="#pop" String="Offset Registers"/>
+	<keyword attribute="Modifier Registers" context="#pop" String="Modifier Registers"/>
+	<keyword attribute="Control Registers" context="#pop" String="Control Registers"/>
+	<keyword attribute="Instructions" context="#pop" String="Instructions"/>
+	<keyword attribute="Directives" context="#pop" String="Directives"/>
+
+	<RegExpr attribute="Label" context="#pop" String="^[A-Za-z][A-Za-z_.0-9]*:?"/>
+	<RegExpr attribute="Local label" context="#pop" String="^_[A-Za-z_][A-Za-z_.0-9]*:?"/>
+
+	<DetectChar attribute="Comment" context="Comment" char=";"/>
+	<DetectChar attribute="Comment" context="Comment" char="*" firstNonSpace="true"/>
+	<DetectChar attribute="Constant" context="Constant" char="#"/>
+	<DetectChar attribute="BaseN" context="Number16" char="$"/>
+	<DetectChar attribute="BaseN" context="Number2" char="%"/>
+	<DetectChar attribute="BaseN" context="Number8" char="@"/>
+	<Float attribute="Float" context="#pop"/>
+	<Int attribute="Number" context="#pop"/>
+	<RangeDetect attribute="Char" context="#pop" char="'"  char1="'"/>
+	<AnyChar attribute="String" context="String" String="&quot;'"/>
+      </context>
+
+      <context name="Comment" attribute="Comment" lineEndContext="#pop"/>
+
+      <context name="String" attribute="String" lineEndContext="#pop">
+	      <AnyChar attribute="String" context="#pop" String="&quot;'"/>
+      </context>
+
+      <context name="Constant" attribute="Constant" lineEndContext="#pop">
+	      <RegExpr attribute="Constant" context="Operators" String="[0-9]+"/>
+	      <RegExpr attribute="Constant" context="Operators" String="\$[A-Fa-f0-9]+"/>
+	      <RegExpr attribute="Constant" context="Operators" String="@[0-7]+"/>
+	      <RegExpr attribute="Constant" context="Operators" String="%[01]+"/>
+	      <RegExpr attribute="Label" context="Operators" String="[A-Za-z_][A-Za-z_.0-9]*"/>
+	      <RegExpr attribute="Local label" context="Operators" String="\.[A-Za-z_][A-Za-z_.0-9]*"/>
+	      <RangeDetect attribute="Char" context="#pop" char="'"  char1="'"/>
+	      <DetectChar attribute="Normal Text" char="," context="#pop"/>
+	      <DetectSpaces attribute="Normal Text" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="(" context="#stay"/>
+      </context>
+
+      <context name="Operators" attribute="Normal Text" lineEndContext="#pop">
+	      <DetectChar attribute="Normal Text" char="|" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="&amp;" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="^" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="*" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="(" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char=")" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="+" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="-" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="/" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="~" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="!" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="%" context="#pop"/>
+	      <Detect2Chars attribute="Normal Text" char="&lt;" char1="&lt;" context="#pop"/>
+	      <Detect2Chars attribute="Normal Text" char="&gt;" char1="&gt;" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="," context="#pop#pop"/>
+	      <DetectSpaces attribute="Normal Text" context="#pop#pop"/>
+      </context>
+
+      <context name="Number16" attribute="BaseN" lineEndContext="#pop">
+	      <RegExpr attribute="BaseN" context="#pop" String="[A-Fa-f0-9]+"/>
+      </context>
+
+      <context name="Number2" attribute="BaseN" lineEndContext="#pop">
+	      <RegExpr attribute="BaseN" context="#pop" String="[01]+"/>
+      </context>
+
+      <context name="Number8" attribute="BaseN" lineEndContext="#pop">
+	      <RegExpr attribute="BaseN" context="#pop" String="[0-7]+"/>
+      </context>
+    </contexts>
+
+    <itemDatas>
+      <!-- keywords -->
+      <itemData name="Normal Text" defStyleNum="dsNormal"/>
+      <itemData name="Data Registers" defStyleNum="dsDataType"/>
+      <itemData name="Address Registers" defStyleNum="dsDataType"/>
+      <itemData name="Offset Registers" defStyleNum="dsDataType"/>
+      <itemData name="Modifier Registers" defStyleNum="dsDataType"/>
+      <itemData name="Control Registers" defStyleNum="dsDataType"/>
+      <itemData name="Instructions" bold="true" defStyleNum="dsKeyword"/>
+      <itemData name="Directives" bold="true" defStyleNum="dsOthers"/>
+      <itemData name="Memory" bold="true" defStyleNum="dsOthers"/>
+      <!-- defined in contexts -->
+      <itemData name="Comment" italic="false" defStyleNum="dsComment"/>
+      <itemData name="Label" defStyleNum="dsFunction"/>
+      <itemData name="Local label" defStyleNum="dsFunction"/>
+      <itemData name="Constant" defStyleNum="dsDataType"/>
+      <itemData name="BaseN" defStyleNum="dsBaseN"/>
+      <itemData name="Float" defStyleNum="dsFloat"/>
+      <itemData name="Number" defStyleNum="dsDecVal"/>
+      <itemData name="Char" defStyleNum="dsChar"/>
+      <itemData name="String" defStyleNum="dsString"/>
+    </itemDatas>
+  </highlighting>
+
+  <general>
+	  <keywords casesensitive="0"/>
+    <comments>
+      <comment name="singleLine" start=";"/>
+    </comments>
+  </general>
+
+</language>
diff --git a/kate/data/asm-m68k.xml b/kate/data/asm-m68k.xml
new file mode 100644
index 000000000..f7611c8a8
--- /dev/null
+++ b/kate/data/asm-m68k.xml
@@ -0,0 +1,651 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+
+<language name="Motorola 68k (VASM/Devpac)" section="Assembler" version="1.00" kateversion="2.4"  extensions="*.s;*.i;*.S;*.I" author="Miro Kropacek ([email protected])" license="LGPL">
+
+  <highlighting>
+    <list name="Data Registers">
+      <item>d0</item>
+      <item>d1</item>
+      <item>d2</item>
+      <item>d3</item>
+      <item>d4</item>
+      <item>d5</item>
+      <item>d6</item>
+      <item>d7</item>
+    </list>
+
+    <list name="Address Registers">
+      <item>a0</item>
+      <item>a1</item>
+      <item>a2</item>
+      <item>a3</item>
+      <item>a4</item>
+      <item>a5</item>
+      <item>a6</item>
+      <item>a7</item>
+      <item>sp</item>
+    </list>
+
+    <list name="Control Registers">
+      <item>ccr</item>
+      <item>sr</item>
+      <item>pc</item>
+      <item>zpc</item>
+      <item>ssp</item>
+      <item>usp</item>
+      <item>msp</item>
+      <item>isp</item>
+      <item>dfc</item>
+      <item>cacr</item>
+      <item>caar</item>
+      <item>vbr</item>
+      <item>crp</item>
+      <item>srp</item>
+      <item>urp</item>
+      <item>tc</item>
+      <item>tt0</item>
+      <item>tt1</item>
+      <item>mmusr</item>
+      <item>itt0</item>
+      <item>itt1</item>
+      <item>dtt0</item>
+      <item>dtt1</item>
+      <item>buscr</item>
+      <item>pcr</item>
+      <item>ic</item>
+      <!-- <item>dc</item> -->
+      <item>bc</item>
+    </list>
+
+    <list name="FPU Registers">
+      <item>fp0</item>
+      <item>fp1</item>
+      <item>fp2</item>
+      <item>fp3</item>
+      <item>fp4</item>
+      <item>fp5</item>
+      <item>fp6</item>
+      <item>fp7</item>
+      <item>fpcr></item>
+      <item>fpsr</item>
+      <item>fpiar</item>
+    </list>
+
+    <list name="Instructions (CPU)">
+      <item>abcd</item>
+      <item>adda</item>
+      <item>addi</item>
+      <item>add</item>
+      <item>addq</item>
+      <item>addx</item>
+      <item>andi</item>
+      <item>and</item>
+      <item>asl</item>
+      <item>asr</item>
+      <item>bcc</item>
+      <item>bchg</item>
+      <item>bclr</item>
+      <item>bcs</item>
+      <item>beq</item>
+      <item>bfchg</item>
+      <item>bfclr</item>
+      <item>bfexts</item>
+      <item>bfextu</item>
+      <item>bfffo</item>
+      <item>bfins</item>
+      <item>bfset</item>
+      <item>bftst</item>
+      <item>bge</item>
+      <item>bgt</item>
+      <item>bhi</item>
+      <item>bhs</item>
+      <item>bkpt</item>
+      <item>ble</item>
+      <item>blo</item>
+      <item>bls</item>
+      <item>blt</item>
+      <item>bmi</item>
+      <item>bne</item>
+      <item>bpl</item>
+      <item>bra</item>
+      <item>bset</item>
+      <item>bsr</item>
+      <item>btst</item>
+      <item>bvc</item>
+      <item>bvs</item>
+      <item>callm</item>
+      <item>cas2</item>
+      <item>cas</item>
+      <item>chk2</item>
+      <item>chk</item>
+      <item>cinva</item>
+      <item>cinvl</item>
+      <item>cinvp</item>
+      <item>clr</item>
+      <item>cmp2</item>
+      <item>cmpa</item>
+      <item>cmpi</item>
+      <item>cmp</item>
+      <item>cmpm</item>
+      <item>cpusha</item>
+      <item>cpushl</item>
+      <item>cpushp</item>
+      <item>dbcc</item>
+      <item>dbcs</item>
+      <item>dbeq</item>
+      <item>dbf</item>
+      <item>dbge</item>
+      <item>dbgt</item>
+      <item>dbhi</item>
+      <item>dbhs</item>
+      <item>dble</item>
+      <item>dblo</item>
+      <item>dbls</item>
+      <item>dblt</item>
+      <item>dbmi</item>
+      <item>dbne</item>
+      <item>dbpl</item>
+      <item>dbra</item>
+      <item>dbt</item>
+      <item>dbvc</item>
+      <item>dbvc</item>
+      <item>divs</item>
+      <item>divsl</item>
+      <item>divu</item>
+      <item>divul</item>
+      <item>eori</item>
+      <item>eor</item>
+      <item>exg</item>
+      <item>extb</item>
+      <item>ext</item>
+      <item>illegal</item>
+      <item>jmp</item>
+      <item>jsr</item>
+      <item>lea</item>
+      <item>link</item>
+      <item>lpstop</item>
+      <item>lsl</item>
+      <item>lsr</item>
+      <item>move16</item>
+      <item>movea</item>
+      <item>movec</item>
+      <item>move</item>
+      <item>movem</item>
+      <item>movep</item>
+      <item>moveq</item>
+      <item>moves</item>
+      <item>muls</item>
+      <item>mulu</item>
+      <item>nbcd</item>
+      <item>neg</item>
+      <item>negx</item>
+      <item>nop</item>
+      <item>not</item>
+      <item>ori</item>
+      <item>or</item>
+      <item>pack</item>
+      <item>pea</item>
+      <item>pflusha</item>
+      <item>pflushan</item>
+      <item>pflush</item>
+      <item>pflushn</item>
+      <item>ploadr</item>
+      <item>ploadw</item>
+      <item>plpa</item>
+      <item>pmovefd</item>
+      <item>pmove</item>
+      <item>ptestr</item>
+      <item>ptestw</item>
+      <item>reset</item>
+      <item>rol</item>
+      <item>ror</item>
+      <item>roxl</item>
+      <item>roxr</item>
+      <item>rtd</item>
+      <item>rte</item>
+      <item>rtm</item>
+      <item>rtr</item>
+      <item>rts</item>
+      <item>sbcd</item>
+      <item>scc</item>
+      <item>scs</item>
+      <item>seq</item>
+      <item>sf</item>
+      <item>sge</item>
+      <item>sgt</item>
+      <item>shi</item>
+      <item>shs</item>
+      <item>sle</item>
+      <item>slo</item>
+      <item>sls</item>
+      <item>slt</item>
+      <item>smi</item>
+      <item>sne</item>
+      <item>spl</item>
+      <item>st</item>
+      <item>stop</item>
+      <item>suba</item>
+      <item>subi</item>
+      <item>sub</item>
+      <item>subq</item>
+      <item>subx</item>
+      <item>svc</item>
+      <item>svc</item>
+      <item>swap</item>
+      <item>tas</item>
+      <item>trapcc</item>
+      <item>trapcs</item>
+      <item>trapeq</item>
+      <item>trapf</item>
+      <item>trapge</item>
+      <item>trapgt</item>
+      <item>traphi</item>
+      <item>traphs</item>
+      <item>trap</item>
+      <item>traple</item>
+      <item>traplo</item>
+      <item>trapls</item>
+      <item>traplt</item>
+      <item>trapmi</item>
+      <item>trapne</item>
+      <item>trappl</item>
+      <item>trapt</item>
+      <item>trapvc</item>
+      <item>trapvc</item>
+      <item>trapv</item>
+      <item>tst</item>
+      <item>unlk</item>
+      <item>unpk</item>
+    </list>
+
+    <list name="Instructions (FPU)">
+      <item>fabs</item>
+      <item>facos</item>
+      <item>fadd</item>
+      <item>fasin</item>
+      <item>fatanh</item>
+      <item>fatan</item>
+      <item>fbeq</item>
+      <item>fbf</item>
+      <item>fbge</item>
+      <item>fbgle</item>
+      <item>fbgl</item>
+      <item>fbgt</item>
+      <item>fble</item>
+      <item>fblt</item>
+      <item>fbne</item>
+      <item>fbnge</item>
+      <item>fbngle</item>
+      <item>fbngl</item>
+      <item>fbngt</item>
+      <item>fbnle</item>
+      <item>fbnlt</item>
+      <item>fboge</item>
+      <item>fbogl</item>
+      <item>fbogt</item>
+      <item>fbole</item>
+      <item>fbolt</item>
+      <item>fbor</item>
+      <item>fbseq</item>
+      <item>fbsf</item>
+      <item>fbsne</item>
+      <item>fbst</item>
+      <item>fbt</item>
+      <item>fbueq</item>
+      <item>fbuge</item>
+      <item>fbugt</item>
+      <item>fbule</item>
+      <item>fbult</item>
+      <item>fbun</item>
+      <item>fcmp</item>
+      <item>fcosh</item>
+      <item>fcos</item>
+      <item>fdabs</item>
+      <item>fdadd</item>
+      <item>fdbeq</item>
+      <item>fdbf</item>
+      <item>fdbge</item>
+      <item>fdbgle</item>
+      <item>fdbgl</item>
+      <item>fdbgt</item>
+      <item>fdble</item>
+      <item>fdblt</item>
+      <item>fdbne</item>
+      <item>fdbnge</item>
+      <item>fdbngle</item>
+      <item>fdbngl</item>
+      <item>fdbngt</item>
+      <item>fdbnle</item>
+      <item>fdbnlt</item>
+      <item>fdboge</item>
+      <item>fdbogl</item>
+      <item>fdbogt</item>
+      <item>fdbole</item>
+      <item>fdbolt</item>
+      <item>fdbor</item>
+      <item>fdbseq</item>
+      <item>fdbsf</item>
+      <item>fdbsne</item>
+      <item>fdbst</item>
+      <item>fdbt</item>
+      <item>fdbueq</item>
+      <item>fdbuge</item>
+      <item>fdbugt</item>
+      <item>fdbule</item>
+      <item>fdbult</item>
+      <item>fdbun</item>
+      <item>fddiv</item>
+      <item>fdiv</item>
+      <item>fdmove</item>
+      <item>fdmul</item>
+      <item>fdneg</item>
+      <item>fdsqrt</item>
+      <item>fdsub</item>
+      <item>fetox</item>
+      <item>fetoxm1</item>
+      <item>fgetexp</item>
+      <item>fgetman</item>
+      <item>fint</item>
+      <item>fintrz</item>
+      <item>flog10</item>
+      <item>flog2</item>
+      <item>flogn</item>
+      <item>flognp1</item>
+      <item>fmod</item>
+      <item>fmovecr</item>
+      <item>fmove</item>
+      <item>fmovem</item>
+      <item>fmul</item>
+      <item>fneg</item>
+      <item>fnop</item>
+      <item>frem</item>
+      <item>frestore</item>
+      <item>fsabs</item>
+      <item>fsadd</item>
+      <item>fsave</item>
+      <item>fscale</item>
+      <item>fsdiv</item>
+      <item>fseq</item>
+      <item>fsf</item>
+      <item>fsge</item>
+      <item>fsgldiv</item>
+      <item>fsgle</item>
+      <item>fsgl</item>
+      <item>fsglmul</item>
+      <item>fsgt</item>
+      <item>fsincos</item>
+      <item>fsinh</item>
+      <item>fsin</item>
+      <item>fsle</item>
+      <item>fslt</item>
+      <item>fsmove</item>
+      <item>fsmul</item>
+      <item>fsneg</item>
+      <item>fsne</item>
+      <item>fsnge</item>
+      <item>fsngle</item>
+      <item>fsngl</item>
+      <item>fsngt</item>
+      <item>fsnle</item>
+      <item>fsnlt</item>
+      <item>fsoge</item>
+      <item>fsogl</item>
+      <item>fsogt</item>
+      <item>fsole</item>
+      <item>fsolt</item>
+      <item>fsor</item>
+      <item>fsqrt</item>
+      <item>fsseq</item>
+      <item>fssf</item>
+      <item>fssne</item>
+      <item>fssqrt</item>
+      <item>fsst</item>
+      <item>fssub</item>
+      <item>fst</item>
+      <item>fsub</item>
+      <item>fsueq</item>
+      <item>fsuge</item>
+      <item>fsugt</item>
+      <item>fsule</item>
+      <item>fsult</item>
+      <item>fsun</item>
+      <item>ftanh</item>
+      <item>ftan</item>
+      <item>ftentox</item>
+      <item>ftrapeq</item>
+      <item>ftrapf</item>
+      <item>ftrapge</item>
+      <item>ftrapgle</item>
+      <item>ftrapgl</item>
+      <item>ftrapgt</item>
+      <item>ftraple</item>
+      <item>ftraplt</item>
+      <item>ftrapne</item>
+      <item>ftrapnge</item>
+      <item>ftrapngle</item>
+      <item>ftrapngl</item>
+      <item>ftrapngt</item>
+      <item>ftrapnle</item>
+      <item>ftrapnlt</item>
+      <item>ftrapoge</item>
+      <item>ftrapogl</item>
+      <item>ftrapogt</item>
+      <item>ftrapole</item>
+      <item>ftrapolt</item>
+      <item>ftrapor</item>
+      <item>ftrapseq</item>
+      <item>ftrapsf</item>
+      <item>ftrapsne</item>
+      <item>ftrapst</item>
+      <item>ftrapt</item>
+      <item>ftrapueq</item>
+      <item>ftrapuge</item>
+      <item>ftrapugt</item>
+      <item>ftrapule</item>
+      <item>ftrapult</item>
+      <item>ftrapun</item>
+      <item>ftst</item>
+      <item>ftwotox</item>
+    </list>
+
+    <list name="Directives">
+      <item>align</item>
+      <item>blk</item>
+      <item>bss</item>
+      <item>clrfo</item>
+      <item>clrso</item>
+      <item>cnop</item>
+      <item>code</item>
+      <item>cseg</item>
+      <item>data</item>
+      <item>dc</item>
+      <item>dcb</item>
+      <item>ds</item>
+      <item>dseg</item>
+      <item>else</item>
+      <item>end</item>
+      <item>endc</item>
+      <item>endif</item>
+      <item>endm</item>
+      <item>endr</item>
+      <item>equ</item>
+      <item>even</item>
+      <item>fo</item>
+      <item>idnt</item>
+      <item>if</item>
+      <item>ifeq</item>
+      <item>ifne</item>
+      <item>ifgt</item>
+      <item>ifge</item>
+      <item>iflt</item>
+      <item>ifle</item>
+      <item>ifd</item>
+      <item>ifnd</item>
+      <item>ifc</item>
+      <item>ifnc</item>
+      <item>incbin</item>
+      <item>incdir</item>
+      <item>include</item>
+      <item>macro</item>
+      <item>org</item>
+      <item>public</item>
+      <item>rept</item>
+      <item>rs</item>
+      <item>rsreset</item>
+      <item>rsset</item>
+      <item>section</item>
+      <item>set</item>
+      <item>setfo</item>
+      <item>setso</item>
+      <item>so</item>
+      <item>text</item>
+      <item>ttl</item>
+      <item>xdef</item>
+      <item>xref</item>
+      <item>sdreg</item>
+      <item>cpu32</item>
+      <item>far</item>
+      <item>fpu</item>
+      <item>machine</item>
+      <item>mc68000</item>
+      <item>mc68010</item>
+      <item>mc68020</item>
+      <item>mc68030</item>
+      <item>mc68040</item>
+      <item>mc68060</item>
+      <item>mcf5200</item>
+      <item>mcf5206</item>
+      <item>mcf5307</item>
+      <item>mcf5407</item>
+      <item>near</item>
+      <item>opt</item>
+      <item>equr</item>
+      <item>equrl</item>
+      <item>fequr</item>
+      <item>fequrl</item>
+      <item>freg</item>
+      <item>reg</item>
+    </list>
+
+    <contexts>
+      <!-- name = name of context, attribute = name of item data -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
+	<keyword attribute="Data Registers" context="#pop" String="Data Registers"/>
+	<keyword attribute="Address Registers" context="#pop" String="Address Registers"/>
+	<keyword attribute="Control Registers" context="#pop" String="Control Registers"/>
+	<keyword attribute="FPU Registers" context="#pop" String="FPU Registers"/>
+	<keyword attribute="Instructions (CPU)" context="#pop" String="Instructions (CPU)"/>
+	<keyword attribute="Instructions (FPU)" context="#pop" String="Instructions (FPU)"/>
+	<keyword attribute="Directives" context="#pop" String="Directives"/>
+
+	<!-- precedes ".[bwlsdqpx]" match -->
+	<RegExpr attribute="Label" context="#pop" String="^[A-Za-z_][A-Za-z_.0-9]*:?"/>
+	<RegExpr attribute="Local label" context="#pop" String="^\.[A-Za-z_][A-Za-z_.0-9]*:?"/>
+
+	<RegExpr attribute="Operand sizes (CPU)" context="#pop" insensitive="true" String="\.b[\s,]"/>
+	<RegExpr attribute="Operand sizes (CPU)" context="#pop" insensitive="true" String="\.w[\s,]"/>
+	<RegExpr attribute="Operand sizes (CPU)" context="#pop" insensitive="true" String="\.l[\s,]"/>
+	<RegExpr attribute="Operand sizes (FPU)" context="#pop" insensitive="true" String="\.s[\s,]"/>
+	<RegExpr attribute="Operand sizes (FPU)" context="#pop" insensitive="true" String="\.d[\s,]"/>
+	<RegExpr attribute="Operand sizes (FPU)" context="#pop" insensitive="true" String="\.p[\s,]"/>
+	<RegExpr attribute="Operand sizes (FPU)" context="#pop" insensitive="true" String="\.q[\s,]"/>
+	<RegExpr attribute="Operand sizes (FPU)" context="#pop" insensitive="true" String="\.x[\s,]"/>
+
+	<DetectChar attribute="Comment" context="Comment" char=";"/>
+	<DetectChar attribute="Comment" context="Comment" char="*" firstNonSpace="true"/>
+	<DetectChar attribute="Constant" context="Constant" char="#"/>
+	<DetectChar attribute="BaseN" context="Number16" char="$"/>
+	<DetectChar attribute="BaseN" context="Number2" char="%"/>
+	<DetectChar attribute="BaseN" context="Number8" char="@"/>
+	<Float attribute="Float" context="#pop"/>
+	<Int attribute="Number" context="#pop"/>
+	<RangeDetect attribute="Char" context="#pop" char="'"  char1="'"/>
+	<AnyChar attribute="String" context="String" String="&quot;'"/>
+      </context>
+
+      <context name="Comment" attribute="Comment" lineEndContext="#pop"/>
+
+      <context name="String" attribute="String" lineEndContext="#pop">
+	      <AnyChar attribute="String" context="#pop" String="&quot;'"/>
+      </context>
+
+      <context name="Constant" attribute="Constant" lineEndContext="#pop">
+	      <RegExpr attribute="Constant" context="Operators" String="[0-9]+"/>
+	      <RegExpr attribute="Constant" context="Operators" String="\$[A-Fa-f0-9]+"/>
+	      <RegExpr attribute="Constant" context="Operators" String="@[0-7]+"/>
+	      <RegExpr attribute="Constant" context="Operators" String="%[01]+"/>
+	      <RegExpr attribute="Label" context="Operators" String="[A-Za-z_][A-Za-z_.0-9]*"/>
+	      <RegExpr attribute="Local label" context="Operators" String="\.[A-Za-z_][A-Za-z_.0-9]*"/>
+	      <RangeDetect attribute="Char" context="#pop" char="'"  char1="'"/>
+	      <DetectChar attribute="Normal Text" char="," context="#pop"/>
+	      <DetectSpaces attribute="Normal Text" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="(" context="#stay"/>
+      </context>
+
+      <context name="Operators" attribute="Normal Text" lineEndContext="#pop">
+	      <DetectChar attribute="Normal Text" char="|" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="&amp;" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="^" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="*" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="(" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char=")" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="+" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="-" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="/" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="~" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="!" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="%" context="#pop"/>
+	      <Detect2Chars attribute="Normal Text" char="&lt;" char1="&lt;" context="#pop"/>
+	      <Detect2Chars attribute="Normal Text" char="&gt;" char1="&gt;" context="#pop"/>
+	      <DetectChar attribute="Normal Text" char="," context="#pop#pop"/>
+	      <DetectSpaces attribute="Normal Text" context="#pop#pop"/>
+      </context>
+
+      <context name="Number16" attribute="BaseN" lineEndContext="#pop">
+	      <RegExpr attribute="BaseN" context="#pop" String="[A-Fa-f0-9]+"/>
+      </context>
+
+      <context name="Number2" attribute="BaseN" lineEndContext="#pop">
+	      <RegExpr attribute="BaseN" context="#pop" String="[01]+"/>
+      </context>
+
+      <context name="Number8" attribute="BaseN" lineEndContext="#pop">
+	      <RegExpr attribute="BaseN" context="#pop" String="[0-7]+"/>
+      </context>
+    </contexts>
+
+    <itemDatas>
+      <!-- keywords -->
+      <itemData name="Normal Text" defStyleNum="dsNormal"/>
+      <itemData name="Data Registers" defStyleNum="dsDataType"/>
+      <itemData name="Address Registers" defStyleNum="dsDataType"/>
+      <itemData name="Control Registers" defStyleNum="dsDataType"/>
+      <itemData name="FPU Registers" defStyleNum="dsDataType"/>
+      <itemData name="Instructions (CPU)" bold="true" defStyleNum="dsKeyword"/>
+      <itemData name="Instructions (FPU)" bold="true" defStyleNum="dsKeyword"/>
+      <itemData name="Directives" bold="true" defStyleNum="dsOthers"/>
+      <!-- defined in contexts -->
+      <itemData name="Operand sizes (CPU)" bold="true" defStyleNum="dsKeyword"/>
+      <itemData name="Operand sizes (FPU)" bold="true" defStyleNum="dsKeyword"/>
+      <itemData name="Comment" italic="false" defStyleNum="dsComment"/>
+      <itemData name="Label" defStyleNum="dsFunction"/>
+      <itemData name="Local label" defStyleNum="dsFunction"/>
+      <itemData name="Constant" defStyleNum="dsDataType"/>
+      <itemData name="BaseN" defStyleNum="dsBaseN"/>
+      <itemData name="Float" defStyleNum="dsFloat"/>
+      <itemData name="Number" defStyleNum="dsDecVal"/>
+      <itemData name="Char" defStyleNum="dsChar"/>
+      <itemData name="String" defStyleNum="dsString"/>
+    </itemDatas>
+  </highlighting>
+
+  <general>
+    <keywords casesensitive="0"/>
+    <comments>
+      <comment name="singleLine" start=";"/>
+      <comment name="singleLine" start="*"/>
+    </comments>
+  </general>
+
+</language>
diff --git a/kate/data/asp.xml b/kate/data/asp.xml
index 1aa4f92d7..3a912b975 100644
--- a/kate/data/asp.xml
+++ b/kate/data/asp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE  language SYSTEM "language.dtd">
-<language name="ASP" version="1.03" kateversion="2.1" section="Markup" extensions="*.asp;" mimetype="text/x-asp-src;text/x-asp-src" author="Antonio Salazar ([email protected])" license="LGPL">
+<language name="ASP" version="1.04" kateversion="2.1" section="Markup" extensions="*.asp;" mimetype="text/x-asp-src;text/x-asp-src" author="Antonio Salazar ([email protected])" license="LGPL">
     <highlighting>
         <list name="control structures">
             <item>select</item>
@@ -271,7 +271,7 @@
                 <RegExpr attribute="Keyword" context="#stay" String="\bend class\b" insensitive="TRUE" endRegion="classendclass1"/>
 
                 <RegExpr attribute="Control Structures" context="#stay" String="\bexit do\b" insensitive="TRUE" />
-                <RegExpr attribute="Control Structures" context="#stay" String="\bdo\b" insensitive="TRUE" beginRegion="doloop1"/>
+                <RegExpr attribute="Control Structures" context="#stay" String="\bdo(\s+(while))?\b" insensitive="TRUE" beginRegion="doloop1"/>
                 <RegExpr attribute="Control Structures" context="#stay" String="\bloop\b" insensitive="TRUE" endRegion="doloop1"/>
 
                 <RegExpr attribute="Control Structures" context="#stay" String="\bexit while\b" insensitive="TRUE" />
diff --git a/kate/data/awk.xml b/kate/data/awk.xml
index 0f16ca4cc..f0fcd3f0b 100644
--- a/kate/data/awk.xml
+++ b/kate/data/awk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="AWK" version="0.90" kateversion="2.3" section="Scripts" extensions="*.awk" mimetype="text/x-awk">
+<language name="AWK" version="0.91" kateversion="2.3" section="Scripts" extensions="*.awk" mimetype="text/x-awk">
   <highlighting>
     <list name="keywords">
       <item>if</item>
@@ -67,7 +67,6 @@
 
       <context name="Base" attribute="Normal" lineEndContext="#stay">
 	<RegExpr String="\b(BEGIN|END)\b" attribute="Pattern" context="#stay" />
-	<RegExpr String="/([^\/[]|\\.|\[\]?(\[[^]]+\]|.)+\])+/" attribute="Pattern" context="#stay" />
 	<DetectChar char="{" attribute="Keyword" context="#stay" beginRegion="block" />
 	<DetectChar char="}" attribute="Keyword" context="#stay" endRegion="block" />
 	<DetectChar char="#" attribute="Comment" context="Comment" />
diff --git a/kate/data/bash.xml b/kate/data/bash.xml
index 2c51c6f5f..84c91596d 100644
--- a/kate/data/bash.xml
+++ b/kate/data/bash.xml
@@ -8,7 +8,7 @@
         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
 ]>
-<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen ([email protected])" license="LGPL">
+<language name="Bash" version="2.14" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen ([email protected])" license="LGPL">
 
 <!-- (c) 2004 by Wilbert Berendsen ([email protected])
     Changes by Matthew Woehlke ([email protected])
@@ -157,6 +157,17 @@
       <item> lsattr </item>
       <item> lsmod </item>
       <item> lsmod.old </item>
+      <item> lzcat </item>
+      <item> lzcmp </item>
+      <item> lzdiff </item>
+      <item> lzegrep </item>
+      <item> lzfgrep </item>
+      <item> lzgrep </item>
+      <item> lzless </item>
+      <item> lzcat </item>
+      <item> lzma </item>
+      <item> lzmainfo </item>
+      <item> lzmore </item>
       <item> mapscrn </item>
       <item> mesg </item>
       <item> mkdir </item>
@@ -210,11 +221,15 @@
       <item> unicode_start </item>
       <item> unicode_stop </item>
       <item> unlink </item>
+      <item> unlzma </item>
+      <item> unxz </item>
       <item> utmpdump </item>
       <item> uuidgen </item>
       <item> vdir </item>
       <item> wall </item>
       <item> wc </item>
+      <item> xz </item>
+      <item> xzcat </item>
       <item> ypdomainname </item>
       <item> zcat </item>
       <item> zcmp </item>
@@ -502,7 +517,7 @@
         <!-- match do and if blocks -->
         <RegExpr attribute="Keyword" context="#stay" String="\bdo&noword;" beginRegion="do" />
         <RegExpr attribute="Keyword" context="#stay" String="\bdone&noword;" endRegion="do" />
-        <RegExpr attribute="Keyword" context="#stay" String="\bif&noword;" beginRegion="if" />
+        <RegExpr attribute="Keyword" context="#stay" String="\bif&eos;" beginRegion="if" />
         <RegExpr attribute="Keyword" context="#stay" String="\bfi&noword;" endRegion="if" />
         <!-- handle case as a special case -->
         <RegExpr attribute="Keyword" context="Case" String="\bcase&noword;" beginRegion="case" />
diff --git a/kate/data/bibtex.xml b/kate/data/bibtex.xml
index 5ee9436b8..e167c270e 100644
--- a/kate/data/bibtex.xml
+++ b/kate/data/bibtex.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
-<language name="BibTeX" version="1.15" kateversion="2.0" extensions="*.bib" section="Markup" mimetype="text/x-bib" casesensitive="1" author="Jeroen Wijnhout ([email protected])+Thomas Braun ([email protected])" license="LGPL">
+<!DOCTYPE language SYSTEM "language.dtd"
+	  [
+	  <!ENTITY stringVariable   	"[a-zA-Z0-9\-]+">
+	  <!ENTITY fieldFormat    	"[a-zA-Z0-9\-_\.]+">
+	  <!ENTITY latexCmd	  	"\\([a-zA-Z@]+|[^ ])">
+	  <!ENTITY refKeyFormat  	"[a-zA-Z0-9_@\\-\\:]+"> <!--taken from kile 2.0.3-->
+	  ]>
+<language name="BibTeX" version="1.17" kateversion="2.3" extensions="*.bib" section="Markup" mimetype="text/x-bib" casesensitive="1" author="Jeroen Wijnhout ([email protected])+Thomas Braun ([email protected])" license="LGPL">
   <highlighting>
     <list name="kw_entry">
       <item>@article</item> 
@@ -26,49 +32,75 @@
       <item>@techreport</item> 
       <item>@unpublished</item>
       <item>@www</item>
-    </list>
-    <list name="kw_command">
-      <item>@string</item>
-      <item>@preamble</item>
-      <item>@comment</item>
+      <item>@person</item> <!--all three from the directory package-->
+      <item>@company</item>
+      <item>@place</item>
     </list>
     <contexts>
-      <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
-        <RegExpr String="([a-zA-Z0-9]+)" attribute="Field" context="Field" firstNonSpace="true"/>
+      <context name="Normal" attribute="Comment" lineEndContext="#stay">
         <keyword String="kw_entry" attribute="Entry" context="Entry"/>
-        <keyword String="kw_command" attribute="Command" context="#stay"/>
-        <DetectChar char="{" attribute="Normal Text" context="#stay" beginRegion="block" />
-        <DetectChar char="}" attribute="Normal Text" context="#stay" endRegion="block" />
-        <RegExpr String="\\([a-zA-Z]+|.)" attribute="Char" context="#stay"/>
-        <DetectChar char="&quot;" attribute="String" context="String"/>
+	<StringDetect String="@string" attribute="Command" insensitive="true" context="StringCommand"/>
+	<StringDetect String="@preamble" attribute="Command" insensitive="true" context="PreambleCommand"/>
+	<StringDetect String="@comment" attribute="Comment" insensitive="true" context="#stay"/> <!--nothing special needed here-->
+    </context>
+
+	<context name="PreambleCommand" attribute="Normal Text" fallthrough="true" fallthroughContext="#pop" lineEndContext="#stay" >
+		<DetectChar char="{" context="CurlyBracket" />
+	</context>
+	
+	<context name="StringCommand" attribute="Normal Text" fallthrough="true" fallthroughContext="#pop" lineEndContext="#stay" >
+		<DetectChar char="{" context="CurlyBracket" />
+		<RegExpr String="&stringVariable;" attribute="String" context="CurlyBracket"/>
+      </context>
+
+      <context name="Entry" attribute="Normal Text" lineEndContext="#stay">
+	      <DetectChar char="{"  context="#stay" beginRegion="block" />
+	      <RegExpr String="&refKeyFormat;" attribute="Ref Key" context="#stay"/>
+	      <DetectChar char="," context="Field"/>
+	      <DetectChar char="}" attribute="Normal Text" context="#pop" endRegion="block" />
       </context>
 
-      <context name="Entry" attribute="Ref Key" lineEndContext="#stay">
-        <DetectChar char="," attribute="Normal Text" context="#pop"/>
-        <DetectChar char="{" attribute="Normal Text" context="#stay" beginRegion="block" />
-        <DetectChar char="}" attribute="Normal Text" context="#stay" endRegion="block" />
-        <RegExpr String="\\([a-zA-Z]+|.)" attribute="Char" context="#stay"/>
-        <DetectChar char="&quot;" attribute="String" context="#pop"/>
+      <context name="Field" attribute="Normal Text" lineEndContext="#stay">
+	      <RegExpr String="&fieldFormat;" attribute="Field" firstNonSpace="true"/>
+	      <DetectSpaces/>
+	      <DetectChar char="=" context="#stay"/>
+	      <DetectSpaces/>
+	      <DetectChar char="{" context="CurlyBracket"/>
+	      <DetectChar char="}" context="#pop" lookAhead="true"/>
+	      <DetectChar char="&quot;"  attribute="Normal Text" context="QuotedText"/>
+	      <DetectChar char="," context="#stay"/>
+	      <DetectChar char="#" context="#stay"/> <!-- the bibtex string concatenate character -->
+	      <RegExpr String="[0-9]+" context="#stay"/>
+	      <RegExpr String="&stringVariable;" attribute="String" /> <!-- assume this is a variable created with @String -->
+	      <DetectSpaces/>
+	      <RegExpr String="." attribute="Error" context="#stay"/> <!--this rule catches all errors-->
       </context>
 
-      <context name="Field" attribute="Field" lineEndContext="#pop">
-	      <DetectChar char="=" attribute="Normal Text" context="#pop"/>
+      <context name="CurlyBracket" attribute="Normal Text" lineEndContext="#stay">
+	      <DetectChar char="{" context="CurlyBracket"/>
+	      <RegExpr String="&latexCmd;" attribute="LatexCommand" context="#stay"/>
+	      <RegExpr String="}$" context="#pop#pop"/>
+	      <DetectChar char="}" context="#pop"/>
       </context>
 
-      <context name="String" attribute="String" lineEndContext="#stay">
-        <RegExpr String="\\([a-zA-Z]+|.)" attribute="Char" context="#stay"/>
-        <DetectChar char="&quot;" attribute="String" context="#pop"/>
+      <context name="QuotedText" attribute="String" lineEndContext="#stay">
+	      <DetectChar char="&quot;" attribute="Normal Text" context="#pop"/>
+	      <RegExpr String="&latexCmd;" attribute="LatexCommand" context="#stay"/>
       </context>
+
     </contexts>
+
     <itemDatas>
       <itemData name="Normal Text" defStyleNum="dsNormal"/>
-      <itemData name="Entry" defStyleNum="dsKeyword" color="#0000ff"/>
-      <itemData name="Command" defStyleNum="dsFunction"/>
-      <itemData name="Field" defStyleNum="dsDataType"/>
-      <itemData name="Ref Key" defStyleNum="dsOthers"/>
-      <itemData name="String" defStyleNum="dsString"/>
-      <itemData name="Char" defStyleNum="dsChar"/>
-    </itemDatas>
+      <itemData name="Entry" defStyleNum="dsKeyword" color="#0000ff" spellChecking="false"/>
+      <itemData name="Command" defStyleNum="dsFunction" spellChecking="false"/>
+      <itemData name="Field" defStyleNum="dsDataType" spellChecking="false"/>
+      <itemData name="Ref Key" defStyleNum="dsOthers" spellChecking="false"/>
+      <itemData name="LatexCommand" defStyleNum="dsChar" spellChecking="false"/>
+      <itemData name="Comment" defStyleNum="dsComment" spellChecking="false"/>
+      <itemData name="Error" defStyleNum="dsAlert" spellChecking="false"/>
+      <itemData name="String" defStyleNum="dsString" spellChecking="true"/>
+</itemDatas>
   </highlighting>
   <general>
    <keywords casesensitive="0" weakDeliminator="\" wordWrapDeliminator=",{}[]"/>
diff --git a/kate/data/bmethod.xml b/kate/data/bmethod.xml
index e74aa3c77..a852390dd 100644
--- a/kate/data/bmethod.xml
+++ b/kate/data/bmethod.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="B-Method" version="0.02" kateversion="2.4" section="Scientific" extensions="*.mch;*.imp;*.ref" author="Ivo Anjo ([email protected])" license="LGPL">
+<language name="B-Method" version="0.1" kateversion="2.4" section="Scientific" extensions="*.mch;*.imp;*.ref" author="Ivo Anjo ([email protected])" license="LGPL">
 
 <highlighting>
 	<list name="sections">
@@ -77,12 +77,12 @@
       		</context>
 	</contexts>
 	<itemDatas>
-		<itemData name="Normal Text" defStyleNum="dsNormal"/>
-		<itemData name="SectionKeyword" defStyleNum="dsKeyword" color="#ff0000"/>
-		<itemData name="OperationKeyword" defStyleNum="dsKeyword" color="#0000ff"/>
+		<itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="0"/>
+		<itemData name="SectionKeyword" defStyleNum="dsKeyword" color="#ff0000" spellChecking="0"/>
+		<itemData name="OperationKeyword" defStyleNum="dsKeyword" color="#0000ff" spellChecking="0"/>
 		<itemData name="Comment" defStyleNum="dsComment"/>
-		<itemData name="Data Type" defStyleNum="dsDataType"/>
-		<itemData name="Decimal" defStyleNum="dsDecVal"/>
+		<itemData name="Data Type" defStyleNum="dsDataType" spellChecking="0"/>
+		<itemData name="Decimal" defStyleNum="dsDecVal" spellChecking="0"/>
 	</itemDatas>
 </highlighting>
 
diff --git a/kate/data/c.xml b/kate/data/c.xml
index ee0e90fa8..0389f7849 100644
--- a/kate/data/c.xml
+++ b/kate/data/c.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <language name="C" section="Sources"
-          version="1.42" kateversion="2.4"
+          version="1.44" kateversion="2.4"
           indenter="cstyle"
           extensions="*.c;*.C;*.h"
           mimetype="text/x-csrc;text/x-c++src;text/x-chdr"
@@ -67,7 +67,7 @@
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
         <DetectSpaces />
-	<RegExpr attribute="Preprocessor" context="Outscoped" String="#\s*if\s+0" beginRegion="PP" firstNonSpace="true" />
+	<RegExpr attribute="Preprocessor" context="Outscoped" String="#\s*if\s+0\s*$" beginRegion="PP" firstNonSpace="true" />
         <DetectChar context="AfterHash" char="#" firstNonSpace="true" lookAhead="true" />
         <StringDetect attribute="Region Marker" context="Region Marker" String="//BEGIN" beginRegion="Region1" firstNonSpace="true" />
         <StringDetect attribute="Region Marker" context="Region Marker" String="//END" endRegion="Region1" firstNonSpace="true" />
@@ -169,23 +169,23 @@
       </context>
     </contexts>
     <itemDatas>
-      <itemData name="Normal Text"  defStyleNum="dsNormal"/>
-      <itemData name="Keyword"      defStyleNum="dsKeyword"/>
-      <itemData name="Data Type"    defStyleNum="dsDataType"/>
-      <itemData name="Decimal"      defStyleNum="dsDecVal"/>
-      <itemData name="Octal"        defStyleNum="dsBaseN"/>
-      <itemData name="Hex"          defStyleNum="dsBaseN"/>
-      <itemData name="Float"        defStyleNum="dsFloat"/>
-      <itemData name="Char"         defStyleNum="dsChar"/>
+      <itemData name="Normal Text"  defStyleNum="dsNormal" spellChecking="false"/>
+      <itemData name="Keyword"      defStyleNum="dsKeyword" spellChecking="false"/>
+      <itemData name="Data Type"    defStyleNum="dsDataType" spellChecking="false"/>
+      <itemData name="Decimal"      defStyleNum="dsDecVal" spellChecking="false"/>
+      <itemData name="Octal"        defStyleNum="dsBaseN" spellChecking="false"/>
+      <itemData name="Hex"          defStyleNum="dsBaseN" spellChecking="false"/>
+      <itemData name="Float"        defStyleNum="dsFloat" spellChecking="false"/>
+      <itemData name="Char"         defStyleNum="dsChar" spellChecking="false"/>
       <itemData name="String"       defStyleNum="dsString"/>
       <itemData name="String Char"  defStyleNum="dsChar"/>
       <itemData name="Comment"      defStyleNum="dsComment"/>
-      <itemData name="Symbol"       defStyleNum="dsNormal"/>
-      <itemData name="Preprocessor" defStyleNum="dsOthers"/>
-      <itemData name="Prep. Lib"    defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); -->
-      <itemData name="Alert"        defStyleNum="dsAlert" />
-      <itemData name="Region Marker" defStyleNum="dsRegionMarker" />
-      <itemData name="Error"        defStyleNum="dsError" />
+      <itemData name="Symbol"       defStyleNum="dsNormal" spellChecking="false"/>
+      <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/>
+      <itemData name="Prep. Lib"    defStyleNum="dsOthers" spellChecking="false"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); -->
+      <itemData name="Alert"        defStyleNum="dsAlert" spellChecking="false"/>
+      <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
+      <itemData name="Error"        defStyleNum="dsError" spellChecking="false"/>
     </itemDatas>
   </highlighting>
   <general>
diff --git a/kate/data/clojure.xml b/kate/data/clojure.xml
new file mode 100644
index 000000000..dfacdd5b3
--- /dev/null
+++ b/kate/data/clojure.xml
@@ -0,0 +1,748 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!--
+  This file is part of TDE's kate project.
+  
+  copyright   : (C) 2004 by Dominik Haumann, (C) 2011 by Caspar Hasenclever
+
+ **********************************************************************
+ * This library is free software; you can redistribute it and/or      *
+ * modify it under the terms of the GNU Library General Public        *
+ * License as published by the Free Software Foundation; either       *
+ * version 2 of the License, or (at your option) any later version.   *
+ *                                                                    *
+ * This library 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  *
+ * Library General Public License for more details.                   *
+ *                                                                    *
+ * You should have received a copy of the GNU Library General Public  *
+ * License along with this library; if not, write to the              *
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,       *
+ * Boston, MA  02110-1301, USA.                                       *
+ **********************************************************************
+ -->
+<language version="1.00" kateversion="2.3" name="Clojure" section="Sources" extensions="*.clj" mimetype="" author="Dominik Haumann [lisp] modified for clojure by Caspar Hasenclever" license="LGPL">
+  <highlighting>
+    <list name="definitions">
+      <item> def </item>
+      <item> def- </item>
+      <item> defalias </item>
+      <item> defhinted </item>
+      <item> definline </item>
+      <item> defmacro </item>
+      <item> defmacro- </item>
+      <item> defmethod </item>
+      <item> defmulti </item>
+      <item> defn </item>
+      <item> defn- </item>
+      <item> defnk </item>
+      <item> defn-memo </item>
+      <item> defonce </item>
+      <item> defonce- </item>
+      <item> defprotocol </item>
+      <item> defrecord </item>
+      <item> defstruct </item>
+      <item> defstruct- </item>
+      <item> deftest </item>
+      <item> deftest- </item>
+      <item> deftype </item>
+      <item> defunbound </item>
+      <item> defunbound- </item>
+      <item> defvar </item>
+      <item> defvar- </item>
+    </list>
+    <list name="keywords">
+      <item> &lt; </item>
+      <item> &lt;= </item>
+      <item> = </item>
+      <item> == </item>
+      <item> &gt; </item>
+      <item> &gt;= </item>
+      <item> - </item>
+      <item> -&gt; </item>
+      <item> -&gt;&gt; </item>
+      <item> / </item>
+      <item> . </item>
+      <item> .. </item>
+      <item> * </item>
+      <item> + </item>
+      <item> accessor </item>
+      <item> aclone </item>
+      <item> add-classpath </item>
+      <item> add-watcher </item>
+      <item> agent </item>
+      <item> agent-errors </item>
+      <item> aget </item>
+      <item> alength </item>
+      <item> alias </item>
+      <item> all-ns </item>
+      <item> alter </item>
+      <item> alter-meta! </item>
+      <item> alter-var-root </item>
+      <item> amap </item>
+      <item> ancestors </item>
+      <item> and </item>
+      <item> append-child </item>
+      <item> apply </item>
+      <item> apply-template </item>
+      <item> are </item>
+      <item> areduce </item>
+      <item> array-map </item>
+      <item> aset </item>
+      <item> aset-boolean </item>
+      <item> aset-byte </item>
+      <item> aset-char </item>
+      <item> aset-double </item>
+      <item> aset-float </item>
+      <item> aset-int </item>
+      <item> aset-long </item>
+      <item> aset-short </item>
+      <item> assert </item>
+      <item> assert-any </item>
+      <item> assert-expr </item>
+      <item> assert-predicate </item>
+      <item> assoc </item>
+      <item> assoc! </item>
+      <item> associative? </item>
+      <item> assoc-in </item>
+      <item> atom </item>
+      <item> atom? </item>
+      <item> attrs </item>
+      <item> await </item>
+      <item> await1 </item>
+      <item> await-for </item>
+      <item> bases </item>
+      <item> bean </item>
+      <item> bigdec </item>
+      <item> bigint </item>
+      <item> binding </item>
+      <item> bit-and </item>
+      <item> bit-and-not </item>
+      <item> bit-clear </item>
+      <item> bit-flip </item>
+      <item> bit-not </item>
+      <item> bit-or </item>
+      <item> bit-set </item>
+      <item> bit-shift-left </item>
+      <item> bit-shift-right </item>
+      <item> bit-test </item>
+      <item> bit-xor </item>
+      <item> boolean </item>
+      <item> boolean-array </item>
+      <item> booleans </item>
+      <item> bound-fn </item>
+      <item> bound-fn* </item>
+      <item> branch? </item>
+      <item> butlast </item>
+      <item> byte </item>
+      <item> byte-array </item>
+      <item> bytes </item>
+      <item> case </item>
+      <item> cast </item>
+      <item> catch </item>
+      <item> char </item>
+      <item> char? </item>
+      <item> char-array </item>
+      <item> char-escape-string </item>
+      <item> char-name-string </item>
+      <item> chars </item>
+      <item> children </item>
+      <item> chunk </item>
+      <item> chunk-append </item>
+      <item> chunk-buffer </item>
+      <item> chunk-cons </item>
+      <item> chunked-seq? </item>
+      <item> chunk-first </item>
+      <item> chunk-next </item>
+      <item> chunk-rest </item>
+      <item> class </item>
+      <item> class? </item>
+      <item> clear-agent-errors </item>
+      <item> clojure-version </item>
+      <item> coll? </item>
+      <item> collection-tag </item>
+      <item> comment </item>
+      <item> commute </item>
+      <item> comp </item>
+      <item> comparator </item>
+      <item> compare </item>
+      <item> compare-and-set! </item>
+      <item> compile </item>
+      <item> complement </item>
+      <item> compose-fixtures </item>
+      <item> concat </item>
+      <item> cond </item>
+      <item> condp </item>
+      <item> conj </item>
+      <item> conj! </item>
+      <item> cons </item>
+      <item> constantly </item>
+      <item> construct-proxy </item>
+      <item> contains? </item>
+      <item> content </item>
+      <item> content-handler </item>
+      <item> count </item>
+      <item> counted? </item>
+      <item> create-ns </item>
+      <item> create-struct </item>
+      <item> cycle </item>
+      <item> dec </item>
+      <item> decimal? </item>
+      <item> declare </item>
+      <item> delay </item>
+      <item> delay? </item>
+      <item> deliver </item>
+      <item> deref </item>
+      <item> derive </item>
+      <item> descendants </item>
+      <item> destructure </item>
+      <item> difference </item>
+      <item> disj </item>
+      <item> disj! </item>
+      <item> dissoc </item>
+      <item> dissoc! </item>
+      <item> distinct </item>
+      <item> distinct? </item>
+      <item> do </item>
+      <item> doall </item>
+      <item> doc </item>
+      <item> dorun </item>
+      <item> doseq </item>
+      <item> dosync </item>
+      <item> do-template </item>
+      <item> dotimes </item>
+      <item> doto </item>
+      <item> double </item>
+      <item> double-array </item>
+      <item> doubles </item>
+      <item> down </item>
+      <item> drop </item>
+      <item> drop-last </item>
+      <item> drop-while </item>
+      <item> e </item>
+      <item> edit </item>
+      <item> element </item>
+      <item> emit </item>
+      <item> emit-element </item>
+      <item> empty </item>
+      <item> empty? </item>
+      <item> end? </item>
+      <item> ensure </item>
+      <item> enumeration-seq </item>
+      <item> eval </item>
+      <item> even? </item>
+      <item> every? </item>
+      <item> extend </item>
+      <item> extenders </item>
+      <item> extend-protocol </item>
+      <item> extends? </item>
+      <item> extend-type </item>
+      <item> false? </item>
+      <item> ffirst </item>
+      <item> file-position </item>
+      <item> file-seq </item>
+      <item> filter </item>
+      <item> finally </item>
+      <item> find </item>
+      <item> find-doc </item>
+      <item> find-ns </item>
+      <item> find-var </item>
+      <item> first </item>
+      <item> float </item>
+      <item> float? </item>
+      <item> float-array </item>
+      <item> floats </item>
+      <item> flush </item>
+      <item> fn </item>
+      <item> fn? </item>
+      <item> fnext </item>
+      <item> for </item>
+      <item> force </item>
+      <item> format </item>
+      <item> function? </item>
+      <item> future </item>
+      <item> future? </item>
+      <item> future-call </item>
+      <item> future-cancel </item>
+      <item> future-cancelled? </item>
+      <item> future-done? </item>
+      <item> gen-and-load-class </item>
+      <item> gen-and-save-class </item>
+      <item> gen-class </item>
+      <item> gen-interface </item>
+      <item> gensym </item>
+      <item> get </item>
+      <item> get-child </item>
+      <item> get-child-count </item>
+      <item> get-in </item>
+      <item> get-method </item>
+      <item> get-possibly-unbound-var </item>
+      <item> get-proxy-class </item>
+      <item> get-thread-bindings </item>
+      <item> get-validator </item>
+      <item> handle </item>
+      <item> handler-case </item>
+      <item> hash </item>
+      <item> hash-map </item>
+      <item> hash-set </item>
+      <item> identical? </item>
+      <item> identity </item>
+      <item> if </item>
+      <item> if-let </item>
+      <item> ifn? </item>
+      <item> if-not </item>
+      <item> import </item>
+      <item> inc </item>
+      <item> inc-report-counter </item>
+      <item> index </item>
+      <item> init-proxy </item>
+      <item> in-ns </item>
+      <item> insert-child </item>
+      <item> insert-left </item>
+      <item> insert-right </item>
+      <item> inspect </item>
+      <item> inspect-table </item>
+      <item> inspect-tree </item>
+      <item> instance? </item>
+      <item> int </item>
+      <item> int-array </item>
+      <item> integer? </item>
+      <item> interleave </item>
+      <item> intern </item>
+      <item> interpose </item>
+      <item> intersection </item>
+      <item> into </item>
+      <item> into-array </item>
+      <item> ints </item>
+      <item> io! </item>
+      <item> is </item>
+      <item> isa? </item>
+      <item> is-leaf </item>
+      <item> iterate </item>
+      <item> iterator-seq </item>
+      <item> join </item>
+      <item> join-fixtures </item>
+      <item> juxt </item>
+      <item> key </item>
+      <item> keys </item>
+      <item> keyword </item>
+      <item> keyword? </item>
+      <item> keywordize-keys </item>
+      <item> last </item>
+      <item> lazy-cat </item>
+      <item> lazy-seq </item>
+      <item> left </item>
+      <item> leftmost </item>
+      <item> lefts </item>
+      <item> let </item>
+      <item> letfn </item>
+      <item> line-seq </item>
+      <item> list </item>
+      <item> list* </item>
+      <item> list? </item>
+      <item> list-model </item>
+      <item> list-provider </item>
+      <item> load </item>
+      <item> loaded-libs </item>
+      <item> load-file </item>
+      <item> load-reader </item>
+      <item> load-script </item>
+      <item> load-string </item>
+      <item> locking </item>
+      <item> long </item>
+      <item> long-array </item>
+      <item> longs </item>
+      <item> loop </item>
+      <item> macroexpand </item>
+      <item> macroexpand-1 </item>
+      <item> macroexpand-all </item>
+      <item> main </item>
+      <item> make-array </item>
+      <item> make-hierarchy </item>
+      <item> make-node </item>
+      <item> map </item>
+      <item> map? </item>
+      <item> mapcat </item>
+      <item> map-invert </item>
+      <item> max </item>
+      <item> max-key </item>
+      <item> memfn </item>
+      <item> memoize </item>
+      <item> merge </item>
+      <item> merge-with </item>
+      <item> meta </item>
+      <item> methods </item>
+      <item> method-sig </item>
+      <item> min </item>
+      <item> min-key </item>
+      <item> mod </item>
+      <item> name </item>
+      <item> namespace </item>
+      <item> neg? </item>
+      <item> newline </item>
+      <item> next </item>
+      <item> nfirst </item>
+      <item> nil? </item>
+      <item> nnext </item>
+      <item> node </item>
+      <item> not </item>
+      <item> not= </item>
+      <item> not-any? </item>
+      <item> not-empty </item>
+      <item> not-every? </item>
+      <item> ns </item>
+      <item> ns-aliases </item>
+      <item> ns-imports </item>
+      <item> ns-interns </item>
+      <item> ns-map </item>
+      <item> ns-name </item>
+      <item> ns-publics </item>
+      <item> ns-refers </item>
+      <item> ns-resolve </item>
+      <item> ns-unalias </item>
+      <item> ns-unmap </item>
+      <item> nth </item>
+      <item> nthnext </item>
+      <item> num </item>
+      <item> number? </item>
+      <item> odd? </item>
+      <item> or </item>
+      <item> parents </item>
+      <item> partial </item>
+      <item> partition </item>
+      <item> path </item>
+      <item> pcalls </item>
+      <item> peek </item>
+      <item> persistent! </item>
+      <item> pmap </item>
+      <item> pop </item>
+      <item> pop! </item>
+      <item> pop-thread-bindings </item>
+      <item> pos? </item>
+      <item> postwalk </item>
+      <item> postwalk-demo </item>
+      <item> postwalk-replace </item>
+      <item> pr </item>
+      <item> prefer-method </item>
+      <item> prefers </item>
+      <item> prev </item>
+      <item> prewalk </item>
+      <item> prewalk-demo </item>
+      <item> prewalk-replace </item>
+      <item> primitives-classnames </item>
+      <item> print </item>
+      <item> print-cause-trace </item>
+      <item> print-ctor </item>
+      <item> print-doc </item>
+      <item> print-dup </item>
+      <item> printf </item>
+      <item> println </item>
+      <item> println-str </item>
+      <item> print-method </item>
+      <item> print-namespace-doc </item>
+      <item> print-simple </item>
+      <item> print-special-doc </item>
+      <item> print-stack-trace </item>
+      <item> print-str </item>
+      <item> print-throwable </item>
+      <item> print-trace-element </item>
+      <item> prn </item>
+      <item> prn-str </item>
+      <item> project </item>
+      <item> promise </item>
+      <item> proxy </item>
+      <item> proxy-call-with-super </item>
+      <item> proxy-mappings </item>
+      <item> proxy-name </item>
+      <item> proxy-super </item>
+      <item> pr-str </item>
+      <item> push-thread-bindings </item>
+      <item> pvalues </item>
+      <item> quot </item>
+      <item> rand </item>
+      <item> rand-int </item>
+      <item> range </item>
+      <item> ratio? </item>
+      <item> rational? </item>
+      <item> rationalize </item>
+      <item> read </item>
+      <item> read-line </item>
+      <item> read-string </item>
+      <item> recur </item>
+      <item> reduce </item>
+      <item> ref </item>
+      <item> refer </item>
+      <item> refer-clojure </item>
+      <item> ref-history-count </item>
+      <item> re-find </item>
+      <item> ref-max-history </item>
+      <item> ref-min-history </item>
+      <item> ref-set </item>
+      <item> re-groups </item>
+      <item> reify </item>
+      <item> release-pending-sends </item>
+      <item> rem </item>
+      <item> re-matcher </item>
+      <item> re-matches </item>
+      <item> remove </item>
+      <item> remove-method </item>
+      <item> remove-ns </item>
+      <item> remove-watcher </item>
+      <item> rename </item>
+      <item> rename-keys </item>
+      <item> re-pattern </item>
+      <item> repeat </item>
+      <item> repeatedly </item>
+      <item> repl </item>
+      <item> replace </item>
+      <item> repl-caught </item>
+      <item> repl-exception </item>
+      <item> replicate </item>
+      <item> repl-prompt </item>
+      <item> repl-read </item>
+      <item> report </item>
+      <item> require </item>
+      <item> re-seq </item>
+      <item> reset! </item>
+      <item> reset-meta! </item>
+      <item> resolve </item>
+      <item> rest </item>
+      <item> resultset-seq </item>
+      <item> reverse </item>
+      <item> reversible? </item>
+      <item> right </item>
+      <item> rightmost </item>
+      <item> rights </item>
+      <item> root </item>
+      <item> rseq </item>
+      <item> rsubseq </item>
+      <item> run-all-tests </item>
+      <item> run-tests </item>
+      <item> satisfies? </item>
+      <item> second </item>
+      <item> select </item>
+      <item> select-keys </item>
+      <item> send </item>
+      <item> send-off </item>
+      <item> seq </item>
+      <item> seq? </item>
+      <item> seque </item>
+      <item> sequence </item>
+      <item> sequential? </item>
+      <item> seq-zip </item>
+      <item> set </item>
+      <item> set? </item>
+      <item> set-test </item>
+      <item> set-validator! </item>
+      <item> short </item>
+      <item> short-array </item>
+      <item> shorts </item>
+      <item> shutdown-agents </item>
+      <item> skip-if-eol </item>
+      <item> skip-whitespace </item>
+      <item> slurp </item>
+      <item> some </item>
+      <item> sort </item>
+      <item> sort-by </item>
+      <item> sorted? </item>
+      <item> sorted-map </item>
+      <item> sorted-map-by </item>
+      <item> sorted-set </item>
+      <item> sorted-set-by </item>
+      <item> special-form-anchor </item>
+      <item> special-symbol? </item>
+      <item> split-at </item>
+      <item> split-with </item>
+      <item> str </item>
+      <item> stream? </item>
+      <item> string? </item>
+      <item> stringify-keys </item>
+      <item> struct </item>
+      <item> struct-map </item>
+      <item> subs </item>
+      <item> subseq </item>
+      <item> subvec </item>
+      <item> successful? </item>
+      <item> supers </item>
+      <item> swap! </item>
+      <item> symbol </item>
+      <item> symbol? </item>
+      <item> sync </item>
+      <item> syntax-symbol-anchor </item>
+      <item> take </item>
+      <item> take-last </item>
+      <item> take-nth </item>
+      <item> take-while </item>
+      <item> test </item>
+      <item> test-all-vars </item>
+      <item> testing </item>
+      <item> testing-contexts-str </item>
+      <item> testing-vars-str </item>
+      <item> test-ns </item>
+      <item> test-var </item>
+      <item> the-ns </item>
+      <item> throw </item>
+      <item> time </item>
+      <item> to-array </item>
+      <item> to-array-2d </item>
+      <item> trampoline </item>
+      <item> transient </item>
+      <item> tree-seq </item>
+      <item> true? </item>
+      <item> try </item>
+      <item> try-expr </item>
+      <item> type </item>
+      <item> unchecked-add </item>
+      <item> unchecked-dec </item>
+      <item> unchecked-divide </item>
+      <item> unchecked-inc </item>
+      <item> unchecked-multiply </item>
+      <item> unchecked-negate </item>
+      <item> unchecked-remainder </item>
+      <item> unchecked-subtract </item>
+      <item> underive </item>
+      <item> unimport </item>
+      <item> union </item>
+      <item> unquote </item>
+      <item> unquote-splicing </item>
+      <item> up </item>
+      <item> update-in </item>
+      <item> update-proxy </item>
+      <item> use </item>
+      <item> use-fixtures </item>
+      <item> val </item>
+      <item> vals </item>
+      <item> var? </item>
+      <item> var-get </item>
+      <item> var-set </item>
+      <item> vary-meta </item>
+      <item> vec </item>
+      <item> vector </item>
+      <item> vector? </item>
+      <item> walk </item>
+      <item> when </item>
+      <item> when-first </item>
+      <item> when-let </item>
+      <item> when-not </item>
+      <item> while </item>
+      <item> with-bindings </item>
+      <item> with-bindings* </item>
+      <item> with-in-str </item>
+      <item> with-loading-context </item>
+      <item> with-local-vars </item>
+      <item> with-meta </item>
+      <item> with-open </item>
+      <item> with-out-str </item>
+      <item> with-precision </item>
+      <item> with-test </item>
+      <item> with-test-out </item>
+      <item> xml-seq </item>
+    </list>
+    <list name="variables">
+      <item> *1 </item>
+      <item> *2 </item>
+      <item> *3 </item>
+      <item> *agent* </item>
+      <item> *allow-unresolved-vars* </item>
+      <item> *assert* </item>
+      <item> *clojure-version* </item>
+      <item> *command-line-args* </item>
+      <item> *compile-files* </item>
+      <item> *compile-path* </item>
+      <item> *current* </item>
+      <item> *e </item>
+      <item> *err* </item>
+      <item> *file* </item>
+      <item> *flush-on-newline* </item>
+      <item> *in* </item>
+      <item> *initial-report-counters* </item>
+      <item> *load-tests* </item>
+      <item> *macro-meta* </item>
+      <item> *math-context* </item>
+      <item> *ns* </item>
+      <item> *out* </item>
+      <item> *print-dup* </item>
+      <item> *print-length* </item>
+      <item> *print-level* </item>
+      <item> *print-meta* </item>
+      <item> *print-readably* </item>
+      <item> *read-eval* </item>
+      <item> *report-counters* </item>
+      <item> *sb* </item>
+      <item> *source-path* </item>
+      <item> *stack* </item>
+      <item> *stack-trace-depth* </item>
+      <item> *state* </item>
+      <item> *testing-contexts* </item>
+      <item> *testing-vars* </item>
+      <item> *test-out* </item>
+      <item> *use-context-classloader* </item>
+      <item> *warn-on-reflection* </item>
+    </list>
+    <contexts>
+      <context name="Normal" attribute="Normal" lineEndContext="#stay">
+        <RegExpr attribute="Comment" context="#stay" String=";.*$"/>
+        <Detect2Chars attribute="Comment" context="#stay" char="#" char1="_"/>
+        <RegExpr attribute="Modifier" context="#stay" String=":\S+"/>
+        <RegExpr attribute="Modifier" context="#stay" String="[@~]\S+"/>
+        <Detect2Chars attribute="Brackets" context="#stay" char="#" char1="("/>
+        <DetectChar attribute="Brackets" context="#stay" char="("/>
+        <DetectChar attribute="Brackets" context="#stay" char=")"/>
+        <Detect2Chars attribute="Brackets" context="#stay" char="#" char1="{"/>
+        <Detect2Chars attribute="Brackets" context="#stay" char="^" char1="{"/>
+        <DetectChar attribute="Brackets" context="#stay" char="{"/>
+        <DetectChar attribute="Brackets" context="#stay" char="}"/>
+        <DetectChar attribute="Brackets" context="#stay" char="["/>
+        <DetectChar attribute="Brackets" context="#stay" char="]"/>
+        <Detect2Chars attribute="Variable" context="#stay" char="#" char1="'"/>
+        <keyword attribute="Keyword" context="#stay" String="keywords"/>
+        <keyword attribute="Variable" context="#stay" String="variables"/>
+        <keyword attribute="Definition" context="function_decl" String="definitions"/>
+        <RegExpr attribute="Char" context="#stay" String="\\."/>
+        <Detect2Chars attribute="String" context="String" char="#" char1="&quot;"/>
+        <DetectChar attribute="String" context="String" char="&quot;"/>
+        <Float attribute="Float" context="#stay"/>
+        <Int attribute="Decimal" context="#stay"/>
+      </context>
+      <context name="function_decl" attribute="Function" lineEndContext="#stay">
+        <RegExpr attribute="Function" context="#pop" String="\s*[A-Za-z0-9-+\&lt;\&gt;//\*]*\s*"/>
+      </context>
+      <context name="SpecialNumber" attribute="Normal" lineEndContext="#pop">
+        <Float attribute="Float" context="#pop"/>
+        <Int attribute="Decimal" context="#pop"/>
+        <HlCOct attribute="BaseN" context="#pop"/>
+        <HlCHex attribute="Float" context="#pop"/>
+      </context>
+      <context name="String" attribute="String" lineEndContext="#stay">
+        <RegExpr attribute="Char" context="#stay" String="#\\."/>
+        <HlCStringChar attribute="String Char" context="#stay"/>
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+      </context>
+    </contexts>
+    <itemDatas>
+      <itemData name="Normal" defStyleNum="dsNormal"/>
+      <itemData name="Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Operator" defStyleNum="dsKeyword" color="#d22811"/>
+      <itemData name="Modifier" defStyleNum="dsKeyword" color="#800000"/>
+      <itemData name="Variable" defStyleNum="dsKeyword" color="#b07e1f"/>
+      <itemData name="Definition" defStyleNum="dsKeyword" color="#d22811"/>
+      <itemData name="Data" defStyleNum="dsDataType"/>
+      <itemData name="Decimal" defStyleNum="dsDecVal"/>
+      <itemData name="BaseN" defStyleNum="dsBaseN"/>
+      <itemData name="Float" defStyleNum="dsFloat"/>
+      <itemData name="Function" defStyleNum="dsFunction"/>
+      <itemData name="Char" defStyleNum="dsChar"/>
+      <itemData name="String" defStyleNum="dsString"/>
+      <itemData name="Comment" defStyleNum="dsComment"/>
+      <itemData name="Region Marker" defStyleNum="dsRegionMarker"/>
+      <itemData name="Brackets" defStyleNum="dsNormal" color="#0000ff" selColor="#00ff00" bold="1" italic="0"/>
+    </itemDatas>
+  </highlighting>
+  <general>
+    <keywords casesensitive="1" weakDeliminator="-+*?!&lt;&gt;=/:#\"/>
+    <comments>
+      <comment name="singleLine" start=";;"/>
+    </comments>
+  </general>
+</language>
diff --git a/kate/data/cmake.xml b/kate/data/cmake.xml
index 09d729774..9201933a0 100644
--- a/kate/data/cmake.xml
+++ b/kate/data/cmake.xml
@@ -24,8 +24,8 @@
  * Boston, MA  02110-1301, USA.                                       *
  **********************************************************************
  -->
-<!-- generated for "cmake version 2.6-patch 3" -->
-<language name="CMake" version="1.11" kateversion="2.4" section="Other" extensions="CMakeLists.txt;*.cmake;" mimetype="" author="Alexander Neundorf ([email protected])" license="LGPL">
+<!-- generated for "cmake version 2.8.1" -->
+<language name="CMake" version="1.13" kateversion="2.4" section="Other" extensions="CMakeLists.txt;*.cmake;" mimetype="" author="Alexander Neundorf ([email protected])" license="LGPL">
   <highlighting>
 
     <list name = "commands">
@@ -137,6 +137,7 @@
 
     <list name="special_args">
       <!-- generated list -->
+      <item> A </item>
       <item> ABSOLUTE </item>
       <item> AFTER </item>
       <item> ALL </item>
@@ -146,10 +147,11 @@
       <item> ARCHIVE </item>
       <item> ARGS </item>
       <item> ASCII </item>
+      <item> AUTHOR_WARNING </item>
+      <item> B </item>
       <item> BEFORE </item>
       <item> BRIEF_DOCS </item>
       <item> BUNDLE </item>
-      <item> C </item>
       <item> CACHE </item>
       <item> CLEAR </item>
       <item> CMAKE_FIND_ROOT_PATH_BOTH </item>
@@ -165,12 +167,13 @@
       <item> COMPONENT </item>
       <item> COMPONENTS </item>
       <item> CONFIGS </item>
+      <item> CONFIGURATION </item>
       <item> CONFIGURATIONS </item>
       <item> CONFIGURE </item>
       <item> COPYONLY </item>
       <item> COPY_FILE </item>
-      <item> CXX </item>
       <item> DEFINED </item>
+      <item> DEFINITION </item>
       <item> DEPENDS </item>
       <item> DESTINATION </item>
       <item> DIRECTORY </item>
@@ -213,6 +216,7 @@
       <item> HINTS </item>
       <item> IMPLICIT_DEPENDS </item>
       <item> IMPORTED </item>
+      <item> IN </item>
       <item> INCLUDE_INTERNALS </item>
       <item> INHERITED </item>
       <item> INPUT_FILE </item>
@@ -220,6 +224,8 @@
       <item> IS_ABSOLUTE </item>
       <item> IS_DIRECTORY </item>
       <item> IS_NEWER_THAN </item>
+      <item> IS_SYMLINK </item>
+      <item> ITEMS </item>
       <item> LENGTH </item>
       <item> LENGTH_MAXIMUM </item>
       <item> LENGTH_MINIMUM </item>
@@ -230,6 +236,7 @@
       <item> LIMIT_INPUT </item>
       <item> LIMIT_OUTPUT </item>
       <item> LINK_INTERFACE_LIBRARIES </item>
+      <item> LISTS </item>
       <item> LOG </item>
       <item> MACOSX_BUNDLE </item>
       <item> MAIN_DEPENDENCY </item>
@@ -251,12 +258,14 @@
       <item> NO_CMAKE_BUILDS_PATH </item>
       <item> NO_CMAKE_ENVIRONMENT_PATH </item>
       <item> NO_CMAKE_FIND_ROOT_PATH </item>
+      <item> NO_CMAKE_PACKAGE_REGISTRY </item>
       <item> NO_CMAKE_PATH </item>
       <item> NO_CMAKE_SYSTEM_PATH </item>
       <item> NO_DEFAULT_PATH </item>
       <item> NO_HEX_CONVERSION </item>
       <item> NO_MODULE </item>
       <item> NO_POLICY_SCOPE </item>
+      <item> NO_SOURCE_PERMISSIONS </item>
       <item> NO_SYSTEM_ENVIRONMENT_PATH </item>
       <item> OFFSET </item>
       <item> OLD </item>
@@ -272,6 +281,7 @@
       <item> OWNER_EXECUTE </item>
       <item> OWNER_READ </item>
       <item> OWNER_WRITE </item>
+      <item> PACKAGE </item>
       <item> PARENT_SCOPE </item>
       <item> PATH </item>
       <item> PATHS </item>
@@ -289,15 +299,18 @@
       <item> PROGRAM </item>
       <item> PROGRAMS </item>
       <item> PROGRAM_ARGS </item>
+      <item> PROJECT_NAME </item>
       <item> PROPERTIES </item>
       <item> PROPERTY </item>
       <item> PUBLIC_HEADER </item>
       <item> PUSH </item>
       <item> QUIET </item>
       <item> RANDOM </item>
+      <item> RANDOM_SEED </item>
       <item> RANGE </item>
       <item> READ </item>
       <item> READ_WITH_PREFIX </item>
+      <item> REALPATH </item>
       <item> REGEX </item>
       <item> REGULAR_EXPRESSION </item>
       <item> RELATIVE </item>
@@ -356,6 +369,7 @@
       <item> VERSION_EQUAL </item>
       <item> VERSION_GREATER </item>
       <item> VERSION_LESS </item>
+      <item> WARNING </item>
       <item> WIN32 </item>
       <item> WORKING_DIRECTORY </item>
       <item> WRITE </item>
@@ -371,40 +385,51 @@
       <!-- generated list -->
       <item> ABSTRACT </item>
       <item> ADDITIONAL_MAKE_CLEAN_FILES </item>
+      <item> ADVANCED </item>
       <item> ALLOW_DUPLICATE_CUSTOM_TARGETS </item>
       <item> ARCHIVE_OUTPUT_DIRECTORY </item>
+      <item> ARCHIVE_OUTPUT_NAME </item>
+      <item> ATTACHED_FILES </item>
+      <item> ATTACHED_FILES_ON_FAIL </item>
       <item> BUILD_WITH_INSTALL_RPATH </item>
       <item> CACHE_VARIABLES </item>
-      <item> CLEAN_DIRECT_OUTPUT </item>
       <item> CLEAN_NO_CUSTOM </item>
       <item> COMPILE_DEFINITIONS </item>
       <item> COMPILE_FLAGS </item>
+      <item> COST </item>
       <item> DEBUG_CONFIGURATIONS </item>
       <item> DEBUG_POSTFIX </item>
       <item> DEFINE_SYMBOL </item>
       <item> DEFINITIONS </item>
+      <item> DEPENDS </item>
       <item> DISABLED_FEATURES </item>
       <item> ENABLED_FEATURES </item>
       <item> ENABLED_LANGUAGES </item>
       <item> ENABLE_EXPORTS </item>
+      <item> ENVIRONMENT </item>
       <item> EXCLUDE_FROM_ALL </item>
       <item> EXTERNAL_OBJECT </item>
       <item> EchoString </item>
       <item> FAIL_REGULAR_EXPRESSION </item>
       <item> FIND_LIBRARY_USE_LIB64_PATHS </item>
+      <item> FIND_LIBRARY_USE_OPENBSD_VERSIONING </item>
       <item> FRAMEWORK </item>
       <item> Fortran_MODULE_DIRECTORY </item>
       <item> GENERATED </item>
       <item> GENERATOR_FILE_NAME </item>
       <item> GLOBAL_DEPENDS_DEBUG_MODE </item>
+      <item> GLOBAL_DEPENDS_NO_CYCLES </item>
       <item> HAS_CXX </item>
       <item> HEADER_FILE_ONLY </item>
+      <item> HELPSTRING </item>
       <item> IMPLICIT_DEPENDS_INCLUDE_TRANSFORM </item>
       <item> IMPORTED </item>
       <item> IMPORTED_CONFIGURATIONS </item>
       <item> IMPORTED_IMPLIB </item>
       <item> IMPORTED_LINK_DEPENDENT_LIBRARIES </item>
+      <item> IMPORTED_LINK_INTERFACE_LANGUAGES </item>
       <item> IMPORTED_LINK_INTERFACE_LIBRARIES </item>
+      <item> IMPORTED_LINK_INTERFACE_MULTIPLICITY </item>
       <item> IMPORTED_LOCATION </item>
       <item> IMPORTED_SONAME </item>
       <item> IMPORT_PREFIX </item>
@@ -414,14 +439,18 @@
       <item> INSTALL_NAME_DIR </item>
       <item> INSTALL_RPATH </item>
       <item> INSTALL_RPATH_USE_LINK_PATH </item>
+      <item> INTERPROCEDURAL_OPTIMIZATION </item>
       <item> IN_TRY_COMPILE </item>
       <item> KEEP_EXTENSION </item>
+      <item> LABELS </item>
       <item> LANGUAGE </item>
       <item> LIBRARY_OUTPUT_DIRECTORY </item>
+      <item> LIBRARY_OUTPUT_NAME </item>
       <item> LINKER_LANGUAGE </item>
       <item> LINK_DIRECTORIES </item>
       <item> LINK_FLAGS </item>
       <item> LINK_INTERFACE_LIBRARIES </item>
+      <item> LINK_INTERFACE_MULTIPLICITY </item>
       <item> LINK_SEARCH_END_STATIC </item>
       <item> LISTFILE_STACK </item>
       <item> LOCATION </item>
@@ -431,8 +460,10 @@
       <item> MACOSX_PACKAGE_LOCATION </item>
       <item> MACROS </item>
       <item> MEASUREMENT </item>
+      <item> MODIFIED </item>
       <item> OBJECT_DEPENDS </item>
       <item> OBJECT_OUTPUTS </item>
+      <item> OSX_ARCHITECTURES </item>
       <item> OUTPUT_NAME </item>
       <item> PACKAGES_FOUND </item>
       <item> PACKAGES_NOT_FOUND </item>
@@ -442,15 +473,24 @@
       <item> PREFIX </item>
       <item> PRE_INSTALL_SCRIPT </item>
       <item> PRIVATE_HEADER </item>
+      <item> PROCESSORS </item>
       <item> PROJECT_LABEL </item>
       <item> PUBLIC_HEADER </item>
       <item> REPORT_UNDEFINED_PROPERTIES </item>
+      <item> REQUIRED_FILES </item>
       <item> RESOURCE </item>
+      <item> RULE_LAUNCH_COMPILE </item>
+      <item> RULE_LAUNCH_CUSTOM </item>
+      <item> RULE_LAUNCH_LINK </item>
+      <item> RULE_MESSAGES </item>
       <item> RUNTIME_OUTPUT_DIRECTORY </item>
+      <item> RUNTIME_OUTPUT_NAME </item>
+      <item> RUN_SERIAL </item>
       <item> SKIP_BUILD_RPATH </item>
       <item> SOURCES </item>
       <item> SOVERSION </item>
       <item> STATIC_LIBRARY_FLAGS </item>
+      <item> STRINGS </item>
       <item> SUFFIX </item>
       <item> SYMBOLIC </item>
       <item> TARGET_ARCHIVES_MAY_BE_SHARED_LIBS </item>
@@ -458,6 +498,7 @@
       <item> TEST_INCLUDE_FILE </item>
       <item> TIMEOUT </item>
       <item> TYPE </item>
+      <item> VALUE </item>
       <item> VARIABLES </item>
       <item> VERSION </item>
       <item> VS_KEYWORD </item>
@@ -484,36 +525,34 @@
         <RegExpr attribute="Region Marker" context="#stay" String="#\s*BEGIN.*$" beginRegion="block" firstNonSpace="true"/>
         <RegExpr attribute="Region Marker" context="#stay" String="#\s*END.*$" endRegion="block" firstNonSpace="true"/>
         <DetectChar attribute="Comment" context="Comment" char="#"/>
+        <IncludeRules context="Detect Variables"/>
+        <RegExpr attribute="Macros" context="Macro Args" String="\w+\s*(?=\()"/>
+      </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="Detect Variables">
         <RegExpr attribute="Environment Variable" context="#stay" String="\$ENV\{\s*\w+\s*\}"/>
         <RegExpr attribute="CMake Variable" context="#stay" String="\$\{\s*\w+\s*\}"/>
-        <RegExpr attribute="Macros" context="Macro Args" String="\w+\s*(?=\()"/>
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="Command Args">
-        <DetectChar attribute="Normal Text" context="#pop" char=")"/>
-        <DetectChar attribute="Strings" context="String" char="&quot;"/>
         <keyword attribute="Special Args" context="#stay" String="special_args"/>
         <keyword attribute="Special Args" context="#stay" String="extra_special_args"/>
         <keyword attribute="Properties" context="#stay" String="properties"/>
         <keyword attribute="Properties" context="#stay" String="extra_properties"/>
-        <RegExpr attribute="Comment" context="#stay" String="#.*$"/>
-        <RegExpr attribute="Environment Variable" context="#stay" String="\$ENV\{\s*\w+\s*\}"/>
-        <RegExpr attribute="CMake Variable" context="#stay" String="\$\{\s*\w+\s*\}"/>
+        <IncludeRules context="Macro Args"/>
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="Macro Args">
         <DetectChar attribute="Normal Text" context="#pop" char=")"/>
+        <StringDetect attribute="Escapes" context="#stay" String="\&quot;"/>
         <DetectChar attribute="Strings" context="String" char="&quot;"/>
         <RegExpr attribute="Comment" context="#stay" String="#.*$"/>
-        <RegExpr attribute="Environment Variable" context="#stay" String="\$ENV\{\s*\w+\s*\}"/>
-        <RegExpr attribute="CMake Variable" context="#stay" String="\$\{\s*\w+\s*\}"/>
+        <IncludeRules context="Detect Variables"/>
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="Comment">
         <IncludeRules context="##Alerts" />
       </context>
       <context attribute="Strings" lineEndContext="#stay" name="String">
-        <DetectChar attribute="Strings" context="#pop" char="&quot;" />
+        <RegExpr attribute="Strings" context="#pop" String="&quot;(?=[ );]|$)" />
         <RegExpr attribute="Escapes" context="#stay" String="\\[&quot;$n\\]" />
-        <RegExpr attribute="Environment Variable" context="#stay" String="\$ENV\{\s*\w+\s*\}"/>
-        <RegExpr attribute="CMake Variable" context="#stay" String="\$\{\s*\w+\s*\}"/>
+        <IncludeRules context="Detect Variables"/>
       </context>
 
     </contexts>
diff --git a/kate/data/coffee.xml b/kate/data/coffee.xml
new file mode 100644
index 000000000..b56386a7a
--- /dev/null
+++ b/kate/data/coffee.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+
+<language name="CoffeeScript"
+          version="1.2"
+          kateversion="2.4"
+          section="Scripts"
+          extensions="Cakefile;*.coffee;*.coco"
+          mimetype="text/x-coffeescript;application/x-coffeescript"
+          indenter="python"
+          casesensitive="1"
+          author="Max Shawabkeh ([email protected])"
+          license="MIT">
+  <highlighting>
+    <!-- Built-in constants. -->
+    <list name="value_keywords">
+      <item>false</item>
+      <item>true</item>
+      <item>yes</item>
+      <item>no</item>
+      <item>on</item>
+      <item>off</item>
+      <item>undefined</item>
+      <item>null</item>
+      <item>NaN</item>
+      <item>Infinity</item>
+    </list>
+    <!-- Generic keywords. -->
+    <list name="keywords">
+      <item>return</item>
+      <item>break</item>
+      <item>continue</item>
+      <item>throw</item>
+      <item>for</item>
+      <item>while</item>
+      <item>until</item>
+      <item>loop</item>
+      <item>if</item>
+      <item>else</item>
+      <item>unless</item>
+      <item>switch</item>
+      <item>when</item>
+      <item>then</item>
+      <item>and</item>
+      <item>or</item>
+      <item>in</item>
+      <item>of</item>
+      <item>by</item>
+      <item>is</item>
+      <item>isnt</item>
+      <item>not</item>
+      <item>typeof</item>
+      <item>delete</item>
+      <item>where</item>
+      <item>super</item>
+      <item>try</item>
+      <item>catch</item>
+      <item>finally</item>
+      <item>try</item>
+      <item>catch</item>
+      <item>finally</item>
+      <item>constructor</item>
+    </list>
+    <!-- Keywords which are always followed by a class name. -->
+    <list name="class_keywords">
+      <item>class</item>
+      <item>extends</item>
+      <item>new</item>
+      <item>instanceof</item>
+    </list>
+    <!-- Reserved words. -->
+    <list name="reserved">
+      <item>case</item>
+      <item>default</item>
+      <item>function</item>
+      <item>var</item>
+      <item>void</item>
+      <item>with</item>
+      <item>const</item>
+      <item>let</item>
+      <item>enum</item>
+      <item>export</item>
+      <item>import</item>
+      <item>native</item>
+      <item>__hasProp</item>
+      <item>__extends</item>
+      <item>__slice</item>
+      <item>__bind</item>
+      <item>__indexOf</item>
+    </list>
+    <!-- Built-in globals provided in most contexts. -->
+    <list name="globals">
+      <item>Object</item>
+      <item>Number</item>
+      <item>Boolean</item>
+      <item>Array</item>
+      <item>String</item>
+      <item>RegExp</item>
+      <item>Function</item>
+      <item>Date</item>
+      <item>Math</item>
+      <item>eval</item>
+      <item>setInterval</item>
+      <item>clearInterval</item>
+      <item>setTimeout</item>
+      <item>clearTimeout</item>
+      <item>isFinite</item>
+      <item>isNaN</item>
+      <item>parseFloat</item>
+      <item>parseInt</item>
+      <item>escape</item>
+      <item>unescape</item>
+      <item>console</item>
+      <item>encodeURI</item>
+      <item>encodeURIComponent</item>
+      <item>decodeURI</item>
+      <item>decodeURIComponent</item>
+    </list>
+    <!-- Built-in globals provided in browser context. -->
+    <list name="browser_globals">
+      <item>window</item>
+      <item>document</item>
+      <item>navigator</item>
+      <item>location</item>
+      <item>history</item>
+      <item>screen</item>
+      <item>alert</item>
+      <item>prompt</item>
+    </list>
+    <!-- Built-in globals provided in Node.js context. -->
+    <list name="nodejs_globals">
+      <item>process</item>
+      <item>GLOBAL</item>
+      <item>require</item>
+      <item>exports</item>
+    </list>
+    <!-- Context-sensitive highlighting rules. -->
+    <contexts>
+      <!-- Generic code. -->
+      <context name="Normal" attribute="Normal" lineEndContext="#stay">
+        <DetectSpaces/>
+        <!-- Numbers. -->
+        <Float attribute="Float" context="#stay"/>
+        <Int attribute="Decimal" context="#stay"/>
+        <HlCOct attribute="Oct" context="#stay"/>
+        <HlCHex attribute="Hex" context="#stay"/>
+        <!-- Keywords. -->
+        <keyword attribute="Keyword" context="#stay" String="keywords"/>
+        <keyword attribute="Keyword" context="Class" String="class_keywords"/>
+        <keyword attribute="Value Keywords" context="#stay" String="value_keywords"/>
+        <keyword attribute="Reserved" context="#stay" String="reserved"/>
+        <!-- Globals. -->
+        <keyword attribute="Globals" context="#stay" String="globals"/>
+        <keyword attribute="Browser Globals" context="#stay" String="browser_globals"/>
+        <keyword attribute="Node.js Globals" context="#stay" String="nodejs_globals"/>
+        <!-- Member accessors. -->
+        <RegExpr attribute="Accessor" context="#stay" String="(@[_$a-zA-Z][$\w]+|\bthis)\b" insensitive="false"/>
+        <!-- Function definitions. Matches an optional argument list followed by a function arrow (normal or fat). -->
+        <RegExpr attribute="Function" context="#stay" String="(\((\'[^']*'|&quot;[^&quot;]*&quot;|[^()])*\))?\s*(-|=)&gt;" insensitive="true"/>
+        <!-- Generic identifiers. -->
+        <RegExpr attribute="Identifier" context="#stay" String="[_$a-z][$\w]+\b" insensitive="true"/>
+        <!-- Strings. -->
+        <StringDetect attribute="String" context="Heredoc" String="'''" beginRegion="Heredoc"/>
+        <StringDetect attribute="String" context="Rich Heredoc" String="&quot;&quot;&quot;" beginRegion="Rich Heredoc"/>
+        <DetectChar attribute="String" context="String" char="'"/>
+        <DetectChar attribute="String" context="Rich String" char="&quot;"/>
+        <!-- Embedded JavaScript. -->
+        <DetectChar attribute="Javascript" context="Javascript" char="`" beginRegion="Javascript"/>
+        <!-- Comments. -->
+        <StringDetect attribute="Comment" context="Multiline Comment" String="###" beginRegion="Comment"/>
+        <DetectChar attribute="Comment" context="Comment" char="#"/>
+        <!-- Regular expressions. -->
+        <RegExpr attribute="Regex" context="Multiline Regex" String="///" beginRegion="Multiline Regex"/>
+        <RegExpr attribute="Regex" context="#stay" String="/([^/\\\r\n]|\\.)*/[mig]{0,3}"/>
+        <!-- Operators and other non-alphanumeric symbols. -->
+        <AnyChar attribute="Symbol" context="#stay" String="():!%&amp;+,-/.*&lt;=&gt;?[]|~^&#59;{}"/>
+      </context>
+      <!-- Multiline regular expressions. -->
+      <context name="Multiline Regex" attribute="Regex" lineEndContext="#stay" noIndentationBasedFolding="1">
+        <HlCStringChar attribute="Regex" context="#stay"/>
+        <DetectChar attribute="Comment" context="Comment" char="#"/>
+        <RegExpr attribute="Regex" context="#pop" String="///[mig]{0,3}" endRegion="Multiline Regex"/>
+      </context>
+      <!-- Class names. -->
+      <context name="Class" attribute="Normal" lineEndContext="#stay">
+        <DetectSpaces/>
+        <RegExpr attribute="Class" context="#pop" String="[@$:.\w\[\]]+"/>
+      </context>
+      <!-- Comments. -->
+      <context name="Comment" attribute="Comment" lineEndContext="#pop">
+        <IncludeRules context="##Alerts_indent"/>
+      </context>
+      <context name="Multiline Comment" attribute="Comment" lineEndContext="#stay" noIndentationBasedFolding="1">
+        <StringDetect attribute="Comment" context="#pop" String="###" endRegion="Comment"/>
+        <IncludeRules context="##Alerts_indent"/>
+      </context>
+      <!-- Single-line strings. -->
+      <context name="String" attribute="String" lineEndContext="#stay">
+        <HlCStringChar attribute="String" context="#stay"/>
+        <DetectChar attribute="String" context="#pop" char="'"/>
+      </context>
+      <context name="Rich String" attribute="String" lineEndContext="#stay">
+        <HlCStringChar attribute="String" context="#stay"/>
+        <Detect2Chars attribute="Embedding" context="Embedding" char="#" char1="{"/>
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+      </context>
+      <!-- Multi-line strings. -->
+      <context name="Heredoc" attribute="String" lineEndContext="#stay" noIndentationBasedFolding="1">
+        <HlCStringChar attribute="String" context="#stay"/>
+        <StringDetect attribute="String" context="#pop" String="'''" endRegion="Heredoc"/>
+      </context>
+      <context name="Rich Heredoc" attribute="String" lineEndContext="#stay" noIndentationBasedFolding="1">
+        <HlCStringChar attribute="String" context="#stay"/>
+        <Detect2Chars attribute="Embedding" context="Embedding" char="#" char1="{"/>
+        <StringDetect attribute="String" context="#pop" String="&quot;&quot;&quot;" endRegion="Rich Heredoc"/>
+      </context>
+      <!-- Expressions embedded in strings. -->
+      <context name="Embedding" attribute="Normal" lineEndContext="#stay">
+        <DetectChar attribute="Embedding" context="#pop" char="}"/>
+      </context>
+      <!-- Embedded Javascript. -->
+      <context name="Javascript" attribute="Javascript" lineEndContext="#stay" noIndentationBasedFolding="1">
+        <DetectChar attribute="Javascript" context="#pop" char="`" endRegion="Javascript"/>
+        <!-- NOTE: This hides errors where a backtick is embedded in a JS string. -->
+        <IncludeRules context="##JavaScript" includeAttrib="true"/>
+      </context>
+    </contexts>
+    <!-- Style mappings. -->
+    <itemDatas>
+      <itemData name="Normal" defStyleNum="dsNormal" spellChecking="false"/>
+      <itemData name="Identifier" defStyleNum="dsNormal" spellChecking="false"/>
+      <itemData name="Keyword" defStyleNum="dsKeyword" spellChecking="false"/>
+      <itemData name="Function" defStyleNum="dsFunction" spellChecking="false"/>
+      <itemData name="Decimal" defStyleNum="dsDecVal" spellChecking="false"/>
+      <itemData name="Float" defStyleNum="dsFloat" spellChecking="false"/>
+      <itemData name="Oct" defStyleNum="dsBaseN" spellChecking="false"/>
+      <itemData name="Hex" defStyleNum="dsBaseN" spellChecking="false"/>
+      <itemData name="String" defStyleNum="dsString" spellChecking="false"/>
+      <itemData name="Comment" defStyleNum="dsComment" spellChecking="true"/>
+      <itemData name="Symbol" defStyleNum="dsKeyword" spellChecking="false"/>
+      <itemData name="Embedding" defStyleNum="dsChar" spellChecking="false"/>
+      <itemData name="Accessor" defStyleNum="dsDataType" spellChecking="false"/>
+      <itemData name="Class" defStyleNum="dsDataType" spellChecking="false" bold="1"/>
+      <itemData name="Javascript" defStyleNum="dsAlert" spellChecking="false" italic="1"/>
+      <itemData name="Regex" defStyleNum="dsString" spellChecking="false"/>
+      <itemData name="Reserved" defStyleNum="dsAlert" spellChecking="false"/>
+      <itemData name="Value Keywords" defStyleNum="dsOthers" spellChecking="false"/>
+      <itemData name="Globals" defStyleNum="dsOthers" spellChecking="false"/>
+      <!-- Context-sensitive globals - not styled by default. -->
+      <itemData name="Browser Globals" defStyleNum="dsNormal" spellChecking="false"/>
+      <itemData name="Node.js Globals" defStyleNum="dsNormal" spellChecking="false"/>
+    </itemDatas>
+  </highlighting>
+  <!-- Global settings. -->
+  <general>
+    <indentation mode="python"/>
+    <folding indentationsensitive="1"/>
+    <comments>
+      <comment name="singleLine" start="#"/>
+      <comment name="multiLine" start="###" end="###" region="Comment"/>
+    </comments>
+    <keywords casesensitive="1" additionalDeliminator="#'"/>
+    <emptyLines>
+      <emptyLine regexpr="(?:\s+|\s*#.*)"/>
+    </emptyLines>
+  </general>
+</language>
diff --git a/kate/data/commonlisp.xml b/kate/data/commonlisp.xml
index 19db0c937..563e56002 100644
--- a/kate/data/commonlisp.xml
+++ b/kate/data/commonlisp.xml
@@ -23,7 +23,7 @@
  * Boston, MA  02110-1301, USA.                                       *
  **********************************************************************
  -->
-<language version="1.04" kateversion="2.3" name="Common Lisp" section="Scripts" extensions="*.lisp;*.cl;*.lsp" mimetype="" author="Dominik Haumann ([email protected])" license="LGPL">
+<language version="1.05" kateversion="2.3" name="Common Lisp" section="Sources" extensions="*.lisp;*.cl;*.lsp" mimetype="" author="Dominik Haumann ([email protected])" license="LGPL">
   <highlighting>
     <list name="symbols">
       <item> &lt; </item>
diff --git a/kate/data/cpp.xml b/kate/data/cpp.xml
index 6007caf73..4b27772dd 100644
--- a/kate/data/cpp.xml
+++ b/kate/data/cpp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <language name="C++" section="Sources"
-          version="1.44" kateversion="2.4"
+          version="1.49" kateversion="2.4"
           indenter="cstyle"
           mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr"
           extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc"
@@ -20,8 +20,10 @@
       <item> case </item>
       <item> catch </item>
       <item> class </item>
+      <item> constexpr </item>
       <item> const_cast </item>
       <item> continue </item>
+      <item> decltype </item>
       <item> default </item>
       <item> delete </item>
       <item> do </item>
@@ -39,6 +41,7 @@
       <item> inline </item>
       <item> namespace </item>
       <item> new </item>
+      <item> nullptr </item>
       <item> operator </item>
       <item> private </item>
       <item> protected </item>
@@ -47,6 +50,7 @@
       <item> reinterpret_cast </item>
       <item> return </item>
       <item> sizeof </item>
+      <item> static_assert </item>
       <item> static_cast </item>
       <item> struct </item>
       <item> switch </item>
@@ -77,9 +81,6 @@
       <item> or_eq </item>
       <item> xor </item>
       <item> xor_eq </item>
-      <item> except </item>
-      <item> finally </item>
-      <item> xalloc </item>
     </list>
     <list name="extensions">
       <item> K_DCOP </item>
@@ -155,6 +156,8 @@
       <item> auto </item>
       <item> bool </item>
       <item> char </item>
+      <item> char16_t </item>
+      <item> char32_t </item>
       <item> const </item>
       <item> double </item>
       <item> float </item>
@@ -183,7 +186,7 @@
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
         <DetectSpaces />
-        <RegExpr attribute="Preprocessor" context="Outscoped" String="#\s*if\s+0" beginRegion="PP" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Outscoped" String="#\s*if\s+0\s*$" beginRegion="PP" firstNonSpace="true" />
         <DetectChar context="AfterHash" char="#" firstNonSpace="true" lookAhead="true" />
         <StringDetect attribute="Region Marker" context="Region Marker" String="//BEGIN" beginRegion="Region1" firstNonSpace="true" />
         <StringDetect attribute="Region Marker" context="Region Marker" String="//END" endRegion="Region1" firstNonSpace="true" />
@@ -272,7 +275,6 @@
         <DetectSpaces />
         <IncludeRules context="##Alerts" />
         <DetectIdentifier />
-        <DetectChar attribute="String" context="String" char="&quot;"/>
         <IncludeRules context="##Doxygen" />
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
@@ -294,23 +296,23 @@
       </context>
     </contexts>
     <itemDatas>
-      <itemData name="Normal Text"  defStyleNum="dsNormal"/>
-      <itemData name="Keyword"      defStyleNum="dsKeyword"/>
-      <itemData name="Extensions"   defStyleNum="dsKeyword" color="#0095ff" selColor="#ffffff" bold="1" italic="0"/>
-      <itemData name="Data Type"    defStyleNum="dsDataType"/>
-      <itemData name="Decimal"      defStyleNum="dsDecVal"/>
-      <itemData name="Octal"        defStyleNum="dsBaseN"/>
-      <itemData name="Hex"          defStyleNum="dsBaseN"/>
-      <itemData name="Float"        defStyleNum="dsFloat"/>
-      <itemData name="Char"         defStyleNum="dsChar"/>
+      <itemData name="Normal Text"  defStyleNum="dsNormal" spellChecking="false"/>
+      <itemData name="Keyword"      defStyleNum="dsKeyword" spellChecking="false"/>
+      <itemData name="Extensions"   defStyleNum="dsKeyword" color="#0095ff" selColor="#ffffff" bold="1" italic="0" spellChecking="false"/>
+      <itemData name="Data Type"    defStyleNum="dsDataType" spellChecking="false"/>
+      <itemData name="Decimal"      defStyleNum="dsDecVal" spellChecking="false"/>
+      <itemData name="Octal"        defStyleNum="dsBaseN" spellChecking="false"/>
+      <itemData name="Hex"          defStyleNum="dsBaseN" spellChecking="false"/>
+      <itemData name="Float"        defStyleNum="dsFloat" spellChecking="false"/>
+      <itemData name="Char"         defStyleNum="dsChar" spellChecking="false"/>
       <itemData name="String"       defStyleNum="dsString"/>
       <itemData name="String Char"  defStyleNum="dsChar"/>
       <itemData name="Comment"      defStyleNum="dsComment"/>
-      <itemData name="Symbol"       defStyleNum="dsNormal"/>
-      <itemData name="Preprocessor" defStyleNum="dsOthers"/>
-      <itemData name="Prep. Lib"    defStyleNum="dsOthers"/>
-      <itemData name="Region Marker" defStyleNum="dsRegionMarker" />
-      <itemData name="Error"        defStyleNum="dsError" />
+      <itemData name="Symbol"       defStyleNum="dsNormal" spellChecking="false"/>
+      <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/>
+      <itemData name="Prep. Lib"    defStyleNum="dsOthers" spellChecking="false"/>
+      <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
+      <itemData name="Error"        defStyleNum="dsError" spellChecking="false"/>
     </itemDatas>
   </highlighting>
   <general>
diff --git a/kate/data/crk.xml b/kate/data/crk.xml
new file mode 100644
index 000000000..640a9cf3c
--- /dev/null
+++ b/kate/data/crk.xml
@@ -0,0 +1,146 @@
+<!DOCTYPE language SYSTEM "language.dtd">
+<language name="Crack" version="1.1" kateversion="2.3" section="Sources" extensions="*.crk" mimetype="">
+  <highlighting>
+    <list name="keywords">
+      <item> break</item>
+      <item> catch</item>
+      <item> class</item>
+      <item> continue</item>
+      <item> else</item>
+      <item> false</item>
+      <item> for</item>
+      <item> if</item>
+      <item> in</item>
+      <item> is</item>
+      <item> null</item>
+      <item> oper</item>
+      <item> return</item>
+      <item> this</item>
+      <item> true</item>
+      <item> try</item>
+      <item> typeof</item>
+      <item> while</item>
+    </list>
+    <list name="types">
+      <item> bool</item>
+      <item> byte</item>
+      <item> int32</item>
+      <item> int64</item>
+      <item> uint32</item>
+      <item> uint64</item>
+      <item> float32</item>
+      <item> float64</item>
+      <item> int</item>
+      <item> uint</item>
+      <item> intz</item>
+      <item> uintz</item>
+      <item> float</item>
+      <item> void</item>
+    </list>
+    <contexts>
+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
+        <keyword attribute="Keyword" context="#stay" String="keywords"/>
+        <StringDetect attribute="Keyword" context="Package" String="import" />
+        <keyword attribute="Data Type" context="#stay" String="types" />
+        <Float attribute="Float" context="#stay">
+          <AnyChar String="fF" attribute="Float" context="#stay"/>
+        </Float>
+        <HlCOct attribute="Octal" context="#stay"/>
+        <HlCHex attribute="Hex" context="#stay"/>
+        <Int attribute="Decimal" context="#stay" >
+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+        </Int>
+        <DetectChar attribute="String" context="Single quoted String" char="'"/>
+        <DetectChar attribute="String" context="String" char="&quot;"/>
+        <DetectChar attribute="String" context="Backtick String" char="`"/>
+        <Detect2Chars attribute="Char" context="Char" char="b" char1="'" />
+        <IncludeRules context="##Doxygen" />
+        <DetectChar attribute="Comment" context="Commentar 1" char="#" />
+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="/"/>
+        <Detect2Chars attribute="Comment" context="Commentar 3" char="/" char1="*"/>
+        <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="block1"/>
+        <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="block1"/>
+        <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
+        <RegExpr attribute="Function" context="#stay" String="\b[_\w][_\w\d]*(?=[\s]*[(])" />
+        <RegExpr attribute="Symbol" context="Member" String="[.]{1,1}" />
+      </context>
+
+      <context attribute="String" lineEndContext="#pop" name="String">
+        <LineContinue attribute="String" context="#pop"/>
+        <HlCStringChar attribute="Char" context="#stay"/>
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+      </context>
+
+      <context attribute="String" lineEndContext="#pop" name="Single quoted String">
+        <LineContinue attribute="String" context="#pop"/>
+        <HlCStringChar attribute="Char" context="#stay"/>
+        <DetectChar attribute="String" context="#pop" char="'"/>
+      </context>
+
+      <context attribute="String" lineEndContext="#stay" name="Backtick String">
+        <HlCStringChar attribute="Char" context="#stay"/>
+        <Detect2Chars attribute="Substitution" char="$" char1="(" context="Subst"/>
+        <DetectChar attribute="Substitution" char="$" context="Short Subst"/>
+        <DetectChar attribute="String" context="#pop" char="`"/>
+      </context>
+
+      <context attribute="Char" lineEndContext="#pop" name="Char">
+        <HlCStringChar attribute="Char" context="#stay" />
+        <DetectChar attribute="Char" context="#pop" char="'" />
+      </context>
+
+      <context name="Subst" attribute="Normal Text" lineEndContext="#stay">
+        <DetectChar attribute="Substitution" char=")" context="#pop"/>
+        <!-- Highlight substitution as code. -->
+        <IncludeRules context="Normal"/>
+      </context>
+
+      <context name="Short Subst" attribute="Substitution" lineEndContext="#pop">
+        <RegExpr attribute="Substitution" String="\w(?!\w)" context="#pop"/>
+      </context>
+
+      <context name="Package" attribute="Package" lineEndContext="#pop">
+        <RegExpr attribute="Package" String="[\w\\.]+" context="#pop"/>
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#pop" name="Member" fallthrough="true" fallthroughContext="#pop">
+        <RegExpr attribute="Function" context="#pop" String="\b[_\w][_\w\d]*(?=[\s]*)" />
+      </context>
+
+      <context attribute="Comment" lineEndContext="#pop" name="Commentar 1"/>
+      <context attribute="Comment" lineEndContext="#pop" name="Commentar 2"/>
+      <context attribute="Comment" lineEndContext="#stay" name="Commentar 3">
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/"/>
+      </context>
+    </contexts>
+    <itemDatas>
+      <itemData name="Normal Text"  defStyleNum="dsNormal"/>
+      <itemData name="Keyword"      defStyleNum="dsKeyword"/>
+      <itemData name="Data Type"    defStyleNum="dsDataType"/>
+      <itemData name="Decimal"      defStyleNum="dsDecVal"/>
+      <itemData name="Octal"        defStyleNum="dsBaseN"/>
+      <itemData name="Hex"          defStyleNum="dsBaseN"/>
+      <itemData name="Float"        defStyleNum="dsFloat"/>
+      <itemData name="Char"         defStyleNum="dsChar"/>
+      <itemData name="String"       defStyleNum="dsString"/>
+      <itemData name="Comment"      defStyleNum="dsComment"/>
+      <itemData name="Symbol"       defStyleNum="dsNormal"/>
+      <itemData name="Substitution" defStyleNum="dsOthers"/>
+      <itemData name="Package"      defStyleNum="dsFunction"/>
+      <itemData name="Function"      defStyleNum="dsFunction"/>
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name="singleLine" start="#" />
+    </comments>
+    <keywords casesensitive="1" />
+  </general>
+</language>
diff --git a/kate/data/cs.xml b/kate/data/cs.xml
index 3393aa204..260434c9b 100644
--- a/kate/data/cs.xml
+++ b/kate/data/cs.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="C#" version="1.14" kateversion="2.3" section="Sources" extensions="*.cs" mimetype="text/x-csharp-src;text/x-csharp-hde">
+<language name="C#" version="1.15" kateversion="2.3" section="Sources" extensions="*.cs" mimetype="text/x-csharp-src;text/x-csharp-hde">
   <highlighting>
     <list name="keywords">
       <item> abstract</item>
@@ -116,6 +116,11 @@
         <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*"/>
         <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="block1"/>
         <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="block1"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bpartial(?=\s+(class|struct|interface|void))"/>
+        <RegExpr attribute="Data Type" context="#stay" String="\bvar(?=\s+\w+\s*=\s*\w+)"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\byield(?=\s+(return|break))"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\b(set|get)(?=\s*[;{])"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bglobal(?=\s*::\s*\w+)"/>
         <RegExpr attribute="Decimal" context="#stay" String="#region.*$" beginRegion="Region1"/>
         <RegExpr attribute="Decimal" context="#stay" String="#endregion.*$" endRegion="Region1"/>
         <RegExpr attribute="Function" context="#stay" String="\b[_\w][_\w\d]*(?=[\s]*[(])" />
diff --git a/kate/data/css.xml b/kate/data/css.xml
index 6b24dba0f..02ab43036 100644
--- a/kate/data/css.xml
+++ b/kate/data/css.xml
@@ -8,6 +8,9 @@
 
     Changelog:
 
+    - Version 2.03, by Milian Wolff:
+        - Make it spelling aware
+
     - Version 2.02, by Rafał Miłecki:
         - Added CSS 3 properties "border-*-image" and "border-*-radius".
         - Added CSS values "clip", "ellipsis" and "ellipsis-word".
@@ -25,7 +28,8 @@
 
 -->
 
-<language name="CSS" version="2.02" kateversion="2.4" section="Markup" extensions="*.css" mimetype="text/css" author="Wilbert Berendsen ([email protected])" license="LGPL">
+<language name="CSS" version="2.05" kateversion="2.4" section="Markup" extensions="*.css" indenter="cstyle"
+          mimetype="text/css" author="Wilbert Berendsen ([email protected])" license="LGPL">
 
   <highlighting>
     <list name="properties">
@@ -413,10 +417,10 @@
       <item> monospace </item>
       <item> border-box </item>
       <item> content-box </item>
-      
+
       <!-- Gecko rendering engine CSS value extensions -->
-      <item> -moz-box </item>      
-      
+      <item> -moz-box </item>
+
     </list>
 
 
@@ -424,6 +428,7 @@
       <item> aqua </item>
       <item> black </item>
       <item> blue </item>
+      <item> cyan </item>
       <item> fuchsia </item>
       <item> gray </item>
       <item> green </item>
@@ -481,10 +486,10 @@
       <!-- in @font-face -->
       <item> local </item>
       <item> format </item>
-      
+
       <!-- Trident (a.k.a., MSHTML) rendering engine functional notation extensions -->
       <item> expression </item>
-      
+
     </list>
 
     <list name="mediatypes">
@@ -557,7 +562,7 @@
 
       <!-- finds arguments to properties -->
       <context attribute="Normal Text" lineEndContext="#stay" name="FindValues">
-	<RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+(em|ex|px|in|cm|mm|pt|pc|deg|rad|grad|ms|s|Hz|kHz)\b" />
+	<RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+(em|ex|ch|rem|vw|vh|vm|px|in|cm|mm|pt|pc|deg|rad|grad|turn|ms|s|Hz|kHz)\b" />
 	<RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+[%]?" />
 	<RegExpr attribute="Normal Text" context="#stay" String="[\w\-]+" />
       </context>
@@ -672,22 +677,22 @@
 
     </contexts>
     <itemDatas>
-      <itemData name="Normal Text" defStyleNum="dsNormal"/>
-      <itemData name="Property"  defStyleNum="dsKeyword"/>
-      <itemData name="Unknown Property"  defStyleNum="dsKeyword" italic="1"/>
-      <itemData name="Media"  defStyleNum="dsDecVal" bold="1"/>
-      <itemData name="At Rule"  defStyleNum="dsDecVal" />
-      <itemData name="String"  defStyleNum="dsString" />
-      <itemData name="Value"  defStyleNum="dsDataType" />
-      <itemData name="Important" defStyleNum="dsKeyword" />
-      <itemData name="Selector Attr" defStyleNum="dsChar" />
-      <itemData name="Selector Id"  defStyleNum="dsFloat" bold="1"/>
-      <itemData name="Selector Class"  defStyleNum="dsFloat" />
-      <itemData name="Selector Pseudo"  defStyleNum="dsDecVal" />
+      <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
+      <itemData name="Property"  defStyleNum="dsKeyword" spellChecking="false"/>
+      <itemData name="Unknown Property"  defStyleNum="dsKeyword" italic="1" spellChecking="false"/>
+      <itemData name="Media"  defStyleNum="dsDecVal" bold="1" spellChecking="false"/>
+      <itemData name="At Rule"  defStyleNum="dsDecVal" spellChecking="false"/>
+      <itemData name="String"  defStyleNum="dsString"/>
+      <itemData name="Value"  defStyleNum="dsDataType" spellChecking="false"/>
+      <itemData name="Important" defStyleNum="dsKeyword" spellChecking="false"/>
+      <itemData name="Selector Attr" defStyleNum="dsChar" spellChecking="false"/>
+      <itemData name="Selector Id"  defStyleNum="dsFloat" bold="1" spellChecking="false"/>
+      <itemData name="Selector Class"  defStyleNum="dsFloat" spellChecking="false"/>
+      <itemData name="Selector Pseudo"  defStyleNum="dsDecVal" spellChecking="false"/>
       <itemData name="Comment" defStyleNum="dsComment" />
-      <itemData name="Region Marker" defStyleNum="dsRegionMarker"/>
-      <itemData name="Alert" defStyleNum="dsAlert"/>
-      <itemData name="Error" defStyleNum="dsError"/>
+      <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
+      <itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/>
+      <itemData name="Error" defStyleNum="dsError" spellChecking="false"/>
     </itemDatas>
   </highlighting>
   <general>
diff --git a/kate/data/d.xml b/kate/data/d.xml
index 500c6e748..d40c413a3 100644
--- a/kate/data/d.xml
+++ b/kate/data/d.xml
@@ -101,7 +101,7 @@
    ========================================================================
 -->
 
-<language name="D" version="1.61" kateversion="2.5" section="Sources" extensions="*.d;*.D;*.di;*.DI;" mimetype="text/x-dsrc" casesensitive="true" author="Diggory Hardy ([email protected]), Aziz Köksal ([email protected]), Jari-Matti Mäkelä ([email protected]), Simon J Mackenzie ([email protected])" license="LGPL">
+<language name="D" version="1.62" kateversion="2.5" section="Sources" extensions="*.d;*.D;*.di;*.DI;" mimetype="text/x-dsrc" casesensitive="true" author="Diggory Hardy ([email protected]), Aziz Köksal ([email protected]), Jari-Matti Mäkelä ([email protected]), Simon J Mackenzie ([email protected])" license="LGPL">
   <highlighting>
     <!-- User-defined keywords (add identifiers you'd like highlighted here) -->
     <list name="userkeywords">
@@ -143,6 +143,7 @@
       <item> const </item>
       <item> export </item>
       <item> final </item>
+      <item> immutable </item>
       <item> inout </item>
       <item> invariant </item>
       <item> lazy </item>
diff --git a/kate/data/debianchangelog.xml b/kate/data/debianchangelog.xml
index 5bf44072b..bfa265ddf 100644
--- a/kate/data/debianchangelog.xml
+++ b/kate/data/debianchangelog.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Debian Changelog" version="0.63" kateversion="2.4" section="Other" extensions="" mimetype="">
+<language name="Debian Changelog" version="0.65" kateversion="2.4" section="Other" extensions="" mimetype="">
     <highlighting>
         <list name="keywords">
             <item>urgency</item>
         </list>
 
         <list name="distributions">
+            <item>oldstable</item>
+            <item>oldstable-security</item>
+            <item>oldstable-proposed-updates</item>
             <item>stable</item>
             <item>stable-security</item>
             <item>testing</item>
+            <item>testing-security</item>
             <item>testing-proposed-updates</item>
             <item>frozen</item>
             <item>unstable</item>
@@ -21,7 +25,10 @@
             <item>etch-backports</item>
             <item>etch-volatile</item>
             <item>lenny-backports</item>
+            <item>lenny-backports-sloppy</item>
             <item>lenny-volatile</item>
+            <item>squeeze-backports</item>
+            <item>squeeze-volatile</item>
             <!-- Ubuntu releases -->
             <item>dapper</item>
             <item>dapper-security</item>
@@ -70,7 +77,21 @@
             <item>karmic-proposed</item>
             <item>karmic-updates</item>
             <item>karmic-backports</item>
-            <item>karmic-partner</item>
+            <item>lucid</item>
+            <item>lucid-security</item>
+            <item>lucid-proposed</item>
+            <item>lucid-updates</item>
+            <item>lucid-backports</item>
+            <item>maverick</item>
+            <item>maverick-security</item>
+            <item>maverick-proposed</item>
+            <item>maverick-updates</item>
+            <item>maverick-backports</item>
+            <item>natty</item>
+            <item>natty-security</item>
+            <item>natty-proposed</item>
+            <item>natty-updates</item>
+            <item>natty-backports</item>
         </list>
 
         <list name="urgencies">
diff --git a/kate/data/debiancontrol.xml b/kate/data/debiancontrol.xml
index 83fb40883..8c34c64ca 100644
--- a/kate/data/debiancontrol.xml
+++ b/kate/data/debiancontrol.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Debian Control" version="0.83" kateversion="2.4" section="Other" extensions="control" mimetype="">
+<language name="Debian Control" version="0.84" kateversion="2.4" section="Other" extensions="control" mimetype="">
     <highlighting>
         <contexts>
             <context attribute="Normal Text" lineEndContext="#stay" name="INIT">
@@ -16,12 +16,13 @@
                 <StringDetect attribute="Keyword" context="DependencyField" String="Build-Depends-Indep:"/>
                 <StringDetect attribute="Keyword" context="DependencyField" String="Build-Conflicts:"/>
                 <StringDetect attribute="Keyword" context="DependencyField" String="Build-Conflicts-Indep:"/>
+                <StringDetect attribute="Keyword" context="DependencyField" String="Breaks:"/>
                 <RegExpr attribute="Keyword" context="Field" minimal="true" String="[^ ]*:" column="0"/>
                 <DetectChar attribute="Value" context="Field" char=" " column="0"/>
             </context>
 
             <context attribute="Value" lineEndContext="#pop" name="Field">
-                <RegExpr attribute="Email" context="#stay" String="&lt;.*@.*&gt;"/>
+                <RegExpr attribute="Email" context="#stay" String="&lt;.*@.*&gt;" minimal="true"/>
                 <Detect2Chars attribute="Keyword" context="Variable" char="$" char1="{"/>
             </context>
 
@@ -30,7 +31,7 @@
             </context>
 
             <context attribute="Value" lineEndContext="#pop" name="DependencyField">
-                <RegExpr attribute="Email" context="#stay" String="&lt;.*@.*&gt;"/>
+                <RegExpr attribute="Email" context="#stay" String="&lt;.*@.*&gt;" minimal="true"/>
                 <Detect2Chars attribute="Keyword" context="Variable" char="$" char1="{"/>
                 <RegExpr attribute="Keyword" context="#stay" String="[,\|]"/>
                 <DetectChar attribute="Keyword" context="Constrain" char="("/>
@@ -56,6 +57,9 @@
     </highlighting>
 
     <general>
+        <comments>
+            <comment name="singleLine" start="#"/>
+        </comments>
         <keywords casesensitive="1" />
     </general>
 </language>
diff --git a/kate/data/djangotemplate.xml b/kate/data/djangotemplate.xml
index 2e817adf8..5189f86ea 100644
--- a/kate/data/djangotemplate.xml
+++ b/kate/data/djangotemplate.xml
@@ -4,7 +4,7 @@
 	<!ENTITY name    "[A-Za-z_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-<language name="Django HTML Template" version="1.2" kateversion="2.4" section="Markup" extensions="*.htm;*.html" mimetype="text/html"  author="Matthew Marshall ([email protected])" license="LGPL" priority="9">
+<language name="Django HTML Template" version="1.3" kateversion="2.4" section="Markup" extensions="*.htm;*.html" mimetype="text/html"  author="Matthew Marshall ([email protected])" license="LGPL" priority="9">
 
 <!--
     Based off of the katepart html syntax highlighting by Wilbert Berendsen.
@@ -23,6 +23,7 @@
     <item>ifchanged</item>
     <item>blocktrans</item>
     <item>spaceless</item>
+    <item>autoescape</item>
 </list>
 
 <list name="endblocktags">
@@ -34,6 +35,7 @@
     <item>endifchanged</item>
     <item>endblocktrans</item>
     <item>endspaceless</item>
+    <item>endautoescape</item>
 </list>
 
 <contexts>
diff --git a/kate/data/dosbat.xml b/kate/data/dosbat.xml
new file mode 100644
index 000000000..c99a11a1b
--- /dev/null
+++ b/kate/data/dosbat.xml
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+        <!ENTITY label    "[^\s]+">
+        <!ENTITY eos      "(?=($|\s))">                         <!-- eol or space following -->
+        <!ENTITY noword   "(?![\w$+-])">                        <!-- no word, $, + or - following -->
+        <!ENTITY varname  "[A-Za-z_][A-Za-z0-9_]*">             <!-- valid character in a variable name -->
+        <!ENTITY eop      "(?=([\s\\;&quot;&#37;]|$))">         <!-- end of path -->
+        <!ENTITY pathpart "[^\s\\&#37;;/:\*\?&quot;&gt;&lt;\|]"> <!-- valid character in a file name -->
+]>
+<language name="MS-DOS Batch" version="0.2" kateversion="2.4" section="Scripts" extensions="*.bat" mimetype="application/x-dos" casesensitive="0" author="Matthew Woehlke ([email protected])" license="LGPL">
+
+<!-- (c) 2006, 2009, 2010 Matthew Woehlke ([email protected])
+    Released under the LGPL -->
+
+  <highlighting>
+    <list name="builtins">
+      <item> assoc </item>
+      <item> break </item>
+      <item> call </item>
+      <item> cd </item>
+      <item> chdir </item>
+      <item> cls </item>
+      <item> color </item>
+      <item> copy </item>
+      <item> date </item>
+      <item> del </item>
+      <item> dir </item>
+      <item> endlocal </item>
+      <item> erase </item>
+      <item> exit </item>
+      <item> ftype </item>
+      <item> md </item>
+      <item> mkdir </item>
+      <item> move </item>
+      <item> path </item>
+      <item> pause </item>
+      <item> popd </item>
+      <item> prompt </item>
+      <item> pushd </item>
+      <item> rd </item>
+      <item> ren </item>
+      <item> rename </item>
+      <item> rmdir </item>
+      <item> setlocal </item>
+      <item> shift </item>
+      <item> start </item>
+      <item> time </item>
+      <item> title </item>
+      <item> type </item>
+      <item> ver </item>
+      <item> verify </item>
+      <item> vol </item>
+    </list>
+
+    <!-- these need special handling -->
+    <list name="echo"><item> echo </item></list>
+    <list name="else"><item> else </item></list>
+    <list name="for"><item> for </item></list>
+    <list name="in"><item> in </item></list>
+    <list name="do"><item> do </item></list>
+    <list name="goto"><item> goto </item></list>
+    <list name="if"><item> if </item></list>
+    <list name="not"><item> not </item></list>
+    <list name="set"><item> set </item></list>
+
+    <list name="commands">
+      <!-- the basics -->
+      <item> at </item>
+      <item> attrib </item>
+      <item> break </item>
+      <item> cacls </item>
+      <item> chcp </item>
+      <item> chkdsk </item>
+      <item> chkntfs </item>
+      <item> cmd </item>
+      <item> comp </item>
+      <item> compact </item>
+      <item> convert </item>
+      <item> diskcomp </item>
+      <item> diskcopy </item>
+      <item> doskey </item>
+      <item> fc </item>
+      <item> find </item>
+      <item> findstr </item>
+      <item> format </item>
+      <item> graftabl </item>
+      <item> help </item>
+      <item> label </item>
+      <item> mode </item>
+      <item> more </item>
+      <item> print </item>
+      <item> recover </item>
+      <item> replace </item>
+      <item> sort </item>
+      <item> subst </item>
+      <item> tree </item>
+      <item> xcopy </item>
+    </list>
+
+
+    <contexts>
+      <context attribute="Normal Text" lineEndContext="#stay" name="Start">
+        <!-- general syntactical stuff -->
+        <RegExpr attribute="Comment" context="Comment" String="^\s*[Rr][Ee][Mm](\s|$)"/>
+        <keyword attribute="Builtin" context="Command" String="builtins"/>
+        <keyword attribute="Command" context="Command" String="commands"/>
+        <DetectChar attribute="Label" context="Label" char=":" firstNonSpace="true"/>
+        <!-- special built-ins -->
+        <RegExpr attribute="Builtin" context="#stay" String="\b[Ee][Cc][Hh][Oo]\s+[Oo]([Ff][Ff]|[Nn])\s*$"/>
+        <keyword attribute="Builtin" context="CmdEcho" String="echo"/>
+        <keyword attribute="Keyword" context="CmdIf" String="if"/>
+        <keyword attribute="Keyword" context="CmdFor" String="for"/>
+        <keyword attribute="Keyword" context="Label" String="goto"/>
+        <keyword attribute="Builtin" context="CmdSet" String="set"/>
+        <DetectChar attribute="Keyword" context="#stay" char="@"/>
+        <!-- other syntaxes -->
+        <IncludeRules context="FindMost"/>
+      </context>
+
+      <!-- the following contexts are meant to be included -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="FindMost">
+        <IncludeRules context="FindStrings"/>
+        <IncludeRules context="FindSubstitutions"/>
+        <!-- handle command line options -->
+        <RegExpr attribute="Option" context="#stay" String="[/-][A-Za-z0-9][A-Za-z0-9_]*:?"/>
+        <!-- handle redirection -->
+        <RegExpr attribute="Redirection" context="#stay" String="[0-9]*(&gt;&gt;?|&lt;)(&amp;[0-9]+)"/>
+        <RegExpr attribute="Redirection" context="Path" String="[0-9]*(&gt;&gt;?|&lt;)\s*"/>
+        <DetectChar attribute="Redirection" context="Start" char="|"/>
+        <!-- handle paths -->
+        <RegExpr attribute="Path" context="#stay" String="[.]+&eop;"/>
+        <RegExpr attribute="Path" context="#stay" String="[A-Za-z][A-Za-z.]*:"/>
+        <RegExpr attribute="Path" context="#stay" String="&pathpart;+(?=\\)"/>
+        <RegExpr attribute="Path" context="#stay" String="[.]*\\+&pathpart;*&eop;"/>
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindStrings">
+        <DetectChar attribute="String" context="String" char="&quot;"/>
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindSubstitutions">
+        <Detect2Chars attribute="Escape" context="#stay" char="&#37;" char1="&#37;"/>
+        <RegExpr attribute="Variable" context="#stay" String="([&#37;!])[^&#37;\s!]+\1"/>
+        <RegExpr attribute="Variable" context="#stay" String="[&#37;!][a-z0-9]" insensitive="true"/>
+      </context>
+
+      <!-- basic sub-contexts -->
+      <context attribute="Comment" lineEndContext="#pop" name="Comment">
+        <IncludeRules context="##Alerts"/>
+      </context>
+
+      <context attribute="String" lineEndContext="#pop" name="String">
+        <Detect2Chars attribute="Escape" context="#stay" char="\" char1="&quot;"/>
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+        <IncludeRules context="FindSubstitutions"/>
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#pop" name="Command">
+        <IncludeRules context="FindMost"/>
+      </context>
+
+      <context attribute="Error" lineEndContext="#pop" name="Label">
+        <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <RegExpr attribute="Label" context="Comment" String="&label;&eos;"/>
+      </context>
+
+      <context attribute="Path" lineEndContext="#pop" name="Path">
+        <IncludeRules context="FindStrings"/>
+        <IncludeRules context="FindSubstitutions"/>
+        <AnyChar attribute="Normal Text" context="#pop" String=" &#9;\&#37;/:*?&quot;&gt;&lt;|" lookAhead="true"/>
+      </context>
+
+      <!-- special sub-contexts -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="Assign">
+        <IncludeRules context="FindMost"/>
+      </context>
+
+      <context attribute="Error" lineEndContext="#pop" name="CmdSet">
+        <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <RegExpr attribute="Variable" context="#pop" String="&varname;="/>
+      </context>
+
+      <context attribute="Echoed Text" lineEndContext="#pop" name="CmdEcho">
+        <IncludeRules context="FindSubstitutions"/>
+        <RegExpr attribute="Escape" context="#stay" String="\^."/>
+        <RegExpr attribute="Redirection" context="#stay" String="[0-9]*(&gt;&gt;?|&lt;)(&amp;[0-9]+)"/>
+        <RegExpr attribute="Redirection" context="Path" String="[0-9]*(&gt;&gt;?|&lt;)\s*"/>
+        <DetectChar attribute="Redirection" context="Start" char="|"/>
+      </context>
+
+      <!-- 'for' sub-contexts -->
+      <context attribute="Error" lineEndContext="#pop" name="CmdFor">
+        <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <RegExpr attribute="Variable" context="CmdForIn" String="%%[a-z]" insensitive="true"/>
+        <Detect2Chars attribute="Option" context="#stay" char="/" char1="D"/>
+        <Detect2Chars attribute="Option" context="CmdForR" char="/" char1="R"/>
+        <Detect2Chars attribute="Option" context="CmdForL" char="/" char1="L"/>
+      </context>
+
+      <context attribute="Error" lineEndContext="#pop" name="CmdForIn">
+        <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <keyword attribute="Keyword" context="CmdForList" String="in"/>
+      </context>
+
+      <context attribute="Error" lineEndContext="#pop" name="CmdForList">
+        <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <DetectChar attribute="Keyword" context="CmdForListBody" char="("/>
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#pop" name="CmdForListBody">
+        <IncludeRules context="FindStrings"/>
+        <IncludeRules context="FindSubstitutions"/>
+        <DetectChar attribute="Keyword" context="CmdForDo" char=")"/>
+      </context>
+
+      <context attribute="Error" lineEndContext="#pop" name="CmdForDo">
+        <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <keyword attribute="Keyword" context="CmdForCommands" String="do"/>
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#pop" name="CmdForCommands">
+        <RegExpr attribute="Variable" context="#stay" String="%%(~([fdpnxsatz]|\$&varname;:)*)?[a-z]" insensitive="true"/>
+        <IncludeRules context="Start"/>
+        <DetectChar attribute="Keyword" context="CmdForNestedCommands" char="("/>
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#stay" name="CmdForNestedCommands">
+        <DetectChar attribute="Keyword" context="#pop" char=")"/>
+        <IncludeRules context="CmdForCommands"/>
+      </context>
+
+      <context attribute="Error" lineEndContext="#pop" name="CmdForR">
+        <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <RegExpr attribute="Path" context="#stay" String="([a-z][a-z.]*:)?[.]*\\*&pathpart;*&eop;" insensitive="true"/>
+        <RegExpr attribute="Variable" context="CmdForIn" String="%%[a-z]" insensitive="true"/>
+      </context>
+
+      <!-- 'for /L' sub-contexts -->
+      <context attribute="Error" lineEndContext="#pop" name="CmdForL">
+        <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <RegExpr attribute="Variable" context="CmdForLIn" String="%%[a-z]" insensitive="true"/>
+      </context>
+
+      <context attribute="Error" lineEndContext="#pop" name="CmdForLIn">
+        <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <keyword attribute="Keyword" context="CmdForLRange" String="in"/>
+      </context>
+
+      <context attribute="Error" lineEndContext="#pop" name="CmdForLRange">
+        <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <DetectChar attribute="Keyword" context="CmdForLStart" char="("/>
+      </context>
+
+      <context attribute="Error" lineEndContext="#pop" name="CmdForLStart">
+        <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <RegExpr attribute="Number" context="CmdForLStartComma" String="-?[0-9]+"/>
+      </context>
+
+      <context attribute="Error" lineEndContext="#pop" name="CmdForLStartComma">
+        <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <DetectChar attribute="Keyword" context="CmdForLStep" char=","/>
+      </context>
+
+      <context attribute="Error" lineEndContext="#pop" name="CmdForLStep">
+        <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <RegExpr attribute="Number" context="CmdForLStepComma" String="-?[0-9]+"/>
+      </context>
+
+      <context attribute="Error" lineEndContext="#pop" name="CmdForLStepComma">
+        <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <DetectChar attribute="Keyword" context="CmdForLEnd" char=","/>
+      </context>
+
+      <context attribute="Error" lineEndContext="#pop" name="CmdForLEnd">
+        <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <RegExpr attribute="Number" context="CmdForLEndParen" String="-?[0-9]+"/>
+      </context>
+
+      <context attribute="Error" lineEndContext="#pop" name="CmdForLEndParen">
+        <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <DetectChar attribute="Keyword" context="CmdForDo" char=")"/>
+      </context>
+
+    </contexts>
+
+    <itemDatas>
+      <itemData name="Normal Text"  defStyleNum="dsNormal"/>
+      <itemData name="Comment"      defStyleNum="dsComment"/>
+      <itemData name="Keyword"      defStyleNum="dsKeyword"/>
+      <itemData name="Number"       defStyleNum="dsDecVal"/>
+      <itemData name="Label"        defStyleNum="dsOthers"/>
+      <itemData name="Builtin"      defStyleNum="dsKeyword"/>
+      <itemData name="Command"      defStyleNum="dsKeyword"/>
+      <itemData name="Redirection"  defStyleNum="dsKeyword"/>
+      <itemData name="String"       defStyleNum="dsString"/>
+      <itemData name="Escape"       defStyleNum="dsChar"/>
+      <itemData name="Echoed Text"  defStyleNum="dsNormal"/>
+      <itemData name="Variable"     defStyleNum="dsOthers"/>
+      <itemData name="Path"         defStyleNum="dsNormal"/>
+      <itemData name="Option"       defStyleNum="dsNormal"/>
+      <itemData name="Error"        defStyleNum="dsError"/>
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name="singleLine" start="rem "/>
+    </comments>
+    <keywords casesensitive="0" weakDeliminator="@" additionalDeliminator="@"/>
+  </general>
+</language>
diff --git a/kate/data/doxygen.xml b/kate/data/doxygen.xml
index f5c47f129..bb3818b33 100644
--- a/kate/data/doxygen.xml
+++ b/kate/data/doxygen.xml
@@ -8,6 +8,7 @@
 
   Copyright 2004 Dominik Haumann ([email protected])
   Copyright 2007 Matthew Woehlke ([email protected])
+  Copyright 2009 Alex Turbov ([email protected])
 
  **********************************************************************
  * This library is free software; you can redistribute it and/or      *
@@ -26,58 +27,85 @@
  * Boston, MA  02110-1301, USA.                                       *
  **********************************************************************
  -->
-<language name="Doxygen" version="1.30" kateversion="2.4" section="Markup" extensions="*.dox;*.doxygen" mimetype="text/x-doxygen" author="Dominik Haumann ([email protected])" license="LGPL" priority="9">
+
+<!-- NOTE: Tags @code and @endcode do not present in keywords due
+           separate handle rules...
+ -->
+
+<language name="Doxygen" version="1.32" kateversion="2.4" section="Markup" extensions="*.dox;*.doxygen" mimetype="text/x-doxygen" author="Dominik Haumann ([email protected])" license="LGPL" priority="9">
   <highlighting>
     <!-- note: all tags may begin with a \ or @ char
          so if you add/change tags you have to do it twice -->
     <list name="TagOnly">
       <item> \arg </item>
+
       <item> \attention </item>
       <item> \author </item>
       <item> \callgraph </item>
-      <item> \code </item>
+      <item> \callergraph </item>
+<!--      <item> \code </item> -->
+
+      <item> \details </item>
       <item> \dot </item>
       <item> \else </item>
-      <item> \endcode </item>
+<!--      <item> \endcode </item> -->
       <item> \endcond </item>
+
       <item> \enddot </item>
       <item> \endhtmlonly </item>
       <item> \endif </item>
       <item> \endlatexonly </item>
       <item> \endlink </item>
+
       <item> \endmanonly </item>
+      <item> \endmsc </item>
       <item> \endverbatim </item>
       <item> \endxmlonly </item>
       <item> \f[ </item>
+
       <item> \f] </item>
       <item> \f$ </item>
       <item> \hideinitializer </item>
       <item> \htmlonly </item>
       <item> \interface </item>
+
       <item> \internal </item>
       <item> \invariant </item>
       <item> \~ </item>
       <item> \@ </item>
       <item> \$ </item>
+
       <item> \\ </item>
       <item> \# </item>
       <item> \latexonly </item>
       <item> \li </item>
       <item> \manonly </item>
+
+      <item> \msc </item>
       <item> \n </item>
       <item> \nosubgrouping </item>
       <item> \note </item>
       <item> \only </item>
+
       <item> \post </item>
       <item> \pre </item>
+      <item> \private </item>
+      <item> \privatesection </item>
+      <item> \protected </item>
+
+      <item> \protectedsection </item>
+      <item> \public </item>
+      <item> \publicsection </item>
       <item> \remarks </item>
       <item> \return </item>
+
       <item> \returns </item>
-      <item> \sa </item>
-      <item> \see </item>
+<!--       <item> \sa </item> -->
+<!--       <item> \see </item> -->
       <item> \showinitializer </item>
       <item> \since </item>
       <item> \test </item>
+
       <item> \todo </item>
       <item> \verbatim </item>
       <item> \warning </item>
@@ -87,49 +115,70 @@
       <item> @attention </item>
       <item> @author </item>
       <item> @callgraph </item>
-      <item> @code </item>
+      <item> @callergraph </item>
+
+<!--      <item> @code </item> -->
+      <item> @details </item>
       <item> @dot </item>
       <item> @else </item>
-      <item> @endcode </item>
+<!--      <item> @endcode </item> -->
       <item> @endcond </item>
+
       <item> @enddot </item>
       <item> @endhtmlonly </item>
       <item> @endif </item>
       <item> @endlatexonly </item>
       <item> @endlink </item>
+
       <item> @endmanonly </item>
+      <item> @endmsc </item>
       <item> @endverbatim </item>
       <item> @endxmlonly </item>
       <item> @f[ </item>
+
       <item> @f] </item>
       <item> @f$ </item>
       <item> @hideinitializer </item>
       <item> @htmlonly </item>
       <item> @interface </item>
+
       <item> @internal </item>
       <item> @invariant </item>
       <item> @~ </item>
       <item> @@ </item>
       <item> @$ </item>
+
       <item> @\ </item>
       <item> @# </item>
       <item> @latexonly </item>
       <item> @li </item>
       <item> @manonly </item>
+
+      <item> @msc </item>
       <item> @n </item>
       <item> @nosubgrouping </item>
       <item> @note </item>
       <item> @only </item>
+
       <item> @post </item>
       <item> @pre </item>
+      <item> @pivate </item>
+      <item> @pivatesection </item>
+      <item> @protected </item>
+
+      <item> @protectedsection </item>
+      <item> @public </item>
+      <item> @publicsection </item>
       <item> @remarks </item>
       <item> @return </item>
+
       <item> @returns </item>
-      <item> @sa </item>
-      <item> @see </item>
+<!--       <item> @sa </item> -->
+<!--       <item> @see </item> -->
       <item> @showinitializer </item>
       <item> @since </item>
       <item> @test </item>
+
       <item> @todo </item>
       <item> @verbatim </item>
       <item> @warning </item>
@@ -141,80 +190,118 @@
       <item> \a </item>
       <item> \anchor </item>
       <item> \b </item>
+
       <item> \c </item>
       <item> \class </item>
       <item> \cond </item>
+      <item> \copybrief </item>
+      <item> \copydetails </item>
+
       <item> \copydoc </item>
       <item> \def </item>
+      <item> \dir </item>
       <item> \dontinclude </item>
       <item> \dotfile </item>
+
       <item> \e </item>
       <item> \elseif </item>
       <item> \em </item>
       <item> \enum </item>
       <item> \example </item>
+
       <item> \exception </item>
       <item> \exceptions </item>
+      <item> \extends </item>
       <item> \file </item>
       <item> \htmlinclude </item>
+
       <item> \if </item>
       <item> \ifnot </item>
+      <item> \implements </item>
       <item> \include </item>
+      <item> \includelineno </item>
+
       <item> \link </item>
+      <item> \memberof </item>
       <item> \namespace </item>
       <item> \p </item>
       <item> \package </item>
+
+      <item> \property </item>
+      <item> \protocol </item>
       <item> \ref </item>
       <item> \relatesalso </item>
       <item> \relates </item>
+
       <item> \retval </item>
       <item> \throw </item>
       <item> \throws </item>
       <item> \verbinclude </item>
       <item> \version </item>
+
       <item> \xrefitem </item>
 
       <item> @addtogroup </item>
       <item> @a </item>
       <item> @anchor </item>
+
       <item> @b </item>
       <item> @c </item>
       <item> @class </item>
       <item> @cond </item>
+      <item> @copybrief </item>
+
+      <item> @copydetails </item>
       <item> @copydoc </item>
       <item> @def </item>
+      <item> @dir </item>
       <item> @dontinclude </item>
+
       <item> @dotfile </item>
       <item> @e </item>
       <item> @elseif </item>
       <item> @em </item>
       <item> @enum </item>
+
       <item> @example </item>
       <item> @exception </item>
       <item> @exceptions </item>
+      <item> @extends </item>
       <item> @file </item>
+
       <item> @htmlinclude </item>
       <item> @if </item>
       <item> @ifnot </item>
+      <item> @implements </item>
       <item> @include </item>
+
+      <item> @includelineno </item>
       <item> @link </item>
+      <item> @memberof </item>
       <item> @namespace </item>
       <item> @p </item>
+
       <item> @package </item>
+      <item> @property </item>
+      <item> @prtocol </item>
       <item> @ref </item>
       <item> @relatesalso </item>
+
       <item> @relates </item>
       <item> @retval </item>
       <item> @throw </item>
       <item> @throws </item>
       <item> @verbinclude </item>
+
       <item> @version </item>
       <item> @xrefitem </item>
     </list>
     <list name="TagParam">
       <item> \param </item>
+      <item> \tparam </item>
 
       <item> @param </item>
+      <item> @tparam </item>
     </list>
     <list name="TagWordWord">
       <item> \image </item>
@@ -222,41 +309,57 @@
       <item> @image </item>
     </list>
     <list name="TagWordString">
+      <item> \category </item>
       <item> \defgroup </item>
+
+      <item> \headerfile </item>
       <item> \page </item>
       <item> \paragraph </item>
       <item> \section </item>
       <item> \struct </item>
+
+      <item> \subpage </item>
       <item> \subsection </item>
       <item> \subsubsection </item>
       <item> \union </item>
       <item> \weakgroup </item>
 
+      <item> @category </item>
       <item> @defgroup </item>
+      <item> @headerfile </item>
       <item> @page </item>
+
       <item> @paragraph </item>
       <item> @section </item>
       <item> @struct </item>
+      <item> @subpage </item>
       <item> @subsection </item>
+
       <item> @subsubsection </item>
       <item> @union </item>
       <item> @weakgroup </item>
     </list>
     <list name="TagString">
       <item> \addindex </item>
+
       <item> \brief </item>
       <item> \bug </item>
       <item> \date </item>
       <item> \deprecated </item>
       <item> \fn </item>
+
       <item> \ingroup </item>
       <item> \line </item>
       <item> \mainpage </item>
       <item> \name </item>
       <item> \overload </item>
+
       <item> \par </item>
+      <item> \sa </item>
+      <item> \see </item>
       <item> \short </item>
       <item> \skip </item>
+
       <item> \skipline </item>
       <item> \typedef </item>
       <item> \until </item>
@@ -267,19 +370,25 @@
       <item> @bug </item>
       <item> @date </item>
       <item> @deprecated </item>
+
       <item> @fn </item>
       <item> @ingroup </item>
       <item> @line </item>
       <item> @mainpage </item>
       <item> @name </item>
+
       <item> @overload </item>
       <item> @par </item>
+      <item> @sa </item>
+      <item> @see </item>
       <item> @short </item>
+
       <item> @skip </item>
       <item> @skipline </item>
       <item> @typedef </item>
       <item> @until </item>
       <item> @var </item>
+
     </list>
     <contexts>
     <!-- different formats:
@@ -290,19 +399,22 @@
       @tag <word> rest_of_line : TagWordString
     -->
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
-        <RegExpr attribute="Comment" context="LineComment" String="//(!|(/(?=[^/]|$)))&lt;?"/>
-        <RegExpr attribute="Comment" context="BlockComment" String="/\*(\*[^*/]|!|[*!]&lt;|\*$)" beginRegion="BlockComment"/>
-        <RegExpr attribute="Region" context="#stay" String="//\s*@\{\s*$" beginRegion="MemberGroup"/>
-        <RegExpr attribute="Region" context="#stay" String="//\s*@\}\s*$"   endRegion="MemberGroup"/>
-        <RegExpr attribute="Region" context="#stay" String="/\*\s*@\{\s*\*/" beginRegion="MemberGroup"/>
-        <RegExpr attribute="Region" context="#stay" String="/\*\s*@\}\s*\*/"   endRegion="MemberGroup"/>
+        <RegExpr attribute="Comment" context="LineComment" String="//(!|(/(?=[^/]|$)))&lt;?" />
+        <RegExpr attribute="Comment" context="BlockComment" String="/\*(\*[^*/]|!|[*!]&lt;|\*$)" beginRegion="BlockComment" />
+        <RegExpr attribute="Region" context="#stay" String="//\s*@\{\s*$" beginRegion="MemberGroup" />
+        <RegExpr attribute="Region" context="#stay" String="//\s*@\}\s*$"   endRegion="MemberGroup" />
+        <RegExpr attribute="Region" context="#stay" String="/\*\s*@\{\s*\*/" beginRegion="MemberGroup" />
+
+        <RegExpr attribute="Region" context="#stay" String="/\*\s*@\}\s*\*/"   endRegion="MemberGroup" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="LineComment">
-        <LineContinue attribute="Comment" context="#stay"/>
+        <LineContinue attribute="Comment" context="#stay" />
         <DetectSpaces />
         <IncludeRules context="##Alerts" />
+        <IncludeRules context="SL_DetectEnv" />
         <keyword attribute="Tags" context="#stay" String="TagOnly" />
         <keyword attribute="Tags" context="SL_TagWord" String="TagWord" />
+
         <keyword attribute="Tags" context="SL_TagParam" String="TagParam" />
         <keyword attribute="Tags" context="SL_TagWordWord" String="TagWordWord" />
         <keyword attribute="Tags" context="SL_TagString" String="TagString" />
@@ -312,14 +424,17 @@
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
         <RegExpr attribute="HTML Tag" context="SL_htmltag" String="&lt;\/?[a-zA-Z_:][a-zA-Z0-9._:-]*" />
       </context>
+
       <context attribute="Comment" lineEndContext="#stay" name="BlockComment">
         <DetectSpaces />
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="BlockComment"/>
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="BlockComment" />
         <IncludeRules context="##Alerts" />
         <Detect2Chars attribute="Region" context="#stay" char="@" char1="{" />
         <Detect2Chars attribute="Region" context="#stay" char="@" char1="}" />
+        <IncludeRules context="SL_DetectEnv" />
         <keyword attribute="Tags" context="#stay" String="TagOnly" />
         <keyword attribute="Tags" context="ML_TagWord" String="TagWord" />
+
         <keyword attribute="Tags" context="ML_TagParam" String="TagParam" />
         <keyword attribute="Tags" context="ML_TagWordWord" String="TagWordWord" />
         <keyword attribute="Tags" context="ML_TagString" String="TagString" />
@@ -329,18 +444,22 @@
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
         <RegExpr attribute="HTML Tag" context="ML_htmltag" String="&lt;\/?[a-zA-Z_:][a-zA-Z0-9._:-]*" />
         <StringDetect attribute="HTML Comment" context="ML_htmlcomment" String="&lt;!--" />
+
       </context>
 
+
+
 <!-- NOTE: all contexts beginning with ML_ are for multiline comments
      The following contexts contain a Detect2Chars that looks for a */ sequence to end multiline comments. Singleline comments do not have this limitation - that's why all contexts are copy&pasted and the line <Detect2Chars ... */> is removed. <IncludeRules context="acontext"> could be used instead but it would make context switching much more complex and very hard to understand! (But use IncludeRules where the rules don't refer to another SL_*/ML_* context, to help maintainability.)
 -->
       <!-- tag contexts -->
       <context attribute="Comment" lineEndContext="#pop" name="ML_TagWord">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true"/>
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
         <IncludeRules context="SL_TagWord" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="ML_TagParam">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true"/>
+
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
         <DetectSpaces />
         <StringDetect attribute="Tags" context="ML_Tag2ndWord" String="[in]" />
         <StringDetect attribute="Tags" context="ML_Tag2ndWord" String="[out]" />
@@ -349,53 +468,59 @@
         <RegExpr attribute="Word" context="#stay" String="\S" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="ML_TagWordWord">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true"/>
+
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
         <DetectSpaces />
         <RegExpr attribute="Word" context="ML_Tag2ndWord" String="\S(?=&wordsep;)" />
         <RegExpr attribute="Word" context="#stay" String="\S" />
       </context>
       <!-- TODO for kate 2.x, convert references to "#pop!ML_TagWord" -->
       <context attribute="Comment" lineEndContext="#pop#pop" name="ML_Tag2ndWord">
-        <Detect2Chars attribute="Comment" context="#pop#pop" char="*" char1="/" lookAhead="true"/>
+        <Detect2Chars attribute="Comment" context="#pop#pop" char="*" char1="/" lookAhead="true" />
         <IncludeRules context="SL_Tag2ndWord" />
+
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="ML_TagString">
         <DetectSpaces />
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true"/>
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
         <StringDetect attribute="HTML Comment" context="ML_htmlcomment" String="&lt;!--" />
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
         <RegExpr attribute="HTML Tag" context="ML_htmltag" String="&lt;\/?[a-zA-Z_:][a-zA-Z0-9._:-]*" />
         <RegExpr attribute="Description" context="#stay" String="." />
       </context>
+
       <context attribute="Comment" lineEndContext="#pop" name="ML_TagWordString">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true"/>
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
         <IncludeRules context="SL_TagWordString" />
       </context>
 
       <!-- html contexts -->
       <context name="ML_htmltag" attribute="Identifier" lineEndContext="#stay">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true"/>
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
         <Detect2Chars attribute="HTML Tag" context="#pop" char="/" char1="&gt;" />
-        <DetectChar attribute="HTML Tag" context="#pop" char="&gt;"/>
-        <RegExpr attribute="Identifier" context="ML_identifiers" String="\s*=\s*"/>
+
+        <DetectChar attribute="HTML Tag" context="#pop" char="&gt;" />
+        <RegExpr attribute="Identifier" context="ML_identifiers" String="\s*=\s*" />
       </context>
       <context name="ML_htmlcomment" attribute="HTML Comment" lineEndContext="#stay">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true"/>
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
         <IncludeRules context="##Alerts" />
         <StringDetect attribute="HTML Comment" context="#pop" String="--&gt;" />
       </context>
       <context name="ML_identifiers" attribute="Identifier" lineEndContext="#stay">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true"/>
+
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
         <RegExpr attribute="String" context="#pop" String="\s*#?[a-zA-Z0-9]*" />
         <DetectChar attribute="Types" context="ML_types1" char="'" />
         <DetectChar attribute="Types" context="ML_types2" char="&quot;" />
       </context>
       <context name="ML_types1" attribute="Types" lineEndContext="#stay">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true"/>
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
         <DetectChar attribute="Types" context="#pop#pop" char="'" />
       </context>
+
       <context name="ML_types2" attribute="Types" lineEndContext="#stay">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true"/>
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
         <DetectChar attribute="Types" context="#pop#pop" char="&quot;" />
       </context>
 
@@ -403,7 +528,8 @@
       <!-- tag contexts -->
       <context attribute="Comment" lineEndContext="#pop" name="SL_TagWord">
         <DetectSpaces />
-        <keyword attribute="Tags" context="#pop" String="TagWord" lookAhead="true"/>
+        <keyword attribute="Tags" context="#pop" String="TagWord" lookAhead="true" />
+
         <RegExpr attribute="Word" context="#pop" String="\S(?=&wordsep;)" />
         <RegExpr attribute="Word" context="#stay" String="\S" />
       </context>
@@ -413,6 +539,7 @@
         <StringDetect attribute="Tags" context="SL_Tag2ndWord" String="[out]" />
         <StringDetect attribute="Tags" context="SL_Tag2ndWord" String="[in,out]" />
         <RegExpr attribute="Word" context="#pop" String="\S(?=&wordsep;)" />
+
         <RegExpr attribute="Word" context="#stay" String="\S" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="SL_TagWordWord">
@@ -422,6 +549,7 @@
       </context>
       <!-- TODO for kate 2.x, convert references to "#pop!SL_TagWord" -->
       <context attribute="Comment" lineEndContext="#pop#pop" name="SL_Tag2ndWord">
+
         <DetectSpaces />
         <RegExpr attribute="Word" context="#pop#pop" String="\S(?=&wordsep;)" />
         <RegExpr attribute="Word" context="#stay" String="\S" />
@@ -431,6 +559,7 @@
         <StringDetect attribute="HTML Comment" context="SL_htmlcomment" String="&lt;!--" />
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
         <RegExpr attribute="HTML Tag" context="SL_htmltag" String="&lt;\/?[a-zA-Z_:][a-zA-Z0-9._:-]*" />
+
         <RegExpr attribute="Description" context="#stay" String="." />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="SL_TagWordString">
@@ -440,15 +569,17 @@
       </context>
 
       <!-- html contexts -->
+
       <context name="SL_htmltag" attribute="Identifier" lineEndContext="#pop">
         <Detect2Chars attribute="HTML Tag" context="#pop" char="/" char1="&gt;" />
-        <DetectChar attribute="HTML Tag" context="#pop" char="&gt;"/>
-        <RegExpr attribute="Identifier" context="SL_identifiers" String="\s*=\s*"/>
+        <DetectChar attribute="HTML Tag" context="#pop" char="&gt;" />
+        <RegExpr attribute="Identifier" context="SL_identifiers" String="\s*=\s*" />
       </context>
       <context name="SL_htmlcomment" attribute="HTML Comment" lineEndContext="#pop">
         <IncludeRules context="##Alerts" />
         <StringDetect attribute="HTML Comment" context="#pop" String="--&gt;" />
       </context>
+
       <context name="SL_identifiers" attribute="Identifier" lineEndContext="#pop">
         <RegExpr attribute="String" context="#pop" String="\s*#?[a-zA-Z0-9]*" />
         <DetectChar attribute="Types" context="SL_types1" char="'" />
@@ -458,24 +589,76 @@
         <DetectChar attribute="Types" context="#pop#pop" char="'" />
       </context>
       <context name="SL_types2" attribute="Types" lineEndContext="#pop">
+
         <DetectChar attribute="Types" context="#pop#pop" char="&quot;" />
       </context>
 
-    </contexts>
+      <context name="SL_DetectEnv" lineEndContext="#pop">
+        <RegExpr attribute="Tags" context="Code" String="[@\\]code" beginRegion="Code" />
+        <RegExpr attribute="Tags" context="Verbatim" String="[@\\]verbatim" beginRegion="Verbatim" />
+        <RegExpr attribute="Tags" context="Formula" String="[@\\]f\[" beginRegion="Formula" />
+        <RegExpr attribute="Tags" context="Msc" String="[@\\]msc" beginRegion="Msc" />
+        <RegExpr attribute="Tags" context="Dot" String="[@\\]dot" beginRegion="Dot" />
+
+      </context>
+
+      <context name="SL_DetectComment" lineEndContext="#pop">
+        <Detect2Chars attribute="Comment" context="#pop#pop" char="*" char1="/" endRegion="BlockComment" />
+      </context>
+
+      <context attribute="Code" lineEndContext="#stay" name="Code">
+
+        <IncludeRules context="SL_DetectComment" />
+        <RegExpr attribute="Tags" context="#pop" String="[@\\]endcode" endRegion="Code" />
+      </context>
+
+      <context attribute="Verbatim" lineEndContext="#stay" name="Verbatim">
+        <IncludeRules context="SL_DetectComment" />
+        <RegExpr attribute="Tags" context="#pop" String="[@\\]endverbatim" endRegion="Verbatim" />
+      </context>
+
+      <context attribute="Formulas" lineEndContext="#stay" name="Formula">
+
+        <IncludeRules context="SL_DetectComment" />
+        <RegExpr attribute="Tags" context="#pop" String="[@\\]f\]" endRegion="Formula" />
+        <!-- TODO: How to force LaTeX math context here?? -->
+        <!-- <IncludeRules context="##LaTeX" /> -->
+      </context>
+
+      <context attribute="Message Sequence Chart" lineEndContext="#stay" name="Msc">
+        <IncludeRules context="SL_DetectComment" />
+        <RegExpr attribute="Tags" context="#pop" String="[@\\]endmsc" endRegion="Msc" />
+
+      </context>
+
+      <context attribute="Dot Graph" lineEndContext="#stay" name="Dot">
+        <IncludeRules context="SL_DetectComment" />
+        <RegExpr attribute="Tags" context="#pop" String="[@\\]enddot" endRegion="Dot" />
+      </context>
+
+  </contexts>
     <itemDatas>
-      <itemData name="Normal Text" defStyleNum="dsNormal" />
-      <itemData name="Tags"        defStyleNum="dsKeyword" color="#ca60ca" selColor="#ffffff" bold="1" italic="0" />
-      <itemData name="Word"        defStyleNum="dsKeyword" color="#0095ff" selColor="#ffffff" bold="1" italic="0" />
-      <itemData name="HTML Tag"    defStyleNum="dsKeyword" color="#000000" selColor="#ffffff" bold="1" italic="0" />
-      <itemData name="Description" defStyleNum="dsString"  color="#ff0000" />
-      <itemData name="Comment"     defStyleNum="dsComment" color="#0000ff" selColor="#ffffff" italic="1" />
-      <itemData name="Region"      defStyleNum="dsRegionMarker" />
-      <itemData name="Identifier"  defStyleNum="dsOthers" />
+      <itemData name="Normal Text"  defStyleNum="dsNormal" />
+
+      <itemData name="Tags"         defStyleNum="dsKeyword" color="#ca60ca" selColor="#ffffff" bold="1" italic="0" />
+      <itemData name="Word"         defStyleNum="dsKeyword" color="#0095ff" selColor="#ffffff" bold="1" italic="0" />
+      <itemData name="HTML Tag"     defStyleNum="dsKeyword" color="#000000" selColor="#ffffff" bold="1" italic="0" />
+      <itemData name="Description"  defStyleNum="dsString"  color="#ff0000" />
+      <itemData name="Comment"      defStyleNum="dsComment" color="#0000ff" selColor="#ffffff" italic="1" />
+      <itemData name="Region"       defStyleNum="dsRegionMarker" />
+      <itemData name="Identifier"   defStyleNum="dsOthers" />
       <itemData name="HTML Comment" defStyleNum="dsComment" />
-      <itemData name="Types"       defStyleNum="dsDataType" />
+      <itemData name="Types"        defStyleNum="dsDataType" />
+
+      <itemData name="Code"         defStyleNum="dsComment" />
+      <itemData name="Dot Graph"    defStyleNum="dsComment" color="#00A000" selColor="#ffffff" italic="1" />
+      <itemData name="Formulas"     defStyleNum="dsComment" color="#00A000" selColor="#ffffff" italic="1" />
+      <itemData name="Message Sequence Chart" defStyleNum="dsComment" color="#00A000" selColor="#ffffff" italic="1" />
+      <itemData name="Verbatim"     defStyleNum="dsComment" />
     </itemDatas>
   </highlighting>
   <general>
     <keywords casesensitive="0" weakDeliminator="\$~" />
+
   </general>
 </language>
diff --git a/kate/data/e.xml b/kate/data/e.xml
index a1fa75f6d..c21ac2880 100644
--- a/kate/data/e.xml
+++ b/kate/data/e.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="E Language" version="0.21" kateversion="2.3" section="Sources" extensions="*.e" mimetype="text/x-e-src">
+<language name="E Language" version="0.22" kateversion="2.3" section="Sources" extensions="*.e" mimetype="text/x-e-src">
     <highlighting>
         <list name="Type">
             <item> FALSE </item>
@@ -200,9 +200,9 @@
          </list>
         <contexts>
 
-	    <context name="out_comment" attribute="OutSide E code"  lineEndContext="#stay">
+	          <context name="out_comment" attribute="OutSide E code"  lineEndContext="#stay">
                 <Detect2Chars attribute="code_begin" context="normal" char="&lt;" char1="'" />
-	    </context>
+	          </context>
 
             <context name="normal" attribute="Normal Text" lineEndContext="#stay">
               	<DetectChar attribute="Operators" context="#stay" char="{" beginRegion="Region1"/>
@@ -215,13 +215,13 @@
                 <Detect2Chars attribute="Comment" context="comment" char="/" char1="/" />
                 <DetectChar attribute="Vector" context="string" char="&quot;" />
                 <AnyChar attribute="Operators" context="#stay" String="'[&amp;&gt;&lt;=:+\-*\|].,;" />
-                <keyword attribute="Data Type" context="#stay" String="Type"/>
+                <keyword attribute="Data Type" context="#stay"  String="Type"/>
                 <keyword attribute="Function" context="#stay"  String="Function"/>
-            	<keyword attribute="Statement" context="#stay" String="Statement"/>
+            		<keyword attribute="Statement" context="#stay"  String="Statement"/>
                 <keyword attribute="Action" context="#stay"  String="Action"/>
-                <keyword attribute="Keyword" context="#stay" String="Generation"/>
-                <keyword attribute="Keyword" context="#stay" String="Cover"/>
-                <keyword attribute="Keyword" context="#stay" String="Simulator"/>
+                <keyword attribute="Keyword" context="#stay"  String="Generation"/>
+                <keyword attribute="Keyword" context="#stay"  String="Cover"/>
+                <keyword attribute="Keyword" context="#stay"  String="Simulator"/>
 
             </context>
 
@@ -251,6 +251,9 @@
 
     </highlighting>
   <general>
+    <comments>
+      <comment name="singleLine" start="//" />
+    </comments>
     <keywords casesensitive="1" />
   </general>
 </language>
diff --git a/kate/data/fortran.xml b/kate/data/fortran.xml
index 948267fc9..4a83a703a 100644
--- a/kate/data/fortran.xml
+++ b/kate/data/fortran.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Fortran" version="1.11" kateversion="2.4" section="Sources" extensions="*.f;*.F;*.for;*.FOR;*.f90;*.F90;*.fpp;*.FPP;*.f95;*.F95;" mimetype="text/x-fortran-src" casesensitive="0" author="Franchin Matteo ([email protected])" license="LGPL">
+<language name="Fortran" version="1.12" kateversion="2.4" section="Sources" extensions="*.f;*.F;*.for;*.FOR;*.f90;*.F90;*.fpp;*.FPP;*.f95;*.F95;" mimetype="text/x-fortran-src" casesensitive="0" author="Franchin Matteo ([email protected])" license="LGPL">
 <!-- by Franchin Matteo, [email protected] -->
   <highlighting>
 
@@ -13,17 +13,17 @@
       <item> call </item>
       <item> case </item>
       <item> common </item>
-      <item> contains </item>
+      <!--item> contains </item-->
       <item> continue </item>
       <item> cycle </item>
       <item> deallocate </item>
       <item> default </item>
-      <item> do </item>
+      <!--item> do </item-->
       <item> forall </item>
       <item> where </item>
       <item> elsewhere </item>
-      <item> elseif </item>
-      <item> else </item>
+      <!--item> elseif </item-->
+      <!--item> else </item-->
       <item> equivalence </item>
       <item> exit </item>
       <item> external </item>
@@ -51,7 +51,7 @@
       <item> select </item>
       <item> selectcase </item>
       <item> stop </item>
-      <item> then </item>
+      <!--item> then </item-->
       <item> to </item>
       <item> use </item>
       <item> only </item>
@@ -380,8 +380,9 @@
         <IncludeRules context="find_preprocessor" />
         <IncludeRules context="find_comments" />
         <IncludeRules context="find_symbols" />
-        <IncludeRules context="find_end_stmnts" />
         <IncludeRules context="find_begin_stmnts" />
+        <IncludeRules context="find_end_stmnts" />
+        <IncludeRules context="find_mid_stmnts" />
       </context>
 <!--************************END OF THE MAIN CONTEXT*************************-->
 
@@ -458,13 +459,23 @@
 <!-- The following context matches the begin of program units -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_begin_stmnts">
         <RegExpr attribute="Keyword" context="#stay" String="\bmodule\s+procedure\b" insensitive="TRUE"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\b(program|subroutine|function|module|block\s*data)\b" insensitive="TRUE" beginRegion="Unit"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\b(subroutine|function|block\s*data)\b" insensitive="TRUE" beginRegion="Routine"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\b(program|module|block\s*data)\b" insensitive="TRUE" beginRegion="Routine"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\b(then|do)\b" insensitive="TRUE" beginRegion="Block"/>
       </context>
 <!-- The following context matches the end of program units -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_end_stmnts">
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(program|subroutine|function|module|block\s*data)\b" insensitive="TRUE" endRegion="Unit"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(do|if|select|where|forall|interface)\b" insensitive="TRUE"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\b" insensitive="TRUE" endRegion="Unit"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(subroutine|function|block\s*data)\b" insensitive="TRUE" endRegion="Routine"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(program|module)\b" insensitive="TRUE" endRegion="Routine"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(do|if)\b" insensitive="TRUE" endRegion="Block"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(select|where|forall|interface)\b" insensitive="TRUE"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\belse\s*if\b" insensitive="TRUE" endRegion="Block"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\b" insensitive="TRUE" endRegion="Routine"/>
+      </context>
+<!-- The following context matches the mid of program units -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="find_mid_stmnts">
+        <RegExpr attribute="Keyword" context="#stay" String="\belse\b" insensitive="TRUE" endRegion="Block" beginRegion="Block"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bcontains\b" insensitive="TRUE" endRegion="Routine" beginRegion="Routine"/>
       </context>
 
 <!-- The following two contexts match declarations -->
diff --git a/kate/data/fsharp.xml b/kate/data/fsharp.xml
new file mode 100644
index 000000000..e5180e3bc
--- /dev/null
+++ b/kate/data/fsharp.xml
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Kate syntax highlighting for F# based on the OCAML syntax by Glyn Webster ([email protected]). -->
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+<!-- Regular expresion constants: -->
+<!ENTITY LETTER "A-Za-z\0300-\0326\0330-\0366\0370-\0377">          <!-- Latin-1 letters. -->
+<!ENTITY IDENT  "[&LETTER;_][&LETTER;0-9_']*">                      <!-- OCaml identifiers. -->
+<!ENTITY MIDENT "[A-Z][&LETTER;0-9_']*">                            <!-- OCaml uppercase identifiers. -->
+<!ENTITY ESC    "(\\[ntbr'&quot;\\]|\\[0-9]{3}|\\x[0-9A-Fa-f]{2})"> <!-- OCaml character code escapes. -->
+<!ENTITY DEC    "[0-9][0-9_]*">                                     <!-- Decimal digits with underscores. -->
+]>
+<language name="FSharp" version="0.0.1" kateversion="2.4" section="Sources" extensions="*.fs;*.fsi;*.fsx" mimetype="" priority="10" author="Bas Bossink ([email protected])" license="LGPL">
+
+  <highlighting>
+    <list name="keywords">
+      <item> abstract </item>
+      <item> and </item>
+      <item> as </item>
+      <item> assert </item>
+      <item> base </item>
+<!--       <item> begin </item> -->
+      <item> class </item>
+      <item> delegate </item>
+<!--       <item> do </item> -->
+<!--       <item> done </item> -->
+      <item> dowcast </item>
+      <item> downto </item>
+      <item> elif </item>
+      <item> else </item>
+<!--       <item> end </item> -->
+      <item> exception </item>
+      <item> extern </item>
+      <item> false </item>
+      <item> for </item>
+      <item> fun </item>
+      <item> function </item>
+      <item> functor </item>
+      <item> global </item>
+      <item> if </item>
+      <item> in </item>
+<!--       <item> include </item> -->
+      <item> inherit </item>
+      <item> inline </item>
+      <item> interfaece </item>
+      <item> internal </item>
+      <item> lazy </item>
+      <item> let </item>
+      <item> match </item>
+      <item> member </item>
+<!--       <item> module </item> -->
+      <item> mutable </item>
+      <item> namespace </item>
+      <item> new </item>
+      <item> not </item>
+      <item> null </item>
+<!--       <item> object </item> -->
+      <item> of </item>
+<!--       <item> open </item> -->
+      <item> or </item>
+      <item> override </item>
+      <item> private </item>
+      <item> public </item>
+      <item> rec </item>
+      <item> ref </item>
+      <item> return </item>
+<!--       <item> sig </item> -->
+      <item> static </item>
+<!--       <item> struct </item> -->
+      <item> then </item>
+      <item> to </item>
+      <item> true </item>
+      <item> try </item>
+      <item> type </item>
+      <item> upcast </item>
+      <item> use </item>
+      <item> val </item>
+      <item> void </item>
+      <item> when </item>
+      <item> while </item>
+      <item> with </item>
+      <item> yield </item>
+    </list>
+    <list name="core types">
+      <item> bool </item>
+      <item> byte </item>
+      <item> sbyte </item>
+      <item> int16 </item>
+      <item> uint16 </item>
+      <item> int </item>
+      <item> uint32 </item>
+      <item> int64 </item>
+      <item> uint64 </item>
+      <item> nativeint </item>
+      <item> unativeint </item>
+      <item> char </item>
+      <item> string </item>
+      <item> decimal </item>
+      <item> unit </item>
+      <item> void </item>
+      <item> float32 </item>
+      <item> single </item>
+      <item> float </item>
+      <item> double </item>
+      <item> bigint </item>
+      <item> option </item>
+      <item> seq </item>
+    </list>
+    <list name="symbols">
+      <item> ? </item>
+    </list>
+    <list name="end">
+      <item> end </item>
+    </list>
+    <list name="sig">
+      <item> sig </item>
+    </list>
+    <list name="struct">
+      <item> struct </item>
+    </list>
+    <list name="object">
+      <item> object </item>
+    </list>
+    <list name="begin">
+      <item> begin </item>
+    </list>
+    <list name="do">
+      <item> do </item>
+    </list>
+    <list name="done">
+      <item> done </item>
+    </list>
+    <list name="module_environment">
+      <item> module </item>
+      <item> open </item>
+    </list>
+    <contexts>
+
+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
+
+        <Detect2Chars attribute="Comment" context="Multiline Comment" char="(" char1="*" beginRegion="comment" />
+        <Detect2Chars context="Singleline Comment" char="/" char1="/" />
+
+        <DetectChar attribute="Symbol" context="#stay" char="(" beginRegion="paren"/>
+        <DetectChar attribute="Symbol" context="#stay" char=")" endRegion="paren"/>
+
+        <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="record"/>
+        <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="record"/>
+        <Detect2Chars attribute="Symbol" context="#stay" char="[" char1="&lt;" beginRegion="attribute"/>
+        <Detect2Chars attribute="Symbol" context="#stay" char="&gt;" char1="]" endRegion="attribute"/>
+
+        <Detect2Chars attribute="Symbol" context="#stay" char="[" char1="|" beginRegion="array"/>
+        <Detect2Chars attribute="Symbol" context="#stay" char="|" char1="]" endRegion="array"/>
+        <DetectChar attribute="Symbol" context="#stay" char="[" beginRegion="list"/>
+        <DetectChar attribute="Symbol" context="#stay" char="]" endRegion="list"/>
+
+        <keyword attribute="Keyword" context="#stay" String="do" beginRegion="loop"/>
+        <keyword attribute="Keyword" context="#stay" String="done" endRegion="loop"/>
+        <keyword attribute="Directive" context="ModuleEnv" String="module_environment"/>
+        <keyword attribute="Region Marker" context="Block" String="begin" beginRegion="block"/>
+        <keyword attribute="Region Marker" context="Object" String="object" beginRegion="object"/>
+        <keyword attribute="Region Marker" context="Sig" String="sig" beginRegion="sig"/>
+        <keyword attribute="Region Marker" context="Struct" String="struct" beginRegion="struct"/>
+
+        <RegExpr attribute="Constructor" context="#stay" String="`\s*&IDENT;"/>
+        <RegExpr attribute="Module" lookAhead="true" context="ModuleEnv2" String="&MIDENT;\s*\."/>
+        <RegExpr attribute="Constructor" context="#stay" String="&MIDENT;"/>
+
+        <!-- Interpreter directives. --> 
+        <!-- (These are lines where the first symbol is a '#' followed by an identifier. -->
+        <!-- Such lines could also be part of a method call split over two lines but     --> 
+        <!-- it's unlikey anyone would code like that.)                                  -->
+        <RegExpr attribute="Directive" context="#stay" String="#&IDENT;.*$" firstNonSpace="true"/>
+
+        <!-- String, character and Camlp4 "quotation" constants.              --> 
+        <!-- Note: If you must modify the pattern for characters be precise:  -->
+        <!-- single quotes have several meanings in Ocaml.                    -->
+        <DetectChar attribute="String" context="String Constant" char="&quot;" />
+        <RegExpr attribute="Character" context="#stay" String="'(&ESC;|[^'])'" />
+        <Detect2Chars attribute="Camlp4 Quotation" context="Camlp4 Quotation Constant" char="&lt;" char1="&lt;" />
+        <RegExpr attribute="Camlp4 Quotation" context="Camlp4 Quotation Constant" String="&lt;:&IDENT;&lt;" />
+
+        <!-- Identifiers and keywords. --> 
+        <keyword attribute="Keyword" context="#stay" String="keywords" />
+        <keyword attribute="Core Data Type" context="#stay" String="core types" />
+        <RegExpr attribute="Identifier" context="#stay" String="&IDENT;" />
+
+        <!-- Numeric constants. -->
+        <!-- Note that they may contain underscores. --> 
+        <RegExpr attribute="Hexadecimal" context="#stay" String="-?0[xX][0-9A-Fa-f_]+" />
+        <RegExpr attribute="Octal" context="#stay" String="-?0[oO][0-7_]+" />
+        <RegExpr attribute="Binary" context="#stay" String="-?0[bB][01_]+" />
+        <RegExpr attribute="Float" context="#stay" String="-?&DEC;((\.(&DEC;)?([eE][-+]?&DEC;)?)|([eE][-+]?&DEC;))" />
+        <RegExpr attribute="Decimal" context="#stay" String="-?&DEC;" />
+      </context>
+
+      <context attribute="Comment" lineEndContext="#pop" name="Singleline Comment"/>
+      <context attribute="Comment" lineEndContext="#stay" name="Multiline Comment">
+        <!-- Support for nested comments -->
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1=")" endRegion="comment" />
+        <Detect2Chars attribute="Comment" context="Multiline Comment" char="(" char1="*" beginRegion="comment" />
+      </context>
+
+      <context attribute="String" lineEndContext="#stay" name="String Constant">
+        <DetectChar attribute="String" context="#pop" char="&quot;" />
+        <RegExpr attribute="Escaped characters" context="#stay" String="&ESC;" />
+        <!-- An underscore at the end of a line in a string indicates  -->
+        <!-- that the string will continue on the next line.           -->
+        <RegExpr attribute="Escaped characters" context="#stay" String="\\$" />
+      </context>
+
+      <context attribute="Normal text" lineEndContext="#stay" name="Block">
+        <keyword attribute="Region Marker" context="#pop" String="end" endRegion="block"/>
+        <IncludeRules context="Normal"/>
+      </context>
+
+      <context attribute="Normal text" lineEndContext="#stay" name="Sig">
+        <keyword attribute="Region Marker" context="#pop" String="end" endRegion="sig"/>
+        <IncludeRules context="Normal"/>
+      </context>
+
+      <context attribute="Normal text" lineEndContext="#stay" name="Struct">
+        <keyword attribute="Region Marker" context="#pop" String="end" endRegion="struct"/>
+        <IncludeRules context="Normal"/>
+      </context>
+      
+      <context attribute="Normal text" lineEndContext="#stay" name="Object">
+        <keyword attribute="Region Marker" context="#pop" String="end" endRegion="object"/>
+        <IncludeRules context="Normal"/>
+      </context>
+      
+      <context attribute="Normal text" lineEndContext="#stay" name="ModuleEnv" fallthrough="true" fallthroughContext="#pop">
+        <DetectSpaces attribute="Normal text" context="#stay"/>
+        <RegExpr attribute="Module" lookAhead="true" context="ModuleEnv2" String="&MIDENT;\s*\."/>
+        <RegExpr attribute="Module" context="#pop" String="&MIDENT;"/>
+      </context>
+      
+      <context attribute="Normal text" lineEndContext="#stay" name="ModuleEnv2">
+        <RegExpr attribute="Module" context="#stay" String="&MIDENT;"/>
+        <DetectSpaces attribute="Normal text" context="#stay"/>
+        <StringDetect attribute="Keyword" context="#pop" String="."/>
+      </context>
+      
+      <!-- Camlp4 Quotations. These are source code literals used by the Campl4 preprocessor.           -->
+      <!-- The only escapes allowed in a Camlp4 quotation are for the quotation start and stop symbols. -->
+      <context attribute="Camlp4 Quotation" lineEndContext="#stay" name="Camlp4 Quotation Constant">
+        <Detect2Chars attribute="Camlp4 Quotation" context="#pop" char="&gt;" char1="&gt;" />
+        <Detect2Chars attribute="Camlp4 Quotation" context="Camlp4 Quotation Constant" char="&lt;" char1="&lt;" />
+        <RegExpr attribute="Camlp4 Quotation" context="Camlp4 Quotation Constant" String="&lt;:&IDENT;&lt;" />
+        <RegExpr attribute="Escaped characters" context="#stay" String="\\(\\|&gt;&gt;|&lt;&lt;)" />
+        <RegExpr attribute="Escaped characters" context="#stay" String="\\&lt;:&IDENT;&lt;" />
+      </context>
+    </contexts>
+
+    <itemDatas>
+      <itemData name="Normal Text" defStyleNum="dsNormal"/>
+      <itemData name="Identifier" defStyleNum="dsNormal"/>
+      <itemData name="Symbol" defStyleNum="dsNormal"/>
+      <itemData name="Keyword"  defStyleNum="dsKeyword"/>
+      <itemData name="Revised Syntax Keyword"  defStyleNum="dsNormal"/>
+      <itemData name="Core Data Type"  defStyleNum="dsDataType"/>
+      <itemData name="Decimal"  defStyleNum="dsDecVal"/>
+      <itemData name="Hexadecimal"  defStyleNum="dsBaseN"/>
+      <itemData name="Octal"  defStyleNum="dsBaseN"/>
+      <itemData name="Binary"  defStyleNum="dsBaseN"/>
+      <itemData name="Float"  defStyleNum="dsFloat"/>
+      <itemData name="Character"  defStyleNum="dsChar"/>
+      <itemData name="String"  defStyleNum="dsString"/>
+      <itemData name="Escaped characters"  defStyleNum="dsChar"/>
+      <itemData name="Comment"  defStyleNum="dsComment"/>
+      <itemData name="Camlp4 Quotation"  defStyleNum="dsString"/>
+      <itemData name="Directive"  defStyleNum="dsOthers"/>
+      <itemData name="Constructor" defStyleNum="dsNormal"/>
+      <itemData name="Module" defStyleNum="dsNormal"/>
+      <itemData name="Region Marker" defStyleNum="dsKeyword"/>
+    </itemDatas>
+  </highlighting>
+
+  <general>
+    <keywords casesensitive="1" />
+    <comments>
+      <comment name="singleLine" start="//" />
+      <comment name="singleLine" start="///" />
+      <comment name="multiLine" start="(*" end="*)" />
+    </comments>
+  </general>
+</language>
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/data/gdb.xml b/kate/data/gdb.xml
new file mode 100644
index 000000000..85f9383ff
--- /dev/null
+++ b/kate/data/gdb.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+
+<!-- Changelog:
+
+v1.0:
+- first Release
+-->
+
+<language name="GDB Backtrace" section="Other"
+          version="1.0" kateversion="2.4"
+          extensions="*.kcrash;*.crash;*.bt"
+          mimetype=""
+          author="Milian Wolff ([email protected])" license="LGPL">
+
+<highlighting>
+
+  <contexts>
+    <context name="apache" attribute="Normal" lineEndContext="#stay">
+      <DetectChar char="#" context="stackframe" firstNonSpace="true" />
+      <IncludeRules context="oneliners" />
+    </context>
+    <context name="oneliners" attribute="Normal" lineEndContext="#pop">
+      <StringDetect attribute="Crash" context="#stay" String="[KCrash Handler]" />
+      <StringDetect String="Thread" firstNonSpace="true" context="thread" />
+      <StringDetect String="[Current thread" firstNonSpace="true" context="thread" />
+    </context>
+    <context name="stackframe" attribute="Normal" lineEndContext="#stay">
+      <RegExpr attribute="Normal" context="identifier"  String="((?:[^ ]|&lt;.+&gt;)+::)?([^ :]+)\s*\(" lookAhead="true" />
+      <StringDetect attribute="Normal" String="at" context="file" />
+      <StringDetect attribute="Normal" String="from" context="file" />
+      <IncludeRules context="oneliners" />
+    </context>
+    <context name="identifier" attribute="Normal" lineEndContext="#stay" dynamic="true">
+      <StringDetect attribute="QualifiedIdentifier" String="%1" dynamic="true" />
+      <StringDetect attribute="Function" String="%2" dynamic="true" />
+      <RegExpr attribute="Crash" String="\b0x0\b" />
+      <DetectChar char=")" context="#pop" />
+    </context>
+    <context name="file" attribute="File" lineEndContext="#pop#pop">
+      <DetectChar char=":" context="#pop#pop" attribute="Normal" />
+    </context>
+    <context name="thread" attribute="Thread" lineEndContext="#pop">
+    </context>
+  </contexts>
+
+  <itemDatas>
+    <itemData name="Normal" defStyleNum="dsNormal" spellChecking="false" />
+    <itemData name="Crash" defStyleNum="dsError" spellChecking="false" underline="false" bold="true" />
+    <itemData name="QualifiedIdentifier" defStyleNum="dsOthers" spellChecking="false" />
+    <itemData name="Function" defStyleNum="dsFunction" spellChecking="false" bold="true" />
+    <itemData name="File" defStyleNum="dsDataType" spellChecking="false" />
+    <itemData name="Thread" defStyleNum="dsBaseN" spellChecking="false" />
+  </itemDatas>
+</highlighting>
+
+</language>
+
+<!-- kate: replace-tabs: on; tab-width: 4; indent-width: 4; -->
\ No newline at end of file
diff --git a/kate/data/glosstex.xml b/kate/data/glosstex.xml
new file mode 100644
index 000000000..b9a98866b
--- /dev/null
+++ b/kate/data/glosstex.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<language name="GlossTex" version="0.01" kateversion="2.1" extensions="*.gdf" section="Markup" mimetype="text/x-gdf" casesensitive="1" author="Thomas Braun([email protected])" license="LGPL">
+  <highlighting>
+    <contexts>
+      <context name="Comment" attribute="Comment" lineEndContext="#stay">
+      <StringDetect String="@entry" attribute="Entry" context="Entry"/>
+      </context>
+      <context name="Entry"  attribute="Entry" lineEndContext="#pop">
+        <DetectChar char="{" attribute="Normal Text" context="Label"/>
+        <DetectChar char="}" attribute="Normal Text" context="Text"/>
+      </context>
+      <context name="Label"  attribute="Label" lineEndContext="#pop">
+      <DetectChar char="," attribute="Normal Text" context="Abbrev"/>
+      <DetectChar char="}" attribute="Normal Text" context="Text"/>
+      </context>
+      <context name="Abbrev" attribute="Abbrev" lineEndContext="#pop">
+        <RegExpr String="\{[^\{\}]*\}" attribute="Abbrev" context="#stay"/>
+        <DetectChar char="," attribute="Normal Text" context="Full"/>
+	<DetectChar char="}" attribute="Normal Text" context="Text"/>
+      </context>
+        <context name="Full" attribute="Full" lineEndContext="#pop">
+	<RegExpr String="\{[^\{\}]*\}" attribute="Full" context="#stay"/>
+	<DetectChar char="}" attribute="Normal Text" context="Text"/>
+      </context>
+      <context name="Text" attribute="Normal Text" lineEndContext="Comment">
+      <IncludeRules context="##LaTeX" includeAttrib="true"/>
+      </context>
+    </contexts>
+    <itemDatas>
+      <itemData name="Normal Text" defStyleNum="dsNormal"/>
+      <itemData name="Comment" defStyleNum="dsComment"/>
+      <itemData name="Entry" defStyleNum="dsKeyword" color="#0000ff"/>
+      <itemData name="Label" defStyleNum="dsDataType"/>
+      <itemData name="Abbrev" defStyleNum="dsOthers"/>
+      <itemData name="Full" defStyleNum="dsString"/>
+      <itemData name="Text" defStyleNum="dsChar"/>
+    </itemDatas>
+  </highlighting>
+  <general>
+   <keywords casesensitive="0" weakDeliminator="\" wordWrapDeliminator=",{}[]"/>
+      <comments>
+      <comment name="singleLine" start="%" />
+    </comments>
+    </general>
+  </language>
diff --git a/kate/data/glsl.xml b/kate/data/glsl.xml
index 21ef312a0..53a872265 100644
--- a/kate/data/glsl.xml
+++ b/kate/data/glsl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="GLSL" section="Sources" extensions="*.glsl;*.vert;*.frag" mimetype="text/x-glslsrc" version="1.02" kateversion="2.4" author="Oliver Richers ([email protected])" license="LGPL">
+<language name="GLSL" section="Sources" extensions="*.glsl;*.vert;*.frag;*.geom" mimetype="text/x-glslsrc" version="1.03" kateversion="2.4" author="Oliver Richers ([email protected])" license="LGPL">
 	<highlighting>
 		<list name="keywords">
 			<item>break</item>
diff --git a/kate/data/gnuassembler.xml b/kate/data/gnuassembler.xml
index 754e4fa02..73db06cff 100644
--- a/kate/data/gnuassembler.xml
+++ b/kate/data/gnuassembler.xml
@@ -9,6 +9,10 @@
 *                                                                       *
 *************************************************************************
 
+Updated:  Miquel Sabaté <[email protected]>
+Date:     14th September, 2010
+Version:  1.02
+
 Updated:  Roland Pabel <[email protected]>
 Date:     15th August, 2002
 Version:  1.01
@@ -39,19 +43,22 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 -->
 
-<language name="GNU Assembler" version="1.05" kateversion="2.4" section="Assembler" extensions="*.s;*.S" mimetype="text/x-asm" author="John Zaitseff ([email protected]), Roland Pabel ([email protected])" license="GPL">
+<language name="GNU Assembler" version="1.10" kateversion="2.4" section="Assembler" extensions="*.s;*.S" mimetype="text/x-asm" author="John Zaitseff ([email protected]), Roland Pabel ([email protected]), Miquel Sabaté ([email protected])" license="GPL">
   <highlighting>
     <list name="keywords">
       <item>.abort</item>
       <item>.align</item>
-      <item>.appfile</item>
+      <item>.app-file</item>
       <item>.appline</item>
       <item>.ascii</item>
       <item>.asciz</item>
+      <item>.att_syntax</item>
       <item>.balign</item>
       <item>.balignl</item>
       <item>.balignw</item>
       <item>.byte</item>
+      <item>.code16</item>
+      <item>.code32</item>
       <item>.comm</item>
       <item>.common.s</item>
       <item>.common</item>
@@ -128,6 +135,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
       <item>.ifnotdef</item>
       <item>.include</item>
       <item>.int</item>
+      <item>.intel_syntax</item>
       <item>.internal</item>
       <item>.irep</item>
       <item>.irepc</item>
@@ -148,6 +156,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
       <item>.noformat</item>
       <item>.nolist</item>
       <item>.nopage</item>
+      <item>noprefix</item>
       <item>.octa</item>
       <item>.offset</item>
       <item>.org</item>
@@ -164,6 +173,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
       <item>.purgem</item>
       <item>.pushsection</item>
       <item>.quad</item>
+      <item>.rodata</item>
       <item>.rep</item>
       <item>.rept</item>
       <item>.rva</item>
@@ -225,7 +235,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
-        <RegExpr      attribute="Label" context="#stay" String="[A-Za-z0-9_.$]+:" firstNonSpace="true"/>
+        <RegExpr      attribute="Label" context="#stay" String="[_\w\d-]*\s*:" />
         <keyword      attribute="Keyword" context="#stay" String="keywords"/>
         <HlCOct       attribute="Octal" context="#stay" />
         <HlCHex       attribute="Hex" context="#stay" />
@@ -233,29 +243,39 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <Int          attribute="Decimal" context="#stay" />
         <RegExpr      attribute="Float" context="#stay" String="0[fFeEdD][-+]?[0-9]*\.?[0-9]*[eE]?[-+]?[0-9]+" />
         <RegExpr      attribute="Normal Text" context="#stay" String="[A-Za-z_.$][A-Za-z0-9_.$]*" />
+        <HlCChar      attribute="Char" context="#stay" />
         <RegExpr      attribute="Char" context="#stay" String="'(\\x[0-9a-fA-F][0-9a-fA-F]?|\\[0-7]?[0-7]?[0-7]?|\\.|.)" />
         <DetectChar   attribute="String" context="String" char="&quot;" />
+        <RegExpr      attribute="Preprocessor" context="Preprocessor" String="#\s*if(?:def|ndef)?(?=\s+\S)" insensitive="true" beginRegion="PP" firstNonSpace="true" />
+        <RegExpr      attribute="Preprocessor" context="Preprocessor" String="#\s*endif" insensitive="true" endRegion="PP" firstNonSpace="true" />
+        <RegExpr      attribute="Preprocessor" context="Define" String="#\s*define.*((?=\\))" insensitive="true" firstNonSpace="true" />
+        <RegExpr      attribute="Preprocessor" context="Preprocessor" String="#\s*(?:el(?:se|if)|include(?:_next)?|define|undef|line|error|warning|pragma)" firstNonSpace="true" />
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="*" />
-        <AnyChar      attribute="Comment" context="Commentar 2" String="@;" />
+        <AnyChar      attribute="Comment" context="Commentar 2" String="@;#" />
         <AnyChar      attribute="Symbol" context="#stay" String="!#%&amp;*()+,-&lt;=&gt;?/:[]^{|}~" />
-        <RegExpr      attribute="Preprocessor" context="Preprocessor" String="^#" />
       </context>
       <context attribute="Comment" lineEndContext="#stay" name="Commentar 1">
+        <IncludeRules context="##Alerts" />
         <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" />
       </context>
-      <context attribute="Comment" lineEndContext="#pop" name="Commentar 2" />
-      <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor" />
+      <context attribute="Comment" lineEndContext="#pop" name="Commentar 2" >
+        <IncludeRules context="##Alerts" />
+      </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue  attribute="String" context="Some Context" />
         <HlCStringChar attribute="String Char" context="#stay" />
         <DetectChar    attribute="String" context="#pop" char="&quot;" />
       </context>
+      <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor" />
+      <context attribute="Preprocessor" lineEndContext="#pop" name="Define">
+        <LineContinue attribute="Preprocessor" context="#stay"/>
+      </context>
       <context attribute="Normal Text" lineEndContext="#pop" name="Some Context" />
     </contexts>
 
     <itemDatas>
       <itemData name="Normal Text"  defStyleNum="dsNormal"   />
-      <itemData name="Label"        defStyleNum="dsNormal"   />
+      <itemData name="Label"        defStyleNum="dsKeyword"  />
       <itemData name="Keyword"      defStyleNum="dsKeyword"  />
       <itemData name="Decimal"      defStyleNum="dsDecVal"   />
       <itemData name="Octal"        defStyleNum="dsBaseN"    />
@@ -273,8 +293,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
   <general>
     <comments>
-      <comment name="singleLine" start=";" />
+      <!--<comment name="singleLine" start=";" />
       <comment name="singleLine" start="@" />
+      <comment name="singleLine" start="#" />-->
       <comment name="multiLine"  start="/*" end="*/" />
     </comments>
     <keywords casesensitive="1" weakDeliminator="_.$" />
diff --git a/kate/data/go.xml b/kate/data/go.xml
new file mode 100644
index 000000000..2913ce0c7
--- /dev/null
+++ b/kate/data/go.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+
+<!--
+This file is part of TDE's Kate project
+
+GO.XML supports syntax highlighting for the Go programming language
+under Kate. Go is a compiled, garbage-collected, concurrent programming
+language developed by Google Inc.
+
+Copyright (C) 2010, Miquel Sabaté <[email protected]>
+
+This program, including associated files, is free software.  You may
+distribute 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 (at your option) 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.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+-->
+
+
+<language name="Go" version="1.00" kateversion="2.4" section="Sources" indenter="cstyle" extensions="*.go" author="Miquel Sabaté ([email protected])" license="GPL">
+    <highlighting>
+    <list name="keywords">
+<!-- Keywords have been taken from The Go Programming Language Specification -> Keywords section -->
+      <item>break</item>
+      <item>case</item>
+      <item>chan</item>
+      <item>const</item>
+      <item>continue</item>
+      <item>default</item>
+      <item>defer</item>
+      <item>else</item>
+      <item>fallthrough</item>
+      <item>for</item>
+      <item>func</item>
+      <item>go</item>
+      <item>goto</item>
+      <item>if</item>
+      <item>import</item>
+      <item>interface</item>
+      <item>map</item>
+<!--       <item>package</item> -->
+      <item>range</item>
+      <item>return</item>
+      <item>select</item>
+      <item>struct</item>
+      <item>switch</item>
+      <item>type</item>
+      <item>var</item>
+    </list>
+    <list name="types">
+      <item>bool</item>
+      <item>byte</item>
+      <item>complex64</item>
+      <item>complex128</item>
+      <item>float</item>
+      <item>float32</item>
+      <item>float64</item>
+      <item>int</item>
+      <item>int8</item>
+      <item>int16</item>
+      <item>int32</item>
+      <item>int64</item>
+      <item>string</item>
+      <item>uint</item>
+      <item>uint8</item>
+      <item>uint16</item>
+      <item>uint32</item>
+      <item>uint64</item>
+    </list>
+    <list name="builtin">
+      <item>cap</item>
+      <item>len</item>
+      <item>make</item>
+      <item>new</item>
+      <item>panic</item>
+      <item>recover</item>
+    </list>
+    <list name="special">
+      <item>false</item>
+      <item>nil</item>
+      <item>true</item>
+    </list>
+    <contexts>
+      <context name="normal" attribute="Normal Text" lineEndContext="#stay">
+      <keyword attribute="Keyword" context="#stay" String="keywords" />
+      <keyword attribute="Special" context="#stay" String="special"  />
+      <keyword attribute="Type" context="#stay" String="types"       />
+      <keyword attribute="Builtin" context="#stay" String="builtin"  />
+      <StringDetect attribute="Package" context="Package" String="package" />
+      <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
+      <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1"   />
+      <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"   />
+      <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*"   />
+      <HlCChar attribute="Char" context="#stay" />
+      <DetectChar attribute="String" context="String" char="&quot;" />
+      </context>
+
+      <context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
+        <LineContinue attribute="Comment" context="#stay"/>
+        <DetectSpaces />
+        <IncludeRules context="##Alerts" />
+        <DetectIdentifier />
+      </context>
+
+      <context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
+        <DetectSpaces />
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
+        <IncludeRules context="##Alerts" />
+        <DetectIdentifier />
+      </context>
+
+      <context attribute="Package" lineEndContext="#pop" name="Package" />
+
+      <context attribute="String" lineEndContext="#pop" name="String">
+        <LineContinue  attribute="String" context="#stay" />
+        <HlCStringChar attribute="String Char" context="#stay" />
+        <DetectChar    attribute="String" context="#pop" char="&quot;" />
+      </context>
+    </contexts>
+    <itemDatas>
+      <itemData name="Normal Text"  defStyleNum="dsNormal"   spellChecking="false"/>
+      <itemData name="Keyword"      defStyleNum="dsKeyword"  spellChecking="false"/>
+      <itemData name="Special"      defStyleNum="dsOthers"   spellChecking="false"/>
+      <itemData name="Type"         defStyleNum="dsDataType" spellChecking="false"/>
+      <itemData name="Builtin"      defStyleNum="dsOthers"   color="#000e52" selColor="#ffffff" spellChecking="false" />
+      <itemData name="String Char"  defStyleNum="dsChar"    />
+      <itemData name="String"       defStyleNum="dsString"  />
+      <itemData name="Comment"      defStyleNum="dsComment" />
+      <itemData name="Char"         defStyleNum="dsChar"   spellChecking="false"/>
+      <itemData name="Package"      defStyleNum="dsNormal" color="#000080" selColor="#ffffff" spellChecking="false" />
+      <itemData name="Symbol"       defStyleNum="dsNormal" spellChecking="false"/>
+    </itemDatas>
+    </highlighting>
+  <general>
+    <comments>
+      <comment name="singleLine" start="//" />
+      <comment name="multiLine" start="/*" end="*/" region="Comment"/>
+    </comments>
+    <keywords casesensitive="1"/>
+  </general>
+</language>
diff --git a/kate/data/grammar.xml b/kate/data/grammar.xml
new file mode 100644
index 000000000..8156c404b
--- /dev/null
+++ b/kate/data/grammar.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!--
+  Syntax definition for tdev-pg/tdev-pg-qt grammars.
+-->
+<language name="KDev-PG[-Qt] Grammar" version="0.24" kateversion="2.5" section="Sources" extensions="*.g" casesensitive="1" author="Milian Wolff ([email protected]), Jonathan Schmidt-Dominé ([email protected])" license="">
+  <highlighting>
+    <list name="macros">
+      <item> ast_extra_members </item>
+      <item> export_macro </item>
+      <item> export_macro_header </item>
+      <item> namespace </item>
+      <item> parserclass </item>
+      <item> token </item>
+      <item> token_stream </item>
+      <item> parser_declaration_header </item>
+      <item> parser_bits_header </item>
+      <item> ast_header </item>
+      <item> ast_base </item>
+      <item> parser_base </item>
+      <item> bin </item>
+      <item> pre </item>
+      <item> post </item>
+      <item> tern </item>
+      <item> paren </item>
+      <item> left </item>
+      <item> right </item>
+      <item> &lt; </item>
+      <item> &gt; </item>
+    </list>
+    <list name="keywords">
+      <item> try/rollback </item>
+      <item> try/recover </item>
+      <item> catch </item>
+    </list>
+    <list name="access">
+      <item> public </item>
+      <item> protected </item>
+      <item> private </item>
+    </list>
+    <list name="locations">
+      <item> declaration </item>
+      <item> destructor </item>
+      <item> constructor </item>
+    </list>
+    
+    <contexts>
+      <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
+        <!-- keywords -->
+        <DetectChar attribute="Keyword" context="Macros" char="%" firstNonSpace="true" />
+        <keyword attribute="Keyword" context="#stay" String="keywords" />
+        <keyword attribute="Access" context="#stay" String="access" />
+        <keyword attribute="Location" context="#stay" String="locations" />
+        <!-- numbers -->
+        <Float attribute="Float" context="#stay" />
+        <Int attribute="Decimal" context="#stay" />
+        <!-- strings -->
+        <DetectChar attribute="String" context="String" char="&quot;" />
+        <!-- comments -->
+        <Detect2Chars attribute="Comment" context="SingleLineComment" char="-" char1="-" />
+        <!-- code segments -->
+        <Detect2Chars attribute="Code Segment" context="CodeSegment" char="[" char1=":" beginRegion="code" />
+        <!-- tokens are all-uppercase -->
+        <RegExpr attribute="Token" insensitive="false" context="#stay" String="\b[A-Z_]+\b" />
+        <!-- simple use of an ASTNode without assigning it -->
+        <RegExpr attribute="AstNode" insensitive="true" context="#stay" String="\b[a-z]+\b(?!=)" />
+        <!-- member=ASTNode -->
+        <DetectChar attribute="Symbol" context="MemberAst" char="=" />
+        <!-- -> ASTNode -->
+        <Detect2Chars attribute="Symbol" context="AstDecl" char="-" char1=">" />
+        <!-- symbols -->
+        <AnyChar attribute="Symbol" context="#stay" String=";[()]->|=*#@:?" />
+      </context>
+      <!-- keywords -->
+      <context name="Macros" attribute="Keyword" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop">
+        <keyword attribute="Keyword" context="#stay" String="macros" />
+        <Detect2Chars lookAhead="true" context="#pop" attribute="Normal Text" char="[" char1=":" />
+        <Detect2Chars context="#pop" attribute="Keyword" char=";" char1=";" />
+      </context>
+      <!-- "string" -->
+      <context name="String" attribute="String" lineEndContext="#stay">
+        <HlCStringChar attribute="String Char" context="#stay" />
+        <DetectChar attribute="String" context="#pop" char="&quot;" />
+      </context>
+      <!-- comments -->
+      <context name="SingleLineComment" attribute="Comment" lineEndContext="#pop"/>
+      <!-- code segments -->
+      <context name="CodeSegment" attribute="Code Segmentt" lineEndContext="#stay">
+        <Detect2Chars attribute="Code Segment" context="#pop" char=":" char1="]" endRegion="code" />
+        <IncludeRules context="##C++" />
+      </context>
+      <!-- memberVar=AstNode -->
+      <context name="MemberAst" attribute="AstNode" lineEndContext="#pop">
+        <DetectSpaces />
+        <!-- tokens are all-uppercase -->
+        <RegExpr attribute="Token" insensitive="false" context="#pop" String="\b[A-Z_]+\b" />
+        <DetectIdentifier attribute="AstNode" context="#pop" />
+      </context>
+      <!-- -> AstNode -->
+      <context name="AstDecl" attribute="Error" lineEndContext="#stay">
+        <DetectSpaces attribute="Normal Text" />
+        <DetectIdentifier attribute="AstNode" />
+        <DetectChar char="[" attribute="Symbol" context="AstMemberDecl" />
+        <Detect2Chars char=";" char1=";" attribute="Symbol" context="#pop" />
+      </context>
+      <!-- member or temporary variables -->
+      <context name="AstMemberDecl" attribute="Normal Text" lineEndContext="#stay">
+        <DetectSpaces />
+        <RegExpr attribute="Keyword" String="\b(member|temporary)\s+variable\b" />
+        <DetectIdentifier attribute="AstMember" />
+        <DetectChar attribute="Symbol" char=":" context="AstMemberType" />
+        <DetectChar attribute="Symbol" char="]" context="#pop" />
+      </context>
+      <context name="AstMemberType" attribute="Normal Text" lineEndContext="#stay">
+        <DetectIdentifier attribute="AstMemberType" />
+        <DetectChar attribute="Symbol" char=";" context="#pop" />
+      </context>
+    </contexts>
+    <itemDatas>
+      <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false" />
+      <itemData name="Keyword" defStyleNum="dsKeyword" spellChecking="false" />
+      <itemData name="Access" defStyleNum="dsDataType" spellChecking="false" />
+      <itemData name="Location" defStyleNum="dsOthers" spellChecking="false" />
+      <itemData name="Decimal"  defStyleNum="dsDecVal" spellChecking="false" />
+      <itemData name="Float"  defStyleNum="dsFloat" spellChecking="false" />
+      <itemData name="String" defStyleNum="dsString" />
+      <itemData name="String Char" defStyleNum="dsChar" spellChecking="false" />
+      <itemData name="Comment" defStyleNum="dsComment" />
+      <itemData name="Symbol" defStyleNum="dsOthers" />
+      <itemData name="Code Segment" defStyleNum="dsFunction" />
+      <itemData name="Token" defStyleNum="dsKeyword" spellChecking="false" />
+      <itemData name="AstNode" defStyleNum="dsFunction" spellChecking="false" />
+      <itemData name="Error" defStyleNum="dsError" spellChecking="false" />
+      <itemData name="AstMember" defStyleNum="dsNormal" spellChecking="false" />
+      <itemData name="AstMemberType" defStyleNum="dsDataType" spellChecking="false" />
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name="singleLine" start="--" />
+    </comments>
+    <keywords casesensitive="true" weakDeliminator="/" />
+  </general>
+</language>
+
diff --git a/kate/data/haskell.xml b/kate/data/haskell.xml
index 34dff8c7f..1d73e319a 100644
--- a/kate/data/haskell.xml
+++ b/kate/data/haskell.xml
@@ -1,388 +1,380 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<!-- Haskell syntax highlighting by Marcel Martin <[email protected]> -->
-<language name="Haskell" version="1.2" kateversion="2.3" section="Sources" extensions="*.hs" mimetype="text/x-haskell" author="Marcel Martin ([email protected])" license="" indenter="haskell">
-	<highlighting>
-	<list name="keywords">
-		<item> case </item>
-		<item> class </item>
-		<item> data </item>
-		<item> deriving </item>
-		<item> do </item>
-		<item> else </item>
-		<item> if </item>
-		<item> import </item>
-		<item> in </item>
-		<item> infixl </item>
-		<item> infixr </item>
-		<item> instance </item>
-		<item> let </item>
-		<item> module </item>
-		<item> of </item>
-		<item> primitive </item>
-		<item> then </item>
-		<item> type </item>
-		<item> where </item>
-	</list>
-        <list name="infix operators">
-		<item> quot </item>
-		<item> rem </item>
-		<item> div </item>
-		<item> mod </item>
-		<item> elem </item>
-		<item> notElem </item>
-		<item> seq </item>
-	</list>
-	<list name="functions">
-		<!--
-                These operators are not handled yet.
-		<item> !! </item>
-		<item> % </item>
-		<item> && </item>
-		<item> $! </item>
-		<item> $ </item>
-		<item> * </item>
-		<item> ** </item>
-		<item> - </item>
-		<item> . </item>
-		<item> /= </item>
-		<item> < </item>
-		<item> <= </item>
-		<item> =<< </item>
-		<item> == </item>
-		<item> > </item>
-		<item> >= </item>
-		<item> >> </item>
-		<item> >>= </item>
-		<item> ^ </item>
-		<item> ^^ </item>
-		<item> ++ </item>
-		<item> || </item>
-		//-->
+<language name="Haskell" version="2.0.3" kateversion="2.3" section="Sources" extensions="*.hs" mimetype="text/x-haskell" author="Nicolas Wu ([email protected])" license="LGPL" indenter="haskell">
+  <highlighting>
+  <list name="keywords">
+    <item> as </item>
+    <item> case </item>
+    <item> class </item>
+    <item> data </item>
+    <item> deriving </item>
+    <item> do </item>
+    <item> else </item>
+    <item> hiding </item>
+    <item> if </item>
+    <item> import </item>
+    <item> in </item>
+    <item> infixl </item>
+    <item> infixr </item>
+    <item> instance </item>
+    <item> let </item>
+    <item> module </item>
+    <item> newtype </item>
+    <item> of </item>
+    <item> primitive </item>
+    <item> qualified </item>
+    <item> then </item>
+    <item> type </item>
+    <item> where </item>
+  </list>
+  <list name="prelude function">
+    <item> FilePath </item>
+    <item> IOError </item>
+    <item> abs </item>
+    <item> acos </item>
+    <item> acosh </item>
+    <item> all </item>
+    <item> and </item>
+    <item> any </item>
+    <item> appendFile </item>
+    <item> approxRational </item>
+    <item> asTypeOf </item>
+    <item> asin </item>
+    <item> asinh </item>
+    <item> atan </item>
+    <item> atan2 </item>
+    <item> atanh </item>
+    <item> basicIORun </item>
+    <item> break </item>
+    <item> catch </item>
+    <item> ceiling </item>
+    <item> chr </item>
+    <item> compare </item>
+    <item> concat </item>
+    <item> concatMap </item>
+    <item> const </item>
+    <item> cos </item>
+    <item> cosh </item>
+    <item> curry </item>
+    <item> cycle </item>
+    <item> decodeFloat </item>
+    <item> denominator </item>
+    <item> digitToInt </item>
+    <item> div </item>
+    <item> divMod </item>
+    <item> drop </item>
+    <item> dropWhile </item>
+    <item> either </item>
+    <item> elem </item>
+    <item> encodeFloat </item>
+    <item> enumFrom </item>
+    <item> enumFromThen </item>
+    <item> enumFromThenTo </item>
+    <item> enumFromTo </item>
+    <item> error </item>
+    <item> even </item>
+    <item> exp </item>
+    <item> exponent </item>
+    <item> fail </item>
+    <item> filter </item>
+    <item> flip </item>
+    <item> floatDigits </item>
+    <item> floatRadix </item>
+    <item> floatRange </item>
+    <item> floor </item>
+    <item> fmap </item>
+    <item> foldl </item>
+    <item> foldl1 </item>
+    <item> foldr </item>
+    <item> foldr1 </item>
+    <item> fromDouble </item>
+    <item> fromEnum </item>
+    <item> fromInt </item>
+    <item> fromInteger </item>
+    <item> fromIntegral </item>
+    <item> fromRational </item>
+    <item> fst </item>
+    <item> gcd </item>
+    <item> getChar </item>
+    <item> getContents </item>
+    <item> getLine </item>
+    <item> group </item>
+    <item> head </item>
+    <item> id </item>
+    <item> inRange </item>
+    <item> index </item>
+    <item> init </item>
+    <item> intToDigit </item>
+    <item> interact </item>
+    <item> ioError </item>
+    <item> isAlpha </item>
+    <item> isAlphaNum </item>
+    <item> isAscii </item>
+    <item> isControl </item>
+    <item> isDenormalized </item>
+    <item> isDigit </item>
+    <item> isHexDigit </item>
+    <item> isIEEE </item>
+    <item> isInfinite </item>
+    <item> isLower </item>
+    <item> isNaN </item>
+    <item> isNegativeZero </item>
+    <item> isOctDigit </item>
+    <item> isPrint </item>
+    <item> isSpace </item>
+    <item> isUpper </item>
+    <item> iterate </item>
+    <item> last </item>
+    <item> lcm </item>
+    <item> length </item>
+    <item> lex </item>
+    <item> lexDigits </item>
+    <item> lexLitChar </item>
+    <item> lines </item>
+    <item> log </item>
+    <item> logBase </item>
+    <item> lookup </item>
+    <item> map </item>
+    <item> mapM </item>
+    <item> mapM_ </item>
+    <item> max </item>
+    <item> maxBound </item>
+    <item> maximum </item>
+    <item> maybe </item>
+    <item> min </item>
+    <item> minBound </item>
+    <item> minimum </item>
+    <item> mod </item>
+    <item> negate </item>
+    <item> not </item>
+    <item> notElem </item>
+    <item> null </item>
+    <item> numerator </item>
+    <item> odd </item>
+    <item> or </item>
+    <item> ord </item>
+    <item> otherwise </item>
+    <item> pack </item>
+    <item> pi </item>
+    <item> pred </item>
+    <item> primExitWith </item>
+    <item> print </item>
+    <item> product </item>
+    <item> properFraction </item>
+    <item> putChar </item>
+    <item> putStr </item>
+    <item> putStrLn </item>
+    <item> quot </item>
+    <item> quotRem </item>
+    <item> range </item>
+    <item> rangeSize </item>
+    <item> read </item>
+    <item> readDec </item>
+    <item> readFile </item>
+    <item> readFloat </item>
+    <item> readHex </item>
+    <item> readIO </item>
+    <item> readInt </item>
+    <item> readList </item>
+    <item> readLitChar </item>
+    <item> readLn </item>
+    <item> readOct </item>
+    <item> readParen </item>
+    <item> readSigned </item>
+    <item> reads </item>
+    <item> readsPrec </item>
+    <item> realToFrac </item>
+    <item> recip </item>
+    <item> rem </item>
+    <item> repeat </item>
+    <item> replicate </item>
+    <item> return </item>
+    <item> reverse </item>
+    <item> round </item>
+    <item> scaleFloat </item>
+    <item> scanl </item>
+    <item> scanl1 </item>
+    <item> scanr </item>
+    <item> scanr1 </item>
+    <item> seq </item>
+    <item> sequence </item>
+    <item> sequence_ </item>
+    <item> show </item>
+    <item> showChar </item>
+    <item> showInt </item>
+    <item> showList </item>
+    <item> showLitChar </item>
+    <item> showParen </item>
+    <item> showSigned </item>
+    <item> showString </item>
+    <item> shows </item>
+    <item> showsPrec </item>
+    <item> significand </item>
+    <item> signum </item>
+    <item> sin </item>
+    <item> sinh </item>
+    <item> snd </item>
+    <item> sort </item>
+    <item> span </item>
+    <item> splitAt </item>
+    <item> sqrt </item>
+    <item> subtract </item>
+    <item> succ </item>
+    <item> sum </item>
+    <item> tail </item>
+    <item> take </item>
+    <item> takeWhile </item>
+    <item> tan </item>
+    <item> tanh </item>
+    <item> threadToIOResult </item>
+    <item> toEnum </item>
+    <item> toInt </item>
+    <item> toInteger </item>
+    <item> toLower </item>
+    <item> toRational </item>
+    <item> toUpper </item>
+    <item> truncate </item>
+    <item> uncurry </item>
+    <item> undefined </item>
+    <item> unlines </item>
+    <item> until </item>
+    <item> unwords </item>
+    <item> unzip </item>
+    <item> unzip3 </item>
+    <item> userError </item>
+    <item> words </item>
+    <item> writeFile </item>
+    <item> zip </item>
+    <item> zip3 </item>
+    <item> zipWith </item>
+    <item> zipWith3 </item>
+  </list>
+  <list name="prelude class">
+    <item> Bounded </item>
+    <item> Enum </item>
+    <item> Eq </item>
+    <item> Floating </item>
+    <item> Fractional </item>
+    <item> Functor </item>
+    <item> Integral </item>
+    <item> Ix </item>
+    <item> Monad </item>
+    <item> Num </item>
+    <item> Ord </item>
+    <item> Read </item>
+    <item> Real </item>
+    <item> RealFloat </item>
+    <item> RealFrac </item>
+    <item> Show </item>
+  </list>
+  <list name="prelude type">
+    <item> Bool </item>
+    <item> Char </item>
+    <item> Double </item>
+    <item> Either </item>
+    <item> FilePath </item>
+    <item> Float </item>
+    <item> Int </item>
+    <item> Integer </item>
+    <item> IO </item>
+    <item> IOError </item>
+    <item> Maybe </item>
+    <item> Ordering </item>
+    <item> Ratio </item>
+    <item> Rational </item>
+    <item> ReadS </item>
+    <item> ShowS </item>
+    <item> String </item>
+    <item> ByteString </item>
+  </list>
+  <list name="prelude data">
+    <item> False </item>
+    <item> True </item>
+    <item> Left </item>
+    <item> Right </item>
+    <item> Just </item>
+    <item> Nothing </item>
+    <item> EQ </item>
+    <item> LT </item>
+    <item> GT </item>
+  </list>
+  <contexts>
+    <context attribute="Normal" lineEndContext="#stay" name="code">
+      <RegExpr attribute="Pragma"  context="#stay" String="\{-#.*#-\}"/>
+      <RegExpr attribute="Comment" context="comments" String="\{-[^#]?" />
+      <RegExpr attribute="Comment" context="comment"  String="--[^\-!#\$%&amp;\*\+/&lt;=&gt;\?&#92;@\^\|~\.:].*$" />
 
-		<item> FilePath </item>
-		<item> IOError </item>
-		<item> abs </item>
-		<item> acos </item>
-		<item> acosh </item>
-		<item> all </item>
-		<item> and </item>
-		<item> any </item>
-		<item> appendFile </item>
-		<item> approxRational </item>
-		<item> asTypeOf </item>
-		<item> asin </item>
-		<item> asinh </item>
-		<item> atan </item>
-		<item> atan2 </item>
-		<item> atanh </item>
-		<item> basicIORun </item>
-		<item> break </item>
-		<item> catch </item>
-		<item> ceiling </item>
-		<item> chr </item>
-		<item> compare </item>
-		<item> concat </item>
-		<item> concatMap </item>
-		<item> const </item>
-		<item> cos </item>
-		<item> cosh </item>
-		<item> curry </item>
-		<item> cycle </item>
-		<item> decodeFloat </item>
-		<item> denominator </item>
-		<item> digitToInt </item>
-		<item> div </item>
-		<item> divMod </item>
-		<item> drop </item>
-		<item> dropWhile </item>
-		<item> either </item>
-		<item> elem </item>
-		<item> encodeFloat </item>
-		<item> enumFrom </item>
-		<item> enumFromThen </item>
-		<item> enumFromThenTo </item>
-		<item> enumFromTo </item>
-		<item> error </item>
-		<item> even </item>
-		<item> exp </item>
-		<item> exponent </item>
-		<item> fail </item>
-		<item> filter </item>
-		<item> flip </item>
-		<item> floatDigits </item>
-		<item> floatRadix </item>
-		<item> floatRange </item>
-		<item> floor </item>
-		<item> fmap </item>
-		<item> foldl </item>
-		<item> foldl1 </item>
-		<item> foldr </item>
-		<item> foldr1 </item>
-		<item> fromDouble </item>
-		<item> fromEnum </item>
-		<item> fromInt </item>
-		<item> fromInteger </item>
-		<item> fromIntegral </item>
-		<item> fromRational </item>
-		<item> fst </item>
-		<item> gcd </item>
-		<item> getChar </item>
-		<item> getContents </item>
-		<item> getLine </item>
-		<item> head </item>
-		<item> id </item>
-		<item> inRange </item>
-		<item> index </item>
-		<item> init </item>
-		<item> intToDigit </item>
-		<item> interact </item>
-		<item> ioError </item>
-		<item> isAlpha </item>
-		<item> isAlphaNum </item>
-		<item> isAscii </item>
-		<item> isControl </item>
-		<item> isDenormalized </item>
-		<item> isDigit </item>
-		<item> isHexDigit </item>
-		<item> isIEEE </item>
-		<item> isInfinite </item>
-		<item> isLower </item>
-		<item> isNaN </item>
-		<item> isNegativeZero </item>
-		<item> isOctDigit </item>
-		<item> isPrint </item>
-		<item> isSpace </item>
-		<item> isUpper </item>
-		<item> iterate </item>
-		<item> last </item>
-		<item> lcm </item>
-		<item> length </item>
-		<item> lex </item>
-		<item> lexDigits </item>
-		<item> lexLitChar </item>
-		<item> lines </item>
-		<item> log </item>
-		<item> logBase </item>
-		<item> lookup </item>
-		<item> map </item>
-		<item> mapM </item>
-		<item> mapM_ </item>
-		<item> max </item>
-		<item> maxBound </item>
-		<item> maximum </item>
-		<item> maybe </item>
-		<item> min </item>
-		<item> minBound </item>
-		<item> minimum </item>
-		<item> mod </item>
-		<item> negate </item>
-		<item> not </item>
-		<item> notElem </item>
-		<item> null </item>
-		<item> numerator </item>
-		<item> odd </item>
-		<item> or </item>
-		<item> ord </item>
-		<item> otherwise </item>
-		<item> pi </item>
-		<item> pred </item>
-		<item> primExitWith </item>
-		<item> print </item>
-		<item> product </item>
-		<item> properFraction </item>
-		<item> putChar </item>
-		<item> putStr </item>
-		<item> putStrLn </item>
-		<item> quot </item>
-		<item> quotRem </item>
-		<item> range </item>
-		<item> rangeSize </item>
-		<item> read </item>
-		<item> readDec </item>
-		<item> readFile </item>
-		<item> readFloat </item>
-		<item> readHex </item>
-		<item> readIO </item>
-		<item> readInt </item>
-		<item> readList </item>
-		<item> readLitChar </item>
-		<item> readLn </item>
-		<item> readOct </item>
-		<item> readParen </item>
-		<item> readSigned </item>
-		<item> reads </item>
-		<item> readsPrec </item>
-		<item> realToFrac </item>
-		<item> recip </item>
-		<item> rem </item>
-		<item> repeat </item>
-		<item> replicate </item>
-		<item> return </item>
-		<item> reverse </item>
-		<item> round </item>
-		<item> scaleFloat </item>
-		<item> scanl </item>
-		<item> scanl1 </item>
-		<item> scanr </item>
-		<item> scanr1 </item>
-		<item> seq </item>
-		<item> sequence </item>
-		<item> sequence_ </item>
-		<item> show </item>
-		<item> showChar </item>
-		<item> showInt </item>
-		<item> showList </item>
-		<item> showLitChar </item>
-		<item> showParen </item>
-		<item> showSigned </item>
-		<item> showString </item>
-		<item> shows </item>
-		<item> showsPrec </item>
-		<item> significand </item>
-		<item> signum </item>
-		<item> sin </item>
-		<item> sinh </item>
-		<item> snd </item>
-		<item> span </item>
-		<item> splitAt </item>
-		<item> sqrt </item>
-		<item> subtract </item>
-		<item> succ </item>
-		<item> sum </item>
-		<item> tail </item>
-		<item> take </item>
-		<item> takeWhile </item>
-		<item> tan </item>
-		<item> tanh </item>
-		<item> threadToIOResult </item>
-		<item> toEnum </item>
-		<item> toInt </item>
-		<item> toInteger </item>
-		<item> toLower </item>
-		<item> toRational </item>
-		<item> toUpper </item>
-		<item> truncate </item>
-		<item> uncurry </item>
-		<item> undefined </item>
-		<item> unlines </item>
-		<item> until </item>
-		<item> unwords </item>
-		<item> unzip </item>
-		<item> unzip3 </item>
-		<item> userError </item>
-		<item> words </item>
-		<item> writeFile </item>
-		<item> zip </item>
-		<item> zip3 </item>
-		<item> zipWith </item>
-		<item> zipWith3 </item>
-	</list>
-	<list name="type constructors">
-		<item> Bool </item>
-		<item> Char </item>
-                <item> Double </item>
-		<item> Either </item>
-		<item> Float </item>
-		<item> IO </item>
-		<item> Integer </item>
-		<item> Int </item>
-		<item> Maybe </item>
-		<item> Ordering </item>
-		<item> Rational </item>
-		<item> Ratio </item>
-		<item> ReadS </item>
-		<item> ShowS </item>
-		<item> String </item>
+      <keyword attribute="Keyword"          context="#stay" String="keywords" />
+      <keyword attribute="Function Prelude" context="#stay" String="prelude function" />
+      <keyword attribute="Type Prelude"     context="#stay" String="prelude type" />
+      <keyword attribute="Data Prelude"     context="#stay" String="prelude data" />
+      <keyword attribute="Class Prelude"    context="#stay" String="prelude class" />
 
-	</list>
-	<list name="classes">
-		<item> Bounded </item>
-		<item> Enum </item>
-		<item> Eq </item>
-		<item> Floating </item>
-		<item> Fractional </item>
-		<item> Functor </item>
-		<item> Integral </item>
-		<item> Ix </item>
-		<item> Monad </item>
-		<item> Num </item>
-		<item> Ord </item>
-		<item> Read </item>
-		<item> RealFloat </item>
-		<item> RealFrac </item>
-		<item> Real </item>
-		<item> Show </item>
-	</list>
-	<list name="data constructors">
-		<item> EQ </item>
-		<item> False </item>
-		<item> GT </item>
-		<item> Just </item>
-		<item> LT </item>
-		<item> Left </item>
-		<item> Nothing </item>
-		<item> Right </item>
-		<item> True </item>
-	</list>
-	<contexts>
-		<context attribute="Normal Text" lineEndContext="#stay" name="normal">
-			<Detect2Chars attribute="Comment" context="comment_multi_line" char="{" char1="-" />
-			<Detect2Chars attribute="Comment" context="comment_single_line" char="-" char1="-" />
-			<keyword attribute="Keyword" context="#stay" String="keywords" />
-			<keyword attribute="Class" context="#stay" String="classes" />
-			<keyword attribute="Type Constructor" context="#stay" String="type constructors" />
-			<keyword attribute="Function" context="#stay" String="functions" />
-			<keyword attribute="Data Constructor" context="#stay" String="data constructors" />
-			<DetectChar attribute="String" context="string" char="&quot;" />
-			<DetectChar attribute="Infix Operator" context="infix" char="`"/>
-			<RegExpr attribute="Normal Text" context="#stay" String="\w[']+" />
-			<DetectChar attribute="Char" context="single_char" char="'" />
-			<RegExpr attribute="Function Definition" context="#stay" String="[a-z_]+\w*'*\s*::" />
-			<Float attribute="Float" context="#stay" />
-			<Int attribute="Decimal" context="#stay" />
-		</context>
-		<context attribute="Comment" lineEndContext="#pop" name="comment_single_line" />
-		<context attribute="Comment" lineEndContext="#stay" name="comment_multi_line">
-			<Detect2Chars attribute="Comment" context="#pop" char="-" char1="}" />
-		</context>
-		<context attribute="String" lineEndContext="#stay" name="string">
-			<RegExpr attribute="String" context="#stay" String="\\." />
-			<DetectChar attribute="String" context="#pop" char="&quot;" />
-		</context>
-		<context attribute="Infix Operator" lineEndContext="#stay" name="infix">
-			<DetectChar attribute="Infix Operator" context="#pop" char="`"/>
-		</context>
-		<context attribute="Char" lineEndContext="#pop" name="single_char">
-			<RegExpr attribute="Char" context="#stay" String="\\." />
-			<DetectChar attribute="Char" context="#pop" char="'" />
-		</context>
-		<context attribute="Function Definition" lineEndContext="#pop" name="function_definition">
-			<DetectChar attribute="Function Definition" context="#pop" char=";" />
-		</context>
-	</contexts>
-	<itemDatas>
-		<itemData name="Normal Text"		defStyleNum="dsNormal"/>
-		<itemData name="Keyword" 		defStyleNum="dsKeyword"/>
-		<itemData name="Function"		defStyleNum="dsFunction"/>
-		<itemData name="Function Definition"	defStyleNum="dsFunction"/>
-		<itemData name="Class"			defStyleNum="dsKeyword"/>
-		<itemData name="Decimal"		defStyleNum="dsDecVal"/>
-		<itemData name="Float"			defStyleNum="dsFloat"/>
-		<itemData name="Char"			defStyleNum="dsChar"/>
-		<itemData name="String"			defStyleNum="dsString"/>
-		<itemData name="Constructor"		defStyleNum="dsOthers"/>
-		<itemData name="Comment"		defStyleNum="dsComment"/>
-		<itemData name="Data Constructor"	defStyleNum="dsKeyword"/>
-		<itemData name="Type Constructor"	defStyleNum="dsDataType"/>
-		<itemData name="Infix Operator"		defStyleNum="dsOthers"/>
-	</itemDatas>
-	</highlighting>
-	<general>
-		<comments>
-			<comment name="singleLine" start="--" />
-			<comment name="multiLine" start="{-" end="-}" />
-		</comments>
-		<keywords casesensitive="1" />
-	</general>
+      <RegExpr attribute="Special"          context="#stay" String="(::|=&gt;|\-&gt;|&lt;\-)" />
+      <AnyChar attribute="Special"          context="#stay" String="∷⇒→←∀∃" />
+      <RegExpr attribute="Signature"        context="#stay" String="\s*[a-z][a-zA-Z0-9_']*\s*(?=::[^\-!#\$%&amp;\*\+/&lt;=&gt;\?&#92;@\^\|~\.:])" />
+      <RegExpr attribute="Signature"        context="#stay" String="\s*(\([\-!#\$%&amp;\*\+/&lt;=&gt;\?&#92;@\^\|~\.:]*\))*\s*(?=::[^\-!#\$%&amp;\*\+/&lt;=&gt;\?&#92;@\^\|~\.:])" />
+      <RegExpr attribute="Function"         context="#stay" String="([A-Z][a-zA-Z0-9_']*\.)*[a-z][a-zA-Z0-9_']*" />
+      <RegExpr attribute="Operator"         context="#stay" String="([A-Z][a-zA-Z0-0_']*\.)*[\-!#\$%&amp;\*\+/&lt;=&gt;\?&#92;@\^\|~\.:]+" />
+      <RegExpr attribute="Type"             context="#stay" String="([A-Z][a-zA-Z0-9_']*\.)*[A-Z][a-zA-Z0-9_']*" />
+
+      <Int        attribute="Decimal" context="#stay" />
+      <RegExpr    attribute="Float"   context="#stay" String="\d+\.\d+" />
+      <DetectChar attribute="Char"    context="char" char="'" />
+      <DetectChar attribute="String"  context="string" char="&quot;" />
+
+      <DetectChar attribute="Function Infix" context="infix" char="`"/>
+      <Detect2Chars attribute="EnumFromTo" context="#stay" char ="." char1="." />
+      <AnyChar      attribute="EnumFromTo" context="#stay" String="‥" />
+    </context>
+    <context attribute="Comment" lineEndContext="#pop" name="comment" />
+    <context attribute="Comment" lineEndContext="#stay" name="comments">
+      <Detect2Chars attribute="Comment" context="#pop" char="-" char1="}" />
+    </context>
+    <context attribute="Char" lineEndContext="#pop" name="char">
+      <RegExpr attribute="Char" context="#stay" String="\\." />
+      <DetectChar attribute="Char" context="#pop" char="'" />
+    </context>
+    <context attribute="String" lineEndContext="#stay" name="string">
+      <RegExpr attribute="String" context="#stay" String="\\." />
+      <DetectChar attribute="String" context="#pop" char="&quot;" />
+    </context>
+    <context attribute="Function Infix" lineEndContext="#stay" name="infix">
+      <DetectChar attribute="Function Infix" context="#pop" char="`"/>
+    </context>
+  </contexts>
+  <itemDatas>
+    <itemData name="Normal"           defStyleNum="dsNormal"   spellChecking="false" />
+    <itemData name="Comment"          defStyleNum="dsComment" />
+    <itemData name="Pragma"           defStyleNum="dsOthers"   spellChecking="false" />
+
+    <itemData name="Keyword"          defStyleNum="dsKeyword"  spellChecking="false" />
+    <itemData name="Type Prelude"     defStyleNum="dsDataType" spellChecking="false" />
+    <itemData name="Function Prelude" defStyleNum="dsFunction" spellChecking="false" />
+    <itemData name="Data Prelude"     defStyleNum="dsKeyword"  spellChecking="false" />
+    <itemData name="Class Prelude"    defStyleNum="dsKeyword"  spellChecking="false" />
+
+    <itemData name="Signature"        defStyleNum="dsOthers"  spellChecking="false" />
+    <itemData name="Function"         defStyleNum="dsNormal"   spellChecking="false" />
+    <itemData name="Operator"         defStyleNum="dsFunction" spellChecking="false" />
+    <itemData name="Type"             defStyleNum="dsDataType" spellChecking="false" />
+    <itemData name="Special"          defStyleNum="dsOthers"  spellChecking="false" />
+
+    <itemData name="Decimal"          defStyleNum="dsDecVal"   spellChecking="false" />
+    <itemData name="Float"            defStyleNum="dsFloat"    spellChecking="false" />
+    <itemData name="Char"             defStyleNum="dsChar"     spellChecking="false" />
+    <itemData name="String"           defStyleNum="dsString" />
+
+    <itemData name="Function Infix"   defStyleNum="dsOthers"   spellChecking="false" />
+    <itemData name="EnumFromTo"       defStyleNum="dsOthers"   spellChecking="false" />
+  </itemDatas>
+  </highlighting>
+  <general>
+    <folding indentationsensitive="1"/>
+    <comments>
+      <comment name="singleLine" start="--" />
+      <comment name="multiLine" start="{-" end="-}" />
+    </comments>
+    <keywords casesensitive="1" />
+</general>
 </language>
diff --git a/kate/data/ini.xml b/kate/data/ini.xml
index af0808f8c..3cdcd1f20 100644
--- a/kate/data/ini.xml
+++ b/kate/data/ini.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="INI Files" section="Configuration" extensions="*.ini;*.pls" mimetype="" version="1.0" author="Jan Janssen ([email protected])" license="LGPL">
+<language name="INI Files" section="Configuration" extensions="*.ini;*.pls;*.kcfgc" mimetype="" version="1.1" kateversion="2.0" author="Jan Janssen ([email protected])" license="LGPL">
 
 <highlighting>
 <list name="keywords">
diff --git a/kate/data/jam.xml b/kate/data/jam.xml
new file mode 100644
index 000000000..0b0ebf625
--- /dev/null
+++ b/kate/data/jam.xml
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!--
+Copyright (C) 2006 Mildred <[email protected]>.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+-->
+<language name="Jam" version="0.3" kateversion="2.3" section="Other" extensions="Jam*;*.jam" mimetype="text/x-jam;text/x-Jamfile;text/x-Jamrules;text/x-Jambase">
+  <!--
+  Changelog
+    0.2
+      * now tokens like [ ] { } ( ) : ; are not detected if there is no whitespace before and after
+      * Jam* files are handled (example Jamrules or Jambase)
+      * different colors
+      * Subvariables are handled (example : $(varname[$(v)])
+      * Include bash highlighting inside actions blocks
+      * rules names are found in rules definitions
+      * highlight the variable reference in rule definitions after 'bind'
+    0.3
+      * because weakDelimiter isn't supported, it is not possible to just have some locals delimiters for the tokens and globals delimiters as default. So it's not possible to have our usual double click to select.
+      * 'actions action_name bind var' instead of 'actions bind var action_name'
+      * bun in syntax 'rule Rulename : param param ...' ':' is not recognized. fixed
+      * fixed some bugs found when looking at Jambase (peacemeal -> piecemeal, ...)
+      * variables recognized in strings
+      * named parameters for rules ... the syntax has changed : 'rule rulename param : param : param {'
+      * changed section from Scripts to Other
+  Feature request to Kate dev.
+    * returnContext attribute
+    * ability to enter a new context after a #pop
+    * when you include rules from foreign contexts (here Bash), having the ability to prepend some rules to all foreign contexts for example to terminate the included context before it naturally ends.
+  -->
+  <highlighting>
+    <list name="keywords">
+      <item> actions </item>
+      <item> break </item>
+      <item> continue </item>
+      <item> for </item>
+      <item> in </item>
+      <item> if </item>
+      <item> else </item>
+      <item> include </item>
+      <item> local </item>
+      <item> on </item>
+      <item> return </item>
+      <item> rule </item>
+      <item> switch </item>
+      <item> case </item>
+      <item> while </item>
+    </list>
+    <list name="keywordLocal">
+      <item> local </item>
+    </list>
+    <list name="actionAttribute">
+      <item> existing </item>
+      <item> ignore </item>
+      <item> piecemeal </item>
+      <item> quietly </item>
+      <item> together </item>
+      <item> updated </item>
+    </list>
+    <list name="actionAttributeBind">
+      <item> bind </item>
+    </list>
+    <list name="tokenColon"><item> : </item></list>
+    <list name="tokenSemicolon"><item> ; </item></list>
+    <list name="tokenSquareOpen"><item> [ </item></list>
+    <list name="tokenSquareClose"><item> ] </item></list>
+    <list name="tokenBraceOpen"><item> ( </item></list>
+    <list name="tokenBraceClose"><item> ) </item></list>
+    <list name="tokenBlockOpen"><item> { </item></list>
+    <list name="tokenBlockClose"><item> } </item></list>
+    <contexts>
+
+      <context attribute="Normal" lineEndContext="#stay" name="Normal">
+        <IncludeRules context="Preprocess"/>
+        <keyword attribute="Error" context="#stay" String="tokenBlockClose" endRegion="block" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <IncludeRules context="Statement"/>
+      </context>
+
+      <context attribute="Normal" lineEndContext="#stay" name="Block">
+        <IncludeRules context="Preprocess"/>
+        <keyword attribute="Operator" context="#pop" String="tokenBlockClose" endRegion="block" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <IncludeRules context="Statement"/>
+      </context>
+
+      <context attribute="Normal" lineEndContext="#stay" name="Statement">
+        <IncludeRules context="Preprocess"/>
+        <StringDetect attribute="Keyword" context="ActionDefinition" String="actions"/>
+        <StringDetect attribute="Keyword" context="RuleDefinition" String="rule"/>
+        <StringDetect attribute="Keyword" context="ForStatement" String="for"/>
+        <StringDetect attribute="Keyword" context="IfStatement" String="if"/>
+        <StringDetect attribute="Keyword" context="IfStatement" String="while"/>
+        <StringDetect attribute="Keyword" context="Rule" String="include"/>
+        <StringDetect attribute="Keyword" context="OnPreStment" String="on"/>
+        <StringDetect attribute="Keyword" context="Rule" String="return"/>
+        <StringDetect attribute="Keyword" context="CaseCond" String="case"/>
+        <keyword attribute="Keyword" context="VarAssign" String="keywordLocal"/>
+        <keyword attribute="Keyword" context="#stay" String="keywords"/>
+        <keyword attribute="Operator" context="Block" String="tokenBlockOpen" beginRegion="block" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <RegExpr attribute="VarAssign" context="VarAssign" String="[^\t ]+[\t ]*[\+\?]?=" lookAhead="true"/>
+        <RegExpr attribute="VarAssign" context="VarAssign" String="[^\t ]+[\t ]+on" lookAhead="true"/>
+        <keyword attribute="Operator" context="#stay" String="tokenColon" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <keyword attribute="Operator" context="#stay" String="tokenSemicolon" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <keyword attribute="Operator" context="#stay" String="tokenBraceOpen" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <keyword attribute="Operator" context="#stay" String="tokenBraceClose" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <RegExpr attribute="Rule" context="Rule" String="([^\t ][^\t ]+|[^\{\}\t ])"/>
+      </context>
+
+      <!-- General instructions -->
+
+      <context attribute="Normal" lineEndContext="#stay" name="Rule">
+        <IncludeRules context="Preprocess"/>
+        <keyword attribute="Operator" context="#stay" String="tokenColon" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <keyword attribute="Operator" context="#pop" String="tokenSemicolon" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+      </context>
+
+      <context attribute="Normal" lineEndContext="#stay" name="CaseCond">
+        <IncludeRules context="Preprocess"/>
+        <keyword attribute="Operator" context="#pop" String="tokenColon" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+      </context>
+
+      <context attribute="Normal" lineEndContext="#stay" name="OnPreStment">
+        <IncludeRules context="Preprocess"/>
+        <RegExpr attribute="Normal" context="#pop" String="[^\t ]+"/>
+        <RegExpr attribute="Normal" context="#pop" String="." lookAhead="true"/>
+      </context>
+
+      <!-- Assigment -->
+
+      <context attribute="Variable" lineEndContext="#stay" name="VarAssign">
+        <IncludeRules context="Preprocess"/>
+        <RegExpr attribute="VarAssign" context="Assigment" String="[^\t ]+[\t ]*[\+\?]?=" lookAhead="true"/>
+        <RegExpr attribute="VarAssign" context="Assigment" String="[^\t ]+[\t ]+on" lookAhead="true"/>
+        <RegExpr attribute="VarAssign" context="Assigment" String="[\+\?]?=" lookAhead="true"/>
+        <keyword attribute="Operator" context="#stay" String="tokenColon" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <keyword attribute="Operator" context="#pop" String="tokenSemicolon" lookAhead="true" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+      </context>
+
+      <context attribute="Normal" lineEndContext="#stay" name="Assigment">
+        <IncludeRules context="Preprocess"/>
+        <StringDetect attribute="Operator" context="#stay" String="on"/>
+        <StringDetect attribute="Operator" context="Assigment2" String="="/>
+        <StringDetect attribute="Operator" context="Assigment2" String="+="/>
+        <StringDetect attribute="Operator" context="Assigment2" String="?="/>
+        <keyword attribute="Operator" context="#pop#pop" String="tokenSemicolon" lookAhead="true" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <RegExpr attribute="VarAssign" context="#stay" String="[^\t ]+"/>
+      </context>
+
+      <context attribute="Normal" lineEndContext="#stay" name="Assigment2">
+        <IncludeRules context="Preprocess"/>
+        <keyword attribute="Operator" context="#pop#pop#pop" String="tokenSemicolon" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+      </context>
+
+      <!-- Sub statements -->
+
+      <context attribute="Normal" lineEndContext="#stay" name="SubStatement">
+        <IncludeRules context="Preprocess"/>
+        <StringDetect attribute="Keyword" context="OnPreStment" String="on"/>
+        <RegExpr attribute="Rule" context="SubRule" String="[^\t ]+"/>
+        <keyword attribute="Operator" context="#pop" String="tokenSquareClose" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+      </context>
+
+      <context attribute="Normal" lineEndContext="#stay" name="SubRule">
+        <IncludeRules context="Preprocess"/>
+        <keyword attribute="Operator" context="#stay" String="tokenColon" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <keyword attribute="Operator" context="#pop#pop" String="tokenSquareClose" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+      </context>
+
+      <!-- Actions, Rules definitions -->
+
+      <context attribute="Normal" lineEndContext="#stay" name="ActionDefinition">
+        <IncludeRules context="Preprocess"/>
+        <keyword attribute="Error" context="#stay" String="actionAttributeBind"/>
+        <keyword attribute="actionAttribute" context="#stay" String="actionAttribute"/>
+        <StringDetect attribute="Operator" context="ActionBody" String="{"/>
+        <RegExpr attribute="Action" context="ActionDefinitionFull" String="[^\t ]+"/>
+        <DetectSpaces attribute="Normal"/>
+      </context>
+
+      <context attribute="Error" lineEndContext="#stay" name="ActionDefinitionFull">
+        <IncludeRules context="Preprocess"/>
+        <DetectSpaces attribute="Normal"/>
+        <StringDetect attribute="Operator" context="#pop" String="{" lookAhead="true"/>
+        <keyword attribute="actionAttribute" context="ActionDefinitionBind" String="actionAttributeBind"/>
+      </context>
+
+      <context attribute="Normal" lineEndContext="#stay" name="ActionDefinitionBind">
+        <IncludeRules context="Preprocess"/>
+        <StringDetect attribute="Operator" context="#pop" String="{" lookAhead="true"/>
+        <RegExpr attribute="Varname" context="#stay" String="[^\t ]+"/>
+      </context>
+
+      <context attribute="ActionText" lineEndContext="#stay" name="ActionBody">
+        <StringDetect attribute="Comment" context="Comment" String="#"/>
+        <StringDetect attribute="VariableDelimiter" context="Variable" String="$("/>
+        <StringDetect attribute="Operator" context="#pop#pop" String="}"/>
+        <IncludeRules context="##Bash"/>
+      </context>
+
+      <context attribute="Normal" lineEndContext="#stay" name="RuleDefinition">
+        <IncludeRules context="Preprocess"/>
+        <keyword attribute="Error" context="#stay" String="tokenColon" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <keyword attribute="Operator" context="#pop" String="tokenBlockOpen" lookAhead="true" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <RegExpr attribute="Rule" context="VarnameList" String="[^\t ]+"/>
+      </context>
+
+      <context attribute="Error" lineEndContext="#stay" name="RuleDefinitionFull">
+        <IncludeRules context="Preprocess"/>
+        <DetectSpaces attribute="Normal"/>
+        <keyword attribute="Operator" context="VarnameList" String="tokenColon" lookAhead="true" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <keyword attribute="Operator" context="#pop" String="tokenBlockOpen" lookAhead="true" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+      </context>
+
+      <context attribute="Normal" lineEndContext="#stay" name="VarnameList">
+        <IncludeRules context="Preprocess"/>
+        <keyword attribute="Operator" context="VarnameList" String="tokenColon" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <keyword attribute="Operator" context="#pop" String="tokenBlockOpen" lookAhead="true" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <RegExpr attribute="Varname" context="#stay" String="[^\t ]+"/>
+      </context>
+
+      <!-- For, While, If -->
+
+      <context attribute="Normal" lineEndContext="#stay" name="ForStatement">
+        <IncludeRules context="Preprocess"/>
+        <StringDetect attribute="Operator" context="ForList" String="in"/>
+        <RegExpr attribute="Varname" context="#stay" String="[^\t ]+"/>
+      </context>
+
+      <context attribute="Normal" lineEndContext="#stay" name="ForList">
+        <IncludeRules context="Preprocess"/>
+        <keyword attribute="Operator" context="#pop#pop" String="tokenBlockOpen" lookAhead="true" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+      </context>
+
+      <context attribute="Normal" lineEndContext="#stay" name="IfStatement">
+        <IncludeRules context="Preprocess"/>
+        <StringDetect attribute="Operator" context="#stay" String="="/>
+        <StringDetect attribute="Operator" context="#stay" String="!="/>
+        <StringDetect attribute="Operator" context="#stay" String="&lt;"/>
+        <StringDetect attribute="Operator" context="#stay" String="&lt;="/>
+        <StringDetect attribute="Operator" context="#stay" String="&gt;"/>
+        <StringDetect attribute="Operator" context="#stay" String="&gt;="/>
+        <StringDetect attribute="Operator" context="#stay" String="in"/>
+        <StringDetect attribute="Operator" context="#stay" String="!"/>
+        <StringDetect attribute="Operator" context="#stay" String="&amp;&amp;"/>
+        <StringDetect attribute="Operator" context="#stay" String="||"/>
+        <keyword attribute="Operator" context="#stay" String="tokenBraceOpen" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <keyword attribute="Operator" context="#stay" String="tokenBraceClose" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+        <keyword attribute="Operator" context="#pop" String="tokenBlockOpen" lookAhead="true" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+      </context>
+
+      <!-- Variables, Strings, Comments -->
+
+      <context attribute="Normal" lineEndContext="#stay" name="Preprocess">
+        <RegExpr attribute="Normal" context="#stay" String="\\(&quot;|\w)"/>
+        <StringDetect attribute="CommentTitle" context="CommentTitle" String="##"/>
+        <StringDetect attribute="Comment" context="Comment" String="#"/>
+        <StringDetect attribute="VariableDelimiter" context="Variable" String="$("/>
+        <StringDetect attribute="String" context="String" String="&quot;"/>
+        <keyword attribute="Operator" context="SubStatement" String="tokenSquareOpen" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
+      </context>
+
+      <context attribute="Variable" lineEndContext="Error" name="Variable">
+        <StringDetect attribute="VariableDelimiter" context="Variable" String="$("/>
+        <StringDetect attribute="VariableDelimiter" context="#pop" String=")"/>
+        <StringDetect attribute="VariableAttribute" context="VariableRange" String="["/>
+        <StringDetect attribute="VariableAttribute" context="VariableAttribute" String=":"/>
+      </context>
+
+      <context attribute="VariableAttribute" lineEndContext="Error" name="VariableRange">
+        <StringDetect attribute="VariableDelimiter" context="Variable" String="$("/>
+        <StringDetect attribute="VariableAttribute" context="#pop" String="]"/>
+      </context>
+
+      <context attribute="VariableAttribute" lineEndContext="Error" name="VariableAttribute">
+        <StringDetect attribute="VariableDelimiter" context="Variable" String="$("/>
+        <StringDetect attribute="Variable" context="#pop" String=")" lookAhead="true"/>
+      </context>
+
+      <context attribute="Comment" lineEndContext="#pop" name="Comment">
+        <RegExpr attribute="Alert" context="#stay" String="(FIXME|TODO)"/>
+      </context>
+
+      <context attribute="CommentTitle" lineEndContext="#pop" name="CommentTitle">
+        <IncludeRules context="Comment"/>
+      </context>
+
+      <context attribute="String" lineEndContext="Error" name="String">
+        <StringDetect attribute="VariableDelimiter" context="Variable" String="$("/>
+        <StringDetect attribute="EscapeSeq" context="#stay" String="\&quot;"/>
+        <StringDetect attribute="EscapeSeq" context="#stay" String="\"/>
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+      </context>
+
+      <!-- Error -->
+
+      <context attribute="Error" lineEndContext="#stay" name="Error"/>
+
+    </contexts>
+    <itemDatas>
+      <!-- action definition (shell script) -->
+      <itemData name="actionAttribute" defStyleNum="dsNormal" italic="1"/>
+      <itemData name="ActionText" defStyleNum="dsNormal"/>
+      <!-- rule / action call -->
+      <itemData name="Rule" defStyleNum="dsFunction" color="black" underline="1"/>
+      <itemData name="Action" defStyleNum="dsNormal"/>
+      <!-- variables with attributes -->
+      <itemData name="Variable" defStyleNum="dsNormal" color="darkgreen"/>
+      <itemData name="VariableDelimiter" defStyleNum="dsNormal" color="blue"/>
+      <itemData name="VariableAttribute" defStyleNum="dsNormal" color="blue"/>
+      <itemData name="VarAssign" defStyleNum="dsNormal" color="darkgreen"/>
+      <itemData name="Varname" defStyleNum="dsNormal" color="darkgreen" italic="1"/>
+      <!-- common -->
+      <itemData name="Normal" defStyleNum="dsNormal"/>
+      <itemData name="Operator" defStyleNum="dsNormal" bold="1"/>
+      <itemData name="Keyword" defStyleNum="dsKeyword" bold="1"/>
+      <itemData name="Comment" defStyleNum="dsComment"/>
+      <itemData name="CommentTitle" defStyleNum="dsComment" color="darkorange" bold="1"/>
+      <itemData name="String" defStyleNum="dsString" color="red"/>
+      <itemData name="EscapeSeq" defStyleNum="dsString" color="purple" bold="1"/>
+      <itemData name="Alert" defStyleNum="dsAlert"/>
+      <itemData name="Error" defStyleNum="dsError"/>
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name="singleLine" start="#"/>
+    </comments>
+    <keywords weakDeliminator=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*," additionalDeliminator=" 	"/>
+  </general>
+</language>
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
\ No newline at end of file
diff --git a/kate/data/java.xml b/kate/data/java.xml
index c7f0f3967..94f793782 100644
--- a/kate/data/java.xml
+++ b/kate/data/java.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Java" version="1.19" kateversion="2.4" section="Sources" extensions="*.java" mimetype="text/x-java" license="LGPL" author="Alfredo Luiz Foltran Fialho ([email protected])">
+<language name="Java" version="1.20" kateversion="2.4" section="Sources" extensions="*.java" mimetype="text/x-java" license="LGPL" author="Alfredo Luiz Foltran Fialho ([email protected])">
 	<highlighting>
 		<list name="java15">
 			<item> ACTIVE </item>
@@ -3767,13 +3767,6 @@
 				<HlCOct attribute="Octal" context="#stay"/>
 				<HlCHex attribute="Hex" context="#stay"/>
 				<Int attribute="Decimal" context="#stay">
-					<StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
 					<StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
 				</Int>
 				<HlCChar attribute="Char" context="#stay"/>
diff --git a/kate/data/javascript.xml b/kate/data/javascript.xml
index be2e33d8b..3a7a8b855 100644
--- a/kate/data/javascript.xml
+++ b/kate/data/javascript.xml
@@ -3,7 +3,9 @@
 <!-- Author: Anders Lund <[email protected]> //-->
 <!-- Minor changes: Joseph Wenninger <[email protected]> //-->
 <!-- Full JavaScript 1.0 support by Whitehawk Stormchaser //-->
-<language name="JavaScript" version="1.13" kateversion="2.3" section="Scripts" extensions="*.js" mimetype="text/x-javascript;application/x-javascript" author="Anders Lund ([email protected]), Joseph Wenninger ([email protected]), Whitehawk Stormchaser ([email protected])" license="">
+<language name="JavaScript" version="1.19" kateversion="2.4" section="Scripts" extensions="*.js;*.kwinscript"
+          mimetype="text/x-javascript;application/x-javascript" indenter="cstyle"
+          author="Anders Lund ([email protected]), Joseph Wenninger ([email protected]), Whitehawk Stormchaser ([email protected])" license="">
   <highlighting>
     <list name="keywords">
         <item> if </item>
@@ -125,288 +127,27 @@
          <item>onSubmit</item>
          <item>onUnload</item>
     </list>
-    <list name="methods">
-        <item>above</item>
-        <item>action</item>
-        <item>alinkColor</item>
-        <item>alert</item>
-        <item>anchor</item>
-        <item>anchors</item>
-        <item>appCodeName</item>
-        <item>applets</item>
-        <item>apply</item>
-        <item>appName</item>
-        <item>appVersion</item>
-        <item>argument</item>
-        <item>arguments</item>
-        <item>arity</item>
-        <item>availHeight</item>
-        <item>availWidth</item>
-        <item>back</item>
-        <item>background</item>
-        <item>below</item>
-        <item>bgColor</item>
-        <item>border</item>
-        <item>big</item>
-        <item>blink</item>
-        <item>blur</item>
-        <item>bold</item>
-        <item>border</item>
-        <item>call</item>
-        <item>caller</item>
-        <item>charAt</item>
-        <item>charCodeAt</item>
-        <item>checked</item>
-        <item>clearInterval</item>
-        <item>clearTimeout</item>
-        <item>click</item>
-        <item>clip</item>
-        <item>close</item>
-        <item>closed</item>
-        <item>colorDepth</item>
-        <item>complete</item>
-        <item>compile</item>
-        <item>constructor</item>
-        <item>confirm</item>
-        <item>cookie</item>
-        <item>current</item>
-        <item>cursor</item>
-        <item>data</item>
-        <item>defaultChecked</item>
-        <item>defaultSelected</item>
-        <item>defaultStatus</item>
-        <item>defaultValue</item>
-        <item>description</item>
-        <item>disableExternalCapture</item>
-        <item>domain</item>
-        <item>elements</item>
-        <item>embeds</item>
-        <item>enabledPlugin</item>
-        <item>enableExternalCapture</item>
-        <item>encoding</item>
-        <item>eval</item>
-        <item>exec</item>
-        <item>fgColor</item>
-        <item>filename</item>
-        <item>find</item>
-        <item>fixed</item>
-        <item>focus</item>
-        <item>fontcolor</item>
-        <item>fontsize</item>
-        <item>form</item>
-        <item>forms</item>
-        <item>formName</item>
-        <item>forward</item>
-        <item>frames</item>
-        <item>fromCharCode</item>
-        <item>getDate</item>
-        <item>getDay</item>
-        <item>getHours</item>
-        <item>getMiliseconds</item>
-        <item>getMinutes</item>
-        <item>getMonth</item>
-        <item>getSeconds</item>
-        <item>getSelection</item>
-        <item>getTime</item>
-        <item>getTimezoneOffset</item>
-        <item>getUTCDate</item>
-        <item>getUTCDay</item>
-        <item>getUTCFullYear</item>
-        <item>getUTCHours</item>
-        <item>getUTCMilliseconds</item>
-        <item>getUTCMinutes</item>
-        <item>getUTCMonth</item>
-        <item>getUTCSeconds</item>
-        <item>getYear</item>
-        <item>global</item>
-        <item>go</item>
-        <item>hash</item>
-        <item>height</item>
-        <item>history</item>
-        <item>home</item>
-        <item>host</item>
-        <item>hostname</item>
-        <item>href</item>
-        <item>hspace</item>
-        <item>ignoreCase</item>
-        <item>images</item>
-        <item>index</item>
-        <item>indexOf</item>
-        <item>innerHeight</item>
-        <item>innerWidth</item>
-        <item>input</item>
-        <item>italics</item>
-        <item>javaEnabled</item>
-        <item>join</item>
-        <item>language</item>
-        <item>lastIndex</item>
-        <item>lastIndexOf</item>
-        <item>lastModified</item>
-        <item>lastParen</item>
-        <item>layers</item>
-        <item>layerX</item>
-        <item>layerY</item>
-        <item>left</item>
-        <item>leftContext</item>
-        <item>length</item>
-        <item>link</item>
-        <item>linkColor</item>
-        <item>links</item>
-        <item>location</item>
-        <item>locationbar</item>
-        <item>load</item>
-        <item>lowsrc</item>
-        <item>match</item>
-        <item>MAX_VALUE</item>
-        <item>menubar</item>
-        <item>method</item>
-        <item>mimeTypes</item>
-        <item>MIN_VALUE</item>
-        <item>modifiers</item>
-        <item>moveAbove</item>
-        <item>moveBelow</item>
-        <item>moveBy</item>
-        <item>moveTo</item>
-        <item>moveToAbsolute</item>
-        <item>multiline</item>
-        <item>name</item>
-        <item>NaN</item>
-        <item>NEGATIVE_INFINITY</item>
-        <item>negative_infinity</item>
-        <item>next</item>
-        <item>open</item>
-        <item>opener</item>
-        <item>options</item>
-        <item>outerHeight</item>
-        <item>outerWidth</item>
-        <item>pageX</item>
-        <item>pageY</item>
-        <item>pageXoffset</item>
-        <item>pageYoffset</item>
-        <item>parent</item>
-        <item>parse</item>
-        <item>pathname</item>
-        <item>personalbar</item>
-        <item>pixelDepth</item>
-        <item>platform</item>
-        <item>plugins</item>
-        <item>pop</item>
-        <item>port</item>
-        <item>POSITIVE_INFINITY</item>
-        <item>positive_infinity</item>
-        <item>preference</item>
-        <item>previous</item>
-        <item>print</item>
-        <item>prompt</item>
-        <item>protocol</item>
-        <item>prototype</item>
-        <item>push</item>
-        <item>referrer</item>
-        <item>refresh</item>
-        <item>releaseEvents</item>
-        <item>reload</item>
-        <item>replace</item>
-        <item>reset</item>
-        <item>resizeBy</item>
-        <item>resizeTo</item>
-        <item>reverse</item>
-        <item>rightContext</item>
-        <item>screenX</item>
-        <item>screenY</item>
-        <item>scroll</item>
-        <item>scrollbar</item>
-        <item>scrollBy</item>
-        <item>scrollTo</item>
-        <item>search</item>
-        <item>select</item>
-        <item>selected</item>
-        <item>selectedIndex</item>
-        <item>self</item>
-        <item>setDate</item>
-        <item>setHours</item>
-        <item>setMinutes</item>
-        <item>setMonth</item>
-        <item>setSeconds</item>
-        <item>setTime</item>
-        <item>setTimeout</item>
-        <item>setUTCDate</item>
-        <item>setUTCDay</item>
-        <item>setUTCFullYear</item>
-        <item>setUTCHours</item>
-        <item>setUTCMilliseconds</item>
-        <item>setUTCMinutes</item>
-        <item>setUTCMonth</item>
-        <item>setUTCSeconds</item>
-        <item>setYear</item>
-        <item>shift</item>
-        <item>siblingAbove</item>
-        <item>siblingBelow</item>
-        <item>small</item>
-        <item>sort</item>
-        <item>source</item>
-        <item>splice</item>
-        <item>split</item>
-        <item>src</item>
-        <item>status</item>
-        <item>statusbar</item>
-        <item>strike</item>
-        <item>sub</item>
-        <item>submit</item>
-        <item>substr</item>
-        <item>substring</item>
-        <item>suffixes</item>
-        <item>sup</item>
-        <item>taintEnabled</item>
-        <item>target</item>
-        <item>test</item>
-        <item>text</item>
-        <item>title</item>
-        <item>toGMTString</item>
-        <item>toLocaleString</item>
-        <item>toLowerCase</item>
-        <item>toolbar</item>
-        <item>toSource</item>
-        <item>toString</item>
-        <item>top</item>
-        <item>toUpperCase</item>
-        <item>toUTCString</item>
-        <item>type</item>
-        <item>URL</item>
-        <item>unshift</item>
-        <item>unwatch</item>
-        <item>userAgent</item>
-        <item>UTC</item>
-        <item>value</item>
-        <item>valueOf</item>
-        <item>visibility</item>
-        <item>vlinkColor</item>
-        <item>vspace</item>
-        <item>width</item>
-        <item>watch</item>
-        <item>which</item>
-        <item>width</item>
-        <item>write</item>
-        <item>writeln</item>
-        <item>x</item>
-        <item>y</item>
-        <item>zIndex</item>
-    </list>
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
 	<DetectSpaces/>
         <StringDetect attribute="Region Marker" context="region_marker" String="//BEGIN" beginRegion="Region1"/>
         <StringDetect attribute="Region Marker" context="region_marker" String="//END" endRegion="Region1"/>
+        <Float attribute="Float" context="#stay" />
+        <Int attribute="Decimal" context="#stay" />
+        <RegExpr attribute="JSON" context="#stay" String="\b[\w\.]+\b\s*(?=:)" />
+
         <keyword attribute="Keyword" context="#stay" String="keywords" />
         <keyword attribute="Function" context="#stay" String="functions" />
         <keyword attribute="Objects" context="#stay" String="objects" />
         <keyword attribute="Math" context="#stay" String="math" />
         <keyword attribute="Events" context="#stay" String="events" />
-        <keyword attribute="Data Type" context="#stay" String="methods" />
+
+        <DetectChar context="ObjectMember" char="." />
+        <RegExpr attribute="Objects" context="ObjectMember" String="\b[\w\.]+(?=\.)" />
+
 	<DetectIdentifier/>
-        <Float attribute="Float" context="#stay" />
-        <Int attribute="Decimal" context="#stay" />
         <DetectChar attribute="String" context="String" char="&quot;"/>
-        <DetectChar attribute="String" context="String 1" char="'"/>
+        <DetectChar attribute="String Char" context="String 1" char="'"/>
         <Detect2Chars attribute="Comment" context="Comment" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="Multi/inline Comment" char="/" char1="*" beginRegion="Comment"/>
         <RegExpr attribute="Normal Text" context="(Internal regex catch)" String="[=?:]" />
@@ -458,6 +199,7 @@
       </context>
       <context attribute="Pattern Character Class" lineEndContext="#stay" name="Regular Expression Character Class">
         <RegExpr attribute="Pattern Character Class" context="#stay" String="\\[\[\]]" />
+        <RegExpr attribute="Pattern Internal Operator" context="#stay" String="\\." />
         <DetectChar attribute="Pattern Character Class" context="#pop#pop" char="]" />
       </context>
       <context attribute="Pattern Internal Operator" lineEndContext="#pop" name="(regex caret first check)" fallthrough="true" fallthroughContext="Regular Expression">
@@ -471,26 +213,34 @@
 	<DetectIdentifier />
 	<DetectSpaces />
       </context>
+
+      <context name="ObjectMember" attribute="Normal Text" lineEndContext="#stay">
+        <DetectChar context="#stay" char="." />
+        <DetectIdentifier attribute="Object Member" />
+        <DetectSpaces context="#pop" />
+        <AnyChar lookAhead="true" context="#pop" String="(){}:!%&amp;+,-/.*&lt;=&gt;?[]|~^&#59;"/>
+      </context>
     </contexts>
     <itemDatas>
-      <itemData name="Normal Text"  defStyleNum="dsNormal"/>
-      <itemData name="Keyword"      defStyleNum="dsKeyword"/>
-      <itemData name="Function" defStyleNum="dsFunction"/>
-      <itemData name="Objects" defStyleNum="dsKeyword" color="#008000" selColor="#00ffff" bold="0" italic="0"/>
-      <itemData name="Math" defStyleNum="dsKeyword" color="#DBA716" selColor="#00ffff" bold="0" italic="0"/>
-      <itemData name="Events" defStyleNum="dsKeyword" color="#F766D5" selColor="#00ffff" bold="0" italic="0"/>
-      <itemData name="Data Type"    defStyleNum="dsDataType"/>
-      <itemData name="Decimal"      defStyleNum="dsDecVal"/>
-      <itemData name="Float"        defStyleNum="dsFloat"/>
-      <itemData name="Char"         defStyleNum="dsChar"/>
+      <itemData name="Normal Text"  defStyleNum="dsNormal"  spellChecking="false"/>
+      <itemData name="Keyword"      defStyleNum="dsKeyword" spellChecking="false"/>
+      <itemData name="Function" defStyleNum="dsFunction" spellChecking="false"/>
+      <itemData name="Objects" defStyleNum="dsKeyword" color="#008000" selColor="#00ffff" bold="0" italic="0" spellChecking="false"/>
+      <itemData name="Object Member" defStyleNum="dsFunction" spellChecking="false"/>
+      <itemData name="Math" defStyleNum="dsKeyword" color="#DBA716" selColor="#00ffff" bold="0" italic="0" spellChecking="false"/>
+      <itemData name="Events" defStyleNum="dsKeyword" color="#F766D5" selColor="#00ffff" bold="0" italic="0" spellChecking="false"/>
+      <itemData name="Decimal"      defStyleNum="dsDecVal" spellChecking="false"/>
+      <itemData name="Float"        defStyleNum="dsFloat" spellChecking="false"/>
+      <itemData name="Char"         defStyleNum="dsChar" spellChecking="false"/>
       <itemData name="String"       defStyleNum="dsString"/>
-      <itemData name="String Char"  defStyleNum="dsChar"/>
+      <itemData name="String Char"  defStyleNum="dsChar" spellChecking="false"/>
       <itemData name="Comment"      defStyleNum="dsComment"/>
-      <itemData name="Symbol"       defStyleNum="dsNormal"/>
-      <itemData name="Regular Expression" defStyleNum="dsOthers"   />
-      <itemData name="Pattern Internal Operator" defStyleNum="dsFloat" />
-      <itemData name="Pattern Character Class" defStyleNum="dsBaseN" />
-      <itemData name="Region Marker" defStyleNum="dsRegionMarker" />
+      <itemData name="Symbol"       defStyleNum="dsNormal" spellChecking="false"/>
+      <itemData name="Regular Expression" defStyleNum="dsOthers" spellChecking="false"/>
+      <itemData name="Pattern Internal Operator" defStyleNum="dsFloat" spellChecking="false"/>
+      <itemData name="Pattern Character Class" defStyleNum="dsBaseN" spellChecking="false"/>
+      <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
+      <itemData name="JSON" defStyleNum="dsDataType" spellChecking="false"/>
     </itemDatas>
   </highlighting>
   <general>
diff --git a/kate/data/json.xml b/kate/data/json.xml
index 8dda5c0e7..074486edc 100644
--- a/kate/data/json.xml
+++ b/kate/data/json.xml
@@ -12,9 +12,9 @@
  ** http://tools.ietf.org/html/rfc4627
  ***************************************************************************
 -->
-<language name="JSON" section="Markup" version="1.00" kateversion="2.3" extensions="*.json" mimetype="application/json" author="Sebastian Pipping ([email protected])" license="GPL">
+<language name="JSON" section="Markup" version="1.2" kateversion="2.3" extensions="*.json" mimetype="application/json" author="Sebastian Pipping ([email protected])" license="GPL">
   <highlighting>
-		<list name="Constants">
+    <list name="Constants">
       <item>null</item>
       <item>true</item>
       <item>false</item>
@@ -23,6 +23,9 @@
     <contexts>
       <context name="Normal" lineEndContext="#stay" attribute="Style_Error">
         <DetectChar char="{"       context="Pair" beginRegion="Region_Object" attribute="Style_Seperator_Pair" />
+        <DetectChar char="["       context="Array" beginRegion="Region_Array" attribute="Style_Seperator_Array" />
+
+        <DetectSpaces context="#stay" attribute="Style_Normal" />
       </context>
 
       <context name="Pair" lineEndContext="#stay" attribute="Style_Error">
@@ -64,6 +67,7 @@
         <DetectChar char="]"       context="#pop" endRegion="Region_Array" attribute="Style_Seperator_Array" />
 
         <DetectChar char="{"       context="Pair" beginRegion="Region_Object" attribute="Style_Seperator_Pair" />
+        <DetectChar char="["       context="Array" beginRegion="Region_Array" attribute="Style_Seperator_Array" />
         <DetectChar char="&quot;"  context="String_Value" attribute="Style_String_Value" />
 
         <DetectSpaces context="#stay" attribute="Style_Normal" />
@@ -88,9 +92,9 @@
       <itemData name="Style_String_Key_Char"    defStyleNum="dsDataType" underline="1" />
       <itemData name="Style_String_Value_Char"  defStyleNum="dsString" color="#FF00FF" underline="1" />
 
-			<itemData name="Style_Keyword"            defStyleNum="dsDecVal" bold="1" />
+      <itemData name="Style_Keyword"            defStyleNum="dsDecVal" bold="1" />
 
-			<itemData name="Style_Error"              defStyleNum="dsError" />
+      <itemData name="Style_Error"              defStyleNum="dsError" />
     </itemDatas>
   </highlighting>
 </language>
diff --git a/kate/data/latex.xml b/kate/data/latex.xml
index 4c944cd50..f138b53d9 100644
--- a/kate/data/latex.xml
+++ b/kate/data/latex.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-	  <language name="LaTeX" version="1.33" section="Markup" kateversion="2.3" priority="10" extensions="*.tex;*.ltx;*.dtx;*.sty;*.cls;" mimetype="text/x-tex" casesensitive="1" author="Jeroen Wijnhout ([email protected])+Holger Danielsson ([email protected])+Michel Ludwig ([email protected])+Thomas Braun ([email protected])" license="LGPL" >
+<language name="LaTeX" version="1.47" section="Markup" kateversion="2.3" priority="10" extensions="*.tex;*.ltx;*.dtx;*.sty;*.cls;*.bbx;*.cbx;*.lbx;" mimetype="text/x-tex" casesensitive="1" author="Jeroen Wijnhout ([email protected])+Holger Danielsson ([email protected])+Michel Ludwig ([email protected])+Thomas Braun ([email protected])" license="LGPL" >
   <highlighting>
     <contexts>
       <!-- Normal text -->
       <context name="Normal Text" attribute="Normal Text" lineEndContext="#stay">
-        <RegExpr String="\\begin(?=[^a-zA-Z])" attribute="Structure" context="FindEnvironment" beginRegion="block" />
-        <RegExpr String="\\end(?=[^a-zA-Z])" attribute="Structure" context="FindEnvironment" endRegion="block" />
+        <RegExpr String="\\begin(?=[^a-zA-Z])" attribute="Structure" context="FindBeginEnvironment" beginRegion="block" />
+        <RegExpr String="\\end(?=[^a-zA-Z])" attribute="Structure" context="FindEndEnvironment" />
 	<RegExpr String="\\(cite|parencite|autocite|Autocite|citetitle)\*(?=[^a-zA-Z])" attribute="Structure" context="Label"/>
 	<RegExpr String="\\(cites|Cites|parencites|Parencites|autocites|Autocites|supercites|footcites|Footcites)(?=[^a-zA-Z])" attribute="Structure" context="FancyLabel"/>
 	<RegExpr String="\\(cite|nocite|Cite|parencite|Parencite|footcite|Footcite|textcite|Textcite|supercite|autocite|Autocite|citeauthor|Citeauthor|citetitle|citeyear|citeurl|nocite|fullcite|footfullcite)(?=[^a-zA-Z])" attribute="Structure" context="Label"/>
-	<RegExpr String="\\(subref\*?|cref\*?|label|pageref|autoref|ref|vpageref|vref|pagecite)(?=[^a-zA-Z])" attribute="Structure" context="Label"/>
+	<RegExpr String="\\(subref\*?|cref\*?|label|pageref|autoref|ref|vpageref|vref|pagecite|eqref)(?=[^a-zA-Z])" attribute="Structure" context="Label"/>
         <RegExpr String="\\(part|chapter|section|subsection|subsubsection|paragraph|subparagraph)\*?\s*(?=[\{\[])" attribute="Structure" context="Sectioning"/>
-        <RegExpr String="\\(footnote)\*?\s*(?=[\{\[])" attribute="Footnote" context="Footnoting"/>
+        <RegExpr String="\\(footnote)\*?\s*(?=[\{\[])" attribute="Keyword" context="Footnoting"/>
 	<RegExpr String="\\(renewcommand|providenewcommand|newcommand)\*?(?=[^a-zA-Z])" attribute="Keyword" context="NewCommand"/>
         <RegExpr String="\\(e|g|x)?def(?=[^a-zA-Z])" attribute="Keyword" context="DefCommand"/>
 	<RegExpr String="&lt;&lt;.*&gt;&gt;=" attribute="Normal Text" context="NoWeb" />
-        <StringDetect String="\(" attribute="Math" context="MathMode" beginRegion="mathMode" />
+        <StringDetect String="\(" attribute="Math" context="MathMode" />
         <StringDetect String="\[" attribute="Math" context="MathModeEquation" beginRegion="mathMode" />
 	<StringDetect String="\iffalse" attribute="Comment" context="Multiline Comment"/>
 	<StringDetect String="\ensuremath{" attribute="Math" context="MathModeEnsure"/>
         <DetectChar char="\" attribute="Keyword" context="ContrSeq"/>
         <StringDetect String="$$" attribute="Math" context="MathModeDisplay" beginRegion="mathMode" />
-        <DetectChar char="$" attribute="Math" context="MathMode" beginRegion="mathMode" />
+        <DetectChar char="$" attribute="Math" context="MathMode" />
         <RegExpr String="%\s*BEGIN.*$" attribute="Region Marker" context="#stay" beginRegion="regionMarker" firstNonSpace="true" />
         <RegExpr String="%\s*END.*$" attribute="Region Marker" context="#stay" endRegion="regionMarker" firstNonSpace="true" />
         <DetectChar char="%" attribute="Comment" context="Comment"/>
@@ -45,9 +45,9 @@
       <context name="SectioningInside" attribute="Structure Text" lineEndContext="#stay">
         <DetectChar char="{" attribute="Normal Text" context="SectioningInside"/>
         <DetectChar char="}" attribute="Normal Text" context="#pop"/>
-        <StringDetect String="\(" attribute="Structure Math" context="SectioningMathMode" beginRegion="mathMode" />
+        <StringDetect String="\(" attribute="Structure Math" context="SectioningMathMode" />
         <DetectChar char="\" attribute="Structure Keyword" context="SectioningContrSeq"/>
-        <DetectChar char="$" attribute="Structure Math" context="SectioningMathMode" beginRegion="mathMode" />
+        <DetectChar char="$" attribute="Structure Math" context="SectioningMathMode" />
         <DetectChar char="%" attribute="Comment" context="Comment"/>
         <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
       </context>
@@ -58,8 +58,8 @@
       </context>
       <context name="SectioningMathMode" attribute="Structure Math" lineEndContext="#stay">
         <StringDetect String="$$" attribute="Error" context="#stay" />
-        <DetectChar char="$" attribute="Structure Math" context="#pop" endRegion="mathMode" />
-        <Detect2Chars char="\" char1=")" attribute="Structure Math" context="#pop" endRegion="mathMode" />
+        <DetectChar char="$" attribute="Structure Math" context="#pop" />
+        <Detect2Chars char="\" char1=")" attribute="Structure Math" context="#pop" />
         <Detect2Chars char="\" char1="]" attribute="Error" context="#stay" />
         <DetectChar char="\" attribute="Structure Keyword Mathmode" context="SectioningMathContrSeq"/>
         <DetectChar char="%" attribute="Comment" context="Comment"/>
@@ -79,33 +79,19 @@
         <DetectChar char="}" attribute="Normal Text" context="#pop"/>
         <DetectChar char="%" attribute="Comment" context="Comment"/>
       </context>
-      <context name="FootnotingInside" attribute="Footnote Text" lineEndContext="#stay">
+      <context name="FootnotingInside" attribute="Normal Text" lineEndContext="#stay">
         <DetectChar char="{" attribute="Normal Text" context="FootnotingInside"/>
         <DetectChar char="}" attribute="Normal Text" context="#pop"/>
-        <StringDetect String="\(" attribute="Footnote Math" context="FootnotingMathMode" beginRegion="mathMode" />
-        <DetectChar char="\" attribute="Footnote Keyword" context="FootnotingContrSeq"/>
-        <DetectChar char="$" attribute="Footnote Math" context="FootnotingMathMode" beginRegion="mathMode" />
-        <DetectChar char="%" attribute="Comment" context="Comment"/>
-        <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
-      </context>
-      <context name="FootnotingContrSeq" attribute="Keyword" lineEndContext="#pop">
-         <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
-        <RegExpr String="[a-zA-Z]+(\+?|\*{0,3})" attribute="Footnote Keyword" context="#pop"/>
-        <RegExpr String="[^a-zA-Z]" attribute="Footnote Keyword" context="#pop" />
+        <StringDetect String="\(" attribute="Math" context="FootnotingMathMode" />
+        <DetectChar char="$" attribute="Math" context="FootnotingMathMode" />
+        <IncludeRules context="Normal Text" />
       </context>
-      <context name="FootnotingMathMode" attribute="Footnote Math" lineEndContext="#stay">
+      <context name="FootnotingMathMode" attribute="Math" lineEndContext="#stay">
         <StringDetect String="$$" attribute="Error" context="#stay" />
-        <DetectChar char="$" attribute="Footnote Math" context="#pop" endRegion="mathMode" />
-        <Detect2Chars char="\" char1=")" attribute="Footnote Math" context="#pop" endRegion="mathMode" />
+        <DetectChar char="$" attribute="Math" context="#pop" />
+        <Detect2Chars char="\" char1=")" attribute="Math" context="#pop" />
         <Detect2Chars char="\" char1="]" attribute="Error" context="#stay" />
-        <DetectChar char="\" attribute="Footnote Keyword Mathmode" context="FootnotingMathContrSeq"/>
-        <DetectChar char="%" attribute="Comment" context="Comment"/>
-        <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
-      </context>
-      <context name="FootnotingMathContrSeq" attribute="Footnote Keyword Mathmode" lineEndContext="#pop">
-        <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
-        <RegExpr String="[a-zA-Z]+\*?" attribute="Footnote Keyword Mathmode" context="#pop"/>
-        <RegExpr String="[^a-zA-Z]" attribute="Footnote Keyword Mathmode" context="#pop" /> 
+        <IncludeRules context="MathMode" />
       </context>
 
       <!-- LaTeX commands \newcommand and \renewcommand -->
@@ -137,7 +123,7 @@
       <!-- LaTeX command in text mode -->
       <context name="ContrSeq" attribute="Keyword" lineEndContext="#pop">
         <StringDetect String="verb*" attribute="Keyword" context="Verb"/>
-        <RegExpr String="verb(?=[^a-zA-Z])" attribute="Keyword" context="Verb"/>
+        <RegExpr String="(Verb|verb|lstinline)(?=[^a-zA-Z])" attribute="Keyword" context="Verb"/>
         <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
         <RegExpr String="[a-zA-Z@]+(\+?|\*{0,3})" attribute="Keyword" context="#pop"/>
         <RegExpr String="[^a-zA-Z]" attribute="Keyword" context="#pop" />
@@ -163,9 +149,9 @@
       </context>
 
       <context name="LabelOption" attribute="Normal Text" lineEndContext="#stay">
-        <StringDetect String="\(" attribute="Math" context="MathMode" beginRegion="mathMode" />
+        <StringDetect String="\(" attribute="Math" context="MathMode" />
         <DetectChar char="\" attribute="Keyword" context="ContrSeq"/>
-        <DetectChar char="$" attribute="Math" context="MathMode" beginRegion="mathMode" />
+        <DetectChar char="$" attribute="Math" context="MathMode" />
         <DetectChar char="%" attribute="Comment" context="Comment"/>
         <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
         <RegExpr String="\s*\]\s*" attribute="Normal Text" context="#pop"/>
@@ -189,26 +175,46 @@
       </context>
 
       <context name="FancyLabelRoundBrackets" attribute="Normal Text" lineEndContext="#stay">
-	      <StringDetect String="\(" attribute="Math" context="MathMode" beginRegion="mathMode" />
+	      <StringDetect String="\(" attribute="Math" context="MathMode" />
 	      <DetectChar char="\" attribute="Keyword" context="ContrSeq"/>
-	      <DetectChar char="$" attribute="Math" context="MathMode" beginRegion="mathMode" />
+	      <DetectChar char="$" attribute="Math" context="MathMode" />
 	      <DetectChar char="%" attribute="Comment" context="Comment"/>
 	      <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
 	      <RegExpr String="\s*\)\s*" attribute="Normal Text" context="#pop"/>
       </context>
 
+      <!-- end of an environment -->
+      <context name="FindEndEnvironment" attribute="Normal Text" lineEndContext="#stay">
+        <DetectChar char="{" attribute="Normal Text" context="EndEnvironment"/>
+        <RegExpr String="\S" attribute="Normal Text" context="#pop"/>
+      </context>
+
+      <context name="EndEnvironment" attribute="Environment" lineEndContext="#stay">
+        <RegExpr String="[a-zA-Z]" attribute="Environment" context="EndLatexEnv"/>
+        <RegExpr String="\s+" attribute="Error" context="#pop"/>
+        <RegExpr String="[^a-zA-Z]" attribute="Error" context="#pop"/>
+      </context>
+
+       <context name="EndLatexEnv" attribute="Environment" lineEndContext="#stay">
+        <DetectChar char="}" attribute="Normal Text" endRegion="block" context="#pop#pop#pop"/>
+        <RegExpr String="[a-zA-Z]+(\*)?" attribute="Environment" context="#stay"/>
+        <RegExpr String="\s+" attribute="Error" context="#stay"/>
+        <RegExpr String="[a-zA-Z]" attribute="Error" context="#pop#pop#pop"/>
+      </context>
+
       <!-- start of an environment -->
-      <context name="FindEnvironment" attribute="Normal Text" lineEndContext="#stay">
-        <DetectChar char="{" attribute="Normal Text" context="Environment"/>
+      <context name="FindBeginEnvironment" attribute="Normal Text" lineEndContext="#stay">
+        <DetectChar char="{" attribute="Normal Text" context="BeginEnvironment"/>
         <RegExpr String="\S" attribute="Normal Text" context="#pop"/>
       </context>
 
       <!-- filter the environment name and check the type -->
-      <context name="Environment" attribute="Environment" lineEndContext="#stay">
+      <context name="BeginEnvironment" attribute="Environment" lineEndContext="#stay">
         <RegExpr String="(lstlisting|(B|L)?Verbatim)" attribute="Environment" context="VerbatimEnvParam"/>
         <RegExpr String="(verbatim|boxedverbatim)" attribute="Environment" context="VerbatimEnv"/>
+        <RegExpr String="comment" attribute="Environment" context="CommentEnv"/>
         <RegExpr String="(alignat|xalignat|xxalignat)" attribute="Environment" context="MathEnvParam"/>
-        <RegExpr String="(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign)" attribute="Environment" context="MathEnv"/>
+        <RegExpr String="(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign|IEEEeqnarray|IEEEeqnarraybox|smallmatrix|pmatrix|bmatrix|Bmatrix|vmatrix|Vmatrix)" attribute="Environment" context="MathEnv"/>
         <RegExpr String="(tabularx|tabular|supertabular|mpsupertabular|xtabular|mpxtabular|longtable)" attribute="Environment" context="TabEnv"/>
         <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
         <RegExpr String="[a-zA-Z]" attribute="Environment" context="LatexEnv"/>
@@ -251,6 +257,26 @@
         <DetectChar char="}" attribute="Normal Text" context="#pop#pop#pop#pop#pop" endRegion="block"/>
       </context>
 
+      <!-- begin comment environment  -->
+      <context name="CommentEnv" attribute="Environment" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop#pop#pop">
+        <DetectChar char="}" attribute="Normal Text" context="BlockComment"/>
+        <RegExpr String="[a-zA-Z]" attribute="Environment" lookAhead="true" context="#pop"/>
+        <IncludeRules context="EnvCommon" />
+       </context>
+
+      <!-- parse comment text -->
+      <context name="BlockComment" attribute="Comment" lineEndContext="#stay">
+        <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
+        <RegExpr String="\\end(?=\s*\{comment\*?\})" attribute="Structure" context="CommFindEnd"/>
+      </context>
+
+      <!-- end of comment environment -->
+      <context name="CommFindEnd" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+        <RegExpr String="\s*\{" attribute="Normal Text" context="#stay"/>
+        <RegExpr String="comment\*?" attribute="Environment" context="#stay"/>
+        <DetectChar char="}" attribute="Normal Text" context="#pop#pop#pop#pop#pop" endRegion="block"/>
+      </context>
+
       <!-- environment type 4: math environment with its own mathmode -->
       <context name="MathEnv" attribute="Environment" lineEndContext="#stay">
         <DetectChar char="}" attribute="Normal Text" context="MathModeEnv"/>
@@ -276,9 +302,8 @@
 
       <!-- parse math environment -->
       <context name="MathModeEnv" attribute="Math" lineEndContext="#stay">
-        <RegExpr String="\\end(?=\s*\{(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign|alignat|xalignat|xxalignat)\*?\})" attribute="Structure" context="MathFindEnd"/>
-        <RegExpr String="\\begin(?=[^a-zA-Z])" attribute="Keyword Mathmode" context="#stay" beginRegion="block" />
-        <RegExpr String="\\end(?=[^a-zA-Z])" attribute="Keyword Mathmode" context="#stay" endRegion="block" />
+	<RegExpr String="\\begin(?=[^a-zA-Z])" attribute="Structure" context="FindBeginEnvironment" beginRegion="block"/>
+	<RegExpr String="\\end(?=[^a-zA-Z])" attribute="Structure" context="MathFindEnd"/>
         <StringDetect String="\(" attribute="Error" context="#stay" />
         <StringDetect String="\[" attribute="Error" context="#stay" />
         <StringDetect String="\)" attribute="Error" context="#stay" />
@@ -296,7 +321,7 @@
       <!-- end of math environment -->
       <context name="MathFindEnd" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
         <RegExpr String="\s*\{" attribute="Normal Text" context="#stay"/>
-        <RegExpr String="(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign|alignat|xalignat|xxalignat)\*?" attribute="Environment" context="#stay"/>
+        <RegExpr String="(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign|alignat|xalignat|xxalignat|IEEEeqnarray|IEEEeqnarraybox|smallmatrix|pmatrix|bmatrix|Bmatrix|vmatrix|Vmatrix)\*?" attribute="Environment" context="#stay"/>
         <DetectChar char="}" attribute="Normal Text" context="#pop#pop#pop#pop#pop"  endRegion="block"/>
       </context>
 
@@ -332,8 +357,8 @@
       <!-- math mode: starting with $ or \( -->
       <context name="MathMode" attribute="Math" lineEndContext="#stay">
         <StringDetect String="$$" attribute="Error" context="#stay" />
-        <DetectChar char="$" attribute="Math" context="#pop" endRegion="mathMode" />
-        <Detect2Chars char="\" char1=")" attribute="Math" context="#pop" endRegion="mathMode" />
+        <DetectChar char="$" attribute="Math" context="#pop" />
+        <Detect2Chars char="\" char1=")" attribute="Math" context="#pop" />
         <Detect2Chars char="\" char1="]" attribute="Error" context="#stay" />
         <IncludeRules context="MathModeCommon" />
       </context>
@@ -365,9 +390,9 @@
 
       <!-- math mode common -->
       <context name="MathModeCommon" attribute="Math" lineEndContext="#stay">
-        <RegExpr String="\\(begin|end)\s*\{(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign|alignat|xalignat|xxalignat)\*?\}" attribute="Error" context="#stay"/>
-        <RegExpr String="\\begin(?=[^a-zA-Z])" attribute="Keyword Mathmode" context="#stay" beginRegion="block" />
-        <RegExpr String="\\end(?=[^a-zA-Z])" attribute="Keyword Mathmode" context="#stay" endRegion="block" />
+        <RegExpr String="\\(begin|end)\s*\{(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign|alignat|xalignat|xxalignat|IEEEeqnarray)\*?\}" attribute="Error" context="#stay"/>
+	<RegExpr String="\\begin(?=[^a-zA-Z])" attribute="Keyword Mathmode" context="#stay" beginRegion="block" />
+	<RegExpr String="\\end(?=[^a-zA-Z])" attribute="Keyword Mathmode" context="#stay" endRegion="block" />
         <RegExpr String="\\(text|intertext|mbox)\s*(?=\{)" attribute="Keyword Mathmode" context="MathModeText" />
         <DetectChar char="\" attribute="Keyword Mathmode" context="MathContrSeq"/>
         <DetectChar char="%" attribute="Comment" context="Comment"/>
@@ -421,29 +446,24 @@
 
     <itemDatas>
       <itemData name="Normal Text" defStyleNum="dsNormal"/>
-      <itemData name="Keyword" defStyleNum="dsNormal" color="#800000" selColor="#60FFFF" bold="0" italic="0"/>
+      <itemData name="Keyword" defStyleNum="dsNormal" color="#800000" selColor="#60FFFF" bold="0" italic="0" spellChecking="false"/>
       <itemData name="Comment" defStyleNum="dsComment"/>
-      <itemData name="Error" defStyleNum="dsAlert"/>
-      <itemData name="Math" defStyleNum="dsNormal" color="#00A000" selColor="#FF40FF"  bold="0" italic="0"/>
-      <itemData name="Structure" defStyleNum="dsNormal" color="#F00000" selColor="#80FFD0" bold="0" italic="0"/>
-      <itemData name="Keyword Mathmode" defStyleNum="dsNormal" color="#606000" selColor="#FFD0FF" bold="0" italic="0"/>
-      <itemData name="Environment" defStyleNum="dsNormal" color="#0000D0" selColor="#FFFF90" bold="0" italic="0"/>
-      <itemData name="Verbatim" defStyleNum="dsNormal" color="#a08000" selColor="#80D0FF" bold="0" italic="0"/>
-      <itemData name="Region Marker" defStyleNum="dsRegionMarker" />
-      <itemData name="Bullet" defStyleNum="dsNormal" color="#FF00C4" bold="1" underline="1"/>
-      <itemData name="Ampersand" defStyleNum="dsNormal" color="#002793" bold="1" />
-      <itemData name="Column Separator" defStyleNum="dsNormal" color="#002793" />
-      <itemData name="Alert" defStyleNum="dsAlert" />
+      <itemData name="Error" defStyleNum="dsAlert" spellChecking="false"/>
+      <itemData name="Math" defStyleNum="dsNormal" color="#00A000" selColor="#FF40FF"  bold="0" italic="0" spellChecking="false"/>
+      <itemData name="Structure" defStyleNum="dsNormal" color="#F00000" selColor="#80FFD0" bold="0" italic="0" spellChecking="false"/>
+      <itemData name="Keyword Mathmode" defStyleNum="dsNormal" color="#606000" selColor="#FFD0FF" bold="0" italic="0" spellChecking="false"/>
+      <itemData name="Environment" defStyleNum="dsNormal" color="#0000D0" selColor="#FFFF90" bold="0" italic="0" spellChecking="false"/>
+      <itemData name="Verbatim" defStyleNum="dsNormal" color="#a08000" selColor="#80D0FF" bold="0" italic="0" spellChecking="false"/>
+      <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
+      <itemData name="Bullet" defStyleNum="dsNormal" color="#FF00C4" bold="1" underline="1" spellChecking="false"/>
+      <itemData name="Ampersand" defStyleNum="dsNormal" color="#002793" bold="1" spellChecking="false"/>
+      <itemData name="Column Separator" defStyleNum="dsNormal" color="#002793" spellChecking="false"/>
+      <itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/>
       <itemData name="Structure Text" defStyleNum="dsNormal" color="#000000" selColor="#FFFFFF" bold="1" italic="0"/>
-      <itemData name="Structure Keyword" defStyleNum="dsNormal" color="#800000" selColor="#60FFFF" bold="1" italic="0"/>
+      <itemData name="Structure Keyword" defStyleNum="dsNormal" color="#800000" selColor="#60FFFF" bold="1" italic="0" spellChecking="false"/>
       <itemData name="Structure Math" defStyleNum="dsNormal" color="#00A000" selColor="#FF40FF"  bold="1" italic="0"/>
-      <itemData name="Structure Keyword Mathmode" defStyleNum="dsNormal" color="#606000" selColor="#FFD0FF" bold="1" italic="0"/>
-      <itemData name="Footnote" defStyleNum="dsNormal" color="#800000" selColor="#60FFFF" bold="0" italic="0"/>
-      <itemData name="Footnote Text" defStyleNum="dsNormal" color="#000000" selColor="#FFFFFF" bold="0" italic="0"/>
-      <itemData name="Footnote Keyword" defStyleNum="dsNormal" color="#800000" selColor="#60FFFF" bold="0" italic="0"/>
-      <itemData name="Footnote Math" defStyleNum="dsNormal" color="#00A000" selColor="#FF40FF"  bold="0" italic="0"/>
-      <itemData name="Footnote Keyword Mathmode" defStyleNum="dsNormal" color="#606000" selColor="#FFD0FF" bold="0" italic="0"/>
-     </itemDatas>
+      <itemData name="Structure Keyword Mathmode" defStyleNum="dsNormal" color="#606000" selColor="#FFD0FF" bold="1" italic="0" spellChecking="false"/>
+    </itemDatas>
   </highlighting>
 
   <general>
@@ -452,4 +472,122 @@
       <comment name="singleLine" start="%" />
     </comments>
   </general>
+
+  <spellchecking>
+    <configuration encodingReplacementPolicy="EncodeWhenPresent"/>
+    <encodings>
+      <encoding char="&#192;" string="\`{A}" />
+      <encoding char="&#192;" string="\`A" />
+      <encoding char="&#193;" string="\'{A}" />
+      <encoding char="&#193;" string="\'A" />
+      <encoding char="&#194;" string="\^{A}" />
+      <encoding char="&#194;" string="\^A" />
+      <encoding char="&#195;" string="\~{A}" />
+      <encoding char="&#195;" string="\~A" />
+      <encoding char="&#196;" string="\&#34;{A}" />
+      <encoding char="&#196;" string="\&#34;A" />
+      <encoding char="&#197;" string="\AA{}" />
+      <encoding char="&#198;" string="\AE{}" />
+      <encoding char="&#199;" string="\c{C}" />
+      <encoding char="&#200;" string="\`{E}" />
+      <encoding char="&#200;" string="\`E" />
+      <encoding char="&#201;" string="\'{E}" />
+      <encoding char="&#201;" string="\'E" />
+      <encoding char="&#202;" string="\^{E}" />
+      <encoding char="&#202;" string="\^E" />
+      <encoding char="&#203;" string="\&#34;{E}" />
+      <encoding char="&#203;" string="\&#34;E" />
+      <encoding char="&#204;" string="\`{I}" />
+      <encoding char="&#204;" string="\`I" />
+      <encoding char="&#205;" string="\'{I}" />
+      <encoding char="&#205;" string="\'I" />
+      <encoding char="&#206;" string="\^{I}" />
+      <encoding char="&#206;" string="\^I" />
+      <encoding char="&#207;" string="\&#34;{I}" />
+      <encoding char="&#207;" string="\&#34;I" />
+      <encoding char="&#208;" string="\DH{}" />
+      <encoding char="&#209;" string="\~{N}" />
+      <encoding char="&#209;" string="\~N" />
+      <encoding char="&#210;" string="\`{O}" />
+      <encoding char="&#210;" string="\`O" />
+      <encoding char="&#211;" string="\'{O}" />
+      <encoding char="&#211;" string="\'O" />
+      <encoding char="&#212;" string="\^{O}" />
+      <encoding char="&#212;" string="\^O" />
+      <encoding char="&#213;" string="\~{O}" />
+      <encoding char="&#213;" string="\~O" />
+      <encoding char="&#214;" string="\&#34;{O}" />
+      <encoding char="&#214;" string="\&#34;O" />
+      <encoding char="&#216;" string="\O{}" />
+      <encoding char="&#217;" string="\`{U}" />
+      <encoding char="&#217;" string="\`U" />
+      <encoding char="&#218;" string="\'{U}" />
+      <encoding char="&#218;" string="\'U" />
+      <encoding char="&#219;" string="\^{U}" />
+      <encoding char="&#219;" string="\^U" />
+      <encoding char="&#220;" string="\&#34;{U}" />
+      <encoding char="&#220;" string="\&#34;U" />
+      <encoding char="&#221;" string="\'{Y}" />
+      <encoding char="&#221;" string="\'Y" />
+      <encoding char="&#222;" string="\TH{}" />
+      <encoding char="&#223;" string="\ss{}" />
+      <encoding char="&#224;" string="\`{a}" />
+      <encoding char="&#224;" string="\`a" />
+      <encoding char="&#225;" string="\'{a}" />
+      <encoding char="&#225;" string="\'a" />
+      <encoding char="&#226;" string="\^{a}" />
+      <encoding char="&#226;" string="\^a" />
+      <encoding char="&#227;" string="\~{a}" />
+      <encoding char="&#227;" string="\~a" />
+      <encoding char="&#228;" string="\&#34;{a}" />
+      <encoding char="&#228;" string="\&#34;a" />
+      <encoding char="&#229;" string="\aa{}" />
+      <encoding char="&#230;" string="\ae{}" />
+      <encoding char="&#231;" string="\c{c}" />
+      <encoding char="&#232;" string="\`{e}" />
+      <encoding char="&#232;" string="\`e" />
+      <encoding char="&#233;" string="\'{e}" />
+      <encoding char="&#233;" string="\'e" />
+      <encoding char="&#234;" string="\^{e}" />
+      <encoding char="&#234;" string="\^e" />
+      <encoding char="&#235;" string="\&#34;{e}" />
+      <encoding char="&#235;" string="\&#34;e" />
+      <encoding char="&#236;" string="\`{i}" />
+      <encoding char="&#236;" string="\`i" />
+      <encoding char="&#237;" string="\'{i}" />
+      <encoding char="&#237;" string="\'i" />
+      <encoding char="&#238;" string="\^{i}" />
+      <encoding char="&#238;" string="\^i" />
+      <encoding char="&#239;" string="\&#34;{i}" />
+      <encoding char="&#239;" string="\&#34;i" />
+      <encoding char="&#240;" string="\dh{}" />
+      <encoding char="&#241;" string="\~{n}" />
+      <encoding char="&#241;" string="\~n" />
+      <encoding char="&#242;" string="\`{o}" />
+      <encoding char="&#242;" string="\`o" />
+      <encoding char="&#243;" string="\'{o}" />
+      <encoding char="&#243;" string="\'o" />
+      <encoding char="&#244;" string="\^{o}" />
+      <encoding char="&#244;" string="\^o" />
+      <encoding char="&#245;" string="\~{o}" />
+      <encoding char="&#245;" string="\~o" />
+      <encoding char="&#246;" string="\&#34;{o}" />
+      <encoding char="&#246;" string="\&#34;o" />
+      <encoding char="&#248;" string="\o{}" />
+      <encoding char="&#249;" string="\`{u}" />
+      <encoding char="&#249;" string="\`u" />
+      <encoding char="&#250;" string="\'{u}" />
+      <encoding char="&#250;" string="\'u" />
+      <encoding char="&#251;" string="\^{u}" />
+      <encoding char="&#251;" string="\^u" />
+      <encoding char="&#252;" string="\&#34;{u}" />
+      <encoding char="&#252;" string="\&#34;u" />
+      <encoding char="&#253;" string="\'{y}" />
+      <encoding char="&#253;" string="\'y" />
+      <encoding char="&#254;" string="\th{}" />
+      <encoding char="&#255;" string="\&#34;{y}" />
+      <encoding char="&#255;" string="\&#34;y" />
+      <encoding string="''" ignored="true" />
+    </encodings>
+  </spellchecking>
 </language>
diff --git a/kate/data/literate-haskell.xml b/kate/data/literate-haskell.xml
index 6a9746794..52dcebe27 100644
--- a/kate/data/literate-haskell.xml
+++ b/kate/data/literate-haskell.xml
@@ -1,386 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Literate Haskell" version="1.05" kateversion="2.4" section="Sources" extensions="*.lhs" author="Marcel Martin ([email protected])" license="">
-	<highlighting>
-	<list name="keywords">
-		<item> case </item>
-		<item> class </item>
-		<item> data </item>
-		<item> deriving </item>
-		<item> do </item>
-		<item> else </item>
-		<item> if </item>
-		<item> in </item>
-		<item> infixl </item>
-		<item> infixr </item>
-		<item> instance </item>
-		<item> let </item>
-		<item> module </item>
-		<item> of </item>
-		<item> primitive </item>
-		<item> then </item>
-		<item> type </item>
-		<item> where </item>
-	</list>
-        <list name="infix operators">
-		<item> quot </item>
-		<item> rem </item>
-		<item> div </item>
-		<item> mod </item>
-		<item> elem </item>
-		<item> notElem </item>
-		<item> seq </item>
-	</list>
-	<list name="functions">
-		<!--
-                These operators are not handled yet.
-		<item> !! </item>
-		<item> % </item>
-		<item> && </item>
-		<item> $! </item>
-		<item> $ </item>
-		<item> * </item>
-		<item> ** </item>
-		<item> - </item>
-		<item> . </item>
-		<item> /= </item>
-		<item> < </item>
-		<item> <= </item>
-		<item> =<< </item>
-		<item> == </item>
-		<item> > </item>
-		<item> >= </item>
-		<item> >> </item>
-		<item> >>= </item>
-		<item> ^ </item>
-		<item> ^^ </item>
-		<item> ++ </item>
-		<item> || </item>
-		//-->
-
-		<item> FilePath </item>
-		<item> IOError </item>
-		<item> abs </item>
-		<item> acos </item>
-		<item> acosh </item>
-		<item> all </item>
-		<item> and </item>
-		<item> any </item>
-		<item> appendFile </item>
-		<item> approxRational </item>
-		<item> asTypeOf </item>
-		<item> asin </item>
-		<item> asinh </item>
-		<item> atan </item>
-		<item> atan2 </item>
-		<item> atanh </item>
-		<item> basicIORun </item>
-		<item> break </item>
-		<item> catch </item>
-		<item> ceiling </item>
-		<item> chr </item>
-		<item> compare </item>
-		<item> concat </item>
-		<item> concatMap </item>
-		<item> const </item>
-		<item> cos </item>
-		<item> cosh </item>
-		<item> curry </item>
-		<item> cycle </item>
-		<item> decodeFloat </item>
-		<item> denominator </item>
-		<item> digitToInt </item>
-		<item> div </item>
-		<item> divMod </item>
-		<item> drop </item>
-		<item> dropWhile </item>
-		<item> either </item>
-		<item> elem </item>
-		<item> encodeFloat </item>
-		<item> enumFrom </item>
-		<item> enumFromThen </item>
-		<item> enumFromThenTo </item>
-		<item> enumFromTo </item>
-		<item> error </item>
-		<item> even </item>
-		<item> exp </item>
-		<item> exponent </item>
-		<item> fail </item>
-		<item> filter </item>
-		<item> flip </item>
-		<item> floatDigits </item>
-		<item> floatRadix </item>
-		<item> floatRange </item>
-		<item> floor </item>
-		<item> fmap </item>
-		<item> foldl </item>
-		<item> foldl1 </item>
-		<item> foldr </item>
-		<item> foldr1 </item>
-		<item> fromDouble </item>
-		<item> fromEnum </item>
-		<item> fromInt </item>
-		<item> fromInteger </item>
-		<item> fromIntegral </item>
-		<item> fromRational </item>
-		<item> fst </item>
-		<item> gcd </item>
-		<item> getChar </item>
-		<item> getContents </item>
-		<item> getLine </item>
-		<item> head </item>
-		<item> id </item>
-		<item> inRange </item>
-		<item> index </item>
-		<item> init </item>
-		<item> intToDigit </item>
-		<item> interact </item>
-		<item> ioError </item>
-		<item> isAlpha </item>
-		<item> isAlphaNum </item>
-		<item> isAscii </item>
-		<item> isControl </item>
-		<item> isDenormalized </item>
-		<item> isDigit </item>
-		<item> isHexDigit </item>
-		<item> isIEEE </item>
-		<item> isInfinite </item>
-		<item> isLower </item>
-		<item> isNaN </item>
-		<item> isNegativeZero </item>
-		<item> isOctDigit </item>
-		<item> isPrint </item>
-		<item> isSpace </item>
-		<item> isUpper </item>
-		<item> iterate </item>
-		<item> last </item>
-		<item> lcm </item>
-		<item> length </item>
-		<item> lex </item>
-		<item> lexDigits </item>
-		<item> lexLitChar </item>
-		<item> lines </item>
-		<item> log </item>
-		<item> logBase </item>
-		<item> lookup </item>
-		<item> map </item>
-		<item> mapM </item>
-		<item> mapM_ </item>
-		<item> max </item>
-		<item> maxBound </item>
-		<item> maximum </item>
-		<item> maybe </item>
-		<item> min </item>
-		<item> minBound </item>
-		<item> minimum </item>
-		<item> mod </item>
-		<item> negate </item>
-		<item> not </item>
-		<item> notElem </item>
-		<item> null </item>
-		<item> numerator </item>
-		<item> odd </item>
-		<item> or </item>
-		<item> ord </item>
-		<item> otherwise </item>
-		<item> pi </item>
-		<item> pred </item>
-		<item> primExitWith </item>
-		<item> print </item>
-		<item> product </item>
-		<item> properFraction </item>
-		<item> putChar </item>
-		<item> putStr </item>
-		<item> putStrLn </item>
-		<item> quot </item>
-		<item> quotRem </item>
-		<item> range </item>
-		<item> rangeSize </item>
-		<item> read </item>
-		<item> readDec </item>
-		<item> readFile </item>
-		<item> readFloat </item>
-		<item> readHex </item>
-		<item> readIO </item>
-		<item> readInt </item>
-		<item> readList </item>
-		<item> readLitChar </item>
-		<item> readLn </item>
-		<item> readOct </item>
-		<item> readParen </item>
-		<item> readSigned </item>
-		<item> reads </item>
-		<item> readsPrec </item>
-		<item> realToFrac </item>
-		<item> recip </item>
-		<item> rem </item>
-		<item> repeat </item>
-		<item> replicate </item>
-		<item> return </item>
-		<item> reverse </item>
-		<item> round </item>
-		<item> scaleFloat </item>
-		<item> scanl </item>
-		<item> scanl1 </item>
-		<item> scanr </item>
-		<item> scanr1 </item>
-		<item> seq </item>
-		<item> sequence </item>
-		<item> sequence_ </item>
-		<item> show </item>
-		<item> showChar </item>
-		<item> showInt </item>
-		<item> showList </item>
-		<item> showLitChar </item>
-		<item> showParen </item>
-		<item> showSigned </item>
-		<item> showString </item>
-		<item> shows </item>
-		<item> showsPrec </item>
-		<item> significand </item>
-		<item> signum </item>
-		<item> sin </item>
-		<item> sinh </item>
-		<item> snd </item>
-		<item> span </item>
-		<item> splitAt </item>
-		<item> sqrt </item>
-		<item> subtract </item>
-		<item> succ </item>
-		<item> sum </item>
-		<item> tail </item>
-		<item> take </item>
-		<item> takeWhile </item>
-		<item> tan </item>
-		<item> tanh </item>
-		<item> threadToIOResult </item>
-		<item> toEnum </item>
-		<item> toInt </item>
-		<item> toInteger </item>
-		<item> toLower </item>
-		<item> toRational </item>
-		<item> toUpper </item>
-		<item> truncate </item>
-		<item> uncurry </item>
-		<item> undefined </item>
-		<item> unlines </item>
-		<item> until </item>
-		<item> unwords </item>
-		<item> unzip </item>
-		<item> unzip3 </item>
-		<item> userError </item>
-		<item> words </item>
-		<item> writeFile </item>
-		<item> zip </item>
-		<item> zip3 </item>
-		<item> zipWith </item>
-		<item> zipWith3 </item>
-	</list>
-	<list name="type constructors">
-		<item> Bool </item>
-		<item> Char </item>
-                <item> Double </item>
-		<item> Either </item>
-		<item> Float </item>
-		<item> IO </item>
-		<item> Integer </item>
-		<item> Int </item>
-		<item> Maybe </item>
-		<item> Ordering </item>
-		<item> Rational </item>
-		<item> Ratio </item>
-		<item> ReadS </item>
-		<item> ShowS </item>
-		<item> String </item>
-
-	</list>
-	<list name="classes">
-		<item> Bounded </item>
-		<item> Enum </item>
-		<item> Eq </item>
-		<item> Floating </item>
-		<item> Fractional </item>
-		<item> Functor </item>
-		<item> Integral </item>
-		<item> Ix </item>
-		<item> Monad </item>
-		<item> Num </item>
-		<item> Ord </item>
-		<item> Read </item>
-		<item> RealFloat </item>
-		<item> RealFrac </item>
-		<item> Real </item>
-		<item> Show </item>
-	</list>
-	<list name="data constructors">
-		<item> EQ </item>
-		<item> False </item>
-		<item> GT </item>
-		<item> Just </item>
-		<item> LT </item>
-		<item> Left </item>
-		<item> Nothing </item>
-		<item> Right </item>
-		<item> True </item>
-	</list>
-	<contexts>
-		<context attribute="Comment" lineEndContext="#stay" name="literate-normal">
-			<DetectChar attribute="Special" context="normal" char="&gt;" column="0"/>
-		</context>
-		<context attribute="Normal Text" lineEndContext="#pop" name="normal">
-			<Detect2Chars attribute="Comment" context="comment_multi_line" char="{" char1="-" />
-			<Detect2Chars attribute="Comment" context="comment_single_line" char="-" char1="-" />
-			<keyword attribute="Keyword" context="#stay" String="keywords" />
-			<keyword attribute="Class" context="#stay" String="classes" />
-			<keyword attribute="Type Constructor" context="#stay" String="type constructors" />
-			<keyword attribute="Function" context="#stay" String="functions" />
-			<keyword attribute="Data Constructor" context="#stay" String="data constructors" />
-			<DetectChar attribute="String" context="string" char="&quot;" />
-			<DetectChar attribute="Infix Operator" context="infix" char="`"/>
-			<RegExpr attribute="Normal Text" context="#stay" String="\w[']+" />
-			<DetectChar attribute="Char" context="single_char" char="'" />
-			<RegExpr attribute="Function Definition" context="#stay" String="\s*[a-z_]+\w*'*\s*::" />
-			<Float attribute="Float" context="#stay" />
-			<Int attribute="Decimal" context="#stay" />
-		</context>
-		<context attribute="Comment" lineEndContext="#pop#pop" name="comment_single_line" />
-		<context attribute="Comment" lineEndContext="#stay" name="comment_multi_line">
-			<Detect2Chars attribute="Comment" context="#pop" char="-" char1="}" />
-		</context>
-		<context attribute="String" lineEndContext="#stay" name="string">
-			<RegExpr attribute="String" context="#stay" String="\\." />
-			<DetectChar attribute="String" context="#pop" char="&quot;" />
-		</context>
-		<context attribute="Infix Operator" lineEndContext="#stay" name="infix">
-			<DetectChar attribute="Infix Operator" context="#pop" char="`"/>
-		</context>
-		<context attribute="Char" lineEndContext="#pop" name="single_char">
-			<RegExpr attribute="Char" context="#stay" String="\\." />
-			<DetectChar attribute="Char" context="#pop" char="'" />
-		</context>
-		<context attribute="Function Definition" lineEndContext="#pop" name="function_definition">
-			<DetectChar attribute="Function Definition" context="#pop" char=";" />
-		</context>
-	</contexts>
-	<itemDatas>
-		<itemData name="Normal Text"		defStyleNum="dsNormal"/>
-		<itemData name="Keyword" 		defStyleNum="dsKeyword"/>
-		<itemData name="Function"		defStyleNum="dsFunction"/>
-		<itemData name="Function Definition"	defStyleNum="dsFunction"/>
-		<itemData name="Class"			defStyleNum="dsKeyword"/>
-		<itemData name="Decimal"		defStyleNum="dsDecVal"/>
-		<itemData name="Float"			defStyleNum="dsFloat"/>
-		<itemData name="Char"			defStyleNum="dsChar"/>
-		<itemData name="String"			defStyleNum="dsString"/>
-		<itemData name="Constructor"		defStyleNum="dsOthers"/>
-		<itemData name="Comment"		defStyleNum="dsComment"/>
-		<itemData name="Data Constructor"	defStyleNum="dsKeyword"/>
-		<itemData name="Type Constructor"	defStyleNum="dsDataType"/>
-		<itemData name="Infix Operator"		defStyleNum="dsOthers"/>
-		<itemData name="Special"		defStyleNum="dsChar"/>
-	</itemDatas>
-	</highlighting>
-	<general>
-		<keywords casesensitive="1" />
-	</general>
+<language name="Literate Haskell" version="2.0.1" kateversion="2.3" section="Sources" extensions="*.lhs" mimetype="text/x-haskell" author="Nicolas Wu ([email protected])" license="LGPL" indenter="haskell">
+  <highlighting>
+  <contexts>
+    <context attribute="Text" lineEndContext="#stay" name="text">
+      <DetectChar attribute="BirdTrack" context="normal" char="&gt;" column="0"/>
+      <DetectChar attribute="BirdTrack" context="normal" char="&lt;" column="0"/>
+      <StringDetect attribute="Text" context="normals" String="&#92;begin&#123;code&#125;"/>
+      <StringDetect attribute="Text" context="normals" String="&#92;begin&#123;spec&#125;"/>
+    </context>
+    <context attribute="Normal" lineEndContext="#pop" name="normal">
+      <RegExpr attribute="Comment" context="comments'" String="\{-[^#]" />
+      <IncludeRules context="##Haskell" />
+    </context>
+    <context attribute="Normal" lineEndContext="#stay" name="normals">
+      <StringDetect attribute="Normal" context="#pop" String="&#92;end&#123;code&#125;"/>
+      <StringDetect attribute="Normal" context="#pop" String="&#92;end&#123;spec&#125;"/>
+      <IncludeRules context="##Haskell" />
+    </context>
+    <context attribute="Comment" lineEndContext="uncomments" name="comments'" >
+      <Detect2Chars attribute="Comment" context="#pop" char="-" char1="}" />
+    </context>
+    <context attribute="Text" lineEndContext="#stay" name="uncomments">
+      <DetectChar attribute="BirdTrack" context="recomments" char="&gt;" column="0"/>
+      <DetectChar attribute="BirdTrack" context="recomments" char="&lt;" column="0"/>
+    </context>
+    <context attribute="Comment" lineEndContext="#pop" name="recomments">
+      <Detect2Chars attribute="Comment" context="#pop#pop#pop" char="-" char1="}" />
+    </context>
+  </contexts>
+  <itemDatas>
+    <itemData name="Text"             defStyleNum="dsNormal" spellChecking="true" />
+    <itemData name="BirdTrack"        defStyleNum="dsOthers"  spellChecking="false" />
+    <itemData name="Comment"          defStyleNum="dsComment" />
+  </itemDatas>
+  </highlighting>
 </language>
diff --git a/kate/data/lua.xml b/kate/data/lua.xml
index 6de4c8a17..52442de05 100644
--- a/kate/data/lua.xml
+++ b/kate/data/lua.xml
@@ -35,7 +35,7 @@
     - improved highlighting
 
     -->
-<language name="Lua" version="1.03" kateversion="2.4" section="Scripts" extensions="*.lua" mimetype="text/x-lua">
+<language name="Lua" version="1.04" indenter="lua" kateversion="2.4" section="Scripts" extensions="*.lua" mimetype="text/x-lua">
   <highlighting>
     <list name="keywords">
       <item> and </item>
@@ -213,6 +213,10 @@
     </list>
 
     <contexts>
+      <context name="Base" attribute="Comment" lineEndContext="Normal">
+        <RegExpr attribute="Comment" context="Normal" String="#!.*$" column="0" />
+        <RegExpr attribute="Comment" context="Normal" String="^.*$" lookAhead="true" />
+      </context>
       <context name="Normal"        attribute="Normal Text" lineEndContext="#stay">
         <IncludeRules context="##DoxygenLua" />
         <keyword      attribute="Error"  context="#stay" String="deprecated" />
@@ -297,4 +301,4 @@
     </comments>
     <keywords casesensitive="1" weakDeliminator="&#46;" additionalDeliminator="&quot;"/>
   </general>
-</language>
\ No newline at end of file
+</language>
diff --git a/kate/data/m4.xml b/kate/data/m4.xml
new file mode 100644
index 000000000..23e3f3576
--- /dev/null
+++ b/kate/data/m4.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!--
+
+  GNU M4 syntax highlightning.
+  Corresponds to GNU M4 version 1.4.16.
+
+  For KatePart (Kate, KWrite etc) copy this file to
+    ~/.tde/share/apps/katepart/syntax/
+
+  For Qt Creator copy this file to
+    ~/.config/Nokia/qtcreator/generic-highlighter/
+
+
+  Copyright (c) 2011, Cybernetica AS ( http://www.cyber.ee/ )
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of Cybernetica AS nor the names of its contributors
+        may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL  Cybernetica AS  BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-->
+<language name="GNU M4" version="1.0" section="Sources" kateversion="2.5" extensions="*.m4;" author="Jaak Ristioja" license="New BSD License">
+  <highlighting>
+    <list name="optbuiltins">
+      <item> __gnu__ </item>
+      <item> __os2__ </item>
+      <item> os2 </item>
+      <item> __unix__ </item>
+      <item> unix </item>
+      <item> __windows__ </item>
+      <item> windows </item>
+    </list>
+    <list name="m4_optbuiltins">
+      <item> m4___gnu__ </item>
+      <item> m4___os2__ </item>
+      <item> m4_os2 </item>
+      <item> m4___unix__ </item>
+      <item> m4_unix </item>
+      <item> m4___windows__ </item>
+      <item> m4_windows </item>
+    </list>
+    <list name="builtins">
+      <item> __file__ </item>
+      <item> __line__ </item>
+      <item> __program__ </item>
+      <item> builtin </item>
+      <item> changecom </item>
+      <item> changequote </item>
+      <item> changeword </item>
+      <item> debugfile </item>
+      <item> debugmode </item>
+      <item> decr </item>
+      <item> define </item>
+      <item> defn </item>
+      <item> divert </item>
+      <item> divnum </item>
+      <item> dnl </item>
+      <item> dumpdef </item>
+      <item> errprint </item>
+      <item> esyscmd </item>
+      <item> eval </item>
+      <item> format </item>
+      <item> ifdef </item>
+      <item> ifelse </item>
+      <item> include </item>
+      <item> incr </item>
+      <item> index </item>
+      <item> indir </item>
+      <item> len </item>
+      <item> m4exit </item>
+      <item> m4wrap </item>
+      <item> maketemp </item>
+      <item> mkstemp </item>
+      <item> patsubst </item>
+      <item> popdef </item>
+      <item> pushdef </item>
+      <item> regexp </item>
+      <item> shift </item>
+      <item> sinclude </item>
+      <item> substr </item>
+      <item> syscmd </item>
+      <item> sysval </item>
+      <item> traceon </item>
+      <item> traceoff </item>
+      <item> translit </item>
+      <item> undefine </item>
+      <item> undivert </item>
+    </list>
+    <list name="m4_builtins">
+      <item> m4___file__ </item>
+      <item> m4___line__ </item>
+      <item> m4___program__ </item>
+      <item> m4_builtin </item>
+      <item> m4_changecom </item>
+      <item> m4_changequote </item>
+      <item> m4_changeword </item>
+      <item> m4_debugfile </item>
+      <item> m4_debugmode </item>
+      <item> m4_decr </item>
+      <item> m4_define </item>
+      <item> m4_defn </item>
+      <item> m4_divert </item>
+      <item> m4_divnum </item>
+      <item> m4_dnl </item>
+      <item> m4_dumpdef </item>
+      <item> m4_errprint </item>
+      <item> m4_esyscmd </item>
+      <item> m4_eval </item>
+      <item> m4_format </item>
+      <item> m4_ifdef </item>
+      <item> m4_ifelse </item>
+      <item> m4_include </item>
+      <item> m4_incr </item>
+      <item> m4_index </item>
+      <item> m4_indir </item>
+      <item> m4_len </item>
+      <item> m4_m4exit </item>
+      <item> m4_m4wrap </item>
+      <item> m4_maketemp </item>
+      <item> m4_mkstemp </item>
+      <item> m4_patsubst </item>
+      <item> m4_popdef </item>
+      <item> m4_pushdef </item>
+      <item> m4_regexp </item>
+      <item> m4_shift </item>
+      <item> m4_sinclude </item>
+      <item> m4_substr </item>
+      <item> m4_syscmd </item>
+      <item> m4_sysval </item>
+      <item> m4_traceon </item>
+      <item> m4_traceoff </item>
+      <item> m4_translit </item>
+      <item> m4_undefine </item>
+      <item> m4_undivert </item>
+    </list>
+    <contexts>
+      <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text">
+        <keyword attribute="Builtins" String="builtins" context="#stay"/>
+        <keyword attribute="Builtins (prefixed with m4_)" String="m4_builtins" context="#stay"/>
+        <keyword attribute="Optional builtins" String="optbuiltins" context="#stay"/>
+        <keyword attribute="Optional builtins (prefixed with m4_)" String="m4_optbuiltins" context="#stay"/>
+        <RegExpr attribute="Normal Text" String="[a-zA-Z_]\w+" context="#stay"/>
+        <RegExpr attribute="Special arguments to macros" String="\$([1-9]\d*|0|\#|\*|\@|\{([1-9]\d*|0)\})" context="#stay"/>
+        <RegExpr attribute="Int" String="([1-9]\d*|0|0x[0-9abcdefABCDEF]+)" context="#stay"/>
+        <RegExpr attribute="Comment" String="#.*$" context="#stay"/>
+        <DetectChar attribute="Commas" char="," context="#stay"/>
+        <DetectChar attribute="Operators" char="(" context="inparenthesis" beginRegion="parenthesis"/>
+        <DetectChar attribute="Operators" char=")" context="#pop" endRegion="parenthesis"/>
+        <RegExpr attribute="Operators" String="[+*/%\|=\!&lt;&gt;!^&amp;~-]" context="#stay"/>
+      </context>
+      <context name="inparenthesis" attribute="Normal Text" lineEndContext="#stay" noIndentationBasedFolding="true">
+        <IncludeRules context="Normal Text" />
+      </context>
+    </contexts>
+    <itemDatas>
+      <itemData name="Builtins" defStyleNum="dsKeyword"/>
+      <itemData name="Builtins (prefixed with m4_)" defStyleNum="dsKeyword"/>
+      <itemData name="Optional builtins" defStyleNum="dsKeyword"/>
+      <itemData name="Optional builtins (prefixed with m4_)" defStyleNum="dsKeyword"/>
+      <itemData name="Normal Text" defStyleNum="dsNormal"/>
+      <itemData name="Special arguments to macros" defStyleNum="dsChar"/>
+      <itemData name="Int" defStyleNum="dsDecVal"/>
+      <itemData name="Comment" defStyleNum="dsComment"/>
+      <itemData name="Commas" defStyleNum="dsChar"/>
+      <itemData name="Operators" defStyleNum="dsChar"/>
+    </itemDatas>
+  </highlighting>
+  <general>
+    <folding indentationsensitive="1" />
+    <comments>
+      <comment name="singleLine" start="#" position="afterwhitespace"/>
+    </comments>
+  </general>
+</language>
diff --git a/kate/data/makefile.xml b/kate/data/makefile.xml
index fc322d737..c0473c958 100644
--- a/kate/data/makefile.xml
+++ b/kate/data/makefile.xml
@@ -3,7 +3,8 @@
 <!-- Makefile syntaxfile v0.9 by Per Wigren <[email protected]> -->
 <!-- Modified by Joseph Wenninger <[email protected]> -->
 <!-- Modified by Rui Santana <[email protected]> -->
-<language name="Makefile" version="1.10" kateversion="2.4" section="Other" extensions="GNUmakefile;Makefile*;makefile*" mimetype="text/x-makefile" author="Per Wigren ([email protected])" license="">
+<!-- small priority to allow for example Makefile.cpp to be detected as cpp file -->
+<language name="Makefile" version="1.12" kateversion="2.4" section="Other" extensions="GNUmakefile;Makefile;makefile;GNUmakefile.*;Makefile.*;makefile.*" mimetype="text/x-makefile" author="Per Wigren ([email protected])" license="">
   <highlighting>
     <list name = "keywords">
       <item> include </item>
@@ -57,11 +58,12 @@
     <contexts>
       <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
         <keyword attribute="Keyword"  context="#stay" String="keywords"/>
-        <RegExpr attribute="Variable" context="Value" String="[_\w\d]*\s*(?=:=|=)"/>
+        <RegExpr attribute="Variable" context="Value" String="[_\w\d]*\s*(?=:=|=|\+=|\?=)"/>
         <RegExpr attribute="Target"   context="#stay" String="[_\w\d-]*\s*:" firstNonSpace="true"/>
         <RegExpr attribute="Section"  context="#stay" String="^[.].*:"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
-        <RegExpr attribute="Operator"  context="VarFromNormal" String="[$][\({]"/>
+        <Detect2Chars attribute="Operator" context="VarFromNormal{" char="$" char1="{"/>
+        <Detect2Chars attribute="Operator" context="VarFromNormal(" char="$" char1="("/>
         <Detect2Chars attribute="Special" context="#stay" char="\" char1="#"/>
         <Detect2Chars attribute="Special" context="#stay" char="\" char1="\"/>
         <AnyChar attribute="Operator" context="#stay" String="+*=%$():\&#059;"/>
@@ -74,32 +76,47 @@
         <DetectChar attribute="String" context="#pop" char="&quot;"/>
       </context>
 
-      <context name="Value" attribute="String" lineEndContext="#stay">
-        <RegExpr attribute="Operator" String="\\$"     context="#stay"/>
-        <RegExpr attribute="String"   String="[^\\]?$" context="#pop"/>
-        <RegExpr attribute="Operator" String="[$][\({]" context="VarFromValue"/>
+      <context name="Value" attribute="String" lineEndContext="#pop">
+        <LineContinue attribute="Operator"/>
+        <Detect2Chars attribute="Operator" context="VarFromValue{" char="$" char1="{"/>
+        <Detect2Chars attribute="Operator" context="VarFromValue(" char="$" char1="("/>
         <RegExpr attribute="Special" context="#pop" String="@[-_\d\w]*@" />
         <DetectChar attribute="Operator" char="&#059;" context="#pop"/>
       </context>
 
-      <context name="VarFromValue" attribute="Variable" lineEndContext="#stay">
-        <RegExpr attribute="Operator" String="[\)}](?=/)" context="#pop"/>
-        <RegExpr attribute="Operator" String="[\)}][^$]" context="#pop"/>
-        <RegExpr attribute="Operator" String="[\)}]$" context="#pop#pop"/>
+      <context name="VarFromValue(" attribute="Variable" lineEndContext="#stay">
+        <DetectChar attribute="Operator" char=")" context="#pop"/>
       </context>
 
-      <context name="VarFromNormal" attribute="Variable" lineEndContext="#stay">
-        <keyword attribute="Keyword" context="FunctionCall" String="functions"/>
-        <AnyChar attribute="Operator" String=")}" context="#pop"/>
+      <context name="VarFromValue{" attribute="Variable" lineEndContext="#stay">
+        <DetectChar attribute="Operator" char="}" context="#pop"/>
       </context>
 
-      <context name="FunctionCall" attribute="String" lineEndContext="#stay">
-        <RegExpr attribute="Operator" context="VarFromNormal" String="[$][\({]"/>
-        <AnyChar attribute="Operator" String=")}" context="#pop#pop"/>
+      <context name="VarFromNormal(" attribute="Variable" lineEndContext="#stay">
+        <keyword attribute="Keyword" context="FunctionCall(" String="functions"/>
+        <DetectChar attribute="Operator" char=")" context="#pop"/>
+      </context>
+
+      <context name="VarFromNormal{" attribute="Variable" lineEndContext="#stay">
+        <keyword attribute="Keyword" context="FunctionCall{" String="functions"/>
+        <DetectChar attribute="Comment" char="}" context="#pop"/>
+      </context>
+
+      <context name="FunctionCall(" attribute="String" lineEndContext="#stay">
+        <Detect2Chars attribute="Operator" context="VarFromNormal{" char="$" char1="{"/>
+        <Detect2Chars attribute="Operator" context="VarFromNormal(" char="$" char1="("/>
+        <DetectChar attribute="Operator" char=")" context="#pop#pop"/>
+      </context>
+
+      <context name="FunctionCall{" attribute="String" lineEndContext="#stay">
+        <Detect2Chars attribute="Operator" context="VarFromNormal{" char="$" char1="{"/>
+        <Detect2Chars attribute="Operator" context="VarFromNormal(" char="$" char1="("/>
+        <DetectChar attribute="Operator" char="}" context="#pop#pop"/>
       </context>
 
       <context name="Commands" attribute="Normal Text" lineEndContext="#pop">
-        <RegExpr attribute="Operator" context="VarFromNormal" String="[$][\({]"/>
+        <Detect2Chars attribute="Operator" context="VarFromNormal{" char="$" char1="{"/>
+        <Detect2Chars attribute="Operator" context="VarFromNormal(" char="$" char1="("/>
         <RegExpr attribute="Commands" context="#pop" String="[_\w-]*\b"/>
       </context>
 
diff --git a/kate/data/mediawiki.xml b/kate/data/mediawiki.xml
index 42ec1dd32..b3aa5c9b1 100644
--- a/kate/data/mediawiki.xml
+++ b/kate/data/mediawiki.xml
@@ -1,6 +1,6 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="MediaWiki" section="Markup" version="1.02" kateversion="2.4" extensions="" mimetype="" license="FDL" >
+<language name="MediaWiki" section="Markup" version="1.03" kateversion="2.4" extensions="" mimetype="" license="FDL" >
   <highlighting>
     <contexts>
       <context attribute="Normal" lineEndContext="#stay" name="normal" >
@@ -45,12 +45,12 @@
       </context>
       <context attribute="Link" lineEndContext="#stay" name="URL" >
         <DetectChar char="]" context="#pop" attribute="Wiki-Tag" />
-        <DetectChar char="'" context="Error" attribute="Error" />
+<!--         <DetectChar char="'" context="Error" attribute="Error" /> -->
       </context>
       <context attribute="Link" lineEndContext="#stay" name="WikiLink" >
         <DetectChar char="|" attribute="Wiki-Tag" context="WikiLinkDescription" />
         <Detect2Chars char="]" char1="]" context="#pop" attribute="Wiki-Tag" />
-        <DetectChar char="'" context="Error" attribute="Error" />
+<!--         <DetectChar char="'" context="Error" attribute="Error" /> -->
       </context>
       <context attribute="Link" lineEndContext="#stay" name="WikiLinkDescription" >
         <Detect2Chars char="]" char1="]" context="#pop" attribute="Wiki-Tag" lookAhead="true" />
@@ -62,7 +62,7 @@
       <context attribute="Error" lineEndContext="#pop" name="Error" />
       <context attribute="Link" lineEndContext="#stay" name="Template" >
         <Detect2Chars char="}" char1="}" context="#pop" attribute="Wiki-Tag" />
-        <DetectChar char="'" context="Error" attribute="Error" />
+<!--         <DetectChar char="'" context="Error" attribute="Error" /> -->
       </context>
       <context attribute="NoWiki" lineEndContext="#stay" name="NoWiki" >
         <RegExpr String="&lt;!--[^-]*--&gt;" attribute="NoWiki" />
diff --git a/kate/data/mel.xml b/kate/data/mel.xml
new file mode 100644
index 000000000..032cba66f
--- /dev/null
+++ b/kate/data/mel.xml
@@ -0,0 +1,1381 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!--
+  MEL (Maya Embedded Language)
+
+  GNU GENERAL PUBLIC LICENCE
+
+This program, including associated files, is free software.  You may
+distribute 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 (at your option) 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.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+-->
+
+<language name="MEL" section="Scripts" version="1.00" kateversion="2.4" extensions="*.mel" mimetype="" author="Karl Erlandsen ([email protected])" license="GPL">
+  <highlighting>
+    <list name="keywords">
+      <item> break </item>
+      <item> case </item>
+      <item> continue </item>
+      <item> default </item>
+      <item> do </item>
+      <item> else </item>
+      <item> false </item>
+      <item> for </item>
+      <item> global </item>
+      <item> if </item>
+      <item> in </item>
+      <item> proc </item>
+      <item> return </item>
+      <item> switch </item>
+      <item> true </item>
+      <item> while </item>
+    </list>
+    
+    <!-- The command list can be automatically generated from the Maya Help Documentation in /usr/aw/maya/docs/Maya*/en_US/Commands
+         with the following bash script:
+         
+         #!/bin/bash
+         
+         cd /usr/aw/maya/docs/Maya*/en_US/Commands;
+         for file in *.html
+         do
+           echo "      <item> ${file%%.html} </item>" >> ~/list.xml;
+         done
+         
+         -->
+    <list name="MEL commands">
+      <item> about </item>
+      <item> abs </item>
+      <item> addAttr </item>
+      <item> addAttributeEditorNodeHelp </item>
+      <item> addDynamic </item>
+      <item> addNewShelfTab </item>
+      <item> addPanelCategory </item>
+      <item> addPP </item>
+      <item> addPrefixToName </item>
+      <item> advanceToNextDrivenKey </item>
+      <item> affectedNet </item>
+      <item> affects </item>
+      <item> aimConstraint </item>
+      <item> air </item>
+      <item> aliasAttr </item>
+      <item> alias </item>
+      <item> alignCtx </item>
+      <item> alignCurve </item>
+      <item> align </item>
+      <item> alignSurface </item>
+      <item> allViewFit </item>
+      <item> ambientLight </item>
+      <item> angleBetween </item>
+      <item> angle </item>
+      <item> animCurveEditor </item>
+      <item> animDisplay </item>
+      <item> animView </item>
+      <item> annotate </item>
+      <item> appendStringArray </item>
+      <item> applicationName </item>
+      <item> applyAttrPreset </item>
+      <item> applyTake </item>
+      <item> arcLenDimContext </item>
+      <item> arcLengthDimension </item>
+      <item> arclen </item>
+      <item> arrayMapper </item>
+      <item> art3dPaintCtx </item>
+      <item> artAttrCtx </item>
+      <item> artAttrPaintVertexCtx </item>
+      <item> artAttrSkinPaintCtx </item>
+      <item> artAttrTool </item>
+      <item> artBuildPaintMenu </item>
+      <item> artFluidAttrCtx </item>
+      <item> artPuttyCtx </item>
+      <item> artSelectCtx </item>
+      <item> artSetPaintCtx </item>
+      <item> artUserPaintCtx </item>
+      <item> assignCommand </item>
+      <item> assignInputDevice </item>
+      <item> assignViewportFactories </item>
+      <item> attachCurve </item>
+      <item> attachDeviceAttr </item>
+      <item> attachSurface </item>
+      <item> attrColorSliderGrp </item>
+      <item> attrCompatibility </item>
+      <item> attrControlGrp </item>
+      <item> attrEnumOptionMenuGrp </item>
+      <item> attrEnumOptionMenu </item>
+      <item> attrFieldGrp </item>
+      <item> attrFieldSliderGrp </item>
+      <item> attributeExists </item>
+      <item> attributeInfo </item>
+      <item> attributeMenu </item>
+      <item> attributeQuery </item>
+      <item> attrNavigationControlGrp </item>
+      <item> attrPresetEditWin </item>
+      <item> autoKeyframe </item>
+      <item> autoPlace </item>
+      <item> bakeClip </item>
+      <item> bakeFluidShading </item>
+      <item> bakePartialHistory </item>
+      <item> bakeResults </item>
+      <item> bakeSimulation </item>
+      <item> basenameEx </item>
+      <item> basename </item>
+      <item> batchRender </item>
+      <item> bessel </item>
+      <item> bevel </item>
+      <item> bevelPlus </item>
+      <item> bindSkin </item>
+      <item> binMembership </item>
+      <item> blank </item>
+      <item> blend2 </item>
+      <item> blendShapeEditor </item>
+      <item> blendShape </item>
+      <item> blendShapePanel </item>
+      <item> blendTwoAttr </item>
+      <item> blindDataType </item>
+      <item> boneLattice </item>
+      <item> boundary </item>
+      <item> boxDollyCtx </item>
+      <item> boxZoomCtx </item>
+      <item> bufferCurve </item>
+      <item> buildBookmarkMenu </item>
+      <item> buildKeyframeMenu </item>
+      <item> button </item>
+      <item> buttonManip </item>
+      <item> cacheFileCombine </item>
+      <item> cacheFile </item>
+      <item> cacheFileMerge </item>
+      <item> cacheFileTrack </item>
+      <item> camera </item>
+      <item> cameraView </item>
+      <item> canCreateManip </item>
+      <item> canvas </item>
+      <item> capitalizeString </item>
+      <item> cat_Animation </item>
+      <item> catch </item>
+      <item> catchQuiet </item>
+      <item> cat_Effects </item>
+      <item> cat_General </item>
+      <item> cat_Language </item>
+      <item> cat_Modeling </item>
+      <item> cat_Rendering </item>
+      <item> cat_System </item>
+      <item> cat_Windows </item>
+      <item> CBG </item>
+      <item> ceil </item>
+      <item> changeSubdivComponentDisplayLevel </item>
+      <item> changeSubdivRegion </item>
+      <item> channelBox </item>
+      <item> character </item>
+      <item> characterize </item>
+      <item> characterMap </item>
+      <item> characterOutlineEditor </item>
+      <item> chdir </item>
+      <item> checkBoxGrp </item>
+      <item> checkBox </item>
+      <item> checkDefaultRenderGlobals </item>
+      <item> choice </item>
+      <item> circle </item>
+      <item> circularFillet </item>
+      <item> clamp </item>
+      <item> clearCache </item>
+      <item> clear </item>
+      <item> clipEditorCurrentTimeCtx </item>
+      <item> clipEditor </item>
+      <item> clip </item>
+      <item> clipSchedule </item>
+      <item> clipSchedulerOutliner </item>
+      <item> clipTrimBefore </item>
+      <item> closeCurve </item>
+      <item> closeSurface </item>
+      <item> cluster </item>
+      <item> cmdFileOutput </item>
+      <item> cmdScrollFieldExecuter </item>
+      <item> cmdScrollFieldReporter </item>
+      <item> cmdShell </item>
+      <item> coarsenSubdivSelectionList </item>
+      <item> collision </item>
+      <item> colorAtPoint </item>
+      <item> colorEditor </item>
+      <item> color </item>
+      <item> colorIndex </item>
+      <item> colorIndexSliderGrp </item>
+      <item> colorSliderButtonGrp </item>
+      <item> colorSliderGrp </item>
+      <item> columnLayout </item>
+      <item> commandEcho </item>
+      <item> commandLine </item>
+      <item> commandPort </item>
+      <item> compactHairSystem </item>
+      <item> componentEditor </item>
+      <item> compositingInterop </item>
+      <item> computePolysetVolume </item>
+      <item> condition </item>
+      <item> cone </item>
+      <item> confirmDialog </item>
+      <item> connectAttr </item>
+      <item> connectControl </item>
+      <item> connectDynamic </item>
+      <item> connectionInfo </item>
+      <item> connectJoint </item>
+      <item> constrain </item>
+      <item> constrainValue </item>
+      <item> constructionHistory </item>
+      <item> container </item>
+      <item> containsMultibyte </item>
+      <item> contextInfo </item>
+      <item> control </item>
+      <item> convertFromOldLayers </item>
+      <item> convertIffToPsd </item>
+      <item> convertLightmap </item>
+      <item> convertSolidTx </item>
+      <item> convertTessellation </item>
+      <item> convertUnit </item>
+      <item> copyArray </item>
+      <item> copyFlexor </item>
+      <item> copyKey </item>
+      <item> copySkinWeights </item>
+      <item> cos </item>
+      <item> cpButton </item>
+      <item> cpCache </item>
+      <item> cpClothSet </item>
+      <item> cpCollision </item>
+      <item> cpConstraint </item>
+      <item> cpConvClothToMesh </item>
+      <item> cpForces </item>
+      <item> cpGetSolverAttr </item>
+      <item> cpPanel </item>
+      <item> cpProperty </item>
+      <item> cpRigidCollisionFilter </item>
+      <item> cpSeam </item>
+      <item> cpSetEdit </item>
+      <item> cpSetSolverAttr </item>
+      <item> cpSolver </item>
+      <item> cpSolverTypes </item>
+      <item> cpTool </item>
+      <item> cpUpdateClothUVs </item>
+      <item> createDisplayLayer </item>
+      <item> createDrawCtx </item>
+      <item> createEditor </item>
+      <item> createLayeredPsdFile </item>
+      <item> createMotionField </item>
+      <item> createNewShelf </item>
+      <item> createNode </item>
+      <item> createRenderLayer </item>
+      <item> createSubdivRegion </item>
+      <item> cross </item>
+      <item> crossProduct </item>
+      <item> ctxAbort </item>
+      <item> ctxCompletion </item>
+      <item> ctxEditMode </item>
+      <item> ctxTraverse </item>
+      <item> currentCtx </item>
+      <item> currentTimeCtx </item>
+      <item> currentTime </item>
+      <item> currentUnit </item>
+      <item> curveAddPtCtx </item>
+      <item> curveCVCtx </item>
+      <item> curveEditorCtx </item>
+      <item> curveEPCtx </item>
+      <item> curve </item>
+      <item> curveIntersect </item>
+      <item> curveMoveEPCtx </item>
+      <item> curveOnSurface </item>
+      <item> curveSketchCtx </item>
+      <item> cutKey </item>
+      <item> cycleCheck </item>
+      <item> cylinder </item>
+      <item> dagPose </item>
+      <item> date </item>
+      <item> defaultLightListCheckBox </item>
+      <item> defaultNavigation </item>
+      <item> defineDataServer </item>
+      <item> defineVirtualDevice </item>
+      <item> deformer </item>
+      <item> deg_to_rad </item>
+      <item> deleteAttr </item>
+      <item> delete </item>
+      <item> deleteShadingGroupsAndMaterials </item>
+      <item> deleteShelfTab </item>
+      <item> deleteUI </item>
+      <item> deleteUnusedBrushes </item>
+      <item> delrandstr </item>
+      <item> detachCurve </item>
+      <item> detachDeviceAttr </item>
+      <item> detachSurface </item>
+      <item> deviceEditor </item>
+      <item> devicePanel </item>
+      <item> dgdirty </item>
+      <item> dgeval </item>
+      <item> dgInfo </item>
+      <item> dgtimer </item>
+      <item> dimWhen </item>
+      <item> directionalLight </item>
+      <item> directKeyCtx </item>
+      <item> dirmap </item>
+      <item> dirname </item>
+      <item> disable </item>
+      <item> disconnectAttr </item>
+      <item> disconnectJoint </item>
+      <item> diskCache </item>
+      <item> displacementToPoly </item>
+      <item> displayAffected </item>
+      <item> displayColor </item>
+      <item> displayCull </item>
+      <item> displayLevelOfDetail </item>
+      <item> displayPref </item>
+      <item> displayRGBColor </item>
+      <item> displaySmoothness </item>
+      <item> displayStats </item>
+      <item> displayString </item>
+      <item> displaySurface </item>
+      <item> distanceDimContext </item>
+      <item> distanceDimension </item>
+      <item> doBlur </item>
+      <item> dollyCtx </item>
+      <item> dolly </item>
+      <item> dopeSheetEditor </item>
+      <item> dot </item>
+      <item> dotProduct </item>
+      <item> doubleProfileBirailSurface </item>
+      <item> dragAttrContext </item>
+      <item> draggerContext </item>
+      <item> drag </item>
+      <item> dropoffLocator </item>
+      <item> duplicateCurve </item>
+      <item> duplicate </item>
+      <item> duplicateSurface </item>
+      <item> dynamicLoad </item>
+      <item> dynCache </item>
+      <item> dynControl </item>
+      <item> dynExport </item>
+      <item> dynExpression </item>
+      <item> dynGlobals </item>
+      <item> dynPaintEditor </item>
+      <item> dynParticleCtx </item>
+      <item> dynPref </item>
+      <item> dynRelEditor </item>
+      <item> dynRelEdPanel </item>
+      <item> editAttrLimits </item>
+      <item> editDisplayLayerGlobals </item>
+      <item> editDisplayLayerMembers </item>
+      <item> editor </item>
+      <item> editorTemplate </item>
+      <item> editRenderLayerAdjustment </item>
+      <item> editRenderLayerGlobals </item>
+      <item> editRenderLayerMembers </item>
+      <item> effector </item>
+      <item> emit </item>
+      <item> emitter </item>
+      <item> enableDevice </item>
+      <item> encodeString </item>
+      <item> endString </item>
+      <item> endsWith </item>
+      <item> env </item>
+      <item> equivalent </item>
+      <item> equivalentTol </item>
+      <item> erf </item>
+      <item> error </item>
+      <item> evalDeferred </item>
+      <item> evalEcho </item>
+      <item> eval </item>
+      <item> event </item>
+      <item> exactWorldBoundingBox </item>
+      <item> exclusiveLightCheckBox </item>
+      <item> exec </item>
+      <item> executeForEachObject </item>
+      <item> exists </item>
+      <item> exp </item>
+      <item> expressionEditorListen </item>
+      <item> expression </item>
+      <item> extendCurve </item>
+      <item> extendSurface </item>
+      <item> extrude </item>
+      <item> fcheck </item>
+      <item> fclose </item>
+      <item> feof </item>
+      <item> fflush </item>
+      <item> fgetline </item>
+      <item> fgetword </item>
+      <item> fileBrowserDialog </item>
+      <item> fileDialog </item>
+      <item> fileExtension </item>
+      <item> file </item>
+      <item> fileInfo </item>
+      <item> filetest </item>
+      <item> filletCurve </item>
+      <item> filterCurve </item>
+      <item> filterExpand </item>
+      <item> filter </item>
+      <item> filterStudioImport </item>
+      <item> findAllIntersections </item>
+      <item> findAnimCurves </item>
+      <item> finder </item>
+      <item> findKeyframe </item>
+      <item> findMenuItem </item>
+      <item> findRelatedSkinCluster </item>
+      <item> firstParentOf </item>
+      <item> fitBspline </item>
+      <item> flexor </item>
+      <item> floatEq </item>
+      <item> floatFieldGrp </item>
+      <item> floatField </item>
+      <item> floatScrollBar </item>
+      <item> floatSlider2 </item>
+      <item> floatSliderButtonGrp </item>
+      <item> floatSliderGrp </item>
+      <item> floatSlider </item>
+      <item> floor </item>
+      <item> flow </item>
+      <item> fluidCacheInfo </item>
+      <item> fluidEmitter </item>
+      <item> fluidVoxelInfo </item>
+      <item> flushUndo </item>
+      <item> fmod </item>
+      <item> fontDialog </item>
+      <item> fopen </item>
+      <item> format </item>
+      <item> formLayout </item>
+      <item> fprint </item>
+      <item> frameLayout </item>
+      <item> frame_search </item>
+      <item> fread </item>
+      <item> freeFormFillet </item>
+      <item> frewind </item>
+      <item> fromNativePath </item>
+      <item> fwrite </item>
+      <item> gamma </item>
+      <item> gauss </item>
+      <item> geometryConstraint </item>
+      <item> getApplicationVersionAsFloat </item>
+      <item> getAttr </item>
+      <item> getClassification </item>
+      <item> getDefaultBrush </item>
+      <item> getenv </item>
+      <item> getFileList </item>
+      <item> getFluidAttr </item>
+      <item> getInputDeviceRange </item>
+      <item> getMayaPanelTypes </item>
+      <item> getModifiers </item>
+      <item> getPanel </item>
+      <item> getParticleAttr </item>
+      <item> getpid </item>
+      <item> getPluginResource </item>
+      <item> globalStitch </item>
+      <item> glRenderEditor </item>
+      <item> glRender </item>
+      <item> gmatch </item>
+      <item> goal </item>
+      <item> gotoBindPose </item>
+      <item> grabColor </item>
+      <item> gradientControl </item>
+      <item> gradientControlNoAttr </item>
+      <item> graphDollyCtx </item>
+      <item> graphSelectContext </item>
+      <item> graphTrackCtx </item>
+      <item> gravity </item>
+      <item> grid </item>
+      <item> gridLayout </item>
+      <item> group </item>
+      <item> groupObjectsByName </item>
+      <item> hardenPointCurve </item>
+      <item> hardware </item>
+      <item> hardwareRenderPanel </item>
+      <item> headsUpDisplay </item>
+      <item> headsUpMessage </item>
+      <item> help </item>
+      <item> helpLine </item>
+      <item> hermite </item>
+      <item> HfAddAttractorToAS </item>
+      <item> HfAssignAS </item>
+      <item> HfBuildEqualMap </item>
+      <item> HfBuildFurFiles </item>
+      <item> HfBuildFurImages </item>
+      <item> HfCancelAFR </item>
+      <item> HfConnectASToHF </item>
+      <item> HfCreateAttractor </item>
+      <item> HfDeleteAS </item>
+      <item> HfEditAS </item>
+      <item> HfPerformCreateAS </item>
+      <item> HfRemoveAttractorFromAS </item>
+      <item> HfSelectAttached </item>
+      <item> HfSelectAttractors </item>
+      <item> HfUnassignAS </item>
+      <item> hide </item>
+      <item> hilite </item>
+      <item> hitTest </item>
+      <item> hotBox </item>
+      <item> hotkeyCheck </item>
+      <item> hotkey </item>
+      <item> hsv_to_rgb </item>
+      <item> hudButton </item>
+      <item> hudSliderButton </item>
+      <item> hudSlider </item>
+      <item> hwReflectionMap </item>
+      <item> hwRender </item>
+      <item> hwRenderLoad </item>
+      <item> hyperGraph </item>
+      <item> hyperPanel </item>
+      <item> hyperShade </item>
+      <item> hypot </item>
+      <item> iconTextButton </item>
+      <item> iconTextCheckBox </item>
+      <item> iconTextRadioButton </item>
+      <item> iconTextRadioCollection </item>
+      <item> iconTextScrollList </item>
+      <item> iconTextStaticLabel </item>
+      <item> ikfkDisplayMethod </item>
+      <item> ikHandleCtx </item>
+      <item> ikHandleDisplayScale </item>
+      <item> ikHandle </item>
+      <item> ikSolver </item>
+      <item> ikSplineHandleCtx </item>
+      <item> ikSystem </item>
+      <item> ikSystemInfo </item>
+      <item> illustratorCurves </item>
+      <item> image </item>
+      <item> imfPlugins </item>
+      <item> index_all </item>
+      <item> index </item>
+      <item> index_overview </item>
+      <item> index_substring </item>
+      <item> inheritTransform </item>
+      <item> insertJointCtx </item>
+      <item> insertJoint </item>
+      <item> insertKeyCtx </item>
+      <item> insertKnotCurve </item>
+      <item> insertKnotSurface </item>
+      <item> instanceable </item>
+      <item> instance </item>
+      <item> instancer </item>
+      <item> internalVar </item>
+      <item> intersect </item>
+      <item> interToUI </item>
+      <item> intFieldGrp </item>
+      <item> intField </item>
+      <item> intScrollBar </item>
+      <item> intSliderGrp </item>
+      <item> intSlider </item>
+      <item> iprEngine </item>
+      <item> isAnimCurve </item>
+      <item> isConnected </item>
+      <item> isDirty </item>
+      <item> isolateSelect </item>
+      <item> isParentOf </item>
+      <item> isSameObject </item>
+      <item> isTrue </item>
+      <item> isValidObjectName </item>
+      <item> isValidString </item>
+      <item> isValidUiName </item>
+      <item> itemFilterAttr </item>
+      <item> itemFilter </item>
+      <item> itemFilterRender </item>
+      <item> itemFilterType </item>
+      <item> jointCluster </item>
+      <item> jointCtx </item>
+      <item> jointDisplayScale </item>
+      <item> joint </item>
+      <item> jointLattice </item>
+      <item> keyframe </item>
+      <item> keyframeOutliner </item>
+      <item> keyframeRegionCurrentTimeCtx </item>
+      <item> keyframeRegionDirectKeyCtx </item>
+      <item> keyframeRegionDollyCtx </item>
+      <item> keyframeRegionInsertKeyCtx </item>
+      <item> keyframeRegionMoveKeyCtx </item>
+      <item> keyframeRegionScaleKeyCtx </item>
+      <item> keyframeRegionSelectKeyCtx </item>
+      <item> keyframeRegionSetKeyCtx </item>
+      <item> keyframeRegionTrackCtx </item>
+      <item> keyframeStats </item>
+      <item> keyTangent </item>
+      <item> lassoContext </item>
+      <item> latticeDeformKeyCtx </item>
+      <item> lattice </item>
+      <item> launch </item>
+      <item> launchImageEditor </item>
+      <item> layerButton </item>
+      <item> layeredShaderPort </item>
+      <item> layeredTexturePort </item>
+      <item> layoutDialog </item>
+      <item> layout </item>
+      <item> lightlink </item>
+      <item> lightListEditor </item>
+      <item> lightList </item>
+      <item> lightListPanel </item>
+      <item> linearPrecision </item>
+      <item> lineIntersection </item>
+      <item> linstep </item>
+      <item> listAnimatable </item>
+      <item> listAttr </item>
+      <item> listCameras </item>
+      <item> listConnections </item>
+      <item> listDeviceAttachments </item>
+      <item> listerEditor </item>
+      <item> listHistory </item>
+      <item> listInputDeviceAxes </item>
+      <item> listInputDeviceButtons </item>
+      <item> listInputDevices </item>
+      <item> listMenuAnnotation </item>
+      <item> listNodeTypes </item>
+      <item> listPanelCategories </item>
+      <item> listRelatives </item>
+      <item> listSets </item>
+      <item> listTransforms </item>
+      <item> listUnselected </item>
+      <item> loadFluid </item>
+      <item> loadNewShelf </item>
+      <item> loadPlugin </item>
+      <item> loadPluginLanguageResources </item>
+      <item> loadPrefObjects </item>
+      <item> localizedPanelLabel </item>
+      <item> lockNode </item>
+      <item> loft </item>
+      <item> log </item>
+      <item> longNameOf </item>
+      <item> lookThru </item>
+      <item> ls </item>
+      <item> lsThroughFilter </item>
+      <item> lsType </item>
+      <item> lsUI </item>
+      <item> mag </item>
+      <item> makebot </item>
+      <item> makeIdentity </item>
+      <item> makeLive </item>
+      <item> makePaintable </item>
+      <item> makeRoll </item>
+      <item> makeSingleSurface </item>
+      <item> makeTubeOn </item>
+      <item> manipMoveContext </item>
+      <item> manipMoveLimitsCtx </item>
+      <item> manipOptions </item>
+      <item> manipRotateContext </item>
+      <item> manipRotateLimitsCtx </item>
+      <item> manipScaleContext </item>
+      <item> manipScaleLimitsCtx </item>
+      <item> marker </item>
+      <item> match </item>
+      <item> max </item>
+      <item> Mayatomr </item>
+      <item> memory </item>
+      <item> menuBarLayout </item>
+      <item> menuEditor </item>
+      <item> menu </item>
+      <item> menuItem </item>
+      <item> menuItemToShelf </item>
+      <item> menuSet </item>
+      <item> menuSetPref </item>
+      <item> messageLine </item>
+      <item> min </item>
+      <item> minimizeApp </item>
+      <item> mirrorJoint </item>
+      <item> modelCurrentTimeCtx </item>
+      <item> modelEditor </item>
+      <item> modelPanel </item>
+      <item> mouse </item>
+      <item> move </item>
+      <item> moveIKtoFK </item>
+      <item> moveKeyCtx </item>
+      <item> moveVertexAlongDirection </item>
+      <item> movIn </item>
+      <item> movOut </item>
+      <item> multiProfileBirailSurface </item>
+      <item> mute </item>
+      <item> nameCommand </item>
+      <item> nameField </item>
+      <item> namespace </item>
+      <item> namespaceInfo </item>
+      <item> nav_Animation </item>
+      <item> nav_Effects </item>
+      <item> nav_General </item>
+      <item> nav_Language </item>
+      <item> nav_Modeling </item>
+      <item> nav_Rendering </item>
+      <item> nav_System </item>
+      <item> nav_Windows </item>
+      <item> newPanelItems </item>
+      <item> newton </item>
+      <item> nodeCast </item>
+      <item> nodeIconButton </item>
+      <item> nodeOutliner </item>
+      <item> nodePreset </item>
+      <item> nodeType </item>
+      <item> noise </item>
+      <item> nonLinear </item>
+      <item> normalConstraint </item>
+      <item> normalize </item>
+      <item> nParticle </item>
+      <item> nurbsBoolean </item>
+      <item> nurbsCopyUVSet </item>
+      <item> nurbsCube </item>
+      <item> nurbsEditUV </item>
+      <item> nurbsPlane </item>
+      <item> nurbsSelect </item>
+      <item> nurbsSquare </item>
+      <item> nurbsToPolygonsPref </item>
+      <item> nurbsToPoly </item>
+      <item> nurbsToSubdiv </item>
+      <item> nurbsToSubdivPref </item>
+      <item> nurbsUVSet </item>
+      <item> nurbsViewDirectionVector </item>
+      <item> objectCenter </item>
+      <item> objectLayer </item>
+      <item> objectType </item>
+      <item> objectTypeUI </item>
+      <item> objExists </item>
+      <item> obsoleteProc </item>
+      <item> oceanNurbsPreviewPlane </item>
+      <item> offsetCurve </item>
+      <item> offsetCurveOnSurface </item>
+      <item> offsetSurface </item>
+      <item> openGLExtension </item>
+      <item> openMayaPref </item>
+      <item> optionMenuGrp </item>
+      <item> optionMenu </item>
+      <item> optionVar </item>
+      <item> orbitCtx </item>
+      <item> orbit </item>
+      <item> orientConstraint </item>
+      <item> outlinerEditor </item>
+      <item> outlinerPanel </item>
+      <item> overrideModifier </item>
+      <item> paintEffectsDisplay </item>
+      <item> pairBlend </item>
+      <item> palettePort </item>
+      <item> paneLayout </item>
+      <item> panelConfiguration </item>
+      <item> panelHistory </item>
+      <item> panel </item>
+      <item> paramDimContext </item>
+      <item> paramDimension </item>
+      <item> paramLocator </item>
+      <item> parentConstraint </item>
+      <item> parent </item>
+      <item> particleExists </item>
+      <item> particle </item>
+      <item> particleInstancer </item>
+      <item> particleRenderInfo </item>
+      <item> partition </item>
+      <item> pasteKey </item>
+      <item> pathAnimation </item>
+      <item> pause </item>
+      <item> pclose </item>
+      <item> percent </item>
+      <item> performanceOptions </item>
+      <item> pfxstrokes </item>
+      <item> pickWalk </item>
+      <item> picture </item>
+      <item> pixelMove </item>
+      <item> planarSrf </item>
+      <item> plane </item>
+      <item> playbackOptions </item>
+      <item> playblast </item>
+      <item> play </item>
+      <item> plugAttr </item>
+      <item> pluginInfo </item>
+      <item> pluginResourceUtil </item>
+      <item> plugNode </item>
+      <item> pointConstraint </item>
+      <item> pointCurveConstraint </item>
+      <item> pointLight </item>
+      <item> pointMatrixMult </item>
+      <item> pointOnCurve </item>
+      <item> pointOnSurface </item>
+      <item> pointPosition </item>
+      <item> poleVectorConstraint </item>
+      <item> polyAppendFacetCtx </item>
+      <item> polyAppend </item>
+      <item> polyAppendVertex </item>
+      <item> polyAutoProjection </item>
+      <item> polyAverageNormal </item>
+      <item> polyAverageVertex </item>
+      <item> polyBevel </item>
+      <item> polyBlendColor </item>
+      <item> polyBlindData </item>
+      <item> polyBoolOp </item>
+      <item> polyBridgeEdge </item>
+      <item> polyCacheMonitor </item>
+      <item> polyCheck </item>
+      <item> polyChipOff </item>
+      <item> polyClipboard </item>
+      <item> polyCloseBorder </item>
+      <item> polyCollapseEdge </item>
+      <item> polyCollapseFacet </item>
+      <item> polyColorBlindData </item>
+      <item> polyColorDel </item>
+      <item> polyColorPerVertex </item>
+      <item> polyColorSet </item>
+      <item> polyCompare </item>
+      <item> polyCone </item>
+      <item> polyCopyUV </item>
+      <item> polyCreaseCtx </item>
+      <item> polyCrease </item>
+      <item> polyCreateFacetCtx </item>
+      <item> polyCreateFacet </item>
+      <item> polyCube </item>
+      <item> polyCutCtx </item>
+      <item> polyCut </item>
+      <item> polyCylinder </item>
+      <item> polyCylindricalProjection </item>
+      <item> polyDelEdge </item>
+      <item> polyDelFacet </item>
+      <item> polyDelVertex </item>
+      <item> polyDuplicateAndConnect </item>
+      <item> polyDuplicateEdge </item>
+      <item> polyEditUV </item>
+      <item> polyEditUVShell </item>
+      <item> polyEvaluate </item>
+      <item> polyExtrudeEdge </item>
+      <item> polyExtrudeFacet </item>
+      <item> polyExtrudeVertex </item>
+      <item> polyFlipEdge </item>
+      <item> polyFlipUV </item>
+      <item> polyForceUV </item>
+      <item> polyGeoSampler </item>
+      <item> polyHelix </item>
+      <item> polyInfo </item>
+      <item> polyInstallAction </item>
+      <item> polyLayoutUV </item>
+      <item> polyListComponentConversion </item>
+      <item> polyMapCut </item>
+      <item> polyMapDel </item>
+      <item> polyMapSew </item>
+      <item> polyMapSewMove </item>
+      <item> polyMergeEdgeCtx </item>
+      <item> polyMergeEdge </item>
+      <item> polyMergeFacetCtx </item>
+      <item> polyMergeFacet </item>
+      <item> polyMergeUV </item>
+      <item> polyMergeVertex </item>
+      <item> polyMirrorFace </item>
+      <item> polyMoveEdge </item>
+      <item> polyMoveFacet </item>
+      <item> polyMoveFacetUV </item>
+      <item> polyMoveUV </item>
+      <item> polyMoveVertex </item>
+      <item> polyNormal </item>
+      <item> polyNormalizeUV </item>
+      <item> polyNormalPerVertex </item>
+      <item> polyOptions </item>
+      <item> polyOptUvs </item>
+      <item> polyOutput </item>
+      <item> polyPipe </item>
+      <item> polyPlanarProjection </item>
+      <item> polyPlane </item>
+      <item> polyPlatonicSolid </item>
+      <item> polyPoke </item>
+      <item> polyPrimitive </item>
+      <item> polyPrism </item>
+      <item> polyProjection </item>
+      <item> polyPyramid </item>
+      <item> polyQuad </item>
+      <item> polyQueryBlindData </item>
+      <item> polyReduce </item>
+      <item> polySelectConstraint </item>
+      <item> polySelectConstraintMonitor </item>
+      <item> polySelectCtx </item>
+      <item> polySelectEditCtx </item>
+      <item> polySelect </item>
+      <item> polySeparate </item>
+      <item> polySetToFaceNormal </item>
+      <item> polySewEdge </item>
+      <item> polyShortestPathCtx </item>
+      <item> polySlideEdge </item>
+      <item> polySmooth </item>
+      <item> polySoftEdge </item>
+      <item> polySphere </item>
+      <item> polySphericalProjection </item>
+      <item> polySplitCtx </item>
+      <item> polySplitEdge </item>
+      <item> polySplit </item>
+      <item> polySplitRing </item>
+      <item> polySplitVertex </item>
+      <item> polyStraightenUVBorder </item>
+      <item> polySubdivideEdge </item>
+      <item> polySubdivideFacet </item>
+      <item> polyTorus </item>
+      <item> polyToSubdiv </item>
+      <item> polyTransfer </item>
+      <item> polyTriangulate </item>
+      <item> polyUnite </item>
+      <item> polyUVSet </item>
+      <item> polyWedgeFace </item>
+      <item> popen </item>
+      <item> popupMenu </item>
+      <item> pose </item>
+      <item> pow </item>
+      <item> preloadRefEd </item>
+      <item> print </item>
+      <item> progressBar </item>
+      <item> progressWindow </item>
+      <item> projectCurve </item>
+      <item> projectionContext </item>
+      <item> projectionManip </item>
+      <item> projectTangent </item>
+      <item> projFileViewer </item>
+      <item> promptDialog </item>
+      <item> propModCtx </item>
+      <item> propMove </item>
+      <item> psdChannelOutliner </item>
+      <item> psdEditTextureFile </item>
+      <item> psdExport </item>
+      <item> psdTextureFile </item>
+      <item> putenv </item>
+      <item> pwd </item>
+      <item> python </item>
+      <item> querySubdiv </item>
+      <item> quit </item>
+      <item> radial </item>
+      <item> radioButtonGrp </item>
+      <item> radioButton </item>
+      <item> radioCollection </item>
+      <item> radioMenuItemCollection </item>
+      <item> rad_to_deg </item>
+      <item> rampColorPort </item>
+      <item> rand </item>
+      <item> randomizeFollicles </item>
+      <item> randstate </item>
+      <item> rangeControl </item>
+      <item> readTake </item>
+      <item> rebuildCurve </item>
+      <item> rebuildSurface </item>
+      <item> recordAttr </item>
+      <item> recordDevice </item>
+      <item> redo </item>
+      <item> referenceEdit </item>
+      <item> reference </item>
+      <item> referenceQuery </item>
+      <item> refineSubdivSelectionList </item>
+      <item> refreshAE </item>
+      <item> refresh </item>
+      <item> registerPluginResource </item>
+      <item> rehash </item>
+      <item> reloadImage </item>
+      <item> removeJoint </item>
+      <item> removeMultiInstance </item>
+      <item> removePanelCategory </item>
+      <item> renameAttr </item>
+      <item> rename </item>
+      <item> renameSelectionList </item>
+      <item> renameUI </item>
+      <item> renderer </item>
+      <item> renderGlobalsNode </item>
+      <item> render </item>
+      <item> renderInfo </item>
+      <item> renderLayerButton </item>
+      <item> renderLayerParent </item>
+      <item> renderLayerPostProcess </item>
+      <item> renderLayerUnparent </item>
+      <item> renderManip </item>
+      <item> renderPartition </item>
+      <item> renderQualityNode </item>
+      <item> renderSettings </item>
+      <item> renderThumbnailUpdate </item>
+      <item> renderWindowEditor </item>
+      <item> renderWindowSelectContext </item>
+      <item> reorderDeformers </item>
+      <item> reorder </item>
+      <item> requires </item>
+      <item> reroot </item>
+      <item> resampleFluid </item>
+      <item> resetAE </item>
+      <item> resetPfxToPolyCamera </item>
+      <item> resetTool </item>
+      <item> resolutionNode </item>
+      <item> retarget </item>
+      <item> reverseCurve </item>
+      <item> reverseSurface </item>
+      <item> revolve </item>
+      <item> rgb_to_hsv </item>
+      <item> rigidBody </item>
+      <item> rigidSolver </item>
+      <item> rollCtx </item>
+      <item> roll </item>
+      <item> rootOf </item>
+      <item> rotate </item>
+      <item> rotationInterpolation </item>
+      <item> rot </item>
+      <item> roundConstantRadius </item>
+      <item> rowColumnLayout </item>
+      <item> rowLayout </item>
+      <item> runTimeCommand </item>
+      <item> runup </item>
+      <item> sampleImage </item>
+      <item> saveAllShelves </item>
+      <item> saveAttrPreset </item>
+      <item> saveFluid </item>
+      <item> saveImage </item>
+      <item> saveInitialState </item>
+      <item> saveMenu </item>
+      <item> savePrefObjects </item>
+      <item> savePrefs </item>
+      <item> saveShelf </item>
+      <item> saveToolSettings </item>
+      <item> scaleBrushBrightness </item>
+      <item> scaleComponents </item>
+      <item> scaleConstraint </item>
+      <item> scale </item>
+      <item> scaleKeyCtx </item>
+      <item> scaleKey </item>
+      <item> sceneEditor </item>
+      <item> sceneUIReplacement </item>
+      <item> scmh </item>
+      <item> scriptCtx </item>
+      <item> scriptEditorInfo </item>
+      <item> scriptedPanel </item>
+      <item> scriptedPanelType </item>
+      <item> scriptJob </item>
+      <item> scriptNode </item>
+      <item> scriptTable </item>
+      <item> scriptToShelf </item>
+      <item> scrollField </item>
+      <item> scrollLayout </item>
+      <item> sculpt </item>
+      <item> searchPathArray </item>
+      <item> seed </item>
+      <item> selectContext </item>
+      <item> selectCurveCV </item>
+      <item> selectedNodes </item>
+      <item> select </item>
+      <item> selectionConnection </item>
+      <item> selectKeyCtx </item>
+      <item> selectKeyframeRegionCtx </item>
+      <item> selectKey </item>
+      <item> selectMode </item>
+      <item> selectPref </item>
+      <item> selectPriority </item>
+      <item> selectType </item>
+      <item> selLoadSettings </item>
+      <item> separator </item>
+      <item> setAttrEnumResource </item>
+      <item> setAttr </item>
+      <item> setAttrMapping </item>
+      <item> setAttrNiceNameResource </item>
+      <item> setConstraintRestPosition </item>
+      <item> setCustomAttrEnumResource </item>
+      <item> setCustomAttrNiceNameResource </item>
+      <item> setDefaultShadingGroup </item>
+      <item> setDrivenKeyframe </item>
+      <item> setDynamic </item>
+      <item> setEditCtx </item>
+      <item> setEditor </item>
+      <item> setFluidAttr </item>
+      <item> setFocus </item>
+      <item> setInfinity </item>
+      <item> setInputDeviceMapping </item>
+      <item> setKeyCtx </item>
+      <item> setKeyframeBlendshapeTargetWts </item>
+      <item> setKeyframe </item>
+      <item> setKeyPath </item>
+      <item> setMenuMode </item>
+      <item> setNodeNiceNameResource </item>
+      <item> setNodeTypeFlag </item>
+      <item> setParent </item>
+      <item> setParticleAttr </item>
+      <item> setPfxToPolyCamera </item>
+      <item> setPluginResource </item>
+      <item> setProject </item>
+      <item> sets </item>
+      <item> setStampDensity </item>
+      <item> setStartupMessage </item>
+      <item> setState </item>
+      <item> setToolTo </item>
+      <item> setUITemplate </item>
+      <item> setXformManip </item>
+      <item> shadingConnection </item>
+      <item> shadingGeometryRelCtx </item>
+      <item> shadingLightRelCtx </item>
+      <item> shadingNetworkCompare </item>
+      <item> shadingNode </item>
+      <item> shapeCompare </item>
+      <item> shelfButton </item>
+      <item> shelfLayout </item>
+      <item> shelfTabLayout </item>
+      <item> shellField </item>
+      <item> shortNameOf </item>
+      <item> showHelp </item>
+      <item> showHidden </item>
+      <item> show </item>
+      <item> showManipCtx </item>
+      <item> showSelectionInTitle </item>
+      <item> showShadingGroupAttrEditor </item>
+      <item> showWindow </item>
+      <item> sign </item>
+      <item> simplify </item>
+      <item> singleProfileBirailSurface </item>
+      <item> sin </item>
+      <item> sizeBytes </item>
+      <item> size </item>
+      <item> skinCluster </item>
+      <item> skinPercent </item>
+      <item> smoothCurve </item>
+      <item> smoothstep </item>
+      <item> smoothTangentSurface </item>
+      <item> snap2to2 </item>
+      <item> snapKey </item>
+      <item> snapMode </item>
+      <item> snapshot </item>
+      <item> snapTogetherCtx </item>
+      <item> soft </item>
+      <item> softModCtx </item>
+      <item> softMod </item>
+      <item> sort </item>
+      <item> soundControl </item>
+      <item> sound </item>
+      <item> source </item>
+      <item> spaceLocator </item>
+      <item> sphere </item>
+      <item> sphrand </item>
+      <item> spotLight </item>
+      <item> spotLightPreviewPort </item>
+      <item> spreadSheetEditor </item>
+      <item> spring </item>
+      <item> sqrt </item>
+      <item> squareSurface </item>
+      <item> srtContext </item>
+      <item> stackTrace </item>
+      <item> startString </item>
+      <item> startsWith </item>
+      <item> stitchAndExplodeShell </item>
+      <item> stitchSurface </item>
+      <item> stitchSurfacePoints </item>
+      <item> strcmp </item>
+      <item> stringArrayCatenate </item>
+      <item> stringArrayContains </item>
+      <item> stringArrayCount </item>
+      <item> stringArrayInsertAtIndex </item>
+      <item> stringArrayIntersector </item>
+      <item> stringArrayRemoveAtIndex </item>
+      <item> stringArrayRemoveDuplicates </item>
+      <item> stringArrayRemoveExact </item>
+      <item> stringArrayRemove </item>
+      <item> stringArrayToString </item>
+      <item> stringToStringArray </item>
+      <item> strip </item>
+      <item> stripPrefixFromName </item>
+      <item> stroke </item>
+      <item> subdAutoProjection </item>
+      <item> subdCleanTopology </item>
+      <item> subdCollapse </item>
+      <item> subdDuplicateAndConnect </item>
+      <item> subdEditUV </item>
+      <item> subdivCrease </item>
+      <item> subdivDisplaySmoothness </item>
+      <item> subdiv </item>
+      <item> subdListComponentConversion </item>
+      <item> subdMapCut </item>
+      <item> subdMapSewMove </item>
+      <item> subdMatchTopology </item>
+      <item> subdMirror </item>
+      <item> subdToBlind </item>
+      <item> subdToPoly </item>
+      <item> subdTransferUVsToCache </item>
+      <item> substituteAllString </item>
+      <item> substituteGeometry </item>
+      <item> substitute </item>
+      <item> substring </item>
+      <item> surface </item>
+      <item> surfaceSampler </item>
+      <item> surfaceShaderList </item>
+      <item> swatchDisplayPort </item>
+      <item> switchTable </item>
+      <item> SymbolsButton </item>
+      <item> SymbolsCheckBox </item>
+      <item> symmetricModelling </item>
+      <item> sysFile </item>
+      <item> system </item>
+      <item> tabLayout </item>
+      <item> tangentConstraint </item>
+      <item> tan </item>
+      <item> texLatticeDeformContext </item>
+      <item> texManipContext </item>
+      <item> texMoveContext </item>
+      <item> texMoveUVShellContext </item>
+      <item> texRotateContext </item>
+      <item> texScaleContext </item>
+      <item> texSelectContext </item>
+      <item> texSelectShortestPathCtx </item>
+      <item> texSmudgeUVContext </item>
+      <item> textCurves </item>
+      <item> textFieldButtonGrp </item>
+      <item> textFieldGrp </item>
+      <item> textField </item>
+      <item> text </item>
+      <item> textManip </item>
+      <item> textScrollList </item>
+      <item> textToShelf </item>
+      <item> textureDisplacePlane </item>
+      <item> textureHairColor </item>
+      <item> texturePlacementContext </item>
+      <item> textureWindow </item>
+      <item> texWinToolCtx </item>
+      <item> threadCount </item>
+      <item> threePointArcCtx </item>
+      <item> timeControl </item>
+      <item> timePort </item>
+      <item> timerX </item>
+      <item> toggleAxis </item>
+      <item> toggle </item>
+      <item> toggleWindowVisibility </item>
+      <item> tokenize </item>
+      <item> tokenizeList </item>
+      <item> tolerance </item>
+      <item> tolower </item>
+      <item> toNativePath </item>
+      <item> toolButton </item>
+      <item> toolCollection </item>
+      <item> toolDropped </item>
+      <item> toolHasOptions </item>
+      <item> toolPropertyWindow </item>
+      <item> torus </item>
+      <item> toupper </item>
+      <item> trace </item>
+      <item> trackCtx </item>
+      <item> track </item>
+      <item> transferAttributes </item>
+      <item> transformCompare </item>
+      <item> transformLimits </item>
+      <item> translator </item>
+      <item> trim </item>
+      <item> truncateFluidCache </item>
+      <item> truncateHairCache </item>
+      <item> trunc </item>
+      <item> tumbleCtx </item>
+      <item> tumble </item>
+      <item> turbulence </item>
+      <item> twoPointArcCtx </item>
+      <item> uiRes </item>
+      <item> uiTemplate </item>
+      <item> unassignInputDevice </item>
+      <item> undo </item>
+      <item> undoInfo </item>
+      <item> ungroup </item>
+      <item> uniform </item>
+      <item> unit </item>
+      <item> unloadPlugin </item>
+      <item> untangleUV </item>
+      <item> untitledFileName </item>
+      <item> untrim </item>
+      <item> upAxis </item>
+      <item> updateAE </item>
+      <item> userCtx </item>
+      <item> uvLink </item>
+      <item> uvSnapshot </item>
+      <item> validateShelfName </item>
+      <item> vectorize </item>
+      <item> view2dToolCtx </item>
+      <item> viewCamera </item>
+      <item> viewClipPlane </item>
+      <item> viewFit </item>
+      <item> viewHeadOn </item>
+      <item> viewLookAt </item>
+      <item> viewManip </item>
+      <item> viewPlace </item>
+      <item> viewSet </item>
+      <item> visor </item>
+      <item> volumeAxis </item>
+      <item> vortex </item>
+      <item> waitCursor </item>
+      <item> warning </item>
+      <item> webBrowser </item>
+      <item> webBrowserPrefs </item>
+      <item> whatIs </item>
+      <item> window </item>
+      <item> windowPref </item>
+      <item> wireContext </item>
+      <item> wire </item>
+      <item> workspace </item>
+      <item> wrinkleContext </item>
+      <item> wrinkle </item>
+      <item> writeTake </item>
+      <item> xbmLangPathList </item>
+      <item> xform </item>
+      <item> xpmPicker </item>
+    </list>
+    <list name="datatypes">
+      <item> int </item>
+      <item> string </item>
+      <item> float </item>
+      <item> vector </item>
+      <item> matrix </item>
+    </list>
+    
+    <contexts>
+      <context attribute="Normal Text" lineEndContext="#pop" name="Normal" >
+        <DetectSpaces />
+        <Detect2Chars attribute="Block comments" context="Block comments" char="/" char1="*" beginRegion="Block comments" />
+        <Detect2Chars attribute="Line comments" context="Line comments" char="/" char1="/" />
+        <DetectChar   attribute="Variable names" context="Variable names" char="$" />
+        <keyword      attribute="MEL commands" context="#stay" String="MEL commands" />
+        <keyword      attribute="Data types" context="#stay" String="datatypes" />
+        <keyword      attribute="Keywords" context="#stay" String="keywords" />
+        <DetectChar   attribute="Expressions"   context="Expressions" char="`" />
+        <DetectChar   attribute="Strings" context="Strings" char="&quot;"/>
+        <DetectChar   attribute="Operators" context="#stay" char="{" beginRegion="Brace1" />
+        <DetectChar   attribute="Operators" context="#stay" char="}" endRegion="Brace1" />
+        <AnyChar      attribute="Operators" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]{|}~^&#59;"/>
+        <Float        attribute="Float values" context="#stay" />
+        <Int          attribute="Integer values" context="#stay" />
+      </context>
+      
+      <context attribute="Block comments" lineEndContext="#stay" name="Block comments">
+        <LineContinue attribute="Strings" context="#stay"/>
+        <Detect2Chars attribute="Block comments" context="#pop" char="*" char1="/" endRegion="Block comments" />
+      </context>
+      
+      <context attribute="Line comments" lineEndContext="#pop" name="Line comments" />
+      
+      <context attribute="Strings" lineEndContext="#stay" name="Strings">
+        <LineContinue attribute="Strings" context="#stay"/>
+        <HlCStringChar attribute="Strings" context="#stay"/>
+        <DetectChar attribute="Strings" context="#pop" char="&quot;"/>
+      </context>
+      
+      <context attribute="Expressions" lineEndContext="#stay" name="Expressions">
+        <LineContinue attribute="Strings" context="#stay"/>
+        <DetectChar attribute="Expressions" context="#pop" char="`" />
+      </context>
+      
+      <context attribute="Variable names" lineEndContext="#pop" name="Variable names">
+        <AnyChar attribute="Normal Text" context="#pop" String=" :!%&amp;()+,-/.*&lt;=&gt;?[]{|}~^&#59;" />
+        <DetectChar attribute="Expressions" context="Expressions" char="`" />
+      </context>
+    </contexts>
+
+    <itemDatas>
+      <itemData name="Normal Text"    defStyleNum="dsNormal" />
+      <itemData name="MEL commands"   defStyleNum="dsFunction" />
+      <itemData name="Data types"     defStyleNum="dsDataType" />
+      <itemData name="Variable names" defStyleNum="dsBaseN" />
+      <itemData name="Integer values" defStyleNum="dsDecVal"/>
+      <itemData name="Float values"   defStyleNum="dsFloat"/>
+      <itemData name="Strings"        defStyleNum="dsString" />
+      <itemData name="Operators"      defStyleNum="dsNormal" />
+      <itemData name="Keywords"       defStyleNum="dsKeyword" />
+      <itemData name="Expressions"    defStyleNum="dsOthers" />
+      <itemData name="Block comments" defStyleNum="dsComment" />
+      <itemData name="Line comments"  defStyleNum="dsComment" />
+    </itemDatas>
+  </highlighting>
+  
+  <general>
+    <folding indentationsensitive="false" />
+    <indentation mode="normal" />
+    <keywords casesensitive="1" />
+    <comments>
+      <comment name="singleLine" start="//" />
+      <comment name="multiLine"  start="/*" end="*/" region="Block comments" />
+    </comments>
+  </general>
+</language>
+
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/data/nasm.xml b/kate/data/nasm.xml
index 17e435fa4..6cbc555c8 100644
--- a/kate/data/nasm.xml
+++ b/kate/data/nasm.xml
@@ -6,6 +6,8 @@
   Created: Nicola Gigante <[email protected]>
     Changes: Bogdan Drozdowski ([email protected])
   Version: 1.3
+             Lyle Putnam ([email protected])
+  Version: 1.4
 
 Changes from 1.0:
   15/01/2006: version 1.1
@@ -18,6 +20,9 @@ Changes from 1.0:
     Corrections in register list and a few new ones (not 64-bit).
     Changed regexes for hex, octal and bin numbers. Now words like
       "change" and "blah" will NOT have the "ch" and "ah" coloured.
+  24/07/2011: Version 1.4 from Lyle Putnam ([email protected]):
+    The above change to fix the regex for hex numbers was incorrect on Kate
+    3.6.2. Fixed.
 
   GNU GENERAL PUBLIC LICENCE
 
@@ -35,7 +40,7 @@ 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.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 -->
-<language name="Intel x86 (NASM)" section="Assembler" version="1.30" kateversion="2.3" extensions="*.asm" mimetype="" author="Nicola Gigante ([email protected])" license="GPL">
+<language name="Intel x86 (NASM)" section="Assembler" version="1.40" kateversion="2.3" extensions="*.asm" mimetype="" author="Nicola Gigante ([email protected])" license="GPL">
   <highlighting>
     <list name="registers">
       <!-- General purpose registers -->
@@ -845,7 +850,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <!-- The NASM's CPU directive -->
         <RegExpr attribute="NASM Keywords" context="#stay" String="cpu (pentium|ppro|p2|p3|katmai|p4|willamette|prescott|ia64)*"/>
         <!-- hexadecimal numbers -->
-        <RegExpr attribute="BaseN" context="#stay" insensitive="TRUE" String="(^|[ \t,]+)((\$|0x){1}[0-9]+[a-f0-9]*|[a-f0-9]+h)([ \t,]+|$)"/>
+        <RegExpr attribute="BaseN" context="#stay" insensitive="TRUE" String="(^|[ \t,]+)((\$|0x){1}[0-9]+[a-f0-9]*|[0-9]+[a-f0-9]*h)([ \t,]+|$)"/>
         <!-- octal and binary numbers -->
         <RegExpr attribute="BaseN" context="#stay" insensitive="TRUE" String="(^|[ \t,]+)([0-7]+(q|o)|[01]+b)([ \t,]+|$)"/>
         <DetectChar attribute="Number" context="#stay" char="$"/>
diff --git a/kate/data/objectivecpp.xml b/kate/data/objectivecpp.xml
index fc912ca1e..bf038d4a2 100644
--- a/kate/data/objectivecpp.xml
+++ b/kate/data/objectivecpp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Objective-C++" version="1.00" kateversion="2.4" section="Sources" extensions="*.mm;*.M;*.h" mimetype="text/x-objcpp-src;text/x-c-hdr" author="Gennady Telegin ([email protected]">
+<language name="Objective-C++" version="1.01" kateversion="2.4" section="Sources" extensions="*.mm;*.M;*.h" mimetype="text/x-objcpp-src;text/x-c-hdr" author="Gennady Telegin ([email protected]">
   <highlighting>
     <list name="keywords">
       <item> break </item>
@@ -79,9 +79,6 @@
       <item> or_eq </item>
       <item> xor </item>
       <item> xor_eq </item>
-      <item> except </item>
-      <item> finally </item>
-      <item> xalloc </item>
     </list>
     <list name="extensions">
       <item> K_DCOP </item>
diff --git a/kate/data/oors.xml b/kate/data/oors.xml
new file mode 100644
index 000000000..f36a68337
--- /dev/null
+++ b/kate/data/oors.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<language name="OORS" version="1.0" kateversion="2.4" section="Sources" extensions="*.oors" author="Gernot Gebhard ([email protected])" license="LGPL">
+  <highlighting>
+    <list name="oors">
+      <item>allow</item>
+      <item>apply</item>
+      <item>copy</item>
+      <item>condition</item>
+      <item>deny</item>
+      <item>extends</item>
+      <item>graph</item>
+      <item>linear</item>
+      <item>profile</item>
+      <item>rule</item>
+      <item>ruleset</item>
+      <item>search</item>
+      <item>unsafe</item>
+    </list>
+    <contexts>
+      <context name="Main" attribute="Normal Text" lineEndContext="#stay">
+        <keyword attribute="Directive" context="#stay" String="oors" />
+        <IncludeRules context="Comment" />
+        <DetectSpaces />
+        <DetectChar attribute="Normal Text" context="Ordered" char="[" beginRegion="Ordered" />
+        <DetectChar attribute="Normal Text" context="Unordered" char="{" beginRegion="Unordered" />
+        <Detect2Chars attribute="Content-Type Delimiter" context="Header" char="%" char1="{" beginRegion="Header" />
+        <Detect2Chars attribute="Content-Type Delimiter" context="Header" char="%" char1="%" beginRegion="Header" />
+      </context>
+      <context name="Header" attribute="Normal Text" lineEndContext="#stay">
+        <IncludeRules context="Comment" />
+        <Detect2Chars attribute="Content-Type Delimiter" context="#pop" char="%" char1="}" endRegion="Header" />
+        <Detect2Chars attribute="Content-Type Delimiter" context="#pop" char="%" char1="%" endRegion="Header" />
+        <IncludeRules context="##C++" />
+      </context>
+      <context name="Ordered" attribute="Normal Text" lineEndContext="#stay">
+        <keyword attribute="Directive" context="#stay" String="oors" />
+        <IncludeRules context="Comment" />
+        <IncludeRules context="Accessor" />
+        <DetectChar attribute="Normal Text" context="Ordered" char="[" beginRegion="Ordered" />
+        <DetectChar attribute="Normal Text" context="Unordered" char="{" beginRegion="Unordered" />
+        <DetectChar attribute="Normal Text" context="#pop" char="]" endRegion="Ordered" />
+        <IncludeRules context="##C++" />
+      </context>
+      <context name="Unordered" attribute="Normal Text" lineEndContext="#stay">
+        <keyword attribute="Directive" context="#stay" String="oors" />
+        <IncludeRules context="Comment" />
+        <IncludeRules context="Accessor" />
+        <DetectChar attribute="Normal Text" context="Ordered" char="[" beginRegion="Ordered" />
+        <DetectChar attribute="Normal Text" context="Unordered" char="{" beginRegion="Unordered" />
+        <DetectChar attribute="Normal Text" context="#pop" char="}" endRegion="Unordered" />
+        <IncludeRules context="##C++" />
+      </context>
+      <context name="Accessor" attribute="Directive">
+        <Detect2Chars attribute="Directive" context="#stay" char="$" char1="$" />
+        <RegExpr attribute="Directive" context="#stay" String="\$-?[_a-zA-Z1-9][_a-zA-Z0-9]*" />
+      </context>
+      <context name="Comment" attribute="Comment">
+        <IncludeRules context="##Doxygen" />
+        <Detect2Chars attribute="Comment" context="CommentStar" char="/" char1="*" />
+        <Detect2Chars attribute="Comment" context="CommentSlash" char="/" char1="/" />
+      </context>
+      <context name="CommentStar" attribute="Comment" lineEndContext="#stay">
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" />
+      </context>
+      <context name="CommentSlash" attribute="Comment" lineEndContext="#stay">
+        <RegExpr attribute="Comment" context="#pop" String="[^\\]$" />
+      </context>
+    </contexts>
+    <itemDatas>
+      <itemData name="Normal Text" defStyleNum="dsNormal" />
+      <itemData name="Definition" defStyleNum="dsNormal" />
+      <itemData name="Comment" defStyleNum="dsComment" />
+      <itemData name="Content-Type Delimiter" defStyleNum="dsBaseN" bold="1" />
+      <itemData name="Directive" defStyleNum="dsKeyword"/>
+      <itemData name="Rule" defStyleNum="dsString" />
+      <itemData name="Backslash Code" defStyleNum="dsString" bold="1" />
+      <itemData name="Alert" defStyleNum="dsAlert" />
+      <itemData name="String" defStyleNum="dsString"/>
+      <itemData name="String Char" defStyleNum="dsChar"/>
+      <itemData name="Data Type" defStyleNum="dsDataType"/>
+    </itemDatas>
+    <general>
+      <comments>
+        <comment name="singleLine" start="//" />
+        <comment name="multiLine" start="/*" end="*/" region="Comment"/>
+      </comments>
+      <keywords casesensitive="1" />
+    </general>
+  </highlighting>
+</language>
diff --git a/kate/data/pango.xml b/kate/data/pango.xml
new file mode 100644
index 000000000..3eb8c8b1a
--- /dev/null
+++ b/kate/data/pango.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<language name="Pango" version="0.1" kateversion="2.4" section="Markup" extensions="" mimetype=""  author="Jonathan Schmidt-Domniné &lt;[email protected]&gt;" license="LGPL" priority="10">
+
+<highlighting>
+    
+  <list name="tags">
+      <item> &lt;span </item>
+      <item> &lt;b </item>
+      <item> &lt;big </item>
+      <item> &lt;i </item>
+      <item> &lt;s </item>
+      <item> &lt;sub </item>
+      <item> &lt;sup </item>
+      <item> &lt;small </item>
+      <item> &lt;tt </item>
+      <item> &lt;u </item>
+  </list>
+  
+  <list name="endtags">
+      <item> &lt;/span&gt; </item>
+      <item> &lt;/b&gt; </item>
+      <item> &lt;/big&gt; </item>
+      <item> &lt;/i&gt; </item>
+      <item> &lt;/s&gt; </item>
+      <item> &lt;/sub&gt; </item>
+      <item> &lt;/sup&gt; </item>
+      <item> &lt;/small&gt; </item>
+      <item> &lt;/tt&gt; </item>
+      <item> &lt;/u&gt; </item>
+  </list>
+  
+  <list name="int_attributes">
+      <item> size= </item>
+      <item> font_size= </item>
+      <item> rise= </item>
+      <item> letter_spacing= </item>
+  </list>
+  
+  <list name="plain_attributes">
+      <item> font= </item>
+      <item> font_desc= </item>
+      <item> font_family= </item>
+      <item> face= </item>
+      <item> lang= </item>
+  </list>
+  
+  <list name="color_attributes">
+      <item> strikethrough_color= </item>
+      <item> foreground= </item>
+      <item> fgcolor= </item>
+      <item> color= </item>
+      <item> background= </item>
+      <item> bgcolor= </item>
+      <item> underline_color= </item>
+  </list>
+  
+  <list name="colors">
+     <item> 'aqua' </item>
+     <item> 'black' </item>
+     <item> 'blue' </item>
+     <item> 'cyan' </item>
+     <item> 'fuchsia' </item>
+     <item> 'gray' </item>
+     <item> 'green' </item>
+     <item> 'lime' </item>
+     <item> 'maroon' </item>
+     <item> 'navy' </item>
+     <item> 'olive' </item>
+     <item> 'purple' </item>
+     <item> 'red' </item>
+     <item> 'silver' </item>
+     <item> 'teal' </item>
+     <item> 'white' </item>
+     <item> 'yellow' </item>
+  </list>
+
+<contexts>
+  <context name="Start" attribute="Normal Text" lineEndContext="#stay">
+    <IncludeRules context="FindPango" />
+  </context>
+
+  <context name="FindPango" attribute="Normal Text" lineEndContext="#stay">
+    <DetectSpaces/>
+    <RegExpr attribute="Element" context="#stay" String="&lt;/(span|b|big|i|s|sub|sup|small|tt|u)&gt;" endRegion="pango_node" />
+    <RegExpr attribute="Element" context="FindAttributes" String="&lt;(span|b|big|i|s|sub|sup|small|tt|u)" beginRegion="pango_node" />
+    <DetectIdentifier />
+  </context>
+
+  <context name="FindAttributes" attribute="Normal Text" lineEndContext="#stay">
+      <DetectSpaces/>
+      <RegExpr attribute="Key" context="InGravity" String="gravity=" />
+      <RegExpr attribute="Key" context="InGravityHint" String="gravity_hint=" />
+      <RegExpr attribute="Key" context="InStretch" String="(font_)?stretch=" />
+      <RegExpr attribute="Key" context="InBoolean" String="(strikethrough|fallback)=" />
+      <RegExpr attribute="Key" context="InStyle" String="(font_)?style=" />
+      <RegExpr attribute="Key" context="InUnderline" String="underline=" />
+      <RegExpr attribute="Key" context="InVariant" String="(font_)?variant=" />
+      <RegExpr attribute="Key" context="InWeight" String="(font_)?weight=" />
+      <RegExpr attribute="Key" context="InInt" String="(size|font_size|rise|letter_spacing)=" />
+      <RegExpr attribute="Key" context="InString" String="(font|font_desc|font_family|face|lang)=" />
+      <RegExpr attribute="Key" context="InColor" String="(strikethrough_color|foreground|fgcolor|color|background|bgcolor|underline_color)=" />
+      <DetectChar attribute="Element" context="#pop" char="&gt;" />
+      <RegExpr attribute="Error" context="#stay" String="\S" />
+  </context>
+  
+  <context name="InGravity" attribute="String" lineEndContext="#stay">
+      <RegExpr attribute="String" context="#pop" String="'(south|east|north|west|auto)'" />
+      <RegExpr attribute="Error" context="#pop#pop" String="\S" />
+  </context>
+  
+  <context name="InGravityHint" attribute="String" lineEndContext="#stay">
+      <RegExpr attribute="String" context="#pop" String="'(natural|strong|line)'" />
+      <RegExpr attribute="Error" context="#pop#pop" String="\S" />
+  </context>
+  
+  <context name="InStretch" attribute="String" lineEndContext="#stay">
+      <RegExpr attribute="String" context="#pop" String="'(ultracondensed|extracondensed|condensed|semicondensed|normal|semiexpanded|expanded|extraexpanded|ultraexpanded)'" />
+      <RegExpr attribute="Error" context="#pop#pop" String="\S" />
+  </context>
+  
+  <context name="InBoolean" attribute="String" lineEndContext="#stay">
+      <RegExpr attribute="String" context="#pop" String="'(false|true)'" />
+      <RegExpr attribute="Error" context="#pop#pop" String="\S" />
+  </context>
+  
+  <context name="InStyle" attribute="String" lineEndContext="#stay">
+      <RegExpr attribute="String" context="#pop" String="'(normal|oblique|italic)'" />
+      <RegExpr attribute="Error" context="#pop#pop" String="\S" />
+  </context>
+  
+  <context name="InUnderline" attribute="String" lineEndContext="#stay">
+      <RegExpr attribute="String" context="#pop" String="'(none|single|double|low|error)'" />
+      <RegExpr attribute="Error" context="#pop#pop" String="\S" />
+  </context>
+  
+  <context name="InVariant" attribute="String" lineEndContext="#stay">
+      <RegExpr attribute="String" context="#pop" String="'(normal|smallcaps)'" />
+      <RegExpr attribute="Error" context="#pop#pop" String="\S" />
+  </context>
+
+  <context name="InWeight" attribute="String" lineEndContext="#stay">
+      <RegExpr attribute="Decimal" context="#pop" String="'[0-9]*'" />
+      <RegExpr attribute="String" context="#pop" String="'(ultralight|light|normal|bold|ultrabold|heavy)'" />
+      <RegExpr attribute="Error" context="#pop#pop" String="\S" />
+  </context>
+  
+  <context name="InColor" attribute="Color" lineEndContext="#stay">
+      <RegExpr attribute="Color" context="#pop" String="'(#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?|aqua|black|blue|cyan|fuchsia|gray|green|lime|maroon|navy|olive|purple|red|silver|teal|white|yellow)'" />
+      <RegExpr attribute="Error" context="#pop#pop" String="\S" />
+  </context>
+  
+  <context name="InInt" attribute="Decimal" lineEndContext="#stay">
+      <RegExpr attribute="Decimal" context="#pop" String="'(-?)[0-9]*'" />
+      <RegExpr attribute="Error" context="#pop#pop" String="\S" />
+  </context>
+  
+  <context name="InString" attribute="String" lineEndContext="#stay">
+      <RegExpr attribute="String" context="#pop" String="'[^']*'" />
+      <RegExpr attribute="Error" context="#pop#pop" String="\S" />
+  </context>
+
+</contexts>
+<itemDatas>
+  <itemData name="Normal Text" defStyleNum="dsNormal" />
+  <itemData name="Element" defStyleNum="dsKeyword" />
+  <itemData name="Key" defStyleNum="dsOthers" />
+  <itemData name="Value" defStyleNum="dsString" color="#a00" />
+  <itemData name="Decimal" defStyleNum="dsDecVal" />
+  <itemData name="Color" defStyleNum="dsFloat" />
+  <itemData name="String" defStyleNum="dsString" />
+  <itemData name="Error" defStyleNum="dsError" />
+</itemDatas>
+
+</highlighting>
+<general>
+<indentation mode="xml" />
+</general>
+</language>
diff --git a/kate/data/perl.xml b/kate/data/perl.xml
index 0b7250457..71b04ad9f 100644
--- a/kate/data/perl.xml
+++ b/kate/data/perl.xml
@@ -39,7 +39,7 @@
 
    Enhance tr/// and y/// support.
 -->
-<language name="Perl" version="1.23" kateversion="2.4" section="Scripts" extensions="*.pl;*.pm" mimetype="application/x-perl;text/x-perl" author="Anders Lund ([email protected])" license="LGPL">
+<language name="Perl" version="1.25" kateversion="2.4" section="Scripts" extensions="*.pl;*.pm" mimetype="application/x-perl;text/x-perl" author="Anders Lund ([email protected])" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item> if </item>
@@ -85,6 +85,7 @@
       <item> **= </item>
       <item> |= </item>
       <item> ||= </item>
+      <item> //= </item>
       <item> &amp;= </item>
       <item> &amp;&amp;= </item>
       <item> ?= </item>
@@ -94,6 +95,7 @@
      <!-- <item> / </item>//-->
       <item> % </item>
       <item> || </item>
+      <item> // </item>
       <item> &amp;&amp; </item>
       <item> | </item>
       <item> &amp; </item>
@@ -362,8 +364,9 @@
 
         <RegExpr attribute="Operator" context="find_here_document" String="\s*&lt;&lt;(?=\w+|\s*[&quot;'])" beginRegion="HereDocument" />
 
-        <RegExpr attribute="Normal Text" context="#stay" String="\s*\}\s*/" endRegion="Block"/>
-        <RegExpr attribute="Normal Text" context="#stay" String="\s*[)]\s*/" />
+        <RegExpr attribute="Normal Text" context="#stay" String="\s*\}\s*/{1,2}" endRegion="Block"/>
+        <RegExpr attribute="Normal Text" context="#stay" String="\s*[)\]]\s*/{1,2}" />
+        
         <RegExpr attribute="Function" context="sub_name_def" String="\w+::" />
         <RegExpr attribute="Normal Text" context="#stay" String="\w+[=]" />
 
@@ -661,7 +664,7 @@
         <RegExpr attribute="Data Type" context="var_detect" String="\$\$[\$\w_]" />
         <RegExpr attribute="Data Type" context="var_detect" String="\$[#_][\w_]" />
         <RegExpr attribute="Data Type" context="var_detect" String="\$+::" />
-        <RegExpr attribute="Special Variable" context="#stay" String="\$[^a-zA-Z0-9\s{][A-Z]?" />
+        <RegExpr attribute="Special Variable" context="var_detect" String="\$[^a-zA-Z0-9\s{][A-Z]?" />
         <RegExpr attribute="Data Type" context="var_detect" String="[\$@%]\{[\w_]+\}" />
         <AnyChar attribute="Data Type" context="var_detect" String="$@%" />
         <RegExpr attribute="Data Type" context="var_detect" String="\*[a-zA-Z_]+" />
@@ -679,7 +682,7 @@
         <RegExpr attribute="Data Type" context="var_detect_unsafe" String="\$+::" />
         <RegExpr attribute="Special Variable" context="#stay" String="\$[^a-zA-Z0-9\s{][A-Z]?" />
         <RegExpr attribute="Data Type" context="var_detect_unsafe" String="[\$@%]\{[\w_]+\}" />
-        <RegExpr attribute="Data Type" context="var_detect_unsafe" String="[\$@%]" />
+        <RegExpr attribute="Data Type" context="var_detect_unsafe" String="[\$@%]" /><!-- AnyChar! -->
         <RegExpr attribute="Data Type" context="var_detect_unsafe" String="\*\w+" />
         <AnyChar attribute="Operator" context="#pop" String="$@%*" />
       </context>
@@ -762,10 +765,10 @@
       </context>
 
       <context name="slash_safe_escape" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-        <RegExpr attribute="Normal Text" context="#pop" String="\s*\]?\s*/" />
-        <RegExpr attribute="Normal Text" context="#pop" String="\s*\}?\s*/" endRegion="Block" />
-        <RegExpr attribute="Normal Text" context="#pop" String="\s*\)?\s*/" />
-        <keyword attribute="Keyword" context="#pop" String="keywords" />
+        <DetectSpaces />
+        <RegExpr attribute="Normal Text" context="#pop" String="\}\s*/{1,2}" endRegion="Block"/>
+        <RegExpr attribute="Normal Text" context="#pop" String="[)\]]?\s*/{1,2}" />
+        <keyword attribute="Keyword" context="#pop" String="keywords" /><!-- wonder why??? -->
       </context>
 
       <context name="package_qualified_blank" attribute="Normal Text" lineEndContext="#stay">
diff --git a/kate/data/php.xml b/kate/data/php.xml
index 879e2ce23..a5c7d5718 100644
--- a/kate/data/php.xml
+++ b/kate/data/php.xml
@@ -2,6 +2,33 @@
 <!--
 
 Changes:
+[ Version 1.42 (2010-05-09) ]
+- fix handling of paamayim nekudotayim in ternary / case context, which used to
+  lead to improper region starts
+
+[ Version 1.41 (2009-08-26) ]
+- Add codefolding to heredocs
+
+[ Version 1.40 (2009-08-26) ]
+- Use Javascript, HTML, CSS or MySQL highlighting in heredoc statements with
+  with names like e.g. <<<HTML or <<<EOHTML
+
+  Bug: 118668
+
+[ Version 1.39 (2009-08-18) ]
+- Don't add subcontexts when using the paamayim nekudotayim token.
+
+[ Version 1.38 (2009-07-23) ]
+
+- Add support for alternate block syntax, see bug #103257. (James Sleeman)
+
+[ Version 1.37 (2009-07-18) ]
+
+- Remove folding on open and close php to improve embedded html handling, see bug #103257, #143022. (James Sleeman)
+
+[ Version 1.36 (2009-07-10) ]
+
+- spelling-awareness
 
 [ Version 1.35 (2009-04-08) ]
 
@@ -31,7 +58,7 @@ Changes:
 
 -->
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="PHP/PHP" version="1.35" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
+<language name="PHP/PHP" indenter="cstyle" version="1.42" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
   <highlighting>
     <list name="control structures">
       <item>as</item>
@@ -94,194 +121,6 @@ Changes:
       <item> __METHOD__ </item>
       <item> __NAMESPACE__ </item>
 
-      <item> E_ERROR </item>
-      <item> E_WARNING </item>
-      <item> E_PARSE </item>
-      <item> E_NOTICE </item>
-      <item> E_STRICT </item>
-      <item> E_CORE_ERROR </item>
-      <item> E_CORE_WARNING </item>
-      <item> E_COMPILE_ERROR </item>
-      <item> E_COMPILE_WARNING </item>
-      <item> E_USER_ERROR </item>
-      <item> E_USER_WARNING </item>
-      <item> E_USER_NOTICE </item>
-      <item> E_ALL </item>
-      <item> TRUE </item>
-      <item> FALSE </item>
-      <item> ZEND_THREAD_SAFE </item>
-      <item> NULL </item>
-      <item> PHP_VERSION </item>
-      <item> PHP_OS </item>
-      <item> PHP_SAPI </item>
-      <item> DEFAULT_INCLUDE_PATH </item>
-      <item> PEAR_INSTALL_DIR </item>
-      <item> PEAR_EXTENSION_DIR </item>
-      <item> PHP_EXTENSION_DIR </item>
-      <item> PHP_PREFIX </item>
-      <item> PHP_BINDIR </item>
-      <item> PHP_LIBDIR </item>
-      <item> PHP_DATADIR </item>
-      <item> PHP_SYSCONFDIR </item>
-      <item> PHP_LOCALSTATEDIR </item>
-      <item> PHP_CONFIG_FILE_PATH </item>
-      <item> PHP_CONFIG_FILE_SCAN_DIR </item>
-      <item> PHP_SHLIB_SUFFIX </item>
-      <item> PHP_EOL </item>
-      <item> PHP_OUTPUT_HANDLER_START </item>
-      <item> PHP_OUTPUT_HANDLER_CONT </item>
-      <item> PHP_OUTPUT_HANDLER_END </item>
-      <item> UPLOAD_ERR_OK </item>
-      <item> UPLOAD_ERR_INI_SIZE </item>
-      <item> UPLOAD_ERR_FORM_SIZE </item>
-      <item> UPLOAD_ERR_PARTIAL </item>
-      <item> UPLOAD_ERR_NO_FILE </item>
-      <item> UPLOAD_ERR_NO_TMP_DIR </item>
-      <item> P_STATIC </item>
-      <item> P_PUBLIC </item>
-      <item> P_PROTECTED </item>
-      <item> P_PRIVATE </item>
-      <item> M_STATIC </item>
-      <item> M_PUBLIC </item>
-      <item> M_PROTECTED </item>
-      <item> M_PRIVATE </item>
-      <item> M_ABSTRACT </item>
-      <item> M_FINAL </item>
-      <item> C_IMPLICIT_ABSTRACT </item>
-      <item> C_EXPLICIT_ABSTRACT </item>
-      <item> C_FINAL </item>
-      <item> XML_ERROR_NONE </item>
-      <item> XML_ERROR_NO_MEMORY </item>
-      <item> XML_ERROR_SYNTAX </item>
-      <item> XML_ERROR_NO_ELEMENTS </item>
-      <item> XML_ERROR_INVALID_TOKEN </item>
-      <item> XML_ERROR_UNCLOSED_TOKEN </item>
-      <item> XML_ERROR_PARTIAL_CHAR </item>
-      <item> XML_ERROR_TAG_MISMATCH </item>
-      <item> XML_ERROR_DUPLICATE_ATTRIBUTE </item>
-      <item> XML_ERROR_JUNK_AFTER_DOC_ELEMENT </item>
-      <item> XML_ERROR_PARAM_ENTITY_REF </item>
-      <item> XML_ERROR_UNDEFINED_ENTITY </item>
-      <item> XML_ERROR_RECURSIVE_ENTITY_REF </item>
-      <item> XML_ERROR_ASYNC_ENTITY </item>
-      <item> XML_ERROR_BAD_CHAR_REF </item>
-      <item> XML_ERROR_BINARY_ENTITY_REF </item>
-      <item> XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF </item>
-      <item> XML_ERROR_MISPLACED_XML_PI </item>
-      <item> XML_ERROR_UNKNOWN_ENCODING </item>
-      <item> XML_ERROR_INCORRECT_ENCODING </item>
-      <item> XML_ERROR_UNCLOSED_CDATA_SECTION </item>
-      <item> XML_ERROR_EXTERNAL_ENTITY_HANDLING </item>
-      <item> XML_OPTION_CASE_FOLDING </item>
-      <item> XML_OPTION_TARGET_ENCODING </item>
-      <item> XML_OPTION_SKIP_TAGSTART </item>
-      <item> XML_OPTION_SKIP_WHITE </item>
-      <item> XML_SAX_IMPL </item>
-      <item> CONNECTION_ABORTED </item>
-      <item> CONNECTION_NORMAL </item>
-      <item> CONNECTION_TIMEOUT </item>
-      <item> INI_USER </item>
-      <item> INI_PERDIR </item>
-      <item> INI_SYSTEM </item>
-      <item> INI_ALL </item>
-      <item> SUNFUNCS_RET_TIMESTAMP </item>
-      <item> SUNFUNCS_RET_STRING </item>
-      <item> SUNFUNCS_RET_DOUBLE </item>
-      <item> M_E </item>
-      <item> M_LOG2E </item>
-      <item> M_LOG10E </item>
-      <item> M_LN2 </item>
-      <item> M_LN10 </item>
-      <item> M_PI </item>
-      <item> M_PI_2 </item>
-      <item> M_PI_4 </item>
-      <item> M_1_PI </item>
-      <item> M_2_PI </item>
-      <item> M_2_SQRTPI </item>
-      <item> M_SQRT2 </item>
-      <item> M_SQRT1_2 </item>
-      <item> INF </item>
-      <item> NAN </item>
-      <item> INFO_GENERAL </item>
-      <item> INFO_CREDITS </item>
-      <item> INFO_CONFIGURATION </item>
-      <item> INFO_MODULES </item>
-      <item> INFO_ENVIRONMENT </item>
-      <item> INFO_VARIABLES </item>
-      <item> INFO_LICENSE </item>
-      <item> INFO_ALL </item>
-      <item> CREDITS_GROUP </item>
-      <item> CREDITS_GENERAL </item>
-      <item> CREDITS_SAPI </item>
-      <item> CREDITS_MODULES </item>
-      <item> CREDITS_DOCS </item>
-      <item> CREDITS_FULLPAGE </item>
-      <item> CREDITS_QA </item>
-      <item> CREDITS_ALL </item>
-      <item> HTML_SPECIALCHARS </item>
-      <item> HTML_ENTITIES </item>
-      <item> ENT_COMPAT </item>
-      <item> ENT_QUOTES </item>
-      <item> ENT_NOQUOTES </item>
-      <item> STR_PAD_LEFT </item>
-      <item> STR_PAD_RIGHT </item>
-      <item> STR_PAD_BOTH </item>
-      <item> PATHINFO_DIRNAME </item>
-      <item> PATHINFO_BASENAME </item>
-      <item> PATHINFO_EXTENSION </item>
-      <item> CHAR_MAX </item>
-      <item> LC_CTYPE </item>
-      <item> LC_NUMERIC </item>
-      <item> LC_TIME </item>
-      <item> LC_COLLATE </item>
-      <item> LC_MONETARY </item>
-      <item> LC_ALL </item>
-      <item> LC_MESSAGES </item>
-      <item> SEEK_SET </item>
-      <item> SEEK_CUR </item>
-      <item> SEEK_END </item>
-      <item> LOCK_SH </item>
-      <item> LOCK_EX </item>
-      <item> LOCK_UN </item>
-      <item> LOCK_NB </item>
-      <item> STREAM_NOTIFY_CONNECT </item>
-      <item> STREAM_NOTIFY_AUTH_REQUIRED </item>
-      <item> STREAM_NOTIFY_AUTH_RESULT </item>
-      <item> STREAM_NOTIFY_MIME_TYPE_IS </item>
-      <item> STREAM_NOTIFY_FILE_SIZE_IS </item>
-      <item> STREAM_NOTIFY_REDIRECTED </item>
-      <item> STREAM_NOTIFY_PROGRESS </item>
-      <item> STREAM_NOTIFY_FAILURE </item>
-      <item> STREAM_NOTIFY_COMPLETED </item>
-      <item> STREAM_NOTIFY_RESOLVE </item>
-      <item> STREAM_NOTIFY_SEVERITY_INFO </item>
-      <item> STREAM_NOTIFY_SEVERITY_WARN </item>
-      <item> STREAM_NOTIFY_SEVERITY_ERR </item>
-      <item> STREAM_FILTER_READ </item>
-      <item> STREAM_FILTER_WRITE </item>
-      <item> STREAM_FILTER_ALL </item>
-      <item> STREAM_CLIENT_PERSISTENT </item>
-      <item> STREAM_CLIENT_ASYNC_CONNECT </item>
-      <item> STREAM_CLIENT_CONNECT </item>
-      <item> STREAM_PEEK </item>
-      <item> STREAM_OOB </item>
-      <item> STREAM_SERVER_BIND </item>
-      <item> STREAM_SERVER_LISTEN </item>
-      <item> FILE_USE_INCLUDE_PATH </item>
-      <item> FILE_IGNORE_NEW_LINES </item>
-      <item> FILE_SKIP_EMPTY_LINES </item>
-      <item> FILE_APPEND </item>
-      <item> FILE_NO_DEFAULT_CONTEXT </item>
-      <item> FNM_NOESCAPE </item>
-      <item> FNM_PATHNAME </item>
-      <item> FNM_PERIOD </item>
-      <item> FNM_CASEFOLD </item>
-      <item> PSFS_PASS_ON </item>
-      <item> PSFS_FEED_ME </item>
-      <item> PSFS_ERR_FATAL </item>
-      <item> PSFS_FLAG_NORMAL </item>
-      <item> PSFS_FLAG_FLUSH_INC </item>
-      <item> PSFS_FLAG_FLUSH_CLOSE </item>
       <item> ABDAY_1 </item>
       <item> ABDAY_2 </item>
       <item> ABDAY_3 </item>
@@ -289,14 +128,10 @@ Changes:
       <item> ABDAY_5 </item>
       <item> ABDAY_6 </item>
       <item> ABDAY_7 </item>
-      <item> DAY_1 </item>
-      <item> DAY_2 </item>
-      <item> DAY_3 </item>
-      <item> DAY_4 </item>
-      <item> DAY_5 </item>
-      <item> DAY_6 </item>
-      <item> DAY_7 </item>
       <item> ABMON_1 </item>
+      <item> ABMON_10 </item>
+      <item> ABMON_11 </item>
+      <item> ABMON_12 </item>
       <item> ABMON_2 </item>
       <item> ABMON_3 </item>
       <item> ABMON_4 </item>
@@ -305,851 +140,862 @@ Changes:
       <item> ABMON_7 </item>
       <item> ABMON_8 </item>
       <item> ABMON_9 </item>
-      <item> ABMON_10 </item>
-      <item> ABMON_11 </item>
-      <item> ABMON_12 </item>
-      <item> MON_1 </item>
-      <item> MON_2 </item>
-      <item> MON_3 </item>
-      <item> MON_4 </item>
-      <item> MON_5 </item>
-      <item> MON_6 </item>
-      <item> MON_7 </item>
-      <item> MON_8 </item>
-      <item> MON_9 </item>
-      <item> MON_10 </item>
-      <item> MON_11 </item>
-      <item> MON_12 </item>
-      <item> AM_STR </item>
-      <item> PM_STR </item>
-      <item> D_T_FMT </item>
-      <item> D_FMT </item>
-      <item> T_FMT </item>
-      <item> T_FMT_AMPM </item>
-      <item> ERA </item>
-      <item> ERA_D_T_FMT </item>
-      <item> ERA_D_FMT </item>
-      <item> ERA_T_FMT </item>
+      <item> AF_INET </item>
+      <item> AF_INET6 </item>
+      <item> AF_UNIX </item>
       <item> ALT_DIGITS </item>
-      <item> CRNCYSTR </item>
-      <item> RADIXCHAR </item>
-      <item> THOUSEP </item>
-      <item> YESEXPR </item>
-      <item> NOEXPR </item>
-      <item> CODESET </item>
-      <item> CRYPT_SALT_LENGTH </item>
-      <item> CRYPT_STD_DES </item>
-      <item> CRYPT_EXT_DES </item>
-      <item> CRYPT_MD5 </item>
-      <item> CRYPT_BLOWFISH </item>
-      <item> DIRECTORY_SEPARATOR </item>
-      <item> PATH_SEPARATOR </item>
-      <item> GLOB_BRACE </item>
-      <item> GLOB_MARK </item>
-      <item> GLOB_NOSORT </item>
-      <item> GLOB_NOCHECK </item>
-      <item> GLOB_NOESCAPE </item>
-      <item> GLOB_ONLYDIR </item>
-      <item> LOG_EMERG </item>
-      <item> LOG_ALERT </item>
-      <item> LOG_CRIT </item>
-      <item> LOG_ERR </item>
-      <item> LOG_WARNING </item>
-      <item> LOG_NOTICE </item>
-      <item> LOG_INFO </item>
-      <item> LOG_DEBUG </item>
-      <item> LOG_KERN </item>
-      <item> LOG_USER </item>
-      <item> LOG_MAIL </item>
-      <item> LOG_DAEMON </item>
-      <item> LOG_AUTH </item>
-      <item> LOG_SYSLOG </item>
-      <item> LOG_LPR </item>
-      <item> LOG_NEWS </item>
-      <item> LOG_UUCP </item>
-      <item> LOG_CRON </item>
-      <item> LOG_AUTHPRIV </item>
-      <item> LOG_LOCAL0 </item>
-      <item> LOG_LOCAL1 </item>
-      <item> LOG_LOCAL2 </item>
-      <item> LOG_LOCAL3 </item>
-      <item> LOG_LOCAL4 </item>
-      <item> LOG_LOCAL5 </item>
-      <item> LOG_LOCAL6 </item>
-      <item> LOG_LOCAL7 </item>
-      <item> LOG_PID </item>
-      <item> LOG_CONS </item>
-      <item> LOG_ODELAY </item>
-      <item> LOG_NDELAY </item>
-      <item> LOG_NOWAIT </item>
-      <item> LOG_PERROR </item>
-      <item> EXTR_OVERWRITE </item>
-      <item> EXTR_SKIP </item>
-      <item> EXTR_PREFIX_SAME </item>
-      <item> EXTR_PREFIX_ALL </item>
-      <item> EXTR_PREFIX_INVALID </item>
-      <item> EXTR_PREFIX_IF_EXISTS </item>
-      <item> EXTR_IF_EXISTS </item>
-      <item> EXTR_REFS </item>
-      <item> SORT_ASC </item>
-      <item> SORT_DESC </item>
-      <item> SORT_REGULAR </item>
-      <item> SORT_NUMERIC </item>
-      <item> SORT_STRING </item>
-      <item> SORT_LOCALE_STRING </item>
-      <item> CASE_LOWER </item>
-      <item> CASE_UPPER </item>
-      <item> COUNT_NORMAL </item>
-      <item> COUNT_RECURSIVE </item>
+      <item> AM_STR </item>
       <item> ASSERT_ACTIVE </item>
-      <item> ASSERT_CALLBACK </item>
       <item> ASSERT_BAIL </item>
-      <item> ASSERT_WARNING </item>
+      <item> ASSERT_CALLBACK </item>
       <item> ASSERT_QUIET_EVAL </item>
-      <item> STREAM_USE_PATH </item>
-      <item> STREAM_IGNORE_URL </item>
-      <item> STREAM_ENFORCE_SAFE_MODE </item>
-      <item> STREAM_REPORT_ERRORS </item>
-      <item> STREAM_MUST_SEEK </item>
-      <item> STREAM_URL_STAT_LINK </item>
-      <item> STREAM_URL_STAT_QUIET </item>
-      <item> STREAM_MKDIR_RECURSIVE </item>
-      <item> IMAGETYPE_GIF </item>
-      <item> IMAGETYPE_JPEG </item>
-      <item> IMAGETYPE_PNG </item>
-      <item> IMAGETYPE_SWF </item>
-      <item> IMAGETYPE_PSD </item>
-      <item> IMAGETYPE_BMP </item>
-      <item> IMAGETYPE_TIFF_II </item>
-      <item> IMAGETYPE_TIFF_MM </item>
-      <item> IMAGETYPE_JPC </item>
-      <item> IMAGETYPE_JP2 </item>
-      <item> IMAGETYPE_JPX </item>
-      <item> IMAGETYPE_JB2 </item>
-      <item> IMAGETYPE_IFF </item>
-      <item> IMAGETYPE_WBMP </item>
-      <item> IMAGETYPE_JPEG2000 </item>
-      <item> IMAGETYPE_XBM </item>
-      <item> DNS_A </item>
-      <item> DNS_NS </item>
-      <item> DNS_CNAME </item>
-      <item> DNS_SOA </item>
-      <item> DNS_PTR </item>
-      <item> DNS_HINFO </item>
-      <item> DNS_MX </item>
-      <item> DNS_TXT </item>
-      <item> DNS_SRV </item>
-      <item> DNS_NAPTR </item>
-      <item> DNS_AAAA </item>
-      <item> DNS_ANY </item>
-      <item> DNS_ALL </item>
-      <item> RIT_LEAVES_ONLY </item>
-      <item> RIT_SELF_FIRST </item>
-      <item> RIT_CHILD_FIRST </item>
-      <item> CIT_CALL_TOSTRING </item>
-      <item> CIT_CATCH_GET_CHILD </item>
-      <item> PREG_PATTERN_ORDER </item>
-      <item> PREG_SET_ORDER </item>
-      <item> PREG_OFFSET_CAPTURE </item>
-      <item> PREG_SPLIT_NO_EMPTY </item>
-      <item> PREG_SPLIT_DELIM_CAPTURE </item>
-      <item> PREG_SPLIT_OFFSET_CAPTURE </item>
-      <item> PREG_GREP_INVERT </item>
-      <item> CAL_GREGORIAN </item>
-      <item> CAL_JULIAN </item>
-      <item> CAL_JEWISH </item>
-      <item> CAL_FRENCH </item>
-      <item> CAL_NUM_CALS </item>
+      <item> ASSERT_WARNING </item>
       <item> CAL_DOW_DAYNO </item>
-      <item> CAL_DOW_SHORT </item>
       <item> CAL_DOW_LONG </item>
-      <item> CAL_MONTH_GREGORIAN_SHORT </item>
-      <item> CAL_MONTH_GREGORIAN_LONG </item>
-      <item> CAL_MONTH_JULIAN_SHORT </item>
-      <item> CAL_MONTH_JULIAN_LONG </item>
-      <item> CAL_MONTH_JEWISH </item>
-      <item> CAL_MONTH_FRENCH </item>
-      <item> CAL_EASTER_DEFAULT </item>
-      <item> CAL_EASTER_ROMAN </item>
+      <item> CAL_DOW_SHORT </item>
       <item> CAL_EASTER_ALWAYS_GREGORIAN </item>
       <item> CAL_EASTER_ALWAYS_JULIAN </item>
-      <item> CAL_JEWISH_ADD_ALAFIM_GERESH </item>
+      <item> CAL_EASTER_DEFAULT </item>
+      <item> CAL_EASTER_ROMAN </item>
+      <item> CAL_FRENCH </item>
+      <item> CAL_GREGORIAN </item>
+      <item> CAL_JEWISH </item>
       <item> CAL_JEWISH_ADD_ALAFIM </item>
+      <item> CAL_JEWISH_ADD_ALAFIM_GERESH </item>
       <item> CAL_JEWISH_ADD_GERESHAYIM </item>
-      <item> CURLOPT_DNS_USE_GLOBAL_CACHE </item>
-      <item> CURLOPT_DNS_CACHE_TIMEOUT </item>
-      <item> CURLOPT_PORT </item>
-      <item> CURLOPT_FILE </item>
-      <item> CURLOPT_READDATA </item>
-      <item> CURLOPT_INFILE </item>
-      <item> CURLOPT_INFILESIZE </item>
-      <item> CURLOPT_URL </item>
-      <item> CURLOPT_PROXY </item>
-      <item> CURLOPT_VERBOSE </item>
-      <item> CURLOPT_HEADER </item>
-      <item> CURLOPT_HTTPHEADER </item>
-      <item> CURLOPT_NOPROGRESS </item>
-      <item> CURLOPT_NOBODY </item>
-      <item> CURLOPT_FAILONERROR </item>
-      <item> CURLOPT_UPLOAD </item>
-      <item> CURLOPT_POST </item>
-      <item> CURLOPT_FTPLISTONLY </item>
-      <item> CURLOPT_FTPAPPEND </item>
-      <item> CURLOPT_NETRC </item>
-      <item> CURLOPT_FOLLOWLOCATION </item>
-      <item> CURLOPT_FTPASCII </item>
-      <item> CURLOPT_PUT </item>
-      <item> CURLOPT_MUTE </item>
-      <item> CURLOPT_USERPWD </item>
-      <item> CURLOPT_PROXYUSERPWD </item>
-      <item> CURLOPT_RANGE </item>
-      <item> CURLOPT_TIMEOUT </item>
-      <item> CURLOPT_POSTFIELDS </item>
-      <item> CURLOPT_REFERER </item>
-      <item> CURLOPT_USERAGENT </item>
-      <item> CURLOPT_FTPPORT </item>
-      <item> CURLOPT_FTP_USE_EPSV </item>
-      <item> CURLOPT_LOW_SPEED_LIMIT </item>
-      <item> CURLOPT_LOW_SPEED_TIME </item>
-      <item> CURLOPT_RESUME_FROM </item>
-      <item> CURLOPT_COOKIE </item>
-      <item> CURLOPT_SSLCERT </item>
-      <item> CURLOPT_SSLCERTPASSWD </item>
-      <item> CURLOPT_WRITEHEADER </item>
-      <item> CURLOPT_SSL_VERIFYHOST </item>
-      <item> CURLOPT_COOKIEFILE </item>
-      <item> CURLOPT_SSLVERSION </item>
-      <item> CURLOPT_TIMECONDITION </item>
-      <item> CURLOPT_TIMEVALUE </item>
-      <item> CURLOPT_CUSTOMREQUEST </item>
-      <item> CURLOPT_STDERR </item>
-      <item> CURLOPT_TRANSFERTEXT </item>
-      <item> CURLOPT_RETURNTRANSFER </item>
-      <item> CURLOPT_QUOTE </item>
-      <item> CURLOPT_POSTQUOTE </item>
-      <item> CURLOPT_INTERFACE </item>
-      <item> CURLOPT_KRB4LEVEL </item>
-      <item> CURLOPT_HTTPPROXYTUNNEL </item>
-      <item> CURLOPT_FILETIME </item>
-      <item> CURLOPT_WRITEFUNCTION </item>
-      <item> CURLOPT_READFUNCTION </item>
-      <item> CURLOPT_PASSWDFUNCTION </item>
-      <item> CURLOPT_HEADERFUNCTION </item>
-      <item> CURLOPT_MAXREDIRS </item>
-      <item> CURLOPT_MAXCONNECTS </item>
-      <item> CURLOPT_CLOSEPOLICY </item>
-      <item> CURLOPT_FRESH_CONNECT </item>
-      <item> CURLOPT_FORBID_REUSE </item>
-      <item> CURLOPT_RANDOM_FILE </item>
-      <item> CURLOPT_EGDSOCKET </item>
-      <item> CURLOPT_CONNECTTIMEOUT </item>
-      <item> CURLOPT_SSL_VERIFYPEER </item>
-      <item> CURLOPT_CAINFO </item>
-      <item> CURLOPT_CAPATH </item>
-      <item> CURLOPT_COOKIEJAR </item>
-      <item> CURLOPT_SSL_CIPHER_LIST </item>
-      <item> CURLOPT_BINARYTRANSFER </item>
-      <item> CURLOPT_NOSIGNAL </item>
-      <item> CURLOPT_PROXYTYPE </item>
-      <item> CURLOPT_BUFFERSIZE </item>
-      <item> CURLOPT_HTTPGET </item>
-      <item> CURLOPT_HTTP_VERSION </item>
-      <item> CURLOPT_SSLKEY </item>
-      <item> CURLOPT_SSLKEYTYPE </item>
-      <item> CURLOPT_SSLKEYPASSWD </item>
-      <item> CURLOPT_SSLENGINE </item>
-      <item> CURLOPT_SSLENGINE_DEFAULT </item>
-      <item> CURLOPT_SSLCERTTYPE </item>
-      <item> CURLOPT_CRLF </item>
-      <item> CURLOPT_ENCODING </item>
-      <item> CURLOPT_PROXYPORT </item>
-      <item> CURLOPT_UNRESTRICTED_AUTH </item>
-      <item> CURLOPT_FTP_USE_EPRT </item>
-      <item> CURLOPT_HTTP200ALIASES </item>
-      <item> CURL_TIMECOND_IFMODSINCE </item>
-      <item> CURL_TIMECOND_IFUNMODSINCE </item>
-      <item> CURL_TIMECOND_LASTMOD </item>
-      <item> CURLOPT_HTTPAUTH </item>
+      <item> CAL_JULIAN </item>
+      <item> CAL_MONTH_FRENCH </item>
+      <item> CAL_MONTH_GREGORIAN_LONG </item>
+      <item> CAL_MONTH_GREGORIAN_SHORT </item>
+      <item> CAL_MONTH_JEWISH </item>
+      <item> CAL_MONTH_JULIAN_LONG </item>
+      <item> CAL_MONTH_JULIAN_SHORT </item>
+      <item> CAL_NUM_CALS </item>
+      <item> CASE_LOWER </item>
+      <item> CASE_UPPER </item>
+      <item> CHAR_MAX </item>
+      <item> CIT_CALL_TOSTRING </item>
+      <item> CIT_CATCH_GET_CHILD </item>
+      <item> CL_EXPUNGE </item>
+      <item> CODESET </item>
+      <item> CONNECTION_ABORTED </item>
+      <item> CONNECTION_NORMAL </item>
+      <item> CONNECTION_TIMEOUT </item>
+      <item> COUNT_NORMAL </item>
+      <item> COUNT_RECURSIVE </item>
+      <item> CP_MOVE </item>
+      <item> CP_UID </item>
+      <item> CREDITS_ALL </item>
+      <item> CREDITS_DOCS </item>
+      <item> CREDITS_FULLPAGE </item>
+      <item> CREDITS_GENERAL </item>
+      <item> CREDITS_GROUP </item>
+      <item> CREDITS_MODULES </item>
+      <item> CREDITS_QA </item>
+      <item> CREDITS_SAPI </item>
+      <item> CRNCYSTR </item>
+      <item> CRYPT_BLOWFISH </item>
+      <item> CRYPT_EXT_DES </item>
+      <item> CRYPT_MD5 </item>
+      <item> CRYPT_SALT_LENGTH </item>
+      <item> CRYPT_STD_DES </item>
+      <item> CURLAUTH_ANY </item>
+      <item> CURLAUTH_ANYSAFE </item>
       <item> CURLAUTH_BASIC </item>
       <item> CURLAUTH_DIGEST </item>
       <item> CURLAUTH_GSSNEGOTIATE </item>
       <item> CURLAUTH_NTLM </item>
-      <item> CURLAUTH_ANY </item>
-      <item> CURLAUTH_ANYSAFE </item>
-      <item> CURLOPT_PROXYAUTH </item>
+      <item> CURLCLOSEPOLICY_CALLBACK </item>
       <item> CURLCLOSEPOLICY_LEAST_RECENTLY_USED </item>
       <item> CURLCLOSEPOLICY_LEAST_TRAFFIC </item>
-      <item> CURLCLOSEPOLICY_SLOWEST </item>
-      <item> CURLCLOSEPOLICY_CALLBACK </item>
       <item> CURLCLOSEPOLICY_OLDEST </item>
-      <item> CURLINFO_EFFECTIVE_URL </item>
-      <item> CURLINFO_HTTP_CODE </item>
-      <item> CURLINFO_HEADER_SIZE </item>
-      <item> CURLINFO_REQUEST_SIZE </item>
-      <item> CURLINFO_TOTAL_TIME </item>
-      <item> CURLINFO_NAMELOOKUP_TIME </item>
-      <item> CURLINFO_CONNECT_TIME </item>
-      <item> CURLINFO_PRETRANSFER_TIME </item>
-      <item> CURLINFO_SIZE_UPLOAD </item>
-      <item> CURLINFO_SIZE_DOWNLOAD </item>
-      <item> CURLINFO_SPEED_DOWNLOAD </item>
-      <item> CURLINFO_SPEED_UPLOAD </item>
-      <item> CURLINFO_FILETIME </item>
-      <item> CURLINFO_SSL_VERIFYRESULT </item>
-      <item> CURLINFO_CONTENT_LENGTH_DOWNLOAD </item>
-      <item> CURLINFO_CONTENT_LENGTH_UPLOAD </item>
-      <item> CURLINFO_STARTTRANSFER_TIME </item>
-      <item> CURLINFO_CONTENT_TYPE </item>
-      <item> CURLINFO_REDIRECT_TIME </item>
-      <item> CURLINFO_REDIRECT_COUNT </item>
-      <item> CURL_VERSION_IPV6 </item>
-      <item> CURL_VERSION_KERBEROS4 </item>
-      <item> CURL_VERSION_SSL </item>
-      <item> CURL_VERSION_LIBZ </item>
-      <item> CURLVERSION_NOW </item>
-      <item> CURLE_OK </item>
-      <item> CURLE_UNSUPPORTED_PROTOCOL </item>
-      <item> CURLE_FAILED_INIT </item>
-      <item> CURLE_URL_MALFORMAT </item>
-      <item> CURLE_URL_MALFORMAT_USER </item>
-      <item> CURLE_COULDNT_RESOLVE_PROXY </item>
-      <item> CURLE_COULDNT_RESOLVE_HOST </item>
+      <item> CURLCLOSEPOLICY_SLOWEST </item>
+      <item> CURLE_ABORTED_BY_CALLBACK </item>
+      <item> CURLE_BAD_CALLING_ORDER </item>
+      <item> CURLE_BAD_CONTENT_ENCODING </item>
+      <item> CURLE_BAD_FUNCTION_ARGUMENT </item>
+      <item> CURLE_BAD_PASSWORD_ENTERED </item>
       <item> CURLE_COULDNT_CONNECT </item>
-      <item> CURLE_FTP_WEIRD_SERVER_REPLY </item>
+      <item> CURLE_COULDNT_RESOLVE_HOST </item>
+      <item> CURLE_COULDNT_RESOLVE_PROXY </item>
+      <item> CURLE_FAILED_INIT </item>
+      <item> CURLE_FILE_COULDNT_READ_FILE </item>
       <item> CURLE_FTP_ACCESS_DENIED </item>
-      <item> CURLE_FTP_USER_PASSWORD_INCORRECT </item>
-      <item> CURLE_FTP_WEIRD_PASS_REPLY </item>
-      <item> CURLE_FTP_WEIRD_USER_REPLY </item>
-      <item> CURLE_FTP_WEIRD_PASV_REPLY </item>
-      <item> CURLE_FTP_WEIRD_227_FORMAT </item>
+      <item> CURLE_FTP_BAD_DOWNLOAD_RESUME </item>
       <item> CURLE_FTP_CANT_GET_HOST </item>
       <item> CURLE_FTP_CANT_RECONNECT </item>
-      <item> CURLE_FTP_COULDNT_SET_BINARY </item>
-      <item> CURLE_PARTIAL_FILE </item>
+      <item> CURLE_FTP_COULDNT_GET_SIZE </item>
       <item> CURLE_FTP_COULDNT_RETR_FILE </item>
-      <item> CURLE_FTP_WRITE_ERROR </item>
-      <item> CURLE_FTP_QUOTE_ERROR </item>
-      <item> CURLE_HTTP_NOT_FOUND </item>
-      <item> CURLE_WRITE_ERROR </item>
-      <item> CURLE_MALFORMAT_USER </item>
-      <item> CURLE_FTP_COULDNT_STOR_FILE </item>
-      <item> CURLE_READ_ERROR </item>
-      <item> CURLE_OUT_OF_MEMORY </item>
-      <item> CURLE_OPERATION_TIMEOUTED </item>
       <item> CURLE_FTP_COULDNT_SET_ASCII </item>
-      <item> CURLE_FTP_PORT_FAILED </item>
+      <item> CURLE_FTP_COULDNT_SET_BINARY </item>
+      <item> CURLE_FTP_COULDNT_STOR_FILE </item>
       <item> CURLE_FTP_COULDNT_USE_REST </item>
-      <item> CURLE_FTP_COULDNT_GET_SIZE </item>
-      <item> CURLE_HTTP_RANGE_ERROR </item>
+      <item> CURLE_FTP_PORT_FAILED </item>
+      <item> CURLE_FTP_QUOTE_ERROR </item>
+      <item> CURLE_FTP_USER_PASSWORD_INCORRECT </item>
+      <item> CURLE_FTP_WEIRD_227_FORMAT </item>
+      <item> CURLE_FTP_WEIRD_PASS_REPLY </item>
+      <item> CURLE_FTP_WEIRD_PASV_REPLY </item>
+      <item> CURLE_FTP_WEIRD_SERVER_REPLY </item>
+      <item> CURLE_FTP_WEIRD_USER_REPLY </item>
+      <item> CURLE_FTP_WRITE_ERROR </item>
+      <item> CURLE_FUNCTION_NOT_FOUND </item>
+      <item> CURLE_GOT_NOTHING </item>
+      <item> CURLE_HTTP_NOT_FOUND </item>
+      <item> CURLE_HTTP_PORT_FAILED </item>
       <item> CURLE_HTTP_POST_ERROR </item>
-      <item> CURLE_SSL_CONNECT_ERROR </item>
-      <item> CURLE_FTP_BAD_DOWNLOAD_RESUME </item>
-      <item> CURLE_FILE_COULDNT_READ_FILE </item>
+      <item> CURLE_HTTP_RANGE_ERROR </item>
       <item> CURLE_LDAP_CANNOT_BIND </item>
       <item> CURLE_LDAP_SEARCH_FAILED </item>
       <item> CURLE_LIBRARY_NOT_FOUND </item>
-      <item> CURLE_FUNCTION_NOT_FOUND </item>
-      <item> CURLE_ABORTED_BY_CALLBACK </item>
-      <item> CURLE_BAD_FUNCTION_ARGUMENT </item>
-      <item> CURLE_BAD_CALLING_ORDER </item>
-      <item> CURLE_HTTP_PORT_FAILED </item>
-      <item> CURLE_BAD_PASSWORD_ENTERED </item>
-      <item> CURLE_TOO_MANY_REDIRECTS </item>
-      <item> CURLE_UNKNOWN_TELNET_OPTION </item>
-      <item> CURLE_TELNET_OPTION_SYNTAX </item>
+      <item> CURLE_MALFORMAT_USER </item>
       <item> CURLE_OBSOLETE </item>
-      <item> CURLE_SSL_PEER_CERTIFICATE </item>
-      <item> CURLE_GOT_NOTHING </item>
-      <item> CURLE_SSL_ENGINE_NOTFOUND </item>
-      <item> CURLE_SSL_ENGINE_SETFAILED </item>
-      <item> CURLE_SEND_ERROR </item>
+      <item> CURLE_OK </item>
+      <item> CURLE_OPERATION_TIMEOUTED </item>
+      <item> CURLE_OUT_OF_MEMORY </item>
+      <item> CURLE_PARTIAL_FILE </item>
+      <item> CURLE_READ_ERROR </item>
       <item> CURLE_RECV_ERROR </item>
+      <item> CURLE_SEND_ERROR </item>
       <item> CURLE_SHARE_IN_USE </item>
+      <item> CURLE_SSL_CACERT </item>
       <item> CURLE_SSL_CERTPROBLEM </item>
       <item> CURLE_SSL_CIPHER </item>
-      <item> CURLE_SSL_CACERT </item>
-      <item> CURLE_BAD_CONTENT_ENCODING </item>
+      <item> CURLE_SSL_CONNECT_ERROR </item>
+      <item> CURLE_SSL_ENGINE_NOTFOUND </item>
+      <item> CURLE_SSL_ENGINE_SETFAILED </item>
+      <item> CURLE_SSL_PEER_CERTIFICATE </item>
+      <item> CURLE_TELNET_OPTION_SYNTAX </item>
+      <item> CURLE_TOO_MANY_REDIRECTS </item>
+      <item> CURLE_UNKNOWN_TELNET_OPTION </item>
+      <item> CURLE_UNSUPPORTED_PROTOCOL </item>
+      <item> CURLE_URL_MALFORMAT </item>
+      <item> CURLE_URL_MALFORMAT_USER </item>
+      <item> CURLE_WRITE_ERROR </item>
+      <item> CURLINFO_CONNECT_TIME </item>
+      <item> CURLINFO_CONTENT_LENGTH_DOWNLOAD </item>
+      <item> CURLINFO_CONTENT_LENGTH_UPLOAD </item>
+      <item> CURLINFO_CONTENT_TYPE </item>
+      <item> CURLINFO_EFFECTIVE_URL </item>
+      <item> CURLINFO_FILETIME </item>
+      <item> CURLINFO_HEADER_SIZE </item>
+      <item> CURLINFO_HTTP_CODE </item>
+      <item> CURLINFO_NAMELOOKUP_TIME </item>
+      <item> CURLINFO_PRETRANSFER_TIME </item>
+      <item> CURLINFO_REDIRECT_COUNT </item>
+      <item> CURLINFO_REDIRECT_TIME </item>
+      <item> CURLINFO_REQUEST_SIZE </item>
+      <item> CURLINFO_SIZE_DOWNLOAD </item>
+      <item> CURLINFO_SIZE_UPLOAD </item>
+      <item> CURLINFO_SPEED_DOWNLOAD </item>
+      <item> CURLINFO_SPEED_UPLOAD </item>
+      <item> CURLINFO_SSL_VERIFYRESULT </item>
+      <item> CURLINFO_STARTTRANSFER_TIME </item>
+      <item> CURLINFO_TOTAL_TIME </item>
+      <item> CURLMSG_DONE </item>
+      <item> CURLM_BAD_EASY_HANDLE </item>
+      <item> CURLM_BAD_HANDLE </item>
+      <item> CURLM_CALL_MULTI_PERFORM </item>
+      <item> CURLM_INTERNAL_ERROR </item>
+      <item> CURLM_OK </item>
+      <item> CURLM_OUT_OF_MEMORY </item>
+      <item> CURLOPT_BINARYTRANSFER </item>
+      <item> CURLOPT_BUFFERSIZE </item>
+      <item> CURLOPT_CAINFO </item>
+      <item> CURLOPT_CAPATH </item>
+      <item> CURLOPT_CLOSEPOLICY </item>
+      <item> CURLOPT_CONNECTTIMEOUT </item>
+      <item> CURLOPT_COOKIE </item>
+      <item> CURLOPT_COOKIEFILE </item>
+      <item> CURLOPT_COOKIEJAR </item>
+      <item> CURLOPT_CRLF </item>
+      <item> CURLOPT_CUSTOMREQUEST </item>
+      <item> CURLOPT_DNS_CACHE_TIMEOUT </item>
+      <item> CURLOPT_DNS_USE_GLOBAL_CACHE </item>
+      <item> CURLOPT_EGDSOCKET </item>
+      <item> CURLOPT_ENCODING </item>
+      <item> CURLOPT_FAILONERROR </item>
+      <item> CURLOPT_FILE </item>
+      <item> CURLOPT_FILETIME </item>
+      <item> CURLOPT_FOLLOWLOCATION </item>
+      <item> CURLOPT_FORBID_REUSE </item>
+      <item> CURLOPT_FRESH_CONNECT </item>
+      <item> CURLOPT_FTPAPPEND </item>
+      <item> CURLOPT_FTPASCII </item>
+      <item> CURLOPT_FTPLISTONLY </item>
+      <item> CURLOPT_FTPPORT </item>
+      <item> CURLOPT_FTP_USE_EPRT </item>
+      <item> CURLOPT_FTP_USE_EPSV </item>
+      <item> CURLOPT_HEADER </item>
+      <item> CURLOPT_HEADERFUNCTION </item>
+      <item> CURLOPT_HTTP200ALIASES </item>
+      <item> CURLOPT_HTTPAUTH </item>
+      <item> CURLOPT_HTTPGET </item>
+      <item> CURLOPT_HTTPHEADER </item>
+      <item> CURLOPT_HTTPPROXYTUNNEL </item>
+      <item> CURLOPT_HTTP_VERSION </item>
+      <item> CURLOPT_INFILE </item>
+      <item> CURLOPT_INFILESIZE </item>
+      <item> CURLOPT_INTERFACE </item>
+      <item> CURLOPT_KRB4LEVEL </item>
+      <item> CURLOPT_LOW_SPEED_LIMIT </item>
+      <item> CURLOPT_LOW_SPEED_TIME </item>
+      <item> CURLOPT_MAXCONNECTS </item>
+      <item> CURLOPT_MAXREDIRS </item>
+      <item> CURLOPT_MUTE </item>
+      <item> CURLOPT_NETRC </item>
+      <item> CURLOPT_NOBODY </item>
+      <item> CURLOPT_NOPROGRESS </item>
+      <item> CURLOPT_NOSIGNAL </item>
+      <item> CURLOPT_PASSWDFUNCTION </item>
+      <item> CURLOPT_PORT </item>
+      <item> CURLOPT_POST </item>
+      <item> CURLOPT_POSTFIELDS </item>
+      <item> CURLOPT_POSTQUOTE </item>
+      <item> CURLOPT_PROXY </item>
+      <item> CURLOPT_PROXYAUTH </item>
+      <item> CURLOPT_PROXYPORT </item>
+      <item> CURLOPT_PROXYTYPE </item>
+      <item> CURLOPT_PROXYUSERPWD </item>
+      <item> CURLOPT_PUT </item>
+      <item> CURLOPT_QUOTE </item>
+      <item> CURLOPT_RANDOM_FILE </item>
+      <item> CURLOPT_RANGE </item>
+      <item> CURLOPT_READDATA </item>
+      <item> CURLOPT_READFUNCTION </item>
+      <item> CURLOPT_REFERER </item>
+      <item> CURLOPT_RESUME_FROM </item>
+      <item> CURLOPT_RETURNTRANSFER </item>
+      <item> CURLOPT_SSLCERT </item>
+      <item> CURLOPT_SSLCERTPASSWD </item>
+      <item> CURLOPT_SSLCERTTYPE </item>
+      <item> CURLOPT_SSLENGINE </item>
+      <item> CURLOPT_SSLENGINE_DEFAULT </item>
+      <item> CURLOPT_SSLKEY </item>
+      <item> CURLOPT_SSLKEYPASSWD </item>
+      <item> CURLOPT_SSLKEYTYPE </item>
+      <item> CURLOPT_SSLVERSION </item>
+      <item> CURLOPT_SSL_CIPHER_LIST </item>
+      <item> CURLOPT_SSL_VERIFYHOST </item>
+      <item> CURLOPT_SSL_VERIFYPEER </item>
+      <item> CURLOPT_STDERR </item>
+      <item> CURLOPT_TIMECONDITION </item>
+      <item> CURLOPT_TIMEOUT </item>
+      <item> CURLOPT_TIMEVALUE </item>
+      <item> CURLOPT_TRANSFERTEXT </item>
+      <item> CURLOPT_UNRESTRICTED_AUTH </item>
+      <item> CURLOPT_UPLOAD </item>
+      <item> CURLOPT_URL </item>
+      <item> CURLOPT_USERAGENT </item>
+      <item> CURLOPT_USERPWD </item>
+      <item> CURLOPT_VERBOSE </item>
+      <item> CURLOPT_WRITEFUNCTION </item>
+      <item> CURLOPT_WRITEHEADER </item>
       <item> CURLPROXY_HTTP </item>
       <item> CURLPROXY_SOCKS5 </item>
-      <item> CURL_NETRC_OPTIONAL </item>
-      <item> CURL_NETRC_IGNORED </item>
-      <item> CURL_NETRC_REQUIRED </item>
-      <item> CURL_HTTP_VERSION_NONE </item>
+      <item> CURLVERSION_NOW </item>
       <item> CURL_HTTP_VERSION_1_0 </item>
       <item> CURL_HTTP_VERSION_1_1 </item>
-      <item> CURLM_CALL_MULTI_PERFORM </item>
-      <item> CURLM_OK </item>
-      <item> CURLM_BAD_HANDLE </item>
-      <item> CURLM_BAD_EASY_HANDLE </item>
-      <item> CURLM_OUT_OF_MEMORY </item>
-      <item> CURLM_INTERNAL_ERROR </item>
-      <item> CURLMSG_DONE </item>
-      <item> DBX_MYSQL </item>
-      <item> DBX_ODBC </item>
-      <item> DBX_PGSQL </item>
-      <item> DBX_MSSQL </item>
+      <item> CURL_HTTP_VERSION_NONE </item>
+      <item> CURL_NETRC_IGNORED </item>
+      <item> CURL_NETRC_OPTIONAL </item>
+      <item> CURL_NETRC_REQUIRED </item>
+      <item> CURL_TIMECOND_IFMODSINCE </item>
+      <item> CURL_TIMECOND_IFUNMODSINCE </item>
+      <item> CURL_TIMECOND_LASTMOD </item>
+      <item> CURL_VERSION_IPV6 </item>
+      <item> CURL_VERSION_KERBEROS4 </item>
+      <item> CURL_VERSION_LIBZ </item>
+      <item> CURL_VERSION_SSL </item>
+      <item> C_EXPLICIT_ABSTRACT </item>
+      <item> C_FINAL </item>
+      <item> C_IMPLICIT_ABSTRACT </item>
+      <item> DAY_1 </item>
+      <item> DAY_2 </item>
+      <item> DAY_3 </item>
+      <item> DAY_4 </item>
+      <item> DAY_5 </item>
+      <item> DAY_6 </item>
+      <item> DAY_7 </item>
+      <item> DBX_CMP_ASC </item>
+      <item> DBX_CMP_DESC </item>
+      <item> DBX_CMP_NATIVE </item>
+      <item> DBX_CMP_NUMBER </item>
+      <item> DBX_CMP_TEXT </item>
+      <item> DBX_COLNAMES_LOWERCASE </item>
+      <item> DBX_COLNAMES_UNCHANGED </item>
+      <item> DBX_COLNAMES_UPPERCASE </item>
       <item> DBX_FBSQL </item>
+      <item> DBX_MSSQL </item>
+      <item> DBX_MYSQL </item>
       <item> DBX_OCI8 </item>
-      <item> DBX_SYBASECT </item>
-      <item> DBX_SQLITE </item>
+      <item> DBX_ODBC </item>
       <item> DBX_PERSISTENT </item>
-      <item> DBX_RESULT_INFO </item>
-      <item> DBX_RESULT_INDEX </item>
+      <item> DBX_PGSQL </item>
       <item> DBX_RESULT_ASSOC </item>
+      <item> DBX_RESULT_INDEX </item>
+      <item> DBX_RESULT_INFO </item>
       <item> DBX_RESULT_UNBUFFERED </item>
-      <item> DBX_COLNAMES_UNCHANGED </item>
-      <item> DBX_COLNAMES_UPPERCASE </item>
-      <item> DBX_COLNAMES_LOWERCASE </item>
-      <item> DBX_CMP_NATIVE </item>
-      <item> DBX_CMP_TEXT </item>
-      <item> DBX_CMP_NUMBER </item>
-      <item> DBX_CMP_ASC </item>
-      <item> DBX_CMP_DESC </item>
-      <item> O_RDONLY </item>
-      <item> O_WRONLY </item>
-      <item> O_RDWR </item>
-      <item> O_CREAT </item>
-      <item> O_EXCL </item>
-      <item> O_TRUNC </item>
-      <item> O_APPEND </item>
-      <item> O_NONBLOCK </item>
-      <item> O_NDELAY </item>
-      <item> O_SYNC </item>
-      <item> O_ASYNC </item>
-      <item> O_NOCTTY </item>
-      <item> S_IRWXU </item>
-      <item> S_IRUSR </item>
-      <item> S_IWUSR </item>
-      <item> S_IXUSR </item>
-      <item> S_IRWXG </item>
-      <item> S_IRGRP </item>
-      <item> S_IWGRP </item>
-      <item> S_IXGRP </item>
-      <item> S_IRWXO </item>
-      <item> S_IROTH </item>
-      <item> S_IWOTH </item>
-      <item> S_IXOTH </item>
-      <item> F_DUPFD </item>
-      <item> F_GETFD </item>
-      <item> F_GETFL </item>
-      <item> F_SETFL </item>
-      <item> F_GETLK </item>
-      <item> F_SETLK </item>
-      <item> F_SETLKW </item>
-      <item> F_SETOWN </item>
-      <item> F_GETOWN </item>
-      <item> F_UNLCK </item>
-      <item> F_RDLCK </item>
-      <item> F_WRLCK </item>
-      <item> XML_ELEMENT_NODE </item>
-      <item> XML_ATTRIBUTE_NODE </item>
-      <item> XML_TEXT_NODE </item>
-      <item> XML_CDATA_SECTION_NODE </item>
-      <item> XML_ENTITY_REF_NODE </item>
-      <item> XML_ENTITY_NODE </item>
-      <item> XML_PI_NODE </item>
-      <item> XML_COMMENT_NODE </item>
-      <item> XML_DOCUMENT_NODE </item>
-      <item> XML_DOCUMENT_TYPE_NODE </item>
-      <item> XML_DOCUMENT_FRAG_NODE </item>
-      <item> XML_NOTATION_NODE </item>
-      <item> XML_HTML_DOCUMENT_NODE </item>
-      <item> XML_DTD_NODE </item>
-      <item> XML_ELEMENT_DECL_NODE </item>
-      <item> XML_ATTRIBUTE_DECL_NODE </item>
-      <item> XML_ENTITY_DECL_NODE </item>
-      <item> XML_NAMESPACE_DECL_NODE </item>
-      <item> XML_LOCAL_NAMESPACE </item>
-      <item> XML_ATTRIBUTE_CDATA </item>
-      <item> XML_ATTRIBUTE_ID </item>
-      <item> XML_ATTRIBUTE_IDREF </item>
-      <item> XML_ATTRIBUTE_IDREFS </item>
-      <item> XML_ATTRIBUTE_ENTITY </item>
-      <item> XML_ATTRIBUTE_NMTOKEN </item>
-      <item> XML_ATTRIBUTE_NMTOKENS </item>
-      <item> XML_ATTRIBUTE_ENUMERATION </item>
-      <item> XML_ATTRIBUTE_NOTATION </item>
-      <item> DOM_PHP_ERR </item>
-      <item> DOM_INDEX_SIZE_ERR </item>
+      <item> DBX_SQLITE </item>
+      <item> DBX_SYBASECT </item>
+      <item> DEFAULT_INCLUDE_PATH </item>
+      <item> DIRECTORY_SEPARATOR </item>
+      <item> DNS_A </item>
+      <item> DNS_AAAA </item>
+      <item> DNS_ALL </item>
+      <item> DNS_ANY </item>
+      <item> DNS_CNAME </item>
+      <item> DNS_HINFO </item>
+      <item> DNS_MX </item>
+      <item> DNS_NAPTR </item>
+      <item> DNS_NS </item>
+      <item> DNS_PTR </item>
+      <item> DNS_SOA </item>
+      <item> DNS_SRV </item>
+      <item> DNS_TXT </item>
       <item> DOMSTRING_SIZE_ERR </item>
       <item> DOM_HIERARCHY_REQUEST_ERR </item>
-      <item> DOM_WRONG_DOCUMENT_ERR </item>
+      <item> DOM_INDEX_SIZE_ERR </item>
+      <item> DOM_INUSE_ATTRIBUTE_ERR </item>
+      <item> DOM_INVALID_ACCESS_ERR </item>
       <item> DOM_INVALID_CHARACTER_ERR </item>
-      <item> DOM_NO_DATA_ALLOWED_ERR </item>
-      <item> DOM_NO_MODIFICATION_ALLOWED_ERR </item>
+      <item> DOM_INVALID_MODIFICATION_ERR </item>
+      <item> DOM_INVALID_STATE_ERR </item>
+      <item> DOM_NAMESPACE_ERR </item>
       <item> DOM_NOT_FOUND_ERR </item>
       <item> DOM_NOT_SUPPORTED_ERR </item>
-      <item> DOM_INUSE_ATTRIBUTE_ERR </item>
-      <item> DOM_INVALID_STATE_ERR </item>
+      <item> DOM_NO_DATA_ALLOWED_ERR </item>
+      <item> DOM_NO_MODIFICATION_ALLOWED_ERR </item>
+      <item> DOM_PHP_ERR </item>
       <item> DOM_SYNTAX_ERR </item>
-      <item> DOM_INVALID_MODIFICATION_ERR </item>
-      <item> DOM_NAMESPACE_ERR </item>
-      <item> DOM_INVALID_ACCESS_ERR </item>
       <item> DOM_VALIDATION_ERR </item>
+      <item> DOM_WRONG_DOCUMENT_ERR </item>
+      <item> D_FMT </item>
+      <item> D_T_FMT </item>
+      <item> ENC7BIT </item>
+      <item> ENC8BIT </item>
+      <item> ENCBASE64 </item>
+      <item> ENCBINARY </item>
+      <item> ENCOTHER </item>
+      <item> ENCQUOTEDPRINTABLE </item>
+      <item> ENT_COMPAT </item>
+      <item> ENT_NOQUOTES </item>
+      <item> ENT_QUOTES </item>
+      <item> ERA </item>
+      <item> ERA_D_FMT </item>
+      <item> ERA_D_T_FMT </item>
+      <item> ERA_T_FMT </item>
       <item> EXIF_USE_MBSTRING </item>
+      <item> EXTR_IF_EXISTS </item>
+      <item> EXTR_OVERWRITE </item>
+      <item> EXTR_PREFIX_ALL </item>
+      <item> EXTR_PREFIX_IF_EXISTS </item>
+      <item> EXTR_PREFIX_INVALID </item>
+      <item> EXTR_PREFIX_SAME </item>
+      <item> EXTR_REFS </item>
+      <item> EXTR_SKIP </item>
+      <item> E_ALL </item>
+      <item> E_COMPILE_ERROR </item>
+      <item> E_COMPILE_WARNING </item>
+      <item> E_CORE_ERROR </item>
+      <item> E_CORE_WARNING </item>
+      <item> E_ERROR </item>
+      <item> E_NOTICE </item>
+      <item> E_PARSE </item>
+      <item> E_STRICT </item>
+      <item> E_USER_ERROR </item>
+      <item> E_USER_NOTICE </item>
+      <item> E_USER_WARNING </item>
+      <item> E_WARNING </item>
+      <item> FALSE </item>
+      <item> FAMAcknowledge </item>
       <item> FAMChanged </item>
+      <item> FAMCreated </item>
       <item> FAMDeleted </item>
+      <item> FAMEndExist </item>
+      <item> FAMExists </item>
+      <item> FAMMoved </item>
       <item> FAMStartExecuting </item>
       <item> FAMStopExecuting </item>
-      <item> FAMCreated </item>
-      <item> FAMMoved </item>
-      <item> FAMAcknowledge </item>
-      <item> FAMExists </item>
-      <item> FAMEndExist </item>
+      <item> FILE_APPEND </item>
+      <item> FILE_IGNORE_NEW_LINES </item>
+      <item> FILE_NO_DEFAULT_CONTEXT </item>
+      <item> FILE_SKIP_EMPTY_LINES </item>
+      <item> FILE_USE_INCLUDE_PATH </item>
+      <item> FNM_CASEFOLD </item>
+      <item> FNM_NOESCAPE </item>
+      <item> FNM_PATHNAME </item>
+      <item> FNM_PERIOD </item>
+      <item> FORCE_DEFLATE </item>
+      <item> FORCE_GZIP </item>
       <item> FTP_ASCII </item>
-      <item> FTP_TEXT </item>
-      <item> FTP_BINARY </item>
-      <item> FTP_IMAGE </item>
       <item> FTP_AUTORESUME </item>
-      <item> FTP_TIMEOUT_SEC </item>
       <item> FTP_AUTOSEEK </item>
+      <item> FTP_BINARY </item>
       <item> FTP_FAILED </item>
       <item> FTP_FINISHED </item>
+      <item> FTP_IMAGE </item>
       <item> FTP_MOREDATA </item>
-      <item> IMG_GIF </item>
-      <item> IMG_JPG </item>
-      <item> IMG_JPEG </item>
-      <item> IMG_PNG </item>
-      <item> IMG_WBMP </item>
-      <item> IMG_XPM </item>
-      <item> IMG_COLOR_TILED </item>
-      <item> IMG_COLOR_STYLED </item>
+      <item> FTP_TEXT </item>
+      <item> FTP_TIMEOUT_SEC </item>
+      <item> FT_INTERNAL </item>
+      <item> FT_NOT </item>
+      <item> FT_PEEK </item>
+      <item> FT_PREFETCHTEXT </item>
+      <item> FT_UID </item>
+      <item> F_DUPFD </item>
+      <item> F_GETFD </item>
+      <item> F_GETFL </item>
+      <item> F_GETLK </item>
+      <item> F_GETOWN </item>
+      <item> F_RDLCK </item>
+      <item> F_SETFL </item>
+      <item> F_SETLK </item>
+      <item> F_SETLKW </item>
+      <item> F_SETOWN </item>
+      <item> F_UNLCK </item>
+      <item> F_WRLCK </item>
+      <item> GD_BUNDLED </item>
+      <item> GLOB_BRACE </item>
+      <item> GLOB_MARK </item>
+      <item> GLOB_NOCHECK </item>
+      <item> GLOB_NOESCAPE </item>
+      <item> GLOB_NOSORT </item>
+      <item> GLOB_ONLYDIR </item>
+      <item> GMP_ROUND_MINUSINF </item>
+      <item> GMP_ROUND_PLUSINF </item>
+      <item> GMP_ROUND_ZERO </item>
+      <item> HTML_ENTITIES </item>
+      <item> HTML_SPECIALCHARS </item>
+      <item> ICONV_IMPL </item>
+      <item> ICONV_MIME_DECODE_CONTINUE_ON_ERROR </item>
+      <item> ICONV_MIME_DECODE_STRICT </item>
+      <item> ICONV_VERSION </item>
+      <item> IMAGETYPE_BMP </item>
+      <item> IMAGETYPE_GIF </item>
+      <item> IMAGETYPE_IFF </item>
+      <item> IMAGETYPE_JB2 </item>
+      <item> IMAGETYPE_JP2 </item>
+      <item> IMAGETYPE_JPC </item>
+      <item> IMAGETYPE_JPEG </item>
+      <item> IMAGETYPE_JPEG2000 </item>
+      <item> IMAGETYPE_JPX </item>
+      <item> IMAGETYPE_PNG </item>
+      <item> IMAGETYPE_PSD </item>
+      <item> IMAGETYPE_SWF </item>
+      <item> IMAGETYPE_TIFF_II </item>
+      <item> IMAGETYPE_TIFF_MM </item>
+      <item> IMAGETYPE_WBMP </item>
+      <item> IMAGETYPE_XBM </item>
+      <item> IMAP_CLOSETIMEOUT </item>
+      <item> IMAP_OPENTIMEOUT </item>
+      <item> IMAP_READTIMEOUT </item>
+      <item> IMAP_WRITETIMEOUT </item>
+      <item> IMG_ARC_CHORD </item>
+      <item> IMG_ARC_EDGED </item>
+      <item> IMG_ARC_NOFILL </item>
+      <item> IMG_ARC_PIE </item>
+      <item> IMG_ARC_ROUNDED </item>
       <item> IMG_COLOR_BRUSHED </item>
+      <item> IMG_COLOR_STYLED </item>
       <item> IMG_COLOR_STYLEDBRUSHED </item>
+      <item> IMG_COLOR_TILED </item>
       <item> IMG_COLOR_TRANSPARENT </item>
-      <item> IMG_ARC_ROUNDED </item>
-      <item> IMG_ARC_PIE </item>
-      <item> IMG_ARC_CHORD </item>
-      <item> IMG_ARC_NOFILL </item>
-      <item> IMG_ARC_EDGED </item>
-      <item> IMG_GD2_RAW </item>
-      <item> IMG_GD2_COMPRESSED </item>
-      <item> IMG_EFFECT_REPLACE </item>
       <item> IMG_EFFECT_ALPHABLEND </item>
       <item> IMG_EFFECT_NORMAL </item>
       <item> IMG_EFFECT_OVERLAY </item>
-      <item> GD_BUNDLED </item>
-      <item> IMG_FILTER_NEGATE </item>
-      <item> IMG_FILTER_GRAYSCALE </item>
+      <item> IMG_EFFECT_REPLACE </item>
       <item> IMG_FILTER_BRIGHTNESS </item>
-      <item> IMG_FILTER_CONTRAST </item>
       <item> IMG_FILTER_COLORIZE </item>
+      <item> IMG_FILTER_CONTRAST </item>
       <item> IMG_FILTER_EDGEDETECT </item>
-      <item> IMG_FILTER_GAUSSIAN_BLUR </item>
-      <item> IMG_FILTER_SELECTIVE_BLUR </item>
       <item> IMG_FILTER_EMBOSS </item>
+      <item> IMG_FILTER_GAUSSIAN_BLUR </item>
+      <item> IMG_FILTER_GRAYSCALE </item>
       <item> IMG_FILTER_MEAN_REMOVAL </item>
+      <item> IMG_FILTER_NEGATE </item>
+      <item> IMG_FILTER_SELECTIVE_BLUR </item>
       <item> IMG_FILTER_SMOOTH </item>
-      <item> GMP_ROUND_ZERO </item>
-      <item> GMP_ROUND_PLUSINF </item>
-      <item> GMP_ROUND_MINUSINF </item>
-      <item> ICONV_IMPL </item>
-      <item> ICONV_VERSION </item>
-      <item> ICONV_MIME_DECODE_STRICT </item>
-      <item> ICONV_MIME_DECODE_CONTINUE_ON_ERROR </item>
-      <item> NIL </item>
-      <item> IMAP_OPENTIMEOUT </item>
-      <item> IMAP_READTIMEOUT </item>
-      <item> IMAP_WRITETIMEOUT </item>
-      <item> IMAP_CLOSETIMEOUT </item>
-      <item> OP_DEBUG </item>
-      <item> OP_READONLY </item>
-      <item> OP_ANONYMOUS </item>
-      <item> OP_SHORTCACHE </item>
-      <item> OP_SILENT </item>
-      <item> OP_PROTOTYPE </item>
-      <item> OP_HALFOPEN </item>
-      <item> OP_EXPUNGE </item>
-      <item> OP_SECURE </item>
-      <item> CL_EXPUNGE </item>
-      <item> FT_UID </item>
-      <item> FT_PEEK </item>
-      <item> FT_NOT </item>
-      <item> FT_INTERNAL </item>
-      <item> FT_PREFETCHTEXT </item>
-      <item> ST_UID </item>
-      <item> ST_SILENT </item>
-      <item> ST_SET </item>
-      <item> CP_UID </item>
-      <item> CP_MOVE </item>
-      <item> SE_UID </item>
-      <item> SE_FREE </item>
-      <item> SE_NOPREFETCH </item>
-      <item> SO_FREE </item>
-      <item> SO_NOSERVER </item>
-      <item> SA_MESSAGES </item>
-      <item> SA_RECENT </item>
-      <item> SA_UNSEEN </item>
-      <item> SA_UIDNEXT </item>
-      <item> SA_UIDVALIDITY </item>
-      <item> SA_ALL </item>
+      <item> IMG_GD2_COMPRESSED </item>
+      <item> IMG_GD2_RAW </item>
+      <item> IMG_GIF </item>
+      <item> IMG_JPEG </item>
+      <item> IMG_JPG </item>
+      <item> IMG_PNG </item>
+      <item> IMG_WBMP </item>
+      <item> IMG_XPM </item>
+      <item> INF </item>
+      <item> INFO_ALL </item>
+      <item> INFO_CONFIGURATION </item>
+      <item> INFO_CREDITS </item>
+      <item> INFO_ENVIRONMENT </item>
+      <item> INFO_GENERAL </item>
+      <item> INFO_LICENSE </item>
+      <item> INFO_MODULES </item>
+      <item> INFO_VARIABLES </item>
+      <item> INI_ALL </item>
+      <item> INI_PERDIR </item>
+      <item> INI_SYSTEM </item>
+      <item> INI_USER </item>
+      <item> LATT_HASCHILDREN </item>
+      <item> LATT_HASNOCHILDREN </item>
+      <item> LATT_MARKED </item>
       <item> LATT_NOINFERIORS </item>
       <item> LATT_NOSELECT </item>
-      <item> LATT_MARKED </item>
-      <item> LATT_UNMARKED </item>
       <item> LATT_REFERRAL </item>
-      <item> LATT_HASCHILDREN </item>
-      <item> LATT_HASNOCHILDREN </item>
-      <item> SORTDATE </item>
-      <item> SORTARRIVAL </item>
-      <item> SORTFROM </item>
-      <item> SORTSUBJECT </item>
-      <item> SORTTO </item>
-      <item> SORTCC </item>
-      <item> SORTSIZE </item>
-      <item> TYPETEXT </item>
-      <item> TYPEMULTIPART </item>
-      <item> TYPEMESSAGE </item>
-      <item> TYPEAPPLICATION </item>
-      <item> TYPEAUDIO </item>
-      <item> TYPEIMAGE </item>
-      <item> TYPEVIDEO </item>
-      <item> TYPEMODEL </item>
-      <item> TYPEOTHER </item>
-      <item> ENC7BIT </item>
-      <item> ENC8BIT </item>
-      <item> ENCBINARY </item>
-      <item> ENCBASE64 </item>
-      <item> ENCQUOTEDPRINTABLE </item>
-      <item> ENCOTHER </item>
+      <item> LATT_UNMARKED </item>
+      <item> LC_ALL </item>
+      <item> LC_COLLATE </item>
+      <item> LC_CTYPE </item>
+      <item> LC_MESSAGES </item>
+      <item> LC_MONETARY </item>
+      <item> LC_NUMERIC </item>
+      <item> LC_TIME </item>
+      <item> LDAP_DEREF_ALWAYS </item>
+      <item> LDAP_DEREF_FINDING </item>
       <item> LDAP_DEREF_NEVER </item>
       <item> LDAP_DEREF_SEARCHING </item>
-      <item> LDAP_DEREF_FINDING </item>
-      <item> LDAP_DEREF_ALWAYS </item>
+      <item> LDAP_OPT_CLIENT_CONTROLS </item>
+      <item> LDAP_OPT_DEBUG_LEVEL </item>
       <item> LDAP_OPT_DEREF </item>
-      <item> LDAP_OPT_SIZELIMIT </item>
-      <item> LDAP_OPT_TIMELIMIT </item>
-      <item> LDAP_OPT_PROTOCOL_VERSION </item>
       <item> LDAP_OPT_ERROR_NUMBER </item>
-      <item> LDAP_OPT_REFERRALS </item>
-      <item> LDAP_OPT_RESTART </item>
-      <item> LDAP_OPT_HOST_NAME </item>
       <item> LDAP_OPT_ERROR_STRING </item>
+      <item> LDAP_OPT_HOST_NAME </item>
       <item> LDAP_OPT_MATCHED_DN </item>
+      <item> LDAP_OPT_PROTOCOL_VERSION </item>
+      <item> LDAP_OPT_REFERRALS </item>
+      <item> LDAP_OPT_RESTART </item>
       <item> LDAP_OPT_SERVER_CONTROLS </item>
-      <item> LDAP_OPT_CLIENT_CONTROLS </item>
-      <item> LDAP_OPT_DEBUG_LEVEL </item>
-      <item> MB_OVERLOAD_MAIL </item>
-      <item> MB_OVERLOAD_STRING </item>
-      <item> MB_OVERLOAD_REGEX </item>
-      <item> MB_CASE_UPPER </item>
+      <item> LDAP_OPT_SIZELIMIT </item>
+      <item> LDAP_OPT_TIMELIMIT </item>
+      <item> LOCK_EX </item>
+      <item> LOCK_NB </item>
+      <item> LOCK_SH </item>
+      <item> LOCK_UN </item>
+      <item> LOG_ALERT </item>
+      <item> LOG_AUTH </item>
+      <item> LOG_AUTHPRIV </item>
+      <item> LOG_CONS </item>
+      <item> LOG_CRIT </item>
+      <item> LOG_CRON </item>
+      <item> LOG_DAEMON </item>
+      <item> LOG_DEBUG </item>
+      <item> LOG_EMERG </item>
+      <item> LOG_ERR </item>
+      <item> LOG_INFO </item>
+      <item> LOG_KERN </item>
+      <item> LOG_LOCAL0 </item>
+      <item> LOG_LOCAL1 </item>
+      <item> LOG_LOCAL2 </item>
+      <item> LOG_LOCAL3 </item>
+      <item> LOG_LOCAL4 </item>
+      <item> LOG_LOCAL5 </item>
+      <item> LOG_LOCAL6 </item>
+      <item> LOG_LOCAL7 </item>
+      <item> LOG_LPR </item>
+      <item> LOG_MAIL </item>
+      <item> LOG_NDELAY </item>
+      <item> LOG_NEWS </item>
+      <item> LOG_NOTICE </item>
+      <item> LOG_NOWAIT </item>
+      <item> LOG_ODELAY </item>
+      <item> LOG_PERROR </item>
+      <item> LOG_PID </item>
+      <item> LOG_SYSLOG </item>
+      <item> LOG_USER </item>
+      <item> LOG_UUCP </item>
+      <item> LOG_WARNING </item>
       <item> MB_CASE_LOWER </item>
       <item> MB_CASE_TITLE </item>
-      <item> MCRYPT_ENCRYPT </item>
-      <item> MCRYPT_DECRYPT </item>
-      <item> MCRYPT_DEV_RANDOM </item>
-      <item> MCRYPT_DEV_URANDOM </item>
-      <item> MCRYPT_RAND </item>
+      <item> MB_CASE_UPPER </item>
+      <item> MB_OVERLOAD_MAIL </item>
+      <item> MB_OVERLOAD_REGEX </item>
+      <item> MB_OVERLOAD_STRING </item>
       <item> MCRYPT_3DES </item>
-      <item> MCRYPT_ARCFOUR_IV </item>
       <item> MCRYPT_ARCFOUR </item>
+      <item> MCRYPT_ARCFOUR_IV </item>
       <item> MCRYPT_BLOWFISH </item>
       <item> MCRYPT_BLOWFISH_COMPAT </item>
       <item> MCRYPT_CAST_128 </item>
       <item> MCRYPT_CAST_256 </item>
       <item> MCRYPT_CRYPT </item>
+      <item> MCRYPT_DECRYPT </item>
       <item> MCRYPT_DES </item>
+      <item> MCRYPT_DEV_RANDOM </item>
+      <item> MCRYPT_DEV_URANDOM </item>
+      <item> MCRYPT_ENCRYPT </item>
       <item> MCRYPT_ENIGNA </item>
       <item> MCRYPT_GOST </item>
+      <item> MCRYPT_IDEA </item>
       <item> MCRYPT_LOKI97 </item>
+      <item> MCRYPT_MARS </item>
+      <item> MCRYPT_MODE_CBC </item>
+      <item> MCRYPT_MODE_CFB </item>
+      <item> MCRYPT_MODE_ECB </item>
+      <item> MCRYPT_MODE_NOFB </item>
+      <item> MCRYPT_MODE_OFB </item>
+      <item> MCRYPT_MODE_STREAM </item>
       <item> MCRYPT_PANAMA </item>
+      <item> MCRYPT_RAND </item>
       <item> MCRYPT_RC2 </item>
+      <item> MCRYPT_RC6 </item>
       <item> MCRYPT_RIJNDAEL_128 </item>
       <item> MCRYPT_RIJNDAEL_192 </item>
       <item> MCRYPT_RIJNDAEL_256 </item>
-      <item> MCRYPT_SAFER64 </item>
       <item> MCRYPT_SAFER128 </item>
+      <item> MCRYPT_SAFER64 </item>
       <item> MCRYPT_SAFERPLUS </item>
       <item> MCRYPT_SERPENT </item>
+      <item> MCRYPT_SKIPJACK </item>
       <item> MCRYPT_THREEWAY </item>
       <item> MCRYPT_TRIPLEDES </item>
       <item> MCRYPT_TWOFISH </item>
       <item> MCRYPT_WAKE </item>
       <item> MCRYPT_XTEA </item>
-      <item> MCRYPT_IDEA </item>
-      <item> MCRYPT_MARS </item>
-      <item> MCRYPT_RC6 </item>
-      <item> MCRYPT_SKIPJACK </item>
-      <item> MCRYPT_MODE_CBC </item>
-      <item> MCRYPT_MODE_CFB </item>
-      <item> MCRYPT_MODE_ECB </item>
-      <item> MCRYPT_MODE_NOFB </item>
-      <item> MCRYPT_MODE_OFB </item>
-      <item> MCRYPT_MODE_STREAM </item>
+      <item> MHASH_ADLER32 </item>
       <item> MHASH_CRC32 </item>
-      <item> MHASH_MD5 </item>
-      <item> MHASH_SHA1 </item>
-      <item> MHASH_HAVAL256 </item>
-      <item> MHASH_RIPEMD160 </item>
-      <item> MHASH_TIGER </item>
-      <item> MHASH_GOST </item>
       <item> MHASH_CRC32B </item>
-      <item> MHASH_HAVAL224 </item>
-      <item> MHASH_HAVAL192 </item>
-      <item> MHASH_HAVAL160 </item>
+      <item> MHASH_GOST </item>
       <item> MHASH_HAVAL128 </item>
-      <item> MHASH_TIGER128 </item>
-      <item> MHASH_TIGER160 </item>
+      <item> MHASH_HAVAL160 </item>
+      <item> MHASH_HAVAL192 </item>
+      <item> MHASH_HAVAL224 </item>
+      <item> MHASH_HAVAL256 </item>
+      <item> MHASH_MD2 </item>
       <item> MHASH_MD4 </item>
-      <item> MHASH_SHA256 </item>
-      <item> MHASH_ADLER32 </item>
-      <item> MHASH_SHA224 </item>
-      <item> MHASH_SHA512 </item>
-      <item> MHASH_SHA384 </item>
-      <item> MHASH_WHIRLPOOL </item>
+      <item> MHASH_MD5 </item>
       <item> MHASH_RIPEMD128 </item>
+      <item> MHASH_RIPEMD160 </item>
       <item> MHASH_RIPEMD256 </item>
       <item> MHASH_RIPEMD320 </item>
+      <item> MHASH_SHA1 </item>
+      <item> MHASH_SHA224 </item>
+      <item> MHASH_SHA256 </item>
+      <item> MHASH_SHA384 </item>
+      <item> MHASH_SHA512 </item>
       <item> MHASH_SNEFRU128 </item>
       <item> MHASH_SNEFRU256 </item>
-      <item> MHASH_MD2 </item>
-      <item> MYSQL_ASSOC </item>
-      <item> MYSQL_NUM </item>
-      <item> MYSQL_BOTH </item>
-      <item> MYSQL_CLIENT_COMPRESS </item>
-      <item> MYSQL_CLIENT_SSL </item>
-      <item> MYSQL_CLIENT_INTERACTIVE </item>
-      <item> MYSQL_CLIENT_IGNORE_SPACE </item>
-      <item> MYSQLI_READ_DEFAULT_GROUP </item>
-      <item> MYSQLI_READ_DEFAULT_FILE </item>
-      <item> MYSQLI_OPT_CONNECT_TIMEOUT </item>
-      <item> MYSQLI_OPT_LOCAL_INFILE </item>
-      <item> MYSQLI_INIT_COMMAND </item>
-      <item> MYSQLI_CLIENT_SSL </item>
+      <item> MHASH_TIGER </item>
+      <item> MHASH_TIGER128 </item>
+      <item> MHASH_TIGER160 </item>
+      <item> MHASH_WHIRLPOOL </item>
+      <item> MON_1 </item>
+      <item> MON_10 </item>
+      <item> MON_11 </item>
+      <item> MON_12 </item>
+      <item> MON_2 </item>
+      <item> MON_3 </item>
+      <item> MON_4 </item>
+      <item> MON_5 </item>
+      <item> MON_6 </item>
+      <item> MON_7 </item>
+      <item> MON_8 </item>
+      <item> MON_9 </item>
+      <item> MSG_DONTROUTE </item>
+      <item> MSG_EXCEPT </item>
+      <item> MSG_IPC_NOWAIT </item>
+      <item> MSG_NOERROR </item>
+      <item> MSG_OOB </item>
+      <item> MSG_PEEK </item>
+      <item> MSG_WAITALL </item>
+      <item> MYSQLI_ASSOC </item>
+      <item> MYSQLI_AUTO_INCREMENT_FLAG </item>
+      <item> MYSQLI_BLOB_FLAG </item>
+      <item> MYSQLI_BOTH </item>
       <item> MYSQLI_CLIENT_COMPRESS </item>
-      <item> MYSQLI_CLIENT_INTERACTIVE </item>
+      <item> MYSQLI_CLIENT_FOUND_ROWS </item>
       <item> MYSQLI_CLIENT_IGNORE_SPACE </item>
+      <item> MYSQLI_CLIENT_INTERACTIVE </item>
       <item> MYSQLI_CLIENT_NO_SCHEMA </item>
-      <item> MYSQLI_CLIENT_FOUND_ROWS </item>
-      <item> MYSQLI_STORE_RESULT </item>
-      <item> MYSQLI_USE_RESULT </item>
-      <item> MYSQLI_ASSOC </item>
-      <item> MYSQLI_NUM </item>
-      <item> MYSQLI_BOTH </item>
-      <item> MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH </item>
-      <item> MYSQLI_NOT_NULL_FLAG </item>
-      <item> MYSQLI_PRI_KEY_FLAG </item>
-      <item> MYSQLI_UNIQUE_KEY_FLAG </item>
+      <item> MYSQLI_CLIENT_SSL </item>
+      <item> MYSQLI_GROUP_FLAG </item>
+      <item> MYSQLI_INIT_COMMAND </item>
       <item> MYSQLI_MULTIPLE_KEY_FLAG </item>
-      <item> MYSQLI_BLOB_FLAG </item>
-      <item> MYSQLI_UNSIGNED_FLAG </item>
-      <item> MYSQLI_ZEROFILL_FLAG </item>
-      <item> MYSQLI_AUTO_INCREMENT_FLAG </item>
-      <item> MYSQLI_TIMESTAMP_FLAG </item>
-      <item> MYSQLI_SET_FLAG </item>
+      <item> MYSQLI_NOT_NULL_FLAG </item>
+      <item> MYSQLI_NO_DATA </item>
+      <item> MYSQLI_NUM </item>
       <item> MYSQLI_NUM_FLAG </item>
+      <item> MYSQLI_OPT_CONNECT_TIMEOUT </item>
+      <item> MYSQLI_OPT_LOCAL_INFILE </item>
       <item> MYSQLI_PART_KEY_FLAG </item>
-      <item> MYSQLI_GROUP_FLAG </item>
+      <item> MYSQLI_PRI_KEY_FLAG </item>
+      <item> MYSQLI_READ_DEFAULT_FILE </item>
+      <item> MYSQLI_READ_DEFAULT_GROUP </item>
+      <item> MYSQLI_REPORT_ALL </item>
+      <item> MYSQLI_REPORT_ERROR </item>
+      <item> MYSQLI_REPORT_INDEX </item>
+      <item> MYSQLI_REPORT_OFF </item>
+      <item> MYSQLI_RPL_ADMIN </item>
+      <item> MYSQLI_RPL_MASTER </item>
+      <item> MYSQLI_RPL_SLAVE </item>
+      <item> MYSQLI_SET_FLAG </item>
+      <item> MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH </item>
+      <item> MYSQLI_STORE_RESULT </item>
+      <item> MYSQLI_TIMESTAMP_FLAG </item>
+      <item> MYSQLI_TYPE_BLOB </item>
+      <item> MYSQLI_TYPE_CHAR </item>
+      <item> MYSQLI_TYPE_DATE </item>
+      <item> MYSQLI_TYPE_DATETIME </item>
       <item> MYSQLI_TYPE_DECIMAL </item>
-      <item> MYSQLI_TYPE_TINY </item>
-      <item> MYSQLI_TYPE_SHORT </item>
-      <item> MYSQLI_TYPE_LONG </item>
-      <item> MYSQLI_TYPE_FLOAT </item>
       <item> MYSQLI_TYPE_DOUBLE </item>
-      <item> MYSQLI_TYPE_NULL </item>
-      <item> MYSQLI_TYPE_TIMESTAMP </item>
-      <item> MYSQLI_TYPE_LONGLONG </item>
+      <item> MYSQLI_TYPE_ENUM </item>
+      <item> MYSQLI_TYPE_FLOAT </item>
+      <item> MYSQLI_TYPE_GEOMETRY </item>
       <item> MYSQLI_TYPE_INT24 </item>
-      <item> MYSQLI_TYPE_DATE </item>
-      <item> MYSQLI_TYPE_TIME </item>
-      <item> MYSQLI_TYPE_DATETIME </item>
-      <item> MYSQLI_TYPE_YEAR </item>
+      <item> MYSQLI_TYPE_INTERVAL </item>
+      <item> MYSQLI_TYPE_LONG </item>
+      <item> MYSQLI_TYPE_LONGLONG </item>
+      <item> MYSQLI_TYPE_LONG_BLOB </item>
+      <item> MYSQLI_TYPE_MEDIUM_BLOB </item>
       <item> MYSQLI_TYPE_NEWDATE </item>
-      <item> MYSQLI_TYPE_ENUM </item>
+      <item> MYSQLI_TYPE_NULL </item>
       <item> MYSQLI_TYPE_SET </item>
+      <item> MYSQLI_TYPE_SHORT </item>
+      <item> MYSQLI_TYPE_STRING </item>
+      <item> MYSQLI_TYPE_TIME </item>
+      <item> MYSQLI_TYPE_TIMESTAMP </item>
+      <item> MYSQLI_TYPE_TINY </item>
       <item> MYSQLI_TYPE_TINY_BLOB </item>
-      <item> MYSQLI_TYPE_MEDIUM_BLOB </item>
-      <item> MYSQLI_TYPE_LONG_BLOB </item>
-      <item> MYSQLI_TYPE_BLOB </item>
       <item> MYSQLI_TYPE_VAR_STRING </item>
-      <item> MYSQLI_TYPE_STRING </item>
-      <item> MYSQLI_TYPE_CHAR </item>
-      <item> MYSQLI_TYPE_INTERVAL </item>
-      <item> MYSQLI_TYPE_GEOMETRY </item>
-      <item> MYSQLI_RPL_MASTER </item>
-      <item> MYSQLI_RPL_SLAVE </item>
-      <item> MYSQLI_RPL_ADMIN </item>
-      <item> MYSQLI_NO_DATA </item>
-      <item> MYSQLI_REPORT_INDEX </item>
-      <item> MYSQLI_REPORT_ERROR </item>
-      <item> MYSQLI_REPORT_ALL </item>
-      <item> MYSQLI_REPORT_OFF </item>
+      <item> MYSQLI_TYPE_YEAR </item>
+      <item> MYSQLI_UNIQUE_KEY_FLAG </item>
+      <item> MYSQLI_UNSIGNED_FLAG </item>
+      <item> MYSQLI_USE_RESULT </item>
+      <item> MYSQLI_ZEROFILL_FLAG </item>
+      <item> MYSQL_ASSOC </item>
+      <item> MYSQL_BOTH </item>
+      <item> MYSQL_CLIENT_COMPRESS </item>
+      <item> MYSQL_CLIENT_IGNORE_SPACE </item>
+      <item> MYSQL_CLIENT_INTERACTIVE </item>
+      <item> MYSQL_CLIENT_SSL </item>
+      <item> MYSQL_NUM </item>
+      <item> M_1_PI </item>
+      <item> M_2_PI </item>
+      <item> M_2_SQRTPI </item>
+      <item> M_ABSTRACT </item>
+      <item> M_E </item>
+      <item> M_FINAL </item>
+      <item> M_LN10 </item>
+      <item> M_LN2 </item>
+      <item> M_LOG10E </item>
+      <item> M_LOG2E </item>
+      <item> M_PI </item>
+      <item> M_PI_2 </item>
+      <item> M_PI_4 </item>
+      <item> M_PRIVATE </item>
+      <item> M_PROTECTED </item>
+      <item> M_PUBLIC </item>
+      <item> M_SQRT1_2 </item>
+      <item> M_SQRT2 </item>
+      <item> M_STATIC </item>
+      <item> NAN </item>
+      <item> NCURSES_ALL_MOUSE_EVENTS </item>
+      <item> NCURSES_A_ALTCHARSET </item>
+      <item> NCURSES_A_BLINK </item>
+      <item> NCURSES_A_BOLD </item>
+      <item> NCURSES_A_CHARTEXT </item>
+      <item> NCURSES_A_DIM </item>
+      <item> NCURSES_A_INVIS </item>
+      <item> NCURSES_A_NORMAL </item>
+      <item> NCURSES_A_PROTECT </item>
+      <item> NCURSES_A_REVERSE </item>
+      <item> NCURSES_A_STANDOUT </item>
+      <item> NCURSES_A_UNDERLINE </item>
+      <item> NCURSES_BUTTON1_CLICKED </item>
+      <item> NCURSES_BUTTON1_DOUBLE_CLICKED </item>
+      <item> NCURSES_BUTTON1_PRESSED </item>
+      <item> NCURSES_BUTTON1_RELEASED </item>
+      <item> NCURSES_BUTTON1_TRIPLE_CLICKED </item>
+      <item> NCURSES_BUTTON2_CLICKED </item>
+      <item> NCURSES_BUTTON2_DOUBLE_CLICKED </item>
+      <item> NCURSES_BUTTON2_PRESSED </item>
+      <item> NCURSES_BUTTON2_RELEASED </item>
+      <item> NCURSES_BUTTON2_TRIPLE_CLICKED </item>
+      <item> NCURSES_BUTTON3_CLICKED </item>
+      <item> NCURSES_BUTTON3_DOUBLE_CLICKED </item>
+      <item> NCURSES_BUTTON3_PRESSED </item>
+      <item> NCURSES_BUTTON3_RELEASED </item>
+      <item> NCURSES_BUTTON3_TRIPLE_CLICKED </item>
+      <item> NCURSES_BUTTON4_CLICKED </item>
+      <item> NCURSES_BUTTON4_DOUBLE_CLICKED </item>
+      <item> NCURSES_BUTTON4_PRESSED </item>
+      <item> NCURSES_BUTTON4_RELEASED </item>
+      <item> NCURSES_BUTTON4_TRIPLE_CLICKED </item>
+      <item> NCURSES_BUTTON_ALT </item>
+      <item> NCURSES_BUTTON_CTRL </item>
+      <item> NCURSES_BUTTON_SHIFT </item>
       <item> NCURSES_COLOR_BLACK </item>
-      <item> NCURSES_COLOR_RED </item>
-      <item> NCURSES_COLOR_GREEN </item>
-      <item> NCURSES_COLOR_YELLOW </item>
       <item> NCURSES_COLOR_BLUE </item>
-      <item> NCURSES_COLOR_MAGENTA </item>
       <item> NCURSES_COLOR_CYAN </item>
+      <item> NCURSES_COLOR_GREEN </item>
+      <item> NCURSES_COLOR_MAGENTA </item>
+      <item> NCURSES_COLOR_RED </item>
       <item> NCURSES_COLOR_WHITE </item>
-      <item> NCURSES_KEY_DOWN </item>
-      <item> NCURSES_KEY_UP </item>
-      <item> NCURSES_KEY_LEFT </item>
-      <item> NCURSES_KEY_RIGHT </item>
-      <item> NCURSES_KEY_BACKSPACE </item>
-      <item> NCURSES_KEY_MOUSE </item>
-      <item> NCURSES_KEY_F0 </item>
-      <item> NCURSES_KEY_F1 </item>
-      <item> NCURSES_KEY_F2 </item>
-      <item> NCURSES_KEY_F3 </item>
-      <item> NCURSES_KEY_F4 </item>
-      <item> NCURSES_KEY_F5 </item>
-      <item> NCURSES_KEY_F6 </item>
-      <item> NCURSES_KEY_F7 </item>
-      <item> NCURSES_KEY_F8 </item>
-      <item> NCURSES_KEY_F9 </item>
-      <item> NCURSES_KEY_F10 </item>
-      <item> NCURSES_KEY_F11 </item>
-      <item> NCURSES_KEY_F12 </item>
-      <item> NCURSES_KEY_DL </item>
-      <item> NCURSES_KEY_IL </item>
-      <item> NCURSES_KEY_DC </item>
-      <item> NCURSES_KEY_IC </item>
-      <item> NCURSES_KEY_EIC </item>
-      <item> NCURSES_KEY_CLEAR </item>
-      <item> NCURSES_KEY_EOS </item>
-      <item> NCURSES_KEY_EOL </item>
-      <item> NCURSES_KEY_SF </item>
-      <item> NCURSES_KEY_SR </item>
-      <item> NCURSES_KEY_NPAGE </item>
-      <item> NCURSES_KEY_PPAGE </item>
-      <item> NCURSES_KEY_STAB </item>
-      <item> NCURSES_KEY_CTAB </item>
-      <item> NCURSES_KEY_CATAB </item>
-      <item> NCURSES_KEY_ENTER </item>
-      <item> NCURSES_KEY_SRESET </item>
-      <item> NCURSES_KEY_RESET </item>
-      <item> NCURSES_KEY_PRINT </item>
-      <item> NCURSES_KEY_LL </item>
+      <item> NCURSES_COLOR_YELLOW </item>
       <item> NCURSES_KEY_A1 </item>
       <item> NCURSES_KEY_A3 </item>
       <item> NCURSES_KEY_B2 </item>
+      <item> NCURSES_KEY_BACKSPACE </item>
+      <item> NCURSES_KEY_BEG </item>
+      <item> NCURSES_KEY_BTAB </item>
       <item> NCURSES_KEY_C1 </item>
       <item> NCURSES_KEY_C3 </item>
-      <item> NCURSES_KEY_BTAB </item>
-      <item> NCURSES_KEY_BEG </item>
       <item> NCURSES_KEY_CANCEL </item>
+      <item> NCURSES_KEY_CATAB </item>
+      <item> NCURSES_KEY_CLEAR </item>
       <item> NCURSES_KEY_CLOSE </item>
       <item> NCURSES_KEY_COMMAND </item>
       <item> NCURSES_KEY_COPY </item>
       <item> NCURSES_KEY_CREATE </item>
+      <item> NCURSES_KEY_CTAB </item>
+      <item> NCURSES_KEY_DC </item>
+      <item> NCURSES_KEY_DL </item>
+      <item> NCURSES_KEY_DOWN </item>
+      <item> NCURSES_KEY_EIC </item>
       <item> NCURSES_KEY_END </item>
+      <item> NCURSES_KEY_ENTER </item>
+      <item> NCURSES_KEY_EOL </item>
+      <item> NCURSES_KEY_EOS </item>
       <item> NCURSES_KEY_EXIT </item>
+      <item> NCURSES_KEY_F0 </item>
+      <item> NCURSES_KEY_F1 </item>
+      <item> NCURSES_KEY_F10 </item>
+      <item> NCURSES_KEY_F11 </item>
+      <item> NCURSES_KEY_F12 </item>
+      <item> NCURSES_KEY_F2 </item>
+      <item> NCURSES_KEY_F3 </item>
+      <item> NCURSES_KEY_F4 </item>
+      <item> NCURSES_KEY_F5 </item>
+      <item> NCURSES_KEY_F6 </item>
+      <item> NCURSES_KEY_F7 </item>
+      <item> NCURSES_KEY_F8 </item>
+      <item> NCURSES_KEY_F9 </item>
       <item> NCURSES_KEY_FIND </item>
       <item> NCURSES_KEY_HELP </item>
+      <item> NCURSES_KEY_IC </item>
+      <item> NCURSES_KEY_IL </item>
+      <item> NCURSES_KEY_LEFT </item>
+      <item> NCURSES_KEY_LL </item>
       <item> NCURSES_KEY_MARK </item>
       <item> NCURSES_KEY_MESSAGE </item>
+      <item> NCURSES_KEY_MOUSE </item>
       <item> NCURSES_KEY_MOVE </item>
       <item> NCURSES_KEY_NEXT </item>
+      <item> NCURSES_KEY_NPAGE </item>
       <item> NCURSES_KEY_OPEN </item>
       <item> NCURSES_KEY_OPTIONS </item>
+      <item> NCURSES_KEY_PPAGE </item>
       <item> NCURSES_KEY_PREVIOUS </item>
+      <item> NCURSES_KEY_PRINT </item>
       <item> NCURSES_KEY_REDO </item>
       <item> NCURSES_KEY_REFERENCE </item>
       <item> NCURSES_KEY_REFRESH </item>
       <item> NCURSES_KEY_REPLACE </item>
+      <item> NCURSES_KEY_RESET </item>
+      <item> NCURSES_KEY_RESIZE </item>
       <item> NCURSES_KEY_RESTART </item>
       <item> NCURSES_KEY_RESUME </item>
+      <item> NCURSES_KEY_RIGHT </item>
       <item> NCURSES_KEY_SAVE </item>
       <item> NCURSES_KEY_SBEG </item>
       <item> NCURSES_KEY_SCANCEL </item>
@@ -1162,6 +1008,7 @@ Changes:
       <item> NCURSES_KEY_SEND </item>
       <item> NCURSES_KEY_SEOL </item>
       <item> NCURSES_KEY_SEXIT </item>
+      <item> NCURSES_KEY_SF </item>
       <item> NCURSES_KEY_SFIND </item>
       <item> NCURSES_KEY_SHELP </item>
       <item> NCURSES_KEY_SHOME </item>
@@ -1173,2214 +1020,743 @@ Changes:
       <item> NCURSES_KEY_SOPTIONS </item>
       <item> NCURSES_KEY_SPREVIOUS </item>
       <item> NCURSES_KEY_SPRINT </item>
+      <item> NCURSES_KEY_SR </item>
       <item> NCURSES_KEY_SREDO </item>
       <item> NCURSES_KEY_SREPLACE </item>
+      <item> NCURSES_KEY_SRESET </item>
       <item> NCURSES_KEY_SRIGHT </item>
       <item> NCURSES_KEY_SRSUME </item>
       <item> NCURSES_KEY_SSAVE </item>
       <item> NCURSES_KEY_SSUSPEND </item>
+      <item> NCURSES_KEY_STAB </item>
       <item> NCURSES_KEY_SUNDO </item>
       <item> NCURSES_KEY_SUSPEND </item>
       <item> NCURSES_KEY_UNDO </item>
-      <item> NCURSES_KEY_RESIZE </item>
-      <item> NCURSES_A_NORMAL </item>
-      <item> NCURSES_A_STANDOUT </item>
-      <item> NCURSES_A_UNDERLINE </item>
-      <item> NCURSES_A_REVERSE </item>
-      <item> NCURSES_A_BLINK </item>
-      <item> NCURSES_A_DIM </item>
-      <item> NCURSES_A_BOLD </item>
-      <item> NCURSES_A_PROTECT </item>
-      <item> NCURSES_A_INVIS </item>
-      <item> NCURSES_A_ALTCHARSET </item>
-      <item> NCURSES_A_CHARTEXT </item>
-      <item> NCURSES_BUTTON1_PRESSED </item>
-      <item> NCURSES_BUTTON1_RELEASED </item>
-      <item> NCURSES_BUTTON1_CLICKED </item>
-      <item> NCURSES_BUTTON1_DOUBLE_CLICKED </item>
-      <item> NCURSES_BUTTON1_TRIPLE_CLICKED </item>
-      <item> NCURSES_BUTTON2_PRESSED </item>
-      <item> NCURSES_BUTTON2_RELEASED </item>
-      <item> NCURSES_BUTTON2_CLICKED </item>
-      <item> NCURSES_BUTTON2_DOUBLE_CLICKED </item>
-      <item> NCURSES_BUTTON2_TRIPLE_CLICKED </item>
-      <item> NCURSES_BUTTON3_PRESSED </item>
-      <item> NCURSES_BUTTON3_RELEASED </item>
-      <item> NCURSES_BUTTON3_CLICKED </item>
-      <item> NCURSES_BUTTON3_DOUBLE_CLICKED </item>
-      <item> NCURSES_BUTTON3_TRIPLE_CLICKED </item>
-      <item> NCURSES_BUTTON4_PRESSED </item>
-      <item> NCURSES_BUTTON4_RELEASED </item>
-      <item> NCURSES_BUTTON4_CLICKED </item>
-      <item> NCURSES_BUTTON4_DOUBLE_CLICKED </item>
-      <item> NCURSES_BUTTON4_TRIPLE_CLICKED </item>
-      <item> NCURSES_BUTTON_SHIFT </item>
-      <item> NCURSES_BUTTON_CTRL </item>
-      <item> NCURSES_BUTTON_ALT </item>
-      <item> NCURSES_ALL_MOUSE_EVENTS </item>
+      <item> NCURSES_KEY_UP </item>
       <item> NCURSES_REPORT_MOUSE_POSITION </item>
-      <item> ODBC_TYPE </item>
+      <item> NIL </item>
+      <item> NOEXPR </item>
+      <item> NULL </item>
+      <item> ODBC_BINMODE_CONVERT </item>
       <item> ODBC_BINMODE_PASSTHRU </item>
       <item> ODBC_BINMODE_RETURN </item>
-      <item> ODBC_BINMODE_CONVERT </item>
-      <item> SQL_ODBC_CURSORS </item>
-      <item> SQL_CUR_USE_DRIVER </item>
-      <item> SQL_CUR_USE_IF_NEEDED </item>
-      <item> SQL_CUR_USE_ODBC </item>
-      <item> SQL_CONCURRENCY </item>
-      <item> SQL_CONCUR_READ_ONLY </item>
-      <item> SQL_CONCUR_LOCK </item>
-      <item> SQL_CONCUR_ROWVER </item>
-      <item> SQL_CONCUR_VALUES </item>
-      <item> SQL_CURSOR_TYPE </item>
-      <item> SQL_CURSOR_FORWARD_ONLY </item>
-      <item> SQL_CURSOR_KEYSET_DRIVEN </item>
-      <item> SQL_CURSOR_DYNAMIC </item>
-      <item> SQL_CURSOR_STATIC </item>
-      <item> SQL_KEYSET_SIZE </item>
-      <item> SQL_FETCH_FIRST </item>
-      <item> SQL_FETCH_NEXT </item>
-      <item> SQL_CHAR </item>
-      <item> SQL_VARCHAR </item>
-      <item> SQL_LONGVARCHAR </item>
-      <item> SQL_DECIMAL </item>
-      <item> SQL_NUMERIC </item>
-      <item> SQL_BIT </item>
-      <item> SQL_TINYINT </item>
-      <item> SQL_SMALLINT </item>
-      <item> SQL_INTEGER </item>
-      <item> SQL_BIGINT </item>
-      <item> SQL_REAL </item>
-      <item> SQL_FLOAT </item>
-      <item> SQL_DOUBLE </item>
-      <item> SQL_BINARY </item>
-      <item> SQL_VARBINARY </item>
-      <item> SQL_LONGVARBINARY </item>
-      <item> SQL_DATE </item>
-      <item> SQL_TIME </item>
-      <item> SQL_TIMESTAMP </item>
-      <item> X509_PURPOSE_SSL_CLIENT </item>
-      <item> X509_PURPOSE_SSL_SERVER </item>
-      <item> X509_PURPOSE_NS_SSL_SERVER </item>
-      <item> X509_PURPOSE_SMIME_SIGN </item>
-      <item> X509_PURPOSE_SMIME_ENCRYPT </item>
-      <item> X509_PURPOSE_CRL_SIGN </item>
-      <item> X509_PURPOSE_ANY </item>
-      <item> OPENSSL_ALGO_SHA1 </item>
-      <item> OPENSSL_ALGO_MD5 </item>
-      <item> OPENSSL_ALGO_MD4 </item>
+      <item> ODBC_TYPE </item>
       <item> OPENSSL_ALGO_MD2 </item>
-      <item> PKCS7_DETACHED </item>
-      <item> PKCS7_TEXT </item>
-      <item> PKCS7_NOINTERN </item>
-      <item> PKCS7_NOVERIFY </item>
-      <item> PKCS7_NOCHAIN </item>
-      <item> PKCS7_NOCERTS </item>
-      <item> PKCS7_NOATTR </item>
-      <item> PKCS7_BINARY </item>
-      <item> PKCS7_NOSIGS </item>
-      <item> OPENSSL_PKCS1_PADDING </item>
-      <item> OPENSSL_SSLV23_PADDING </item>
-      <item> OPENSSL_NO_PADDING </item>
-      <item> OPENSSL_PKCS1_OAEP_PADDING </item>
-      <item> OPENSSL_CIPHER_RC2_40 </item>
+      <item> OPENSSL_ALGO_MD4 </item>
+      <item> OPENSSL_ALGO_MD5 </item>
+      <item> OPENSSL_ALGO_SHA1 </item>
+      <item> OPENSSL_CIPHER_3DES </item>
+      <item> OPENSSL_CIPHER_DES </item>
       <item> OPENSSL_CIPHER_RC2_128 </item>
+      <item> OPENSSL_CIPHER_RC2_40 </item>
       <item> OPENSSL_CIPHER_RC2_64 </item>
-      <item> OPENSSL_CIPHER_DES </item>
-      <item> OPENSSL_CIPHER_3DES </item>
-      <item> OPENSSL_KEYTYPE_RSA </item>
-      <item> OPENSSL_KEYTYPE_DSA </item>
       <item> OPENSSL_KEYTYPE_DH </item>
-      <item> WNOHANG </item>
-      <item> WUNTRACED </item>
-      <item> SIG_IGN </item>
-      <item> SIG_DFL </item>
-      <item> SIG_ERR </item>
-      <item> SIGHUP </item>
-      <item> SIGINT </item>
-      <item> SIGQUIT </item>
-      <item> SIGILL </item>
-      <item> SIGTRAP </item>
+      <item> OPENSSL_KEYTYPE_DSA </item>
+      <item> OPENSSL_KEYTYPE_RSA </item>
+      <item> OPENSSL_NO_PADDING </item>
+      <item> OPENSSL_PKCS1_OAEP_PADDING </item>
+      <item> OPENSSL_PKCS1_PADDING </item>
+      <item> OPENSSL_SSLV23_PADDING </item>
+      <item> OP_ANONYMOUS </item>
+      <item> OP_DEBUG </item>
+      <item> OP_EXPUNGE </item>
+      <item> OP_HALFOPEN </item>
+      <item> OP_PROTOTYPE </item>
+      <item> OP_READONLY </item>
+      <item> OP_SECURE </item>
+      <item> OP_SHORTCACHE </item>
+      <item> OP_SILENT </item>
+      <item> O_APPEND </item>
+      <item> O_ASYNC </item>
+      <item> O_CREAT </item>
+      <item> O_EXCL </item>
+      <item> O_NDELAY </item>
+      <item> O_NOCTTY </item>
+      <item> O_NONBLOCK </item>
+      <item> O_RDONLY </item>
+      <item> O_RDWR </item>
+      <item> O_SYNC </item>
+      <item> O_TRUNC </item>
+      <item> O_WRONLY </item>
+      <item> PATHINFO_BASENAME </item>
+      <item> PATHINFO_DIRNAME </item>
+      <item> PATHINFO_EXTENSION </item>
+      <item> PATH_SEPARATOR </item>
+      <item> PEAR_EXTENSION_DIR </item>
+      <item> PEAR_INSTALL_DIR </item>
+      <item> PGSQL_ASSOC </item>
+      <item> PGSQL_BAD_RESPONSE </item>
+      <item> PGSQL_BOTH </item>
+      <item> PGSQL_COMMAND_OK </item>
+      <item> PGSQL_CONNECTION_BAD </item>
+      <item> PGSQL_CONNECTION_OK </item>
+      <item> PGSQL_CONNECT_FORCE_NEW </item>
+      <item> PGSQL_CONV_FORCE_NULL </item>
+      <item> PGSQL_CONV_IGNORE_DEFAULT </item>
+      <item> PGSQL_CONV_IGNORE_NOT_NULL </item>
+      <item> PGSQL_COPY_IN </item>
+      <item> PGSQL_COPY_OUT </item>
+      <item> PGSQL_DML_ASYNC </item>
+      <item> PGSQL_DML_EXEC </item>
+      <item> PGSQL_DML_NO_CONV </item>
+      <item> PGSQL_DML_STRING </item>
+      <item> PGSQL_EMPTY_QUERY </item>
+      <item> PGSQL_FATAL_ERROR </item>
+      <item> PGSQL_NONFATAL_ERROR </item>
+      <item> PGSQL_NUM </item>
+      <item> PGSQL_SEEK_CUR </item>
+      <item> PGSQL_SEEK_END </item>
+      <item> PGSQL_SEEK_SET </item>
+      <item> PGSQL_STATUS_LONG </item>
+      <item> PGSQL_STATUS_STRING </item>
+      <item> PGSQL_TUPLES_OK </item>
+      <item> PHP_BINARY_READ </item>
+      <item> PHP_BINDIR </item>
+      <item> PHP_CONFIG_FILE_PATH </item>
+      <item> PHP_CONFIG_FILE_SCAN_DIR </item>
+      <item> PHP_DATADIR </item>
+      <item> PHP_EOL </item>
+      <item> PHP_EXTENSION_DIR </item>
+      <item> PHP_LIBDIR </item>
+      <item> PHP_LOCALSTATEDIR </item>
+      <item> PHP_NORMAL_READ </item>
+      <item> PHP_OS </item>
+      <item> PHP_OUTPUT_HANDLER_CONT </item>
+      <item> PHP_OUTPUT_HANDLER_END </item>
+      <item> PHP_OUTPUT_HANDLER_START </item>
+      <item> PHP_PREFIX </item>
+      <item> PHP_SAPI </item>
+      <item> PHP_SHLIB_SUFFIX </item>
+      <item> PHP_SYSCONFDIR </item>
+      <item> PHP_VERSION </item>
+      <item> PKCS7_BINARY </item>
+      <item> PKCS7_DETACHED </item>
+      <item> PKCS7_NOATTR </item>
+      <item> PKCS7_NOCERTS </item>
+      <item> PKCS7_NOCHAIN </item>
+      <item> PKCS7_NOINTERN </item>
+      <item> PKCS7_NOSIGS </item>
+      <item> PKCS7_NOVERIFY </item>
+      <item> PKCS7_TEXT </item>
+      <item> PM_STR </item>
+      <item> PREG_GREP_INVERT </item>
+      <item> PREG_OFFSET_CAPTURE </item>
+      <item> PREG_PATTERN_ORDER </item>
+      <item> PREG_SET_ORDER </item>
+      <item> PREG_SPLIT_DELIM_CAPTURE </item>
+      <item> PREG_SPLIT_NO_EMPTY </item>
+      <item> PREG_SPLIT_OFFSET_CAPTURE </item>
+      <item> PRIO_PGRP </item>
+      <item> PRIO_PROCESS </item>
+      <item> PRIO_USER </item>
+      <item> PSFS_ERR_FATAL </item>
+      <item> PSFS_FEED_ME </item>
+      <item> PSFS_FLAG_FLUSH_CLOSE </item>
+      <item> PSFS_FLAG_FLUSH_INC </item>
+      <item> PSFS_FLAG_NORMAL </item>
+      <item> PSFS_PASS_ON </item>
+      <item> P_PRIVATE </item>
+      <item> P_PROTECTED </item>
+      <item> P_PUBLIC </item>
+      <item> P_STATIC </item>
+      <item> RADIXCHAR </item>
+      <item> RIT_CHILD_FIRST </item>
+      <item> RIT_LEAVES_ONLY </item>
+      <item> RIT_SELF_FIRST </item>
+      <item> SA_ALL </item>
+      <item> SA_MESSAGES </item>
+      <item> SA_RECENT </item>
+      <item> SA_UIDNEXT </item>
+      <item> SA_UIDVALIDITY </item>
+      <item> SA_UNSEEN </item>
+      <item> SEEK_CUR </item>
+      <item> SEEK_END </item>
+      <item> SEEK_SET </item>
+      <item> SE_FREE </item>
+      <item> SE_NOPREFETCH </item>
+      <item> SE_UID </item>
       <item> SIGABRT </item>
-      <item> SIGIOT </item>
+      <item> SIGALRM </item>
+      <item> SIGBABY </item>
       <item> SIGBUS </item>
+      <item> SIGCHLD </item>
+      <item> SIGCLD </item>
+      <item> SIGCONT </item>
       <item> SIGFPE </item>
+      <item> SIGHUP </item>
+      <item> SIGILL </item>
+      <item> SIGINT </item>
+      <item> SIGIO </item>
+      <item> SIGIOT </item>
       <item> SIGKILL </item>
-      <item> SIGUSR1 </item>
-      <item> SIGSEGV </item>
-      <item> SIGUSR2 </item>
       <item> SIGPIPE </item>
-      <item> SIGALRM </item>
-      <item> SIGTERM </item>
+      <item> SIGPOLL </item>
+      <item> SIGPROF </item>
+      <item> SIGPWR </item>
+      <item> SIGQUIT </item>
+      <item> SIGSEGV </item>
       <item> SIGSTKFLT </item>
-      <item> SIGCLD </item>
-      <item> SIGCHLD </item>
-      <item> SIGCONT </item>
       <item> SIGSTOP </item>
+      <item> SIGSYS </item>
+      <item> SIGTERM </item>
+      <item> SIGTRAP </item>
       <item> SIGTSTP </item>
       <item> SIGTTIN </item>
       <item> SIGTTOU </item>
       <item> SIGURG </item>
-      <item> SIGXCPU </item>
-      <item> SIGXFSZ </item>
+      <item> SIGUSR1 </item>
+      <item> SIGUSR2 </item>
       <item> SIGVTALRM </item>
-      <item> SIGPROF </item>
       <item> SIGWINCH </item>
-      <item> SIGPOLL </item>
-      <item> SIGIO </item>
-      <item> SIGPWR </item>
-      <item> SIGSYS </item>
-      <item> SIGBABY </item>
-      <item> PRIO_PGRP </item>
-      <item> PRIO_USER </item>
-      <item> PRIO_PROCESS </item>
-      <item> PGSQL_CONNECT_FORCE_NEW </item>
-      <item> PGSQL_ASSOC </item>
-      <item> PGSQL_NUM </item>
-      <item> PGSQL_BOTH </item>
-      <item> PGSQL_CONNECTION_BAD </item>
-      <item> PGSQL_CONNECTION_OK </item>
-      <item> PGSQL_SEEK_SET </item>
-      <item> PGSQL_SEEK_CUR </item>
-      <item> PGSQL_SEEK_END </item>
-      <item> PGSQL_STATUS_LONG </item>
-      <item> PGSQL_STATUS_STRING </item>
-      <item> PGSQL_EMPTY_QUERY </item>
-      <item> PGSQL_COMMAND_OK </item>
-      <item> PGSQL_TUPLES_OK </item>
-      <item> PGSQL_COPY_OUT </item>
-      <item> PGSQL_COPY_IN </item>
-      <item> PGSQL_BAD_RESPONSE </item>
-      <item> PGSQL_NONFATAL_ERROR </item>
-      <item> PGSQL_FATAL_ERROR </item>
-      <item> PGSQL_CONV_IGNORE_DEFAULT </item>
-      <item> PGSQL_CONV_FORCE_NULL </item>
-      <item> PGSQL_CONV_IGNORE_NOT_NULL </item>
-      <item> PGSQL_DML_NO_CONV </item>
-      <item> PGSQL_DML_EXEC </item>
-      <item> PGSQL_DML_ASYNC </item>
-      <item> PGSQL_DML_STRING </item>
-      <item> SNMP_VALUE_LIBRARY </item>
-      <item> SNMP_VALUE_PLAIN </item>
-      <item> SNMP_VALUE_OBJECT </item>
+      <item> SIGXCPU </item>
+      <item> SIGXFSZ </item>
+      <item> SIG_DFL </item>
+      <item> SIG_ERR </item>
+      <item> SIG_IGN </item>
       <item> SNMP_BIT_STR </item>
-      <item> SNMP_OCTET_STR </item>
-      <item> SNMP_OPAQUE </item>
+      <item> SNMP_COUNTER </item>
+      <item> SNMP_COUNTER64 </item>
+      <item> SNMP_INTEGER </item>
+      <item> SNMP_IPADDRESS </item>
       <item> SNMP_NULL </item>
       <item> SNMP_OBJECT_ID </item>
-      <item> SNMP_IPADDRESS </item>
-      <item> SNMP_COUNTER </item>
-      <item> SNMP_UNSIGNED </item>
+      <item> SNMP_OCTET_STR </item>
+      <item> SNMP_OPAQUE </item>
       <item> SNMP_TIMETICKS </item>
       <item> SNMP_UINTEGER </item>
-      <item> SNMP_INTEGER </item>
-      <item> SNMP_COUNTER64 </item>
+      <item> SNMP_UNSIGNED </item>
+      <item> SNMP_VALUE_LIBRARY </item>
+      <item> SNMP_VALUE_OBJECT </item>
+      <item> SNMP_VALUE_PLAIN </item>
       <item> SOAP_1_1 </item>
       <item> SOAP_1_2 </item>
-      <item> SOAP_PERSISTENCE_SESSION </item>
-      <item> SOAP_PERSISTENCE_REQUEST </item>
-      <item> SOAP_FUNCTIONS_ALL </item>
-      <item> SOAP_ENCODED </item>
-      <item> SOAP_LITERAL </item>
-      <item> SOAP_RPC </item>
-      <item> SOAP_DOCUMENT </item>
       <item> SOAP_ACTOR_NEXT </item>
       <item> SOAP_ACTOR_NONE </item>
       <item> SOAP_ACTOR_UNLIMATERECEIVER </item>
       <item> SOAP_COMPRESSION_ACCEPT </item>
-      <item> SOAP_COMPRESSION_GZIP </item>
       <item> SOAP_COMPRESSION_DEFLATE </item>
-      <item> UNKNOWN_TYPE </item>
-      <item> XSD_STRING </item>
-      <item> XSD_BOOLEAN </item>
-      <item> XSD_DECIMAL </item>
-      <item> XSD_FLOAT </item>
-      <item> XSD_DOUBLE </item>
-      <item> XSD_DURATION </item>
-      <item> XSD_DATETIME </item>
-      <item> XSD_TIME </item>
-      <item> XSD_DATE </item>
-      <item> XSD_GYEARMONTH </item>
-      <item> XSD_GYEAR </item>
-      <item> XSD_GMONTHDAY </item>
-      <item> XSD_GDAY </item>
-      <item> XSD_GMONTH </item>
-      <item> XSD_HEXBINARY </item>
-      <item> XSD_BASE64BINARY </item>
-      <item> XSD_ANYURI </item>
-      <item> XSD_QNAME </item>
-      <item> XSD_NOTATION </item>
-      <item> XSD_NORMALIZEDSTRING </item>
-      <item> XSD_TOKEN </item>
-      <item> XSD_LANGUAGE </item>
-      <item> XSD_NMTOKEN </item>
-      <item> XSD_NAME </item>
-      <item> XSD_NCNAME </item>
-      <item> XSD_ID </item>
-      <item> XSD_IDREF </item>
-      <item> XSD_IDREFS </item>
-      <item> XSD_ENTITY </item>
-      <item> XSD_ENTITIES </item>
-      <item> XSD_INTEGER </item>
-      <item> XSD_NONPOSITIVEINTEGER </item>
-      <item> XSD_NEGATIVEINTEGER </item>
-      <item> XSD_LONG </item>
-      <item> XSD_INT </item>
-      <item> XSD_SHORT </item>
-      <item> XSD_BYTE </item>
-      <item> XSD_NONNEGATIVEINTEGER </item>
-      <item> XSD_UNSIGNEDLONG </item>
-      <item> XSD_UNSIGNEDINT </item>
-      <item> XSD_UNSIGNEDSHORT </item>
-      <item> XSD_UNSIGNEDBYTE </item>
-      <item> XSD_POSITIVEINTEGER </item>
-      <item> XSD_NMTOKENS </item>
-      <item> XSD_ANYTYPE </item>
-      <item> SOAP_ENC_OBJECT </item>
+      <item> SOAP_COMPRESSION_GZIP </item>
+      <item> SOAP_DOCUMENT </item>
+      <item> SOAP_ENCODED </item>
       <item> SOAP_ENC_ARRAY </item>
-      <item> XSD_1999_TIMEINSTANT </item>
-      <item> XSD_NAMESPACE </item>
-      <item> XSD_1999_NAMESPACE </item>
-      <item> AF_UNIX </item>
-      <item> AF_INET </item>
-      <item> AF_INET6 </item>
-      <item> SOCK_STREAM </item>
-      <item> SOCK_DGRAM </item>
-      <item> SOCK_RAW </item>
-      <item> SOCK_SEQPACKET </item>
-      <item> SOCK_RDM </item>
-      <item> MSG_OOB </item>
-      <item> MSG_WAITALL </item>
-      <item> MSG_PEEK </item>
-      <item> MSG_DONTROUTE </item>
-      <item> SO_DEBUG </item>
-      <item> SO_REUSEADDR </item>
-      <item> SO_KEEPALIVE </item>
-      <item> SO_DONTROUTE </item>
-      <item> SO_LINGER </item>
-      <item> SO_BROADCAST </item>
-      <item> SO_OOBINLINE </item>
-      <item> SO_SNDBUF </item>
-      <item> SO_RCVBUF </item>
-      <item> SO_SNDLOWAT </item>
-      <item> SO_RCVLOWAT </item>
-      <item> SO_SNDTIMEO </item>
-      <item> SO_RCVTIMEO </item>
-      <item> SO_TYPE </item>
-      <item> SO_ERROR </item>
-      <item> SOL_SOCKET </item>
-      <item> SOMAXCONN </item>
-      <item> PHP_NORMAL_READ </item>
-      <item> PHP_BINARY_READ </item>
-      <item> SOCKET_EPERM </item>
-      <item> SOCKET_ENOENT </item>
-      <item> SOCKET_EINTR </item>
-      <item> SOCKET_EIO </item>
-      <item> SOCKET_ENXIO </item>
+      <item> SOAP_ENC_OBJECT </item>
+      <item> SOAP_FUNCTIONS_ALL </item>
+      <item> SOAP_LITERAL </item>
+      <item> SOAP_PERSISTENCE_REQUEST </item>
+      <item> SOAP_PERSISTENCE_SESSION </item>
+      <item> SOAP_RPC </item>
       <item> SOCKET_E2BIG </item>
-      <item> SOCKET_EBADF </item>
-      <item> SOCKET_EAGAIN </item>
-      <item> SOCKET_ENOMEM </item>
       <item> SOCKET_EACCES </item>
-      <item> SOCKET_EFAULT </item>
-      <item> SOCKET_ENOTBLK </item>
+      <item> SOCKET_EADDRINUSE </item>
+      <item> SOCKET_EADDRNOTAVAIL </item>
+      <item> SOCKET_EADV </item>
+      <item> SOCKET_EAFNOSUPPORT </item>
+      <item> SOCKET_EAGAIN </item>
+      <item> SOCKET_EALREADY </item>
+      <item> SOCKET_EBADE </item>
+      <item> SOCKET_EBADF </item>
+      <item> SOCKET_EBADFD </item>
+      <item> SOCKET_EBADMSG </item>
+      <item> SOCKET_EBADR </item>
+      <item> SOCKET_EBADRQC </item>
+      <item> SOCKET_EBADSLT </item>
       <item> SOCKET_EBUSY </item>
+      <item> SOCKET_ECHRNG </item>
+      <item> SOCKET_ECOMM </item>
+      <item> SOCKET_ECONNABORTED </item>
+      <item> SOCKET_ECONNREFUSED </item>
+      <item> SOCKET_ECONNRESET </item>
+      <item> SOCKET_EDESTADDRREQ </item>
+      <item> SOCKET_EDQUOT </item>
       <item> SOCKET_EEXIST </item>
-      <item> SOCKET_EXDEV </item>
-      <item> SOCKET_ENODEV </item>
-      <item> SOCKET_ENOTDIR </item>
-      <item> SOCKET_EISDIR </item>
-      <item> SOCKET_EINVAL </item>
-      <item> SOCKET_ENFILE </item>
-      <item> SOCKET_EMFILE </item>
-      <item> SOCKET_ENOTTY </item>
-      <item> SOCKET_ENOSPC </item>
-      <item> SOCKET_ESPIPE </item>
-      <item> SOCKET_EROFS </item>
-      <item> SOCKET_EMLINK </item>
-      <item> SOCKET_EPIPE </item>
-      <item> SOCKET_ENAMETOOLONG </item>
-      <item> SOCKET_ENOLCK </item>
-      <item> SOCKET_ENOSYS </item>
-      <item> SOCKET_ENOTEMPTY </item>
-      <item> SOCKET_ELOOP </item>
-      <item> SOCKET_EWOULDBLOCK </item>
-      <item> SOCKET_ENOMSG </item>
+      <item> SOCKET_EFAULT </item>
+      <item> SOCKET_EHOSTDOWN </item>
+      <item> SOCKET_EHOSTUNREACH </item>
       <item> SOCKET_EIDRM </item>
-      <item> SOCKET_ECHRNG </item>
+      <item> SOCKET_EINPROGRESS </item>
+      <item> SOCKET_EINTR </item>
+      <item> SOCKET_EINVAL </item>
+      <item> SOCKET_EIO </item>
+      <item> SOCKET_EISCONN </item>
+      <item> SOCKET_EISDIR </item>
+      <item> SOCKET_EISNAM </item>
+      <item> SOCKET_EL2HLT </item>
       <item> SOCKET_EL2NSYNC </item>
       <item> SOCKET_EL3HLT </item>
       <item> SOCKET_EL3RST </item>
       <item> SOCKET_ELNRNG </item>
-      <item> SOCKET_EUNATCH </item>
-      <item> SOCKET_ENOCSI </item>
-      <item> SOCKET_EL2HLT </item>
-      <item> SOCKET_EBADE </item>
-      <item> SOCKET_EBADR </item>
-      <item> SOCKET_EXFULL </item>
+      <item> SOCKET_ELOOP </item>
+      <item> SOCKET_EMEDIUMTYPE </item>
+      <item> SOCKET_EMFILE </item>
+      <item> SOCKET_EMLINK </item>
+      <item> SOCKET_EMSGSIZE </item>
+      <item> SOCKET_EMULTIHOP </item>
+      <item> SOCKET_ENAMETOOLONG </item>
+      <item> SOCKET_ENETDOWN </item>
+      <item> SOCKET_ENETRESET </item>
+      <item> SOCKET_ENETUNREACH </item>
+      <item> SOCKET_ENFILE </item>
       <item> SOCKET_ENOANO </item>
-      <item> SOCKET_EBADRQC </item>
-      <item> SOCKET_EBADSLT </item>
-      <item> SOCKET_ENOSTR </item>
+      <item> SOCKET_ENOBUFS </item>
+      <item> SOCKET_ENOCSI </item>
       <item> SOCKET_ENODATA </item>
-      <item> SOCKET_ETIME </item>
-      <item> SOCKET_ENOSR </item>
-      <item> SOCKET_ENONET </item>
-      <item> SOCKET_EREMOTE </item>
+      <item> SOCKET_ENODEV </item>
+      <item> SOCKET_ENOENT </item>
+      <item> SOCKET_ENOLCK </item>
       <item> SOCKET_ENOLINK </item>
-      <item> SOCKET_EADV </item>
-      <item> SOCKET_ESRMNT </item>
-      <item> SOCKET_ECOMM </item>
-      <item> SOCKET_EPROTO </item>
-      <item> SOCKET_EMULTIHOP </item>
-      <item> SOCKET_EBADMSG </item>
-      <item> SOCKET_ENOTUNIQ </item>
-      <item> SOCKET_EBADFD </item>
-      <item> SOCKET_EREMCHG </item>
-      <item> SOCKET_ERESTART </item>
-      <item> SOCKET_ESTRPIPE </item>
-      <item> SOCKET_EUSERS </item>
-      <item> SOCKET_ENOTSOCK </item>
-      <item> SOCKET_EDESTADDRREQ </item>
-      <item> SOCKET_EMSGSIZE </item>
-      <item> SOCKET_EPROTOTYPE </item>
+      <item> SOCKET_ENOMEDIUM </item>
+      <item> SOCKET_ENOMEM </item>
+      <item> SOCKET_ENOMSG </item>
+      <item> SOCKET_ENONET </item>
       <item> SOCKET_ENOPROTOOPT </item>
-      <item> SOCKET_EPROTONOSUPPORT </item>
-      <item> SOCKET_ESOCKTNOSUPPORT </item>
+      <item> SOCKET_ENOSPC </item>
+      <item> SOCKET_ENOSR </item>
+      <item> SOCKET_ENOSTR </item>
+      <item> SOCKET_ENOSYS </item>
+      <item> SOCKET_ENOTBLK </item>
+      <item> SOCKET_ENOTCONN </item>
+      <item> SOCKET_ENOTDIR </item>
+      <item> SOCKET_ENOTEMPTY </item>
+      <item> SOCKET_ENOTSOCK </item>
+      <item> SOCKET_ENOTTY </item>
+      <item> SOCKET_ENOTUNIQ </item>
+      <item> SOCKET_ENXIO </item>
       <item> SOCKET_EOPNOTSUPP </item>
+      <item> SOCKET_EPERM </item>
       <item> SOCKET_EPFNOSUPPORT </item>
-      <item> SOCKET_EAFNOSUPPORT </item>
-      <item> SOCKET_EADDRINUSE </item>
-      <item> SOCKET_EADDRNOTAVAIL </item>
-      <item> SOCKET_ENETDOWN </item>
-      <item> SOCKET_ENETUNREACH </item>
-      <item> SOCKET_ENETRESET </item>
-      <item> SOCKET_ECONNABORTED </item>
-      <item> SOCKET_ECONNRESET </item>
-      <item> SOCKET_ENOBUFS </item>
-      <item> SOCKET_EISCONN </item>
-      <item> SOCKET_ENOTCONN </item>
+      <item> SOCKET_EPIPE </item>
+      <item> SOCKET_EPROTO </item>
+      <item> SOCKET_EPROTONOSUPPORT </item>
+      <item> SOCKET_EPROTOTYPE </item>
+      <item> SOCKET_EREMCHG </item>
+      <item> SOCKET_EREMOTE </item>
+      <item> SOCKET_EREMOTEIO </item>
+      <item> SOCKET_ERESTART </item>
+      <item> SOCKET_EROFS </item>
       <item> SOCKET_ESHUTDOWN </item>
-      <item> SOCKET_ETOOMANYREFS </item>
+      <item> SOCKET_ESOCKTNOSUPPORT </item>
+      <item> SOCKET_ESPIPE </item>
+      <item> SOCKET_ESRMNT </item>
+      <item> SOCKET_ESTRPIPE </item>
+      <item> SOCKET_ETIME </item>
       <item> SOCKET_ETIMEDOUT </item>
-      <item> SOCKET_ECONNREFUSED </item>
-      <item> SOCKET_EHOSTDOWN </item>
-      <item> SOCKET_EHOSTUNREACH </item>
-      <item> SOCKET_EALREADY </item>
-      <item> SOCKET_EINPROGRESS </item>
-      <item> SOCKET_EISNAM </item>
-      <item> SOCKET_EREMOTEIO </item>
-      <item> SOCKET_EDQUOT </item>
-      <item> SOCKET_ENOMEDIUM </item>
-      <item> SOCKET_EMEDIUMTYPE </item>
+      <item> SOCKET_ETOOMANYREFS </item>
+      <item> SOCKET_EUNATCH </item>
+      <item> SOCKET_EUSERS </item>
+      <item> SOCKET_EWOULDBLOCK </item>
+      <item> SOCKET_EXDEV </item>
+      <item> SOCKET_EXFULL </item>
+      <item> SOCK_DGRAM </item>
+      <item> SOCK_RAW </item>
+      <item> SOCK_RDM </item>
+      <item> SOCK_SEQPACKET </item>
+      <item> SOCK_STREAM </item>
+      <item> SOL_SOCKET </item>
       <item> SOL_TCP </item>
       <item> SOL_UDP </item>
-      <item> SQLITE_BOTH </item>
-      <item> SQLITE_NUM </item>
+      <item> SOMAXCONN </item>
+      <item> SORTARRIVAL </item>
+      <item> SORTCC </item>
+      <item> SORTDATE </item>
+      <item> SORTFROM </item>
+      <item> SORTSIZE </item>
+      <item> SORTSUBJECT </item>
+      <item> SORTTO </item>
+      <item> SORT_ASC </item>
+      <item> SORT_DESC </item>
+      <item> SORT_LOCALE_STRING </item>
+      <item> SORT_NUMERIC </item>
+      <item> SORT_REGULAR </item>
+      <item> SORT_STRING </item>
+      <item> SO_BROADCAST </item>
+      <item> SO_DEBUG </item>
+      <item> SO_DONTROUTE </item>
+      <item> SO_ERROR </item>
+      <item> SO_FREE </item>
+      <item> SO_KEEPALIVE </item>
+      <item> SO_LINGER </item>
+      <item> SO_NOSERVER </item>
+      <item> SO_OOBINLINE </item>
+      <item> SO_RCVBUF </item>
+      <item> SO_RCVLOWAT </item>
+      <item> SO_RCVTIMEO </item>
+      <item> SO_REUSEADDR </item>
+      <item> SO_SNDBUF </item>
+      <item> SO_SNDLOWAT </item>
+      <item> SO_SNDTIMEO </item>
+      <item> SO_TYPE </item>
+      <item> SQLITE_ABORT </item>
       <item> SQLITE_ASSOC </item>
-      <item> SQLITE_OK </item>
+      <item> SQLITE_AUTH </item>
+      <item> SQLITE_BOTH </item>
+      <item> SQLITE_BUSY </item>
+      <item> SQLITE_CANTOPEN </item>
+      <item> SQLITE_CONSTRAINT </item>
+      <item> SQLITE_CORRUPT </item>
+      <item> SQLITE_DONE </item>
+      <item> SQLITE_EMPTY </item>
       <item> SQLITE_ERROR </item>
+      <item> SQLITE_FORMAT </item>
+      <item> SQLITE_FULL </item>
       <item> SQLITE_INTERNAL </item>
-      <item> SQLITE_PERM </item>
-      <item> SQLITE_ABORT </item>
-      <item> SQLITE_BUSY </item>
-      <item> SQLITE_LOCKED </item>
-      <item> SQLITE_NOMEM </item>
-      <item> SQLITE_READONLY </item>
       <item> SQLITE_INTERRUPT </item>
       <item> SQLITE_IOERR </item>
-      <item> SQLITE_CORRUPT </item>
-      <item> SQLITE_NOTFOUND </item>
-      <item> SQLITE_FULL </item>
-      <item> SQLITE_CANTOPEN </item>
-      <item> SQLITE_PROTOCOL </item>
-      <item> SQLITE_EMPTY </item>
-      <item> SQLITE_SCHEMA </item>
-      <item> SQLITE_TOOBIG </item>
-      <item> SQLITE_CONSTRAINT </item>
+      <item> SQLITE_LOCKED </item>
       <item> SQLITE_MISMATCH </item>
       <item> SQLITE_MISUSE </item>
       <item> SQLITE_NOLFS </item>
-      <item> SQLITE_AUTH </item>
-      <item> SQLITE_FORMAT </item>
+      <item> SQLITE_NOMEM </item>
+      <item> SQLITE_NOTFOUND </item>
+      <item> SQLITE_NUM </item>
+      <item> SQLITE_OK </item>
+      <item> SQLITE_PERM </item>
+      <item> SQLITE_PROTOCOL </item>
+      <item> SQLITE_READONLY </item>
       <item> SQLITE_ROW </item>
-      <item> SQLITE_DONE </item>
-      <item> MSG_IPC_NOWAIT </item>
-      <item> MSG_NOERROR </item>
-      <item> MSG_EXCEPT </item>
-      <item> T_INCLUDE </item>
-      <item> T_INCLUDE_ONCE </item>
-      <item> T_EVAL </item>
-      <item> T_REQUIRE </item>
-      <item> T_REQUIRE_ONCE </item>
-      <item> T_LOGICAL_OR </item>
-      <item> T_LOGICAL_XOR </item>
-      <item> T_LOGICAL_AND </item>
-      <item> T_PRINT </item>
-      <item> T_PLUS_EQUAL </item>
-      <item> T_MINUS_EQUAL </item>
-      <item> T_MUL_EQUAL </item>
-      <item> T_DIV_EQUAL </item>
-      <item> T_CONCAT_EQUAL </item>
-      <item> T_MOD_EQUAL </item>
+      <item> SQLITE_SCHEMA </item>
+      <item> SQLITE_TOOBIG </item>
+      <item> SQL_BIGINT </item>
+      <item> SQL_BINARY </item>
+      <item> SQL_BIT </item>
+      <item> SQL_CHAR </item>
+      <item> SQL_CONCURRENCY </item>
+      <item> SQL_CONCUR_LOCK </item>
+      <item> SQL_CONCUR_READ_ONLY </item>
+      <item> SQL_CONCUR_ROWVER </item>
+      <item> SQL_CONCUR_VALUES </item>
+      <item> SQL_CURSOR_DYNAMIC </item>
+      <item> SQL_CURSOR_FORWARD_ONLY </item>
+      <item> SQL_CURSOR_KEYSET_DRIVEN </item>
+      <item> SQL_CURSOR_STATIC </item>
+      <item> SQL_CURSOR_TYPE </item>
+      <item> SQL_CUR_USE_DRIVER </item>
+      <item> SQL_CUR_USE_IF_NEEDED </item>
+      <item> SQL_CUR_USE_ODBC </item>
+      <item> SQL_DATE </item>
+      <item> SQL_DECIMAL </item>
+      <item> SQL_DOUBLE </item>
+      <item> SQL_FETCH_FIRST </item>
+      <item> SQL_FETCH_NEXT </item>
+      <item> SQL_FLOAT </item>
+      <item> SQL_INTEGER </item>
+      <item> SQL_KEYSET_SIZE </item>
+      <item> SQL_LONGVARBINARY </item>
+      <item> SQL_LONGVARCHAR </item>
+      <item> SQL_NUMERIC </item>
+      <item> SQL_ODBC_CURSORS </item>
+      <item> SQL_REAL </item>
+      <item> SQL_SMALLINT </item>
+      <item> SQL_TIME </item>
+      <item> SQL_TIMESTAMP </item>
+      <item> SQL_TINYINT </item>
+      <item> SQL_VARBINARY </item>
+      <item> SQL_VARCHAR </item>
+      <item> STREAM_CLIENT_ASYNC_CONNECT </item>
+      <item> STREAM_CLIENT_CONNECT </item>
+      <item> STREAM_CLIENT_PERSISTENT </item>
+      <item> STREAM_ENFORCE_SAFE_MODE </item>
+      <item> STREAM_FILTER_ALL </item>
+      <item> STREAM_FILTER_READ </item>
+      <item> STREAM_FILTER_WRITE </item>
+      <item> STREAM_IGNORE_URL </item>
+      <item> STREAM_MKDIR_RECURSIVE </item>
+      <item> STREAM_MUST_SEEK </item>
+      <item> STREAM_NOTIFY_AUTH_REQUIRED </item>
+      <item> STREAM_NOTIFY_AUTH_RESULT </item>
+      <item> STREAM_NOTIFY_COMPLETED </item>
+      <item> STREAM_NOTIFY_CONNECT </item>
+      <item> STREAM_NOTIFY_FAILURE </item>
+      <item> STREAM_NOTIFY_FILE_SIZE_IS </item>
+      <item> STREAM_NOTIFY_MIME_TYPE_IS </item>
+      <item> STREAM_NOTIFY_PROGRESS </item>
+      <item> STREAM_NOTIFY_REDIRECTED </item>
+      <item> STREAM_NOTIFY_RESOLVE </item>
+      <item> STREAM_NOTIFY_SEVERITY_ERR </item>
+      <item> STREAM_NOTIFY_SEVERITY_INFO </item>
+      <item> STREAM_NOTIFY_SEVERITY_WARN </item>
+      <item> STREAM_OOB </item>
+      <item> STREAM_PEEK </item>
+      <item> STREAM_REPORT_ERRORS </item>
+      <item> STREAM_SERVER_BIND </item>
+      <item> STREAM_SERVER_LISTEN </item>
+      <item> STREAM_URL_STAT_LINK </item>
+      <item> STREAM_URL_STAT_QUIET </item>
+      <item> STREAM_USE_PATH </item>
+      <item> STR_PAD_BOTH </item>
+      <item> STR_PAD_LEFT </item>
+      <item> STR_PAD_RIGHT </item>
+      <item> ST_SET </item>
+      <item> ST_SILENT </item>
+      <item> ST_UID </item>
+      <item> SUNFUNCS_RET_DOUBLE </item>
+      <item> SUNFUNCS_RET_STRING </item>
+      <item> SUNFUNCS_RET_TIMESTAMP </item>
+      <item> S_IRGRP </item>
+      <item> S_IROTH </item>
+      <item> S_IRUSR </item>
+      <item> S_IRWXG </item>
+      <item> S_IRWXO </item>
+      <item> S_IRWXU </item>
+      <item> S_IWGRP </item>
+      <item> S_IWOTH </item>
+      <item> S_IWUSR </item>
+      <item> S_IXGRP </item>
+      <item> S_IXOTH </item>
+      <item> S_IXUSR </item>
+      <item> THOUSEP </item>
+      <item> TRUE </item>
+      <item> TYPEAPPLICATION </item>
+      <item> TYPEAUDIO </item>
+      <item> TYPEIMAGE </item>
+      <item> TYPEMESSAGE </item>
+      <item> TYPEMODEL </item>
+      <item> TYPEMULTIPART </item>
+      <item> TYPEOTHER </item>
+      <item> TYPETEXT </item>
+      <item> TYPEVIDEO </item>
+      <item> T_ABSTRACT </item>
       <item> T_AND_EQUAL </item>
-      <item> T_OR_EQUAL </item>
-      <item> T_XOR_EQUAL </item>
-      <item> T_SL_EQUAL </item>
-      <item> T_SR_EQUAL </item>
-      <item> T_BOOLEAN_OR </item>
-      <item> T_BOOLEAN_AND </item>
-      <item> T_IS_EQUAL </item>
-      <item> T_IS_NOT_EQUAL </item>
-      <item> T_IS_IDENTICAL </item>
-      <item> T_IS_NOT_IDENTICAL </item>
-      <item> T_IS_SMALLER_OR_EQUAL </item>
-      <item> T_IS_GREATER_OR_EQUAL </item>
-      <item> T_SL </item>
-      <item> T_SR </item>
-      <item> T_INC </item>
-      <item> T_DEC </item>
-      <item> T_INT_CAST </item>
-      <item> T_DOUBLE_CAST </item>
-      <item> T_STRING_CAST </item>
+      <item> T_ARRAY </item>
       <item> T_ARRAY_CAST </item>
-      <item> T_OBJECT_CAST </item>
+      <item> T_AS </item>
+      <item> T_BAD_CHARACTER </item>
+      <item> T_BOOLEAN_AND </item>
+      <item> T_BOOLEAN_OR </item>
       <item> T_BOOL_CAST </item>
-      <item> T_UNSET_CAST </item>
-      <item> T_NEW </item>
-      <item> T_EXIT </item>
-      <item> T_IF </item>
-      <item> T_ELSEIF </item>
-      <item> T_ELSE </item>
-      <item> T_ENDIF </item>
-      <item> T_LNUMBER </item>
-      <item> T_DNUMBER </item>
-      <item> T_STRING </item>
-      <item> T_STRING_VARNAME </item>
-      <item> T_VARIABLE </item>
-      <item> T_NUM_STRING </item>
-      <item> T_INLINE_HTML </item>
+      <item> T_BREAK </item>
+      <item> T_CASE </item>
+      <item> T_CATCH </item>
       <item> T_CHARACTER </item>
-      <item> T_BAD_CHARACTER </item>
-      <item> T_ENCAPSED_AND_WHITESPACE </item>
+      <item> T_CLASS </item>
+      <item> T_CLASS_C </item>
+      <item> T_CLONE </item>
+      <item> T_CLOSE_TAG </item>
+      <item> T_COMMENT </item>
+      <item> T_CONCAT_EQUAL </item>
+      <item> T_CONST </item>
       <item> T_CONSTANT_ENCAPSED_STRING </item>
-      <item> T_ECHO </item>
+      <item> T_CONTINUE </item>
+      <item> T_CURLY_OPEN </item>
+      <item> T_DEC </item>
+      <item> T_DECLARE </item>
+      <item> T_DEFAULT </item>
+      <item> T_DIV_EQUAL </item>
+      <item> T_DNUMBER </item>
       <item> T_DO </item>
-      <item> T_WHILE </item>
-      <item> T_ENDWHILE </item>
-      <item> T_FOR </item>
+      <item> T_DOC_COMMENT </item>
+      <item> T_DOLLAR_OPEN_CURLY_BRACES </item>
+      <item> T_DOUBLE_ARROW </item>
+      <item> T_DOUBLE_CAST </item>
+      <item> T_DOUBLE_COLON </item>
+      <item> T_ECHO </item>
+      <item> T_ELSE </item>
+      <item> T_ELSEIF </item>
+      <item> T_EMPTY </item>
+      <item> T_ENCAPSED_AND_WHITESPACE </item>
+      <item> T_ENDDECLARE </item>
       <item> T_ENDFOR </item>
-      <item> T_FOREACH </item>
       <item> T_ENDFOREACH </item>
-      <item> T_DECLARE </item>
-      <item> T_ENDDECLARE </item>
-      <item> T_AS </item>
-      <item> T_SWITCH </item>
+      <item> T_ENDIF </item>
       <item> T_ENDSWITCH </item>
-      <item> T_CASE </item>
-      <item> T_DEFAULT </item>
-      <item> T_BREAK </item>
-      <item> T_CONTINUE </item>
+      <item> T_ENDWHILE </item>
+      <item> T_END_HEREDOC </item>
+      <item> T_EVAL </item>
+      <item> T_EXIT </item>
+      <item> T_EXTENDS </item>
+      <item> T_FILE </item>
+      <item> T_FINAL </item>
+      <item> T_FMT </item>
+      <item> T_FMT_AMPM </item>
+      <item> T_FOR </item>
+      <item> T_FOREACH </item>
       <item> T_FUNCTION </item>
-      <item> T_CONST </item>
-      <item> T_RETURN </item>
-      <item> T_USE </item>
+      <item> T_FUNC_C </item>
       <item> T_GLOBAL </item>
-      <item> T_STATIC </item>
-      <item> T_VAR </item>
-      <item> T_UNSET </item>
-      <item> T_ISSET </item>
-      <item> T_EMPTY </item>
-      <item> T_CLASS </item>
-      <item> T_EXTENDS </item>
-      <item> T_INTERFACE </item>
+      <item> T_IF </item>
       <item> T_IMPLEMENTS </item>
-      <item> T_OBJECT_OPERATOR </item>
-      <item> T_DOUBLE_ARROW </item>
+      <item> T_INC </item>
+      <item> T_INCLUDE </item>
+      <item> T_INCLUDE_ONCE </item>
+      <item> T_INLINE_HTML </item>
+      <item> T_INSTANCEOF </item>
+      <item> T_INTERFACE </item>
+      <item> T_INT_CAST </item>
+      <item> T_ISSET </item>
+      <item> T_IS_EQUAL </item>
+      <item> T_IS_GREATER_OR_EQUAL </item>
+      <item> T_IS_IDENTICAL </item>
+      <item> T_IS_NOT_EQUAL </item>
+      <item> T_IS_NOT_IDENTICAL </item>
+      <item> T_IS_SMALLER_OR_EQUAL </item>
+      <item> T_LINE </item>
       <item> T_LIST </item>
-      <item> T_ARRAY </item>
-      <item> T_CLASS_C </item>
-      <item> T_FUNC_C </item>
+      <item> T_LNUMBER </item>
+      <item> T_LOGICAL_AND </item>
+      <item> T_LOGICAL_OR </item>
+      <item> T_LOGICAL_XOR </item>
       <item> T_METHOD_C </item>
-      <item> T_LINE </item>
-      <item> T_FILE </item>
-      <item> T_COMMENT </item>
-      <item> T_DOC_COMMENT </item>
+      <item> T_MINUS_EQUAL </item>
+      <item> T_MOD_EQUAL </item>
+      <item> T_MUL_EQUAL </item>
+      <item> T_NEW </item>
+      <item> T_NUM_STRING </item>
+      <item> T_OBJECT_CAST </item>
+      <item> T_OBJECT_OPERATOR </item>
       <item> T_OPEN_TAG </item>
       <item> T_OPEN_TAG_WITH_ECHO </item>
-      <item> T_CLOSE_TAG </item>
-      <item> T_WHITESPACE </item>
-      <item> T_START_HEREDOC </item>
-      <item> T_END_HEREDOC </item>
-      <item> T_DOLLAR_OPEN_CURLY_BRACES </item>
-      <item> T_CURLY_OPEN </item>
+      <item> T_OR_EQUAL </item>
       <item> T_PAAMAYIM_NEKUDOTAYIM </item>
-      <item> T_DOUBLE_COLON </item>
-      <item> T_ABSTRACT </item>
-      <item> T_CATCH </item>
-      <item> T_FINAL </item>
-      <item> T_INSTANCEOF </item>
+      <item> T_PLUS_EQUAL </item>
+      <item> T_PRINT </item>
       <item> T_PRIVATE </item>
       <item> T_PROTECTED </item>
       <item> T_PUBLIC </item>
+      <item> T_REQUIRE </item>
+      <item> T_REQUIRE_ONCE </item>
+      <item> T_RETURN </item>
+      <item> T_SL </item>
+      <item> T_SL_EQUAL </item>
+      <item> T_SR </item>
+      <item> T_SR_EQUAL </item>
+      <item> T_START_HEREDOC </item>
+      <item> T_STATIC </item>
+      <item> T_STRING </item>
+      <item> T_STRING_CAST </item>
+      <item> T_STRING_VARNAME </item>
+      <item> T_SWITCH </item>
       <item> T_THROW </item>
       <item> T_TRY </item>
-      <item> T_CLONE </item>
-      <item> XSL_CLONE_AUTO </item>
-      <item> XSL_CLONE_NEVER </item>
-      <item> XSL_CLONE_ALWAYS </item>
-      <item> YPERR_BADARGS </item>
-      <item> YPERR_BADDB </item>
-      <item> YPERR_BUSY </item>
-      <item> YPERR_DOMAIN </item>
-      <item> YPERR_KEY </item>
-      <item> YPERR_MAP </item>
-      <item> YPERR_NODOM </item>
-      <item> YPERR_NOMORE </item>
-      <item> YPERR_PMAP </item>
-      <item> YPERR_RESRC </item>
-      <item> YPERR_RPC </item>
-      <item> YPERR_YPBIND </item>
-      <item> YPERR_YPERR </item>
-      <item> YPERR_YPSERV </item>
-      <item> YPERR_VERS </item>
-      <item> FORCE_GZIP </item>
-      <item> FORCE_DEFLATE </item>
-      <item> E_ERROR </item>
-      <item> E_WARNING </item>
-      <item> E_PARSE </item>
-      <item> E_NOTICE </item>
-      <item> E_STRICT </item>
-      <item> E_CORE_ERROR </item>
-      <item> E_CORE_WARNING </item>
-      <item> E_COMPILE_ERROR </item>
-      <item> E_COMPILE_WARNING </item>
-      <item> E_USER_ERROR </item>
-      <item> E_USER_WARNING </item>
-      <item> E_USER_NOTICE </item>
-      <item> E_ALL </item>
-      <item> TRUE </item>
-      <item> FALSE </item>
-      <item> ZEND_THREAD_SAFE </item>
-      <item> NULL </item>
-      <item> PHP_VERSION </item>
-      <item> PHP_OS </item>
-      <item> PHP_SAPI </item>
-      <item> DEFAULT_INCLUDE_PATH </item>
-      <item> PEAR_INSTALL_DIR </item>
-      <item> PEAR_EXTENSION_DIR </item>
-      <item> PHP_EXTENSION_DIR </item>
-      <item> PHP_PREFIX </item>
-      <item> PHP_BINDIR </item>
-      <item> PHP_LIBDIR </item>
-      <item> PHP_DATADIR </item>
-      <item> PHP_SYSCONFDIR </item>
-      <item> PHP_LOCALSTATEDIR </item>
-      <item> PHP_CONFIG_FILE_PATH </item>
-      <item> PHP_CONFIG_FILE_SCAN_DIR </item>
-      <item> PHP_SHLIB_SUFFIX </item>
-      <item> PHP_EOL </item>
-      <item> PHP_OUTPUT_HANDLER_START </item>
-      <item> PHP_OUTPUT_HANDLER_CONT </item>
-      <item> PHP_OUTPUT_HANDLER_END </item>
-      <item> UPLOAD_ERR_OK </item>
-      <item> UPLOAD_ERR_INI_SIZE </item>
+      <item> T_UNSET </item>
+      <item> T_UNSET_CAST </item>
+      <item> T_USE </item>
+      <item> T_VAR </item>
+      <item> T_VARIABLE </item>
+      <item> T_WHILE </item>
+      <item> T_WHITESPACE </item>
+      <item> T_XOR_EQUAL </item>
+      <item> UNKNOWN_TYPE </item>
       <item> UPLOAD_ERR_FORM_SIZE </item>
-      <item> UPLOAD_ERR_PARTIAL </item>
+      <item> UPLOAD_ERR_INI_SIZE </item>
       <item> UPLOAD_ERR_NO_FILE </item>
       <item> UPLOAD_ERR_NO_TMP_DIR </item>
-      <item> P_STATIC </item>
-      <item> P_PUBLIC </item>
-      <item> P_PROTECTED </item>
-      <item> P_PRIVATE </item>
-      <item> M_STATIC </item>
-      <item> M_PUBLIC </item>
-      <item> M_PROTECTED </item>
-      <item> M_PRIVATE </item>
-      <item> M_ABSTRACT </item>
-      <item> M_FINAL </item>
-      <item> C_IMPLICIT_ABSTRACT </item>
-      <item> C_EXPLICIT_ABSTRACT </item>
-      <item> C_FINAL </item>
+      <item> UPLOAD_ERR_OK </item>
+      <item> UPLOAD_ERR_PARTIAL </item>
+      <item> WNOHANG </item>
+      <item> WUNTRACED </item>
+      <item> X509_PURPOSE_ANY </item>
+      <item> X509_PURPOSE_CRL_SIGN </item>
+      <item> X509_PURPOSE_NS_SSL_SERVER </item>
+      <item> X509_PURPOSE_SMIME_ENCRYPT </item>
+      <item> X509_PURPOSE_SMIME_SIGN </item>
+      <item> X509_PURPOSE_SSL_CLIENT </item>
+      <item> X509_PURPOSE_SSL_SERVER </item>
+      <item> XML_ATTRIBUTE_CDATA </item>
+      <item> XML_ATTRIBUTE_DECL_NODE </item>
+      <item> XML_ATTRIBUTE_ENTITY </item>
+      <item> XML_ATTRIBUTE_ENUMERATION </item>
+      <item> XML_ATTRIBUTE_ID </item>
+      <item> XML_ATTRIBUTE_IDREF </item>
+      <item> XML_ATTRIBUTE_IDREFS </item>
+      <item> XML_ATTRIBUTE_NMTOKEN </item>
+      <item> XML_ATTRIBUTE_NMTOKENS </item>
+      <item> XML_ATTRIBUTE_NODE </item>
+      <item> XML_ATTRIBUTE_NOTATION </item>
+      <item> XML_CDATA_SECTION_NODE </item>
+      <item> XML_COMMENT_NODE </item>
+      <item> XML_DOCUMENT_FRAG_NODE </item>
+      <item> XML_DOCUMENT_NODE </item>
+      <item> XML_DOCUMENT_TYPE_NODE </item>
+      <item> XML_DTD_NODE </item>
+      <item> XML_ELEMENT_DECL_NODE </item>
+      <item> XML_ELEMENT_NODE </item>
+      <item> XML_ENTITY_DECL_NODE </item>
+      <item> XML_ENTITY_NODE </item>
+      <item> XML_ENTITY_REF_NODE </item>
+      <item> XML_ERROR_ASYNC_ENTITY </item>
+      <item> XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF </item>
+      <item> XML_ERROR_BAD_CHAR_REF </item>
+      <item> XML_ERROR_BINARY_ENTITY_REF </item>
+      <item> XML_ERROR_DUPLICATE_ATTRIBUTE </item>
+      <item> XML_ERROR_EXTERNAL_ENTITY_HANDLING </item>
+      <item> XML_ERROR_INCORRECT_ENCODING </item>
+      <item> XML_ERROR_INVALID_TOKEN </item>
+      <item> XML_ERROR_JUNK_AFTER_DOC_ELEMENT </item>
+      <item> XML_ERROR_MISPLACED_XML_PI </item>
       <item> XML_ERROR_NONE </item>
-      <item> XML_ERROR_NO_MEMORY </item>
-      <item> XML_ERROR_SYNTAX </item>
       <item> XML_ERROR_NO_ELEMENTS </item>
-      <item> XML_ERROR_INVALID_TOKEN </item>
-      <item> XML_ERROR_UNCLOSED_TOKEN </item>
+      <item> XML_ERROR_NO_MEMORY </item>
+      <item> XML_ERROR_PARAM_ENTITY_REF </item>
       <item> XML_ERROR_PARTIAL_CHAR </item>
+      <item> XML_ERROR_RECURSIVE_ENTITY_REF </item>
+      <item> XML_ERROR_SYNTAX </item>
       <item> XML_ERROR_TAG_MISMATCH </item>
-      <item> XML_ERROR_DUPLICATE_ATTRIBUTE </item>
-      <item> XML_ERROR_JUNK_AFTER_DOC_ELEMENT </item>
-      <item> XML_ERROR_PARAM_ENTITY_REF </item>
+      <item> XML_ERROR_UNCLOSED_CDATA_SECTION </item>
+      <item> XML_ERROR_UNCLOSED_TOKEN </item>
       <item> XML_ERROR_UNDEFINED_ENTITY </item>
-      <item> XML_ERROR_RECURSIVE_ENTITY_REF </item>
-      <item> XML_ERROR_ASYNC_ENTITY </item>
-      <item> XML_ERROR_BAD_CHAR_REF </item>
-      <item> XML_ERROR_BINARY_ENTITY_REF </item>
-      <item> XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF </item>
-      <item> XML_ERROR_MISPLACED_XML_PI </item>
       <item> XML_ERROR_UNKNOWN_ENCODING </item>
-      <item> XML_ERROR_INCORRECT_ENCODING </item>
-      <item> XML_ERROR_UNCLOSED_CDATA_SECTION </item>
-      <item> XML_ERROR_EXTERNAL_ENTITY_HANDLING </item>
+      <item> XML_HTML_DOCUMENT_NODE </item>
+      <item> XML_LOCAL_NAMESPACE </item>
+      <item> XML_NAMESPACE_DECL_NODE </item>
+      <item> XML_NOTATION_NODE </item>
       <item> XML_OPTION_CASE_FOLDING </item>
-      <item> XML_OPTION_TARGET_ENCODING </item>
       <item> XML_OPTION_SKIP_TAGSTART </item>
       <item> XML_OPTION_SKIP_WHITE </item>
+      <item> XML_OPTION_TARGET_ENCODING </item>
+      <item> XML_PI_NODE </item>
       <item> XML_SAX_IMPL </item>
-      <item> CONNECTION_ABORTED </item>
-      <item> CONNECTION_NORMAL </item>
-      <item> CONNECTION_TIMEOUT </item>
-      <item> INI_USER </item>
-      <item> INI_PERDIR </item>
-      <item> INI_SYSTEM </item>
-      <item> INI_ALL </item>
-      <item> SUNFUNCS_RET_TIMESTAMP </item>
-      <item> SUNFUNCS_RET_STRING </item>
-      <item> SUNFUNCS_RET_DOUBLE </item>
-      <item> M_E </item>
-      <item> M_LOG2E </item>
-      <item> M_LOG10E </item>
-      <item> M_LN2 </item>
-      <item> M_LN10 </item>
-      <item> M_PI </item>
-      <item> M_PI_2 </item>
-      <item> M_PI_4 </item>
-      <item> M_1_PI </item>
-      <item> M_2_PI </item>
-      <item> M_2_SQRTPI </item>
-      <item> M_SQRT2 </item>
-      <item> M_SQRT1_2 </item>
-      <item> INF </item>
-      <item> NAN </item>
-      <item> INFO_GENERAL </item>
-      <item> INFO_CREDITS </item>
-      <item> INFO_CONFIGURATION </item>
-      <item> INFO_MODULES </item>
-      <item> INFO_ENVIRONMENT </item>
-      <item> INFO_VARIABLES </item>
-      <item> INFO_LICENSE </item>
-      <item> INFO_ALL </item>
-      <item> CREDITS_GROUP </item>
-      <item> CREDITS_GENERAL </item>
-      <item> CREDITS_SAPI </item>
-      <item> CREDITS_MODULES </item>
-      <item> CREDITS_DOCS </item>
-      <item> CREDITS_FULLPAGE </item>
-      <item> CREDITS_QA </item>
-      <item> CREDITS_ALL </item>
-      <item> HTML_SPECIALCHARS </item>
-      <item> HTML_ENTITIES </item>
-      <item> ENT_COMPAT </item>
-      <item> ENT_QUOTES </item>
-      <item> ENT_NOQUOTES </item>
-      <item> STR_PAD_LEFT </item>
-      <item> STR_PAD_RIGHT </item>
-      <item> STR_PAD_BOTH </item>
-      <item> PATHINFO_DIRNAME </item>
-      <item> PATHINFO_BASENAME </item>
-      <item> PATHINFO_EXTENSION </item>
-      <item> CHAR_MAX </item>
-      <item> LC_CTYPE </item>
-      <item> LC_NUMERIC </item>
-      <item> LC_TIME </item>
-      <item> LC_COLLATE </item>
-      <item> LC_MONETARY </item>
-      <item> LC_ALL </item>
-      <item> LC_MESSAGES </item>
-      <item> SEEK_SET </item>
-      <item> SEEK_CUR </item>
-      <item> SEEK_END </item>
-      <item> LOCK_SH </item>
-      <item> LOCK_EX </item>
-      <item> LOCK_UN </item>
-      <item> LOCK_NB </item>
-      <item> STREAM_NOTIFY_CONNECT </item>
-      <item> STREAM_NOTIFY_AUTH_REQUIRED </item>
-      <item> STREAM_NOTIFY_AUTH_RESULT </item>
-      <item> STREAM_NOTIFY_MIME_TYPE_IS </item>
-      <item> STREAM_NOTIFY_FILE_SIZE_IS </item>
-      <item> STREAM_NOTIFY_REDIRECTED </item>
-      <item> STREAM_NOTIFY_PROGRESS </item>
-      <item> STREAM_NOTIFY_FAILURE </item>
-      <item> STREAM_NOTIFY_COMPLETED </item>
-      <item> STREAM_NOTIFY_RESOLVE </item>
-      <item> STREAM_NOTIFY_SEVERITY_INFO </item>
-      <item> STREAM_NOTIFY_SEVERITY_WARN </item>
-      <item> STREAM_NOTIFY_SEVERITY_ERR </item>
-      <item> STREAM_FILTER_READ </item>
-      <item> STREAM_FILTER_WRITE </item>
-      <item> STREAM_FILTER_ALL </item>
-      <item> STREAM_CLIENT_PERSISTENT </item>
-      <item> STREAM_CLIENT_ASYNC_CONNECT </item>
-      <item> STREAM_CLIENT_CONNECT </item>
-      <item> STREAM_PEEK </item>
-      <item> STREAM_OOB </item>
-      <item> STREAM_SERVER_BIND </item>
-      <item> STREAM_SERVER_LISTEN </item>
-      <item> FILE_USE_INCLUDE_PATH </item>
-      <item> FILE_IGNORE_NEW_LINES </item>
-      <item> FILE_SKIP_EMPTY_LINES </item>
-      <item> FILE_APPEND </item>
-      <item> FILE_NO_DEFAULT_CONTEXT </item>
-      <item> FNM_NOESCAPE </item>
-      <item> FNM_PATHNAME </item>
-      <item> FNM_PERIOD </item>
-      <item> FNM_CASEFOLD </item>
-      <item> PSFS_PASS_ON </item>
-      <item> PSFS_FEED_ME </item>
-      <item> PSFS_ERR_FATAL </item>
-      <item> PSFS_FLAG_NORMAL </item>
-      <item> PSFS_FLAG_FLUSH_INC </item>
-      <item> PSFS_FLAG_FLUSH_CLOSE </item>
-      <item> ABDAY_1 </item>
-      <item> ABDAY_2 </item>
-      <item> ABDAY_3 </item>
-      <item> ABDAY_4 </item>
-      <item> ABDAY_5 </item>
-      <item> ABDAY_6 </item>
-      <item> ABDAY_7 </item>
-      <item> DAY_1 </item>
-      <item> DAY_2 </item>
-      <item> DAY_3 </item>
-      <item> DAY_4 </item>
-      <item> DAY_5 </item>
-      <item> DAY_6 </item>
-      <item> DAY_7 </item>
-      <item> ABMON_1 </item>
-      <item> ABMON_2 </item>
-      <item> ABMON_3 </item>
-      <item> ABMON_4 </item>
-      <item> ABMON_5 </item>
-      <item> ABMON_6 </item>
-      <item> ABMON_7 </item>
-      <item> ABMON_8 </item>
-      <item> ABMON_9 </item>
-      <item> ABMON_10 </item>
-      <item> ABMON_11 </item>
-      <item> ABMON_12 </item>
-      <item> MON_1 </item>
-      <item> MON_2 </item>
-      <item> MON_3 </item>
-      <item> MON_4 </item>
-      <item> MON_5 </item>
-      <item> MON_6 </item>
-      <item> MON_7 </item>
-      <item> MON_8 </item>
-      <item> MON_9 </item>
-      <item> MON_10 </item>
-      <item> MON_11 </item>
-      <item> MON_12 </item>
-      <item> AM_STR </item>
-      <item> PM_STR </item>
-      <item> D_T_FMT </item>
-      <item> D_FMT </item>
-      <item> T_FMT </item>
-      <item> T_FMT_AMPM </item>
-      <item> ERA </item>
-      <item> ERA_D_T_FMT </item>
-      <item> ERA_D_FMT </item>
-      <item> ERA_T_FMT </item>
-      <item> ALT_DIGITS </item>
-      <item> CRNCYSTR </item>
-      <item> RADIXCHAR </item>
-      <item> THOUSEP </item>
-      <item> YESEXPR </item>
-      <item> NOEXPR </item>
-      <item> CODESET </item>
-      <item> CRYPT_SALT_LENGTH </item>
-      <item> CRYPT_STD_DES </item>
-      <item> CRYPT_EXT_DES </item>
-      <item> CRYPT_MD5 </item>
-      <item> CRYPT_BLOWFISH </item>
-      <item> DIRECTORY_SEPARATOR </item>
-      <item> PATH_SEPARATOR </item>
-      <item> GLOB_BRACE </item>
-      <item> GLOB_MARK </item>
-      <item> GLOB_NOSORT </item>
-      <item> GLOB_NOCHECK </item>
-      <item> GLOB_NOESCAPE </item>
-      <item> GLOB_ONLYDIR </item>
-      <item> LOG_EMERG </item>
-      <item> LOG_ALERT </item>
-      <item> LOG_CRIT </item>
-      <item> LOG_ERR </item>
-      <item> LOG_WARNING </item>
-      <item> LOG_NOTICE </item>
-      <item> LOG_INFO </item>
-      <item> LOG_DEBUG </item>
-      <item> LOG_KERN </item>
-      <item> LOG_USER </item>
-      <item> LOG_MAIL </item>
-      <item> LOG_DAEMON </item>
-      <item> LOG_AUTH </item>
-      <item> LOG_SYSLOG </item>
-      <item> LOG_LPR </item>
-      <item> LOG_NEWS </item>
-      <item> LOG_UUCP </item>
-      <item> LOG_CRON </item>
-      <item> LOG_AUTHPRIV </item>
-      <item> LOG_LOCAL0 </item>
-      <item> LOG_LOCAL1 </item>
-      <item> LOG_LOCAL2 </item>
-      <item> LOG_LOCAL3 </item>
-      <item> LOG_LOCAL4 </item>
-      <item> LOG_LOCAL5 </item>
-      <item> LOG_LOCAL6 </item>
-      <item> LOG_LOCAL7 </item>
-      <item> LOG_PID </item>
-      <item> LOG_CONS </item>
-      <item> LOG_ODELAY </item>
-      <item> LOG_NDELAY </item>
-      <item> LOG_NOWAIT </item>
-      <item> LOG_PERROR </item>
-      <item> EXTR_OVERWRITE </item>
-      <item> EXTR_SKIP </item>
-      <item> EXTR_PREFIX_SAME </item>
-      <item> EXTR_PREFIX_ALL </item>
-      <item> EXTR_PREFIX_INVALID </item>
-      <item> EXTR_PREFIX_IF_EXISTS </item>
-      <item> EXTR_IF_EXISTS </item>
-      <item> EXTR_REFS </item>
-      <item> SORT_ASC </item>
-      <item> SORT_DESC </item>
-      <item> SORT_REGULAR </item>
-      <item> SORT_NUMERIC </item>
-      <item> SORT_STRING </item>
-      <item> SORT_LOCALE_STRING </item>
-      <item> CASE_LOWER </item>
-      <item> CASE_UPPER </item>
-      <item> COUNT_NORMAL </item>
-      <item> COUNT_RECURSIVE </item>
-      <item> ASSERT_ACTIVE </item>
-      <item> ASSERT_CALLBACK </item>
-      <item> ASSERT_BAIL </item>
-      <item> ASSERT_WARNING </item>
-      <item> ASSERT_QUIET_EVAL </item>
-      <item> STREAM_USE_PATH </item>
-      <item> STREAM_IGNORE_URL </item>
-      <item> STREAM_ENFORCE_SAFE_MODE </item>
-      <item> STREAM_REPORT_ERRORS </item>
-      <item> STREAM_MUST_SEEK </item>
-      <item> STREAM_URL_STAT_LINK </item>
-      <item> STREAM_URL_STAT_QUIET </item>
-      <item> STREAM_MKDIR_RECURSIVE </item>
-      <item> IMAGETYPE_GIF </item>
-      <item> IMAGETYPE_JPEG </item>
-      <item> IMAGETYPE_PNG </item>
-      <item> IMAGETYPE_SWF </item>
-      <item> IMAGETYPE_PSD </item>
-      <item> IMAGETYPE_BMP </item>
-      <item> IMAGETYPE_TIFF_II </item>
-      <item> IMAGETYPE_TIFF_MM </item>
-      <item> IMAGETYPE_JPC </item>
-      <item> IMAGETYPE_JP2 </item>
-      <item> IMAGETYPE_JPX </item>
-      <item> IMAGETYPE_JB2 </item>
-      <item> IMAGETYPE_IFF </item>
-      <item> IMAGETYPE_WBMP </item>
-      <item> IMAGETYPE_JPEG2000 </item>
-      <item> IMAGETYPE_XBM </item>
-      <item> DNS_A </item>
-      <item> DNS_NS </item>
-      <item> DNS_CNAME </item>
-      <item> DNS_SOA </item>
-      <item> DNS_PTR </item>
-      <item> DNS_HINFO </item>
-      <item> DNS_MX </item>
-      <item> DNS_TXT </item>
-      <item> DNS_SRV </item>
-      <item> DNS_NAPTR </item>
-      <item> DNS_AAAA </item>
-      <item> DNS_ANY </item>
-      <item> DNS_ALL </item>
-      <item> RIT_LEAVES_ONLY </item>
-      <item> RIT_SELF_FIRST </item>
-      <item> RIT_CHILD_FIRST </item>
-      <item> CIT_CALL_TOSTRING </item>
-      <item> CIT_CATCH_GET_CHILD </item>
-      <item> PREG_PATTERN_ORDER </item>
-      <item> PREG_SET_ORDER </item>
-      <item> PREG_OFFSET_CAPTURE </item>
-      <item> PREG_SPLIT_NO_EMPTY </item>
-      <item> PREG_SPLIT_DELIM_CAPTURE </item>
-      <item> PREG_SPLIT_OFFSET_CAPTURE </item>
-      <item> PREG_GREP_INVERT </item>
-      <item> CAL_GREGORIAN </item>
-      <item> CAL_JULIAN </item>
-      <item> CAL_JEWISH </item>
-      <item> CAL_FRENCH </item>
-      <item> CAL_NUM_CALS </item>
-      <item> CAL_DOW_DAYNO </item>
-      <item> CAL_DOW_SHORT </item>
-      <item> CAL_DOW_LONG </item>
-      <item> CAL_MONTH_GREGORIAN_SHORT </item>
-      <item> CAL_MONTH_GREGORIAN_LONG </item>
-      <item> CAL_MONTH_JULIAN_SHORT </item>
-      <item> CAL_MONTH_JULIAN_LONG </item>
-      <item> CAL_MONTH_JEWISH </item>
-      <item> CAL_MONTH_FRENCH </item>
-      <item> CAL_EASTER_DEFAULT </item>
-      <item> CAL_EASTER_ROMAN </item>
-      <item> CAL_EASTER_ALWAYS_GREGORIAN </item>
-      <item> CAL_EASTER_ALWAYS_JULIAN </item>
-      <item> CAL_JEWISH_ADD_ALAFIM_GERESH </item>
-      <item> CAL_JEWISH_ADD_ALAFIM </item>
-      <item> CAL_JEWISH_ADD_GERESHAYIM </item>
-      <item> CURLOPT_DNS_USE_GLOBAL_CACHE </item>
-      <item> CURLOPT_DNS_CACHE_TIMEOUT </item>
-      <item> CURLOPT_PORT </item>
-      <item> CURLOPT_FILE </item>
-      <item> CURLOPT_READDATA </item>
-      <item> CURLOPT_INFILE </item>
-      <item> CURLOPT_INFILESIZE </item>
-      <item> CURLOPT_URL </item>
-      <item> CURLOPT_PROXY </item>
-      <item> CURLOPT_VERBOSE </item>
-      <item> CURLOPT_HEADER </item>
-      <item> CURLOPT_HTTPHEADER </item>
-      <item> CURLOPT_NOPROGRESS </item>
-      <item> CURLOPT_NOBODY </item>
-      <item> CURLOPT_FAILONERROR </item>
-      <item> CURLOPT_UPLOAD </item>
-      <item> CURLOPT_POST </item>
-      <item> CURLOPT_FTPLISTONLY </item>
-      <item> CURLOPT_FTPAPPEND </item>
-      <item> CURLOPT_NETRC </item>
-      <item> CURLOPT_FOLLOWLOCATION </item>
-      <item> CURLOPT_FTPASCII </item>
-      <item> CURLOPT_PUT </item>
-      <item> CURLOPT_MUTE </item>
-      <item> CURLOPT_USERPWD </item>
-      <item> CURLOPT_PROXYUSERPWD </item>
-      <item> CURLOPT_RANGE </item>
-      <item> CURLOPT_TIMEOUT </item>
-      <item> CURLOPT_POSTFIELDS </item>
-      <item> CURLOPT_REFERER </item>
-      <item> CURLOPT_USERAGENT </item>
-      <item> CURLOPT_FTPPORT </item>
-      <item> CURLOPT_FTP_USE_EPSV </item>
-      <item> CURLOPT_LOW_SPEED_LIMIT </item>
-      <item> CURLOPT_LOW_SPEED_TIME </item>
-      <item> CURLOPT_RESUME_FROM </item>
-      <item> CURLOPT_COOKIE </item>
-      <item> CURLOPT_SSLCERT </item>
-      <item> CURLOPT_SSLCERTPASSWD </item>
-      <item> CURLOPT_WRITEHEADER </item>
-      <item> CURLOPT_SSL_VERIFYHOST </item>
-      <item> CURLOPT_COOKIEFILE </item>
-      <item> CURLOPT_SSLVERSION </item>
-      <item> CURLOPT_TIMECONDITION </item>
-      <item> CURLOPT_TIMEVALUE </item>
-      <item> CURLOPT_CUSTOMREQUEST </item>
-      <item> CURLOPT_STDERR </item>
-      <item> CURLOPT_TRANSFERTEXT </item>
-      <item> CURLOPT_RETURNTRANSFER </item>
-      <item> CURLOPT_QUOTE </item>
-      <item> CURLOPT_POSTQUOTE </item>
-      <item> CURLOPT_INTERFACE </item>
-      <item> CURLOPT_KRB4LEVEL </item>
-      <item> CURLOPT_HTTPPROXYTUNNEL </item>
-      <item> CURLOPT_FILETIME </item>
-      <item> CURLOPT_WRITEFUNCTION </item>
-      <item> CURLOPT_READFUNCTION </item>
-      <item> CURLOPT_PASSWDFUNCTION </item>
-      <item> CURLOPT_HEADERFUNCTION </item>
-      <item> CURLOPT_MAXREDIRS </item>
-      <item> CURLOPT_MAXCONNECTS </item>
-      <item> CURLOPT_CLOSEPOLICY </item>
-      <item> CURLOPT_FRESH_CONNECT </item>
-      <item> CURLOPT_FORBID_REUSE </item>
-      <item> CURLOPT_RANDOM_FILE </item>
-      <item> CURLOPT_EGDSOCKET </item>
-      <item> CURLOPT_CONNECTTIMEOUT </item>
-      <item> CURLOPT_SSL_VERIFYPEER </item>
-      <item> CURLOPT_CAINFO </item>
-      <item> CURLOPT_CAPATH </item>
-      <item> CURLOPT_COOKIEJAR </item>
-      <item> CURLOPT_SSL_CIPHER_LIST </item>
-      <item> CURLOPT_BINARYTRANSFER </item>
-      <item> CURLOPT_NOSIGNAL </item>
-      <item> CURLOPT_PROXYTYPE </item>
-      <item> CURLOPT_BUFFERSIZE </item>
-      <item> CURLOPT_HTTPGET </item>
-      <item> CURLOPT_HTTP_VERSION </item>
-      <item> CURLOPT_SSLKEY </item>
-      <item> CURLOPT_SSLKEYTYPE </item>
-      <item> CURLOPT_SSLKEYPASSWD </item>
-      <item> CURLOPT_SSLENGINE </item>
-      <item> CURLOPT_SSLENGINE_DEFAULT </item>
-      <item> CURLOPT_SSLCERTTYPE </item>
-      <item> CURLOPT_CRLF </item>
-      <item> CURLOPT_ENCODING </item>
-      <item> CURLOPT_PROXYPORT </item>
-      <item> CURLOPT_UNRESTRICTED_AUTH </item>
-      <item> CURLOPT_FTP_USE_EPRT </item>
-      <item> CURLOPT_HTTP200ALIASES </item>
-      <item> CURL_TIMECOND_IFMODSINCE </item>
-      <item> CURL_TIMECOND_IFUNMODSINCE </item>
-      <item> CURL_TIMECOND_LASTMOD </item>
-      <item> CURLOPT_HTTPAUTH </item>
-      <item> CURLAUTH_BASIC </item>
-      <item> CURLAUTH_DIGEST </item>
-      <item> CURLAUTH_GSSNEGOTIATE </item>
-      <item> CURLAUTH_NTLM </item>
-      <item> CURLAUTH_ANY </item>
-      <item> CURLAUTH_ANYSAFE </item>
-      <item> CURLOPT_PROXYAUTH </item>
-      <item> CURLCLOSEPOLICY_LEAST_RECENTLY_USED </item>
-      <item> CURLCLOSEPOLICY_LEAST_TRAFFIC </item>
-      <item> CURLCLOSEPOLICY_SLOWEST </item>
-      <item> CURLCLOSEPOLICY_CALLBACK </item>
-      <item> CURLCLOSEPOLICY_OLDEST </item>
-      <item> CURLINFO_EFFECTIVE_URL </item>
-      <item> CURLINFO_HTTP_CODE </item>
-      <item> CURLINFO_HEADER_SIZE </item>
-      <item> CURLINFO_REQUEST_SIZE </item>
-      <item> CURLINFO_TOTAL_TIME </item>
-      <item> CURLINFO_NAMELOOKUP_TIME </item>
-      <item> CURLINFO_CONNECT_TIME </item>
-      <item> CURLINFO_PRETRANSFER_TIME </item>
-      <item> CURLINFO_SIZE_UPLOAD </item>
-      <item> CURLINFO_SIZE_DOWNLOAD </item>
-      <item> CURLINFO_SPEED_DOWNLOAD </item>
-      <item> CURLINFO_SPEED_UPLOAD </item>
-      <item> CURLINFO_FILETIME </item>
-      <item> CURLINFO_SSL_VERIFYRESULT </item>
-      <item> CURLINFO_CONTENT_LENGTH_DOWNLOAD </item>
-      <item> CURLINFO_CONTENT_LENGTH_UPLOAD </item>
-      <item> CURLINFO_STARTTRANSFER_TIME </item>
-      <item> CURLINFO_CONTENT_TYPE </item>
-      <item> CURLINFO_REDIRECT_TIME </item>
-      <item> CURLINFO_REDIRECT_COUNT </item>
-      <item> CURL_VERSION_IPV6 </item>
-      <item> CURL_VERSION_KERBEROS4 </item>
-      <item> CURL_VERSION_SSL </item>
-      <item> CURL_VERSION_LIBZ </item>
-      <item> CURLVERSION_NOW </item>
-      <item> CURLE_OK </item>
-      <item> CURLE_UNSUPPORTED_PROTOCOL </item>
-      <item> CURLE_FAILED_INIT </item>
-      <item> CURLE_URL_MALFORMAT </item>
-      <item> CURLE_URL_MALFORMAT_USER </item>
-      <item> CURLE_COULDNT_RESOLVE_PROXY </item>
-      <item> CURLE_COULDNT_RESOLVE_HOST </item>
-      <item> CURLE_COULDNT_CONNECT </item>
-      <item> CURLE_FTP_WEIRD_SERVER_REPLY </item>
-      <item> CURLE_FTP_ACCESS_DENIED </item>
-      <item> CURLE_FTP_USER_PASSWORD_INCORRECT </item>
-      <item> CURLE_FTP_WEIRD_PASS_REPLY </item>
-      <item> CURLE_FTP_WEIRD_USER_REPLY </item>
-      <item> CURLE_FTP_WEIRD_PASV_REPLY </item>
-      <item> CURLE_FTP_WEIRD_227_FORMAT </item>
-      <item> CURLE_FTP_CANT_GET_HOST </item>
-      <item> CURLE_FTP_CANT_RECONNECT </item>
-      <item> CURLE_FTP_COULDNT_SET_BINARY </item>
-      <item> CURLE_PARTIAL_FILE </item>
-      <item> CURLE_FTP_COULDNT_RETR_FILE </item>
-      <item> CURLE_FTP_WRITE_ERROR </item>
-      <item> CURLE_FTP_QUOTE_ERROR </item>
-      <item> CURLE_HTTP_NOT_FOUND </item>
-      <item> CURLE_WRITE_ERROR </item>
-      <item> CURLE_MALFORMAT_USER </item>
-      <item> CURLE_FTP_COULDNT_STOR_FILE </item>
-      <item> CURLE_READ_ERROR </item>
-      <item> CURLE_OUT_OF_MEMORY </item>
-      <item> CURLE_OPERATION_TIMEOUTED </item>
-      <item> CURLE_FTP_COULDNT_SET_ASCII </item>
-      <item> CURLE_FTP_PORT_FAILED </item>
-      <item> CURLE_FTP_COULDNT_USE_REST </item>
-      <item> CURLE_FTP_COULDNT_GET_SIZE </item>
-      <item> CURLE_HTTP_RANGE_ERROR </item>
-      <item> CURLE_HTTP_POST_ERROR </item>
-      <item> CURLE_SSL_CONNECT_ERROR </item>
-      <item> CURLE_FTP_BAD_DOWNLOAD_RESUME </item>
-      <item> CURLE_FILE_COULDNT_READ_FILE </item>
-      <item> CURLE_LDAP_CANNOT_BIND </item>
-      <item> CURLE_LDAP_SEARCH_FAILED </item>
-      <item> CURLE_LIBRARY_NOT_FOUND </item>
-      <item> CURLE_FUNCTION_NOT_FOUND </item>
-      <item> CURLE_ABORTED_BY_CALLBACK </item>
-      <item> CURLE_BAD_FUNCTION_ARGUMENT </item>
-      <item> CURLE_BAD_CALLING_ORDER </item>
-      <item> CURLE_HTTP_PORT_FAILED </item>
-      <item> CURLE_BAD_PASSWORD_ENTERED </item>
-      <item> CURLE_TOO_MANY_REDIRECTS </item>
-      <item> CURLE_UNKNOWN_TELNET_OPTION </item>
-      <item> CURLE_TELNET_OPTION_SYNTAX </item>
-      <item> CURLE_OBSOLETE </item>
-      <item> CURLE_SSL_PEER_CERTIFICATE </item>
-      <item> CURLE_GOT_NOTHING </item>
-      <item> CURLE_SSL_ENGINE_NOTFOUND </item>
-      <item> CURLE_SSL_ENGINE_SETFAILED </item>
-      <item> CURLE_SEND_ERROR </item>
-      <item> CURLE_RECV_ERROR </item>
-      <item> CURLE_SHARE_IN_USE </item>
-      <item> CURLE_SSL_CERTPROBLEM </item>
-      <item> CURLE_SSL_CIPHER </item>
-      <item> CURLE_SSL_CACERT </item>
-      <item> CURLE_BAD_CONTENT_ENCODING </item>
-      <item> CURLPROXY_HTTP </item>
-      <item> CURLPROXY_SOCKS5 </item>
-      <item> CURL_NETRC_OPTIONAL </item>
-      <item> CURL_NETRC_IGNORED </item>
-      <item> CURL_NETRC_REQUIRED </item>
-      <item> CURL_HTTP_VERSION_NONE </item>
-      <item> CURL_HTTP_VERSION_1_0 </item>
-      <item> CURL_HTTP_VERSION_1_1 </item>
-      <item> CURLM_CALL_MULTI_PERFORM </item>
-      <item> CURLM_OK </item>
-      <item> CURLM_BAD_HANDLE </item>
-      <item> CURLM_BAD_EASY_HANDLE </item>
-      <item> CURLM_OUT_OF_MEMORY </item>
-      <item> CURLM_INTERNAL_ERROR </item>
-      <item> CURLMSG_DONE </item>
-      <item> DBX_MYSQL </item>
-      <item> DBX_ODBC </item>
-      <item> DBX_PGSQL </item>
-      <item> DBX_MSSQL </item>
-      <item> DBX_FBSQL </item>
-      <item> DBX_OCI8 </item>
-      <item> DBX_SYBASECT </item>
-      <item> DBX_SQLITE </item>
-      <item> DBX_PERSISTENT </item>
-      <item> DBX_RESULT_INFO </item>
-      <item> DBX_RESULT_INDEX </item>
-      <item> DBX_RESULT_ASSOC </item>
-      <item> DBX_RESULT_UNBUFFERED </item>
-      <item> DBX_COLNAMES_UNCHANGED </item>
-      <item> DBX_COLNAMES_UPPERCASE </item>
-      <item> DBX_COLNAMES_LOWERCASE </item>
-      <item> DBX_CMP_NATIVE </item>
-      <item> DBX_CMP_TEXT </item>
-      <item> DBX_CMP_NUMBER </item>
-      <item> DBX_CMP_ASC </item>
-      <item> DBX_CMP_DESC </item>
-      <item> O_RDONLY </item>
-      <item> O_WRONLY </item>
-      <item> O_RDWR </item>
-      <item> O_CREAT </item>
-      <item> O_EXCL </item>
-      <item> O_TRUNC </item>
-      <item> O_APPEND </item>
-      <item> O_NONBLOCK </item>
-      <item> O_NDELAY </item>
-      <item> O_SYNC </item>
-      <item> O_ASYNC </item>
-      <item> O_NOCTTY </item>
-      <item> S_IRWXU </item>
-      <item> S_IRUSR </item>
-      <item> S_IWUSR </item>
-      <item> S_IXUSR </item>
-      <item> S_IRWXG </item>
-      <item> S_IRGRP </item>
-      <item> S_IWGRP </item>
-      <item> S_IXGRP </item>
-      <item> S_IRWXO </item>
-      <item> S_IROTH </item>
-      <item> S_IWOTH </item>
-      <item> S_IXOTH </item>
-      <item> F_DUPFD </item>
-      <item> F_GETFD </item>
-      <item> F_GETFL </item>
-      <item> F_SETFL </item>
-      <item> F_GETLK </item>
-      <item> F_SETLK </item>
-      <item> F_SETLKW </item>
-      <item> F_SETOWN </item>
-      <item> F_GETOWN </item>
-      <item> F_UNLCK </item>
-      <item> F_RDLCK </item>
-      <item> F_WRLCK </item>
-      <item> XML_ELEMENT_NODE </item>
-      <item> XML_ATTRIBUTE_NODE </item>
       <item> XML_TEXT_NODE </item>
-      <item> XML_CDATA_SECTION_NODE </item>
-      <item> XML_ENTITY_REF_NODE </item>
-      <item> XML_ENTITY_NODE </item>
-      <item> XML_PI_NODE </item>
-      <item> XML_COMMENT_NODE </item>
-      <item> XML_DOCUMENT_NODE </item>
-      <item> XML_DOCUMENT_TYPE_NODE </item>
-      <item> XML_DOCUMENT_FRAG_NODE </item>
-      <item> XML_NOTATION_NODE </item>
-      <item> XML_HTML_DOCUMENT_NODE </item>
-      <item> XML_DTD_NODE </item>
-      <item> XML_ELEMENT_DECL_NODE </item>
-      <item> XML_ATTRIBUTE_DECL_NODE </item>
-      <item> XML_ENTITY_DECL_NODE </item>
-      <item> XML_NAMESPACE_DECL_NODE </item>
-      <item> XML_LOCAL_NAMESPACE </item>
-      <item> XML_ATTRIBUTE_CDATA </item>
-      <item> XML_ATTRIBUTE_ID </item>
-      <item> XML_ATTRIBUTE_IDREF </item>
-      <item> XML_ATTRIBUTE_IDREFS </item>
-      <item> XML_ATTRIBUTE_ENTITY </item>
-      <item> XML_ATTRIBUTE_NMTOKEN </item>
-      <item> XML_ATTRIBUTE_NMTOKENS </item>
-      <item> XML_ATTRIBUTE_ENUMERATION </item>
-      <item> XML_ATTRIBUTE_NOTATION </item>
-      <item> DOM_PHP_ERR </item>
-      <item> DOM_INDEX_SIZE_ERR </item>
-      <item> DOMSTRING_SIZE_ERR </item>
-      <item> DOM_HIERARCHY_REQUEST_ERR </item>
-      <item> DOM_WRONG_DOCUMENT_ERR </item>
-      <item> DOM_INVALID_CHARACTER_ERR </item>
-      <item> DOM_NO_DATA_ALLOWED_ERR </item>
-      <item> DOM_NO_MODIFICATION_ALLOWED_ERR </item>
-      <item> DOM_NOT_FOUND_ERR </item>
-      <item> DOM_NOT_SUPPORTED_ERR </item>
-      <item> DOM_INUSE_ATTRIBUTE_ERR </item>
-      <item> DOM_INVALID_STATE_ERR </item>
-      <item> DOM_SYNTAX_ERR </item>
-      <item> DOM_INVALID_MODIFICATION_ERR </item>
-      <item> DOM_NAMESPACE_ERR </item>
-      <item> DOM_INVALID_ACCESS_ERR </item>
-      <item> DOM_VALIDATION_ERR </item>
-      <item> EXIF_USE_MBSTRING </item>
-      <item> FAMChanged </item>
-      <item> FAMDeleted </item>
-      <item> FAMStartExecuting </item>
-      <item> FAMStopExecuting </item>
-      <item> FAMCreated </item>
-      <item> FAMMoved </item>
-      <item> FAMAcknowledge </item>
-      <item> FAMExists </item>
-      <item> FAMEndExist </item>
-      <item> FTP_ASCII </item>
-      <item> FTP_TEXT </item>
-      <item> FTP_BINARY </item>
-      <item> FTP_IMAGE </item>
-      <item> FTP_AUTORESUME </item>
-      <item> FTP_TIMEOUT_SEC </item>
-      <item> FTP_AUTOSEEK </item>
-      <item> FTP_FAILED </item>
-      <item> FTP_FINISHED </item>
-      <item> FTP_MOREDATA </item>
-      <item> IMG_GIF </item>
-      <item> IMG_JPG </item>
-      <item> IMG_JPEG </item>
-      <item> IMG_PNG </item>
-      <item> IMG_WBMP </item>
-      <item> IMG_XPM </item>
-      <item> IMG_COLOR_TILED </item>
-      <item> IMG_COLOR_STYLED </item>
-      <item> IMG_COLOR_BRUSHED </item>
-      <item> IMG_COLOR_STYLEDBRUSHED </item>
-      <item> IMG_COLOR_TRANSPARENT </item>
-      <item> IMG_ARC_ROUNDED </item>
-      <item> IMG_ARC_PIE </item>
-      <item> IMG_ARC_CHORD </item>
-      <item> IMG_ARC_NOFILL </item>
-      <item> IMG_ARC_EDGED </item>
-      <item> IMG_GD2_RAW </item>
-      <item> IMG_GD2_COMPRESSED </item>
-      <item> IMG_EFFECT_REPLACE </item>
-      <item> IMG_EFFECT_ALPHABLEND </item>
-      <item> IMG_EFFECT_NORMAL </item>
-      <item> IMG_EFFECT_OVERLAY </item>
-      <item> GD_BUNDLED </item>
-      <item> IMG_FILTER_NEGATE </item>
-      <item> IMG_FILTER_GRAYSCALE </item>
-      <item> IMG_FILTER_BRIGHTNESS </item>
-      <item> IMG_FILTER_CONTRAST </item>
-      <item> IMG_FILTER_COLORIZE </item>
-      <item> IMG_FILTER_EDGEDETECT </item>
-      <item> IMG_FILTER_GAUSSIAN_BLUR </item>
-      <item> IMG_FILTER_SELECTIVE_BLUR </item>
-      <item> IMG_FILTER_EMBOSS </item>
-      <item> IMG_FILTER_MEAN_REMOVAL </item>
-      <item> IMG_FILTER_SMOOTH </item>
-      <item> GMP_ROUND_ZERO </item>
-      <item> GMP_ROUND_PLUSINF </item>
-      <item> GMP_ROUND_MINUSINF </item>
-      <item> ICONV_IMPL </item>
-      <item> ICONV_VERSION </item>
-      <item> ICONV_MIME_DECODE_STRICT </item>
-      <item> ICONV_MIME_DECODE_CONTINUE_ON_ERROR </item>
-      <item> NIL </item>
-      <item> IMAP_OPENTIMEOUT </item>
-      <item> IMAP_READTIMEOUT </item>
-      <item> IMAP_WRITETIMEOUT </item>
-      <item> IMAP_CLOSETIMEOUT </item>
-      <item> OP_DEBUG </item>
-      <item> OP_READONLY </item>
-      <item> OP_ANONYMOUS </item>
-      <item> OP_SHORTCACHE </item>
-      <item> OP_SILENT </item>
-      <item> OP_PROTOTYPE </item>
-      <item> OP_HALFOPEN </item>
-      <item> OP_EXPUNGE </item>
-      <item> OP_SECURE </item>
-      <item> CL_EXPUNGE </item>
-      <item> FT_UID </item>
-      <item> FT_PEEK </item>
-      <item> FT_NOT </item>
-      <item> FT_INTERNAL </item>
-      <item> FT_PREFETCHTEXT </item>
-      <item> ST_UID </item>
-      <item> ST_SILENT </item>
-      <item> ST_SET </item>
-      <item> CP_UID </item>
-      <item> CP_MOVE </item>
-      <item> SE_UID </item>
-      <item> SE_FREE </item>
-      <item> SE_NOPREFETCH </item>
-      <item> SO_FREE </item>
-      <item> SO_NOSERVER </item>
-      <item> SA_MESSAGES </item>
-      <item> SA_RECENT </item>
-      <item> SA_UNSEEN </item>
-      <item> SA_UIDNEXT </item>
-      <item> SA_UIDVALIDITY </item>
-      <item> SA_ALL </item>
-      <item> LATT_NOINFERIORS </item>
-      <item> LATT_NOSELECT </item>
-      <item> LATT_MARKED </item>
-      <item> LATT_UNMARKED </item>
-      <item> LATT_REFERRAL </item>
-      <item> LATT_HASCHILDREN </item>
-      <item> LATT_HASNOCHILDREN </item>
-      <item> SORTDATE </item>
-      <item> SORTARRIVAL </item>
-      <item> SORTFROM </item>
-      <item> SORTSUBJECT </item>
-      <item> SORTTO </item>
-      <item> SORTCC </item>
-      <item> SORTSIZE </item>
-      <item> TYPETEXT </item>
-      <item> TYPEMULTIPART </item>
-      <item> TYPEMESSAGE </item>
-      <item> TYPEAPPLICATION </item>
-      <item> TYPEAUDIO </item>
-      <item> TYPEIMAGE </item>
-      <item> TYPEVIDEO </item>
-      <item> TYPEMODEL </item>
-      <item> TYPEOTHER </item>
-      <item> ENC7BIT </item>
-      <item> ENC8BIT </item>
-      <item> ENCBINARY </item>
-      <item> ENCBASE64 </item>
-      <item> ENCQUOTEDPRINTABLE </item>
-      <item> ENCOTHER </item>
-      <item> LDAP_DEREF_NEVER </item>
-      <item> LDAP_DEREF_SEARCHING </item>
-      <item> LDAP_DEREF_FINDING </item>
-      <item> LDAP_DEREF_ALWAYS </item>
-      <item> LDAP_OPT_DEREF </item>
-      <item> LDAP_OPT_SIZELIMIT </item>
-      <item> LDAP_OPT_TIMELIMIT </item>
-      <item> LDAP_OPT_PROTOCOL_VERSION </item>
-      <item> LDAP_OPT_ERROR_NUMBER </item>
-      <item> LDAP_OPT_REFERRALS </item>
-      <item> LDAP_OPT_RESTART </item>
-      <item> LDAP_OPT_HOST_NAME </item>
-      <item> LDAP_OPT_ERROR_STRING </item>
-      <item> LDAP_OPT_MATCHED_DN </item>
-      <item> LDAP_OPT_SERVER_CONTROLS </item>
-      <item> LDAP_OPT_CLIENT_CONTROLS </item>
-      <item> LDAP_OPT_DEBUG_LEVEL </item>
-      <item> MB_OVERLOAD_MAIL </item>
-      <item> MB_OVERLOAD_STRING </item>
-      <item> MB_OVERLOAD_REGEX </item>
-      <item> MB_CASE_UPPER </item>
-      <item> MB_CASE_LOWER </item>
-      <item> MB_CASE_TITLE </item>
-      <item> MCRYPT_ENCRYPT </item>
-      <item> MCRYPT_DECRYPT </item>
-      <item> MCRYPT_DEV_RANDOM </item>
-      <item> MCRYPT_DEV_URANDOM </item>
-      <item> MCRYPT_RAND </item>
-      <item> MCRYPT_3DES </item>
-      <item> MCRYPT_ARCFOUR_IV </item>
-      <item> MCRYPT_ARCFOUR </item>
-      <item> MCRYPT_BLOWFISH </item>
-      <item> MCRYPT_BLOWFISH_COMPAT </item>
-      <item> MCRYPT_CAST_128 </item>
-      <item> MCRYPT_CAST_256 </item>
-      <item> MCRYPT_CRYPT </item>
-      <item> MCRYPT_DES </item>
-      <item> MCRYPT_ENIGNA </item>
-      <item> MCRYPT_GOST </item>
-      <item> MCRYPT_LOKI97 </item>
-      <item> MCRYPT_PANAMA </item>
-      <item> MCRYPT_RC2 </item>
-      <item> MCRYPT_RIJNDAEL_128 </item>
-      <item> MCRYPT_RIJNDAEL_192 </item>
-      <item> MCRYPT_RIJNDAEL_256 </item>
-      <item> MCRYPT_SAFER64 </item>
-      <item> MCRYPT_SAFER128 </item>
-      <item> MCRYPT_SAFERPLUS </item>
-      <item> MCRYPT_SERPENT </item>
-      <item> MCRYPT_THREEWAY </item>
-      <item> MCRYPT_TRIPLEDES </item>
-      <item> MCRYPT_TWOFISH </item>
-      <item> MCRYPT_WAKE </item>
-      <item> MCRYPT_XTEA </item>
-      <item> MCRYPT_IDEA </item>
-      <item> MCRYPT_MARS </item>
-      <item> MCRYPT_RC6 </item>
-      <item> MCRYPT_SKIPJACK </item>
-      <item> MCRYPT_MODE_CBC </item>
-      <item> MCRYPT_MODE_CFB </item>
-      <item> MCRYPT_MODE_ECB </item>
-      <item> MCRYPT_MODE_NOFB </item>
-      <item> MCRYPT_MODE_OFB </item>
-      <item> MCRYPT_MODE_STREAM </item>
-      <item> MHASH_CRC32 </item>
-      <item> MHASH_MD5 </item>
-      <item> MHASH_SHA1 </item>
-      <item> MHASH_HAVAL256 </item>
-      <item> MHASH_RIPEMD160 </item>
-      <item> MHASH_TIGER </item>
-      <item> MHASH_GOST </item>
-      <item> MHASH_CRC32B </item>
-      <item> MHASH_HAVAL224 </item>
-      <item> MHASH_HAVAL192 </item>
-      <item> MHASH_HAVAL160 </item>
-      <item> MHASH_HAVAL128 </item>
-      <item> MHASH_TIGER128 </item>
-      <item> MHASH_TIGER160 </item>
-      <item> MHASH_MD4 </item>
-      <item> MHASH_SHA256 </item>
-      <item> MHASH_ADLER32 </item>
-      <item> MHASH_SHA224 </item>
-      <item> MHASH_SHA512 </item>
-      <item> MHASH_SHA384 </item>
-      <item> MHASH_WHIRLPOOL </item>
-      <item> MHASH_RIPEMD128 </item>
-      <item> MHASH_RIPEMD256 </item>
-      <item> MHASH_RIPEMD320 </item>
-      <item> MHASH_SNEFRU128 </item>
-      <item> MHASH_SNEFRU256 </item>
-      <item> MHASH_MD2 </item>
-      <item> MYSQL_ASSOC </item>
-      <item> MYSQL_NUM </item>
-      <item> MYSQL_BOTH </item>
-      <item> MYSQL_CLIENT_COMPRESS </item>
-      <item> MYSQL_CLIENT_SSL </item>
-      <item> MYSQL_CLIENT_INTERACTIVE </item>
-      <item> MYSQL_CLIENT_IGNORE_SPACE </item>
-      <item> MYSQLI_READ_DEFAULT_GROUP </item>
-      <item> MYSQLI_READ_DEFAULT_FILE </item>
-      <item> MYSQLI_OPT_CONNECT_TIMEOUT </item>
-      <item> MYSQLI_OPT_LOCAL_INFILE </item>
-      <item> MYSQLI_INIT_COMMAND </item>
-      <item> MYSQLI_CLIENT_SSL </item>
-      <item> MYSQLI_CLIENT_COMPRESS </item>
-      <item> MYSQLI_CLIENT_INTERACTIVE </item>
-      <item> MYSQLI_CLIENT_IGNORE_SPACE </item>
-      <item> MYSQLI_CLIENT_NO_SCHEMA </item>
-      <item> MYSQLI_CLIENT_FOUND_ROWS </item>
-      <item> MYSQLI_STORE_RESULT </item>
-      <item> MYSQLI_USE_RESULT </item>
-      <item> MYSQLI_ASSOC </item>
-      <item> MYSQLI_NUM </item>
-      <item> MYSQLI_BOTH </item>
-      <item> MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH </item>
-      <item> MYSQLI_NOT_NULL_FLAG </item>
-      <item> MYSQLI_PRI_KEY_FLAG </item>
-      <item> MYSQLI_UNIQUE_KEY_FLAG </item>
-      <item> MYSQLI_MULTIPLE_KEY_FLAG </item>
-      <item> MYSQLI_BLOB_FLAG </item>
-      <item> MYSQLI_UNSIGNED_FLAG </item>
-      <item> MYSQLI_ZEROFILL_FLAG </item>
-      <item> MYSQLI_AUTO_INCREMENT_FLAG </item>
-      <item> MYSQLI_TIMESTAMP_FLAG </item>
-      <item> MYSQLI_SET_FLAG </item>
-      <item> MYSQLI_NUM_FLAG </item>
-      <item> MYSQLI_PART_KEY_FLAG </item>
-      <item> MYSQLI_GROUP_FLAG </item>
-      <item> MYSQLI_TYPE_DECIMAL </item>
-      <item> MYSQLI_TYPE_TINY </item>
-      <item> MYSQLI_TYPE_SHORT </item>
-      <item> MYSQLI_TYPE_LONG </item>
-      <item> MYSQLI_TYPE_FLOAT </item>
-      <item> MYSQLI_TYPE_DOUBLE </item>
-      <item> MYSQLI_TYPE_NULL </item>
-      <item> MYSQLI_TYPE_TIMESTAMP </item>
-      <item> MYSQLI_TYPE_LONGLONG </item>
-      <item> MYSQLI_TYPE_INT24 </item>
-      <item> MYSQLI_TYPE_DATE </item>
-      <item> MYSQLI_TYPE_TIME </item>
-      <item> MYSQLI_TYPE_DATETIME </item>
-      <item> MYSQLI_TYPE_YEAR </item>
-      <item> MYSQLI_TYPE_NEWDATE </item>
-      <item> MYSQLI_TYPE_ENUM </item>
-      <item> MYSQLI_TYPE_SET </item>
-      <item> MYSQLI_TYPE_TINY_BLOB </item>
-      <item> MYSQLI_TYPE_MEDIUM_BLOB </item>
-      <item> MYSQLI_TYPE_LONG_BLOB </item>
-      <item> MYSQLI_TYPE_BLOB </item>
-      <item> MYSQLI_TYPE_VAR_STRING </item>
-      <item> MYSQLI_TYPE_STRING </item>
-      <item> MYSQLI_TYPE_CHAR </item>
-      <item> MYSQLI_TYPE_INTERVAL </item>
-      <item> MYSQLI_TYPE_GEOMETRY </item>
-      <item> MYSQLI_RPL_MASTER </item>
-      <item> MYSQLI_RPL_SLAVE </item>
-      <item> MYSQLI_RPL_ADMIN </item>
-      <item> MYSQLI_NO_DATA </item>
-      <item> MYSQLI_REPORT_INDEX </item>
-      <item> MYSQLI_REPORT_ERROR </item>
-      <item> MYSQLI_REPORT_ALL </item>
-      <item> MYSQLI_REPORT_OFF </item>
-      <item> NCURSES_COLOR_BLACK </item>
-      <item> NCURSES_COLOR_RED </item>
-      <item> NCURSES_COLOR_GREEN </item>
-      <item> NCURSES_COLOR_YELLOW </item>
-      <item> NCURSES_COLOR_BLUE </item>
-      <item> NCURSES_COLOR_MAGENTA </item>
-      <item> NCURSES_COLOR_CYAN </item>
-      <item> NCURSES_COLOR_WHITE </item>
-      <item> NCURSES_KEY_DOWN </item>
-      <item> NCURSES_KEY_UP </item>
-      <item> NCURSES_KEY_LEFT </item>
-      <item> NCURSES_KEY_RIGHT </item>
-      <item> NCURSES_KEY_BACKSPACE </item>
-      <item> NCURSES_KEY_MOUSE </item>
-      <item> NCURSES_KEY_F0 </item>
-      <item> NCURSES_KEY_F1 </item>
-      <item> NCURSES_KEY_F2 </item>
-      <item> NCURSES_KEY_F3 </item>
-      <item> NCURSES_KEY_F4 </item>
-      <item> NCURSES_KEY_F5 </item>
-      <item> NCURSES_KEY_F6 </item>
-      <item> NCURSES_KEY_F7 </item>
-      <item> NCURSES_KEY_F8 </item>
-      <item> NCURSES_KEY_F9 </item>
-      <item> NCURSES_KEY_F10 </item>
-      <item> NCURSES_KEY_F11 </item>
-      <item> NCURSES_KEY_F12 </item>
-      <item> NCURSES_KEY_DL </item>
-      <item> NCURSES_KEY_IL </item>
-      <item> NCURSES_KEY_DC </item>
-      <item> NCURSES_KEY_IC </item>
-      <item> NCURSES_KEY_EIC </item>
-      <item> NCURSES_KEY_CLEAR </item>
-      <item> NCURSES_KEY_EOS </item>
-      <item> NCURSES_KEY_EOL </item>
-      <item> NCURSES_KEY_SF </item>
-      <item> NCURSES_KEY_SR </item>
-      <item> NCURSES_KEY_NPAGE </item>
-      <item> NCURSES_KEY_PPAGE </item>
-      <item> NCURSES_KEY_STAB </item>
-      <item> NCURSES_KEY_CTAB </item>
-      <item> NCURSES_KEY_CATAB </item>
-      <item> NCURSES_KEY_ENTER </item>
-      <item> NCURSES_KEY_SRESET </item>
-      <item> NCURSES_KEY_RESET </item>
-      <item> NCURSES_KEY_PRINT </item>
-      <item> NCURSES_KEY_LL </item>
-      <item> NCURSES_KEY_A1 </item>
-      <item> NCURSES_KEY_A3 </item>
-      <item> NCURSES_KEY_B2 </item>
-      <item> NCURSES_KEY_C1 </item>
-      <item> NCURSES_KEY_C3 </item>
-      <item> NCURSES_KEY_BTAB </item>
-      <item> NCURSES_KEY_BEG </item>
-      <item> NCURSES_KEY_CANCEL </item>
-      <item> NCURSES_KEY_CLOSE </item>
-      <item> NCURSES_KEY_COMMAND </item>
-      <item> NCURSES_KEY_COPY </item>
-      <item> NCURSES_KEY_CREATE </item>
-      <item> NCURSES_KEY_END </item>
-      <item> NCURSES_KEY_EXIT </item>
-      <item> NCURSES_KEY_FIND </item>
-      <item> NCURSES_KEY_HELP </item>
-      <item> NCURSES_KEY_MARK </item>
-      <item> NCURSES_KEY_MESSAGE </item>
-      <item> NCURSES_KEY_MOVE </item>
-      <item> NCURSES_KEY_NEXT </item>
-      <item> NCURSES_KEY_OPEN </item>
-      <item> NCURSES_KEY_OPTIONS </item>
-      <item> NCURSES_KEY_PREVIOUS </item>
-      <item> NCURSES_KEY_REDO </item>
-      <item> NCURSES_KEY_REFERENCE </item>
-      <item> NCURSES_KEY_REFRESH </item>
-      <item> NCURSES_KEY_REPLACE </item>
-      <item> NCURSES_KEY_RESTART </item>
-      <item> NCURSES_KEY_RESUME </item>
-      <item> NCURSES_KEY_SAVE </item>
-      <item> NCURSES_KEY_SBEG </item>
-      <item> NCURSES_KEY_SCANCEL </item>
-      <item> NCURSES_KEY_SCOMMAND </item>
-      <item> NCURSES_KEY_SCOPY </item>
-      <item> NCURSES_KEY_SCREATE </item>
-      <item> NCURSES_KEY_SDC </item>
-      <item> NCURSES_KEY_SDL </item>
-      <item> NCURSES_KEY_SELECT </item>
-      <item> NCURSES_KEY_SEND </item>
-      <item> NCURSES_KEY_SEOL </item>
-      <item> NCURSES_KEY_SEXIT </item>
-      <item> NCURSES_KEY_SFIND </item>
-      <item> NCURSES_KEY_SHELP </item>
-      <item> NCURSES_KEY_SHOME </item>
-      <item> NCURSES_KEY_SIC </item>
-      <item> NCURSES_KEY_SLEFT </item>
-      <item> NCURSES_KEY_SMESSAGE </item>
-      <item> NCURSES_KEY_SMOVE </item>
-      <item> NCURSES_KEY_SNEXT </item>
-      <item> NCURSES_KEY_SOPTIONS </item>
-      <item> NCURSES_KEY_SPREVIOUS </item>
-      <item> NCURSES_KEY_SPRINT </item>
-      <item> NCURSES_KEY_SREDO </item>
-      <item> NCURSES_KEY_SREPLACE </item>
-      <item> NCURSES_KEY_SRIGHT </item>
-      <item> NCURSES_KEY_SRSUME </item>
-      <item> NCURSES_KEY_SSAVE </item>
-      <item> NCURSES_KEY_SSUSPEND </item>
-      <item> NCURSES_KEY_SUNDO </item>
-      <item> NCURSES_KEY_SUSPEND </item>
-      <item> NCURSES_KEY_UNDO </item>
-      <item> NCURSES_KEY_RESIZE </item>
-      <item> NCURSES_A_NORMAL </item>
-      <item> NCURSES_A_STANDOUT </item>
-      <item> NCURSES_A_UNDERLINE </item>
-      <item> NCURSES_A_REVERSE </item>
-      <item> NCURSES_A_BLINK </item>
-      <item> NCURSES_A_DIM </item>
-      <item> NCURSES_A_BOLD </item>
-      <item> NCURSES_A_PROTECT </item>
-      <item> NCURSES_A_INVIS </item>
-      <item> NCURSES_A_ALTCHARSET </item>
-      <item> NCURSES_A_CHARTEXT </item>
-      <item> NCURSES_BUTTON1_PRESSED </item>
-      <item> NCURSES_BUTTON1_RELEASED </item>
-      <item> NCURSES_BUTTON1_CLICKED </item>
-      <item> NCURSES_BUTTON1_DOUBLE_CLICKED </item>
-      <item> NCURSES_BUTTON1_TRIPLE_CLICKED </item>
-      <item> NCURSES_BUTTON2_PRESSED </item>
-      <item> NCURSES_BUTTON2_RELEASED </item>
-      <item> NCURSES_BUTTON2_CLICKED </item>
-      <item> NCURSES_BUTTON2_DOUBLE_CLICKED </item>
-      <item> NCURSES_BUTTON2_TRIPLE_CLICKED </item>
-      <item> NCURSES_BUTTON3_PRESSED </item>
-      <item> NCURSES_BUTTON3_RELEASED </item>
-      <item> NCURSES_BUTTON3_CLICKED </item>
-      <item> NCURSES_BUTTON3_DOUBLE_CLICKED </item>
-      <item> NCURSES_BUTTON3_TRIPLE_CLICKED </item>
-      <item> NCURSES_BUTTON4_PRESSED </item>
-      <item> NCURSES_BUTTON4_RELEASED </item>
-      <item> NCURSES_BUTTON4_CLICKED </item>
-      <item> NCURSES_BUTTON4_DOUBLE_CLICKED </item>
-      <item> NCURSES_BUTTON4_TRIPLE_CLICKED </item>
-      <item> NCURSES_BUTTON_SHIFT </item>
-      <item> NCURSES_BUTTON_CTRL </item>
-      <item> NCURSES_BUTTON_ALT </item>
-      <item> NCURSES_ALL_MOUSE_EVENTS </item>
-      <item> NCURSES_REPORT_MOUSE_POSITION </item>
-      <item> ODBC_TYPE </item>
-      <item> ODBC_BINMODE_PASSTHRU </item>
-      <item> ODBC_BINMODE_RETURN </item>
-      <item> ODBC_BINMODE_CONVERT </item>
-      <item> SQL_ODBC_CURSORS </item>
-      <item> SQL_CUR_USE_DRIVER </item>
-      <item> SQL_CUR_USE_IF_NEEDED </item>
-      <item> SQL_CUR_USE_ODBC </item>
-      <item> SQL_CONCURRENCY </item>
-      <item> SQL_CONCUR_READ_ONLY </item>
-      <item> SQL_CONCUR_LOCK </item>
-      <item> SQL_CONCUR_ROWVER </item>
-      <item> SQL_CONCUR_VALUES </item>
-      <item> SQL_CURSOR_TYPE </item>
-      <item> SQL_CURSOR_FORWARD_ONLY </item>
-      <item> SQL_CURSOR_KEYSET_DRIVEN </item>
-      <item> SQL_CURSOR_DYNAMIC </item>
-      <item> SQL_CURSOR_STATIC </item>
-      <item> SQL_KEYSET_SIZE </item>
-      <item> SQL_FETCH_FIRST </item>
-      <item> SQL_FETCH_NEXT </item>
-      <item> SQL_CHAR </item>
-      <item> SQL_VARCHAR </item>
-      <item> SQL_LONGVARCHAR </item>
-      <item> SQL_DECIMAL </item>
-      <item> SQL_NUMERIC </item>
-      <item> SQL_BIT </item>
-      <item> SQL_TINYINT </item>
-      <item> SQL_SMALLINT </item>
-      <item> SQL_INTEGER </item>
-      <item> SQL_BIGINT </item>
-      <item> SQL_REAL </item>
-      <item> SQL_FLOAT </item>
-      <item> SQL_DOUBLE </item>
-      <item> SQL_BINARY </item>
-      <item> SQL_VARBINARY </item>
-      <item> SQL_LONGVARBINARY </item>
-      <item> SQL_DATE </item>
-      <item> SQL_TIME </item>
-      <item> SQL_TIMESTAMP </item>
-      <item> X509_PURPOSE_SSL_CLIENT </item>
-      <item> X509_PURPOSE_SSL_SERVER </item>
-      <item> X509_PURPOSE_NS_SSL_SERVER </item>
-      <item> X509_PURPOSE_SMIME_SIGN </item>
-      <item> X509_PURPOSE_SMIME_ENCRYPT </item>
-      <item> X509_PURPOSE_CRL_SIGN </item>
-      <item> X509_PURPOSE_ANY </item>
-      <item> OPENSSL_ALGO_SHA1 </item>
-      <item> OPENSSL_ALGO_MD5 </item>
-      <item> OPENSSL_ALGO_MD4 </item>
-      <item> OPENSSL_ALGO_MD2 </item>
-      <item> PKCS7_DETACHED </item>
-      <item> PKCS7_TEXT </item>
-      <item> PKCS7_NOINTERN </item>
-      <item> PKCS7_NOVERIFY </item>
-      <item> PKCS7_NOCHAIN </item>
-      <item> PKCS7_NOCERTS </item>
-      <item> PKCS7_NOATTR </item>
-      <item> PKCS7_BINARY </item>
-      <item> PKCS7_NOSIGS </item>
-      <item> OPENSSL_PKCS1_PADDING </item>
-      <item> OPENSSL_SSLV23_PADDING </item>
-      <item> OPENSSL_NO_PADDING </item>
-      <item> OPENSSL_PKCS1_OAEP_PADDING </item>
-      <item> OPENSSL_CIPHER_RC2_40 </item>
-      <item> OPENSSL_CIPHER_RC2_128 </item>
-      <item> OPENSSL_CIPHER_RC2_64 </item>
-      <item> OPENSSL_CIPHER_DES </item>
-      <item> OPENSSL_CIPHER_3DES </item>
-      <item> OPENSSL_KEYTYPE_RSA </item>
-      <item> OPENSSL_KEYTYPE_DSA </item>
-      <item> OPENSSL_KEYTYPE_DH </item>
-      <item> WNOHANG </item>
-      <item> WUNTRACED </item>
-      <item> SIG_IGN </item>
-      <item> SIG_DFL </item>
-      <item> SIG_ERR </item>
-      <item> SIGHUP </item>
-      <item> SIGINT </item>
-      <item> SIGQUIT </item>
-      <item> SIGILL </item>
-      <item> SIGTRAP </item>
-      <item> SIGABRT </item>
-      <item> SIGIOT </item>
-      <item> SIGBUS </item>
-      <item> SIGFPE </item>
-      <item> SIGKILL </item>
-      <item> SIGUSR1 </item>
-      <item> SIGSEGV </item>
-      <item> SIGUSR2 </item>
-      <item> SIGPIPE </item>
-      <item> SIGALRM </item>
-      <item> SIGTERM </item>
-      <item> SIGSTKFLT </item>
-      <item> SIGCLD </item>
-      <item> SIGCHLD </item>
-      <item> SIGCONT </item>
-      <item> SIGSTOP </item>
-      <item> SIGTSTP </item>
-      <item> SIGTTIN </item>
-      <item> SIGTTOU </item>
-      <item> SIGURG </item>
-      <item> SIGXCPU </item>
-      <item> SIGXFSZ </item>
-      <item> SIGVTALRM </item>
-      <item> SIGPROF </item>
-      <item> SIGWINCH </item>
-      <item> SIGPOLL </item>
-      <item> SIGIO </item>
-      <item> SIGPWR </item>
-      <item> SIGSYS </item>
-      <item> SIGBABY </item>
-      <item> PRIO_PGRP </item>
-      <item> PRIO_USER </item>
-      <item> PRIO_PROCESS </item>
-      <item> PGSQL_CONNECT_FORCE_NEW </item>
-      <item> PGSQL_ASSOC </item>
-      <item> PGSQL_NUM </item>
-      <item> PGSQL_BOTH </item>
-      <item> PGSQL_CONNECTION_BAD </item>
-      <item> PGSQL_CONNECTION_OK </item>
-      <item> PGSQL_SEEK_SET </item>
-      <item> PGSQL_SEEK_CUR </item>
-      <item> PGSQL_SEEK_END </item>
-      <item> PGSQL_STATUS_LONG </item>
-      <item> PGSQL_STATUS_STRING </item>
-      <item> PGSQL_EMPTY_QUERY </item>
-      <item> PGSQL_COMMAND_OK </item>
-      <item> PGSQL_TUPLES_OK </item>
-      <item> PGSQL_COPY_OUT </item>
-      <item> PGSQL_COPY_IN </item>
-      <item> PGSQL_BAD_RESPONSE </item>
-      <item> PGSQL_NONFATAL_ERROR </item>
-      <item> PGSQL_FATAL_ERROR </item>
-      <item> PGSQL_CONV_IGNORE_DEFAULT </item>
-      <item> PGSQL_CONV_FORCE_NULL </item>
-      <item> PGSQL_CONV_IGNORE_NOT_NULL </item>
-      <item> PGSQL_DML_NO_CONV </item>
-      <item> PGSQL_DML_EXEC </item>
-      <item> PGSQL_DML_ASYNC </item>
-      <item> PGSQL_DML_STRING </item>
-      <item> SNMP_VALUE_LIBRARY </item>
-      <item> SNMP_VALUE_PLAIN </item>
-      <item> SNMP_VALUE_OBJECT </item>
-      <item> SNMP_BIT_STR </item>
-      <item> SNMP_OCTET_STR </item>
-      <item> SNMP_OPAQUE </item>
-      <item> SNMP_NULL </item>
-      <item> SNMP_OBJECT_ID </item>
-      <item> SNMP_IPADDRESS </item>
-      <item> SNMP_COUNTER </item>
-      <item> SNMP_UNSIGNED </item>
-      <item> SNMP_TIMETICKS </item>
-      <item> SNMP_UINTEGER </item>
-      <item> SNMP_INTEGER </item>
-      <item> SNMP_COUNTER64 </item>
-      <item> SOAP_1_1 </item>
-      <item> SOAP_1_2 </item>
-      <item> SOAP_PERSISTENCE_SESSION </item>
-      <item> SOAP_PERSISTENCE_REQUEST </item>
-      <item> SOAP_FUNCTIONS_ALL </item>
-      <item> SOAP_ENCODED </item>
-      <item> SOAP_LITERAL </item>
-      <item> SOAP_RPC </item>
-      <item> SOAP_DOCUMENT </item>
-      <item> SOAP_ACTOR_NEXT </item>
-      <item> SOAP_ACTOR_NONE </item>
-      <item> SOAP_ACTOR_UNLIMATERECEIVER </item>
-      <item> SOAP_COMPRESSION_ACCEPT </item>
-      <item> SOAP_COMPRESSION_GZIP </item>
-      <item> SOAP_COMPRESSION_DEFLATE </item>
-      <item> UNKNOWN_TYPE </item>
-      <item> XSD_STRING </item>
+      <item> XSD_1999_NAMESPACE </item>
+      <item> XSD_1999_TIMEINSTANT </item>
+      <item> XSD_ANYTYPE </item>
+      <item> XSD_ANYURI </item>
+      <item> XSD_BASE64BINARY </item>
       <item> XSD_BOOLEAN </item>
+      <item> XSD_BYTE </item>
+      <item> XSD_DATE </item>
+      <item> XSD_DATETIME </item>
       <item> XSD_DECIMAL </item>
-      <item> XSD_FLOAT </item>
       <item> XSD_DOUBLE </item>
       <item> XSD_DURATION </item>
-      <item> XSD_DATETIME </item>
-      <item> XSD_TIME </item>
-      <item> XSD_DATE </item>
-      <item> XSD_GYEARMONTH </item>
-      <item> XSD_GYEAR </item>
-      <item> XSD_GMONTHDAY </item>
+      <item> XSD_ENTITIES </item>
+      <item> XSD_ENTITY </item>
+      <item> XSD_FLOAT </item>
       <item> XSD_GDAY </item>
       <item> XSD_GMONTH </item>
+      <item> XSD_GMONTHDAY </item>
+      <item> XSD_GYEAR </item>
+      <item> XSD_GYEARMONTH </item>
       <item> XSD_HEXBINARY </item>
-      <item> XSD_BASE64BINARY </item>
-      <item> XSD_ANYURI </item>
-      <item> XSD_QNAME </item>
-      <item> XSD_NOTATION </item>
-      <item> XSD_NORMALIZEDSTRING </item>
-      <item> XSD_TOKEN </item>
-      <item> XSD_LANGUAGE </item>
-      <item> XSD_NMTOKEN </item>
-      <item> XSD_NAME </item>
-      <item> XSD_NCNAME </item>
       <item> XSD_ID </item>
       <item> XSD_IDREF </item>
       <item> XSD_IDREFS </item>
-      <item> XSD_ENTITY </item>
-      <item> XSD_ENTITIES </item>
+      <item> XSD_INT </item>
       <item> XSD_INTEGER </item>
-      <item> XSD_NONPOSITIVEINTEGER </item>
-      <item> XSD_NEGATIVEINTEGER </item>
+      <item> XSD_LANGUAGE </item>
       <item> XSD_LONG </item>
-      <item> XSD_INT </item>
-      <item> XSD_SHORT </item>
-      <item> XSD_BYTE </item>
+      <item> XSD_NAME </item>
+      <item> XSD_NAMESPACE </item>
+      <item> XSD_NCNAME </item>
+      <item> XSD_NEGATIVEINTEGER </item>
+      <item> XSD_NMTOKEN </item>
+      <item> XSD_NMTOKENS </item>
       <item> XSD_NONNEGATIVEINTEGER </item>
-      <item> XSD_UNSIGNEDLONG </item>
+      <item> XSD_NONPOSITIVEINTEGER </item>
+      <item> XSD_NORMALIZEDSTRING </item>
+      <item> XSD_NOTATION </item>
+      <item> XSD_POSITIVEINTEGER </item>
+      <item> XSD_QNAME </item>
+      <item> XSD_SHORT </item>
+      <item> XSD_STRING </item>
+      <item> XSD_TIME </item>
+      <item> XSD_TOKEN </item>
+      <item> XSD_UNSIGNEDBYTE </item>
       <item> XSD_UNSIGNEDINT </item>
+      <item> XSD_UNSIGNEDLONG </item>
       <item> XSD_UNSIGNEDSHORT </item>
-      <item> XSD_UNSIGNEDBYTE </item>
-      <item> XSD_POSITIVEINTEGER </item>
-      <item> XSD_NMTOKENS </item>
-      <item> XSD_ANYTYPE </item>
-      <item> SOAP_ENC_OBJECT </item>
-      <item> SOAP_ENC_ARRAY </item>
-      <item> XSD_1999_TIMEINSTANT </item>
-      <item> XSD_NAMESPACE </item>
-      <item> XSD_1999_NAMESPACE </item>
-      <item> AF_UNIX </item>
-      <item> AF_INET </item>
-      <item> AF_INET6 </item>
-      <item> SOCK_STREAM </item>
-      <item> SOCK_DGRAM </item>
-      <item> SOCK_RAW </item>
-      <item> SOCK_SEQPACKET </item>
-      <item> SOCK_RDM </item>
-      <item> MSG_OOB </item>
-      <item> MSG_WAITALL </item>
-      <item> MSG_PEEK </item>
-      <item> MSG_DONTROUTE </item>
-      <item> SO_DEBUG </item>
-      <item> SO_REUSEADDR </item>
-      <item> SO_KEEPALIVE </item>
-      <item> SO_DONTROUTE </item>
-      <item> SO_LINGER </item>
-      <item> SO_BROADCAST </item>
-      <item> SO_OOBINLINE </item>
-      <item> SO_SNDBUF </item>
-      <item> SO_RCVBUF </item>
-      <item> SO_SNDLOWAT </item>
-      <item> SO_RCVLOWAT </item>
-      <item> SO_SNDTIMEO </item>
-      <item> SO_RCVTIMEO </item>
-      <item> SO_TYPE </item>
-      <item> SO_ERROR </item>
-      <item> SOL_SOCKET </item>
-      <item> SOMAXCONN </item>
-      <item> PHP_NORMAL_READ </item>
-      <item> PHP_BINARY_READ </item>
-      <item> SOCKET_EPERM </item>
-      <item> SOCKET_ENOENT </item>
-      <item> SOCKET_EINTR </item>
-      <item> SOCKET_EIO </item>
-      <item> SOCKET_ENXIO </item>
-      <item> SOCKET_E2BIG </item>
-      <item> SOCKET_EBADF </item>
-      <item> SOCKET_EAGAIN </item>
-      <item> SOCKET_ENOMEM </item>
-      <item> SOCKET_EACCES </item>
-      <item> SOCKET_EFAULT </item>
-      <item> SOCKET_ENOTBLK </item>
-      <item> SOCKET_EBUSY </item>
-      <item> SOCKET_EEXIST </item>
-      <item> SOCKET_EXDEV </item>
-      <item> SOCKET_ENODEV </item>
-      <item> SOCKET_ENOTDIR </item>
-      <item> SOCKET_EISDIR </item>
-      <item> SOCKET_EINVAL </item>
-      <item> SOCKET_ENFILE </item>
-      <item> SOCKET_EMFILE </item>
-      <item> SOCKET_ENOTTY </item>
-      <item> SOCKET_ENOSPC </item>
-      <item> SOCKET_ESPIPE </item>
-      <item> SOCKET_EROFS </item>
-      <item> SOCKET_EMLINK </item>
-      <item> SOCKET_EPIPE </item>
-      <item> SOCKET_ENAMETOOLONG </item>
-      <item> SOCKET_ENOLCK </item>
-      <item> SOCKET_ENOSYS </item>
-      <item> SOCKET_ENOTEMPTY </item>
-      <item> SOCKET_ELOOP </item>
-      <item> SOCKET_EWOULDBLOCK </item>
-      <item> SOCKET_ENOMSG </item>
-      <item> SOCKET_EIDRM </item>
-      <item> SOCKET_ECHRNG </item>
-      <item> SOCKET_EL2NSYNC </item>
-      <item> SOCKET_EL3HLT </item>
-      <item> SOCKET_EL3RST </item>
-      <item> SOCKET_ELNRNG </item>
-      <item> SOCKET_EUNATCH </item>
-      <item> SOCKET_ENOCSI </item>
-      <item> SOCKET_EL2HLT </item>
-      <item> SOCKET_EBADE </item>
-      <item> SOCKET_EBADR </item>
-      <item> SOCKET_EXFULL </item>
-      <item> SOCKET_ENOANO </item>
-      <item> SOCKET_EBADRQC </item>
-      <item> SOCKET_EBADSLT </item>
-      <item> SOCKET_ENOSTR </item>
-      <item> SOCKET_ENODATA </item>
-      <item> SOCKET_ETIME </item>
-      <item> SOCKET_ENOSR </item>
-      <item> SOCKET_ENONET </item>
-      <item> SOCKET_EREMOTE </item>
-      <item> SOCKET_ENOLINK </item>
-      <item> SOCKET_EADV </item>
-      <item> SOCKET_ESRMNT </item>
-      <item> SOCKET_ECOMM </item>
-      <item> SOCKET_EPROTO </item>
-      <item> SOCKET_EMULTIHOP </item>
-      <item> SOCKET_EBADMSG </item>
-      <item> SOCKET_ENOTUNIQ </item>
-      <item> SOCKET_EBADFD </item>
-      <item> SOCKET_EREMCHG </item>
-      <item> SOCKET_ERESTART </item>
-      <item> SOCKET_ESTRPIPE </item>
-      <item> SOCKET_EUSERS </item>
-      <item> SOCKET_ENOTSOCK </item>
-      <item> SOCKET_EDESTADDRREQ </item>
-      <item> SOCKET_EMSGSIZE </item>
-      <item> SOCKET_EPROTOTYPE </item>
-      <item> SOCKET_ENOPROTOOPT </item>
-      <item> SOCKET_EPROTONOSUPPORT </item>
-      <item> SOCKET_ESOCKTNOSUPPORT </item>
-      <item> SOCKET_EOPNOTSUPP </item>
-      <item> SOCKET_EPFNOSUPPORT </item>
-      <item> SOCKET_EAFNOSUPPORT </item>
-      <item> SOCKET_EADDRINUSE </item>
-      <item> SOCKET_EADDRNOTAVAIL </item>
-      <item> SOCKET_ENETDOWN </item>
-      <item> SOCKET_ENETUNREACH </item>
-      <item> SOCKET_ENETRESET </item>
-      <item> SOCKET_ECONNABORTED </item>
-      <item> SOCKET_ECONNRESET </item>
-      <item> SOCKET_ENOBUFS </item>
-      <item> SOCKET_EISCONN </item>
-      <item> SOCKET_ENOTCONN </item>
-      <item> SOCKET_ESHUTDOWN </item>
-      <item> SOCKET_ETOOMANYREFS </item>
-      <item> SOCKET_ETIMEDOUT </item>
-      <item> SOCKET_ECONNREFUSED </item>
-      <item> SOCKET_EHOSTDOWN </item>
-      <item> SOCKET_EHOSTUNREACH </item>
-      <item> SOCKET_EALREADY </item>
-      <item> SOCKET_EINPROGRESS </item>
-      <item> SOCKET_EISNAM </item>
-      <item> SOCKET_EREMOTEIO </item>
-      <item> SOCKET_EDQUOT </item>
-      <item> SOCKET_ENOMEDIUM </item>
-      <item> SOCKET_EMEDIUMTYPE </item>
-      <item> SOL_TCP </item>
-      <item> SOL_UDP </item>
-      <item> SQLITE_BOTH </item>
-      <item> SQLITE_NUM </item>
-      <item> SQLITE_ASSOC </item>
-      <item> SQLITE_OK </item>
-      <item> SQLITE_ERROR </item>
-      <item> SQLITE_INTERNAL </item>
-      <item> SQLITE_PERM </item>
-      <item> SQLITE_ABORT </item>
-      <item> SQLITE_BUSY </item>
-      <item> SQLITE_LOCKED </item>
-      <item> SQLITE_NOMEM </item>
-      <item> SQLITE_READONLY </item>
-      <item> SQLITE_INTERRUPT </item>
-      <item> SQLITE_IOERR </item>
-      <item> SQLITE_CORRUPT </item>
-      <item> SQLITE_NOTFOUND </item>
-      <item> SQLITE_FULL </item>
-      <item> SQLITE_CANTOPEN </item>
-      <item> SQLITE_PROTOCOL </item>
-      <item> SQLITE_EMPTY </item>
-      <item> SQLITE_SCHEMA </item>
-      <item> SQLITE_TOOBIG </item>
-      <item> SQLITE_CONSTRAINT </item>
-      <item> SQLITE_MISMATCH </item>
-      <item> SQLITE_MISUSE </item>
-      <item> SQLITE_NOLFS </item>
-      <item> SQLITE_AUTH </item>
-      <item> SQLITE_FORMAT </item>
-      <item> SQLITE_ROW </item>
-      <item> SQLITE_DONE </item>
-      <item> MSG_IPC_NOWAIT </item>
-      <item> MSG_NOERROR </item>
-      <item> MSG_EXCEPT </item>
-      <item> T_INCLUDE </item>
-      <item> T_INCLUDE_ONCE </item>
-      <item> T_EVAL </item>
-      <item> T_REQUIRE </item>
-      <item> T_REQUIRE_ONCE </item>
-      <item> T_LOGICAL_OR </item>
-      <item> T_LOGICAL_XOR </item>
-      <item> T_LOGICAL_AND </item>
-      <item> T_PRINT </item>
-      <item> T_PLUS_EQUAL </item>
-      <item> T_MINUS_EQUAL </item>
-      <item> T_MUL_EQUAL </item>
-      <item> T_DIV_EQUAL </item>
-      <item> T_CONCAT_EQUAL </item>
-      <item> T_MOD_EQUAL </item>
-      <item> T_AND_EQUAL </item>
-      <item> T_OR_EQUAL </item>
-      <item> T_XOR_EQUAL </item>
-      <item> T_SL_EQUAL </item>
-      <item> T_SR_EQUAL </item>
-      <item> T_BOOLEAN_OR </item>
-      <item> T_BOOLEAN_AND </item>
-      <item> T_IS_EQUAL </item>
-      <item> T_IS_NOT_EQUAL </item>
-      <item> T_IS_IDENTICAL </item>
-      <item> T_IS_NOT_IDENTICAL </item>
-      <item> T_IS_SMALLER_OR_EQUAL </item>
-      <item> T_IS_GREATER_OR_EQUAL </item>
-      <item> T_SL </item>
-      <item> T_SR </item>
-      <item> T_INC </item>
-      <item> T_DEC </item>
-      <item> T_INT_CAST </item>
-      <item> T_DOUBLE_CAST </item>
-      <item> T_STRING_CAST </item>
-      <item> T_ARRAY_CAST </item>
-      <item> T_OBJECT_CAST </item>
-      <item> T_BOOL_CAST </item>
-      <item> T_UNSET_CAST </item>
-      <item> T_NEW </item>
-      <item> T_EXIT </item>
-      <item> T_IF </item>
-      <item> T_ELSEIF </item>
-      <item> T_ELSE </item>
-      <item> T_ENDIF </item>
-      <item> T_LNUMBER </item>
-      <item> T_DNUMBER </item>
-      <item> T_STRING </item>
-      <item> T_STRING_VARNAME </item>
-      <item> T_VARIABLE </item>
-      <item> T_NUM_STRING </item>
-      <item> T_INLINE_HTML </item>
-      <item> T_CHARACTER </item>
-      <item> T_BAD_CHARACTER </item>
-      <item> T_ENCAPSED_AND_WHITESPACE </item>
-      <item> T_CONSTANT_ENCAPSED_STRING </item>
-      <item> T_ECHO </item>
-      <item> T_DO </item>
-      <item> T_WHILE </item>
-      <item> T_ENDWHILE </item>
-      <item> T_FOR </item>
-      <item> T_ENDFOR </item>
-      <item> T_FOREACH </item>
-      <item> T_ENDFOREACH </item>
-      <item> T_DECLARE </item>
-      <item> T_ENDDECLARE </item>
-      <item> T_AS </item>
-      <item> T_SWITCH </item>
-      <item> T_ENDSWITCH </item>
-      <item> T_CASE </item>
-      <item> T_DEFAULT </item>
-      <item> T_BREAK </item>
-      <item> T_CONTINUE </item>
-      <item> T_FUNCTION </item>
-      <item> T_CONST </item>
-      <item> T_RETURN </item>
-      <item> T_USE </item>
-      <item> T_GLOBAL </item>
-      <item> T_STATIC </item>
-      <item> T_VAR </item>
-      <item> T_UNSET </item>
-      <item> T_ISSET </item>
-      <item> T_EMPTY </item>
-      <item> T_CLASS </item>
-      <item> T_EXTENDS </item>
-      <item> T_INTERFACE </item>
-      <item> T_IMPLEMENTS </item>
-      <item> T_OBJECT_OPERATOR </item>
-      <item> T_DOUBLE_ARROW </item>
-      <item> T_LIST </item>
-      <item> T_ARRAY </item>
-      <item> T_CLASS_C </item>
-      <item> T_FUNC_C </item>
-      <item> T_METHOD_C </item>
-      <item> T_LINE </item>
-      <item> T_FILE </item>
-      <item> T_COMMENT </item>
-      <item> T_DOC_COMMENT </item>
-      <item> T_OPEN_TAG </item>
-      <item> T_OPEN_TAG_WITH_ECHO </item>
-      <item> T_CLOSE_TAG </item>
-      <item> T_WHITESPACE </item>
-      <item> T_START_HEREDOC </item>
-      <item> T_END_HEREDOC </item>
-      <item> T_DOLLAR_OPEN_CURLY_BRACES </item>
-      <item> T_CURLY_OPEN </item>
-      <item> T_PAAMAYIM_NEKUDOTAYIM </item>
-      <item> T_DOUBLE_COLON </item>
-      <item> T_ABSTRACT </item>
-      <item> T_CATCH </item>
-      <item> T_FINAL </item>
-      <item> T_INSTANCEOF </item>
-      <item> T_PRIVATE </item>
-      <item> T_PROTECTED </item>
-      <item> T_PUBLIC </item>
-      <item> T_THROW </item>
-      <item> T_TRY </item>
-      <item> T_CLONE </item>
+      <item> XSL_CLONE_ALWAYS </item>
       <item> XSL_CLONE_AUTO </item>
       <item> XSL_CLONE_NEVER </item>
-      <item> XSL_CLONE_ALWAYS </item>
+      <item> YESEXPR </item>
       <item> YPERR_BADARGS </item>
       <item> YPERR_BADDB </item>
       <item> YPERR_BUSY </item>
@@ -3392,12 +1768,11 @@ Changes:
       <item> YPERR_PMAP </item>
       <item> YPERR_RESRC </item>
       <item> YPERR_RPC </item>
+      <item> YPERR_VERS </item>
       <item> YPERR_YPBIND </item>
       <item> YPERR_YPERR </item>
       <item> YPERR_YPSERV </item>
-      <item> YPERR_VERS </item>
-      <item> FORCE_GZIP </item>
-      <item> FORCE_DEFLATE </item>
+      <item> ZEND_THREAD_SAFE </item>
     </list>
     <list name="special_methods">
       <item> __autoload </item>
@@ -3438,7 +1813,6 @@ Changes:
       <item> array_diff_key </item>
       <item> array_diff_uassoc </item>
       <item> array_diff_ukey </item>
-      <item> array_diff </item>
       <item> array_fill </item>
       <item> array_filter </item>
       <item> array_flip </item>
@@ -3447,7 +1821,6 @@ Changes:
       <item> array_intersect_key </item>
       <item> array_intersect_uassoc </item>
       <item> array_intersect_ukey </item>
-      <item> array_intersect </item>
       <item> array_key_exists </item>
       <item> array_keys </item>
       <item> array_map </item>
@@ -3472,7 +1845,6 @@ Changes:
       <item> array_uintersect </item>
       <item> array_uintersect_assoc </item>
       <item> array_uintersect_uassoc </item>
-      <item> array_uintersect </item>
       <item> array_unique </item>
       <item> array_unshift </item>
       <item> array_values </item>
@@ -3807,8 +2179,6 @@ Changes:
       <item> debug_backtrace </item>
       <item> debug_print_backtrace </item>
       <item> debug_zval_dump </item>
-      <item> dcgettext </item>
-      <item> dcngettext </item>
       <item> debugger_off </item>
       <item> debugger_on </item>
       <item> decbin </item>
@@ -3841,7 +2211,6 @@ Changes:
       <item> dns_get_mx </item>
       <item> dns_get_record </item>
       <item> dom_import_simplexml </item>
-      <item> dngettext </item>
       <item> domxml_add_root </item>
       <item> domxml_attributes </item>
       <item> domxml_children </item>
@@ -4242,7 +2611,6 @@ Changes:
       <item> hw_unlock </item>
       <item> hw_who </item>
       <item> hypot </item>
-      <item> idate </item>
       <item> ibase_blob_add </item>
       <item> ibase_blob_cancel </item>
       <item> ibase_blob_close </item>
@@ -4287,6 +2655,7 @@ Changes:
       <item> iconv_mime_decode_headers </item>
       <item> iconv_mime_encode </item>
       <item> iconv_set_encoding </item>
+      <item> idate </item>
       <item> ifx_affected_rows </item>
       <item> ifx_blobinfile_mode </item>
       <item> ifx_byteasvarchar </item>
@@ -4804,12 +3173,6 @@ Changes:
       <item> mktime </item>
       <item> money_format </item>
       <item> move_uploaded_file </item>
-      <item> msg_get_queue </item>
-      <item> msg_receive </item>
-      <item> msg_remove_queue </item>
-      <item> msg_send </item>
-      <item> msg_set_queue </item>
-      <item> msg_stat_queue </item>
       <item> msession_connect </item>
       <item> msession_count </item>
       <item> msession_create </item>
@@ -4831,6 +3194,12 @@ Changes:
       <item> msession_timeout </item>
       <item> msession_uniq </item>
       <item> msession_unlock </item>
+      <item> msg_get_queue </item>
+      <item> msg_receive </item>
+      <item> msg_remove_queue </item>
+      <item> msg_send </item>
+      <item> msg_set_queue </item>
+      <item> msg_stat_queue </item>
       <item> msql </item>
       <item> msql_affected_rows </item>
       <item> msql_close </item>
@@ -4910,9 +3279,9 @@ Changes:
       <item> muscat_setup_net </item>
       <item> mysql </item>
       <item> mysql_affected_rows </item>
-      <item> mysql_client_encoding </item>
       <item> mysql_change_user </item>
       <item> mysql_character_set_name </item>
+      <item> mysql_client_encoding </item>
       <item> mysql_close </item>
       <item> mysql_connect </item>
       <item> mysql_create_db </item>
@@ -6474,21 +4843,40 @@ Changes:
     </list>
     <contexts>
       <context name="start" lineEndContext="#stay" attribute="Normal Text">
-          <RegExpr context="phpsource" attribute="Keyword" String="&lt;\?(?:=|php)?" insensitive="true" beginRegion="php" />
-        <StringDetect attribute="Keyword" context="#pop" String="?&gt;" endRegion="php" />
-      </context>
-      <context name="braceregion" lineEndContext="#stay" attribute="Normal Text">
-        <IncludeRules context="phpsource"/>
-        <DetectChar attribute="Normal Text" context="#pop" char="}" endRegion="Brace1" />
+        <RegExpr context="phpsource" attribute="Keyword" String="&lt;\?(?:=|php)?" insensitive="true" />
+        <StringDetect attribute="Keyword" context="#pop" String="?&gt;" />
       </context>
       <context name="phpsource" attribute="PHP Text" lineEndContext="#stay">
         <DetectSpaces />
-        <!-- WORKAROUND for bug #143022 / missing feature #103257 -->
-        <StringDetect attribute="Keyword" context="#pop" String="?&gt;" endRegion="Brace1" lookAhead="true" />
+        <StringDetect attribute="Keyword" context="#pop" String="?&gt;" lookAhead="true" />
+
+        <!-- Alternate PHP Block Syntax
+          -  http://www.php.net/manual/en/control-structures.alternative-syntax.php
+          -
+          -  We must treat the ternary and case/default statements specially so that the : in those can be
+          -  ignored.  Then otherwise we treat the : as a block start, and the 5 different end statements as
+          -  a block end.
+          -
+          -  The ternary and case/default switch to a context which short-circuits the : detection and
+          -  just pops back to this context instead of starting a block.
+          -
+          -  We can not use case/default as starting a block because they can be terminated by break. return
+          -  or not at all, making it impossible to determine where the block should end.
+          -
+          -  Additionally the paamayim nekudotayim (::) must not start a subcontext that is never terminated.
+          -->
+
+        <DetectChar attribute="Other" context="ternary" char="?" />
+        <RegExpr attribute="Keyword" context="case"  String="(case|default)(\s|:|$)" />
+        <Detect2Chars attribute="Normal Text" context="#stay" char=":" char1=":" />
+        <DetectChar attribute="Normal Text" context="#stay" char=":" beginRegion="Alternate Block" />
+        <RegExpr attribute="Control Structures" context="#stay" String="endif|endwhile|endfor|endforeach|endswitch" endRegion="Alternate Block" />
+        <!--/ Alternate PHP Block Syntax -->
+
         <DetectChar attribute="Comment" context="onelinecomment" char="#" />
         <IncludeRules context="##Doxygen" />
         <Detect2Chars attribute="Comment" context="onelinecomment" char="/" char1="/" />
-        <Detect2Chars attribute="Comment" context="twolinecomment" char="/" char1="&#42;" beginRegion="Comment"/>
+        <Detect2Chars attribute="Comment" context="twolinecomment" char="/" char1="*" beginRegion="Comment" />
         <keyword attribute="Control Structures" context="#stay" String="control structures" />
         <keyword attribute="Keyword" context="#stay" String="keywords" />
         <DetectChar attribute="Function" context="#stay" char="@" />
@@ -6497,17 +4885,34 @@ Changes:
         <DetectIdentifier />
         <DetectChar attribute="String" context="doublequotestring" char="&quot;" />
         <DetectChar attribute="String" context="backquotestring" char="`" />
-        <DetectChar attribute="String" context="singlequotestring" char="&#39;" />
-        <RegExpr attribute="Backslash Code" context="heredoc" String="&lt;&lt;&lt;([A-Za-z_][A-Za-z0-9_]*)" />
+        <DetectChar attribute="String" context="singlequotestring" char="'" />
+        <RegExpr attribute="Backslash Code" context="htmlheredoc" String="&lt;&lt;&lt;((EO)?HTML)\b" beginRegion="Heredoc" />
+        <RegExpr attribute="Backslash Code" context="cssheredoc" String="&lt;&lt;&lt;((EO)?CSS)\b" beginRegion="Heredoc" />
+        <RegExpr attribute="Backslash Code" context="javascriptheredoc" String="&lt;&lt;&lt;((EO)?JAVASCRIPT)\b" beginRegion="Heredoc" />
+        <RegExpr attribute="Backslash Code" context="mysqlheredoc" String="&lt;&lt;&lt;((EO)?MYSQL)\b" beginRegion="Heredoc" />
+        <RegExpr attribute="Backslash Code" context="heredoc" String="&lt;&lt;&lt;([A-Za-z_][A-Za-z0-9_]*)" beginRegion="Heredoc" />
         <RegExpr attribute="Variable" context="#stay" String="\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*" />
         <RegExpr attribute="String" context="#stay" String="[0123456789]*\.\.\.[0123456789]*" />
         <HlCOct attribute="Octal" context="#stay" />
         <HlCHex attribute="Hex" context="#stay" />
         <Float attribute="Float" context="#stay" />
         <Int attribute="Decimal" context="#stay" />
-        <DetectChar attribute="Normal Text" context="braceregion" char="{" beginRegion="Brace1" />
-        <AnyChar attribute="Other" context="#stay" String=";():,[]" />
+        <DetectChar attribute="Normal Text" context="#stay" char="{" beginRegion="Brace1" />
+        <DetectChar attribute="Normal Text" context="#stay" char="}" endRegion="Brace1" />
+        <AnyChar attribute="Other" context="#stay" String=";(),[]" />
+      </context>
+
+      <context name="ternary" attribute="PHP Text" lineEndContext="#stay">
+        <!-- the paamayim nekudotayim (::) must not start a subcontext that is never terminated. -->
+        <Detect2Chars attribute="Normal Text" context="#stay" char=":" char1=":" />
+        <DetectChar attribute="Other" char=":" context="#pop" />
+        <IncludeRules context="phpsource" />
+      </context>
+
+      <context name="case" attribute="PHP Text" lineEndContext="#stay">
+        <IncludeRules context="ternary" />
       </context>
+
       <context name="onelinecomment" attribute="Comment" lineEndContext="#pop">
         <StringDetect attribute="Keyword" context="#pop" lookAhead="true" String="?&gt;" />
       </context>
@@ -6526,51 +4931,74 @@ Changes:
         <RegExpr attribute="Backslash Code" context="#stay" String="\\x[0-9A-Fa-f]{1,2}" />
         <RegExpr attribute="Variable" context="#stay" String="\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\[[a-zA-Z0-9_]*\])*" />
         <RegExpr attribute="Variable" context="#stay" String="\$\{[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\[[a-zA-Z0-9_]*\])*\}" />
-        <RegExpr attribute="Variable" context="#stay" String="\{\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\[([0-9]*|&quot;[^&quot;]*&quot;|\$[a-zA-Z]*)|'[^']*'|\])*(->[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\[[a-zA-Z0-9_]*\])*(\[([0-9]*|&quot;[a-zA-Z_]*&quot;)|'[a-zA-Z_]*'|\])*)*\}" />
+        <RegExpr attribute="Variable" context="#stay" String="\{\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\[([0-9]*|&quot;[^&quot;]*&quot;|\$[a-zA-Z]*)|'[^']*'|\])*(-&gt;[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\[[a-zA-Z0-9_]*\])*(\[([0-9]*|&quot;[a-zA-Z_]*&quot;)|'[a-zA-Z_]*'|\])*)*\}" />
       </context>
       <context name="backquotestring" attribute="String" lineEndContext="#stay">
-        <IncludeRules context="doublebackquotestringcommon"/>
+        <IncludeRules context="doublebackquotestringcommon" />
         <Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="`" />
         <DetectChar attribute="String" context="#pop" char="`" />
       </context>
       <context name="doublequotestring" attribute="String" lineEndContext="#stay">
-        <IncludeRules context="doublebackquotestringcommon"/>
+        <IncludeRules context="doublebackquotestringcommon" />
         <Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="&quot;" />
         <DetectChar attribute="String" context="#pop" char="&quot;" />
       </context>
       <context name="singlequotestring" attribute="String" lineEndContext="#stay">
-        <Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="'"/>
-        <Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="\"/>
+        <Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="'" />
+        <Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="\" />
         <DetectChar attribute="String" context="#pop" char="'" />
       </context>
+      <context name="htmlheredoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
+        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
+        <IncludeRules context="commonheredoc" />
+        <IncludeRules context="##HTML" />
+      </context>
+      <context name="cssheredoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
+        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
+        <IncludeRules context="commonheredoc" />
+        <IncludeRules context="##CSS" />
+      </context>
+      <context name="mysqlheredoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
+        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
+        <IncludeRules context="commonheredoc" />
+        <IncludeRules context="##SQL (MySQL)" />
+      </context>
+      <context name="javascriptheredoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
+        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
+        <IncludeRules context="commonheredoc" />
+        <IncludeRules context="##JavaScript" />
+      </context>
       <context name="heredoc" attribute="String" lineEndContext="#stay" dynamic="true">
-        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" />
+        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
+        <IncludeRules context="commonheredoc" />
+      </context>
+      <context name="commonheredoc" attribute="String" lineEndContext="#stay">
         <RegExpr attribute="Variable" context="#stay" String="\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\[[a-zA-Z0-9_]*\])*" />
         <RegExpr attribute="Variable" context="#stay" String="\$\{[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\[[a-zA-Z0-9_]*\])*\}" />
-        <RegExpr attribute="Variable" context="#stay" String="\{\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\[([0-9]*|&quot;[a-zA-Z_]*&quot;)|'[a-zA-Z_]*'|\])*(->[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\[[a-zA-Z0-9_]*\])*(\[([0-9]*|&quot;[a-zA-Z_]*&quot;)|'[a-zA-Z_]*'|\])*)*\}" />
+        <RegExpr attribute="Variable" context="#stay" String="\{\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\[([0-9]*|&quot;[a-zA-Z_]*&quot;)|'[a-zA-Z_]*'|\])*(-&gt;[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\[[a-zA-Z0-9_]*\])*(\[([0-9]*|&quot;[a-zA-Z_]*&quot;)|'[a-zA-Z_]*'|\])*)*\}" />
       </context>
     </contexts>
     <itemDatas>
-      <itemData name="Normal Text" defStyleNum="dsNormal" />
-      <itemData name="PHP Text" defStyleNum="dsNormal" />
-      <itemData name="Keyword" defStyleNum="dsKeyword" />
-      <itemData name="Function" defStyleNum="dsFunction" />
-      <itemData name="Special method" defStyleNum="dsFunction" />
-      <itemData name="Decimal" defStyleNum="dsDecVal" />
-      <itemData name="Octal" defStyleNum="dsBaseN" />
-      <itemData name="Hex" defStyleNum="dsBaseN" />
-      <itemData name="Float" defStyleNum="dsFloat" />
+      <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false" />
+      <itemData name="PHP Text" defStyleNum="dsNormal" spellChecking="false" />
+      <itemData name="Keyword" defStyleNum="dsKeyword" spellChecking="false" />
+      <itemData name="Function" defStyleNum="dsFunction" spellChecking="false" />
+      <itemData name="Special method" defStyleNum="dsFunction" spellChecking="false" />
+      <itemData name="Decimal" defStyleNum="dsDecVal" spellChecking="false" />
+      <itemData name="Octal" defStyleNum="dsBaseN" spellChecking="false" />
+      <itemData name="Hex" defStyleNum="dsBaseN" spellChecking="false" />
+      <itemData name="Float" defStyleNum="dsFloat" spellChecking="false" />
       <itemData name="String" defStyleNum="dsString" />
       <itemData name="Comment" defStyleNum="dsComment" />
-      <itemData name="Variable" defStyleNum="dsKeyword" color="#5555FF" selColor="#ffffff" bold="0" italic="0" />
-      <itemData name="Control Structures" defStyleNum="dsKeyword" color="#A1A100" selColor="#ffffff" bold="0" italic="0" />
-      <itemData name="Backslash Code" defStyleNum="dsKeyword" color="#0F0F8F" selColor="#ffffff" bold="1" italic="0" />
-      <itemData name="Other" defStyleNum="dsOthers" />
+      <itemData name="Variable" defStyleNum="dsKeyword" color="#5555FF" selColor="#ffffff" bold="0" italic="0" spellChecking="false" />
+      <itemData name="Control Structures" defStyleNum="dsKeyword" color="#A1A100" selColor="#ffffff" bold="0" italic="0" spellChecking="false" />
+      <itemData name="Backslash Code" defStyleNum="dsKeyword" color="#0F0F8F" selColor="#ffffff" bold="1" italic="0" spellChecking="false" />
+      <itemData name="Other" defStyleNum="dsOthers" spellChecking="false" />
 
-      <itemData name="HTML Tag" defStyleNum="dsKeyword" color="#0F0000" selColor="#ffffff" bold="1" italic="0" />
+      <itemData name="HTML Tag" defStyleNum="dsKeyword" color="#0F0000" selColor="#ffffff" bold="1" italic="0" spellChecking="false" />
       <itemData name="HTML Comment" defStyleNum="dsComment" />
-      <itemData name="Identifier" defStyleNum="dsOthers" />
-      <itemData name="Types" defStyleNum="dsDataType" />
+      <itemData name="Identifier" defStyleNum="dsOthers" spellChecking="false" />
+      <itemData name="Types" defStyleNum="dsDataType" spellChecking="false" />
     </itemDatas>
   </highlighting>
   <general>
@@ -6578,6 +5006,6 @@ Changes:
       <comment name="singleLine" start="//" />
       <comment name="multiLine" start="/*" end="*/" />
     </comments>
-    <keywords casesensitive="0" weakDeliminator="" additionalDeliminator="@"/>
+    <keywords casesensitive="0" weakDeliminator="" additionalDeliminator="@" />
   </general>
-</language>
\ No newline at end of file
+</language>
diff --git a/kate/data/python.xml b/kate/data/python.xml
index 4207ca8a2..31f5a0dde 100644
--- a/kate/data/python.xml
+++ b/kate/data/python.xml
@@ -4,7 +4,16 @@
 <!-- Python syntax highlighting v1.9 by Michael Bueker (improved keyword differentiation) -->
 <!-- Python syntax highlighting v1.97 by Paul Giannaros -->
 <!-- Python syntax highlighting v1.99 by Primoz Anzur -->
-<language name="Python" version="1.99" kateversion="2.4" section="Scripts" extensions="*.py;*.pyw" mimetype="application/x-python;text/x-python" casesensitive="1" author="Michael Bueker" license="">
+<!-- Python syntax highlighting v2.01 by Paul Giannaros:
+	* full format character support
+	* unicode string modifier supported -->
+<!-- v2.02 remove RegExpr for nums and make indent consistent -->
+<!-- v2.03 highlight decorators, remove operator regex, don't highlight parens as operators -->
+<!-- v2.04 make alerts visible even if they are directly after ''' or # without a space -->
+<!-- v2.06 decorator names can (and often do) contain periods -->
+<!-- v2.07 add support for %prog and co, see bug 142832 -->
+<!-- v2.08 add missing overloaders, new Python 3 statements, builtins, and keywords -->
+<language name="Python" version="2.11" kateversion="2.4" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript" mimetype="application/x-python;text/x-python" casesensitive="1" author="Michael Bueker" license="">
 	<highlighting>
 		<list name="prep">
 			<item> import </item>
@@ -17,10 +26,10 @@
 			<item> del </item>
 			<item> global </item>
 			<item> lambda </item>
+			<item> nonlocal </item>
 		</list>
 		<list name="operators">
 			<item> and </item>
-			<item> assert </item>
 			<item> in </item>
 			<item> is </item>
 			<item> not </item>
@@ -31,6 +40,7 @@
 			<item> print </item>
 		</list>
 		<list name="flow">
+			<item> assert </item>
 			<item> break </item>
 			<item> continue </item>
 			<item> elif </item>
@@ -44,6 +54,7 @@
 			<item> return </item>
 			<item> try </item>
 			<item> while </item>
+			<item> with </item>
 			<item> yield </item>
 		</list>
 		<list name="builtinfuncs">
@@ -55,6 +66,7 @@
 			<item> any </item>
 			<item> apply </item>
 			<item> basestring </item>
+			<item> bin </item>
 			<item> bool </item>
 			<item> buffer </item>
 			<item> callable </item>
@@ -74,11 +86,13 @@
 			<item> file </item>
 			<item> filter </item>
 			<item> float </item>
+			<item> format </item>
 			<item> frozenset </item>
 			<item> getattr </item>
 			<item> globals </item>
 			<item> hasattr </item>
 			<item> hash </item>
+			<item> help </item>
 			<item> hex </item>
 			<item> id </item>
 			<item> input </item>
@@ -94,6 +108,7 @@
 			<item> map </item>
 			<item> max </item>
 			<item> min </item>
+			<item> next </item>
 			<item> object </item>
 			<item> oct </item>
 			<item> open </item>
@@ -130,6 +145,8 @@
 			<item> False </item>
 			<item> NotImplemented </item>
 			<item> Ellipsis </item>
+			<item> __debug__ </item>
+			<item> __file__ </item>
 		</list>
 		<list name="bindings">
 			<item> SIGNAL </item>
@@ -153,6 +170,79 @@
 			<item>__hash__</item>
 			<item>__nonzero__</item>
 			<item>__unicode__</item>
+			<item>__getattr__</item>
+			<item>__setattr__</item>
+			<item>__delattr__</item>
+			<item>__getattribute__</item>
+			<item>__get__</item>
+			<item>__set__</item>
+			<item>__delete__</item>
+			<item>__call__</item>
+			<item>__len__</item>
+			<item>__getitem__</item>
+			<item>__setitem__</item>
+			<item>__delitem__</item>
+			<item>__iter__</item>
+			<item>__reversed__</item>
+			<item>__contains__</item>
+			<item>__getslice__</item>
+			<item>__setslice__</item>
+			<item>__delslice__</item>
+			<item>__add__</item>
+			<item>__sub__</item>
+			<item>__mul__</item>
+			<item>__floordiv__</item>
+			<item>__mod__</item>
+			<item>__divmod__</item>
+			<item>__pow__</item>
+			<item>__lshift__</item>
+			<item>__rshift__</item>
+			<item>__and__</item>
+			<item>__xor__</item>
+			<item>__or__</item>
+			<item>__div__</item>
+			<item>__truediv__</item>
+			<item>__radd__</item>
+			<item>__rsub__</item>
+			<item>__rmul__</item>
+			<item>__rdiv__</item>
+			<item>__rtruediv__</item>
+			<item>__rfloordiv__</item>
+			<item>__rmod__</item>
+			<item>__rdivmod__</item>
+			<item>__rpow__</item>
+			<item>__rlshift__</item>
+			<item>__rrshift__</item>
+			<item>__rand__</item>
+			<item>__rxor__</item>
+			<item>__ror__</item>
+			<item>__iadd__</item>
+			<item>__isub__</item>
+			<item>__imul__</item>
+			<item>__idiv__</item>
+			<item>__itruediv__</item>
+			<item>__ifloordiv__</item>
+			<item>__imod__</item>
+			<item>__ipow__</item>
+			<item>__ilshift__</item>
+			<item>__irshift__</item>
+			<item>__iand__</item>
+			<item>__ixor__</item>
+			<item>__ior__</item>
+			<item>__neg__</item>
+			<item>__pos__</item>
+			<item>__abs__</item>
+			<item>__invert__</item>
+			<item>__complex__</item>
+			<item>__int__</item>
+			<item>__long__</item>
+			<item>__float__</item>
+			<item>__oct__</item>
+			<item>__hex__</item>
+			<item>__index__</item>
+			<item>__coerce__</item>
+			<item>__enter__</item>
+			<item>__exit__</item>
 		</list>
 		<list name="exceptions">
 			<item>ArithmeticError</item>
@@ -203,6 +293,7 @@
 		</list>
 		<contexts>
 			<context name="Normal" attribute="Normal Text" lineEndContext="#stay">
+				<LineContinue context="CheckForString" attribute="Normal Text"/>
 				<keyword attribute="Preprocessor" String="prep" context="#stay"/>
 				<keyword attribute="Definition Keyword" String="defs" context="#stay"/>
 				<keyword attribute="Operator" String="operators" context="#stay"/>
@@ -216,150 +307,187 @@
 				<RegExpr attribute="Normal" String="[a-zA-Z_][a-zA-Z_0-9]+" context="#stay"/>
 
 				<RegExpr attribute="Complex" String=" ((([0-9]*\.[0-9]+|[0-9]+\.)|([0-9]+|([0-9]*\.[0-9]+|[0-9]+\.))[eE](\+|-)?[0-9]+)|[0-9]+)[jJ]" context="#stay"/>
-				<RegExpr attribute="Float" String="([0-9]+\.[0-9]*|\.[0-9]+)([eE][0-9]+)?" context="#stay"/>
-				<RegExpr attribute="Int" String="([1-9][0-9]*([eE][0-9]+)?|0)" context="#stay"/>
-				<RegExpr attribute="Long" String="[1-9][0-9]*([eE][0-9.]+)?[Ll]" context="#stay"/>
-				<RegExpr attribute="Hex" String="0[Xx][0-9a-fA-F]+" context="#stay"/>
-				<RegExpr attribute="Octal" String="0[1-9][0-9]*" context="#stay"/>
-  
-				<RegExpr attribute="Raw String" String="[rR]'''" context="Raw Tripple A-string"/>
-				<RegExpr attribute="Raw String" String="[rR]&quot;&quot;&quot;" context="Raw Tripple Q-string"/>
+				<Float attribute="Float" context="#stay" />
+				<HlCHex attribute="Hex" context="#stay"/>
+				<HlCOct attribute="Octal" context="#stay"/>
+				<Int attribute="Int" context="#stay">
+					<StringDetect attribute="Int" String="L" insensitive="true" context="#stay"/>
+				</Int>
+
+				<StringDetect attribute="Raw String" String="r'''" insensitive="true" context="Raw Tripple A-string"/>
+				<StringDetect attribute="Raw String" String="r&quot;&quot;&quot;" insensitive="true" context="Raw Tripple Q-string"/>
 
-				<RegExpr attribute="Raw String" String="[rR]'" context="Raw A-string"/>
-				<RegExpr attribute="Raw String" String="[rR]&quot;" context="Raw Q-string"/>
+				<StringDetect attribute="Raw String" String="r'" insensitive="true" context="Raw A-string"/>
+				<StringDetect attribute="Raw String" String="r&quot;" insensitive="true" context="Raw Q-string"/>
 
-				<RegExpr attribute="Comment" String="#.*$" context="#stay"/>
-				<RegExpr attribute="Comment" String="^\s*'''" context="Tripple A-comment" beginRegion="Tripple A-region"/>
-				<RegExpr attribute="Comment" String="^\s*&quot;&quot;&quot;" context="Tripple Q-comment" beginRegion="Tripple Q-region"/>
+				<DetectChar attribute="Comment" char="#" context="Hash comment"/>
+                                <RegExpr attribute="Comment" String="u?'''" firstNonSpace="true" context="Tripple A-comment" beginRegion="Tripple A-region"/>
+                                <RegExpr attribute="Comment" String="u?&quot;&quot;&quot;" firstNonSpace="true" context="Tripple Q-comment" beginRegion="Tripple Q-region"/>
 
+				<!-- ''' -->
 				<StringDetect attribute="String" String="'''" context="Tripple A-string" beginRegion="Tripple A-region"/>
+				<StringDetect attribute="String" String="u'''" context="Tripple A-string" beginRegion="Tripple A-region"/>
+				<!-- """ -->
 				<StringDetect attribute="String" String="&quot;&quot;&quot;" context="Tripple Q-string" beginRegion="Tripple Q-region"/>
+				<StringDetect attribute="String" String="u&quot;&quot;&quot;" context="Tripple Q-string" beginRegion="Tripple Q-region"/>
+				<!-- ' -->
 				<DetectChar attribute="String" char="'" context="Single A-string"/>
+				<Detect2Chars attribute="String" char="u" char1="'" context="Single A-string"/>
+				<!-- " -->
 				<DetectChar attribute="String" char="&quot;" context="Single Q-string"/>
-				
-				<DetectChar attribute="Operator" char="(" context="parenthesised" beginRegion="parenthesis"/>
-				<DetectChar attribute="Operator" char=")" context="#pop" endRegion="parenthesis"/>
-				
-				<RegExpr attribute="Operator" String="[+*/%\|=;\!&lt;&gt;!^&amp;~-]" context="#stay"/>
-				<RegExpr attribute="String Substitution" String="%[a-zA-Z]" context="#stay"/>
+				<Detect2Chars attribute="String" char="u" char1="&quot;" context="Single Q-string"/>
 
+				<DetectChar attribute="Normal" char="(" context="parenthesised" beginRegion="parenthesis"/>
+				<DetectChar attribute="Normal" char=")" context="#pop" endRegion="parenthesis"/>
+
+				<AnyChar attribute="Operator" String="+*/%\|=;\!&lt;&gt;!^&amp;~-" context="#stay"/>
+				<RegExpr attribute="Decorator" String="@[_a-zA-Z][\._a-zA-Z0-9]*" firstNonSpace="true"/>
 			</context>
-			
+			<!-- The context CheckForString only exists to catch LineContinue with \ at end of previous line. So that we don't interpret it as comment.  -->
+			<context name="CheckForString" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+				<DetectSpaces/>
+				<StringDetect attribute="String" String="'''" context="Tripple A-string" beginRegion="Tripple A-region"/>
+				<StringDetect attribute="String" String="u'''" context="Tripple A-string" beginRegion="Tripple A-region"/>
+				<!-- """ -->
+				<StringDetect attribute="String" String="&quot;&quot;&quot;" context="Tripple Q-string" beginRegion="Tripple Q-region"/>
+				<StringDetect attribute="String" String="u&quot;&quot;&quot;" context="Tripple Q-string" beginRegion="Tripple Q-region"/>
+			</context>
+
+
 			<context name="parenthesised" attribute="Normal Text" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<IncludeRules context="Normal" />
 			</context>
-			
+
+			<!-- Comments -->
+
+			<context name="Hash comment" attribute="Comment" lineEndContext="#pop">
+				<IncludeRules context="##Alerts_indent" />
+			</context>
+
 			<context name="Tripple A-comment" attribute="Comment" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<StringDetect attribute="Comment" String="'''" context="#pop" endRegion="Tripple A-region"/>
+				<IncludeRules context="##Alerts_indent" />
 			</context>
 
 			<context name="Tripple Q-comment" attribute="Comment" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<HlCChar attribute="Comment" context="#stay"/>
-				<RegExpr attribute="Comment" String="&quot;&quot;&quot;" context="#pop" endRegion="Tripple Q-region"/>
+				<StringDetect attribute="Comment" String="&quot;&quot;&quot;" context="#pop" endRegion="Tripple Q-region"/>
+				<IncludeRules context="##Alerts_indent" />
+			</context>
+
+			<context name="Single A-comment" attribute="Comment" lineEndContext="#stay">
+				<HlCStringChar attribute="Comment" context="#stay"/>
+				<DetectChar attribute="Comment" char="'" context="#pop"/>
+				<IncludeRules context="##Alerts_indent" />
+			</context>
+
+			<context name="Single Q-comment" attribute="Comment" lineEndContext="#stay">
+				<HlCStringChar attribute="Comment" context="#stay"/>
+				<DetectChar attribute="Comment" char="&quot;" context="#pop"/>
+				<IncludeRules context="##Alerts_indent" />
+			</context>
+
+			<!-- Strings -->
+
+			<!-- format characters -->
+			<context name="stringformat" attribute="String Substitution" lineEndContext="#stay">
+				<!-- Python 2 style. Syntax:
+				     1. start character '%'
+				     2. [optional] Mapping key, e.g. '(foo)'
+				     3. [optional] Conversion flags, one of '#0- +'
+				     4. [optional] Minimum width, integer or '*'
+				     5. [optional] Precision, '.' followed by integer or '*'
+				     6. [optional] Length modifier, one of 'hlL'
+				     7. conversion type, one of 'crsdiouxXeEfFgG%'
+				     [Special cases: %prog and %default - see http://docs.python.org/library/optparse.html]
+				-->
+				<RegExpr attribute="String Substitution" String="%((\([a-zA-Z0-9_]+\))?[#0\- +]?([1-9][0-9]*|\*)?(\.([1-9][0-9]*|\*))?[hlL]?[crsdiouxXeEfFgG%]|prog|default)" context="#stay"/>
 			</context>
 
 			<context name="Tripple A-string" attribute="String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<HlCStringChar attribute="String Char" context="#stay"/>
-				<RegExpr attribute="String Substitution" String="%\([a-zA-Z0-9_]+\)[a-zA-Z]" context="#stay"/> 
-				<RegExpr attribute="String Substitution" String="%[a-zA-Z]" context="#stay"/>
-				<RegExpr attribute="String" String="'''" context="#pop" endRegion="Tripple A-region"/>
+				<IncludeRules context="stringformat"/>
+				<StringDetect attribute="String" String="'''" context="#pop" endRegion="Tripple A-region"/>
 			</context>
 
 			<context name="Raw Tripple A-string" attribute="Raw String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<HlCStringChar attribute="Raw String" context="#stay"/>
-				<RegExpr attribute="String Substitution" String="%\([a-zA-Z0-9_]+\)[a-zA-Z]" context="#stay"/> 
-				<RegExpr attribute="String Substitution" String="%[a-zA-Z]" context="#stay"/>
-				<RegExpr attribute="String" String="'''" context="#pop" endRegion="Tripple A-region"/>
+				<IncludeRules context="stringformat"/>
+				<StringDetect attribute="String" String="'''" context="#pop" endRegion="Tripple A-region"/>
 			</context>
 
 			<context name="Tripple Q-string" attribute="String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<HlCStringChar attribute="String Char" context="#stay"/>
-				<RegExpr attribute="String Substitution" String="%\([a-zA-Z0-9_]+\)[a-zA-Z]" context="#stay"/>
-				<RegExpr attribute="String Substitution" String="%[a-zA-Z]" context="#stay"/>
-				<RegExpr attribute="String" String="&quot;&quot;&quot;" context="#pop" endRegion="Tripple Q-region"/>
+				<IncludeRules context="stringformat"/>
+				<StringDetect attribute="String" String="&quot;&quot;&quot;" context="#pop" endRegion="Tripple Q-region"/>
 			</context>
 
 			<context name="Raw Tripple Q-string" attribute="Raw String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<HlCStringChar attribute="Raw String" context="#stay"/>
-				<RegExpr attribute="String Substitution" String="%\([a-zA-Z0-9_]+\)[a-zA-Z]" context="#stay"/>
-				<RegExpr attribute="String Substitution" String="%[a-zA-Z]" context="#stay"/>
-				<RegExpr attribute="String" String="&quot;&quot;&quot;" context="#pop" endRegion="Tripple Q-region"/>
+				<IncludeRules context="stringformat"/>
+				<StringDetect attribute="String" String="&quot;&quot;&quot;" context="#pop" endRegion="Tripple Q-region"/>
 			</context>
 
-			<context name="Single A-comment" attribute="Comment" lineEndContext="#stay">
-				<HlCStringChar attribute="Comment" context="#stay"/>
-				<DetectChar attribute="Comment" char="'" context="#pop"/>
-			</context>
-
-			<context name="Single Q-comment" attribute="Comment" lineEndContext="#stay">
-				<HlCStringChar attribute="Comment" context="#stay"/>
-				<DetectChar attribute="Comment" char="&quot;" context="#pop"/>
-			</context>
 
 			<context name="Single A-string" attribute="String" lineEndContext="#stay">
 				<HlCStringChar attribute="String Char" context="#stay"/>
-				<RegExpr attribute="String Substitution" String="%\([a-zA-Z0-9_]+\)[a-zA-Z]" context="#stay"/>
-				<RegExpr attribute="String Substitution" String="%[a-zA-Z]" context="#stay"/>
+				<IncludeRules context="stringformat"/>
 				<DetectChar attribute="String" char="'" context="#pop"/>
 			</context>
 
 			<context name="Single Q-string" attribute="String" lineEndContext="#stay">
 				<HlCStringChar attribute="String Char" context="#stay"/>
-				<RegExpr attribute="String Substitution" String="%\([a-zA-Z0-9_]+\)[a-zA-Z]" context="#stay"/>
-				<RegExpr attribute="String Substitution" String="%[a-zA-Z]" context="#stay"/>
+				<IncludeRules context="stringformat"/>
 				<DetectChar attribute="String" char="&quot;" context="#pop"/>
 			</context>
 
 			<context name="Raw A-string" attribute="Raw String" lineEndContext="#stay">
 				<HlCStringChar attribute="Raw String" context="#stay"/>
-				<RegExpr attribute="String Substitution" String="%\([a-zA-Z0-9_]+\)[a-zA-Z]" context="#stay"/>
-				<RegExpr attribute="String Substitution" String="%[a-zA-Z]" context="#stay"/>
+				<IncludeRules context="stringformat"/>
 				<DetectChar attribute="Raw String" char="'" context="#pop"/>
 			</context>
 
 			<context name="Raw Q-string" attribute="Raw String" lineEndContext="#stay">
 				<HlCStringChar attribute="Raw String" context="#stay"/>
-				<RegExpr attribute="String Substitution" String="%\([a-zA-Z0-9_]+\)[a-zA-Z]" context="#stay"/>
-				<RegExpr attribute="String Substitution" String="%[a-zA-Z]" context="#stay"/>
+				<IncludeRules context="stringformat"/>
 				<DetectChar attribute="Raw String" char="&quot;" context="#pop"/>
 			</context>
 
 
 		</contexts>
 		<itemDatas>
-			<itemData name="Normal Text" defStyleNum="dsNormal"/>
-			<itemData name="Definition Keyword" defStyleNum="dsKeyword"/>
-			<itemData name="Operator" defStyleNum="dsNormal"/>
-			<itemData name="String Substitution" defStyleNum="dsNormal"/>
-			<itemData name="Command Keyword" defStyleNum="dsKeyword"/>
-			<itemData name="Flow Control Keyword" defStyleNum="dsKeyword"/>
-			<itemData name="Builtin Function" defStyleNum="dsDataType"/>
-			<itemData name="Special Variable" defStyleNum="dsOthers"/>
-			<itemData name="Extensions" defStyleNum="dsOthers" color="#0095ff" selColor="#ffffff" bold="1" italic="0"/>
-			<itemData name="Exceptions" defStyleNum="dsOthers" color="#054d00" selColor="#ffffff" bold="1" italic="0"/>
-			<itemData name="Overloaders" defStyleNum="dsOthers" color="#000e52" selColor="#ffffff" bold="1" italic="0"/>
-			<itemData name="Preprocessor" defStyleNum="dsChar"/>
-			<itemData name="String Char" defStyleNum="dsChar"/>
-			<itemData name="Long" defStyleNum="dsOthers"/>
-			<itemData name="Float" defStyleNum="dsFloat"/>
-			<itemData name="Int" defStyleNum="dsDecVal"/>
-			<itemData name="Hex" defStyleNum="dsOthers"/>
-			<itemData name="Octal" defStyleNum="dsOthers"/>
-			<itemData name="Complex" defStyleNum="dsOthers"/>
+			<itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
+			<itemData name="Definition Keyword" defStyleNum="dsKeyword" spellChecking="false"/>
+			<itemData name="Operator" defStyleNum="dsNormal" bold="1" spellChecking="false"/>
+			<itemData name="String Substitution" defStyleNum="dsOthers" color="#0057ae" selColor="#ffffff"  spellChecking="false"/>
+			<itemData name="Command Keyword" defStyleNum="dsKeyword" spellChecking="false"/>
+			<itemData name="Flow Control Keyword" defStyleNum="dsKeyword" spellChecking="false"/>
+			<itemData name="Builtin Function" defStyleNum="dsDataType" spellChecking="false"/>
+			<itemData name="Special Variable" defStyleNum="dsOthers" spellChecking="false"/>
+			<itemData name="Extensions" defStyleNum="dsOthers" color="#0095ff" selColor="#ffffff" bold="1" italic="0" spellChecking="false"/>
+			<itemData name="Exceptions" defStyleNum="dsOthers" color="#054d00" selColor="#ffffff" bold="1" italic="0" spellChecking="false"/>
+			<itemData name="Overloaders" defStyleNum="dsOthers" color="#000e52" selColor="#ffffff" bold="1" italic="0" spellChecking="false"/>
+			<itemData name="Preprocessor" defStyleNum="dsChar" spellChecking="false"/>
+			<itemData name="String Char" defStyleNum="dsChar" spellChecking="false"/>
+			<itemData name="Float" defStyleNum="dsFloat" spellChecking="false"/>
+			<itemData name="Int" defStyleNum="dsDecVal" spellChecking="false"/>
+			<itemData name="Hex" defStyleNum="dsBaseN" spellChecking="false"/>
+			<itemData name="Octal" defStyleNum="dsBaseN" spellChecking="false"/>
+			<itemData name="Complex" defStyleNum="dsOthers" spellChecking="false"/>
 			<itemData name="Comment" defStyleNum="dsComment"/>
 			<itemData name="String" defStyleNum="dsString"/>
 			<itemData name="Raw String" defStyleNum="dsString"/>
+			<itemData name="Decorator" defStyleNum="dsOthers" color="#8f6b32" selColor="#ffffff" italic="0" spellChecking="false"/>
 		</itemDatas>
 	</highlighting>
-   <general>
-     <folding indentationsensitive="1" />
-     <emptyLines>
-       <emptyLine regexpr="\s+" casesensitive="false"/>
-       <emptyLine regexpr="\s*#.*$" casesensitive="false"/>
-     </emptyLines>
-     <comments>
-        <comment name="singleLine" start="#" position="afterwhitespace"/>
-     </comments>
-     <keywords casesensitive="1" />
-   </general>
+	<general>
+		<folding indentationsensitive="1" />
+		<emptyLines>
+			<emptyLine regexpr="(?:\s+|\s*#.*)"/>
+		</emptyLines>
+		<comments>
+			<comment name="singleLine" start="#" position="afterwhitespace"/>
+		</comments>
+		<keywords casesensitive="1" additionalDeliminator="#'"/>
+	</general>
 </language>
diff --git a/kate/data/qmake.xml b/kate/data/qmake.xml
new file mode 100644
index 000000000..d267033c4
--- /dev/null
+++ b/kate/data/qmake.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<language name="QMake" section="Other" extensions="*.pro;*.pri;" mimetype="" version="1.1" kateversion="2.0" author="Milian Wolff ([email protected])" license="LGPL">
+
+<highlighting>
+  <list name="variables">
+    <item>CONFIG</item>
+    <item>DEFINES</item>
+    <item>DESTDIR</item>
+    <item>DLLDESTDIR</item>
+    <item>FORMS</item>
+    <item>HEADERS</item>
+    <item>INCLUDEPATH</item>
+    <item>INSTALLS</item>
+    <item>LIBS</item>
+    <item>OBJECTIVE_SOURCES</item>
+    <item>OTHER_FILES</item>
+    <item>OUT_PWD</item>
+    <item>QMAKE_CXXFLAGS</item>
+    <item>QMAKE_EXTRA_COMPILERS</item>
+    <item>QMAKE_FILE_IN</item>
+    <item>QMAKE_FILE_OUT</item>
+    <item>QMAKE_LFLAGS</item>
+    <item>QMAKE_LFLAGS_SONAME</item>
+    <item>QMAKE_RPATHDIR</item>
+    <item>QMAKE_SUBSTITUTES</item>
+    <item>QT</item>
+    <item>QT_CONFIG</item>
+    <item>QT_MAJOR_VERSION</item>
+    <item>QT_MINOR_VERSION</item>
+    <item>QT_PATCH_VERSION</item>
+    <item>RCC_DIR</item>
+    <item>RESOURCES</item>
+    <item>SOURCES</item>
+    <item>SUBDIRS</item>
+    <item>TARGET</item>
+    <item>TEMPLATE</item>
+    <item>UI_DIR</item>
+    <item>MOC_DIR</item>
+    <item>OBJECTS_DIR</item>
+  </list>
+  <list name="functions">
+    <item>contains</item>
+    <item>defineReplace</item>
+    <item>defineTest</item>
+    <item>equals</item>
+    <item>error</item>
+    <item>eval</item>
+    <item>greaterThan</item>
+    <item>include</item>
+    <item>isEmpty</item>
+    <item>isEqual</item>
+    <item>message</item>
+    <item>return</item>
+    <item>unset</item>
+  </list>
+  <list name="systems">
+    <item>build_pass</item>
+    <item>debug</item>
+    <item>debug_and_release</item>
+    <item>linux</item>
+    <item>macx</item>
+    <item>msvc</item>
+    <item>release</item>
+    <item>unix</item>
+    <item>win32</item>
+  </list>
+  <list name="keywords">
+    <item>else</item>
+    <item>for</item>
+    <item>if</item>
+  </list>
+
+  <contexts>
+    <context name="normal" attribute="Normal Text" lineEndContext="#stay">
+      <keyword attribute="Predefined Variable" String="variables" />
+      <keyword attribute="Function" String="functions" />
+      <keyword attribute="System" String="systems" />
+      <keyword attribute="Keyword" String="keywords" />
+      <DetectChar char="#" attribute="Comment" context="Comment" />
+      <RegExpr attribute="Variable" context="#stay" String="\$\$?[a-zA-Z0-9_]+" />
+      <RegExpr attribute="Variable" context="#stay" String="\$\$\{[^\}]*\}" />
+      <RegExpr attribute="Variable" context="#stay" String="\$\$\[[^\]]*\]" />
+      <RegExpr attribute="Variable" context="#stay" String="\$\$\([^\)]*\)" />
+      <Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="\" />
+      <Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="&quot;" />
+      <DetectChar char="&quot;" attribute="String" context="String" />
+    </context>
+
+    <context name="String" attribute="String" lineEndContext="#stay">
+      <Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="\" />
+      <Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="&quot;" />
+      <DetectChar attribute="String" context="#pop" char="&quot;" />
+    </context>
+    <context name="Comment" attribute="Comment" lineEndContext="#pop">
+      <DetectSpaces />
+      <IncludeRules context="##Alerts" />
+      <DetectIdentifier />
+    </context>
+  </contexts>
+
+  <itemDatas>
+    <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false" />
+    <itemData name="Predefined Variable" defStyleNum="dsDataType" bold="1" spellChecking="false" />
+    <itemData name="Variable" defStyleNum="dsDataType" spellChecking="false" />
+    <itemData name="Function" defStyleNum="dsFunction" spellChecking="false" />
+    <itemData name="System" defStyleNum="dsOthers" spellChecking="false" />
+    <itemData name="Keyword" defStyleNum="dsKeyword" spellChecking="false" />
+    <itemData name="String" defStyleNum="dsString" spellChecking="false" />
+    <itemData name="Backslash Code" defStyleNum="dsKeyword" bold="1" spellChecking="false" />
+    <itemData name="Comment" defStyleNum="dsComment" />
+  </itemDatas>
+</highlighting>
+
+<general>
+  <comments>
+      <comment name="singleLine" start="#" />
+  </comments>
+  <keywords casesensitive="1" />
+</general>
+
+</language>
+<!-- kate: indent-width 2; -->
\ No newline at end of file
diff --git a/kate/data/qml.xml b/kate/data/qml.xml
new file mode 100644
index 000000000..e5a0c8be0
--- /dev/null
+++ b/kate/data/qml.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!-- Author: Milian Wolff <[email protected]> -->
+<language name="QML" version="1.3" kateversion="2.4" section="Scripts" extensions="*.qml"
+          mimetype="text/x-qml;application/x-qml" indenter="cstyle"
+          author="Milian Wolff ([email protected])" license="">
+  <highlighting>
+    <list name="elements">
+      <!-- see: http://doc.trolltech.com/4.7-snapshot/qmlelements.html -->
+      <item>State</item>
+      <item>PropertyChanges</item>
+      <item>StateGroup</item>
+      <item>ParentChange</item>
+      <item>StateChangeScript</item>
+      <item>AnchorChanges</item>
+      <item>PropertyAnimation</item>
+      <item>NumberAnimation</item>
+      <item>ColorAnimation</item>
+      <item>SequentialAnimation</item>
+      <item>ParallelAnimation</item>
+      <item>PauseAnimation</item>
+      <item>PropertyAction</item>
+      <item>ParentAction</item>
+      <item>ScriptAction</item>
+      <item>Transition</item>
+      <item>SpringFollow</item>
+      <item>EaseFollow</item>
+      <item>Behavior</item>
+      <item>Binding</item>
+      <item>ListModel</item>
+      <item>ListElement</item>
+      <item>VisualItemModel</item>
+      <item>XmlListModel</item>
+      <item>XmlRole</item>
+      <item>DateTimeFormatter</item>
+      <item>NumberFormatter</item>
+      <item>Script</item>
+      <item>Connection</item>
+      <item>Component</item>
+      <item>Timer</item>
+      <item>QtObject</item>
+      <item>Item</item>
+      <item>Rectangle</item>
+      <item>Image</item>
+      <item>BorderImage</item>
+      <item>Text</item>
+      <item>TextInput</item>
+      <item>TextEdit</item>
+      <item>MouseArea</item>
+      <item>FocusScope</item>
+      <item>Flickable</item>
+      <item>Flipable</item>
+      <item>WebView</item>
+      <item>Loader</item>
+      <item>Repeater</item>
+      <item>SystemPalette</item>
+      <item>GraphicsObjectContainer</item>
+      <item>LayoutItem</item>
+      <item>ListView</item>
+      <item>GridView</item>
+      <item>PathView</item>
+      <item>Path</item>
+      <item>PathLine</item>
+      <item>PathQuad</item>
+      <item>PathCubic</item>
+      <item>PathAttribute</item>
+      <item>PathPercent</item>
+      <item>Column</item>
+      <item>Row</item>
+      <item>Grid</item>
+      <item>Scale</item>
+      <item>Rotation</item>
+      <item>Blur</item>
+      <item>Colorize</item>
+      <item>DropShadow</item>
+      <item>Opacity</item>
+      <item>Particles</item>
+      <item>ParticleMotionLinear</item>
+      <item>ParticleMotionGravity</item>
+      <item>ParticleMotionWander</item>
+      <!-- here some other items I find in the examples, we really need a proper list of them... -->
+      <item>Gradient</item>
+      <item>GradientStop</item>
+      <item>MouseRegion</item>
+    </list>
+    <list name="types">
+      <!-- see: http://doc.trolltech.com/4.7-snapshot/qml-extending-types.html -->
+      <item>string</item>
+      <item>int</item>
+      <item>bool</item>
+      <item>date</item>
+      <item>color</item>
+      <item>url</item>
+      <item>real</item>
+      <item>double</item>
+      <item>var</item>
+      <item>variant</item>
+    </list>
+    <contexts>
+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
+        <DetectSpaces/>
+        <StringDetect attribute="Import" context="Import" String="import"/>
+        <keyword attribute="Elements" context="#stay" String="elements" />
+        <StringDetect attribute="Signal" context="Signal" String="signal" />
+        <StringDetect attribute="Keywords" context="Property" String="default property" />
+        <StringDetect attribute="Keywords" context="Property" String="property" />
+        <IncludeRules context="##JavaScript" />
+      </context>
+      <context attribute="ImportValue" lineEndContext="#pop" name="Import">
+      </context>
+      <context attribute="Normal Text" lineEndContext="#pop" name="Property">
+        <StringDetect attribute="Property Type" context="#stay" String="alias" />
+        <keyword attribute="Property Type" context="#stay" String="types" />
+        <DetectSpaces />
+        <DetectIdentifier />
+        <DetectSpaces />
+        <DetectChar char=":" context="#pop" />
+      </context>
+      <context attribute="Normal Text" lineEndContext="#pop" name="Signal">
+        <DetectSpaces />
+        <DetectIdentifier />
+        <DetectChar char="(" context="SignalParameter" />
+      </context>
+      <context attribute="Normal Text" name="SignalParameter" lineEndContext="#pop">
+        <DetectSpaces />
+        <keyword attribute="Property Type" context="#stay" String="types" />
+        <DetectSpaces />
+        <DetectIdentifier />
+        <DetectSpaces />
+        <AnyChar String=")" context="#pop"/>
+      </context>
+    </contexts>
+    <itemDatas>
+      <itemData name="Normal Text"  defStyleNum="dsNormal"  spellChecking="false" />
+      <itemData name="Import"  defStyleNum="dsKeyword"  spellChecking="false" />
+      <itemData name="ImportValue"  defStyleNum="dsString"  spellChecking="false" />
+      <itemData name="Keywords"  defStyleNum="dsKeyword"  spellChecking="false" />
+      <itemData name="Elements" defStyleNum="dsKeyword" color="#008000" selColor="#00ffff" bold="0" italic="0" spellChecking="false"/>
+      <itemData name="Signal" defStyleNum="dsKeyword" color="#0095ff" selColor="#ffffff" spellChecking="false"/>
+      <itemData name="Property Type" defStyleNum="dsDataType" spellChecking="false" />
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name="singleLine" start="//" />
+      <comment name="multiLine" start="/*" end="*/" />
+    </comments>
+    <keywords casesensitive="1" />
+  </general>
+</language>
+
+<!-- kate: tab-width 2; replace-tabs on; indent-width 2; -->
\ No newline at end of file
diff --git a/kate/data/r.xml b/kate/data/r.xml
index ada76ece5..bfb336f14 100644
--- a/kate/data/r.xml
+++ b/kate/data/r.xml
@@ -8,7 +8,7 @@
 	R      : http://www.r-project.org/
 	RKWard : http://rkward.sourceforge.net/
 	-->
-<language version="2.02" kateversion="2.5" name="R Script" section="Scripts" extensions="*.R;*.r;*.S;*.s;*.q" mimetype="" license="GPL">
+<language version="2.07" kateversion="2.5" name="R Script" section="Scripts" extensions="*.R;*.r;*.S;*.s;*.q" mimetype="" license="GPL">
 <highlighting>
 
 	<list name="controls">
@@ -77,6 +77,15 @@
 			<HlCStringChar attribute="String Char" context="#stay"/>
 		</context>
 
+		<context attribute="Normal Text" lineEndContext="#stay" name="operator_rhs" fallthrough="true" fallthroughContext="#pop">
+			<!-- While there is nothing of interest, stay in the context -->
+			<StringDetect attribute="Headline" context="Headline" String="##"/>
+			<DetectChar attribute="Comment" context="Comment" char="#"/>
+			<DetectChar attribute="String" context="#stay" char=" "/>
+			<!-- Operators other than +, -, and ! directly after another operator are an error. -->
+			<RegExpr attribute="Error" context="#stay" String="(\*|/|&lt;|&gt;|\!=|=|\||&amp;|:|\^|@|\$|~)"/>
+		</context>
+
 		<context attribute="Headline" lineEndContext="#pop" name="Headline"/>
 		<context attribute="Comment" lineEndContext="#pop" name="Comment"/>
 
@@ -95,21 +104,12 @@
 			<StringDetect attribute="Headline" context="Headline" String="##"/>
 			<DetectChar attribute="Comment" context="Comment" char="#"/>
 
-			<!-- The following three lines look worse than they are: If there are any other operators directly before or after -> and <-, this is a syntax error (expections: ->> and <<-) -->
-			<RegExpr attribute="Error" context="#stay" String="([\+\-\*/\^\:\$~!&amp;\|=&gt;@^])([&lt;]{1,2}\-|\-[&gt;]{1,2})"/>
-			<RegExpr attribute="Error" context="#stay" String="([&lt;]{1,2}\-|\-[&gt;]{1,2})([\+\-\*/\^\:\$~!&amp;\|=&lt;@])"/>
-			<RegExpr attribute="Error" context="#stay" String="([&lt;]{3}|[&gt;]{3})"/>
-			<RegExpr attribute="Assign" context="#stay" String="[&lt;]{1,2}\-"/>
-			<RegExpr attribute="Assign" context="#stay" String="\-[&gt;]{1,2}"/>
-			<!-- Much like above: Most other operators are forbidden around = -->
-			<RegExpr attribute="Error" context="#stay" String="([\+\-\*/\^\:\$~&amp;\|@^])="/>
-			<RegExpr attribute="Error" context="#stay" String="=([\+\-\*/\^\:\$~!&lt;&gt;&amp;\|@^])"/>
-			<RegExpr attribute="Assign" context="#stay" String="=(?!=)"/>
-
-			<!-- These operators are fine as long as they're followed by something else or end of line. Error otherwise -->
-			<RegExpr attribute="Operator" context="#stay" String="(\+|\-|\*|/|&lt;=|&gt;=|={1,2}|\!=|\|{1,2}|&amp;{1,2}|:{1,3}|\^|@|\$|~)((?!(\+|\-|\*|/|&lt;=|&gt;=|=|\!=|\||&amp;|:|\^|@|\$|~))|$)"/>
-			<RegExpr attribute="Error" context="#stay" String="(\+|\-|\*|/|&lt;=|&gt;=|={1,2}|\!=|\|{1,2}|&amp;{1,2}|:{1,3}|\^|@|\$|~){2,}"/>	
-			<RegExpr attribute="Operator" context="#stay" String="%[^%]*%"/>
+			<!-- For (assignment) operators, enter a new context operator_rhs to check what follows (generally, that should not be another op) -->
+			<RegExpr attribute="Assign" context="operator_rhs" String="[&lt;]{1,2}\-"/>
+			<RegExpr attribute="Assign" context="operator_rhs" String="\-[&gt;]{1,2}"/>
+			<RegExpr attribute="Assign" context="operator_rhs" String="=(?!=)"/>
+			<RegExpr attribute="Operator" context="operator_rhs" String="(\+|\-|\*{1,2}|/|&lt;=?|&gt;=?|={1,2}|\!=?|\|{1,2}|&amp;{1,2}|:{1,3}|\^|@|\$|~)"/>
+			<RegExpr attribute="Operator" context="operator_rhs" String="%[^%]*%"/>
 			
 			<DetectChar attribute="Symbol" context="ctx0" char="{" beginRegion="Brace1" />
 
@@ -143,6 +143,6 @@
 	<comments>
 		<comment name="singleLine" start="#" end=""/>
 	</comments>
-	<keywords casesensitive="1" />
+	<keywords casesensitive="true" weakDeliminator="." additionalDeliminator="$"/>
 </general>
 </language>
diff --git a/kate/data/relaxng.xml b/kate/data/relaxng.xml
new file mode 100644
index 000000000..974f37ff5
--- /dev/null
+++ b/kate/data/relaxng.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+	<!ENTITY qname    "[A-Za-z_:][\w.:_-]*">
+	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&qname;);">
+]>
+
+<!--
+  Kate syntax highlighting for RELAX NG
+  2007 by Thomas Schraitle (tom_schr AT web DOT de)
+  Derived from the XSLT syntax file from Peter Lammich
+  Published under the LGPL
+
+  TODO:
+   - More modularization (how?)
+   - Namespace rules
+-->
+
+<language version="0.8"
+          kateversion="2.1"
+          name="RELAX NG"
+          section="Markup"
+          extensions="*.rng;*.RNG"
+          license="LGPL"
+          author="Thomas Schraitle (tom_schr AT web DOT de)">
+  <highlighting>
+    <list name="relaxngnames">
+      <item> anyName </item>
+      <item> attribute </item>
+      <item> choice </item>
+      <item> data </item>
+      <item> define </item>
+      <item> div </item>
+      <item> element </item>
+      <item> empty </item>
+      <item> except </item>
+      <item> externalRef </item>
+      <item> grammar </item>
+      <item> group </item>
+      <item> include </item>
+      <item> interleave </item>
+      <item> list </item>
+      <item> mixed </item>
+      <item> name </item>
+      <item> notAllowed </item>
+      <item> nsName </item>
+      <item> oneOrMore </item>
+      <item> optional </item>
+      <item> param </item>
+      <item> parentRef </item>
+      <item> ref </item>
+      <item> start </item>
+      <item> text </item>
+      <item> value </item>
+      <item> zeroOrMore </item>
+    </list>
+
+    <contexts>
+      <context name="normalText" attribute="Normal Text" lineEndContext="#stay">
+         <StringDetect attribute="Comment" context="comment" String="&lt;!--" beginRegion="comment"/>
+         <DetectChar attribute="Tag" context="tagname" char="&lt;" />
+         <RegExpr attribute="Entity Reference" context="#stay" String="&entref;" />
+      </context>
+
+      <context name="detectEntRef" attribute="Normal Text" lineEndContext="#stay">
+         <RegExpr attribute="Entity Reference" context="#stay" String="&entref;" />
+      </context>
+
+      <context name="tagname" attribute="Tag" lineEndContext="#stay">
+         <keyword attribute="RELAX NG Tag" context="attributes" String="relaxngnames" />
+         <RegExpr attribute="Attribute" context="attributes" String="\s*" />
+         <DetectChar attribute="Tag" context="#pop" char="&gt;" />
+      </context>
+      
+      <context name="attributes" attribute="Attribute" lineEndContext="#stay">
+         <Detect2Chars attribute="Tag" context="#pop#pop" char="/" char1="&gt;" />
+         <DetectChar attribute="Tag" context="#pop#pop" char="&gt;" />
+         <RegExpr attribute="Normal Text" context="attrValue" String="\s*=\s*" />
+      </context>
+      
+      <context name="attrValue" attribute="Invalid" lineEndContext="#stay">
+         <Detect2Chars attribute="Invalid" context="#pop#pop#pop" char="/" char1="&gt;" />
+         <DetectChar attribute="Invalid" context="#pop#pop#pop" char="&gt;" />
+         <DetectChar attribute="Attribute Value" context="string" char="&quot;" />
+      </context>
+      
+      <context name="string" attribute="Attribute Value" lineEndContext="#stay">
+         <DetectChar attribute="Attribute Value" context="#pop#pop" char="&quot;" />
+         <IncludeRules context="detectEntRef" />
+      </context>
+      
+      <context name="comment" attribute="Comment" lineEndContext="#stay">
+        <DetectSpaces/>
+        <StringDetect attribute="Comment" context="#pop"  String="--&gt;" endRegion="comment"/>
+        <RegExpr attribute="Error" context="#stay" String="-(-(?!-&gt;))+"/>
+        <IncludeRules context="##Alerts"/>
+        <DetectIdentifier/>
+      </context>      
+    </contexts>
+    
+    <itemDatas>
+      <itemData name="Normal Text" defStyleNum="dsNormal"/>
+      <itemData name="Tag" defStyleNum="dsKeyword"/>
+      <itemData name="Invalid" defStyleNum="dsError"/>
+      <itemData name="Attribute" defStyleNum="dsOthers"/>
+      <itemData name="Attribute Value" defStyleNum="dsString" color="#800000" selColor="#ffffff" bold="0" italic="0"/>
+      <itemData name="Comment" defStyleNum="dsComment"/>
+      <itemData name="RELAX NG Tags" defStyleNum="dsKeyword" color="#000080" selColor="#ffffff" bold="1" italic="0" />
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name="multiLine" start="&lt;!--" end="--&gt;" />
+    </comments>
+    <keywords casesensitive="0" weakDeliminator="-:" additionalDeliminator="&quot;{}"/>
+  </general>
+</language>
diff --git a/kate/data/relaxngcompact.xml b/kate/data/relaxngcompact.xml
new file mode 100644
index 000000000..a44012fba
--- /dev/null
+++ b/kate/data/relaxngcompact.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<language name="RelaxNG-Compact" version="0.2" kateversion="2.4" section="Markup" extensions="*.rnc" casesensitive="1" author="Rintze Zelle" license="LGPL">
+  <highlighting>
+    <list name="Keywords">
+      <item> default </item>
+      <item> datatypes </item>
+      <item> div </item>
+      <item> empty </item>
+      <item> external </item>
+      <item> grammar </item>
+      <item> include </item>
+      <item> inherit </item>
+      <item> list </item>
+      <item> mixed </item>
+      <item> namespace </item>
+      <item> notAllowed </item>
+      <item> parent </item>
+      <item> start </item>
+      <item> token </item>      
+    </list>
+    <list name="Node Names">
+      <item> attribute </item>
+      <item> element </item>    
+    </list>    
+    <list name="Datatypes">
+      <item> string </item>
+      <item> text </item>    
+      <item> xsd:anyURI </item>
+      <item> xsd:base64Binary </item>
+      <item> xsd:boolean </item>
+      <item> xsd:byte </item>
+      <item> xsd:date </item>
+      <item> xsd:dateTime </item>
+      <item> xsd:decimal </item>
+      <item> xsd:double </item>
+      <item> xsd:duration </item>
+      <item> xsd:ENTITIES </item>
+      <item> xsd:ENTITY </item>
+      <item> xsd:float </item>
+      <item> xsd:gDay </item>
+      <item> xsd:gMonth </item>
+      <item> xsd:gMonthDay </item>
+      <item> xsd:gYear </item>
+      <item> xsd:gYearMonth </item>
+      <item> xsd:hexBinary </item>
+      <item> xsd:ID </item>
+      <item> xsd:IDREF </item>
+      <item> xsd:IDREFS </item>
+      <item> xsd:int </item>
+      <item> xsd:integer </item>
+      <item> xsd:language </item>
+      <item> xsd:long </item>
+      <item> xsd:Name </item>
+      <item> xsd:NCName </item>
+      <item> xsd:negativeInteger </item>
+      <item> xsd:NMTOKEN </item>
+      <item> xsd:NMTOKENS </item>
+      <item> xsd:nonNegativeInteger </item>
+      <item> xsd:nonPositiveInteger </item>
+      <item> xsd:normalizedString </item>
+      <item> xsd:NOTATION </item>
+      <item> xsd:positiveInteger </item>
+      <item> xsd:QName </item>
+      <item> xsd:short </item>
+      <item> xsd:string </item> 
+      <item> xsd:time </item>
+      <item> xsd:token </item>
+      <item> xsd:unsignedByte </item>
+      <item> xsd:unsignedInt </item>
+      <item> xsd:unsignedLong </item>
+      <item> xsd:unsignedShort </item>
+    </list>
+    <contexts>
+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal Text" >
+        <DetectChar attribute="Comments" char="#" firstNonSpace="true" context="Comments"/>
+	<DetectChar attribute="String" char="&quot;" context="String" />
+	<keyword attribute="Keywords" context="#stay" String="Keywords" />
+	<keyword attribute="Keywords" context="Node Names" String="Node Names" />
+	<keyword attribute="Datatypes" context="#stay" String="Datatypes" />
+	<RegExpr attribute="Definitions" context="Definitions" String="[\w\.-]+[\s]+=" lookAhead="true" />
+      </context>
+      <context attribute="Comments" lineEndContext="#pop" name="Comments" >
+      </context>
+      <context attribute="String" lineEndContext="#stay" name="String" >
+        <DetectChar attribute="String" context="#pop" char="&quot;" />
+      </context>
+      <context attribute="Node Names" lineEndContext="#pop" name="Node Names" >
+        <DetectChar attribute="Node Names" context="#pop" char="{" lookAhead="true" />
+      </context>
+      <context attribute="Definitions" lineEndContext="#pop" name="Definitions" >
+        <DetectChar attribute="Definitions" context="#pop#pop" char="=" lookAhead="true" />
+      </context>
+    </contexts>
+    <itemDatas>
+      <itemData name="Normal Text" defStyleNum="dsNormal" />
+      <itemData name="Comments" defStyleNum="dsComment" />
+      <itemData name="String" defStyleNum="dsString" />
+      <itemData name="Keywords" defStyleNum="dsKeyword" />
+      <itemData name="Datatypes" defStyleNum="dsDataType" />
+      <itemData name="Node Names" defStyleNum="dsOthers" />
+      <itemData name="Definitions" defStyleNum="dsFunction" />
+    </itemDatas>
+  </highlighting>
+  <general>
+    <keywords weakDeliminator="-:"/>
+  </general>
+</language>
\ No newline at end of file
diff --git a/kate/data/rest.xml b/kate/data/rest.xml
new file mode 100644
index 000000000..a97524ec7
--- /dev/null
+++ b/kate/data/rest.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+        <!ENTITY inlinestart "(^|[\s&apos;&quot;\(\[-{&lt;/:‘“’«¡¿‐‑‒–— ])">
+        <!ENTITY inlineend "([\s’”»‐‑‒–— &apos;&quot;\)\]}&gt;-/:\.,;!\?\\]|$)">
+        <!ENTITY SimpleReferenceNameChars "\w-_\.:\+">
+]>
+<!-- Copyright Matt Williams <[email protected]> June 2010 -->
+<language name="reStructuredText" extensions="*.rst" section="Markup" mimetype="text/x-rst" version="1.01" kateversion="2.4" casesensitive="1">
+	
+	<highlighting>
+		
+		<contexts>
+			<context name="Normal" attribute="Normal" lineEndContext="#stay">
+				<RegExpr attribute="Bold" context="#stay" String="&inlinestart;\*\*[^\s].*\*\*&inlineend;" minimal="true"/>
+				<RegExpr attribute="Italic" context="#stay" String="&inlinestart;\*[^\s].*\*&inlineend;" minimal="true"/>
+				<RegExpr attribute="InlineLiteral" context="#stay" String="&inlinestart;``[^\s].*``&inlineend;" minimal="true"/>
+				<RegExpr attribute="SubstitutionReference" context="#stay" String="&inlinestart;\|[^\s].*\|&inlineend;" minimal="true"/>
+				<RegExpr attribute="InlineInternalTarget" context="#stay" String="&inlinestart;_`[^\s].*`&inlineend;" minimal="true"/>
+				<RegExpr attribute="Normal" context="#stay" String="&inlinestart;\[[^\s].*\]&inlineend;" minimal="true"/> <!--This is to stop greedy matching of [foo]-->
+				<RegExpr attribute="FootnoteReference" context="#stay" String="&inlinestart;\[[^\s].*\]_&inlineend;" minimal="true"/>
+				<RegExpr attribute="HyperlinkRefOrInterpretedText" context="#stay" String="&inlinestart;`[^\s].*(`|`_)&inlineend;" minimal="true"/>
+				<RegExpr attribute="HyperlinkReference" context="#stay" String="\w+_(\s|$)" minimal="true"/>
+				<DetectChar attribute="Field" context="Field" firstNonSpace="true" char=":"/>
+				<RegExpr attribute="Footnote" context="#stay" String="^\s*\.\. \[(\d+|#|\*|#[&SimpleReferenceNameChars;]+)\]\s" minimal="true" firstNonSpace="true"/>
+				<RegExpr attribute="Citation" context="#stay" String="^\s*\.\. \[[&SimpleReferenceNameChars;]+\]\s" minimal="true" firstNonSpace="true"/>
+				<RegExpr attribute="HyperlinkTarget" context="#stay" String="^\s*(\.\. (__:|_[&SimpleReferenceNameChars; ]+:(\s|$))|__ )" minimal="true" firstNonSpace="true"/>
+				<RegExpr attribute="Directive" context="#stay" String="^\s*\.\. [\w-_\.]+::(\s|$)" minimal="true" firstNonSpace="true"/>
+				<RegExpr attribute="SubstitutionDefinition" context="#stay" String="^\s*\.\. \|[&SimpleReferenceNameChars; ]+\|\s+[&SimpleReferenceNameChars;]+::\s" minimal="true" firstNonSpace="true"/>
+			</context>
+			<context name="Field" attribute="Field" lineEndContext="#stay">
+				<DetectChar attribute="Field" context="#pop" char=":"/>
+				<Detect2Chars attribute="Field" context="#stay" char="\" char1=":"/>
+			</context>
+		</contexts>
+		
+		<itemDatas>
+			<itemData name="Normal" defStyleNum="dsNormal" />
+			<itemData name="Bold" defStyleNum="dsNormal" bold="1" />
+			<itemData name="Italic" defStyleNum="dsNormal" italic="1" />
+			<itemData name="InlineLiteral" defStyleNum="dsString" />
+			<itemData name="SubstitutionReference" defStyleNum="dsFunction" />
+			<itemData name="InlineInternalTarget" defStyleNum="dsFunction" />
+			<itemData name="FootnoteReference" defStyleNum="dsOthers" />
+			<itemData name="HyperlinkRefOrInterpretedText" defStyleNum="dsOthers" />
+			<itemData name="HyperlinkReference" defStyleNum="dsOthers" />
+			<itemData name="Monospaced" defStyleNum="dsNormal" color="#006600" />
+			<itemData name="Field" defStyleNum="dsFunction" />
+			<itemData name="Footnote" defStyleNum="dsDataType" />
+			<itemData name="Citation" defStyleNum="dsDataType" />
+			<itemData name="HyperlinkTarget" defStyleNum="dsDataType" />
+			<itemData name="Directive" defStyleNum="dsDataType" />
+			<itemData name="SubstitutionDefinition" defStyleNum="dsDataType" />
+		</itemDatas>
+		
+	</highlighting>
+	
+	<general>
+		<folding indentationsensitive="true" />
+	</general>
+	
+</language>
diff --git a/kate/data/rpmspec.xml b/kate/data/rpmspec.xml
index dc21ca3b5..a0b774c6c 100644
--- a/kate/data/rpmspec.xml
+++ b/kate/data/rpmspec.xml
@@ -1,134 +1,505 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd" [
   <!ENTITY a_valid_char_in_macro_names "A-Za-z0-9_">
+  <!ENTITY command_section_name "(prep|build|pre|preun|install|post|postun|clean|files|trigger|triggerin|triggerun|triggerpostun|verifyscript|check|pretrans|posttrans)">
+  <!ENTITY arch "(alpha|alphaev5|alphaev56|alphaev6|alphaev67|alphapca56|amd64|armv3l|armv4b|armv4l|armv4tl|armv5b|armv5l|armv5teb|armv5tejl|armv5tel|armv6l|armv7l|atariclone|atarist|atariste|ataritt|athlon|axp|em64t|falcon|fat|geode|hades|hppa|hppa1\.0|hppa1\.1|hppa1\.2|hppa2\.0|hppa64|i370|i386|i486|i586|i686|ia32e|ia64|IP|m68k|m68kmint|milan|mips|mipsel|noarch|osfmach3_i386|osfmach3_i486|osfmach3_i586|osfmach3_i686|osfmach3_ppc|parisc|pentium3|pentium4|powerpc|powerpc64|powerppc|ppc|ppc32dy4|ppc64|ppc64iseries|ppc64pseries|ppc8260|ppc8560|ppciseries|ppcpseries|rs6000|s390|s390x|sgi|sh|sh3|sh4|sh4a|sparc|sparc64|sparc64v|sparcv8|sparcv9|sparcv9v|sun4|sun4c|sun4d|sun4m|sun4u|x86_64|xtensa)">
+  <!ENTITY os "(AIX|AmigaOS|BSD_OS|bsdi|bsdi4\.0|cygwin32|CYGWIN32_95|CYGWIN32_NT|Darwin|darwin|Darwin|FreeBSD|FreeMiNT|HP-UX|hpux10|hpux10\.00|hpux10\.01|hpux10\.10|hpux10\.20|hpux10\.30|hpux11\.00|hpux9\.04|hpux9\.05|hpux9\.07|IRIX|Irix|IRIX|IRIX64|Irix64|IRIX64|Linux|Linux\/390|Linux\/ESA|machten|MacOSX|macosx|MacOSX|MiNT|mint|MiNT|mint|MiNT|mint|MP_RAS|ncr-sysv4\.2|ncr-sysv4\.3|NEXTSTEP|NextStep|OS\/390|OSF1|osf1|osf3\.2|osf4\.0|SCO_SV|SCO_SV3\.2v5\.0\.2|solaris|solaris2\.3|solaris2\.4|solaris2\.5|solaris2\.6|solaris2\.7|SunOS|SunOS4|SunOS5|TOS|UNIX_SV|VM\/ESA)">
+  <!ENTITY arch_conditionals_names "(ifarch|ifnarch)">
+  <!ENTITY os_conditionals_names "(ifos|ifnos)">
+  <!ENTITY lookahead_whitespace_eol "(?=($| |\t))">
 ]>
-<language name="RPM Spec" version="1.4" kateversion="2.4" section="Other" extensions="*.spec" mimetype="" license="public domain">
+<language name="RPM Spec" version="2.03" kateversion="2.4" section="Other" extensions="*.spec" mimetype="" license="public domain">
+
+<!-- The entities "arch" and "os" are based on /usr/lib/rpm/rpmrc (in the version coming with openSUSE 11.4). -->
 
   <highlighting>
-    
+
+    <list name="weekdays">
+      <item> Mon </item>
+      <item> Tue </item>
+      <item> Wed </item>
+      <item> Thu </item>
+      <item> Fri </item>
+      <item> Sat </item>
+      <item> Sun </item>
+    </list>
+
+    <list name="month names">
+      <item> Jan </item>
+      <item> Feb </item>
+      <item> Mar </item>
+      <item> Apr </item>
+      <item> May </item>
+      <item> Jun </item>
+      <item> Jul </item>
+      <item> Aug </item>
+      <item> Sep </item>
+      <item> Oct </item>
+      <item> Nov </item>
+      <item> Dec </item>
+    </list>
+
+    <list name="days">
+      <item> 1 </item>
+      <item> 2 </item>
+      <item> 3 </item>
+      <item> 4 </item>
+      <item> 5 </item>
+      <item> 6 </item>
+      <item> 7 </item>
+      <item> 8 </item>
+      <item> 9 </item>
+      <item> 01 </item>
+      <item> 02 </item>
+      <item> 03 </item>
+      <item> 04 </item>
+      <item> 05 </item>
+      <item> 06 </item>
+      <item> 07 </item>
+      <item> 08 </item>
+      <item> 09 </item>
+      <item> 10 </item>
+      <item> 11 </item>
+      <item> 12 </item>
+      <item> 13 </item>
+      <item> 14 </item>
+      <item> 15 </item>
+      <item> 16 </item>
+      <item> 17 </item>
+      <item> 18 </item>
+      <item> 19 </item>
+      <item> 20 </item>
+      <item> 21 </item>
+      <item> 22 </item>
+      <item> 23 </item>
+      <item> 24 </item>
+      <item> 25 </item>
+      <item> 26 </item>
+      <item> 27 </item>
+      <item> 28 </item>
+      <item> 29 </item>
+      <item> 30 </item>
+      <item> 31 </item>
+    </list>
+
     <contexts>
-      <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
+      <!-- "package section" is the context for the package defination. As it is the first context
+      in this file, it is also the context with which the interpreter starts. -->
+      <context attribute="Error" lineEndContext="#stay" name="package section">
         <!-- Handle tags: -->
-        <RegExpr attribute="Tag" context="tag_line" String="((Name|Summary|Summary\(.*\)|Version|Epoch|Serial|Release|Group|Copyright|License|Icon|Vendor|Distribution|Packager|Url|URL|Prefix|Conflicts|Obsoletes|Provides|AutoReqProv|PreReq|Requires|Requires\(.*\)|Enhances|Suggests|Recommends|BuildArch|BuildArchitectures|BuildConflicts|BuildRequires|BuildRoot|ExclusiveArch|ExclusiveOs|ExcludeArch|ExcludeOs|Source\d*|Nosource|Patch\d*|Nopatch)[ \t]*:)" column="0" />
+        <RegExpr attribute="Tag" context="tag_line_value" String="((Icon)[ \t]*:[ \t]*)" column="0" />
+        <RegExpr attribute="Tag" context="tag_line_os" String="((ExclusiveOs|ExcludeOs)[ \t]*:[ \t]*)" column="0" />
+        <RegExpr attribute="Tag" context="tag_line_arch" String="((BuildArch|BuildArchitectures|ExclusiveArch|ExcludeArch)[ \t]*:[ \t]*)" column="0" />
+        <RegExpr attribute="Tag" context="tag_line_package" String="((Conflicts|Obsoletes|Provides|Requires|Requires\(.*\)|Enhances|Suggests|BuildConflicts|BuildRequires|Recommends|PreReq)[ \t]*:[ \t]*)" column="0" />
+        <RegExpr attribute="Tag" context="tag_line_integer" String="((Epoch|Serial|Nosource|Nopatch)[ \t]*:[ \t]*)" column="0" />
+        <RegExpr attribute="Tag" context="tag_line_switch" String="((AutoReq|AutoProv|AutoReqProv)[ \t]*:[ \t]*)" column="0" />
+        <RegExpr attribute="Tag" context="tag_line_string" String="((Copyright|License|Summary|Summary\(.*\)|Distribution|Vendor|Packager|Group|Source\d*|Patch\d*|BuildRoot|Prefix)[ \t]*:[ \t]*)" column="0" />
+        <RegExpr attribute="Tag" context="tag_line_string_only_one_word" String="((Name|Version|Release|Url|URL)[ \t]*:[ \t]*)" column="0" />
         <!-- Handle % -->
-        <AnyChar context="handle_percent" String="%$" lookAhead="true" />
+        <AnyChar context="macro entry in package section" String="%$" lookAhead="true" />
         <!-- Handle comments. "# norootforbuild" is displayed like a tag. -->
-        <DetectChar context="Comment" char="#" column="0" lookAhead="true" />
+        <RegExpr context="Comment" String="[ \t]*#" column="0" lookAhead="true" />
+                <!-- Spaces are okay -->
+        <DetectSpaces attribute="Fallback for separator spaces" />
+        <!-- Fallback value for every non-space -->
+        <!--RegExpr attribute="Error" context="#stay" String="[^\s]" /-->
       </context>
-      
-      <context attribute="Normal Text" lineEndContext="#stay" name="command section">
+
+      <!-- "macro entry in package section" is used for lines in the package section that start
+      with a macro. It recognizes macros. Everything else is treated as normal text. This context
+      is used to prevent to highlight syntax errors after macros. With the next line break, this
+      context will switch back ("#pop"). -->
+      <context attribute="Shell commands" lineEndContext="#pop" name="macro entry in package section">
+        <!-- Handle % -->
+        <AnyChar context="handle_percent" String="%$" lookAhead="true" />
+      </context>
+
+      <!-- "package section start line" simply is used for the parameters after the
+      "%package" macro. With the next line break, it will switch to the
+      "package section" context which will handle everything else. -->
+      <context attribute="Shell commands" lineEndContext="package section" name="package section start line">
         <!-- Handle % -->
         <AnyChar context="handle_percent" String="%$" lookAhead="true" />
-        <!-- Handle comments. "# norootforbuild" is displayed like a tag. -->
-        <DetectChar context="Comment" char="#" column="0" lookAhead="true" />
       </context>
-      
-      <context attribute="Normal Text" lineEndContext="#stay" name="changelog section">
-        <Detect2Chars attribute="Value" context="tag_line" char="-" char1=" " column="0" />
-        <Detect2Chars attribute="Tag" context="changelog_header" char="*" char1=" " column="0" />
+
+      <!-- "command section" is a generic context for all secions (like %prep, %build, %install...)
+      where you can enter shell commands. -->
+      <context attribute="Shell commands" lineEndContext="#stay" name="command section">
+        <!-- Handle \ -->
+        <RegExpr attribute="Escaped character" String="\\." />
+        <DetectChar attribute="Line break" char="\" />
+        <!-- Handle % -->
+        <AnyChar context="handle_percent" String="%$" lookAhead="true" />
         <!-- Handle comments. "# norootforbuild" is displayed like a tag. -->
-        <DetectChar context="Comment" char="#" column="0" lookAhead="true" />
+        <RegExpr context="Comment" String="[ \t]*#" column="0" lookAhead="true" />
+      </context>
+
+      <!-- "changelog section" is the context for the changelog. By default, everything that is
+      not recognized especially, is interpretated as changelog text. -->
+      <context attribute="String" lineEndContext="#stay" name="changelog section">
+        <!-- Handle calender date -->
+        <DetectChar attribute="Tag" context="changelog_weekday" char="*" column="0" />
         <!-- Handle % -->
         <AnyChar context="handle_percent" String="%$" lookAhead="true" />
+        <!-- Handle comments. "# norootforbuild" is displayed like a tag. -->
+        <RegExpr context="Comment" String="[ \t]*#" column="0" lookAhead="true" />
       </context>
-      
-      <context attribute="Normal" lineEndContext="description section" name="description section start line">
+
+      <!-- "description section start line" simply is used for the parameters after the
+      "%description" macro. With the next line break, it will switch to the
+      "description section" context which will handle the content of the description. -->
+      <context attribute="Shell commands" lineEndContext="description section" name="description section start line">
         <!-- Handle % -->
         <AnyChar context="handle_percent" String="%$" lookAhead="true" />
       </context>
-      
-      <context attribute="Value" lineEndContext="#stay" name="description section">
+
+      <!-- "description section" is a follow-up context of "description section start line". See
+      there for further details. -->
+      <context attribute="String" lineEndContext="#stay" name="description section">
         <!-- Handle % -->
         <AnyChar context="handle_percent" String="%$" lookAhead="true" />
         <!-- Handle comments. "# norootforbuild" is displayed like a tag. -->
-        <DetectChar context="Comment" char="#" column="0" lookAhead="true" />
+        <RegExpr context="Comment" String="[ \t]*#" column="0" lookAhead="true" />
       </context>
 
+      <!-- This is a convenience context that is handling comments automatically. Furthermore it
+      handles "# norootforbuild" because it looks like a comment. If a context supports comments,
+      simple use "<RegExpr context="Comment" String="[ \t]*#" column="0" lookAhead="true" />".
+      (This context relies on the asumption that # is the first non-whitespace. We have to
+      guarantee this when calling this context! -->
       <context attribute="Comment" lineEndContext="#pop" name="Comment">
-        <StringDetect attribute="Tag" context="every_non_whitespace_is_error" String="# norootforbuild" column="0" />
-        <!-- Error on single percent ("%"), but not on double percent ("%%"): -->
+        <!-- While indeeted comments are not allowed by the standard (see section "Comments" at
+        http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch-specfile-syntax.html#id1961462),
+        rpmbuild accepts them nevertheless. We highlight them as comments, but we mark the
+        indeet. -->
+        <RegExpr attribute="Hint" context="#stay" String="[ \t]+(?=#)" column="0" />
+	<!-- Handle "# norootforbuild" and some of its miss-spellings. -->
+        <StringDetect attribute="Tag" context="every_non_whitespace_is_warning" String="# norootforbuild" column="0" />
+        <RegExpr attribute="Warning" context="#stay" String="#[ \t]*norootforbuild" />
+        <!-- Warning on single percent ("%"), but not on double percent ("%%"): -->
         <Detect2Chars attribute="Comment" char="%" char1="%"/>
-        <DetectChar attribute="Error" char="%"/>
-        <!-- Alert on "TODO" -->
-        <StringDetect attribute="Alert" String="TODO" insensitive="true" />
-        <StringDetect attribute="Alert" String="FIXME" insensitive="true" />
+        <DetectChar attribute="Warning" char="%"/>
+        <IncludeRules context="##Alerts"/> <!-- Alert -->
       </context>
-      
-      <context attribute="Normal Text" lineEndContext="#pop" name="every_non_whitespace_is_error">
+
+      <!-- "every_non_whitespace_is_error" is a simple helper context. It switchs back to the
+      previous context at the end of the line. -->
+      <context attribute="Fallback for separator spaces" lineEndContext="#pop" name="every_non_whitespace_is_error">
         <RegExpr attribute="Error" context="#stay" String="[^\s]" />
       </context>
-      
-      <context attribute="Value" lineEndContext="#pop" name="tag_line">
+
+      <!-- "every_non_whitespace_is_warning" is a simple helper context. It switchs back to the
+      previous context at the end of the line. -->
+      <context attribute="Fallback for separator spaces" lineEndContext="#pop" name="every_non_whitespace_is_warning">
+        <RegExpr attribute="Warning" context="#stay" String="[^\s]" />
+      </context>
+
+      <!-- "tag_line_value" is a context for enumeration values. It makes no further syntax
+      check. -->
+      <context attribute="Enumeration" lineEndContext="#pop" name="tag_line_value">
+        <!-- Handle % -->
+        <AnyChar context="handle_percent" String="%$" lookAhead="true" />
+      </context>
+
+      <!-- "tag_line_string" is a context for string values. It makes no further syntax
+      check. -->
+      <context attribute="String" lineEndContext="#pop" name="tag_line_string">
+        <!-- Handle \ -->
+        <RegExpr attribute="Escaped character" String="\\[^%]" />
+        <RegExpr attribute="Escaped character" String="\\(?=(\%))" />
+        <!-- Handle % -->
+        <AnyChar context="handle_percent" String="%$" lookAhead="true" />
+      </context>
+
+      <!-- "tag_line_string_only_one_word" is a context for string values. The first word is
+      highlighted as string, but after the first space (normal space, tab...), all other
+      words are highlighted as error. WARNING: This context requieres that there is no space at
+      the begin! -->
+      <context attribute="String" lineEndContext="#pop" name="tag_line_string_only_one_word">
+        <!-- Handle \ -->
+        <RegExpr attribute="Escaped character" String="\\[^%]" />
+        <RegExpr attribute="Escaped character" String="\\(?=(\%))" />
+        <!-- Handle % -->
+        <AnyChar context="tag_line_string" String="%$" lookAhead="true" />
+        <!-- Handle spaces -->
+        <DetectSpaces context="every_non_whitespace_is_error" />
+      </context>
+
+      <!-- "tag_line_integer" is a context for integer values. Non-integer context is marked as
+      error. -->
+      <context attribute="Error" lineEndContext="#pop" name="tag_line_integer">
+        <Int attribute="Integer" context="every_non_whitespace_is_error" />
+        <!-- Handle % -->
+        <AnyChar context="tag_line_integer_without_syntax_check" String="%$" lookAhead="true" />
+        <RegExpr context="every_non_whitespace_is_error" String="." lookAhead="true" />
+      </context>
+
+      <!-- "tag_line_os" is a context for values that define the operation system. Unknown values
+      are marked as error. -->
+      <context attribute="Warning" lineEndContext="#pop" name="tag_line_os">
+        <!-- Spaces are okay -->
+        <DetectSpaces attribute="Fallback for separator spaces" />
+        <!-- Recognize valid values -->
+        <RegExpr attribute="Enumeration" String="&os;&lookahead_whitespace_eol;" />
+        <!-- Handle % -->
+        <AnyChar context="tag_line_value" String="%$" lookAhead="true" />
+      </context>
+
+      <!-- "tag_line_integer_without_syntax_check" is a context that is used internally by
+      "tag_line_integer" after macros. -->
+      <context attribute="Integer" lineEndContext="#pop" name="tag_line_integer_without_syntax_check">
+        <!-- Handle % -->
+        <AnyChar context="handle_percent" String="%$" lookAhead="true" />
+      </context>
+
+      <!-- "tag_line_arch" is a context for values that define the computer type. Unknown values
+      are marked as error. -->
+      <context attribute="Warning" lineEndContext="#pop" name="tag_line_arch">
+        <!-- Spaces are okay -->
+        <DetectSpaces attribute="Fallback for separator spaces" />
+        <!-- Recognize valid values -->
+        <RegExpr attribute="Enumeration" String="&arch;&lookahead_whitespace_eol;" />
+        <!-- Handle % -->
+        <AnyChar context="tag_line_value" String="%$" lookAhead="true" />
+      </context>
+
+      <!-- "tag_line_package" is a context for dependency handling. The keywords <= >= == < > are
+      recognized and highlighted as keywords. Thee rest is simply highlighted as enumeration. See
+      http://docs.fedoraproject.org/drafts/rpm-guide-en/ch-specfile-syntax.html#id3045258 and
+      http://docs.fedoraproject.org/drafts/rpm-guide-en/ch-advanced-packaging.html#id2979270 for
+      details -->
+      <context attribute="Enumeration" lineEndContext="#pop" name="tag_line_package">
+        <AnyChar attribute="Keyword" context="#stay" String="()" /> <!-- See http://rpm5.org/docs/api/dependencies.html about the parentheses -->
+        <Detect2Chars attribute="Keyword" context="#stay" char="&lt;" char1="="/>
+        <Detect2Chars attribute="Keyword" context="#stay" char="&gt;" char1="="/>
+        <Detect2Chars attribute="Keyword" context="#stay" char="=" char1="="/>
+        <AnyChar attribute="Keyword" context="#stay" String="=&lt;&gt;," />
+        <!-- Handle % -->
+        <AnyChar context="handle_percent" String="%$" lookAhead="true" />
+      </context>
+
+      <!-- "tag_line_switch" is a context that accepts "0", "1", "yes" and "no" as value.
+      Everything else is an error. See http://www.rpm.org/max-rpm-snapshot/s1-rpm-depend-auto-depend.html
+      and http://www.rpm.org/max-rpm/s1-rpm-inside-tags.html#S3-RPM-INSIDE-AUTOREQPROV-TAG -->
+      <context attribute="Error" lineEndContext="#pop" name="tag_line_switch">
+        <AnyChar attribute="Enumeration" context="every_non_whitespace_is_error" String="01" />
+        <Detect2Chars attribute="Enumeration" context="every_non_whitespace_is_error" char="n" char1="o"/>
+        <StringDetect attribute="Enumeration" context="every_non_whitespace_is_error" String="yes" />
+        <!-- Handle % -->
+        <AnyChar context="tag_line_value" String="%$" lookAhead="true" />
+        <RegExpr context="every_non_whitespace_is_error" String="." lookAhead="true" />
+      </context>
+
+      <!-- A context that doesn't test for format errors in the changelog date anymore. Necessary
+      if macros are used. -->
+      <context attribute="Tag" lineEndContext="#pop" name="changelog_generic">
         <!-- Handle % -->
         <AnyChar context="handle_percent" String="%$" lookAhead="true" />
       </context>
-      
+
+     <!-- A context that handles the weekday in the changelog date. -->
+      <context attribute="Tag" lineEndContext="#pop" name="changelog_weekday">
+        <DetectSpaces/>
+        <keyword context="changelog_month" attribute="Tag" String="weekdays" />
+        <!-- % handling without format errors in the date of the changelog -->
+        <AnyChar context="changelog_generic" String="%$" lookAhead="true" />
+        <RegExpr context="changelog_month" attribute="Error" String="\S*" />
+      </context>
+
+     <!-- A context that handles the month in the changelog date. -->
+      <context attribute="Tag" lineEndContext="#pop" name="changelog_month">
+        <DetectSpaces/>
+        <keyword context="changelog_day" attribute="Tag" String="month names" />
+        <!-- % handling without format errors in the date of the changelog -->
+        <AnyChar context="changelog_generic" String="%$" lookAhead="true" />
+        <RegExpr context="changelog_day" attribute="Error" String="\S*" />
+      </context>
+
+     <!-- A context that handles the day in the changelog date. -->
+      <context attribute="Tag" lineEndContext="#pop" name="changelog_day">
+        <DetectSpaces/>
+        <keyword context="changelog_year" attribute="Tag" String="days" />
+        <!-- % handling without format errors in the date of the changelog -->
+        <AnyChar context="changelog_generic" String="%$" lookAhead="true" />
+        <RegExpr context="changelog_year" attribute="Error" String="\S*" />
+      </context>
+
+     <!-- A context that handles the year in the changelog date. -->
+      <context attribute="Tag" lineEndContext="#pop" name="changelog_year">
+        <DetectSpaces/>
+        <RegExpr context="changelog_header" attribute="Tag" String="(\d{4})&lookahead_whitespace_eol;" />
+        <!-- % handling without format errors in the date of the changelog -->
+        <AnyChar context="changelog_generic" String="%$" lookAhead="true" />
+        <RegExpr context="changelog_header" attribute="Error" String="\S*" />
+      </context>
+
+     <!-- A context that handles the text after the date in a changelog (name, e-mail...). -->
       <context attribute="Tag" lineEndContext="#pop" name="changelog_header">
         <!-- Handle % -->
         <AnyChar context="handle_percent" String="%$" lookAhead="true" />
       </context>
-      
-      <context attribute="Normal Text" lineEndContext="#pop" name="parameters after keyword">
+
+      <!-- Handles everything that comes after %ifos etc... -->
+      <context attribute="Warning" lineEndContext="#pop" name="parameters after ifos">
+        <!-- Spaces are okay -->
+        <DetectSpaces attribute="Fallback for separator spaces" />
+        <!-- Recognize valid values -->
+        <RegExpr attribute="Enumeration" String="&os;&lookahead_whitespace_eol;" />
         <!-- Handle % -->
         <AnyChar context="handle_percent" String="%$" lookAhead="true" />
       </context>
-      
-      <!-- Expects a string starting with % or $ (otherwise, this context will fail!). -->
-      <context lineEndContext="#pop" name="handle_percent">
+
+      <!-- Handles everything that comes after %ifarch etc... -->
+      <context attribute="Warning" lineEndContext="#pop" name="parameters after ifarch">
+        <!-- Spaces are okay -->
+        <DetectSpaces attribute="Fallback for separator spaces" />
+        <!-- Recognize valid values -->
+        <RegExpr attribute="Enumeration" String="&arch;&lookahead_whitespace_eol;" />
+        <!-- Handle % -->
+        <AnyChar context="handle_percent" String="%$" lookAhead="true" />
+      </context>
+
+      <!-- Handles expressions after conditionals. -->
+      <context attribute="Error" lineEndContext="#pop" name="expression after _if_ statement">
+        <!-- spaces should not be "Error" (which is the default for unrecognized entities) -->
+        <DetectSpaces attribute="Fallback for separator spaces" context="#stay" />
+        <!-- %if recognizes && || > < >= <= == != ! and () -->
+        <AnyChar attribute="Keyword" context="#stay" String="()" />
+        <Detect2Chars attribute="Keyword" context="#stay" char="&amp;" char1="&amp;"/>
+        <Detect2Chars attribute="Keyword" context="#stay" char="&lt;" char1="="/>
+        <Detect2Chars attribute="Keyword" context="#stay" char="&gt;" char1="="/>
+        <Detect2Chars attribute="Keyword" context="#stay" char="=" char1="="/>
+        <Detect2Chars attribute="Keyword" context="#stay" char="!" char1="="/>
+        <AnyChar attribute="Keyword" context="#stay" String="!&lt;&gt;" />
+        <Detect2Chars attribute="Keyword" context="#stay" char="|" char1="|"/>
+        <!-- %if interpretates values either as integer or as string -->
+        <Int attribute="Integer" context="#stay" />
+        <DetectIdentifier attribute="String" context="#stay" />
+        <DetectChar attribute="String" context="quoted strings in if statements" char="&quot;" />
+        <!-- Handle % -->
+        <AnyChar context="handle_percent" String="%$" lookAhead="true" />
+      </context>
+
+      <!-- This context handles quoted strings in %if statements. WARNING: Make sure that you
+      switch to this context _after_ parsing the starting ", because at the first occurence
+      of " this context switches back. -->
+      <context attribute="String" lineEndContext="#pop" name="quoted strings in if statements">
+        <!-- Handle \ -->
+        <RegExpr attribute="Escaped character" String="\\[^&quot;]" />
+        <!-- Handle % -->
+        <AnyChar context="handle_percent" String="%$" lookAhead="true" />
+        <!-- Switch back at the end of the quoted string -->
+        <DetectChar attribute="String" context="#pop" char="&quot;" />
+      </context>
+
+      <!-- Context for %define -->
+      <context attribute="Fallback for separator spaces" lineEndContext="#pop" name="macro defination">
+        <DetectSpaces />
+        <RegExpr attribute="Enumeration" context="macro defination content" String="[&a_valid_char_in_macro_names;]*&lookahead_whitespace_eol;" />
+        <RegExpr attribute="Error" context="macro defination content" String="[^ \t]*" />
+      </context>
+
+      <!-- Context for the content of a macro defination. -->
+      <context attribute="String" lineEndContext="#pop" name="macro defination content">
+        <DetectSpaces />
+        <LineContinue attribute="Line break" context="#stay"/>
+        <DetectChar attribute="Warning" char="\" />
+      </context>
+
+      <!-- Context for %undefine -->
+      <context attribute="Fallback for separator spaces" lineEndContext="#pop" name="undefine macro">
+        <DetectSpaces />
+        <RegExpr attribute="Enumeration" context="every_non_whitespace_is_error" String="[&a_valid_char_in_macro_names;]*&lookahead_whitespace_eol;" />
+        <RegExpr attribute="Error" context="every_non_whitespace_is_error" String="." />
+      </context>
+
+      <!-- This context handles automatically all type of macros, keywords and so on that start with % or $.
+      It expects a string starting with % or $ (otherwise, this context will fail!). -->
+      <context attribute="Fallback for separator spaces" lineEndContext="#pop" name="handle_percent">
         <Detect2Chars attribute="Escaped character" context="#pop" char="%" char1="%"/>
         <!-- Keywords: -->
-        <RegExpr attribute="Keyword" context="parameters after keyword" String="%(if|ifarch|ifnarch|ifos|ifnos)(?=($| |\t))" column="0" beginRegion="if_block" />
-        <RegExpr attribute="Keyword" context="every_non_whitespace_is_error" String="%else(?=($| |\t))" column="0" />
-        <RegExpr attribute="Keyword" context="every_non_whitespace_is_error" String="%endif(?=($| |\t))" column="0" endRegion="if_block" />
-        <RegExpr attribute="Keyword" context="parameters after keyword" String="%(define|global|undefine)(?=($| |\t))" column="0" />
+        <RegExpr attribute="Keyword" context="expression after _if_ statement" String="%(if!?)&lookahead_whitespace_eol;" firstNonSpace="true" beginRegion="if_block" />
+        <RegExpr attribute="Keyword" context="parameters after ifarch" String="%&arch_conditionals_names;&lookahead_whitespace_eol;" firstNonSpace="true" beginRegion="if_block" />
+        <RegExpr attribute="Keyword" context="parameters after ifos" String="%&os_conditionals_names;&lookahead_whitespace_eol;" firstNonSpace="true" beginRegion="if_block" />
+        <RegExpr attribute="Keyword" context="every_non_whitespace_is_error" String="%else&lookahead_whitespace_eol;" firstNonSpace="true" endRegion="if_block" beginRegion="if_block" />
+        <RegExpr attribute="Keyword" context="every_non_whitespace_is_error" String="%endif&lookahead_whitespace_eol;" firstNonSpace="true" endRegion="if_block" />
+        <RegExpr attribute="Keyword" context="macro defination" String="%(define|global)&lookahead_whitespace_eol;" firstNonSpace="true" />
+        <RegExpr attribute="Keyword" context="undefine macro" String="%undefine&lookahead_whitespace_eol;" firstNonSpace="true" />
         <!-- If a command section starts (=section macro at begin of the line), we switch
              to the corresponding context. There will never be a return to THIS context...: -->
-        <RegExpr attribute="Section" context="Normal" String="%package(?=($| |\t))" column="0" />
-        <RegExpr attribute="Section" context="description section start line" String="%description(?=($| |\t))" column="0" />
-        <RegExpr attribute="Section" context="command section" String="%(prep|build|pre|preun|install|post|postun|clean|files|trigger|triggerin|triggerun|triggerpostun|verifyscript)(?=($| |\t))" column="0" />
-        <RegExpr attribute="Section" context="changelog section" String="%changelog(?=($| |\t))" column="0" />
+        <RegExpr attribute="Section" context="package section start line" String="%package&lookahead_whitespace_eol;" column="0" />
+        <RegExpr attribute="Section" context="description section start line" String="%description&lookahead_whitespace_eol;" column="0" />
+        <RegExpr attribute="Section" context="command section" String="%&command_section_name;&lookahead_whitespace_eol;" column="0" />
+        <RegExpr attribute="Section" context="changelog section" String="%changelog&lookahead_whitespace_eol;" column="0" />
         <!-- Handle normal macros -->
-        <RegExpr attribute="Error" context="#pop" String="%([\{\(][ \t]{0,}){0,1}(if|ifarch|ifnarch|ifos|ifnos|else|endif|define|global|undefine|package|description|prep|build|pre|preun|install|post|postun|clean|files|trigger|triggerin|triggerun|triggerpostun|verifyscript|changelog)(?=($|[^&a_valid_char_in_macro_names;]))" />
+        <RegExpr attribute="Error" context="#pop" String="%([\{\(][ \t]{0,}){0,1}(if|&arch_conditionals_names;|&os_conditionals_names;|else|endif|define|global|undefine|package|description|&command_section_name;|changelog)(?=($|[^&a_valid_char_in_macro_names;]))" />
         <RegExpr attribute="Macro call" context="macro content in parenthesis" String="%[&a_valid_char_in_macro_names;]*\(" />
         <RegExpr attribute="Macro call" context="macro content in braces" String="(%|\$)\{" />
         <RegExpr attribute="Macro call" context="#pop" String="(%|\$)([&a_valid_char_in_macro_names;]{1,}|\*|\#)(?=($|[^&a_valid_char_in_macro_names;]))" /> <!-- ')' and '}' are only allowed as macro terminator in the lookahead because when you do something like %__make %{?jobs:-j %jobs}, then the "%jobs" is a valid macro. However, the disadvantage is that a line like "%abc} isn't marked as error. But it is to complicate to distinguish this properly. -->
         <RegExpr attribute="Error" context="#pop" String="(%|\$)([&a_valid_char_in_macro_names;]{1,}|\*|\#)" />
         <AnyChar attribute="Error" context="#pop" String="%$" /> <!-- a single % or $ is also an error -->
       </context>
-      
+
+      <!-- Used internally by "handle_percent" -->
       <context attribute="Macro call" lineEndContext="#pop#pop" name="macro content in parenthesis">
         <!-- Handle % -->
         <AnyChar context="handle_percent" String="%$" lookAhead="true" />
         <DetectChar attribute="Macro call" context="#pop#pop" char=")" />
         <AnyChar attribute="Error" context="#stay" String="({}" />
       </context>
-      
+
+      <!-- Used internally by "handle_percent" -->
       <context attribute="Macro call" lineEndContext="#pop#pop" name="macro content in braces">
         <DetectChar attribute="Macro call" context="#pop#pop" char="}" />
         <AnyChar attribute="Error" context="#stay" String="({)" />
+        <!--(This seems to be confusing instead of helping)AnyChar attribute="Keyword" context="#stay" String="!?:" /-->
         <!-- Handle % -->
         <AnyChar context="handle_percent" String="%$" lookAhead="true" />
       </context>
 
     </contexts>
-    
+
     <itemDatas>
-      <itemData name="Normal Text" defStyleNum="dsNormal"/>
-      <itemData name="Keyword"  defStyleNum="dsKeyword"/>
-      <itemData name="Comment"  defStyleNum="dsComment"/>
+      <!-- "Shell commands" is used for the sections like %prep, %build or %install, where you write
+      shell commands. -->
+      <itemData name="Shell commands" defStyleNum="dsNormal"/>
+      <!-- "Fallback for separator spaces" is used as a fallback context for spaces between
+      different contexts. For example: "%if 1 <= %number" has the contexts Keyword,
+      Integer, Keyword and Macro call. But the spaces between? They are using THIS
+      context. -->
+      <itemData name="Fallback for separator spaces" defStyleNum="dsNormal"/>
+      <itemData name="Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Comment" defStyleNum="dsComment"/>
       <itemData name="Tag" defStyleNum="dsDataType"/>
-      <itemData name="Value"  defStyleNum="dsDecVal"/>
+      <!-- "Enumeration" is used for data types where you can't use arbitrary strings but have 
+      to use predefined values (like in "Provides:" or "%undefine"). -->
+      <itemData name="Enumeration" defStyleNum="dsOthers"/>
+      <itemData name="String" defStyleNum="dsString"/>
+      <itemData name="Integer" defStyleNum="dsDecVal"/>
+      <!-- "Error" is used for problems that will always produce an error in the interpretation
+      process. -->
       <itemData name="Error" defStyleNum="dsError"/>
+      <!-- "Warning" is used for problems that will maybe produce an error in the interpretation
+      process or will lead to unexpected results. -->
+      <itemData name="Warning" defStyleNum="dsError"/>
+      <!-- "Hint" is used for problems that will never produce an error in the interpretation
+      process and will always work like expected (the interpreter has error tolerance),
+      but that are claimed as bad or invalid .spec following the documentation. -->
+      <itemData name="Hint" defStyleNum="dsError"/>
       <itemData name="Macro call" defStyleNum="dsFunction"/>
       <itemData name="Section" defStyleNum="dsRegionMarker"/>
-      <itemData name="Alert" defStyleNum="dsAlert"/>
       <itemData name="Escaped character" defStyleNum="dsChar"/>
+      <itemData name="Line break" defStyleNum="dsKeyword"/>
     </itemDatas>
-    
+
   </highlighting>
-  
+
   <general>
-    <keywords casesensitive="1" />
+    <!-- defining all word deliminators except space and tab as weak -->
+    <keywords casesensitive="1" weakDeliminator=".():!+,-&lt;=&gt;%&amp;*/;?[]^{|}~\," />
+    <comments>
+      <comment name="singleLine" start="#"/>
+    </comments>
   </general>
-  
+
 </language>
diff --git a/kate/data/ruby.xml b/kate/data/ruby.xml
index c59f01529..4b34e8065 100644
--- a/kate/data/ruby.xml
+++ b/kate/data/ruby.xml
@@ -3,10 +3,11 @@
 
 <!--
   Ruby syntax highlighting definition for Kate.
-  
+
   Copyright (C) 2004  by Sebastian Vuorinen (sebastian dot vuorinen at helsinki dot fi)
   Copyright (C) 2004  by Stefan Lang ([email protected])
   Copyright (C) 2008  by Robin Pedersen ([email protected])
+  Copyright (C) 2011  by Miquel Sabaté ([email protected])
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public
@@ -25,17 +26,16 @@
 -->
 
 <!--
-	TODO:	* "Nested" HERE documents aren't recognized.
-			* Division after gdl contexts is interpreted as regexp
+    TODO: Division after gdl contexts is interpreted as regexp
 -->
 
 <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". -->
 <language name="Ruby" section="Scripts"
-          version="1.18" kateversion="2.4" 
-	  extensions="*.rb;*.rjs;*.rxml;*.xml.erb;*.js.erb"
+	  version="1.24" kateversion="2.4"
+	  extensions="*.rb;*.rjs;*.rxml;*.xml.erb;*.js.erb;*.rake;Rakefile;Gemfile;*.gemspec"
 	  mimetype="application/x-ruby"
 	  style="ruby" indenter="ruby"
-	  author="Stefan Lang ([email protected]), Sebastian Vuorinen ([email protected]), Robin Pedersen ([email protected])" license="LGPL">
+	  author="Stefan Lang ([email protected]), Sebastian Vuorinen ([email protected]), Robin Pedersen ([email protected]), Miquel Sabaté ([email protected])" license="LGPL">
 	
 	<highlighting>
 	
@@ -67,7 +67,6 @@
 			<item> unless </item>
 			<item> until </item>
 			<item> when </item>
-			<item> while </item>
 			<item> yield </item>
 		</list>
 		
@@ -161,6 +160,7 @@
 			<item> readline </item>
 			<item> readlines </item>
 			<item> require </item>
+			<item> require_relative </item>
 			<item> scan </item>
 			<item> select </item>
 			<item> set_trace_func </item>
@@ -179,13 +179,7 @@
 			<item> untrace_var </item>
 			<item> warn </item>
 		</list>
-		
-		<list name="attention">
-			<item> TODO </item>
-			<item> FIXME </item>
-			<item> NOTE </item>
-		</list>
-		
+
 		<contexts>
 			<context name="Normal" attribute="Normal Text" lineEndContext="#stay">
 				<!-- ruby ignores newline after \ -->
@@ -201,7 +195,7 @@
 				<!-- check for statement modifiers with regexes -->
 				<DetectChar attribute="Operator" char="{" context="Find closing block brace" beginRegion="def block"/>
 				<RegExpr attribute="Keyword" String="(\=|\(|\[|\{)\s*(if|unless|while|until)\b" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="(while|until)\b(?!.*\bdo\b)" context="#stay" beginRegion="def block" firstNonSpace="true"/>
+				<RegExpr attribute="Keyword" String="(while|until)\b(?!.*\bdo\b)" context="#stay" beginRegion="def block" />
 				<RegExpr attribute="Keyword" String="\;\s*(while|until)\b(?!.*\bdo\b)" context="#stay" beginRegion="def block"/>
 				<RegExpr attribute="Keyword" String="(if|unless)\b" context="#stay" beginRegion="def block" firstNonSpace="true"/>
 				<RegExpr attribute="Keyword" String="\;\s*(if|unless)\b" context="#stay" beginRegion="def block"/>
@@ -302,7 +296,7 @@
 				
 				<!-- recognize the beginning of a general delimited input format -->
 				<!-- this moves to the next context to separate out the exact nature of the GDL input -->
-				<RegExpr attribute="GDL input" context="find_gdl_input" String="\s*[%](?=[Qqxw]?[^\s])" beginRegion="GdlInput" />
+				<RegExpr attribute="GDL input" context="find_gdl_input" String="\s*[%](?=[QqxwW]?[^\s])" beginRegion="GdlInput" />
 				
 				<DetectChar attribute="Normal Text" char=")" context="check_div_1"/>
 				<DetectIdentifier attribute="Normal Text" context="check_div_2"/>
@@ -383,6 +377,7 @@
 			
 			<context name="Embedded documentation" attribute="Blockcomment" lineEndContext="#stay">
 				<RegExpr attribute="Comment" String="^=end(?:\s.*|$)" context="#pop" endRegion="comment block" column="0"/>
+				<IncludeRules context="##Alerts" />
 			</context>
 			
 			<context name="RegEx 1" attribute="Regular Expression" lineEndContext="#stay">
@@ -425,11 +420,11 @@
 			
 			<context name="Comment Line" attribute="Comment" lineEndContext="#pop">
 				<RegExpr attribute="Comment" String="\w\:\:\s" context="RDoc Label"/>
-				<keyword attribute="Alert" String="attention" context="#stay"/>
+				<IncludeRules context="##Alerts" />
 			</context>
 			
 			<context name="General Comment" attribute="Comment" lineEndContext="#pop">
-				<keyword attribute="Dec" String="attention" context="#stay"/>
+				<IncludeRules context="##Alerts" />
 			</context>
 			
 			<context name="RDoc Label" attribute="RDoc Value" lineEndContext="#pop"/>
@@ -448,22 +443,18 @@
 			</context>
 			<!-- these are the real heredoc contexts -->
 			<context name="indented_heredoc" attribute="Here Document" lineEndContext="#stay" dynamic="true">
-<!--				<RegExpr attribute="Keyword" context="#pop#pop" String="^\s*%1$" dynamic="true" endRegion="HereDocument"/>-->
 				<RegExpr attribute="Keyword" context="#pop#pop" String="%1$" dynamic="true" endRegion="HereDocument" firstNonSpace="true"/>
 				<IncludeRules context="heredoc_rules" />
 			</context>
 			<context name="apostrophed_indented_heredoc" attribute="Here Document" lineEndContext="#stay" dynamic="true">
-<!--				<RegExpr attribute="Keyword" context="#pop#pop" String="^\s*%1$" dynamic="true" endRegion="HereDocument"/>-->
 				<RegExpr attribute="Keyword" context="#pop#pop" String="%1$" dynamic="true" endRegion="HereDocument" firstNonSpace="true"/>
 			</context>
 			
 			<context name="normal_heredoc" attribute="Here Document" lineEndContext="#stay" dynamic="true">
-<!--				<RegExpr attribute="Keyword" context="#pop#pop" String="^%1$" dynamic="true" endRegion="HereDocument"/>-->
 				<RegExpr attribute="Keyword" context="#pop#pop" String="%1$" dynamic="true" endRegion="HereDocument" column="0"/>
 				<IncludeRules context="heredoc_rules" />
 			</context>
 			<context name="apostrophed_normal_heredoc" attribute="Here Document" lineEndContext="#stay" dynamic="true">
-<!--				<RegExpr attribute="Keyword" context="#pop#pop" String="^%1$" dynamic="true" endRegion="HereDocument"/>-->
 				<RegExpr attribute="Keyword" context="#pop#pop" String="%1$" dynamic="true" endRegion="HereDocument" column="0"/>
 			</context>
 			
@@ -485,7 +476,15 @@
 				<RegExpr attribute="GDL input" context="gdl_token_array_4" String="w&lt;" />
 				<!-- then we handle the 'any char' format -->
 				<RegExpr attribute="GDL input" context="gdl_token_array_5" String="w([^\s\w])" />
-				
+
+				<!-- handle token arrays -->
+				<RegExpr attribute="GDL input" context="gdl_token_array_1" String="W\(" />
+				<RegExpr attribute="GDL input" context="gdl_token_array_2" String="W\{" />
+				<RegExpr attribute="GDL input" context="gdl_token_array_3" String="W\[" />
+				<RegExpr attribute="GDL input" context="gdl_token_array_4" String="W&lt;" />
+				<!-- then we handle the 'any char' format -->
+				<RegExpr attribute="GDL input" context="gdl_token_array_5" String="W([^\s\w])" />
+
 				<!-- handle apostrophed strings -->
 				<RegExpr attribute="GDL input" context="gdl_apostrophed_1" String="q\(" />
 				<RegExpr attribute="GDL input" context="gdl_apostrophed_2" String="q\{" />
@@ -899,7 +898,6 @@
 			
 			<!-- use these to mark errors and alerts things -->
 			<itemData name="Error" defStyleNum="dsError" />
-			<itemData name="Alert" defStyleNum="dsAlert" />
 			
 			<itemData name="Delimiter" defStyleNum="dsNormal" color="#FF9FEC"/>
 			<itemData name="Expression" defStyleNum="dsOthers"/>
diff --git a/kate/data/sed.xml b/kate/data/sed.xml
new file mode 100644
index 000000000..095d440a1
--- /dev/null
+++ b/kate/data/sed.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<language name="sed" section="Scripts" version="1.0" kateversion="2.4" extensions="*.sed" mimetype="text/x-sed" author="Bart Sas ([email protected])" license="GPL">
+        <highlighting>
+                <contexts>
+                        <context name="BeginningOfLine" attribute="Normal" lineEndContext="#stay">
+                                <DetectSpaces/>
+                                <DetectChar char="#"     attribute="Comment"     context="Comment"/>
+                                <RegExpr String="(/)"    attribute="Separator"   context="FirstAddressRegex"/>
+                                <RegExpr String="\\(\S)" attribute="Separator"   context="FirstAddressRegex"/>
+                                <Int                     attribute="Line Number" context="AfterFirstAddress"/>
+                                <DetectChar char="$"     attribute="Last Line"   context="AfterFirstAddress"/>
+                                <DetectChar char="}"     attribute="Brace"       context="AfterCommand"/>
+                                <DetectChar char=":"     attribute="Label"       context="Label"/>
+                                <DetectChar char="!"     attribute="Negation"    context="Command"/>
+                                <IncludeRules                                    context="Command"/>
+                                <RegExpr String="\S"     attribute="Error"       context="Error"/>
+                        </context>
+
+                        <context name="FirstAddressRegex" attribute="Regex" lineEndContext="Error" dynamic="true">
+                                <DetectSpaces/>
+                                <RegExpr String="\\%1" attribute="Regex Escape" context="#stay"             dynamic="true"/>
+                                <RegExpr String="%1"   attribute="Separator"    context="AfterFirstAddress" dynamic="true"/>
+                                <IncludeRules                                   context="Regex"/>
+                        </context>
+
+                        <context name="AfterFirstAddress" attribute="Normal" lineEndContext="BeginningOfLine">
+                                <DetectSpaces/>
+                                <DetectChar char="!" attribute="Negation" context="Command"/>
+                                <IncludeRules                             context="AfterFirstAddress2"/>
+                                <RegExpr String="\S" attribute="Error"    context="Error"/>
+                        </context>
+
+                        <context name="AfterFirstAddress2" attribute="Normal" lineEndContext="BeginningOfLine">
+                                <DetectSpaces/>
+                                <DetectChar char="," attribute="Normal" context="SecondAddress"/>
+                                <DetectChar char="~" attribute="Normal" context="Step"/>
+                                <IncludeRules                           context="Command"/>
+                                <RegExpr String="\S" attribute="Error"  context="Error"/>
+                        </context>
+
+                        <context name="SecondAddress" attribute="Normal" lineEndContext="Error">
+                                <DetectSpaces/>
+                                <RegExpr String="(/)"    attribute="Separator"   context="SecondAddressRegex"/>
+                                <RegExpr String="\\(\S)" attribute="Separator"   context="SecondAddressRegex"/>
+                                <Int                     attribute="Line Number" context="AfterSecondAddress"/>
+                                <DetectChar char="$"     attribute="Last Line"   context="AfterSecondAddress"/>
+                                <RegExpr String="\S"     attribute="Error"       context="Error"/>
+                        </context>
+
+                        <context name="SecondAddressRegex" attribute="Regex" lineEndContext="Error" dynamic="true">
+                                <DetectSpaces/>
+                                <RegExpr String="\\%1" attribute="Regex Escape" context="#stay"              dynamic="true"/>
+                                <RegExpr String="%1"   attribute="Separator"    context="AfterSecondAddress" dynamic="true"/>
+                                <IncludeRules                                   context="Regex"/>
+                        </context>
+
+                        <context name="AfterSecondAddress" attribute="Normal" lineEndContext="Error" dynamic="true">
+                                <DetectSpaces/>
+                                <DetectChar char="!" attribute="Negation" context="Command"/>
+                                <IncludeRules                             context="Command"/>
+                                <RegExpr String="\S" attribute="Error"    context="Error"/>
+                        </context>
+
+                        <context name="Step" attribute="Normal" lineEndContext="Error">
+                                <DetectSpaces/>
+                                <Int                 attribute="Step"  context="Command"/>
+                                <RegExpr String="\S" attribute="Error" context="Error"/>
+                        </context>
+
+                        <context name="Command" attribute="Normal" lineEndContext="Error">
+                                <DetectSpaces/>
+                                <DetectChar char="s"              attribute="Command" context="SCommand"/>
+                                <DetectChar char="y"              attribute="Command" context="YCommand"/>
+                                <AnyChar String="dpnDNPhHgGxFvz=" attribute="Command" context="AfterCommand"/>
+                                <AnyChar String="aic"             attribute="Command" context="AICCommand"/>
+                                <AnyChar String="bTt"             attribute="Command" context="BTCommand"/>
+                                <AnyChar String="WwrR"            attribute="Command" context="WRCommand"/>
+                                <AnyChar String="lL"              attribute="Command" context="LCommand"/>
+                                <AnyChar String="qQ"              attribute="Command" context="QCommand"/>
+                                <DetectChar char="{"              attribute="Brace"   context="BeginningOfLine"/>
+                                <RegExpr String="\S"              attribute="Error"   context="Error"/>
+                        </context>
+
+                        <context name="SCommand" attribute="Normal" lineEndContext="Error">
+                                <DetectSpaces/>
+                                <RegExpr String="(\S)" attribute="Separator" context="SRegex"/>
+                        </context>
+
+                        <context name="SRegex" attribute="Regex" lineEndContext="Error" dynamic="true">
+                                <DetectSpaces/>
+                                <RegExpr String="\\%1" attribute="Regex Escape" context="#stay"        dynamic="true"/>
+                                <RegExpr String="(%1)" attribute="Separator"    context="SReplacement" dynamic="true"/>
+                                <IncludeRules                                   context="Regex"/>
+                        </context>
+
+                        <context name="SReplacement" attribute="Replacement" lineEndContext="Error" dynamic="true">
+                                <DetectSpaces/>
+                                <RegExpr String="\\%1"                attribute="Repl Escape" context="#stay"  dynamic="true"/>
+                                <RegExpr String="%1"                  attribute="Separator"   context="SFlags" dynamic="true"/>
+                                <RegExpr String="\\[0-9LlUuE\\&amp;]" attribute="Repl Escape" context="#stay"/>
+                                <DetectChar char="&amp;"              attribute="Repl Escape" context="#stay"/>
+                        </context>
+
+                        <context name="SFlags" attribute="Normal" lineEndContext="BeginningOfLine">
+                                <DetectSpaces/>
+                                <AnyChar String="gpeIiMm" attribute="Flag"        context="#stay"/>
+                                <DetectChar char="w"      attribute="Flag"        context="WFlag"/>
+                                <Int                      attribute="Repl Number" context="#stay"/>
+                                <IncludeRules                                     context="AfterCommand"/>
+                        </context>
+
+                        <context name="WFlag" attribute="Normal" lineEndContext="BeginningOfLine">
+                                <DetectSpaces/>
+                                <RegExpr String="\S+" attribute="Filename" context="SFlags"/>
+                        </context>
+
+                        <context name="YCommand" attribute="Normal" lineEndContext="Error">
+                                <DetectSpaces/>
+                                <RegExpr String="(\S)" attribute="Separator" context="YSourceList"/>
+                        </context>
+
+                        <context name="YSourceList" attribute="Char List" lineEndContext="Error" dynamic="true">
+                                <DetectSpaces/>
+                                <RegExpr String="\\%1"           attribute="Char List Escape" context="#stay"     dynamic="true"/>
+                                <RegExpr String="(%1)"           attribute="Separator"        context="YDestList" dynamic="true"/>
+                                <Detect2Chars char="\" char1="n" attribute="Char List Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="\" attribute="Char List Escape" context="#stay"/>
+                        </context>
+
+                        <context name="YDestList" attribute="Char List" lineEndContext="Error" dynamic="true">
+                                <DetectSpaces/>
+                                <RegExpr String="\\%1"           attribute="Char List Escape" context="#stay"        dynamic="true"/>
+                                <RegExpr String="%1"             attribute="Separator"        context="AfterCommand" dynamic="true"/>
+                                <Detect2Chars char="\" char1="n" attribute="Char List Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="\" attribute="Char List Escape" context="#stay"/>
+                        </context>
+
+                        <context name="AICCommand" attribute="Normal" lineEndContext="Error">
+                                <DetectSpaces/>
+                                <LineContinue             attribute="Line Continue" context="LiteralText"/>
+                                <RegExpr      String="\S" attribute="Error"         context="Error"/>
+                        </context>
+
+                        <context name="LiteralText" attribute="Literal Text" lineEndContext="BeginningOfLine">
+                                <Detect2Chars char="\" char1="\" attribute="Literal Escape" context="LiteralText"/>
+                                <LineContinue                    attribute="Line Continue"  context="LiteralText"/>
+                                <DetectChar   char="\"           attribute="Error"          context="Error"/>
+                        </context>
+
+                        <context name="BTCommand" attribute="Normal" lineEndContext="BeginningOfLine">
+                                <DetectSpaces/>
+                                <RegExpr String="\w+" attribute="Label" context="AfterCommand"/>
+                                <IncludeRules                           context="AfterCommand"/>
+                        </context>
+
+                        <context name="WRCommand" attribute="Normal" lineEndContext="Error">
+                                <DetectSpaces/>
+                                <RegExpr String="\S+" attribute="Filename" context="AfterCommand"/>
+                        </context>
+
+                        <context name="LCommand" attribute="Normal" lineEndContext="BeginningOfLine">
+                                <DetectSpaces/>
+                                <Int attribute="Wrap Length" context="AfterCommand"/>
+                                <IncludeRules                context="AfterCommand"/>
+                        </context>
+
+                        <context name="QCommand" attribute="Normal" lineEndContext="BeginningOfLine">
+                                <DetectSpaces/>
+                                <Int attribute="Exit Code" context="AfterCommand"/>
+                                <IncludeRules              context="AfterCommand"/>
+                        </context>
+
+                        <context name="Label" attribute="Normal" lineEndContext="Error">
+                                <DetectSpaces/>
+                                <RegExpr String="\w+" attribute="Label" context="AfterCommand"/>
+                                <RegExpr String="\S"  attribute="Error" context="Error"/>
+                        </context>
+
+                        <context name="AfterCommand" attribute="Normal" lineEndContext="BeginningOfLine">
+                                <DetectSpaces/>
+                                <DetectChar char=";" attribute="Normal"  context="BeginningOfLine"/>
+                                <DetectChar char="}" attribute="Brace"   context="AfterCommand"/>
+                                <DetectChar char="#" attribute="Comment" context="Comment"/>
+                                <RegExpr String="\S" attribute="Error"   context="Error"/>
+                        </context>
+
+                        <context name="Regex" attribute="Regex" lineEndContext="Error">
+                                <Detect2Chars char="\" char1="(" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1=")" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="+" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="?" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="|" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="{" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="}" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="[" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="]" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="." attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="*" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="\" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="^" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="$" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="n" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="t" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="0" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="1" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="2" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="3" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="4" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="5" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="6" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="7" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="8" attribute="Regex Escape" context="#stay"/>
+                                <Detect2Chars char="\" char1="9" attribute="Regex Escape" context="#stay"/>
+                                <DetectChar   char="*"           attribute="Regex Escape" context="#stay"/>
+                                <DetectChar   char="."           attribute="Regex Escape" context="#stay"/>
+                                <DetectChar   char="^"           attribute="Regex Escape" context="#stay"/>
+                                <DetectChar   char="$"           attribute="Regex Escape" context="#stay"/>
+                                <DetectChar   char="["           attribute="Regex Escape" context="#stay"/>
+                                <DetectChar   char="]"           attribute="Regex Escape" context="#stay"/>
+                        </context>
+
+                        <context name="Comment" attribute="Comment" lineEndContext="BeginningOfLine"/>
+                        <context name="Error"   attribute="Error"   lineEndContext="BeginningOfLine"/>
+                </contexts>
+
+                <itemDatas>
+                        <itemData name="Normal"           defStyleNum="dsNormal"/>
+
+                        <itemData name="Regex"            defStyleNum="dsString"/>
+                        <itemData name="Regex Escape"     defStyleNum="dsChar"/>
+                        <itemData name="Replacement"      defStyleNum="dsString"/>
+                        <itemData name="Repl Escape"      defStyleNum="dsChar"/>
+                        <itemData name="Char List"        defStyleNum="dsString"/>
+                        <itemData name="Char List Escape" defStyleNum="dsChar"/>
+                        <itemData name="Separator"        defStyleNum="dsString" color="#00F"/>
+
+                        <itemData name="Line Number"      defStyleNum="dsDecVal"/>
+                        <itemData name="Step"             defStyleNum="dsDecVal"/>
+                        <itemData name="Last Line"        defStyleNum="dsOthers" color="#808" bold="1"/>
+                        <itemData name="Negation"         defStyleNum="dsOthers" color="#808" bold="1"/>
+
+                        <itemData name="Command"          defStyleNum="dsKeyword"/>
+                        <itemData name="Label"            defStyleNum="dsFunction"/>
+                        <itemData name="Brace"            defStyleNum="dsNormal"/>
+
+                        <itemData name="Flag"             defStyleNum="dsDataType"/>
+                        <itemData name="Repl Number"      defStyleNum="dsDecVal"/>
+                        <itemData name="Exit Code"        defStyleNum="dsDecVal"/>
+                        <itemData name="Filename"         defStyleNum="dsBaseN"/>
+                        <itemData name="Wrap Length"      defStyleNum="dsDecVal"/>
+
+                        <itemData name="Line Continue"    defStyleNum="dsOthers" color="#000" bold="1"/>
+                        <itemData name="Literal Text"     defStyleNum="dsOthers" color="#080" italic="1"/>
+                        <itemData name="Literal Escape"   defStyleNum="dsOthers" color="#0A0" italic="1"/>
+
+                        <itemData name="Comment"          defStyleNum="dsComment"/>
+                        <itemData name="Error"            defStyleNum="dsError"/>
+                </itemDatas>
+        </highlighting>
+
+        <general>
+                <comments>
+                        <comment name="singleLine" start="#"/>
+                </comments>
+        </general>
+</language>
diff --git a/kate/data/sql-mysql.xml b/kate/data/sql-mysql.xml
index 4c0a99706..3a260fe74 100644
--- a/kate/data/sql-mysql.xml
+++ b/kate/data/sql-mysql.xml
@@ -5,7 +5,7 @@
   original by Shane Wright ([email protected])
   modifications by Milian Wolff ([email protected])
 -->
-<language name="SQL (MySQL)" version="1.09" kateversion="2.5" section="Database" extensions="*.sql;*.SQL" mimetype="text/x-sql" casesensitive="0" author="Shane Wright ([email protected])" license="">
+<language name="SQL (MySQL)" version="1.13" kateversion="2.5" section="Database" extensions="*.sql;*.SQL" mimetype="text/x-sql" casesensitive="0" author="Shane Wright ([email protected])" license="">
   <highlighting>
     <list name="keywords">
       <item> ACCESS </item>
@@ -381,6 +381,7 @@
     </list>
     <contexts>
       <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
+        <DetectSpaces />
         <!-- problematic special cases -->
         <!-- SET type -->
         <RegExpr attribute="Data Type" context="#stay" insensitive="true" String="SET(?=\s*\()"/>
@@ -391,16 +392,12 @@
         <keyword attribute="Operator" context="#stay" String="operators"/>
         <keyword attribute="Function" context="#stay" String="functions"/>
         <keyword attribute="Data Type" context="#stay" String="types"/>
+
+        <DetectIdentifier />
         <!-- extra data types -->
-        <RegExpr attribute="Data Type" context="#stay" String="%bulk_exceptions\b" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="#stay" String="%bulk_rowcount\b" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="#stay" String="%found\b" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="#stay" String="%isopen\b" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="#stay" String="%notfound\b" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="#stay" String="%rowcount\b" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="#stay" String="%rowtype\b" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="#stay" String="%type\b" insensitive="true"/>
+        <RegExpr attribute="Data Type" context="#stay" String="%(?:bulk_(?:exceptions|rowcount)|found|isopen|notfound|rowcount|rowtype|type)\b" insensitive="true"/>
         <!-- numbers -->
+        <HlCHex attribute="Hex" context="#stay"/>
         <Float attribute="Float" context="#stay"/>
         <Int attribute="Decimal" context="#stay"/>
         <!-- strings -->
@@ -412,7 +409,7 @@
         <Detect2Chars attribute="Comment" context="SingleLineComment" char="-" char1="-"/>
         <Detect2Chars attribute="Comment" context="MultiLineComment" char="/" char1="*" beginRegion="Comment"/>
         <RegExpr attribute="Comment" context="SingleLineComment" String="rem\b" insensitive="true" column="0"/>
-      
+
         <AnyChar attribute="Symbol" context="#stay" String=":&#38;"/>
         <RegExpr attribute="Symbol" context="#stay" String="/$" column="0"/>
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="@@?[^@ \t\r\n]" column="0"/>
@@ -449,19 +446,20 @@
       <context name="Preprocessor" attribute="Preprocessor" lineEndContext="#pop"/>
     </contexts>
     <itemDatas>
-      <itemData name="Normal Text" defStyleNum="dsNormal"/>
-      <itemData name="Keyword" defStyleNum="dsKeyword"/>
-      <itemData name="Operator" defStyleNum="dsNormal"/>
-      <itemData name="Function" defStyleNum="dsFunction"/>
-      <itemData name="Data Type" defStyleNum="dsDataType"/>
-      <itemData name="Decimal"  defStyleNum="dsDecVal"/>
-      <itemData name="Float"  defStyleNum="dsFloat"/>
+      <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
+      <itemData name="Keyword" defStyleNum="dsKeyword" spellChecking="false"/>
+      <itemData name="Operator" defStyleNum="dsNormal" spellChecking="false"/>
+      <itemData name="Function" defStyleNum="dsFunction" spellChecking="false"/>
+      <itemData name="Data Type" defStyleNum="dsDataType" spellChecking="false"/>
+      <itemData name="Decimal"  defStyleNum="dsDecVal" spellChecking="false"/>
+      <itemData name="Float"  defStyleNum="dsFloat" spellChecking="false"/>
+      <itemData name="Hex" defStyleNum="dsBaseN" spellChecking="false"/>
       <itemData name="String" defStyleNum="dsString"/>
-      <itemData name="Name" color="#080" defStyleNum="dsString"/>
-      <itemData name="String Char" defStyleNum="dsChar"/>
+      <itemData name="Name" color="#080" defStyleNum="dsString" spellChecking="false"/>
+      <itemData name="String Char" defStyleNum="dsChar" spellChecking="false"/>
       <itemData name="Comment" defStyleNum="dsComment"/>
-      <itemData name="Symbol"  defStyleNum="dsChar"/>
-      <itemData name="Preprocessor" defStyleNum="dsOthers"/>
+      <itemData name="Symbol"  defStyleNum="dsChar" spellChecking="false"/>
+      <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/>
     </itemDatas>
   </highlighting>
   <general>
@@ -473,4 +471,4 @@
     <folding indentationsensitive="true"/>
   </general>
 </language>
- 
+
diff --git a/kate/data/sql-postgresql.xml b/kate/data/sql-postgresql.xml
index cae648c0e..2c72c9391 100644
--- a/kate/data/sql-postgresql.xml
+++ b/kate/data/sql-postgresql.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- PostgreSQL SQL, syntax definition based on sql.xml by Yury Lebedev -->
-<language name="SQL (PostgreSQL)" version="1.09" kateversion="2.4" section="Database" extensions="*.sql;*.SQL" mimetype="text/x-sql" casesensitive="0" author="Shane Wright ([email protected])" license="">
+<language name="SQL (PostgreSQL)" version="1.10" kateversion="2.4" section="Database" extensions="*.sql;*.SQL" mimetype="text/x-sql" casesensitive="0" author="Shane Wright ([email protected])" license="">
   <highlighting>
     <list name="keywords">
       <item> ABORT </item>
@@ -649,7 +649,7 @@
       <item> PATH </item>
       <item> POINT </item>
       <item> POLYGON </item>
-      <!-- network address type, TEXT is omitted as its more commonly a data type -->
+      <!-- network address type, TEXT is omitted as it is more commonly a data type -->
       <item> BROADCAST </item>
       <item> HOST </item>
       <item> MASKLEN </item>
@@ -731,6 +731,8 @@
     </list>
     <contexts>
       <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
+        <!-- HACK: don't jump into MultiLineString for CREATE FUNCTION $funcName$...$funcName$ -->
+        <StringDetect String="CREATE FUNCTION" context="CreateFunction" attribute="Keyword" />
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Operator" context="#stay" String="operators"/>
         <keyword attribute="Function" context="#stay" String="functions"/>
@@ -754,10 +756,18 @@
         <AnyChar attribute="Symbol" context="#stay" String=":&#38;"/>
         <RegExpr attribute="Symbol" context="#stay" String="/$" column="0"/>
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="@@?[^@ \t\r\n]" column="0"/>
-        <RegExpr attribute="Operator" context="MultiLineString" String="\$([^$]*)\$" dynamic="true"/>
+        <RegExpr attribute="Operator" context="MultiLineString" String="\$([^\$\n\r]*)\$" dynamic="true"/>
+      </context>
+      <context name="CreateFunction" attribute="Normal Text" lineEndContext="#stay">
+          <RegExpr attribute="Function" context="FunctionBody" String="\$([^\$\n\r]*)\$" dynamic="true"/>
+          <IncludeRules context="Normal" />
+      </context>
+      <context name="FunctionBody" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
+          <RegExpr attribute="Function" context="#pop#pop" String="\$%1\$" dynamic="true"/>
+          <IncludeRules context="Normal" />
       </context>
       <context name="MultiLineString" attribute="String" lineEndContext="#stay" dynamic="true">
-          <RegExpr attribute="Operator" context="Normal" String="\$%1\$" dynamic="true"/>
+          <RegExpr attribute="Operator" context="#pop" String="\$%1\$" dynamic="true"/>
       </context>
       <context name="String" attribute="String" lineEndContext="#stay">
         <LineContinue attribute="String" context="#pop"/>
diff --git a/kate/data/sql.xml b/kate/data/sql.xml
index 70a9f11ce..5a98ae2d7 100644
--- a/kate/data/sql.xml
+++ b/kate/data/sql.xml
@@ -3,7 +3,7 @@
 <!-- Oracle10g SQL and PL/SQL syntax - ANSI SQL 2003 superset -->
 <!-- This file is maintained by Anders Lund <[email protected]> since 2005-11-06 -->
 <!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
-<language name="SQL" version="1.13" kateversion="2.4" section="Database" extensions="*.sql;*.SQL" mimetype="text/x-sql" casesensitive="0" author="Yury Lebedev ([email protected])" license="LGPL">
+<language name="SQL" version="1.14" kateversion="2.4" section="Database" extensions="*.sql;*.SQL" mimetype="text/x-sql" casesensitive="0" author="Yury Lebedev ([email protected])" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item> ACCESS </item>
@@ -884,20 +884,21 @@
     </list>
     <contexts>
       <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
+        <DetectSpaces />
+
         <keyword attribute="Keyword" String="keywords" context="#stay"/>
         <keyword attribute="Operator" String="operators" context="#stay"/>
         <keyword attribute="Function" String="functions" context="#stay"/>
         <keyword attribute="Data Type" String="types" context="#stay"/>
-        <RegExpr attribute="Data Type" String="%bulk_exceptions\b" insensitive="true" context="#stay"/>
-        <RegExpr attribute="Data Type" String="%bulk_rowcount\b" insensitive="true" context="#stay"/>
-        <RegExpr attribute="Data Type" String="%found\b" insensitive="true" context="#stay"/>
-        <RegExpr attribute="Data Type" String="%isopen\b" insensitive="true" context="#stay"/>
-        <RegExpr attribute="Data Type" String="%notfound\b" insensitive="true" context="#stay"/>
-        <RegExpr attribute="Data Type" String="%rowcount\b" insensitive="true" context="#stay"/>
-        <RegExpr attribute="Data Type" String="%rowtype\b" insensitive="true" context="#stay"/>
-        <RegExpr attribute="Data Type" String="%type\b" insensitive="true" context="#stay"/>
+
+        <DetectIdentifier />
+
+        <RegExpr attribute="Data Type" context="#stay" String="%(?:bulk_(?:exceptions|rowcount)|found|isopen|notfound|rowcount|rowtype|type)\b" insensitive="true"/>
+
+        <HlCHex attribute="Hex" context="#stay"/>
         <Float attribute="Float" context="#stay"/>
         <Int attribute="Decimal" context="#stay"/>
+
         <DetectChar attribute="String" context="String literal" char="'"/>
         <Detect2Chars attribute="Comment" context="Singleline PL/SQL-style comment" char="-" char1="-"/>
         <Detect2Chars attribute="Comment" context="Multiline C-style comment" char="/" char1="*"/>
@@ -931,6 +932,7 @@
       <itemData name="Function"          defStyleNum="dsFunction"/>
       <itemData name="Data Type"         defStyleNum="dsDataType"/>
       <itemData name="Decimal"           defStyleNum="dsDecVal"/>
+      <itemData name="Hex"             defStyleNum="dsBaseN"/>
       <itemData name="Float"             defStyleNum="dsFloat"/>
       <itemData name="String"            defStyleNum="dsString"/>
       <itemData name="String Char"       defStyleNum="dsChar"/>
diff --git a/kate/data/stata.xml b/kate/data/stata.xml
index c8eb2499f..64c8eaf26 100644
--- a/kate/data/stata.xml
+++ b/kate/data/stata.xml
@@ -1,472 +1,3225 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Stata" version="1.01" kateversion="2.1" section="Sources" extensions="*.ado;*.do" mimetype="" author="Edwin Leuven ([email protected])" license="LGPL">
+<language name="Stata" version="2.00" kateversion="2.4" section="Sources" extensions="*.do; *.ado; *.doh; *.DO; *.ADO; *.DOH"
+ casesensitive="1" priority="5" author="Larry Radbill (Larry.Radbill gmail com)" license="LGPL" >
+
   <highlighting>
-    <list name="keywords">
-      <item> about </item>
-      <item> ado </item>
+
+    <list name="graphics-options">
+
+      <item> addlabels </item>
+      <item> addlabopts </item>
+      <item> addplot </item>
+      <item> bar </item>
+      <item> barwidth </item>
+      <item> bin </item>
+      <item> blabel </item>
+      <item> caption </item>
+      <item> center </item>
+      <item> circle </item>
+      <item> circle_hollow </item>
+      <item> color </item>
+      <item> cols </item>
+      <item> combine </item>
+      <item> dot </item>
+      <item> draw </item>
+      <item> dropline </item>
+      <item> frequency </item>
+      <item> grid </item>
+      <item> hbar </item>
+      <item> imargin </item>
+      <item> labsize </item>
+      <item> legend </item>
+      <item> margin </item>
+      <item> medthick </item>
+      <item> mlabangle </item>
+      <item> mlabcolor </item>
+      <item> mlabel </item>
+      <item> mlabgap </item>
+      <item> mlabposition </item>
+      <item> mlabsize </item>
+      <item> mlabstyle </item>
+      <item> mlabtextstyle </item>
+      <item> mlabvposition </item>
+      <item> msymbol </item>
+      <item> name </item>
+      <item> nodraw </item>
+      <item> nogrid </item>
+      <item> over </item>
+      <item> plotregion </item>
+      <item> position </item>
+      <item> ring </item>
+      <item> rows </item>
+      <item> scale </item>
+      <item> size </item>
+      <item> start </item>
+      <item> subtitle </item>
+      <item> t1title </item>
+      <item> t2title </item>
+      <item> text </item>
+      <item> textsize </item>
+      <item> title </item>
+      <item> xcommon </item>
+      <item> xlabel </item>
+      <item> xline </item>
+      <item> xscale </item>
+      <item> xsize </item>
+      <item> xtitle </item>
+      <item> ycommon </item>
+      <item> ylabel </item>
+      <item> yline </item>
+      <item> yscale </item>
+      <item> ysize </item>
+      <item> ytitle </item>
+      <item> zero </item>
+    </list>
+
+    <list name="Stata-colors">
+      <item> background </item>
+      <item> bg </item>
+      <item> black </item>
+      <item> blue </item>
+      <item> bluishgray </item>
+      <item> brown </item>
+      <item> cranberry </item>
+      <item> cyan </item>
+      <item> dimgray </item>
+      <item> dkgreen </item>
+      <item> dknavy </item>
+      <item> dkorange </item>
+      <item> ebblue </item>
+      <item> ebg </item>
+      <item> edkblue </item>
+      <item> eggshell </item>
+      <item> eltblue </item>
+      <item> eltgreen </item>
+      <item> emerald </item>
+      <item> emidblue </item>
+      <item> erose </item>
+      <item> fg </item>
+      <item> foreground </item>
+      <item> forest_green </item>
+      <item> gold </item>
+      <item> gray </item>
+      <item> green </item>
+      <item> gs </item>
+      <item> khaki </item>
+      <item> lavender </item>
+      <item> lime </item>
+      <item> ltblue </item>
+      <item> ltbluishgray </item>
+      <item> ltkhaki </item>
+      <item> magenta </item>
+      <item> maroon </item>
+      <item> midblue </item>
+      <item> midgreen </item>
+      <item> mint </item>
+      <item> navy </item>
+      <item> none </item>
+      <item> olive </item>
+      <item> olive_teal </item>
+      <item> orange </item>
+      <item> orange_red </item>
+      <item> pink </item>
+      <item> purple </item>
+      <item> red </item>
+      <item> sand </item>
+      <item> sandb </item>
+      <item> sienna </item>
+      <item> stone </item>
+      <item> teal </item>
+      <item> white </item>
+      <item> yellow </item>
+    </list>
+
+    <list name="proc-options">
+      <item> accum </item>
+      <item> as </item>
+      <item> ascending </item>
+      <item> BASE </item>
+      <item> be </item>
+      <item> begin </item>
+      <item> bfgs </item>
+      <item> bhhh </item>
+      <item> brrweight </item>
+      <item> clean </item>
+      <item> close </item>
+      <item> clpatt [ern] </item>
+      <item> clwidth </item>
+      <item> cole </item>
+      <item> color </item>
+      <item> confirm </item>
+      <item> continue </item>
+      <item> cov(unstr) </item>
+      <item> cov(unstructured) </item>
+      <item> covariance </item>
+      <item> dash </item>
+      <item> define </item>
+      <item> deft </item>
+      <item> delmacs </item>
+      <item> detail </item>
+      <item> dev </item>
+      <item> deviations </item>
+      <item> dfp </item>
+      <item> difficult </item>
+      <item> dirname </item>
+      <item> do </item>
+      <item> effects </item>
+      <item> eform </item>
+      <item> else </item>
+      <item> emdots </item>
+      <item> emiterate </item>
+      <item> emlog </item>
+      <item> emonly </item>
+      <item> emtolerance </item>
+      <item> end </item>
+      <item> error </item>
+      <item> estmetric </item>
+      <item> exchangeable </item>
+      <item> exit </item>
+      <item> family </item>
+      <item> fe </item>
+      <item> fitted </item>
+      <item> force </item>
+      <item> foreach </item>
+      <item> forvalues </item>
+      <item> fpc </item>
+      <item> frequency </item>
+      <item> function </item>
+      <item> global </item>
+      <item> gtolerance </item>
+      <item> hessian </item>
+      <item> ic </item>
+      <item> identity </item>
+      <item> if </item>
+      <item> in </item>
+      <item> independent </item>
+      <item> intpoints </item>
+      <item> irr </item>
+      <item> iterate </item>
+      <item> jkrweight </item>
+      <item> lincom </item>
+      <item> linearized </item>
+      <item> local </item>
+      <item> long </item>
+      <item> ltolerance </item>
+      <item> macro </item>
+      <item> manage </item>
+      <item> meff </item>
+      <item> meft </item>
+      <item> minimize </item>
+      <item> mle </item>
+      <item> mse </item>
+      <item> multiplier </item>
+      <item> noclear </item>
+      <item> nocons </item>
+      <item> noconstant </item>
+      <item> nodots </item>
+      <item> nofetable </item>
+      <item> nogroup </item>
+      <item> noheader </item>
+      <item> nolog </item>
+      <item> nolrtest </item>
+      <item> none </item>
+      <item> nonrtolerance </item>
+      <item> noobs </item>
+      <item> noomit </item>
+      <item> noretable </item>
+      <item> nostderr </item>
+      <item> not </item>
+      <item> nr </item>
+      <item> of </item>
+      <item> offset </item>
+      <item> or </item>
+      <item> p </item>
+      <item> parse </item>
+      <item> patterns </item>
+      <item> poststrata </item>
+      <item> postweight </item>
+      <item> prefix </item>
+      <item> program </item>
+      <item> r2_p </item>
+      <item> reffects </item>
+      <item> reml </item>
+      <item> reset </item>
+      <item> resid </item>
+      <item> run </item>
+      <item> scale </item>
+      <item> shift </item>
+      <item> showstep </item>
+      <item> SITE </item>
+      <item> size </item>
+      <item> star </item>
+      <item> stats </item>
+      <item> STBPLUS </item>
+      <item> stfmt </item>
+      <item> store </item>
+      <item> strata </item>
+      <item> syntax </item>
+      <item> tempfile </item>
+      <item> tempname </item>
+      <item> tempvar </item>
+      <item> tokenize </item>
+      <item> tolerance </item>
+      <item> unstructured </item>
+      <item> until </item>
+      <item> UPDATES </item>
+      <item> weight </item>
+      <item> while </item>
+      <item> wide </item>
+      <item> window </item>
+      <item> x2 </item>
+      <item> xb </item>
+
+      <item> _b[ </item>
+      <item> _coeff[ </item>
+
+      <item> ereturn </item>
+      <item> rreturn </item>
+      <item> sreturn </item>
+
+      <item> e( </item>
+      <item> r( </item>
+      <item> s( </item>
+    </list>
+
+    <list name="macro-extended-functions">
+      <item> all </item>
+      <item> BASE </item>
+      <item> coleq </item>
+      <item> colfullnames </item>
+      <item> coln </item>
+      <item> colnames </item>
+      <item> constraint </item>
+      <item> data </item>
+      <item> dir </item>
+      <item> display </item>
+      <item> environment </item>
+      <item> format </item>
+      <item> l </item>
+      <item> label </item>
+      <item> length </item>
+      <item> list </item>
+      <item> nobreak </item>
+      <item> nofail </item>
+      <item> permname </item>
+      <item> PERSONAL </item>
+      <item> piece </item>
+      <item> PLUS </item>
+      <item> quoted </item>
+      <item> row </item>
+      <item> roweq </item>
+      <item> rowfullnames </item>
+      <item> rown </item>
+      <item> rownames </item>
+      <item> SITE </item>
+      <item> sortedby </item>
+      <item> STATA </item>
+      <item> strict </item>
+      <item> sysdir </item>
+      <item> tempfile </item>
+      <item> tempvar </item>
+      <item> tsnorm </item>
+      <item> UPDATES </item>
+      <item> value </item>
+      <item> variable </item>
+    </list>
+
+    <list name="Internal-Stata-commands">
+      <item> allstring </item>
+      <item> append </item>
+      <item> args </item>
+      <item> aweight </item>
+      <item> born </item>
+      <item> by </item>
+      <item> bys </item>
+      <item> bysort </item>
+      <item> byte </item>
+      <item> capture </item>
+      <item> cfreq </item>
+      <item> clear </item>
+      <item> Cns </item>
+      <item> Co </item>
+      <item> collinear </item>
+      <item> columns </item>
+      <item> comma </item>
+      <item> compress </item>
+      <item> connect </item>
+      <item> console </item>
+      <item> cpercent </item>
+      <item> cr </item>
+      <item> d0 </item>
+      <item> data </item>
+      <item> datestring </item>
+      <item> decode </item>
+      <item> delimit </item>
+      <item> depnames </item>
+      <item> desc </item>
+      <item> describe </item>
+      <item> di </item>
+      <item> diparm_options </item>
+      <item> display </item>
+      <item> double </item>
+      <item> drop </item>
+      <item> eclass </item>
+      <item> encode </item>
+      <item> esample </item>
+      <item> Ev </item>
+      <item> exec </item>
+      <item> fam </item>
+      <item> fdadescribe </item>
+      <item> fdasave </item>
+      <item> fdause </item>
+      <item> filefilter </item>
+      <item> float </item>
+      <item> format </item>
+      <item> fweight </item>
+      <item> gen </item>
+      <item> generate </item>
+      <item> gr [een] </item>
+      <item> gradient </item>
+      <item> hold </item>
+      <item> include </item>
+      <item> insert </item>
+      <item> insheet </item>
+      <item> int </item>
+      <item> iweight </item>
+      <item> k </item>
+      <item> keep </item>
+      <item> label </item>
+      <item> Ld </item>
+      <item> link </item>
+      <item> load </item>
+      <item> long </item>
+      <item> longstub </item>
+      <item> macrolen </item>
+      <item> markout </item>
+      <item> marksample </item>
+      <item> maximize </item>
+      <item> meanonly </item>
+      <item> mlmatsbysum </item>
+      <item> mlout </item>
+      <item> mode </item>
+      <item> model </item>
+      <item> more </item>
+      <item> N </item>
+      <item> namelen </item>
+      <item> noextend </item>
+      <item> nofootnote </item>
+      <item> noi </item>
+      <item> noisily </item>
+      <item> nolabel </item>
+      <item> nonotes </item>
+      <item> nopreserve </item>
+      <item> norescale </item>
+      <item> noscvars </item>
+      <item> nosummary </item>
+      <item> nototal </item>
+      <item> nrtolerance </item>
+      <item> obs </item>
+      <item> odbc </item>
+      <item> off </item>
+      <item> oim </item>
+      <item> on </item>
+      <item> oneway </item>
+      <item> opg </item>
+      <item> order </item>
+      <item> outfile </item>
+      <item> outsheet </item>
+      <item> percent </item>
+      <item> permanently </item>
+      <item> post </item>
+      <item> postclose </item>
+      <item> postfile </item>
+      <item> preserve </item>
+      <item> Psi </item>
+      <item> pweight </item>
+      <item> query </item>
+      <item> qui </item>
+      <item> quietly </item>
+      <item> rawsum </item>
+      <item> red </item>
+      <item> ren </item>
+      <item> rename </item>
+      <item> replace </item>
+      <item> Replay </item>
+      <item> report </item>
+      <item> repost </item>
+      <item> restore </item>
+      <item> robust </item>
+      <item> save </item>
+      <item> saving </item>
+      <item> SD </item>
+      <item> SE </item>
+      <item> search </item>
+      <item> set </item>
+      <item> shownrtolerance </item>
+      <item> sort </item>
+      <item> sqlfile </item>
+      <item> sqlshow </item>
+      <item> STATA </item>
+      <item> statistics </item>
+      <item> sum </item>
+      <item> summarize </item>
+      <item> t1title </item>
+      <item> t2title </item>
+      <item> tab </item>
+      <item> tabulate </item>
+      <item> technique </item>
+      <item> timer </item>
+      <item> total </item>
+      <item> unhold </item>
+      <item> unique </item>
+      <item> uniquemaster </item>
+      <item> uniqusing </item>
+      <item> use </item>
+      <item> using </item>
+      <item> V </item>
+      <item> values </item>
+      <item> variable </item>
+      <item> varlist </item>
+      <item> VCE </item>
+      <item> waldtest </item>
+      <item> width </item>
+      <item> xlabel </item>
+      <item> xmlsave </item>
+      <item> xmluse </item>
+      <item> yellow </item>
+      <item> ylabel </item>
+      <item> yline </item>
+    </list>
+
+  <!-- functions and constants -->
+
+    <list name="math-functions">
+      <item> abs </item>
+      <item> acos </item>
+      <item> asin </item>
+      <item> atan </item>
+      <item> atan2 </item>
+      <item> atanh </item>
+      <item> ceil </item>
+      <item> cloglog </item>
+      <item> comb </item>
+      <item> cos </item>
+      <item> digamma </item>
+      <item> exp </item>
+      <item> floor </item>
+      <item> invcloglog </item>
+      <item> invlogit </item>
+      <item> ln </item>
+      <item> lnfact </item>
+      <item> lnfactorial </item>
+      <item> lngamma </item>
+      <item> log </item>
+      <item> log10 </item>
+      <item> max </item>
+      <item> min </item>
+      <item> mod </item>
+      <item> reldif </item>
+      <item> round </item>
+      <item> sign </item>
+      <item> sin </item>
+      <item> sqrt </item>
+      <item> sum </item>
+      <item> tan </item>
+      <item> tanh </item>
+      <item> trigamma </item>
+      <item> trunc </item>
+    </list>
+
+    <list name="probability-functions">
+      <item> betaden </item>
+      <item> Binomial </item>
+      <item> binorm </item>
+      <item> binormal </item>
+      <item> chi2 </item>
+      <item> chi2tail </item>
+      <item> dgammapda </item>
+      <item> dgammapdada </item>
+      <item> dgammapdadx </item>
+      <item> dgammapdx </item>
+      <item> dgammapdxdx </item>
+      <item> F </item>
+      <item> Fden </item>
+      <item> Ftail </item>
+      <item> gammaden </item>
+      <item> gammap </item>
+      <item> ibeta </item>
+      <item> invbinomial </item>
+      <item> invchi2 </item>
+      <item> invchi2tail </item>
+      <item> invF </item>
+      <item> invFtail </item>
+      <item> invgammap </item>
+      <item> invibeta </item>
+      <item> invnchi2 </item>
+      <item> invnFtail </item>
+      <item> invnibeta </item>
+      <item> invnorm </item>
+      <item> invnormal </item>
+      <item> invttail </item>
+      <item> nbetaden </item>
+      <item> nchi2 </item>
+      <item> nFden </item>
+      <item> nFtail </item>
+      <item> nibeta </item>
+      <item> norm </item>
+      <item> normal </item>
+      <item> normalden </item>
+      <item> normd </item>
+      <item> npnchi2 </item>
+      <item> tden </item>
+      <item> ttail </item>
+      <item> uniform() </item>
+    </list>
+
+    <list name="string-functions">
+      <item> abbrev </item>
+      <item> char </item>
+      <item> index </item>
+      <item> indexnot </item>
+      <item> length </item>
+      <item> lower </item>
+      <item> ltrim </item>
+      <item> match </item>
+      <item> plural </item>
+      <item> proper </item>
+      <item> real </item>
+      <item> regexm </item>
+      <item> regexr </item>
+      <item> regexs </item>
+      <item> reverse </item>
+      <item> rtrim </item>
+      <item> string </item>
+      <item> strlen </item>
+      <item> strlower </item>
+      <item> strltrim </item>
+      <item> strmatch </item>
+      <item> strofreal </item>
+      <item> strpos </item>
+      <item> strproper </item>
+      <item> strreverse </item>
+      <item> strrtrim </item>
+      <item> strtrim </item>
+      <item> strupper </item>
+      <item> subinstr </item>
+      <item> subinword </item>
+      <item> substr </item>
+      <item> trim </item>
+      <item> upper </item>
+      <item> word </item>
+      <item> wordcount </item>
+    </list>
+
+    <list name="programming-functions">
+      <item> _caller </item>
+      <item> autocode </item>
+      <item> byteorder </item>
+      <item> chop </item>
+      <item> clip </item>
+      <item> cond </item>
+      <item> e </item>
+      <item> epsdouble </item>
+      <item> epsfloat </item>
+      <item> group </item>
+      <item> inlist </item>
+      <item> inrange </item>
+      <item> irecode </item>
+      <item> matrix </item>
+      <item> maxbyte </item>
+      <item> maxdouble </item>
+      <item> maxfloat </item>
+      <item> maxint </item>
+      <item> maxlong </item>
+      <item> mi </item>
+      <item> minbyte </item>
+      <item> mindouble </item>
+      <item> minfloat </item>
+      <item> minint </item>
+      <item> minlong </item>
+      <item> missing </item>
+      <item> r </item>
+      <item> recode </item>
+      <item> replay </item>
+      <item> return </item>
+      <item> s </item>
+      <item> scalar </item>
+    </list>
+
+    <list name="date-functions">
+      <item> d </item>
+      <item> date </item>
+      <item> day </item>
+      <item> dow </item>
+      <item> doy </item>
+      <item> halfyear </item>
+      <item> mdy </item>
+      <item> month </item>
+      <item> quarter </item>
+      <item> week </item>
+      <item> year </item>
+    </list>
+
+    <list name="timeseries-functions">
+      <item> d </item>
+      <item> daily </item>
+      <item> dofd </item>
+      <item> dofh </item>
+      <item> dofm </item>
+      <item> dofq </item>
+      <item> dofw </item>
+      <item> dofy </item>
+      <item> h </item>
+      <item> halfyearly </item>
+      <item> hofd </item>
+      <item> m </item>
+      <item> mofd </item>
+      <item> monthly </item>
+      <item> q </item>
+      <item> qofd </item>
+      <item> quarterly </item>
+      <item> tin </item>
+      <item> twithin </item>
+      <item> w </item>
+      <item> weekly </item>
+      <item> wofd </item>
+      <item> y </item>
+      <item> yearly </item>
+      <item> yh </item>
+      <item> ym </item>
+      <item> yofd </item>
+      <item> yq </item>
+      <item> yw </item>
+    </list>
+
+    <list name="matrix-functions">
+      <item> cholesky </item>
+      <item> colnumb </item>
+      <item> colsof </item>
+      <item> corr </item>
+      <item> det </item>
+      <item> diag </item>
+      <item> diag0cnt </item>
+      <item> el </item>
+      <item> get </item>
+      <item> hadamard </item>
+      <item> I </item>
+      <item> inv </item>
+      <item> invsym </item>
+      <item> issym </item>
+      <item> issymmetric </item>
+      <item> J </item>
+      <item> matmissing </item>
+      <item> matuniform </item>
+      <item> mreldif </item>
+      <item> nullmat </item>
+      <item> rownumb </item>
+      <item> rowsof </item>
+      <item> sweep </item>
+      <item> syminv </item>
+      <item> trace </item>
+      <item> vec </item>
+      <item> vecdiag </item>
+    </list>
+
+    <list name="egen-functions">
+      <item> anycount </item>
+      <item> anymatch </item>
+      <item> anyvalue </item>
+      <item> at </item>
+      <item> concat </item>
+      <item> count </item>
+      <item> cut </item>
+      <item> diff </item>
+      <item> ends </item>
+      <item> field </item>
+      <item> fill </item>
+      <item> group </item>
+      <item> groupicodes </item>
+      <item> head </item>
+      <item> iqr </item>
+      <item> kurt </item>
+      <item> label </item>
+      <item> last </item>
+      <item> lname </item>
+      <item> mad </item>
+      <item> max </item>
+      <item> maxlength </item>
+      <item> maxmode </item>
+      <item> mdev </item>
+      <item> mean </item>
+      <item> median </item>
+      <item> min </item>
+      <item> minmode </item>
+      <item> missing </item>
+      <item> mode </item>
+      <item> mtr </item>
+      <item> nummodemissing </item>
+      <item> pc prop </item>
+      <item> pctile </item>
+      <item> punct </item>
+      <item> rank </item>
+      <item> rowfirst </item>
+      <item> rowlast </item>
+      <item> rowmax </item>
+      <item> rowmean </item>
+      <item> rowmin </item>
+      <item> rowmiss </item>
+      <item> rownonmiss </item>
+      <item> rowsd </item>
+      <item> rowtotal </item>
+      <item> sd </item>
+      <item> seq </item>
+      <item> skew </item>
+      <item> std </item>
+      <item> strok </item>
+      <item> tag </item>
+      <item> tail </item>
+      <item> total </item>
+      <item> track </item>
+      <item> trim </item>
+      <item> truncate </item>
+    </list>
+
+    <list name="constants">
+      <item> _all </item>
+      <item> _column </item>
+      <item> _cons </item>
+      <item> _dta </item>
+      <item> _dup </item>
+      <item> _merge </item>
+      <item> _n </item>
+      <item> _newline </item>
+      <item> _pi </item>
+      <item> _rc </item>
+      <item> creturn </item>
+      <item> c(adopath) </item>
+      <item> c(adosize) </item>
+      <item> c(ALPHA) </item>
+      <item> c(born_date) </item>
+      <item> c(byteorder) </item>
+      <item> c(changed) </item>
+      <item> c(checksum) </item>
+      <item> c(cmdlen) </item>
+      <item> c(console) </item>
+      <item> c(copycolor) </item>
+      <item> c(current_date) </item>
+      <item> c(current_time) </item>
+      <item> c(dirsep) </item>
+      <item> c(dockable) </item>
+      <item> c(dockingguides) </item>
+      <item> c(dp) </item>
+      <item> c(epsdouble) </item>
+      <item> c(epsfloat) </item>
+      <item> c(filedate) </item>
+      <item> c(filename) </item>
+      <item> c(flavor) </item>
+      <item> c(graphics) </item>
+      <item> c(httpproxy) </item>
+      <item> c(httpproxyauth) </item>
+      <item> c(httpproxyhost) </item>
+      <item> c(httpproxyport) </item>
+      <item> c(httpproxypw) </item>
+      <item> c(httpproxyuser) </item>
+      <item> c(k) </item>
+      <item> c(level) </item>
+      <item> c(linegap) </item>
+      <item> c(linesize) </item>
+      <item> c(locksplitters) </item>
+      <item> c(logtype) </item>
+      <item> c(machine_type) </item>
+      <item> c(macrolen) </item>
+      <item> c(matacache) </item>
+      <item> c(matafavor) </item>
+      <item> c(matalibs) </item>
+      <item> c(matalnum) </item>
+      <item> c(matamofirst) </item>
+      <item> c(mataoptimize) </item>
+      <item> c(matastrict) </item>
+      <item> c(matsize) </item>
+      <item> c(max_cmdlen) </item>
+      <item> c(max_k_current) </item>
+      <item> c(max_k_theory) </item>
+      <item> c(max_macrolen) </item>
+      <item> c(max_matsize) </item>
+      <item> c(max_N_current) </item>
+      <item> c(max_N_theory) </item>
+      <item> c(max_width_current) </item>
+      <item> c(max_width_theory) </item>
+      <item> c(maxbyte) </item>
+      <item> c(maxdb) </item>
+      <item> c(maxdouble) </item>
+      <item> c(maxfloat) </item>
+      <item> c(maxint) </item>
+      <item> c(maxiter) </item>
+      <item> c(maxlong) </item>
+      <item> c(maxstrvarlen) </item>
+      <item> c(maxvar) </item>
+      <item> c(memory) </item>
+      <item> c(min_matsize) </item>
+      <item> c(minbyte) </item>
+      <item> c(mindouble) </item>
+      <item> c(minfloat) </item>
+      <item> c(minint) </item>
+      <item> c(minlong) </item>
+      <item> c(mode) </item>
+      <item> c(Mons) </item>
+      <item> c(Months) </item>
+      <item> c(more) </item>
+      <item> c(N) </item>
+      <item> c(namelen) </item>
+      <item> c(os) </item>
+      <item> c(osdtl) </item>
+      <item> c(pagesize) </item>
+      <item> c(persistfv) </item>
+      <item> c(persistvtopic) </item>
+      <item> c(pi) </item>
+      <item> c(printcolor) </item>
+      <item> c(pwd) </item>
+      <item> c(rc) </item>
+      <item> c(reventries) </item>
+      <item> c(rmsg_time) </item>
+      <item> c(rmsg) </item>
+      <item> c(scheme) </item>
+      <item> c(scrollbufsize) </item>
+      <item> c(SE) </item>
+      <item> c(searchdefault) </item>
+      <item> c(seed) </item>
+      <item> c(stata_version) </item>
+      <item> c(sysdir_base) </item>
+      <item> c(sysdir_oldplace) </item>
+      <item> c(sysdir_personal) </item>
+      <item> c(sysdir_plus) </item>
+      <item> c(sysdir_site) </item>
+      <item> c(sysdir_stata) </item>
+      <item> c(sysdir_updates) </item>
+      <item> c(timeout1) </item>
+      <item> c(timeout2) </item>
+      <item> c(trace) </item>
+      <item> c(tracedepth) </item>
+      <item> c(traceexpand) </item>
+      <item> c(tracehilite) </item>
+      <item> c(traceindent) </item>
+      <item> c(tracenumber) </item>
+      <item> c(tracesep) </item>
+      <item> c(type) </item>
+      <item> c(update_interval) </item>
+      <item> c(update_prompt) </item>
+      <item> c(update_query) </item>
+      <item> c(varabbrev) </item>
+      <item> c(varlabelpos) </item>
+      <item> c(version) </item>
+      <item> c(virtual) </item>
+      <item> c(Wdays) </item>
+      <item> c(Weekdays) </item>
+      <item> c(width) </item>
+      <item> c(xptheme) </item>
+    </list>
+
+    <list name="System-parameters">
+      <item> adosize </item>
+      <item> checksum </item>
+      <item> copycolor </item>
+      <item> dockable </item>
+      <item> dockingguides </item>
+      <item> dp </item>
+      <item> graphics </item>
+      <item> httpproxy </item>
+      <item> httpproxyauth </item>
+      <item> httpproxyhost </item>
+      <item> httpproxyport </item>
+      <item> httpproxypw </item>
+      <item> httpproxyuser </item>
+      <item> level </item>
+      <item> linegap </item>
+      <item> linesize </item>
+      <item> locksplitters </item>
+      <item> logtype </item>
+      <item> matacache </item>
+      <item> matafavor </item>
+      <item> matalibs </item>
+      <item> matalnum </item>
+      <item> matamofirst </item>
+      <item> mataoptimize </item>
+      <item> matastrict </item>
+      <item> matsize </item>
+      <item> maxdb </item>
+      <item> maxiter </item>
+      <item> maxvar </item>
+      <item> memory </item>
+      <item> more </item>
+      <item> pagesize </item>
+      <item> persistfv </item>
+      <item> persistvtopic </item>
+      <item> printcolor </item>
+      <item> reventries </item>
+      <item> rmsg </item>
+      <item> scheme </item>
+      <item> scrollbufsize </item>
+      <item> searchdefault </item>
+      <item> seed </item>
+      <item> timeout1 </item>
+      <item> timeout2 </item>
+      <item> trace </item>
+      <item> tracedepth </item>
+      <item> traceexpand </item>
+      <item> tracehilite </item>
+      <item> traceindent </item>
+      <item> tracenumber </item>
+      <item> tracesep </item>
+      <item> type </item>
+      <item> update_interval </item>
+      <item> update_prompt </item>
+      <item> update_query </item>
+      <item> varabbrev </item>
+      <item> varlabelpos </item>
+      <item> version </item>
+      <item> virtual </item>
+      <item> xptheme </item>
+    </list>
+
+  <!-- stata ado files   version 9.0    Date: 05/05/2005 -->
+    <list name="procedures">
+      <item> _a_cls_msg </item>
+      <item> _addgph </item>
+      <item> _assert </item>
+      <item> _assert_mreldif </item>
+      <item> _assert_mreldifp </item>
+      <item> _assert_mreldifs </item>
+      <item> _assert_obs </item>
+      <item> _assert_streq </item>
+      <item> _at </item>
+      <item> _bigtab </item>
+      <item> _binperfect </item>
+      <item> _binperfout </item>
+      <item> _biplotmat </item>
+      <item> _brr_sum </item>
+      <item> _bs_display </item>
+      <item> _bs_sum </item>
+      <item> _btcmd </item>
+      <item> _byoptnotallowed </item>
+      <item> _ca_parse_normalize </item>
+      <item> _callerr </item>
+      <item> _cci </item>
+      <item> _check_eformopt </item>
+      <item> _check4gropts </item>
+      <item> _choice_table </item>
+      <item> _ckirfset </item>
+      <item> _cknotsvaroi </item>
+      <item> _ckvec </item>
+      <item> _clsarr2list </item>
+      <item> _cmdxel </item>
+      <item> _coef_table </item>
+      <item> _coef_table_header </item>
+      <item> _confirm_date </item>
+      <item> _confirm_number_or_date </item>
+      <item> _copy_mat_stripes </item>
+      <item> _cpmatnm </item>
+      <item> _crc2use </item>
+      <item> _crc4fld </item>
+      <item> _crcacnt </item>
+      <item> _crcar1 </item>
+      <item> _crcause </item>
+      <item> _crcbin </item>
+      <item> _crcbygr </item>
+      <item> _crcchi2 </item>
+      <item> _crcchkw </item>
+      <item> _crccip </item>
+      <item> _crceprs </item>
+      <item> _crcgldv </item>
+      <item> _crcglil </item>
+      <item> _crcird </item>
+      <item> _crcirr </item>
+      <item> _crcmeq </item>
+      <item> _crcnuse </item>
+      <item> _crcor </item>
+      <item> _crcphdr </item>
+      <item> _crcra </item>
+      <item> _crcrd </item>
+      <item> _crcrr </item>
+      <item> _crcseq </item>
+      <item> _crcshdr </item>
+      <item> _crcslbl </item>
+      <item> _crcsrvc </item>
+      <item> _crcswxx </item>
+      <item> _crcunab </item>
+      <item> _crcunit </item>
+      <item> _crcvarl </item>
+      <item> _crcwsrv </item>
+      <item> _crczsku </item>
+      <item> _cvar </item>
+      <item> _date2elapsed </item>
+      <item> _diag2mat </item>
+      <item> _diparm </item>
+      <item> _diparm_8 </item>
+      <item> _dots </item>
+      <item> _e2r </item>
+      <item> _egennoby </item>
+      <item> _evlist </item>
+      <item> _exp_list_expand </item>
+      <item> _exp_list_parse </item>
+      <item> _find_tsops </item>
+      <item> _fr_area_parse_and_log </item>
+      <item> _fr_aspect_parse_and_log </item>
+      <item> _fr_draw_rect </item>
+      <item> _fr_droplines_draw </item>
+      <item> _fr_erasearr </item>
+      <item> _fr_legend_parse_and_log </item>
+      <item> _fr_merged_implicit </item>
+      <item> _fr_runlog </item>
+      <item> _fr_sztextbox_parse_and_log </item>
+      <item> _fr_tbstyle_parse_and_log </item>
+      <item> _fr_tedits_parse_and_log </item>
+      <item> _fr_textbox_parse_and_log </item>
+      <item> _fr_title_parse_and_log </item>
+      <item> _fr_x_log_cleanup </item>
+      <item> _fr_x_log_create </item>
+      <item> _fracpp </item>
+      <item> _fracxo </item>
+      <item> _frr_sztextbox_pnl </item>
+      <item> _gany </item>
+      <item> _ganycount </item>
+      <item> _ganymatch </item>
+      <item> _ganyvalue </item>
+      <item> _gconcat </item>
+      <item> _gcount </item>
+      <item> _gcut </item>
+      <item> _gdiff </item>
+      <item> _gends </item>
+      <item> _geqany </item>
+      <item> _get_diparmopts </item>
+      <item> _get_diparmopts_8 </item>
+      <item> _get_eformopts </item>
+      <item> _get_eqspec </item>
+      <item> _get_gropts </item>
+      <item> _get_irf </item>
+      <item> _get_offopt </item>
+      <item> _getbv </item>
+      <item> _getcovcorr </item>
+      <item> _getfilename </item>
+      <item> _getnewlabelname </item>
+      <item> _getrhs </item>
+      <item> _getvarcns </item>
+      <item> _getxel </item>
+      <item> _getxel2 </item>
+      <item> _gfill </item>
+      <item> _ggroup </item>
+      <item> _giqr </item>
+      <item> _gkurt </item>
+      <item> _gm_edit </item>
+      <item> _gm_log </item>
+      <item> _gma </item>
+      <item> _gmad </item>
+      <item> _gmax </item>
+      <item> _gmdev </item>
+      <item> _gmean </item>
+      <item> _gmedian </item>
+      <item> _gmin </item>
+      <item> _gmode </item>
+      <item> _gmtr </item>
+      <item> _gneqany </item>
+      <item> _gpc </item>
+      <item> _gpctile </item>
+      <item> _gr_arrowhead </item>
+      <item> _gr_atomize_styles </item>
+      <item> _gr_common_axes </item>
+      <item> _gr_drawrect </item>
+      <item> _gr_linkstyles </item>
+      <item> _gr_symbol_of </item>
+      <item> _grank </item>
+      <item> _grfirst </item>
+      <item> _grlast </item>
+      <item> _grmax </item>
+      <item> _grmean </item>
+      <item> _grmin </item>
+      <item> _grmiss </item>
+      <item> _grobs </item>
+      <item> _growfirst </item>
+      <item> _growlast </item>
+      <item> _growmax </item>
+      <item> _growmean </item>
+      <item> _growmin </item>
+      <item> _growmiss </item>
+      <item> _grownonmiss </item>
+      <item> _growsd </item>
+      <item> _growtotal </item>
+      <item> _grsd </item>
+      <item> _grsum </item>
+      <item> _gs_addgrname </item>
+      <item> _gs_bygraph </item>
+      <item> _gs_clean_graphlist </item>
+      <item> _gs_default_bands </item>
+      <item> _gs_islivefile </item>
+      <item> _gs_parse_and_log_axoptions </item>
+      <item> _gs_parse_and_log_axtitle </item>
+      <item> _gs_parse_and_log_lines </item>
+      <item> _gs_parse_and_log_tickset </item>
+      <item> _gs_rdfilehdr </item>
+      <item> _gs_wrfilehdr </item>
+      <item> _gs_x_create </item>
+      <item> _gsd </item>
+      <item> _gseq </item>
+      <item> _gskew </item>
+      <item> _gstd </item>
+      <item> _gsum </item>
+      <item> _gtag </item>
+      <item> _gtotal </item>
+      <item> _hadamard_verify </item>
+      <item> _hw_comp </item>
+      <item> _hw_opt_d0 </item>
+      <item> _hwsa_comp </item>
+      <item> _hwsa_opt_d0 </item>
+      <item> _hwsm_comp </item>
+      <item> _hwsm_opt_d0 </item>
+      <item> _isfit </item>
+      <item> _ivreg_project </item>
+      <item> _jk_nlegend </item>
+      <item> _jk_pseudo </item>
+      <item> _jk_sum </item>
+      <item> _labels2names </item>
+      <item> _linemax </item>
+      <item> _loop_brr </item>
+      <item> _loop_jknife </item>
+      <item> _loop_jknife_fw </item>
+      <item> _loop_jknife_iw </item>
+      <item> _loop_jknife2 </item>
+      <item> _loop_rw </item>
+      <item> _lrtest7 </item>
+      <item> _m2matrix </item>
+      <item> _m2scalar </item>
+      <item> _matplot </item>
+      <item> _matsort </item>
+      <item> _mdisplay </item>
+      <item> _mds_classical </item>
+      <item> _mds_dataheader </item>
+      <item> _mds_display </item>
+      <item> _mds_display_classical </item>
+      <item> _mds_euclidean </item>
+      <item> _mds_parse_dopts </item>
+      <item> _mds_parse_method </item>
+      <item> _mds_parse_s2d </item>
+      <item> _mds_s2d </item>
+      <item> _me_der </item>
+      <item> _me_der2 </item>
+      <item> _me_derb </item>
+      <item> _me_derd </item>
+      <item> _me_l_der </item>
+      <item> _me_l_der2 </item>
+      <item> _mfrmvec </item>
+      <item> _mka2 </item>
+      <item> _mkg </item>
+      <item> _mkkmn </item>
+      <item> _mksigma </item>
+      <item> _mkvec </item>
+      <item> _mprobitestimator </item>
+      <item> _mtest </item>
+      <item> _mvec </item>
+      <item> _no_estat </item>
+      <item> _no_predict </item>
+      <item> _nobs </item>
+      <item> _on_colon_parse </item>
+      <item> _parmlist </item>
+      <item> _parse_optexp </item>
+      <item> _parsewt </item>
+      <item> _pk_p </item>
+      <item> _plotpos </item>
+      <item> _pred_me </item>
+      <item> _pred_se </item>
+      <item> _prefix_check4esample </item>
+      <item> _prefix_checkopt </item>
+      <item> _prefix_clear </item>
+      <item> _prefix_command </item>
+      <item> _prefix_display </item>
+      <item> _prefix_expand </item>
+      <item> _prefix_explist </item>
+      <item> _prefix_footnote </item>
+      <item> _prefix_getchars </item>
+      <item> _prefix_getmat </item>
+      <item> _prefix_legend </item>
+      <item> _prefix_mlogit </item>
+      <item> _prefix_model_test </item>
+      <item> _prefix_note </item>
+      <item> _prefix_reject </item>
+      <item> _prefix_relabel_eqns </item>
+      <item> _prefix_run_error </item>
+      <item> _prefix_saving </item>
+      <item> _prefix_title </item>
+      <item> _prefix_vcenotallowed </item>
+      <item> _qsort_index </item>
+      <item> _qsur </item>
+      <item> _r2e </item>
+      <item> _repost </item>
+      <item> _resample_warn </item>
+      <item> _restore_labels </item>
+      <item> _returnclear </item>
+      <item> _rmdcoll </item>
+      <item> _robust2 </item>
+      <item> _roccom1 </item>
+      <item> _roccom1_8 </item>
+      <item> _rocsen </item>
+      <item> _rotate_clear </item>
+      <item> _rotate_text </item>
+      <item> _score_spec </item>
+      <item> _set_irf_vars </item>
+      <item> _shortenpath </item>
+      <item> _sigfm </item>
+      <item> _small2dotz </item>
+      <item> _stata_internalerror </item>
+      <item> _stcurv </item>
+      <item> _strip_labels </item>
+      <item> _sttrend </item>
+      <item> _stubstar2names </item>
+      <item> _sum_table </item>
+      <item> _sumaccum </item>
+      <item> _sunflower_binar </item>
+      <item> _svar_cnsmac </item>
+      <item> _svar_eqmac </item>
+      <item> _svar_newcns </item>
+      <item> _svar_post </item>
+      <item> _svard2 </item>
+      <item> _svariden </item>
+      <item> _svaridenlr </item>
+      <item> _svarlrd2 </item>
+      <item> _svd </item>
+      <item> _svy_check_cmdopts </item>
+      <item> _svy_check_fpc </item>
+      <item> _svy_check_postw </item>
+      <item> _svy_check_predict </item>
+      <item> _svy_check_vce </item>
+      <item> _svy_fpc_note </item>
+      <item> _svy_ftest </item>
+      <item> _svy_ivreg_first </item>
+      <item> _svy_mtdeff </item>
+      <item> _svy_mkmeff </item>
+      <item> _svy_mkvmsp </item>
+      <item> _svy_mkvsrs </item>
+      <item> _svy_newrule </item>
+      <item> _svy_setup </item>
+      <item> _svy_singleton_note </item>
+      <item> _svy_subpop </item>
+      <item> _svy_subpop_note </item>
+      <item> _svy_summarize </item>
+      <item> _svy_summarize_legend </item>
+      <item> _svy_tabulate </item>
+      <item> _svy2 </item>
+      <item> _svydes_dlg </item>
+      <item> _svylc </item>
+      <item> _svyset </item>
+      <item> _sw_ood </item>
+      <item> _ts </item>
+      <item> _ts_dexp </item>
+      <item> _ts_exp </item>
+      <item> _ts_hw </item>
+      <item> _ts_hwsa </item>
+      <item> _ts_hwsm </item>
+      <item> _tsheadr </item>
+      <item> _tsinchk </item>
+      <item> _tsma </item>
+      <item> _ttest </item>
+      <item> _ttest1 </item>
+      <item> _ttest2 </item>
+      <item> _tutends </item>
+      <item> _var_mka </item>
+      <item> _varbsf </item>
+      <item> _vardisprmse </item>
+      <item> _varfcast </item>
+      <item> _varfcast_clear </item>
+      <item> _varfcast_fcast </item>
+      <item> _varfcast_graph </item>
+      <item> _varirf </item>
+      <item> _varsim </item>
+      <item> _vce_parserun </item>
+      <item> _vec_ckgraph </item>
+      <item> _vec_dreduced </item>
+      <item> _vec_grcroots </item>
+      <item> _vec_opck </item>
+      <item> _vec_pgparse </item>
+      <item> _vec_pgridplots </item>
+      <item> _vec_postvar </item>
+      <item> _vecauxdisp </item>
+      <item> _vecfcast_compute </item>
+      <item> _vecfcast_compute_w </item>
+      <item> _vecgetacns </item>
+      <item> _vecgetcv </item>
+      <item> _vecgtn </item>
+      <item> _vecmka </item>
+      <item> _vecmkapvp </item>
+      <item> _vecmkce </item>
+      <item> _vecmkgam </item>
+      <item> _vecmksi </item>
+      <item> _vecmktrend </item>
+      <item> _vecortho </item>
+      <item> _vecpclean </item>
+      <item> _vectparse </item>
+      <item> _vecu </item>
+      <item> _virf_add </item>
+      <item> _virf_char </item>
+      <item> _virf_fck </item>
+      <item> _virf_mknewfile </item>
+      <item> _virf_nlen </item>
+      <item> _virf_use </item>
+      <item> _writenum </item>
+      <item> _xtreg_chk_cl </item>
+
+      <item> ac </item>
+      <item> ac_7 </item>
+      <item> acprplot </item>
+      <item> acprplot_7 </item>
       <item> adjust </item>
+      <item> adopath </item>
       <item> alpha </item>
-      <item> anova </item>
-      <item> anovadef </item>
-      <item> append </item>
-      <item> assert </item>
+      <item> ameans </item>
+      <item> anova_estat </item>
+      <item> anova_terms </item>
+      <item> aorder </item>
       <item> arch </item>
+      <item> arch_dr </item>
+      <item> arch_estat </item>
+      <item> arch_p </item>
+      <item> archlm </item>
       <item> areg </item>
-      <item> args </item>
+      <item> areg_p </item>
       <item> arima </item>
-      <item> bar </item>
+      <item> arima_dr </item>
+      <item> arima_estat </item>
+      <item> arima_p </item>
+      <item> asmprobit </item>
+      <item> asmprobit_estat </item>
+      <item> asmprobit_lf </item>
+      <item> asmprobit_p </item>
+      <item> avplot </item>
+      <item> avplot_7 </item>
+      <item> avplots </item>
+      <item> avplots_7 </item>
+      <item> bcskew0 </item>
+      <item> bgodfrey </item>
       <item> binreg </item>
+      <item> bip0_lf </item>
+      <item> biplot </item>
+      <item> bipp_lf </item>
+      <item> bipr_lf </item>
+      <item> bipr_p </item>
       <item> biprobit </item>
       <item> bitest </item>
+      <item> bitesti </item>
+      <item> bitowt </item>
+      <item> blogit </item>
+      <item> bmemsize </item>
+      <item> boot </item>
+      <item> bootsamp </item>
+      <item> bootstrap </item>
+      <item> bootstrap_8 </item>
+      <item> boxco_l </item>
+      <item> boxco_p </item>
       <item> boxcox </item>
+      <item> boxcox_6 </item>
+      <item> boxcox_p </item>
+      <item> bprobit </item>
       <item> brier </item>
-      <item> break </item>
-      <item> browse </item>
+      <item> brr </item>
+      <item> brrstat </item>
+      <item> bs </item>
+      <item> bs_7 </item>
+      <item> bsampl_w </item>
+      <item> bsample </item>
+      <item> bsample_7 </item>
+      <item> bsqreg </item>
+      <item> bstat </item>
+      <item> bstat_7 </item>
+      <item> bstat_8 </item>
       <item> bstrap </item>
-      <item> by </item>
+      <item> bstrap_7 </item>
+      <item> ca </item>
+      <item> ca_estat </item>
+      <item> ca_p </item>
+      <item> cabiplot </item>
+      <item> camat </item>
       <item> canon </item>
-      <item> cap </item>
-      <item> capture </item>
-      <item> cat </item>
-      <item> cd </item>
+      <item> canon_8 </item>
+      <item> canon_8_p </item>
+      <item> canon_estat </item>
+      <item> canon_p </item>
+      <item> caprojection </item>
+      <item> cc </item>
+      <item> cchart </item>
+      <item> cchart_7 </item>
+      <item> cci </item>
+      <item> censobs_table </item>
       <item> centile </item>
       <item> cf </item>
-      <item> checksum </item>
+      <item> checkdlgfiles </item>
+      <item> checkhlpfiles </item>
       <item> ci </item>
-      <item> clavg </item>
-      <item> class </item>
-      <item> clist </item>
-      <item> clcomp </item>
+      <item> cii </item>
+      <item> classutil </item>
       <item> clear </item>
-      <item> clgen </item>
-      <item> clkmeans </item>
-      <item> clkmed </item>
-      <item> clnote </item>
+      <item> clo </item>
+      <item> clog </item>
+      <item> clog_lf </item>
+      <item> clog_p </item>
+      <item> clogi </item>
+      <item> clogi_sw </item>
       <item> clogit </item>
+      <item> clogit_lf </item>
+      <item> clogit_p </item>
+      <item> clogitp </item>
+      <item> clogl_sw </item>
       <item> cloglog </item>
-      <item> clsing </item>
-      <item> cltree </item>
+      <item> clonevar </item>
+      <item> clslistarray </item>
       <item> cluster </item>
-      <item> clutil </item>
-      <item> cmdlog </item>
+      <item> cluster_measures </item>
+      <item> cluster_stop </item>
+      <item> cluster_tree </item>
+      <item> cluster_tree_8 </item>
+      <item> clustermat </item>
+      <item> cnr </item>
+      <item> cnre </item>
       <item> cnreg </item>
+      <item> cnreg_p </item>
+      <item> cnreg_sw </item>
       <item> cnsreg </item>
-      <item> creturn </item>
       <item> codebook </item>
+      <item> collaps4 </item>
       <item> collapse </item>
+      <item> colormult_nb </item>
+      <item> colormult_nw </item>
       <item> compare </item>
-      <item> compress </item>
-      <item> confirm </item>
-      <item> constraint </item>
+      <item> conren </item>
       <item> contract </item>
-      <item> continue </item>
-      <item> copy </item>
       <item> copyright </item>
+      <item> copysource </item>
+      <item> corc </item>
+      <item> corr_anti </item>
+      <item> corr_kmo </item>
+      <item> corr_smc </item>
       <item> corr2data </item>
-      <item> corr </item>
-      <item> correlate </item>
       <item> corrgram </item>
-      <item> count </item>
-      <item> cox </item>
+      <item> cox_p </item>
+      <item> cox_sw </item>
+      <item> coxbase </item>
+      <item> coxhaz </item>
+      <item> coxvar </item>
+      <item> cprplot </item>
+      <item> cprplot_7 </item>
+      <item> crc </item>
       <item> cross </item>
+      <item> cs </item>
+      <item> cscript </item>
+      <item> cscript_log </item>
+      <item> csi </item>
       <item> ct </item>
+      <item> ct_is </item>
       <item> ctset </item>
+      <item> ctst_5 </item>
+      <item> ctst_st </item>
       <item> cttost </item>
       <item> cumsp </item>
+      <item> cumsp_7 </item>
       <item> cumul </item>
       <item> cusum </item>
-      <item> datatypes </item>
-      <item> decode </item>
-      <item> define </item>
+      <item> cusum_7 </item>
+      <item> cutil </item>
+
+      <item> d </item>
+      <item> datetof </item>
+      <item> db </item>
+      <item> dbeta </item>
+      <item> de </item>
+      <item> deff </item>
+      <item> des </item>
+      <item> desc </item>
+      <item> descr </item>
+      <item> descri </item>
+      <item> describ </item>
       <item> describe </item>
       <item> destring </item>
+      <item> dfbeta </item>
+      <item> dfgls </item>
       <item> dfuller </item>
-      <item> diagplots </item>
-      <item> dir </item>
-      <item> discard </item>
-      <item> di </item>
-      <item> display </item>
-      <item> do </item>
-      <item> doedit </item>
+      <item> dirstats </item>
+      <item> disp_res </item>
+      <item> disp_s </item>
       <item> dotplot </item>
+      <item> dotplot_7 </item>
+      <item> dprobit </item>
       <item> drawnorm </item>
-      <item> drop </item>
+      <item> ds </item>
+      <item> ds_util </item>
       <item> dstdize </item>
-      <item> edit </item>
+      <item> duplicates </item>
+      <item> durbina </item>
+      <item> dwstat </item>
+      <item> dydx </item>
       <item> egen </item>
       <item> eivreg </item>
-      <item> else </item>
-      <item> encode </item>
-      <item> end </item>
-      <item> epitab </item>
-      <item> erase </item>
-      <item> ereturn </item>
-      <item> exit </item>
-      <item> expand </item>
-      <item> export </item>
+      <item> emdef </item>
+      <item> eq </item>
+      <item> ereg </item>
+      <item> ereg_lf </item>
+      <item> ereg_p </item>
+      <item> ereg_sw </item>
+      <item> ereghet </item>
+      <item> ereghet_glf </item>
+      <item> ereghet_glf_sh </item>
+      <item> ereghet_gp </item>
+      <item> ereghet_ilf </item>
+      <item> ereghet_ilf_sh </item>
+      <item> ereghet_ip </item>
+      <item> est </item>
+      <item> est_cfexist </item>
+      <item> est_cfname </item>
+      <item> est_clickable </item>
+      <item> est_expand </item>
+      <item> est_hold </item>
+      <item> est_table </item>
+      <item> est_unhold </item>
+      <item> est_unholdok </item>
+      <item> estat </item>
+      <item> estat_default </item>
+      <item> estat_summ </item>
+      <item> estat_vce_only </item>
+      <item> esti </item>
+      <item> estimates </item>
+      <item> etodow </item>
+      <item> etof </item>
+      <item> etomdy </item>
+      <item> expandcl </item>
+      <item> fac </item>
+      <item> fact </item>
+      <item> facto </item>
       <item> factor </item>
-      <item> fdadescribe </item>
-      <item> fdasave </item>
-      <item> fdause </item>
+      <item> factor_estat </item>
+      <item> factor_p </item>
+      <item> factor_pca_rotated </item>
+      <item> factor_rotate </item>
+      <item> factormat </item>
+      <item> fcast </item>
+      <item> fcast_compute </item>
+      <item> fcast_graph </item>
+      <item> fh_st </item>
       <item> fillin </item>
-      <item> file </item>
-      <item> filefilter </item>
-      <item> flist </item>
+      <item> find_hlp_file </item>
+      <item> findfile </item>
+      <item> findit </item>
+      <item> findit_7 </item>
+      <item> fit </item>
       <item> for </item>
-      <item> foreach </item>
-      <item> forv </item>
-      <item> forval </item>
-      <item> forvalues </item>
-      <item> format </item>
+      <item> for5_0 </item>
+      <item> fpredict </item>
+      <item> frac_154 </item>
+      <item> frac_adj </item>
+      <item> frac_chk </item>
+      <item> frac_cox </item>
+      <item> frac_ddp </item>
+      <item> frac_dis </item>
+      <item> frac_dv </item>
+      <item> frac_in </item>
+      <item> frac_mun </item>
+      <item> frac_pp </item>
+      <item> frac_pq </item>
+      <item> frac_pv </item>
+      <item> frac_wgt </item>
+      <item> frac_xo </item>
+      <item> fracgen </item>
+      <item> fracplot </item>
+      <item> fracplot_7 </item>
       <item> fracpoly </item>
-      <item> g </item>
-      <item> gen </item>
-      <item> generate </item>
-      <item> gettoken </item>
+      <item> fracpred </item>
+      <item> fron_ex </item>
+      <item> fron_hn </item>
+      <item> fron_p </item>
+      <item> fron_tn </item>
+      <item> fron_tn2 </item>
+      <item> frontier </item>
+      <item> ftodate </item>
+      <item> ftoe </item>
+      <item> ftomdy </item>
+      <item> ftowdate </item>
+
+      <item> gamhet_glf </item>
+      <item> gamhet_gp </item>
+      <item> gamhet_ilf </item>
+      <item> gamhet_ip </item>
+      <item> gamma </item>
+      <item> gamma_d2 </item>
+      <item> gamma_p </item>
+      <item> gamma_sw </item>
+      <item> gammahet </item>
+      <item> gdi_hexagon </item>
+      <item> gdi_spokes </item>
+      <item> genrank </item>
+      <item> genstd </item>
+      <item> genvmean </item>
+      <item> gladder </item>
+      <item> gladder_7 </item>
+      <item> glim_l01 </item>
+      <item> glim_l02 </item>
+      <item> glim_l03 </item>
+      <item> glim_l04 </item>
+      <item> glim_l05 </item>
+      <item> glim_l06 </item>
+      <item> glim_l07 </item>
+      <item> glim_l08 </item>
+      <item> glim_l09 </item>
+      <item> glim_l10 </item>
+      <item> glim_l11 </item>
+      <item> glim_l12 </item>
+      <item> glim_lf </item>
+      <item> glim_mu </item>
+      <item> glim_nw1 </item>
+      <item> glim_nw2 </item>
+      <item> glim_nw3 </item>
+      <item> glim_p </item>
+      <item> glim_v1 </item>
+      <item> glim_v2 </item>
+      <item> glim_v3 </item>
+      <item> glim_v4 </item>
+      <item> glim_v5 </item>
+      <item> glim_v6 </item>
+      <item> glim_v7 </item>
       <item> glm </item>
+      <item> glm_6 </item>
+      <item> glm_p </item>
+      <item> glm_sw </item>
+      <item> glmpred </item>
       <item> glogit </item>
-      <item> gprefs </item>
-      <item> gr7 </item>
-      <item> graph7 </item>
+      <item> glogit_8 </item>
+      <item> glogit_p </item>
+      <item> gmeans </item>
+      <item> gnbre_lf </item>
+      <item> gnbreg </item>
+      <item> gnbreg_5 </item>
+      <item> gnbreg_p </item>
+      <item> gomp_lf </item>
+      <item> gompe_sw </item>
+      <item> gomper_p </item>
+      <item> gompertz </item>
+      <item> gompertzhet </item>
+      <item> gomphet_glf </item>
+      <item> gomphet_glf_sh </item>
+      <item> gomphet_gp </item>
+      <item> gomphet_ilf </item>
+      <item> gomphet_ilf_sh </item>
+      <item> gomphet_ip </item>
+      <item> gphdot </item>
+      <item> gphpen </item>
+      <item> gphprint </item>
+      <item> gprobi_p </item>
+      <item> gprobit </item>
+      <item> gprobit_8 </item>
       <item> gr </item>
+      <item> gr_copy </item>
+      <item> gr_current </item>
+      <item> gr_db </item>
+      <item> gr_describe </item>
+      <item> gr_dir </item>
+      <item> gr_draw </item>
+      <item> gr_draw_replay </item>
+      <item> gr_drop </item>
+      <item> gr_edit </item>
+      <item> gr_editviewopts </item>
+      <item> gr_example </item>
+      <item> gr_example2 </item>
+      <item> gr_export </item>
+      <item> gr_print </item>
+      <item> gr_qscheme </item>
+      <item> gr_query </item>
+      <item> gr_read </item>
+      <item> gr_rename </item>
+      <item> gr_replay </item>
+      <item> gr_save </item>
+      <item> gr_set </item>
+      <item> gr_setscheme </item>
+      <item> gr_table </item>
+      <item> gr_undo </item>
+      <item> gr_use </item>
       <item> graph </item>
+      <item> grebar </item>
+      <item> greigen </item>
+      <item> greigen_7 </item>
+      <item> greigen_8 </item>
       <item> grmeanby </item>
+      <item> grmeanby_7 </item>
+      <item> gs_fileinfo </item>
+      <item> gs_filetype </item>
+      <item> gs_graphinfo </item>
+      <item> gs_stat </item>
       <item> gsort </item>
+      <item> gwood </item>
+      <item> h </item>
       <item> hadimvo </item>
+      <item> hareg </item>
       <item> hausman </item>
-      <item> haver </item>
+      <item> he </item>
+      <item> heck_d2 </item>
+      <item> heckma_p </item>
       <item> heckman </item>
+      <item> heckp_lf </item>
+      <item> heckpr_p </item>
       <item> heckprob </item>
+      <item> hel </item>
       <item> help </item>
+      <item> hereg </item>
+      <item> hetpr_lf </item>
+      <item> hetpr_p </item>
       <item> hetprob </item>
-      <item> hexdump </item>
+      <item> hettest </item>
       <item> hilite </item>
       <item> hist </item>
+      <item> hist_7 </item>
+      <item> histogram </item>
+      <item> hlogit </item>
+      <item> hlu </item>
+      <item> hmeans </item>
       <item> hotel </item>
-      <item> if </item>
+      <item> hotelling </item>
+      <item> hprobit </item>
+      <item> hreg </item>
       <item> icd9 </item>
+      <item> icd9_ff </item>
+      <item> icd9p </item>
+      <item> iis </item>
       <item> impute </item>
-      <item> in </item>
-      <item> infile </item>
-      <item> infile1 </item>
-      <item> infile2 </item>
-      <item> infiling </item>
-      <item> infix </item>
-      <item> input </item>
-      <item> insheet </item>
-      <item> inspect </item>
+      <item> imtest </item>
+      <item> inbase </item>
+      <item> integ </item>
+      <item> inten </item>
+      <item> intreg </item>
+      <item> intreg_7 </item>
+      <item> intreg_p </item>
+      <item> intrg_ll </item>
+      <item> intrg_ll2 </item>
+      <item> intrg2_ll </item>
       <item> ipolate </item>
+      <item> iqreg </item>
+      <item> ir </item>
+      <item> irf </item>
+      <item> irf_create </item>
+      <item> irfm </item>
+      <item> iri </item>
+      <item> is_svy </item>
+      <item> is_svysum </item>
+      <item> isid </item>
+      <item> istdize </item>
+      <item> ivprob_1_lf </item>
+      <item> ivprob_lf </item>
+      <item> ivprobit </item>
+      <item> ivprobit_p </item>
       <item> ivreg </item>
+      <item> ivreg_footnote </item>
+      <item> ivtob_1_lf </item>
+      <item> ivtob_lf </item>
+      <item> ivtobit </item>
+      <item> ivtobit_p </item>
+
+      <item> jackknife </item>
+      <item> jacknife </item>
       <item> jknife </item>
+      <item> jknife_6 </item>
+      <item> jknife_8 </item>
+      <item> jkstat </item>
       <item> joinby </item>
+      <item> kalarma1 </item>
+      <item> kap </item>
+      <item> kap_3 </item>
+      <item> kapmeier </item>
       <item> kappa </item>
+      <item> kapwgt </item>
       <item> kdensity </item>
-      <item> keep </item>
+      <item> kdensity_7 </item>
       <item> ksm </item>
       <item> ksmirnov </item>
+      <item> ktau </item>
       <item> kwallis </item>
-      <item> label </item>
+      <item> labelbook </item>
       <item> ladder </item>
       <item> levels </item>
-      <item> limits </item>
+      <item> levelsof </item>
+      <item> leverage </item>
+      <item> lfit </item>
+      <item> lfit_p </item>
       <item> lincom </item>
       <item> line </item>
       <item> linktest </item>
-      <item> list </item>
+      <item> lloghet_glf </item>
+      <item> lloghet_glf_sh </item>
+      <item> lloghet_gp </item>
+      <item> lloghet_ilf </item>
+      <item> lloghet_ilf_sh </item>
+      <item> lloghet_ip </item>
+      <item> llogi_sw </item>
+      <item> llogis_p </item>
+      <item> llogist </item>
+      <item> llogistic </item>
+      <item> llogistichet </item>
+      <item> lnorm_lf </item>
+      <item> lnorm_sw </item>
+      <item> lnorma_p </item>
+      <item> lnormal </item>
+      <item> lnormalhet </item>
+      <item> lnormhet_glf </item>
+      <item> lnormhet_glf_sh </item>
+      <item> lnormhet_gp </item>
+      <item> lnormhet_ilf </item>
+      <item> lnormhet_ilf_sh </item>
+      <item> lnormhet_ip </item>
       <item> lnskew0 </item>
-      <item> log </item>
+      <item> loadingplot </item>
+      <item> logi </item>
+      <item> logis_lf </item>
       <item> logistic </item>
-      <item> lowess </item>
-      <item> lfit </item>
-      <item> lstat </item>
-      <item> lroc </item>
-      <item> lsens </item>
+      <item> logistic_p </item>
       <item> logit </item>
+      <item> logit_estat </item>
+      <item> logit_p </item>
+      <item> loglogs </item>
+      <item> logrank </item>
       <item> loneway </item>
+      <item> lookfor </item>
+      <item> lowess </item>
+      <item> lowess_7 </item>
+      <item> lpredict </item>
+      <item> lrecomp </item>
+      <item> lroc </item>
+      <item> lroc_7 </item>
       <item> lrtest </item>
+      <item> lsens </item>
+      <item> lsens_7 </item>
+      <item> lsens_x </item>
+      <item> lstat </item>
       <item> ltable </item>
+      <item> ltable_7 </item>
+      <item> ltriang </item>
       <item> lv </item>
-      <item> manova </item>
-      <item> manovatest </item>
-      <item> mark </item>
-      <item> markin </item>
-      <item> markout </item>
-      <item> marksample </item>
-      <item> matsize </item>
-      <item> maximize </item>
+      <item> lvr2plot </item>
+      <item> lvr2plot_7 </item>
+
+      <item> makecns </item>
+      <item> manova_estat </item>
+      <item> manova_p </item>
+      <item> mantel </item>
+      <item> mat_capp </item>
+      <item> mat_order </item>
+      <item> mat_rapp </item>
+      <item> mata_matdescribe </item>
+      <item> mata_matsave </item>
+      <item> mata_matuse </item>
+      <item> matalabel </item>
+      <item> matcproc </item>
+      <item> matlist </item>
+      <item> matname </item>
+      <item> matstrik </item>
+      <item> mcc </item>
+      <item> mcci </item>
+      <item> md0_ </item>
+      <item> md1_ </item>
+      <item> md1debug_ </item>
+      <item> md2_ </item>
+      <item> md2debug_ </item>
+      <item> mds </item>
+      <item> mds_estat </item>
+      <item> mds_p </item>
+      <item> mdsconfig </item>
+      <item> mdslong </item>
+      <item> mdsmat </item>
+      <item> mdsshepard </item>
+      <item> mdytoe </item>
+      <item> mdytof </item>
+      <item> me_derd </item>
+      <item> mean </item>
       <item> means </item>
       <item> median </item>
-      <item> memory </item>
+      <item> memsize </item>
+      <item> meqparse </item>
+      <item> mer </item>
+      <item> merg </item>
       <item> merge </item>
+      <item> mfp </item>
       <item> mfx </item>
-      <item> mkdir </item>
+      <item> mhelp </item>
+      <item> mhodds </item>
+      <item> mixed_ll </item>
+      <item> mixed_ll_reparm </item>
+      <item> mkassert </item>
+      <item> mkmat </item>
       <item> mkspline </item>
       <item> ml </item>
-      <item> mleval </item>
-      <item> mlmatbysum </item>
-      <item> mlmatsum  </item>
-      <item> mlsum  </item>
-      <item> mlvecsum  </item>
+      <item> ml_5 </item>
+      <item> ml_adjs </item>
+      <item> ml_bhhhs </item>
+      <item> ml_c_d </item>
+      <item> ml_check </item>
+      <item> ml_clear </item>
+      <item> ml_cnt </item>
+      <item> ml_debug </item>
+      <item> ml_defd </item>
+      <item> ml_e0 </item>
+      <item> ml_e0_bfgs </item>
+      <item> ml_e0_cycle </item>
+      <item> ml_e0_dfp </item>
+      <item> ml_e0i </item>
+      <item> ml_e1 </item>
+      <item> ml_e1_bfgs </item>
+      <item> ml_e1_bhhh </item>
+      <item> ml_e1_cycle </item>
+      <item> ml_e1_dfp </item>
+      <item> ml_e2 </item>
+      <item> ml_e2_cycle </item>
+      <item> ml_ebfg0 </item>
+      <item> ml_ebfr0 </item>
+      <item> ml_ebfr1 </item>
+      <item> ml_ebh0q </item>
+      <item> ml_ebhh0 </item>
+      <item> ml_ebhr0 </item>
+      <item> ml_ebr0i </item>
+      <item> ml_ecr0i </item>
+      <item> ml_edfp0 </item>
+      <item> ml_edfr0 </item>
+      <item> ml_edfr1 </item>
+      <item> ml_edr0i </item>
+      <item> ml_eds </item>
+      <item> ml_eer0i </item>
+      <item> ml_egr0i </item>
+      <item> ml_elf </item>
+      <item> ml_elf_bfgs </item>
+      <item> ml_elf_bhhh </item>
+      <item> ml_elf_cycle </item>
+      <item> ml_elf_dfp </item>
+      <item> ml_elfi </item>
+      <item> ml_elfs </item>
+      <item> ml_enr0i </item>
+      <item> ml_enrr0 </item>
+      <item> ml_erdu0 </item>
+      <item> ml_erdu0_bfgs </item>
+      <item> ml_erdu0_bhhh </item>
+      <item> ml_erdu0_bhhhq </item>
+      <item> ml_erdu0_cycle </item>
+      <item> ml_erdu0_dfp </item>
+      <item> ml_erdu0_nrbfgs </item>
+      <item> ml_exde </item>
+      <item> ml_footnote </item>
+      <item> ml_geqnr </item>
+      <item> ml_grad0 </item>
+      <item> ml_graph </item>
+      <item> ml_hbhhh </item>
+      <item> ml_hd0 </item>
+      <item> ml_hold </item>
+      <item> ml_init </item>
+      <item> ml_inv </item>
+      <item> ml_log </item>
+      <item> ml_max </item>
+      <item> ml_mlout </item>
+      <item> ml_model </item>
+      <item> ml_nb0 </item>
+      <item> ml_opt </item>
+      <item> ml_p </item>
+      <item> ml_plot </item>
+      <item> ml_query </item>
+      <item> ml_rdgrd </item>
+      <item> ml_repor </item>
+      <item> ml_s_e </item>
+      <item> ml_score </item>
+      <item> ml_searc </item>
+      <item> ml_technique </item>
+      <item> ml_unhold </item>
+      <item> mlf_ </item>
+      <item> mlog </item>
+      <item> mlogi </item>
       <item> mlogit </item>
-      <item> more </item>
-      <item> move </item>
+      <item> mlogit_footnote </item>
+      <item> mlogit_p </item>
+      <item> mlopts </item>
+      <item> mnl0_ </item>
+      <item> mprobit </item>
+      <item> mprobit_lf </item>
+      <item> mprobit_p </item>
+      <item> mrdu0_ </item>
+      <item> mrdu1_ </item>
+      <item> mvdecode </item>
       <item> mvencode </item>
       <item> mvreg </item>
+      <item> mvreg_estat </item>
       <item> nbreg </item>
-      <item> net </item>
+      <item> nbreg_al </item>
+      <item> nbreg_lf </item>
+      <item> nbreg_p </item>
+      <item> nbreg_sw </item>
       <item> newey </item>
-      <item> news </item>
+      <item> newey_7 </item>
+      <item> newey_p </item>
       <item> nl </item>
+      <item> nl_7 </item>
+      <item> nl_p </item>
+      <item> nl_p_7 </item>
+      <item> nlcom </item>
+      <item> nlcom_p </item>
+      <item> nlexp2 </item>
+      <item> nlexp2_7 </item>
+      <item> nlexp2a </item>
+      <item> nlexp2a_7 </item>
+      <item> nlexp3 </item>
+      <item> nlexp3_7 </item>
+      <item> nlgom3 </item>
+      <item> nlgom3_7 </item>
+      <item> nlgom4 </item>
+      <item> nlgom4_7 </item>
+      <item> nlinit </item>
+      <item> nllog3 </item>
+      <item> nllog3_7 </item>
+      <item> nllog4 </item>
+      <item> nllog4_7 </item>
+      <item> nlog_rd </item>
       <item> nlogit </item>
-      <item> nobreak </item>
-      <item> nois </item>
-      <item> noisily </item>
+      <item> nlogit_p </item>
+      <item> nlogitgen </item>
+      <item> nlogittree </item>
+      <item> nlpred </item>
+      <item> note </item>
       <item> notes </item>
       <item> nptrend </item>
-      <item> numlist </item>
-      <item> obs </item>
-      <item> odbc </item>
+      <item> numlabel </item>
+      <item> old_ver </item>
+      <item> olo </item>
+      <item> olog </item>
+      <item> ologi </item>
+      <item> ologi_sw </item>
       <item> ologit </item>
-      <item> oneway </item>
+      <item> ologit_p </item>
+      <item> ologitp </item>
+      <item> op_colnm </item>
+      <item> op_comp </item>
+      <item> op_diff </item>
+      <item> op_inv </item>
+      <item> op_str </item>
+      <item> opr </item>
+      <item> opro </item>
+      <item> oprob </item>
+      <item> oprob_sw </item>
+      <item> oprobi </item>
+      <item> oprobi_p </item>
       <item> oprobit </item>
-      <item> order </item>
+      <item> oprobitp </item>
+      <item> opts_exclusive </item>
       <item> orthog </item>
-      <item> outfile </item>
-      <item> outsheet </item>
-      <item> parse </item>
+      <item> orthpoly </item>
+      <item> ovtest </item>
+
+      <item> pac </item>
+      <item> pac_7 </item>
+      <item> palette </item>
+      <item> parse_dissim </item>
+      <item> pause </item>
+      <item> pca </item>
+      <item> pca_8 </item>
+      <item> pca_display </item>
+      <item> pca_estat </item>
+      <item> pca_p </item>
+      <item> pca_rotate </item>
+      <item> pcamat </item>
+      <item> pchart </item>
+      <item> pchart_7 </item>
+      <item> pchi </item>
+      <item> pchi_7 </item>
       <item> pcorr </item>
-      <item> _pctile </item>
       <item> pctile </item>
+      <item> pentium </item>
       <item> pergram </item>
-      <item> pk </item>
+      <item> pergram_7 </item>
+      <item> permute </item>
+      <item> permute_8 </item>
+      <item> personal </item>
+      <item> peto_st </item>
       <item> pkcollapse </item>
       <item> pkcross </item>
       <item> pkequiv </item>
       <item> pkexamine </item>
+      <item> pkexamine_7 </item>
       <item> pkshape </item>
       <item> pksumm </item>
-      <item> plot </item>
+      <item> pksumm_7 </item>
+      <item> pnorm </item>
+      <item> pnorm_7 </item>
+      <item> poisgof </item>
+      <item> poiss_lf </item>
+      <item> poiss_sw </item>
+      <item> poisso_p </item>
       <item> poisson </item>
-      <item> post </item>
-      <item> postclose </item>
-      <item> postfile </item>
-      <item> postutil </item>
+      <item> poisson_estat </item>
       <item> pperron </item>
       <item> prais </item>
+      <item> prais_e </item>
+      <item> prais_e2 </item>
+      <item> prais_p </item>
       <item> predict </item>
-      <item> preserve </item>
+      <item> predictnl </item>
+      <item> print </item>
+      <item> prob </item>
+      <item> probi </item>
       <item> probit </item>
-      <item> program </item>
+      <item> probit_estat </item>
+      <item> probit_p </item>
+      <item> proc_time </item>
+      <item> procoverlay </item>
+      <item> procrustes </item>
+      <item> procrustes_estat </item>
+      <item> procrustes_p </item>
+      <item> profiler </item>
+      <item> prop </item>
+      <item> proportion </item>
       <item> prtest </item>
+      <item> prtesti </item>
       <item> pwcorr </item>
-      <item> qc </item>
+      <item> qby </item>
+      <item> qbys </item>
+      <item> qchi </item>
+      <item> qchi_7 </item>
+      <item> qladder </item>
+      <item> qladder_7 </item>
+      <item> qnorm </item>
+      <item> qnorm_7 </item>
+      <item> qqplot </item>
+      <item> qqplot_7 </item>
       <item> qreg </item>
+      <item> qreg_c </item>
+      <item> qreg_p </item>
+      <item> qreg_sw </item>
       <item> quadchk </item>
-      <item> query </item>
-      <item> qui </item>
-      <item> quietly </item>
-      <item> ranksum </item>
+      <item> quantile </item>
+      <item> quantile_7 </item>
       <item> range </item>
+      <item> ranksum </item>
+      <item> ratio </item>
+      <item> rchart </item>
+      <item> rchart_7 </item>
+      <item> rcof </item>
       <item> recast </item>
       <item> recode </item>
-      <item> reg3 </item>
-      <item> regdiag </item>
       <item> reg </item>
+      <item> reg3 </item>
+      <item> reg3_p </item>
+      <item> regdw </item>
+      <item> regr </item>
+      <item> regre </item>
+      <item> regre_p2 </item>
+      <item> regres </item>
+      <item> regres_p </item>
       <item> regress </item>
-      <item> rename </item>
-      <item> replace </item>
+      <item> regress_estat </item>
+      <item> regriv_p </item>
+      <item> remap </item>
+      <item> renpfix </item>
+      <item> repeat </item>
       <item> reshape </item>
-      <item> restore </item>
-      <item> return </item>
-      <item> roc </item>
+      <item> robvar </item>
+      <item> roccomp </item>
+      <item> roccomp_7 </item>
+      <item> roccomp_8 </item>
+      <item> rocf_lf </item>
+      <item> rocfit </item>
+      <item> rocfit_8 </item>
+      <item> rocgold </item>
       <item> rocplot </item>
+      <item> rocplot_7 </item>
+      <item> roctab </item>
+      <item> roctab_7 </item>
+      <item> rolling </item>
+      <item> rologit </item>
+      <item> rologit_p </item>
+      <item> rot </item>
+      <item> rota </item>
+      <item> rotat </item>
       <item> rotate </item>
+      <item> rotatemat </item>
       <item> rreg </item>
+      <item> rreg_p </item>
       <item> runtest </item>
-      <item> run </item>
+      <item> rvfplot </item>
+      <item> rvfplot_7 </item>
+      <item> rvpplot </item>
+      <item> rvpplot_7 </item>
+
+      <item> safesum </item>
       <item> sample </item>
       <item> sampsi </item>
-      <item> save </item>
+      <item> savedresults </item>
+      <item> saveold </item>
+      <item> sc </item>
       <item> scatter </item>
+      <item> scm_mine </item>
+      <item> sco </item>
+      <item> scob_lf </item>
+      <item> scob_p </item>
+      <item> scobi_sw </item>
       <item> scobit </item>
+      <item> scor </item>
       <item> score </item>
+      <item> scoreplot </item>
+      <item> scoreplot_help </item>
+      <item> scree </item>
+      <item> screeplot </item>
+      <item> screeplot_help </item>
       <item> sdtest </item>
-      <item> search </item>
+      <item> sdtesti </item>
       <item> separate </item>
+      <item> seperate </item>
       <item> serrbar </item>
-      <item> set </item>
-      <item> shell </item>
+      <item> serrbar_7 </item>
+      <item> set_defaults </item>
+      <item> sfrancia </item>
+      <item> shewhart </item>
+      <item> shewhart_7 </item>
       <item> signrank </item>
       <item> signtest </item>
       <item> simul </item>
+      <item> simul_7 </item>
+      <item> simulate </item>
+      <item> simulate_8 </item>
       <item> sktest </item>
+      <item> slogit </item>
+      <item> slogit_d2 </item>
+      <item> slogit_p </item>
       <item> smooth </item>
       <item> snapspan </item>
-      <item> sort </item>
       <item> spearman </item>
       <item> spikeplot </item>
-      <item> sreturn </item>
+      <item> spikeplot_7 </item>
+      <item> spikeplt </item>
+      <item> spline_x </item>
+      <item> split </item>
+      <item> sqreg </item>
+      <item> sqreg_p </item>
+      <item> ssc </item>
       <item> st </item>
+      <item> st_ct </item>
+      <item> st_hc </item>
+      <item> st_hcd </item>
+      <item> st_hcd_sh </item>
+      <item> st_is </item>
+      <item> st_issys </item>
+      <item> st_note </item>
+      <item> st_promo </item>
+      <item> st_set </item>
+      <item> st_show </item>
+      <item> st_smpl </item>
+      <item> st_subid </item>
       <item> stack </item>
       <item> statsby </item>
-      <item> stb </item>
+      <item> statsby_8 </item>
       <item> stbase </item>
       <item> stci </item>
+      <item> stci_7 </item>
       <item> stcox </item>
+      <item> stcox_estat </item>
+      <item> stcox_fr </item>
+      <item> stcox_fr_ll </item>
+      <item> stcox_p </item>
+      <item> stcox_sw </item>
+      <item> stcoxkm </item>
+      <item> stcoxkm_7 </item>
+      <item> stcstat </item>
+      <item> stcurv </item>
+      <item> stcurve </item>
+      <item> stcurve_7 </item>
       <item> stdes </item>
       <item> stem </item>
+      <item> stepwise </item>
+      <item> stereg </item>
       <item> stfill </item>
       <item> stgen </item>
       <item> stir </item>
+      <item> stjoin </item>
+      <item> stmc </item>
+      <item> stmh </item>
       <item> stphplot </item>
+      <item> stphplot_7 </item>
+      <item> stphtest </item>
+      <item> stphtest_7 </item>
       <item> stptime </item>
       <item> strate </item>
+      <item> strate_7 </item>
       <item> streg </item>
+      <item> streg_sw </item>
+      <item> streset </item>
       <item> sts </item>
+      <item> sts_7 </item>
       <item> stset </item>
       <item> stsplit </item>
       <item> stsum </item>
       <item> sttocc </item>
       <item> sttoct </item>
       <item> stvary </item>
-      <item> sum </item>
-      <item> summarize </item>
+      <item> stweib </item>
+      <item> suest </item>
+      <item> suest_8 </item>
+      <item> sunflower </item>
       <item> sureg </item>
+      <item> survcurv </item>
+      <item> survsum </item>
+      <item> svar </item>
+      <item> svar_p </item>
+      <item> svmat </item>
       <item> svy </item>
+      <item> svy_disp </item>
+      <item> svy_dreg </item>
+      <item> svy_est </item>
+      <item> svy_est_7 </item>
+      <item> svy_estat </item>
+      <item> svy_get </item>
+      <item> svy_gnbreg_p </item>
+      <item> svy_head </item>
+      <item> svy_header </item>
+      <item> svy_heckman_p </item>
+      <item> svy_heckprob_p </item>
+      <item> svy_intreg_p </item>
+      <item> svy_ivreg_p </item>
+      <item> svy_logistic_p </item>
+      <item> svy_logit_p </item>
+      <item> svy_mlogit_p </item>
+      <item> svy_nbreg_p </item>
+      <item> svy_ologit_p </item>
+      <item> svy_oprobit_p </item>
+      <item> svy_poisson_p </item>
+      <item> svy_probit_p </item>
+      <item> svy_regress_p </item>
+      <item> svy_sub </item>
+      <item> svy_sub_7 </item>
+      <item> svy_x </item>
+      <item> svy_x_7 </item>
+      <item> svy_x_p </item>
       <item> svydes </item>
+      <item> svydes_8 </item>
+      <item> svygen </item>
+      <item> svygnbreg </item>
+      <item> svyheckman </item>
+      <item> svyheckprob </item>
+      <item> svyintreg </item>
+      <item> svyintreg_7 </item>
+      <item> svyintrg </item>
+      <item> svyivreg </item>
       <item> svylc </item>
+      <item> svylog_p </item>
+      <item> svylogit </item>
+      <item> svymarkout </item>
+      <item> svymarkout_8 </item>
       <item> svymean </item>
+      <item> svymlog </item>
+      <item> svymlogit </item>
+      <item> svynbreg </item>
+      <item> svyolog </item>
+      <item> svyologit </item>
+      <item> svyoprob </item>
+      <item> svyoprobit </item>
+      <item> svyopts </item>
+      <item> svypois </item>
+      <item> svypois_7 </item>
+      <item> svypoisson </item>
+      <item> svyprobit </item>
+      <item> svyprobt </item>
+      <item> svyprop </item>
+      <item> svyprop_7 </item>
+      <item> svyratio </item>
+      <item> svyreg </item>
+      <item> svyreg_p </item>
+      <item> svyregress </item>
       <item> svyset </item>
+      <item> svyset_7 </item>
+      <item> svyset_8 </item>
       <item> svytab </item>
+      <item> svytab_7 </item>
       <item> svytest </item>
+      <item> svytotal </item>
       <item> sw </item>
+      <item> sw_8 </item>
+      <item> swcnreg </item>
+      <item> swcox </item>
+      <item> swereg </item>
       <item> swilk </item>
+      <item> swlogis </item>
+      <item> swlogit </item>
+      <item> swologit </item>
+      <item> swoprbt </item>
+      <item> swpois </item>
+      <item> swprobit </item>
+      <item> swqreg </item>
+      <item> swtobit </item>
+      <item> swweib </item>
       <item> symmetry </item>
-      <item> syntax </item>
-      <item> tab </item>
+      <item> symmi </item>
+      <item> symplot </item>
+      <item> symplot_7 </item>
+      <item> sysdescribe </item>
+      <item> sysuse </item>
+      <item> szroeter </item>
+      <item> tab_or </item>
+      <item> tab1 </item>
+      <item> tab2 </item>
+      <item> tabi </item>
       <item> table </item>
-      <item> tabdisp </item>
+      <item> tabodds </item>
+      <item> tabodds_7 </item>
       <item> tabstat </item>
-      <item> tabsum </item>
-      <item> tabulate </item>
-      <item> tempname </item>
-      <item> tempvar </item>
-      <item> tempfile </item>
+      <item> te </item>
+      <item> tes </item>
       <item> test </item>
       <item> testnl </item>
+      <item> testparm </item>
+      <item> teststd </item>
+      <item> tetrachoric </item>
+      <item> time_it </item>
+      <item> tis </item>
+      <item> tob </item>
+      <item> tobi </item>
       <item> tobit </item>
-      <item> tokenize </item>
-      <item> translate </item>
-      <item> translator </item>
-      <item> transmap </item>
+      <item> tobit_p </item>
+      <item> tobit_sw </item>
+      <item> tostring </item>
+      <item> total </item>
+      <item> treat_ll </item>
+      <item> treatr_p </item>
       <item> treatreg </item>
+      <item> trim </item>
+      <item> trnb_cons </item>
+      <item> trnb_mean </item>
+      <item> trpoiss_d2 </item>
+      <item> trunc_ll </item>
+      <item> truncr_p </item>
       <item> truncreg </item>
+      <item> tsappend </item>
+      <item> tset </item>
+      <item> tsfill </item>
+      <item> tsline </item>
+      <item> tsline_ex </item>
       <item> tsreport </item>
-      <item> tsrevar </item>
+      <item> tsrline </item>
       <item> tsset </item>
+      <item> tssmooth </item>
+      <item> tsunab </item>
       <item> ttest </item>
-      <item> tutorials </item>
+      <item> ttesti </item>
+      <item> tut_chk </item>
+      <item> tut_wait </item>
+      <item> tutorial </item>
+      <item> tw </item>
+      <item> tware_st </item>
+      <item> two </item>
       <item> twoway </item>
-      <item> type </item>
-      <item> unabcmd </item>
-      <item> unabbr </item>
-      <item> update </item>
-      <item> use </item>
-      <item> using </item>
-      <item> version </item>
+      <item> twoway__fpfit_serset </item>
+      <item> twoway__function_gen </item>
+      <item> twoway__histogram_gen </item>
+      <item> twoway__ipoint_serset </item>
+      <item> twoway__ipoints_serset </item>
+      <item> twoway__kdensity_gen </item>
+      <item> twoway__lfit_serset </item>
+      <item> twoway__normgen_gen </item>
+      <item> twoway__pci_serset </item>
+      <item> twoway__qfit_serset </item>
+      <item> twoway__scatteri_serset </item>
+      <item> twoway__sunflower_gen </item>
+      <item> twoway_ksm_serset </item>
+      <item> typeof </item>
+      <item> unab </item>
+      <item> unabbrev </item>
+      <item> uselabel </item>
+
+      <item> var </item>
+      <item> var_mkcompanion </item>
+      <item> var_p </item>
+      <item> varbasic </item>
+      <item> varfcast </item>
+      <item> vargranger </item>
+      <item> varirf </item>
+      <item> varirf_add </item>
+      <item> varirf_cgraph </item>
+      <item> varirf_create </item>
+      <item> varirf_ctable </item>
+      <item> varirf_describe </item>
+      <item> varirf_dir </item>
+      <item> varirf_drop </item>
+      <item> varirf_erase </item>
+      <item> varirf_graph </item>
+      <item> varirf_ograph </item>
+      <item> varirf_rename </item>
+      <item> varirf_set </item>
+      <item> varirf_table </item>
+      <item> varlmar </item>
+      <item> varnorm </item>
+      <item> varsoc </item>
+      <item> varstable </item>
+      <item> varstable_w </item>
+      <item> varstable_w2 </item>
+      <item> varwle </item>
       <item> vce </item>
-      <item> view </item>
+      <item> vec </item>
+      <item> vec_fevd </item>
+      <item> vec_mkphi </item>
+      <item> vec_p </item>
+      <item> vec_p_w </item>
+      <item> vecirf_create </item>
+      <item> veclmar </item>
+      <item> veclmar_w </item>
+      <item> vecnorm </item>
+      <item> vecnorm_w </item>
+      <item> vecrank </item>
+      <item> vecstable </item>
+      <item> verinst </item>
+      <item> viewsource </item>
+      <item> vif </item>
       <item> vwls </item>
+      <item> wdatetof </item>
+      <item> webdescribe </item>
+      <item> webseek </item>
+      <item> webuse </item>
+      <item> weib_lf </item>
+      <item> weib_lf0 </item>
+      <item> weib1_lf </item>
+      <item> weib2_lf </item>
+      <item> weibhet_glf </item>
+      <item> weibhet_glf_sh </item>
+      <item> weibhet_glfa </item>
+      <item> weibhet_glfa_sh </item>
+      <item> weibhet_gp </item>
+      <item> weibhet_ilf </item>
+      <item> weibhet_ilf_sh </item>
+      <item> weibhet_ilfa </item>
+      <item> weibhet_ilfa_sh </item>
+      <item> weibhet_ip </item>
+      <item> weibu_sw </item>
+      <item> weibul_p </item>
       <item> weibull </item>
+      <item> weibull_c </item>
+      <item> weibull_s </item>
+      <item> weibullhet </item>
       <item> whelp </item>
-      <item> while </item>
-      <item> which </item>
+      <item> wilc_st </item>
+      <item> wilcoxon </item>
       <item> wntestb </item>
+      <item> wntestb_7 </item>
       <item> wntestq </item>
+      <item> xchart </item>
+      <item> xchart_7 </item>
       <item> xcorr </item>
+      <item> xcorr_7 </item>
       <item> xi </item>
+      <item> xi_6 </item>
       <item> xpose </item>
-      <item> xt </item>
+      <item> xt_iis </item>
+      <item> xt_tis </item>
+      <item> xtab_p </item>
       <item> xtabond </item>
+      <item> xtbin_p </item>
       <item> xtclog </item>
+      <item> xtcloglog </item>
+      <item> xtcloglog_8 </item>
+      <item> xtcloglog_d2 </item>
+      <item> xtcloglog_re_p </item>
+      <item> xtcnt_p </item>
+      <item> xtcorr </item>
       <item> xtdata </item>
       <item> xtdes </item>
+      <item> xtfront_p </item>
+      <item> xtfrontier </item>
       <item> xtgee </item>
+      <item> xtgee_elink </item>
+      <item> xtgee_estat </item>
+      <item> xtgee_makeivar </item>
+      <item> xtgee_p </item>
+      <item> xtgee_plink </item>
       <item> xtgls </item>
-      <item> xtintreg </item>
+      <item> xtgls_p </item>
+      <item> xthaus </item>
+      <item> xthausman </item>
+      <item> xtht_p </item>
+      <item> xthtaylor </item>
       <item> xtile </item>
+      <item> xtint_p </item>
+      <item> xtintreg </item>
+      <item> xtintreg_8 </item>
+      <item> xtintreg_d2 </item>
+      <item> xtintreg_p </item>
+      <item> xtivp_1 </item>
+      <item> xtivp_2 </item>
       <item> xtivreg </item>
+      <item> xtline </item>
+      <item> xtline_ex </item>
       <item> xtlogit </item>
+      <item> xtlogit_8 </item>
+      <item> xtlogit_d2 </item>
+      <item> xtlogit_fe_p </item>
+      <item> xtlogit_pa_p </item>
+      <item> xtlogit_re_p </item>
+      <item> xtmixed </item>
+      <item> xtmixed_estat </item>
+      <item> xtmixed_p </item>
+      <item> xtnb_fe </item>
+      <item> xtnb_lf </item>
       <item> xtnbreg </item>
+      <item> xtnbreg_pa_p </item>
+      <item> xtnbreg_refe_p </item>
       <item> xtpcse </item>
+      <item> xtpcse_p </item>
       <item> xtpois </item>
+      <item> xtpoisson </item>
+      <item> xtpoisson_d2 </item>
+      <item> xtpoisson_pa_p </item>
+      <item> xtpoisson_refe_p </item>
+      <item> xtpred </item>
       <item> xtprobit </item>
+      <item> xtprobit_8 </item>
+      <item> xtprobit_d2 </item>
+      <item> xtprobit_re_p </item>
+      <item> xtps_fe </item>
+      <item> xtps_lf </item>
+      <item> xtps_ren </item>
+      <item> xtps_ren_8 </item>
+      <item> xtrar_p </item>
+      <item> xtrc </item>
+      <item> xtrc_p </item>
       <item> xtrchh </item>
+      <item> xtrefe_p </item>
       <item> xtreg </item>
+      <item> xtreg_be </item>
+      <item> xtreg_fe </item>
+      <item> xtreg_ml </item>
+      <item> xtreg_pa_p </item>
+      <item> xtreg_re </item>
       <item> xtregar </item>
+      <item> xtrere_p </item>
+      <item> xtsf_ll </item>
+      <item> xtsf_llti </item>
       <item> xtsum </item>
       <item> xttab </item>
+      <item> xttest0 </item>
       <item> xttobit </item>
+      <item> xttobit_8 </item>
+      <item> xttobit_p </item>
+      <item> xttrans </item>
+      <item> yx </item>
+      <item> yxview__barlike_draw </item>
+      <item> yxview_area_draw </item>
+      <item> yxview_bar_draw </item>
+      <item> yxview_dot_draw </item>
+      <item> yxview_dropline_draw </item>
+      <item> yxview_function_draw </item>
+      <item> yxview_iarrow_draw </item>
+      <item> yxview_ilabels_draw </item>
+      <item> yxview_normal_draw </item>
+      <item> yxview_pcarrow_draw </item>
+      <item> yxview_pcbarrow_draw </item>
+      <item> yxview_pccapsym_draw </item>
+      <item> yxview_pcscatter_draw </item>
+      <item> yxview_pcspike_draw </item>
+      <item> yxview_rarea_draw </item>
+      <item> yxview_rbar_draw </item>
+      <item> yxview_rbarm_draw </item>
+      <item> yxview_rcap_draw </item>
+      <item> yxview_rcapsym_draw </item>
+      <item> yxview_rconnected_draw </item>
+      <item> yxview_rline_draw </item>
+      <item> yxview_rscatter_draw </item>
+      <item> yxview_rspike_draw </item>
+      <item> yxview_spike_draw </item>
+      <item> yxview_sunflower_draw </item>
+      <item> zap_s </item>
+      <item> zinb </item>
+      <item> zinb_llf </item>
+      <item> zinb_plf </item>
       <item> zip </item>
+      <item> zip_llf </item>
+      <item> zip_p </item>
+      <item> zip_plf </item>
+      <item> zt_ct_5 </item>
+      <item> zt_hc_5 </item>
+      <item> zt_hcd_5 </item>
+      <item> zt_is_5 </item>
+      <item> zt_iss_5 </item>
+      <item> zt_sho_5 </item>
+      <item> zt_smp_5 </item>
+      <item> ztbase_5 </item>
+      <item> ztcox_5 </item>
+      <item> ztdes_5 </item>
+      <item> ztereg_5 </item>
+      <item> ztfill_5 </item>
+      <item> ztgen_5 </item>
+      <item> ztir_5 </item>
+      <item> ztjoin_5 </item>
+      <item> ztnb </item>
+      <item> ztnb_p </item>
+      <item> ztp </item>
+      <item> ztp_p </item>
+      <item> zts_5 </item>
+      <item> ztset_5 </item>
+      <item> ztspli_5 </item>
+      <item> ztsum_5 </item>
+      <item> zttoct_5 </item>
+      <item> ztvary_5 </item>
+      <item> ztweib_5 </item>
     </list>
-    <list name="types">
-      <item> char </item>
+
+    <list name="Mata">
+      <item> _cholinv </item>
+      <item> _cholsolve </item>
+      <item> _corr </item>
+      <item> _edittoint </item>
+      <item> _edittointtol </item>
+      <item> _edittozero </item>
+      <item> _edittozerotol </item>
+      <item> _eigen_work </item>
+      <item> _eigensystem </item>
+      <item> _eigenvalues </item>
+      <item> _equilc </item>
+      <item> _equilr </item>
+      <item> _equilrc </item>
+      <item> _ftell </item>
+      <item> _fullsvd </item>
+      <item> _hqrd </item>
+      <item> _hqrdp </item>
+      <item> _invlower </item>
+      <item> _jumble </item>
+      <item> _lefteigensystem </item>
+      <item> _lowertriangle </item>
+      <item> _lud </item>
+      <item> _lud_la </item>
+      <item> _luinv </item>
+      <item> _lusolve </item>
+      <item> _matexpsym </item>
+      <item> _matlogsym </item>
+      <item> _matpowersym </item>
+      <item> _mprobit_outer_prod </item>
+      <item> _mprobit_quadrature </item>
+      <item> _mprobit_quadrature_eval </item>
+      <item> _mprobit_quadrature_m </item>
+      <item> _mprobit_select </item>
+      <item> _mprobit_simulator </item>
+      <item> _mprobit_simulator_case_g </item>
+      <item> _mprobit_simulator_lk </item>
+      <item> _mprobit_simulator_m </item>
+      <item> _mprobit_simulator_mi </item>
+      <item> _mprobit_validate_choice </item>
+      <item> _mprobit_weights_roots_laguerre </item>
+      <item> _perhapsequilc </item>
+      <item> _perhapsequilr </item>
+      <item> _perhapsequilrc </item>
+      <item> _pinv </item>
+      <item> _qrinv </item>
+      <item> _qrsolve </item>
+      <item> _rowswap </item>
+      <item> _solvelower </item>
+      <item> _solveupper </item>
+      <item> _sort </item>
+      <item> _svd </item>
+      <item> _svdsv </item>
+      <item> _svsolve </item>
+      <item> _svy_design </item>
+      <item> _svy_group_sum </item>
+      <item> _svy_identify </item>
+      <item> _svy_mean </item>
+      <item> _svy_mean_post </item>
+      <item> _svy_mean_std </item>
+      <item> _svy_mean_stdpost </item>
+      <item> _svy_over_expand </item>
+      <item> _svy_over_sizes </item>
+      <item> _svy_post_sizes </item>
+      <item> _svy_ratio </item>
+      <item> _svy_ratio_post </item>
+      <item> _svy_ratio_std </item>
+      <item> _svy_ratio_stdpost </item>
+      <item> _svy_srs_variance </item>
+      <item> _svy_srssub_variance </item>
+      <item> _svy_std_sizes </item>
+      <item> _svy_total </item>
+      <item> _svy_total_post </item>
+      <item> _svy_variance </item>
+      <item> _symeigen_work </item>
+      <item> _symeigensystem </item>
+      <item> _symeigenvalues </item>
+      <item> _symmatfunc_work </item>
+      <item> _uppertriangle </item>
+      <item> _xtm_beta </item>
+      <item> _xtm_blup </item>
+      <item> _xtm_blup_save </item>
+      <item> _xtm_blup_save_u </item>
+      <item> _xtm_blup_u </item>
+      <item> _xtm_cleanup </item>
+      <item> _xtm_covtype </item>
+      <item> _xtm_de_th_u </item>
+      <item> _xtm_delta_to_theta </item>
+      <item> _xtm_det_upper </item>
+      <item> _xtm_em_get_rij </item>
+      <item> _xtm_em_get_uij </item>
+      <item> _xtm_em_iter </item>
+      <item> _xtm_em_iter_u </item>
+      <item> _xtm_em_solve </item>
+      <item> _xtm_fact_expand </item>
+      <item> _xtm_ga_th_u </item>
+      <item> _xtm_gamma_to_theta </item>
+      <item> _xtm_get_delta </item>
+      <item> _xtm_get_delta_u </item>
+      <item> _xtm_invert_R </item>
+      <item> _xtm_logdetr00 </item>
+      <item> _xtm_logdetr00_u </item>
+      <item> _xtm_matexp </item>
+      <item> _xtm_matlog </item>
+      <item> _xtm_mixed_ll </item>
+      <item> _xtm_mixed_ll_u </item>
+      <item> _xtm_mixed_ll_uu </item>
+      <item> _xtm_mk_eqs </item>
+      <item> _xtm_ml_eqlist </item>
+      <item> _xtm_ml_eqlist_wrk </item>
+      <item> _xtm_setup </item>
+      <item> _xtm_start </item>
+      <item> _xtm_start_collapse </item>
+      <item> _xtm_start_u </item>
+      <item> _xtm_th_de_u </item>
+      <item> _xtm_th_ga_u </item>
+      <item> _xtm_theta_to_delta </item>
+      <item> _xtm_theta_to_gamma </item>
+      <item> acos </item>
+      <item> acosh </item>
+      <item> aggregate </item>
+      <item> array </item>
+      <item> asin </item>
+      <item> asinh </item>
+      <item> assert </item>
+      <item> asserteq </item>
+      <item> atan </item>
+      <item> atanh </item>
+      <item> blockdiag </item>
+      <item> boolean </item>
+      <item> break </item>
+      <item> byte </item>
+      <item> case </item>
+      <item> cat </item>
+      <item> catch </item>
+      <item> chdir </item>
+      <item> cholesky </item>
+      <item> cholinv </item>
+      <item> cholsolve </item>
+      <item> class </item>
+      <item> cloglog </item>
+      <item> collate </item>
+      <item> colmax </item>
+      <item> colmin </item>
+      <item> colscalefactors </item>
+      <item> colshape </item>
+      <item> colvector </item>
+      <item> complex </item>
+      <item> cond </item>
+      <item> const </item>
+      <item> continue </item>
+      <item> convolve </item>
+      <item> convolveslowly </item>
+      <item> Corr </item>
+      <item> correlation </item>
+      <item> Corrslowly </item>
+      <item> corruppercase </item>
+      <item> cosh </item>
+      <item> deconvolve </item>
+      <item> default </item>
+      <item> delegate </item>
+      <item> delete </item>
+      <item> designmatrix </item>
+      <item> det </item>
+      <item> dettriangular </item>
+      <item> diag </item>
+      <item> diag0cnt </item>
+      <item> do </item>
       <item> double </item>
-      <item> error </item>
-      <item> text </item>
-      <item> result </item>
+      <item> dsign </item>
+      <item> e </item>
+      <item> editmissing </item>
+      <item> edittoint </item>
+      <item> edittointtol </item>
+      <item> edittozero </item>
+      <item> edittozerotol </item>
+      <item> editvalue </item>
+      <item> eigensystem </item>
+      <item> eigenvalues </item>
+      <item> else </item>
+      <item> eltypedef </item>
+      <item> end </item>
+      <item> enum </item>
+      <item> explicit </item>
+      <item> export </item>
+      <item> external </item>
+      <item> fft </item>
+      <item> fileexists </item>
+      <item> findfile </item>
       <item> float </item>
+      <item> for </item>
+      <item> friend </item>
+      <item> ftell </item>
+      <item> ftfreqs </item>
+      <item> ftpad </item>
+      <item> ftperiodogram </item>
+      <item> ftretime </item>
+      <item> ftunwrap </item>
+      <item> ftwrap </item>
+      <item> fullsdiag </item>
+      <item> fullsvd </item>
+      <item> function </item>
+      <item> gamma </item>
+      <item> global </item>
+      <item> goto </item>
+      <item> helloworld </item>
+      <item> Hilbert </item>
+      <item> hqrd </item>
+      <item> hqrdmultq </item>
+      <item> hqrdmultq1t </item>
+      <item> hqrdp </item>
+      <item> hqrdq </item>
+      <item> hqrdq1 </item>
+      <item> hqrdr </item>
+      <item> hqrdr1 </item>
+      <item> if </item>
+      <item> inline </item>
       <item> int </item>
-      <item> long </item>
+      <item> invcloglog </item>
+      <item> invfft </item>
+      <item> invHilbert </item>
+      <item> invlogit </item>
+      <item> invlower </item>
+      <item> invorder </item>
+      <item> invslowfft </item>
+      <item> invslowft </item>
+      <item> invvech </item>
+      <item> isdiagonal </item>
+      <item> jumble </item>
+      <item> lefteigensystem </item>
       <item> local </item>
-      <item> global </item>
-      <item> macro </item>
-      <item> mat </item>
+      <item> log10 </item>
+      <item> logit </item>
+      <item> long </item>
+      <item> lowertriangle </item>
+      <item> lud </item>
+      <item> luinv </item>
+      <item> lusolve </item>
+      <item> makesymmetric </item>
+      <item> mat_norm </item>
+      <item> mata </item>
+      <item> matexpsym </item>
+      <item> matlogsym </item>
+      <item> matpowersym </item>
       <item> matrix </item>
+      <item> max </item>
+      <item> mean </item>
+      <item> meanvariance </item>
+      <item> min </item>
+      <item> mkdir </item>
+      <item> mmat_ </item>
+      <item> mmat_describe </item>
+      <item> mmat_expandlist </item>
+      <item> mmat_readerror </item>
+      <item> mmat_save </item>
+      <item> mmat_use </item>
+      <item> mmat_writeerror </item>
+      <item> namespace </item>
+      <item> new </item>
+      <item> norm </item>
+      <item> NULL </item>
+      <item> numeric </item>
+      <item> operator </item>
+      <item> orgtypedef </item>
+      <item> panelsetup </item>
+      <item> panelsetup_u </item>
+      <item> panelstats </item>
+      <item> panelsubmatrix </item>
+      <item> panelsubview </item>
+      <item> pathlist </item>
+      <item> pathsubsysdir </item>
+      <item> pi </item>
+      <item> pinv </item>
+      <item> pointer </item>
+      <item> polyadd </item>
+      <item> polyadd_expand </item>
+      <item> polyderiv </item>
+      <item> polydiv </item>
+      <item> polyeval </item>
+      <item> polyinteg </item>
+      <item> polymorphic </item>
+      <item> polymult </item>
+      <item> polyroots </item>
+      <item> polysolve </item>
+      <item> polytrim </item>
+      <item> pragma </item>
+      <item> private </item>
+      <item> protected </item>
+      <item> public </item>
+      <item> qrd </item>
+      <item> qrdp </item>
+      <item> qrinv </item>
+      <item> qrsolve </item>
+      <item> quad </item>
+      <item> quadcorrelation </item>
+      <item> quadmeanvariance </item>
+      <item> quadrant </item>
+      <item> quadvariance </item>
+      <item> range </item>
+      <item> rangen </item>
+      <item> rank </item>
+      <item> rank_from_singular_values </item>
+      <item> real </item>
+      <item> return </item>
+      <item> revorder </item>
+      <item> rmdir </item>
+      <item> rowmax </item>
+      <item> rowmin </item>
+      <item> rowscalefactors </item>
+      <item> rowvector </item>
       <item> scalar </item>
-      <item> variable </item>
-      <item> var </item>
-      <item> varlist </item>
-      <item> varname </item>
+      <item> scalar_norm </item>
+      <item> short </item>
+      <item> sign </item>
+      <item> signed </item>
+      <item> sinh </item>
+      <item> sizeof </item>
+      <item> slowfft </item>
+      <item> slowft </item>
+      <item> solve_tol </item>
+      <item> solve_tolscale </item>
+      <item> solvelower </item>
+      <item> solveupper </item>
+      <item> sort </item>
+      <item> spline3 </item>
+      <item> spline3eval </item>
+      <item> splineeval </item>
+      <item> st_islmname </item>
+      <item> static </item>
+      <item> string </item>
+      <item> struct </item>
+      <item> super </item>
+      <item> svd </item>
+      <item> svdsv </item>
+      <item> svsolve </item>
+      <item> switch </item>
+      <item> symeigensystem </item>
+      <item> symeigenvalues </item>
+      <item> tanh </item>
+      <item> template </item>
+      <item> this </item>
+      <item> throw </item>
+      <item> Toeplitz </item>
+      <item> trace </item>
+      <item> trace_prod </item>
+      <item> transmorphic </item>
+      <item> transposeonly </item>
+      <item> try </item>
+      <item> typedef </item>
+      <item> typename </item>
+      <item> union </item>
+      <item> uniqrows </item>
+      <item> unitcircle </item>
+      <item> unorder </item>
+      <item> unsigned </item>
+      <item> uppertriangle </item>
+      <item> using </item>
+      <item> Vandermonde </item>
+      <item> variance </item>
+      <item> vec </item>
+      <item> vec_norm </item>
+      <item> vech </item>
+      <item> vector </item>
+      <item> version </item>
+      <item> virtual </item>
+      <item> void </item>
+      <item> volatile </item>
+      <item> while </item>
     </list>
-      
+
     <contexts>
-    
-      <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
-        <keyword attribute="Keyword" context="#stay" String="keywords" />
-        <keyword attribute="Data Type" context="#stay" String="types" />
-        <DetectChar attribute="String" context="string" char="&quot;"/>
-        <RangeDetect char = "`" char1 = "'" attribute = "Macro" context="#stay"/>
-        <Detect2Chars attribute="Comment" context="Comment 1" char="/" char1="/"/>
-        <Detect2Chars attribute="Comment" context="Comment 2" char="/" char1="*" beginRegion="Comment"/>
-        <DetectChar attribute="Normal Text" context="#stay" char="{" beginRegion="block"/>
-        <DetectChar attribute="Normal Text" context="#stay" char="}" endRegion="block"/>
+
+      <context        attribute="Normal Text"   lineEndContext="#stay" name="Normal Text">
+
+        <keyword      attribute="Keyword"       context="#stay" String="proc-options" />
+        <keyword      attribute="Keyword"       context="#stay" String="Internal-Stata-commands" />
+        <keyword      attribute="Keyword"       context="#stay" String="procedures" />
+
+        <keyword      attribute="Graphics"      context="#stay" String="graphics-options" />
+        <keyword      attribute="Graphics"      context="#stay" String="Stata-colors" />
+
+        <keyword      attribute="Functions"     context="#stay" String="math-functions" />
+        <keyword      attribute="Functions"     context="#stay" String="probability-functions" />
+        <keyword      attribute="Functions"     context="#stay" String="string-functions" />
+        <keyword      attribute="Functions"     context="#stay" String="programming-functions" />
+        <keyword      attribute="Functions"     context="#stay" String="date-functions" />
+        <keyword      attribute="Functions"     context="#stay" String="timeseries-functions" />
+        <keyword      attribute="Functions"     context="#stay" String="matrix-functions" />
+        <keyword      attribute="Functions"     context="#stay" String="egen-functions" />
+
+        <keyword      attribute="Mata"          context="#stay" String="Mata" />
+
+        <keyword      attribute="Constants"     context="#stay" String="constants" />
+        <keyword      attribute="SystemParams"  context="#stay" String="System-parameters" />
+
+        <keyword      attribute="Macro"         context="#stay" String="macro-extended-functions" />
+        <RegExpr      attribute="GlobalMacro"   context="#stay" String="\$[A-Za-z0-9_?{}!]+" />
+
+        <keyword      attribute="DataType"      context="#stay" String="types" />
+
+        <DetectChar   attribute="String"        context="string" char="&quot;"/>
+        <Detect2Chars attribute="String2"       context="#stay" char="`" char1='"'/>
+
+        <RangeDetect  attribute="Macro"         context="#stay" char= "`" char1= "'" />
+
+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
+
+        <DetectChar   attribute="Normal Text"   context="#stay" char="{" beginRegion="block"/>
+        <DetectChar   attribute="Normal Text"   context="#stay" char="}" endRegion="block"/>
+
+        <StringDetect attribute="Normal Text"   context="#stay" String="program define" beginRegion="block"/>
+        <StringDetect attribute="Normal Text"   context="#stay" String="end" endRegion="block"/>
+
+      </context>
+
+      <context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
+        <IncludeRules context="##Alerts" />
+      </context>
+
+      <context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
+        <IncludeRules context="##Alerts" />
       </context>
 
-      <context attribute="Comment" lineEndContext="#pop" name="Comment 1"/>
-      
       <context attribute="Comment" lineEndContext="#stay" name="Comment 2">
         <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
       </context>
-      
-      <context attribute="String" lineEndContext="#pop" name="string">
+
+      <context attribute="String" lineEndContext="#stay" name="string">
         <HlCStringChar attribute="String Char" context="#stay"/>
         <DetectChar attribute="String" context="#pop" char="&quot;"/>
       </context>
-      
+
+      <context name = "Base" attribute = "Normal Text" lineEndContext = "#stay">
+        <RegExpr String = "\$[A-Za-z0-9_?{}!]+" attribute = "GlobalMacro" context = "#stay"/>
+      </context>
+
     </contexts>
-    
+
     <itemDatas>
-      <itemData name="Normal Text" defStyleNum="dsNormal"/>
-      <itemData name="Keyword" defStyleNum="dsKeyword"/>
-      <itemData name="String" defStyleNum="dsString"/>
-      <itemData name="Macro" defStyleNum="dsOthers"/>
-      <itemData name="Data Type" defStyleNum="dsDataType"/>
-      <itemData name="Comment" defStyleNum="dsComment"/>
+
+      <itemData name="Normal Text"    defStyleNum="dsNormal"/>
+      <itemData name="Keyword"        defStyleNum="dsKeyword"/>
+      <itemData name="Graphics"       defStyleNum="dsBaseN" />
+      <itemData name="Functions"      defStyleNum="dsFunction" />
+      <itemData name="Mata"           defStyleNum="dsKeyword" />
+      <itemData name="Constants"      defStyleNum="dsDataType" />
+      <itemData name="System Params"  defStyleNum="dsDecVal" />
+
+      <itemData name="String"         defStyleNum="dsString"/>
+      <itemData name="String Char"    defStyleNum="dsChar"/>
+
+      <itemData name="Macro"          defStyleNum="dsOthers"/>
+      <itemData name="GlobalMacro"    defStyleNum="dsOthers"/>
+
+      <itemData name="Data Type"      defStyleNum="dsDataType"/>
+      <itemData name="Comment"        defStyleNum="dsComment"/>
+
     </itemDatas>
-    
+
   </highlighting>
+
   <general>
     <comments>
       <comment name="singleLine" start="//" />
@@ -474,5 +3227,5 @@
     </comments>
     <keywords casesensitive="1" />
   </general>
+
 </language>
-<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/data/systemverilog.xml b/kate/data/systemverilog.xml
new file mode 100644
index 000000000..a13d3fc19
--- /dev/null
+++ b/kate/data/systemverilog.xml
@@ -0,0 +1,1028 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************************-->
+<!-- $Id: systemverilog.xml 10 2009-06-25 03:41:39Z seanoboyle $            -->
+<!--***********************************************************************-->
+<!--  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 3 of the License, or    -->
+<!--  (at your option) 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, see <http://www.gnu.org/licenses/>.-->
+<!--                                                                       -->
+<!--***********************************************************************-->
+<!-- Title:        SystemVerilog Language Keywords File for Kate Editor    -->
+<!-- Description:  This file contains the SV keywords defined in the       -->
+<!--               IEEE1800-2009 Draft Standard in the format expected by  -->
+<!--               the Kate Editor.                                        -->
+<!--                                                                       -->
+<!-- Original Author: Sean O'Boyle                                         -->
+<!-- Contact:         [email protected]                         -->
+<!-- Company:         Intelligent Design Verification                      -->
+<!-- Company URL:     http://intelligentdv.com                             -->
+<!--                                                                       -->
+<!-- Download the most recent version here:                                -->
+<!--                  http://intelligentdv.com/downloads                   -->
+<!--                                                                       -->
+<!-- File Bugs Here:  http://bugs.intelligentdv.com                        -->
+<!--        Project:  SyntaxFiles                                          -->
+<!--                                                                       -->
+<!-- File: systemverilog.xml                                               -->
+<!-- $LastChangedBy: seanoboyle $                                          -->
+<!-- $LastChangedDate: 2009-06-24 20:41:39 -0700 (Wed, 24 Jun 2009) $      -->
+<!-- $LastChangedRevision: 10 $                                             -->
+<!--                                                                       -->
+<!--***********************************************************************-->
+<!DOCTYPE language SYSTEM "language.dtd">
+<language name="SystemVerilog" version="1.50" kateversion="2.4" section="Hardware" extensions="*.sv;*.svh" mimetype="text/x-systemverilog-src" author="Sean O'Boyle ([email protected])" license="GPL">
+  <highlighting>
+    <list name="key_deprecated">
+       <item> defparam </item>
+       <item> deassign </item>
+    </list>
+
+    <list name="key_dpi">
+       <item> DPI </item>
+       <item> DPI-C </item>
+       <item> import </item>
+       <item> export </item>
+       <item> context </item>
+    </list>
+
+    <list name="key_assert">
+       <item> assert </item>
+       <item> assume </item>
+       <item> cover </item>
+       <item> expect </item>
+       <item> disable </item>
+       <item> iff </item>
+       <item> binsof </item>
+       <item> intersect </item>
+       <item> first_match </item>
+       <item> throughout </item>
+       <item> within </item>
+    </list>
+
+    <list name="key_coverage">
+       <item> coverpoint </item>
+       <item> cross </item>
+       <item> wildcard </item>
+       <item> bins </item>
+       <item> ignore_bins </item>
+       <item> illegal_bins </item>
+    </list>
+
+    <list name="key_generator">
+       <item> genvar </item>
+    </list>
+
+    <list name="key_conditional">
+       <item> if </item>
+       <item> else </item>
+       <item> unique </item>
+       <item> priority </item>
+       <item> matches </item>
+    </list>
+
+    <list name="key_case">
+       <item> default </item>
+    </list>
+
+    <list name="key_loop">
+       <item> forever </item>
+       <item> repeat </item>
+       <item> while </item>
+       <item> for </item>
+       <item> do </item>
+       <item> foreach </item>
+       <item> break </item>
+       <item> continue </item>
+       <item> return </item>
+    </list>
+
+    <list name="key_specify">
+       <item> pulsestyle_onevent </item>
+       <item> pulsestyle_ondetect </item>
+       <item> noshowcancelled </item>
+       <item> showcancelled </item>
+       <item> ifnone </item>
+    </list>
+
+    <list name="key_procblock">
+       <item> initial </item>
+       <item> final </item>
+       <item> always </item>
+       <item> always_comb </item>
+       <item> always_ff </item>
+       <item> always_latch </item>
+    </list>
+
+    <list name="key_contassign">
+       <item> alias </item>
+       <item> assign </item>
+       <item> force </item>
+       <item> release </item>
+    </list>
+
+    <list name="key_event">
+       <item> posedge </item>
+       <item> negedge </item>
+       <item> edge </item>
+       <item> wait </item>
+       <item> wait_order </item>
+    </list>
+
+    <list name="key_time">
+       <item> timeunit </item>
+       <item> timeprecision </item>
+       <item> s </item>
+       <item> ms </item>
+       <item> ns </item>
+       <item> us </item>
+       <item> ns </item>
+       <item> ps </item>
+       <item> fs </item>
+       <item> step </item>
+    </list>
+
+    <list name="key_class">
+       <item> new </item>
+       <item> extends </item>
+       <item> this </item>
+       <item> super </item>
+       <item> protected </item>
+       <item> local </item>
+       <item> rand </item>
+       <item> randc </item>
+       <item> bind </item>
+    </list>
+
+    <list name="key_constraint">
+       <item> constraint </item>
+       <item> solve </item>
+       <item> before </item>
+       <item> dist </item>
+       <item> inside </item>
+       <item> with </item>
+    </list>
+
+    <list name="key_methods">
+       <item> virtual </item>
+       <item> pure </item>
+       <item> extern </item>
+       <item> forkjoin </item>
+    </list>
+
+    <list name="key_config">
+       <item> design </item>
+       <item> instance </item>
+       <item> cell </item>
+       <item> liblist </item>
+       <item> use </item>
+    </list>
+
+    <list name="key_library">
+       <item> library </item>
+       <item> incdir </item>
+       <item> include </item>
+    </list>
+
+    <list name="key_interface">
+       <item> modport </item>
+    </list>
+
+    <list name="key_checker">
+        <item> sync_accept_on </item>
+        <item> reject_on </item>
+        <item> accept_on </item>
+        <item> sync_reject_on </item>
+        <item> restrict </item>
+        <item> let </item>
+        <item> until </item>
+        <item> until_with </item>
+        <item> unique0 </item>
+        <item> eventually </item>
+        <item> s_until </item>
+        <item> s_always </item>
+        <item> s_eventually </item>
+        <item> s_nexttime </item>
+        <item> s_until_with </item>
+        <item> global </item>
+        <item> untyped </item>
+        <item> implies </item>
+        <item> weak </item>
+        <item> strong </item>
+        <item> nexttime </item>
+    </list>
+
+    <list name="key_types">
+       <!-- parameters -->
+       <item> parameter </item>
+       <item> localparam </item>
+       <item> specparam </item>
+       <!-- port direction -->
+       <item> input </item>
+       <item> output </item>
+       <item> inout </item>
+       <item> ref </item>
+       <!-- integer atom type -->
+       <item> byte </item>
+       <item> shortint </item>
+       <item> int </item>
+       <item> integer </item>
+       <item> longint </item>
+       <item> time </item>
+       <!-- integer vector type -->
+       <item> bit </item>
+       <item> logic </item>
+       <item> reg </item>
+       <!-- net type -->
+       <item> supply0 </item>
+       <item> supply1 </item>
+       <item> tri </item>
+       <item> triand </item>
+       <item> trior </item>
+       <item> trireg </item>
+       <item> tri0 </item>
+       <item> tri1 </item>
+       <item> wire </item>
+       <item> uwire </item>
+       <item> wand </item>
+       <item> wor </item>
+       <!-- signing -->
+       <item> signed </item>
+       <item> unsigned </item>
+       <!-- noninteger type -->
+       <item> shortreal </item>
+       <item> real </item>
+       <item> realtime </item>
+       <!-- type reference -->
+       <item> type </item>
+       <item> void </item>
+       <!-- struct union -->
+       <item> struct </item>
+       <item> union </item>
+       <item> tagged </item>
+       <!-- modifier -->
+       <item> const </item>
+       <item> var </item>
+       <item> automatic </item>
+       <item> static </item>
+       <item> packed </item>
+       <item> vectored </item>
+       <item> scalared </item>
+       <!-- other types -->
+       <item> typedef </item>
+       <item> enum </item>
+       <item> string </item>
+       <item> chandle </item>
+       <item> event </item>
+       <!-- misc -->
+       <item> null </item>
+    </list>
+
+    <list name="key_preprocessor">
+        <item> `__FILE__ </item>
+        <item> `__LINE__ </item>
+        <item> `begin_keywords </item>
+        <item> `celldefine </item>
+        <item> `default_nettype </item>
+        <item> `define </item>
+        <item> `else </item>
+        <item> `elsif </item>
+        <item> `end_keywords </item>
+        <item> `endcelldefine </item>
+        <item> `endif </item>
+        <item> `ifdef </item>
+        <item> `ifndef </item>
+        <item> `include </item>
+        <item> `line </item>
+        <item> `nounconnected_drive </item>
+        <item> `pragma </item>
+        <item> `resetall </item>
+        <item> `timescale </item>
+        <item> `unconnected_drive </item>
+        <item> `undef </item>
+        <item> `undefineall </item>
+    </list>
+
+    <list name="key_system">
+        <item> $finish </item>
+        <item> $stop </item>
+        <item> $exit </item>
+        <item> $realtime </item>
+        <item> $stime </item>
+        <item> $time </item>
+        <item> $printtimescale </item>
+        <item> $timeformat </item>
+        <item> $bitstoreal </item>
+        <item> $realtobits </item>
+        <item> $bitstoshortreal </item>
+        <item> $shortrealtobits </item>
+        <item> $itor </item>
+        <item> $rtoi </item>
+        <item> $signed </item>
+        <item> $unsigned </item>
+        <item> $cast </item>
+        <item> $bits </item>
+        <item> $isunbounded </item>
+        <item> $typename </item>
+        <item> $unpacked_dimensions </item>
+        <item> $dimensions </item>
+        <item> $left </item>
+        <item> $right </item>
+        <item> $low </item>
+        <item> $high </item>
+        <item> $increment </item>
+        <item> $size </item>
+        <item> $clog2 </item>
+        <item> $asin </item>
+        <item> $ln </item>
+        <item> $acos </item>
+        <item> $log10 </item>
+        <item> $atan </item>
+        <item> $exp </item>
+        <item> $atan2 </item>
+        <item> $sqrt </item>
+        <item> $hypot </item>
+        <item> $pow </item>
+        <item> $sinh </item>
+        <item> $floor </item>
+        <item> $cosh </item>
+        <item> $ceil </item>
+        <item> $tanh </item>
+        <item> $sin </item>
+        <item> $asinh </item>
+        <item> $cos </item>
+        <item> $acosh </item>
+        <item> $tan </item>
+        <item> $atanh </item>
+        <item> $fatal </item>
+        <item> $error </item>
+        <item> $warning </item>
+        <item> $info </item>
+        <item> $fatal </item>
+        <item> $error </item>
+        <item> $warning </item>
+        <item> $info </item>
+        <item> $asserton </item>
+        <item> $assertoff </item>
+        <item> $assertkill </item>
+        <item> $assertpasson </item>
+        <item> $assertpassoff </item>
+        <item> $assertfailon </item>
+        <item> $assertfailoff </item>
+        <item> $assertnonvacuouson </item>
+        <item> $assertvacuousoff </item>
+        <item> $onehot </item>
+        <item> $onehot0 </item>
+        <item> $isunknown </item>
+        <item> $sampled </item>
+        <item> $rose </item>
+        <item> $fell </item>
+        <item> $stable </item>
+        <item> $changed </item>
+        <item> $past </item>
+        <item> $countones </item>
+        <item> $past_gclk </item>
+        <item> $rose_gclk </item>
+        <item> $fell_gclk </item>
+        <item> $stable_gclk </item>
+        <item> $changed_gclk </item>
+        <item> $future_gclk </item>
+        <item> $rising_gclk </item>
+        <item> $falling_gclk </item>
+        <item> $steady_gclk </item>
+        <item> $changing_gclk </item>
+        <item> $coverage_control </item>
+        <item> $coverage_get_max </item>
+        <item> $coverage_get </item>
+        <item> $coverage_merge </item>
+        <item> $coverage_save </item>
+        <item> $get_coverage </item>
+        <item> $set_coverage_db_name </item>
+        <item> $load_coverage_db </item>
+        <item> $random </item>
+        <item> $dist_chi_square </item>
+        <item> $dist_erlang </item>
+        <item> $dist_exponential </item>
+        <item> $dist_normal </item>
+        <item> $dist_poisson </item>
+        <item> $dist_t </item>
+        <item> $dist_uniform </item>
+        <item> $q_initialize </item>
+        <item> $q_add </item>
+        <item> $q_remove </item>
+        <item> $q_full </item>
+        <item> $q_exam </item>
+        <item> $async$and$array </item>
+        <item> $async$and$plane </item>
+        <item> $async$nand$array </item>
+        <item> $async$nand$plane </item>
+        <item> $async$or$array </item>
+        <item> $async$or$plane </item>
+        <item> $async$nor$array </item>
+        <item> $async$nor$plane </item>
+        <item> $sync$and$array </item>
+        <item> $sync$and$plane </item>
+        <item> $sync$nand$array </item>
+        <item> $sync$nand$plane </item>
+        <item> $sync$or$array </item>
+        <item> $sync$or$plane </item>
+        <item> $sync$nor$array </item>
+        <item> $sync$nor$plane </item>
+        <item> $system </item>
+        <item> $display </item>
+        <item> $write </item>
+        <item> $displayb </item>
+        <item> $writeb </item>
+        <item> $displayh </item>
+        <item> $writeh </item>
+        <item> $displayo </item>
+        <item> $writeo </item>
+        <item> $strobe </item>
+        <item> $monitor </item>
+        <item> $strobeb </item>
+        <item> $monitorb </item>
+        <item> $strobeh </item>
+        <item> $monitorh </item>
+        <item> $strobeo </item>
+        <item> $monitoro </item>
+        <item> $monitoroff </item>
+        <item> $monitoron </item>
+        <item> $fclose </item>
+        <item> $fopen </item>
+        <item> $fdisplay </item>
+        <item> $fwrite </item>
+        <item> $fdisplayb </item>
+        <item> $fwriteb </item>
+        <item> $fdisplayh </item>
+        <item> $fwriteh </item>
+        <item> $fdisplayo </item>
+        <item> $fwriteo </item>
+        <item> $fstrobe </item>
+        <item> $fmonitor </item>
+        <item> $fstrobeb </item>
+        <item> $fmonitorb </item>
+        <item> $fstrobeh </item>
+        <item> $fmonitorh </item>
+        <item> $fstrobeo </item>
+        <item> $fmonitoro </item>
+        <item> $swrite </item>
+        <item> $sformat </item>
+        <item> $swriteb </item>
+        <item> $sformatf </item>
+        <item> $swriteh </item>
+        <item> $fgetc </item>
+        <item> $swriteo </item>
+        <item> $ungetc </item>
+        <item> $fscanf </item>
+        <item> $fgets </item>
+        <item> $fread </item>
+        <item> $sscanf </item>
+        <item> $fseek </item>
+        <item> $rewind </item>
+        <item> $fflush </item>
+        <item> $ftell </item>
+        <item> $feof </item>
+        <item> $ferror </item>
+        <item> $readmemb </item>
+        <item> $readmemh </item>
+        <item> $writememb </item>
+        <item> $writememh </item>
+        <item> $test$plusargs </item>
+        <item> $value$plusargs </item>
+        <item> $dumpfile </item>
+        <item> $dumpvars </item>
+        <item> $dumpoff </item>
+        <item> $dumpon </item>
+        <item> $dumpall </item>
+        <item> $dumplimit </item>
+        <item> $dumpflush </item>
+        <item> $dumpports </item>
+        <item> $dumpportsoff </item>
+        <item> $dumpportson </item>
+        <item> $dumpportsall </item>
+        <item> $dumpportslimit </item>
+        <item> $dumpportsflush </item>
+    </list>
+
+    <list name="key_gates">
+       <item> pullup </item>
+       <item> pulldown </item>
+       <item> cmos </item>
+       <item> rcmos </item>
+       <item> nmos </item>
+       <item> pmos </item>
+       <item> rnmos </item>
+       <item> rpmos </item>
+       <item> and </item>
+       <item> nand </item>
+       <item> or </item>
+       <item> nor </item>
+       <item> xor </item>
+       <item> xnor </item>
+       <item> not </item>
+       <item> buf </item>
+       <item> tran </item>
+       <item> rtran </item>
+       <item> tranif0 </item>
+       <item> tranif1 </item>
+       <item> rtranif0 </item>
+       <item> rtranif1 </item>
+       <item> bufif0 </item>
+       <item> bufif1 </item>
+       <item> notif0 </item>
+       <item> notif1 </item>
+    </list>
+
+    <list name="key_strength">
+       <!-- drive strength -->
+       <item> strong0 </item>
+       <item> strong1 </item>
+       <item> pull0 </item>
+       <item> pull1 </item>
+       <item> weak0 </item>
+       <item> weak1 </item>
+       <item> highz0 </item>
+       <item> highz1 </item>
+       <!-- charge strength -->
+       <item> small </item>
+       <item> medium </item>
+       <item> large </item>
+    </list>
+    <list name="key_stdlib">
+       <item> randomize </item>
+       <item> mailbox </item>
+       <item> semaphore </item>
+       <item> put </item>
+       <item> get </item>
+       <item> try_put </item>
+       <item> try_get </item>
+       <item> peek </item>
+       <item> try_peek </item>
+       <item> process </item>
+       <item> state </item>
+       <item> self </item>
+       <item> status </item>
+       <item> kill </item>
+       <item> await </item>
+       <item> suspend </item>
+       <item> resume </item>
+       <!-- Array -->
+       <item> size </item>
+       <item> delete </item>
+       <item> insert </item>
+       <item> num </item>
+       <item> first </item>
+       <item> last </item>
+       <item> next </item>
+       <item> prev </item>
+       <item> pop_front </item>
+       <item> pop_back </item>
+       <item> push_front </item>
+       <item> push_back </item>
+       <item> find </item>
+       <item> find_index </item>
+       <item> find_first </item>
+       <item> find_last </item>
+       <item> find_last_index </item>
+       <item> min </item>
+       <item> max </item>
+       <item> unique_index </item>
+       <item> reverse </item>
+       <item> sort </item>
+       <item> rsort </item>
+       <item> shuffle </item>
+       <item> sum </item>
+       <item> product </item>
+       <!-- List_pkg -->
+       <item> List </item>
+       <item> List_Iterator </item>
+       <item> neq </item>
+       <item> eq </item>
+       <item> data </item>
+       <item> empty </item>
+       <item> front </item>
+       <item> back </item>
+       <item> start </item>
+       <item> finish </item>
+       <item> insert_range </item>
+       <item> erase </item>
+       <item> erase_range </item>
+       <item> set </item>
+       <item> swap </item>
+       <item> clear </item>
+       <item> purge </item>
+    </list>
+
+    <list name="begin">
+       <item>begin</item>
+    </list>
+    <list name="end">
+       <item>end</item>
+    </list>
+    <list name="package">
+       <item> package </item>
+    </list>
+    <list name="endpackage">
+       <item> endpackage </item>
+    </list>
+    <list name="macromodule">
+       <item> macromodule </item>
+    </list>
+    <list name="module">
+       <item> module </item>
+    </list>
+    <list name="endmodule">
+       <item> endmodule </item>
+    </list>
+    <list name="generate">
+       <item> generate </item>
+    </list>
+    <list name="endgenerate">
+       <item> endgenerate </item>
+    </list>
+    <list name="program">
+       <item> program </item>
+    </list>
+    <list name="endprogram">
+       <item> endprogram </item>
+    </list>
+    <list name="class">
+       <item> class </item>
+    </list>
+    <list name="endclass">
+       <item> endclass </item>
+    </list>
+    <list name="function">
+       <item> function </item>
+    </list>
+    <list name="endfunction">
+       <item> endfunction </item>
+    </list>
+    <list name="case">
+       <item> case </item>
+    </list>
+    <list name="casex">
+       <item> casex </item>
+    </list>
+    <list name="casez">
+       <item> casez </item>
+    </list>
+    <list name="randcase">
+       <item> randcase </item>
+    </list>
+    <list name="endcase">
+       <item> endcase </item>
+    </list>
+    <list name="interface">
+       <item> interface </item>
+    </list>
+    <list name="endinterface">
+       <item> endinterface </item>
+    </list>
+    <list name="clocking">
+       <item> clocking </item>
+    </list>
+    <list name="endclocking">
+       <item> endclocking </item>
+    </list>
+    <list name="task">
+       <item> task </item>
+    </list>
+    <list name="endtask">
+       <item> endtask </item>
+    </list>
+    <list name="primitive">
+       <item> primitive </item>
+    </list>
+    <list name="endprimitive">
+       <item> endprimitive </item>
+    </list>
+    <list name="fork">
+       <item> fork </item>
+    </list>
+    <list name="join">
+       <item> join </item>
+    </list>
+    <list name="join_any">
+       <item> join_any </item>
+    </list>
+    <list name="join_none">
+       <item> join_none </item>
+    </list>
+    <list name="covergroup">
+       <item> covergroup </item>
+    </list>
+    <list name="endgroup">
+       <item> endgroup </item>
+    </list>
+    <list name="checker">
+       <item> checker </item>
+    </list>
+    <list name="endchecker">
+       <item> endchecker </item>
+    </list>
+    <list name="property">
+       <item> property </item>
+    </list>
+    <list name="endproperty">
+       <item> endproperty </item>
+    </list>
+    <list name="randsequence">
+       <item> randsequence </item>
+    </list>
+    <list name="sequence">
+       <item> sequence </item>
+    </list>
+    <list name="endsequence">
+       <item> endsequence </item>
+    </list>
+    <list name="specify">
+       <item> specify </item>
+    </list>
+    <list name="endspecify">
+       <item> endspecify </item>
+    </list>
+    <list name="config">
+       <item> config </item>
+    </list>
+    <list name="endconfig">
+       <item> endconfig </item>
+    </list>
+    <list name="table">
+       <item> table </item>
+    </list>
+    <list name="endtable">
+       <item> endtable </item>
+    </list>
+    <list name="extern">
+       <item> extern </item>
+    </list>
+    <list name="pure">
+       <item> pure </item>
+    </list>
+    <list name="typedef">
+       <item> typedef </item>
+    </list>
+    <list name="import">
+       <item> import </item>
+    </list>
+
+
+    <contexts>
+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
+        <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1"/>
+        <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1"/>
+        <RegExpr attribute="Block Keyword" context="Block Name" String="begin\ *:" beginRegion="beginEnd"/>
+        <keyword attribute="Method Keyword" context="Extern Context" String="extern"/>
+        <keyword attribute="Method Keyword" context="Extern Context" String="pure"/>
+        <keyword attribute="Method Keyword" context="Extern Context" String="import"/>
+        <keyword attribute="Type Keyword" context="Typedef Context" String="typedef"/>
+        <keyword attribute="Block Keyword" context="#stay" String="begin" beginRegion="beginEnd"/>
+        <keyword attribute="Block Keyword" context="#stay" String="end" endRegion="beginEnd"/>
+        <keyword attribute="Block Keyword" context="#stay" String="package" beginRegion="packageEndpackage"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endpackage" endRegion="packageEndpackage"/>
+        <keyword attribute="Block Keyword" context="#stay" String="macromodule" beginRegion="moduleEndmodule"/>
+        <keyword attribute="Block Keyword" context="#stay" String="module" beginRegion="moduleEndmodule"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endmodule" endRegion="moduleEndmodule"/>
+        <keyword attribute="Block Keyword" context="#stay" String="generate" beginRegion="generateEndgenerate"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endgenerate" endRegion="generateEndgenerate"/>
+        <keyword attribute="Block Keyword" context="#stay" String="program" beginRegion="programEndprogram"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endprogram" endRegion="programEndprogram"/>
+        <keyword attribute="Block Keyword" context="#stay" String="class" beginRegion="classEndclass"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endclass" endRegion="classEndclass"/>
+        <keyword attribute="Block Keyword" context="#stay" String="function" beginRegion="functionEndfunction"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endfunction" endRegion="functionEndfunction"/>
+        <keyword attribute="Block Keyword" context="#stay" String="case" beginRegion="caseEndcase"/>
+        <keyword attribute="Block Keyword" context="#stay" String="casex" beginRegion="caseEndcase"/>
+        <keyword attribute="Block Keyword" context="#stay" String="casez" beginRegion="caseEndcase"/>
+        <keyword attribute="Block Keyword" context="#stay" String="randcase" beginRegion="caseEndcase"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endcase" endRegion="caseEndcase"/>
+        <keyword attribute="Block Keyword" context="#stay" String="interface" beginRegion="interfaceEndinterface"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endinterface" endRegion="interfaceEndinterface"/>
+        <keyword attribute="Block Keyword" context="#stay" String="clocking" beginRegion="clockingEndclocking"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endclocking" endRegion="clockingEndclocking"/>
+        <keyword attribute="Block Keyword" context="#stay" String="task" beginRegion="taskEndtask"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endtask" endRegion="taskEndtask"/>
+        <keyword attribute="Block Keyword" context="#stay" String="primitive" beginRegion="primitiveEndprimitive"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endprimitive" endRegion="primitiveEndprimitive"/>
+        <keyword attribute="Block Keyword" context="#stay" String="fork" beginRegion="forkJoin"/>
+        <keyword attribute="Block Keyword" context="#stay" String="join" endRegion="forkJoin"/>
+        <keyword attribute="Block Keyword" context="#stay" String="join_any" endRegion="forkJoin"/>
+        <keyword attribute="Block Keyword" context="#stay" String="join_none" endRegion="forkJoin"/>
+        <keyword attribute="Block Keyword" context="#stay" String="covergroup" beginRegion="covergroupEndgroup"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endgroup" endRegion="covergroupEndgroup"/>
+        <keyword attribute="Block Keyword" context="#stay" String="checker" beginRegion="checkerEndchecker"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endchecker" endRegion="checkerEndchecker"/>
+        <keyword attribute="Block Keyword" context="#stay" String="property" beginRegion="propertyEndproperty"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endproperty" endRegion="propertyEndproperty"/>
+        <keyword attribute="Block Keyword" context="#stay" String="randsequence" beginRegion="sequenceEndsequence"/>
+        <keyword attribute="Block Keyword" context="#stay" String="sequence" beginRegion="sequenceEndsequence"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endsequence" endRegion="sequenceEndsequence"/>
+        <keyword attribute="Block Keyword" context="#stay" String="specify" beginRegion="specifyEndspecify"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endspecify" endRegion="specifyEndspecify"/>
+        <keyword attribute="Block Keyword" context="#stay" String="config" beginRegion="configEndconfig"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endconfig" endRegion="configEndconfig"/>
+        <keyword attribute="Block Keyword" context="#stay" String="table" beginRegion="tableEndtable"/>
+        <keyword attribute="Block Keyword" context="#stay" String="endtable" endRegion="tableEndtable"/>
+        <keyword attribute="Deprecated Keyword" context="#stay" String="key_deprecated"/>
+        <keyword attribute="DPI Keyword" context="#stay" String="key_dpi"/>
+        <keyword attribute="Assert Keyword" context="#stay" String="key_assert"/>
+        <keyword attribute="Coverage Keyword" context="#stay" String="key_coverage"/>
+        <keyword attribute="Generator Keyword" context="#stay" String="key_generator"/>
+        <keyword attribute="Confitional Keyword" context="#stay" String="key_conditional"/>
+        <keyword attribute="Case Keyword" context="#stay" String="key_case"/>
+        <keyword attribute="Loop Keyword" context="#stay" String="key_loop"/>
+        <keyword attribute="Specify Keyword" context="#stay" String="key_specify"/>
+        <keyword attribute="Process Block Keyword" context="#stay" String="key_procblock"/>
+        <keyword attribute="Continuous Assign Keyword" context="#stay" String="key_contassign"/>
+        <keyword attribute="Event Keyword" context="#stay" String="key_event"/>
+        <keyword attribute="Time Keyword" context="#stay" String="key_time"/>
+        <keyword attribute="Class Keyword" context="#stay" String="key_class"/>
+        <keyword attribute="Constraint Keyword" context="#stay" String="key_constraint"/>
+        <keyword attribute="Method Keyword" context="#stay" String="key_methods"/>
+        <keyword attribute="Config Keyword" context="#stay" String="key_config"/>
+        <keyword attribute="Library Keyword" context="#stay" String="key_library"/>
+        <keyword attribute="Interface Keyword" context="#stay" String="key_interface"/>
+        <keyword attribute="Checker Keyword" context="#stay" String="key_checker"/>
+        <keyword attribute="Type Keyword" context="#stay" String="key_types"/>
+        <keyword attribute="Preprocessor Keyword" context="#stay" String="key_preprocessor"/>
+        <keyword attribute="System Task Keyword" context="#stay" String="key_system"/>
+        <keyword attribute="Data Type Keyword" context="#stay" String="key_types"/>
+        <keyword attribute="Drive/Charge Strength Keyword" context="#stay" String="key_strength"/>
+        <keyword attribute="Gate Instantiation Keyword" context="#stay" String="key_gates"/>
+        <keyword attribute="Standard Library" context="#stay" String="key_stdlib"/>
+
+        <RegExpr attribute="Decimal" context="#stay" String="[\d_]*'d[\d_]+"/>
+        <RegExpr attribute="Octal" context="#stay" String="[\d_]*'o[0-7xXzZ_]+"/>
+        <RegExpr attribute="Hex" context="#stay" String="[\d_]*'h[\da-fA-FxXzZ_]+"/>
+        <RegExpr attribute="Binary" context="#stay" String="[\d_]*'b[01_zZxX]+"/>
+        <Float attribute="Float" context="#stay"/>
+        <Int attribute="Integer" context="#stay"/>
+
+        <RegExpr attribute="Port Connection" context="#stay" String="[^\w$]\.[a-zA-Z]+[\w$]*"/>
+
+        <DetectChar attribute="String" context="String" char="&quot;"/>
+        <IncludeRules context="##Doxygen" />
+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
+        <AnyChar attribute="Symbol" context="#stay" String="!%&amp;()+,-&lt;=+/:;&gt;?[]^{|}~@"/>
+
+        <DetectChar attribute="Preprocessor" context="Preprocessor" char="`" column="0"/>
+        <RegExpr attribute="Preprocessor" context="#stay" String="\`[a-zA-Z_]+\w*" />
+        <RegExpr attribute="PLI Task" context="#stay" String="\$[a-zA-Z_]+\w*"/>
+        <RegExpr attribute="Delay" context="#stay" String="#[\d_]+"/>
+      </context>
+      <context attribute="Extern Context" lineEndContext="#pop" name="Extern Context">
+         <keyword attribute="Method Keyword" context="#stay" String="key_methods"/>
+         <keyword attribute="DPI Keyword" context="#stay" String="key_dpi"/>
+         <keyword attribute="Class Keyword" context="#stay" String="key_class"/>
+	      <keyword attribute="Constraint Keyword" context="#stay" String="key_constraint"/>
+         <keyword attribute="Block Keyword" context="#pop" String="function"/>
+         <keyword attribute="Block Keyword" context="#pop" String="task"/>
+      </context>
+      <context attribute="Typedef Context" lineEndContext="#pop" name="Typedef Context">
+         <keyword attribute="Block Keyword" context="#pop" String="class"/>
+         <keyword attribute="Type Keyword" context="#pop" String="key_types"/>
+         <keyword attribute="Interface Keyword" context="#pop" String="key_interface"/>
+         <keyword attribute="Checker Keyword" context="#pop" String="key_checker"/>
+      </context>
+      <context attribute="String" lineEndContext="#pop" name="String">
+        <LineContinue attribute="String" context="#stay"/>
+        <HlCStringChar attribute="String Char" context="#stay"/>
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+      </context>
+
+      <context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
+        <LineContinue attribute="Comment" context="#stay"/>
+        <DetectSpaces />
+        <IncludeRules context="##Alerts" />
+        <DetectIdentifier />
+      </context>
+
+      <context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
+        <DetectSpaces />
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
+        <IncludeRules context="##Alerts" />
+        <DetectIdentifier />
+      </context>
+     
+      <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor">
+        <LineContinue attribute="Preprocessor" context="#stay"/>
+        <RangeDetect attribute="Prep. Lib" context="#stay" char="&quot;" char1="&quot;"/>
+        <RangeDetect attribute="Prep. Lib" context="#stay" char="&lt;" char1="&gt;"/>
+        <IncludeRules context="##Doxygen" />
+        <Detect2Chars attribute="Comment" context="Commentar/Preprocessor" char="/" char1="*" beginRegion="Comment2" />
+
+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+      </context>
+
+      <context attribute="Preprocessor" lineEndContext="#pop" name="Define">
+        <LineContinue attribute="Preprocessor" context="#stay"/>
+      </context>
+
+      <context attribute="Comment" lineEndContext="#stay" name="Commentar/Preprocessor">
+        <DetectSpaces />
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment2" />
+        <DetectIdentifier />
+      </context>
+
+      <context attribute="Comment" lineEndContext="#stay" name="Outscoped" >
+        <DetectSpaces />
+        <IncludeRules context="##Alerts" />
+        <DetectIdentifier />
+        <DetectChar attribute="String" context="String" char="&quot;"/>
+        <IncludeRules context="##Doxygen" />
+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
+        <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="PP" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="#pop" String="#\s*el(?:se|if)" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="#pop" String="#\s*endif" endRegion="PP" firstNonSpace="true" />
+      </context>
+
+      <context attribute="Comment" lineEndContext="#stay" name="Outscoped intern">
+        <DetectSpaces />
+        <IncludeRules context="##Alerts" />
+        <DetectIdentifier />
+        <DetectChar attribute="String" context="String" char="&quot;"/>
+        <IncludeRules context="##Doxygen" />
+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
+        <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="PP" firstNonSpace="true" />
+        <RegExpr attribute="Comment" context="#pop" String="#\s*endif" endRegion="PP" firstNonSpace="true" />
+      </context>
+      
+      <context attribute="Block Name" lineEndContext="#pop" name="Block Name">
+          <RegExpr attribute="Data Type Keyword" context="#pop" String="[^ ]+"/>
+      </context>
+    </contexts>
+
+    <itemDatas>
+      <itemData name="Normal Text" defStyleNum="dsNormal"/>
+      <itemData name="Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Block Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="DPI Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Assert Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Coverage Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Generator Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Confitional Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Case Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Loop Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Specify Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Process Block Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Continuous Assign Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Event Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Time Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Class Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Constraint Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Method Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Config Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Library Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Interface Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Checker Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Type Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Preprocessor Keyword" defStyleNum="dsOthers"/>
+      <itemData name="Preprocessor" defStyleNum="dsOthers"/>
+      <itemData name="System Task Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Data Type Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Drive/Charge Strength Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Gate Instantiation Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Data Type Keyword" defStyleNum="dsDataType"/>
+      <itemData name="Decimal" defStyleNum="dsBaseN"/>
+      <itemData name="Octal" defStyleNum="dsBaseN"/>
+      <itemData name="Hex" defStyleNum="dsBaseN"/>
+      <itemData name="Binary" defStyleNum="dsBaseN"/>
+      <itemData name="Float" defStyleNum="dsFloat"/>
+      <itemData name="String" defStyleNum="dsString"/>
+      <itemData name="String Char" defStyleNum="dsChar"/>
+      <itemData name="Comment" defStyleNum="dsComment"/>
+      <itemData name="Deprecated Keyword" defStyleNum="dsError"/>
+      <itemData name="Symbol" defStyleNum="dsNormal"/>
+      <itemData name="Preprocessor Keyword" defStyleNum="dsOthers"/>
+      <itemData name="Prep. Lib" defStyleNum="dsFloat"/>
+      <itemData name="PLI Task" defStyleNum="dsDataType"/>
+      <itemData name="System Task Keyword" defStyleNum="dsDataType"/>
+      <itemData name="Integer" defStyleNum="dsDecVal"/>
+      <itemData name="Delay" defStyleNum="dsBaseN"/>
+      <itemData name="Block Name" defStyleNum="dsDataType"/>
+      <itemData name="Drive/Charge Strength Keyword" defStyleNum="dsBaseN"/>
+      <itemData name="Gate Instantiation Keyword" defStyleNum="dsDataType"/>
+      <itemData name="Port Connection" defStyleNum="dsDataType"/>
+      <itemData name="Standard Library" defStyleNum="dsOthers"/>
+      </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name="singleLine" start="//" />
+      <comment name="multiLine" start="/*" end="*/" region="Comment"/>
+    </comments>
+    <keywords casesensitive="1"/>
+  </general>
+</language>
diff --git a/kate/data/tads3.xml b/kate/data/tads3.xml
new file mode 100644
index 000000000..9114633e6
--- /dev/null
+++ b/kate/data/tads3.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!-- TADS 3 syntax highlight definition for Kate. -->
+<!-- Author: Nikos Chantziaras <[email protected]> -->
+<language name="TADS 3" section="Sources"
+          version="1.0" kateversion="2.4"
+          indenter="cstyle"
+          extensions="*.t;*.h"
+          mimetype=""
+          priority="0">
+
+<highlighting>
+	<list name="keywords">
+		<item> abort </item>
+		<item> and </item>
+		<item> argcount </item>
+		<item> break </item>
+		<item> case </item>
+		<item> catch </item>
+		<item> class </item>
+		<item> construct </item>
+		<item> continue </item>
+		<item> default </item>
+		<item> definingobj </item>
+		<item> delegated </item>
+		<item> dictionary </item>
+		<item> do </item>
+		<item> else </item>
+		<item> enum </item>
+		<item> exit </item>
+		<item> export </item>
+		<item> extern </item>
+		<item> finalize </item>
+		<item> finally </item>
+		<item> for </item>
+		<item> foreach </item>
+		<item> function </item>
+		<item> goto </item>
+		<item> grammar </item>
+		<item> if </item>
+		<item> in </item>
+		<item> inherited </item>
+		<item> intrinsic </item>
+		<item> is </item>
+		<item> local </item>
+		<item> modify </item>
+		<item> new </item>
+		<item> nil </item>
+		<item> not </item>
+		<item> object </item>
+		<item> or </item>
+		<item> property </item>
+		<item> propertyset </item>
+		<item> replace </item>
+		<item> replaced </item>
+		<item> return </item>
+		<item> self </item>
+		<item> static </item>
+		<item> switch </item>
+		<item> targetobj </item>
+		<item> targetprop </item>
+		<item> template </item>
+		<item> throw </item>
+		<item> token </item>
+		<item> transient </item>
+		<item> true </item>
+		<item> try </item>
+		<item> while </item>
+	</list>
+
+	<contexts>
+		<context attribute="Normal Text" lineEndContext="#stay" name="Normal">
+			<keyword attribute="Keyword" context="#stay" String="keywords"/>
+			<HlCOct attribute="Octal" context="#stay"/>
+			<HlCHex attribute="Hex" context="#stay"/>
+			<Int attribute="Decimal" context="#stay"/>
+			<DetectChar attribute="String" context="String" char="&quot;"/>
+			<DetectChar attribute="ValString" context="ValString" char="'"/>
+			<Detect2Chars attribute="Comment" context="ShortComment" char="/" char1="/"/>
+			<Detect2Chars attribute="Comment" context="LongComment" char="/" char1="*" beginRegion="Comment"/>
+			<DetectChar attribute="Normal Text" context="#stay" char="{" beginRegion="Brace1"/>
+			<DetectChar attribute="Normal Text" context="#stay" char="}" endRegion="Brace1"/>
+			<AnyChar attribute="Symbol" context="#stay" String="!%&amp;()+,-&lt;=&gt;?[]^{|}~"/>
+			<RegExpr attribute="Preprocessor" context="Preprocessor" String="#"/>
+		</context>
+
+		<context attribute="String" lineEndContext="#stay" name="String">
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="&quot;"/>
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="\"/>
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="n"/>
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="r"/>
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="t"/>
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="b"/>
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="^"/>
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="v"/>
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1=" "/>
+			<Detect2Chars attribute="Embedded Expression" context="embedded" char="&lt;" char1="&lt;"/>
+			<DetectChar attribute="HTML Tag" context="htmltag" char="&lt;"/>
+			<DetectChar attribute="String" context="#pop" char="&quot;"/>
+		</context>
+
+		<context attribute="ValString" lineEndContext="#stay" name="ValString">
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="'"/>
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="\"/>
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="n"/>
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="r"/>
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="t"/>
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="b"/>
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="^"/>
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1="v"/>
+			<Detect2Chars attribute="Backslash Code" context="#stay" char="\" char1=" "/>
+			<DetectChar attribute="HTML Tag" context="htmltag" char="&lt;"/>
+			<DetectChar attribute="String" context="#pop" char="'"/>
+		</context>
+
+		<context attribute="Comment" lineEndContext="#pop" name="ShortComment">
+			<RegExpr attribute="Preprocessor" context="#stay" String="(FIXME|TODO)"/>
+		</context>
+
+		<context attribute="Comment" lineEndContext="#stay" name="LongComment">
+			<RegExpr attribute="Preprocessor" context="#stay" String="(FIXME|TODO)"/>
+			<Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
+		</context>
+
+		<context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor">
+			<LineContinue attribute="Preprocessor" context="#stay"/>
+			<RangeDetect attribute="String" context="#stay" char="&quot;" char1="&quot;"/>
+			<RangeDetect attribute="String" context="#stay" char="&lt;" char1="&gt;"/>
+			<Detect2Chars attribute="Comment" context="ShortComment" char="/" char1="/"/>
+			<Detect2Chars attribute="Comment" context="LongComment/Preprocessor" char="/" char1="*"/>
+		</context>
+
+		<context attribute="Comment" lineEndContext="#stay" name="LongComment/Preprocessor">
+			<RegExpr attribute="Preprocessor" context="#stay" String="(FIXME|TODO)"/>
+			<Detect2Chars attribute="Comment" context="#pop" char="*" char1="/"/>
+		</context>
+
+		<context name="embedded" attribute="Embedded Expression" lineEndContext="#stay">
+			<Detect2Chars attribute="Embedded Expression" context="#pop" char="&gt;" char1="&gt;"/>
+		</context>
+
+		<context name="htmltag" attribute="HTML Tag" lineEndContext="#stay">
+			<Detect2Chars attribute="HTML Tag" context="#pop" char="/" char1="&gt;"/>
+			<DetectChar attribute="HTML Tag" context="#pop" char="&gt;"/>
+		</context>
+	</contexts>
+
+	<itemDatas>
+		<itemData name="Normal Text" defStyleNum="dsNormal"/>
+		<itemData name="Keyword" defStyleNum="dsKeyword"/>
+		<itemData name="Decimal" defStyleNum="dsDecVal"/>
+		<itemData name="Octal" defStyleNum="dsBaseN"/>
+		<itemData name="Hex" defStyleNum="dsBaseN"/>
+		<itemData name="String" defStyleNum="dsString"/>
+		<itemData name="ValString" defStyleNum="dsString"/>
+		<itemData name="Comment" defStyleNum="dsComment"/>
+		<itemData name="Symbol" defStyleNum="dsNormal"/>
+		<itemData name="Preprocessor" defStyleNum="dsOthers"/>
+		<itemData name="Backslash Code" defStyleNum="dsKeyword" color="#0F0F8F" selColor="#ffffff" bold="1" italic="0"/>
+		<itemData name="HTML Tag" defStyleNum="dsKeyword" color="#0F0F8F" selColor="#ffffff" bold="0" italic="1"/>
+		<itemData name="Embedded Expression" defStyleNum="dsNormal" color="#000000" selColor="#ffffff" bold="0" italic="1"/>
+	</itemDatas>
+
+</highlighting>
+
+<general>
+	<comments>
+		<comment name="singleLine" start="//"/>
+		<comment name="multiLine" start="/*" end="*/"/>
+	</comments>
+
+	<keywords casesensitive="1"/>
+</general>
+
+</language>
\ No newline at end of file
diff --git a/kate/data/tcsh.xml b/kate/data/tcsh.xml
new file mode 100644
index 000000000..f9dffa2e4
--- /dev/null
+++ b/kate/data/tcsh.xml
@@ -0,0 +1,868 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+        <!ENTITY funcname "[A-Za-z_:][A-Za-z0-9_:#&#37;@-]*">
+        <!ENTITY varname  "[A-Za-z_][A-Za-z0-9_]*">
+        <!ENTITY word     "[|&amp;;()&lt;&gt;\s]+">	<!-- see man csh -->
+        <!ENTITY eos      "(?=($|\s))">			<!-- eol or space following -->
+        <!ENTITY noword   "(?![\w$+-])">		<!-- no word, $, + or - following -->
+        <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
+]>
+<language name="Tcsh" version="0.1" kateversion="2.4" section="Scripts" extensions="*.csh;*.tcsh;csh.cshrc;csh.login;.tcshrc;.cshrc;.login" mimetype="application/x-csh" casesensitive="1" author="Matthew Woehlke ([email protected])" license="LGPL">
+
+<!-- (c) 2006 Matthew Woehlke ([email protected])
+    Based on the bash highlighter by Wilbert Berendsen ([email protected])
+    Released under the LGPL -->
+
+  <highlighting>
+    <list name="keywords">
+      <item> else </item>
+      <item> for </item>
+      <item> function </item>
+      <item> in </item>
+      <item> select </item>
+      <item> until </item>
+      <item> while </item>
+      <item> . </item>
+      <item> then </item>
+    </list>
+
+    <list name="builtins">
+      <item> : </item>
+      <item> alias </item>
+      <item> alloc </item>
+      <item> bg </item>
+      <item> bindkey </item>
+      <item> break </item>
+      <item> builtins </item>
+      <item> bye </item>
+      <item> cd </item>
+      <item> chdir </item>
+      <item> complete </item>
+      <item> continue </item>
+      <item> dirs </item>
+      <item> echo </item>
+      <item> echotc </item>
+      <item> eval </item>
+      <item> exec </item>
+      <item> exit </item>
+      <item> fg </item>
+      <item> filetest </item>
+      <item> glob </item>
+      <item> hashstat </item>
+      <item> history </item>
+      <item> hup </item>
+      <item> inlib </item>
+      <item> jobs </item>
+      <item> kill </item>
+      <item> limit </item>
+      <item> log </item>
+      <item> login </item>
+      <item> logout </item>
+      <item> ls-F </item>
+      <item> migrate </item>
+      <item> newgrp </item>
+      <item> nice </item>
+      <item> nohup </item>
+      <item> notify </item>
+      <item> onintr </item>
+      <item> popd </item>
+      <item> printenv </item>
+      <item> pushd </item>
+      <item> rehash </item>
+      <item> repeat </item>
+      <item> sched </item>
+      <item> settc </item>
+      <item> setty </item>
+      <item> shift </item>
+      <item> source </item>
+      <item> stop </item>
+      <item> suspend </item>
+      <item> telltc </item>
+      <item> time </item>
+      <item> umask </item>
+      <item> unalias </item>
+      <item> uncomplete </item>
+      <item> unhash </item>
+      <item> unlimit </item>
+      <item> ver </item>
+      <item> wait </item>
+      <item> watchlog </item>
+      <item> where </item>
+      <item> which </item>
+    </list>
+
+    <list name="builtins_var">
+      <item> unset </item>
+      <item> unsetenv </item>
+    </list>
+
+    <list name="unixcommands">
+      <!-- /bin -->
+      <item> arch </item>
+      <item> awk </item>
+      <item> bash </item>
+      <item> bunzip2 </item>
+      <item> bzcat </item>
+      <item> bzcmp </item>
+      <item> bzdiff </item>
+      <item> bzegrep </item>
+      <item> bzfgrep </item>
+      <item> bzgrep </item>
+      <item> bzip2 </item>
+      <item> bzip2recover </item>
+      <item> bzless </item>
+      <item> bzmore </item>
+      <item> cat </item>
+      <item> chattr </item>
+      <item> chgrp </item>
+      <item> chmod </item>
+      <item> chown </item>
+      <item> chvt </item>
+      <item> cp </item>
+      <item> date </item>
+      <item> dd </item>
+      <item> deallocvt </item>
+      <item> df </item>
+      <item> dir </item>
+      <item> dircolors </item>
+      <item> dmesg </item>
+      <item> dnsdomainname </item>
+      <item> domainname </item>
+      <item> du </item>
+      <item> dumpkeys </item>
+      <item> echo </item>
+      <item> ed </item>
+      <item> egrep </item>
+      <item> false </item>
+      <item> fgconsole </item>
+      <item> fgrep </item>
+      <item> fuser </item>
+      <item> gawk </item>
+      <item> getkeycodes </item>
+      <item> gocr </item>
+      <item> grep </item>
+      <item> groff </item>
+      <item> groups </item>
+      <item> gunzip </item>
+      <item> gzexe </item>
+      <item> gzip </item>
+      <item> hostname </item>
+      <item> igawk </item>
+      <item> install </item>
+      <item> kbd_mode </item>
+      <item> kbdrate </item>
+      <item> killall </item>
+      <item> last </item>
+      <item> lastb </item>
+      <item> link </item>
+      <item> ln </item>
+      <item> loadkeys </item>
+      <item> loadunimap </item>
+      <item> login </item>
+      <item> ls </item>
+      <item> lsattr </item>
+      <item> lsmod </item>
+      <item> lsmod.old </item>
+      <item> mapscrn </item>
+      <item> mesg </item>
+      <item> mkdir </item>
+      <item> mkfifo </item>
+      <item> mknod </item>
+      <item> mktemp </item>
+      <item> more </item>
+      <item> mount </item>
+      <item> mv </item>
+      <item> nano </item>
+      <item> netstat </item>
+      <item> nisdomainname </item>
+      <item> nroff </item>
+      <item> openvt </item>
+      <item> pgawk </item>
+      <item> pidof </item>
+      <item> ping </item>
+      <item> ps </item>
+      <item> pstree </item>
+      <item> pwd </item>
+      <item> rbash </item>
+      <item> readlink </item>
+      <item> red </item>
+      <item> resizecons </item>
+      <item> rm </item>
+      <item> rmdir </item>
+      <item> run-parts </item>
+      <item> sash </item>
+      <item> sed </item>
+      <item> setfont </item>
+      <item> setkeycodes </item>
+      <item> setleds </item>
+      <item> setmetamode </item>
+      <item> setserial </item>
+      <item> sh </item>
+      <item> showkey </item>
+      <item> shred </item>
+      <item> sleep </item>
+      <item> ssed </item>
+      <item> stat </item>
+      <item> stty </item>
+      <item> su </item>
+      <item> sync </item>
+      <item> tar </item>
+      <item> tempfile </item>
+      <item> touch </item>
+      <item> troff </item>
+      <item> true </item>
+      <item> umount </item>
+      <item> uname </item>
+      <item> unicode_start </item>
+      <item> unicode_stop </item>
+      <item> unlink </item>
+      <item> utmpdump </item>
+      <item> uuidgen </item>
+      <item> vdir </item>
+      <item> wall </item>
+      <item> wc </item>
+      <item> ypdomainname </item>
+      <item> zcat </item>
+      <item> zcmp </item>
+      <item> zdiff </item>
+      <item> zegrep </item>
+      <item> zfgrep </item>
+      <item> zforce </item>
+      <item> zgrep </item>
+      <item> zless </item>
+      <item> zmore </item>
+      <item> znew </item>
+      <item> zsh </item>
+
+      <!-- some from /usr/bin -->
+      <item> aclocal </item>
+      <item> aconnect </item>
+      <item> aplay </item>
+      <item> apm </item>
+      <item> apmsleep </item>
+      <item> apropos </item>
+      <item> ar </item>
+      <item> arecord </item>
+      <item> as </item>
+      <item> as86 </item>
+      <item> autoconf </item>
+      <item> autoheader </item>
+      <item> automake </item>
+      <item> awk </item>
+      <item> basename </item>
+      <item> bc </item>
+      <item> bison </item>
+      <item> c++ </item>
+      <item> cal </item>
+      <item> cat </item>
+      <item> cc </item>
+      <item> cdda2wav </item>
+      <item> cdparanoia </item>
+      <item> cdrdao </item>
+      <item> cd-read </item>
+      <item> cdrecord </item>
+      <item> chfn </item>
+      <item> chgrp </item>
+      <item> chmod </item>
+      <item> chown </item>
+      <item> chroot </item>
+      <item> chsh </item>
+      <item> clear </item>
+      <item> cmp </item>
+      <item> co </item>
+      <item> col </item>
+      <item> comm </item>
+      <item> cp </item>
+      <item> cpio </item>
+      <item> cpp </item>
+      <item> cut </item>
+      <item> dc </item>
+      <item> dd </item>
+      <item> df </item>
+      <item> diff </item>
+      <item> diff3 </item>
+      <item> dir </item>
+      <item> dircolors </item>
+      <item> directomatic </item>
+      <item> dirname </item>
+      <item> du </item>
+      <item> env </item>
+      <item> expr </item>
+      <item> fbset </item>
+      <item> file </item>
+      <item> find </item>
+      <item> flex </item>
+      <item> flex++ </item>
+      <item> fmt </item>
+      <item> free </item>
+      <item> ftp </item>
+      <item> funzip </item>
+      <item> fuser </item>
+      <item> g++ </item>
+      <item> gawk </item>
+      <item> gc </item>
+      <item> gcc </item>
+      <item> gdb </item>
+      <item> getent </item>
+      <item> getopt </item>
+      <item> gettext </item>
+      <item> gettextize </item>
+      <item> gimp </item>
+      <item> gimp-remote </item>
+      <item> gimptool </item>
+      <item> gmake </item>
+      <item> gs </item>
+      <item> head </item>
+      <item> hexdump </item>
+      <item> id </item>
+      <item> install </item>
+      <item> join </item>
+      <item> kill </item>
+      <item> killall </item>
+      <item> ld </item>
+      <item> ld86 </item>
+      <item> ldd </item>
+      <item> less </item>
+      <item> lex </item>
+      <item> ln </item>
+      <item> locate </item>
+      <item> lockfile </item>
+      <item> logname </item>
+      <item> lp </item>
+      <item> lpr </item>
+      <item> ls </item>
+      <item> lynx </item>
+      <item> m4 </item>
+      <item> make </item>
+      <item> man </item>
+      <item> mkdir </item>
+      <item> mknod </item>
+      <item> msgfmt </item>
+      <item> mv </item>
+      <item> namei </item>
+      <item> nasm </item>
+      <item> nawk </item>
+      <item> nice </item>
+      <item> nl </item>
+      <item> nm </item>
+      <item> nm86 </item>
+      <item> nmap </item>
+      <item> nohup </item>
+      <item> nop </item>
+      <item> od </item>
+      <item> passwd </item>
+      <item> patch </item>
+      <item> pcregrep </item>
+      <item> pcretest </item>
+      <item> perl </item>
+      <item> perror </item>
+      <item> pidof </item>
+      <item> pr </item>
+      <item> printf </item>
+      <item> procmail </item>
+      <item> prune </item>
+      <item> ps2ascii </item>
+      <item> ps2epsi </item>
+      <item> ps2frag </item>
+      <item> ps2pdf </item>
+      <item> ps2ps </item>
+      <item> psbook </item>
+      <item> psmerge </item>
+      <item> psnup </item>
+      <item> psresize </item>
+      <item> psselect </item>
+      <item> pstops </item>
+      <item> rcs </item>
+      <item> rev </item>
+      <item> rm </item>
+      <item> scp </item>
+      <item> sed </item>
+      <item> seq </item>
+      <item> setterm </item>
+      <item> shred </item>
+      <item> size </item>
+      <item> size86 </item>
+      <item> skill </item>
+      <item> slogin </item>
+      <item> snice </item>
+      <item> sort </item>
+      <item> sox </item>
+      <item> split </item>
+      <item> ssh </item>
+      <item> ssh-add </item>
+      <item> ssh-agent </item>
+      <item> ssh-keygen </item>
+      <item> ssh-keyscan </item>
+      <item> stat </item>
+      <item> strings </item>
+      <item> strip </item>
+      <item> sudo </item>
+      <item> suidperl </item>
+      <item> sum </item>
+      <item> tac </item>
+      <item> tail </item>
+      <item> tee </item>
+      <item> test </item>
+      <item> tr </item>
+      <item> uniq </item>
+      <item> unlink </item>
+      <item> unzip </item>
+      <item> updatedb </item>
+      <item> updmap </item>
+      <item> uptime </item>
+      <item> users </item>
+      <item> vmstat </item>
+      <item> w </item>
+      <item> wc </item>
+      <item> wget </item>
+      <item> whatis </item>
+      <item> whereis </item>
+      <item> which </item>
+      <item> who </item>
+      <item> whoami </item>
+      <item> write </item>
+      <item> xargs </item>
+      <item> yacc </item>
+      <item> yes </item>
+      <item> zip </item>
+      <item> zsoelim </item>
+
+      <!-- others -->
+      <item> dcop </item>
+      <item> kdialog </item>
+      <item> kfile </item>
+      <item> xhost </item>
+      <item> xmodmap </item>
+      <item> xset </item>
+    </list>
+
+
+    <contexts>
+      <context attribute="Normal Text" lineEndContext="#stay" name="Start">
+        <IncludeRules context="FindAll" />
+      </context>
+
+<!-- ====== The following rulessets are meant to be included ======== -->
+      <!-- FindAll tries to interpret everything -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindAll">
+        <IncludeRules context="FindComments" />
+        <IncludeRules context="FindCommands" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+      </context>
+
+      <!-- FindMost tries to interpret anything except commands -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindMost">
+        <IncludeRules context="FindComments" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+      </context>
+
+
+      <!-- FindComments consumes shell comments till EOL -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="FindComments">
+        <DetectChar attribute="Comment" context="Comment" char="#" firstNonSpace="true"/>
+        <RegExpr attribute="Normal Text" context="Comment" String="[\s;](?=#)" />
+      </context>
+      <context attribute="Comment" lineEndContext="#pop" name="Comment">
+        <IncludeRules context="##Alerts" />
+      </context>
+
+      <!-- FindCommentsParen consumes shell comments till EOL or a closing parenthese -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="FindCommentsParen">
+        <DetectChar attribute="Comment" context="CommentParen" char="#" firstNonSpace="true"/>
+        <RegExpr attribute="Normal Text" context="CommentParen" String="[\s;](?=#)" />
+      </context>
+      <context attribute="Comment" lineEndContext="#pop" name="CommentParen">
+        <RegExpr attribute="Comment" context="#pop" String="[^)](?=\))" />
+        <IncludeRules context="##Alerts" />
+      </context>
+
+      <!-- FindCommentsBackq consumes shell comments till EOL or a backquote -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="FindCommentsBackq">
+        <DetectChar attribute="Comment" context="CommentBackq" char="#" firstNonSpace="true"/>
+        <RegExpr attribute="Normal Text" context="CommentBackq" String="[\s;](?=#)" />
+      </context>
+      <context attribute="Comment" lineEndContext="#pop" name="CommentBackq">
+        <RegExpr attribute="Comment" context="#pop" String="[^`](?=`)" />
+        <IncludeRules context="##Alerts" />
+      </context>
+
+
+      <!-- breaksw case default if else end endif endsw foreach goto
+           set setenv switch while -->
+
+      <!-- FindCommands matches many items that can be expected outside strings, substitutions etc. -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindCommands">
+        <!-- start expression in double parentheses -->
+<!--!--><Detect2Chars attribute="Keyword" context="ExprDblParen" char="(" char1="(" beginRegion="expression" />
+        <!-- start expression in double brackets -->
+<!--!--><RegExpr attribute="Keyword" context="ExprDblBracket" String="\[\[&eos;" beginRegion="expression" column="0"/>
+<!--!--><RegExpr attribute="Keyword" context="ExprDblBracket" String="\s\[\[&eos;" beginRegion="expression" />
+        <!-- start expression in single brackets -->
+<!--!--><RegExpr attribute="Builtin" context="ExprBracket" String="\[&eos;" beginRegion="expression" column="0"/>
+<!--!--><RegExpr attribute="Builtin" context="ExprBracket" String="\s\[&eos;" beginRegion="expression" />
+        <!-- start a group command with { -->
+<!--!--><RegExpr attribute="Keyword" context="Group" String="\{&eos;" beginRegion="group" />
+        <!-- start a subshell -->
+<!--!--><DetectChar attribute="Keyword" context="SubShell" char="(" beginRegion="subshell" />
+        <!-- match do and if blocks -->
+<!--!--><RegExpr attribute="Keyword" context="#stay" String="\bdo&noword;" beginRegion="do" />
+<!--!--><RegExpr attribute="Keyword" context="#stay" String="\bdone&noword;" endRegion="do" />
+<!--!--><RegExpr attribute="Keyword" context="#stay" String="\belse\s+if&noword;" />
+<!--!--><RegExpr attribute="Keyword" context="#stay" String="\bif&noword;" beginRegion="if" />
+<!--!--><RegExpr attribute="Keyword" context="#stay" String="\bendif&noword;" endRegion="if" />
+        <!-- handle switch as a special case -->
+<!--!--><RegExpr attribute="Keyword" context="Switch" String="\bswitch&noword;" beginRegion="switch" />
+        <!-- handle command line options -->
+        <RegExpr attribute="Option" context="#stay" String="-[A-Za-z0-9][A-Za-z0-9_]*" />
+        <RegExpr attribute="Option" context="#stay" String="--[a-z][A-Za-z0-9_-]*" />
+        <!-- handle variable assignments -->
+<!--R--><RegExpr attribute="Keyword" context="Cmd@" String="\b@\s" />
+<!--R--><RegExpr attribute="Keyword" context="CmdSet" String="\bset\s" />
+        <RegExpr attribute="Keyword" context="CmdSetEnv" String="\bsetenv\s" />
+        <!-- handle functions with function keyword before keywords -->
+<!--!--><StringDetect attribute="Function" context="#stay" String=":()" />
+<!--!--><RegExpr attribute="Keyword" context="FunctionDef" String="\bfunction\b" />
+        <!-- handle keywords -->
+        <keyword attribute="Keyword" context="#stay" String="keywords" />
+        <keyword attribute="Builtin" context="#stay" String="builtins" />
+        <keyword attribute="Command" context="#stay" String="unixcommands" />
+        <!-- handle commands that have variable names as argument -->
+        <keyword attribute="Builtin" context="VarName" String="builtins_var" />
+        <!-- handle redirection -->
+        <RegExpr attribute="Redirection" context="#stay" String="(&lt;&lt;?|&gt;&gt;?&amp;?!?)" />
+        <!-- handle &, &&, | and || -->
+        <RegExpr attribute="Control" context="#stay" String="([|&amp;])\1?" />
+        <!-- mark function definitions without function keyword -->
+        <RegExpr attribute="Function" context="#stay" String="&funcname;\s*\(\)" />
+      </context>
+
+      <!-- FindOthers contains various rules to mark different shell input -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindOthers">
+        <RegExpr attribute="Escape" context="#stay" String="\\[;&quot;\\'$`{}()|&amp;&lt;&gt;* ]" />
+<!--?   <RegExpr attribute="Escape" context="#stay" String="\{(?!(\s|$))\S*\}" />-->
+        <RegExpr attribute="Path" context="#stay" String="&pathpart;*(?=/)" />
+        <RegExpr attribute="Path" context="#stay" String="~\w*" />
+        <RegExpr attribute="Path" context="#stay" String="/&pathpart;*(?=([\s/):;$`'&quot;]|$))" />
+        <!-- TODO: shell globs -->
+      </context>
+
+      <!-- FindStrings looks for single and double quoted strings, also with $-prefix -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindStrings">
+        <DetectChar attribute="String SingleQ" context="StringSQ" char="'" />
+        <DetectChar attribute="String DoubleQ" context="StringDQ" char="&quot;" />
+        <Detect2Chars attribute="String SingleQ" context="StringEsc" char="$" char1="'" />
+        <Detect2Chars attribute="String Transl." context="StringDQ" char="$" char1="&quot;" />
+      </context>
+
+      <!-- FindSubstitutions goes after anything starting with $ and ` and their escapes -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindSubstitutions">
+        <RegExpr attribute="Variable" context="Subscript" String="\$&varname;\[" />
+        <RegExpr attribute="Variable" context="#stay" String="\$&varname;" />
+        <RegExpr attribute="Variable" context="#stay" String="\$[*@#?$!_0-9-]" />
+        <RegExpr attribute="Variable" context="#stay" String="\$\{[*@#?$!_0-9-]\}" />
+        <RegExpr attribute="Variable" context="#stay" String="\$\{#&varname;\}" />
+        <RegExpr attribute="Variable" context="#stay" String="\$\{!&varname;\*?\}" />
+        <RegExpr attribute="Variable" context="VarBrace" String="\$\{&varname;" />
+        <RegExpr attribute="Variable" context="VarBrace" String="\$\{[*@#?$!_0-9-](?=[:#%/])" />
+        <StringDetect attribute="Variable" context="ExprDblParenSubst" String="$((" beginRegion="expression" />
+<!--?   <StringDetect attribute="Redirection" context="SubstFile" String="$(&lt;" />-->
+<!--?   <StringDetect attribute="Variable" context="SubstCommand" String="$(" />-->
+        <DetectChar attribute="Backquote" context="SubstBackq" char="`" />
+        <RegExpr attribute="Escape" context="#stay" String="\\[`$\\]" />
+      </context>
+
+      <!-- FindTests finds operators valid in tests -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindTests">
+        <RegExpr attribute="Expression" context="#stay" String="-[rwxXeozsfdlbcpSugktRLDIFNZ](?=\s)"/>
+        <RegExpr attribute="Expression" context="#stay" String="-[AMCUG]:?(?=\s)"/>
+        <RegExpr attribute="Expression" context="#stay" String="-P[0-7]{,3}:?(?=\s)"/>
+        <RegExpr attribute="Expression" context="#stay" String="([|&amp;=&gt;&lt;)\1"/>
+        <RegExpr attribute="Expression" context="#stay" String="[|^&amp;&gt;&lt;+-*/%!~]"/>
+        <RegExpr attribute="Expression" context="#stay" String="([!=]~|[!&gt;&lt;]=)"/>
+      </context>
+
+
+<!-- ====== These are the contexts that can be branched to ======= -->
+
+      <!-- ExprDblParen consumes an expression started in command mode till )) -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblParen">
+        <Detect2Chars attribute="Keyword" context="#pop" char=")" char1=")" endRegion="expression" />
+        <DetectChar attribute="Normal Text" context="ExprSubParen" char="(" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- ExprDblParenSubst like ExprDblParen but matches )) as Variable -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblParenSubst">
+        <Detect2Chars attribute="Variable" context="#pop" char=")" char1=")" endRegion="expression" />
+        <DetectChar attribute="Normal Text" context="ExprSubParen" char="(" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- ExprSubParen consumes an expression till ) -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprSubParen">
+        <DetectChar attribute="Normal Text" context="#pop" char=")" />
+        <DetectChar attribute="Normal Text" context="ExprSubParen" char="(" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- ExprBracket consumes an expression till ] -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracket">
+        <RegExpr attribute="Builtin" context="#pop" String="\s\](?=($|[\s;|&amp;]))" endRegion="expression" />
+        <RegExpr attribute="Builtin" context="#pop" String="\](?=($|[\s;|&amp;]))" endRegion="expression" column="0"/>
+        <DetectChar attribute="Normal Text" context="ExprSubParen" char="(" />
+        <IncludeRules context="FindTests" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- ExprDblBracket consumes an expression till ]] -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracket">
+        <RegExpr attribute="Keyword" context="#pop" String="\s\]\](?=($|[\s;|&amp;]))" endRegion="expression" />
+        <RegExpr attribute="Keyword" context="#pop" String="\]\](?=($|[\s;|&amp;]))" endRegion="expression" column="0"/>
+        <DetectChar attribute="Normal Text" context="ExprSubParen" char="(" />
+        <IncludeRules context="FindTests" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- Group consumes shell input till } -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="Group">
+        <DetectChar attribute="Keyword" context="#pop" char="}" endRegion="group" />
+        <IncludeRules context="FindAll" />
+      </context>
+
+      <!-- SubShell consumes shell input till ) -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="SubShell">
+        <DetectChar attribute="Keyword" context="#pop" char=")" endRegion="subshell" />
+        <IncludeRules context="FindAll" />
+      </context>
+
+      <!-- Assign consumes an expression till EOL or whitespace -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="Assign" fallthrough="true" fallthroughContext="#pop">
+        <DetectChar attribute="Variable" context="AssignArray" char="(" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+        <RegExpr attribute="Normal Text" context="#stay" String="[\w:,+_./-]+" />
+      </context>
+
+      <!-- AssignArray consumes everything till ), marking assignments -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="AssignArray">
+        <DetectChar attribute="Variable" context="#pop" char=")" />
+        <DetectChar attribute="Variable" context="Subscript" char="[" />
+        <DetectChar attribute="Variable" context="Assign" char="=" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- AssignSubscr first expects a [ then parses subscript and continues with '=value' -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="AssignSubscr" fallthrough="true" fallthroughContext="#pop">
+        <DetectChar attribute="Variable" context="Subscript" char="[" />
+        <DetectChar attribute="Variable" context="Assign" char="=" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+      </context>
+
+      <!-- Subscript consumes anything till ], marks as Variable -->
+      <context attribute="Variable" lineEndContext="#stay" name="Subscript">
+        <DetectChar attribute="Variable" context="#pop" char="]" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+      </context>
+
+      <!-- FunctionDef consumes a name, possibly with (), marks as Function -->
+      <context attribute="Function" lineEndContext="#pop" name="FunctionDef" fallthrough="true" fallthroughContext="#pop">
+        <RegExpr attribute="Function" context="#pop" String="\s+&funcname;(\s*\(\))?" />
+      </context>
+
+      <!-- CmdSetEnv handles the name part of setenv -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="CmdSetEnv" fallthrough="true" fallthroughContext="#pop">
+        <!-- handle command line options -->
+        <RegExpr attribute="Variable" context="#pop" String="\b&varname;" />
+        <DetectChar attribute="Variable" context="Assign" char="\s" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- VarName consumes spare variable names and assignments -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="VarName" fallthrough="true" fallthroughContext="#pop">
+        <!-- handle command line options -->
+        <RegExpr attribute="Option" context="#stay" String="-[A-Za-z0-9]+" />
+        <RegExpr attribute="Option" context="#stay" String="--[a-z][A-Za-z0-9_-]*" />
+        <RegExpr attribute="Variable" context="#stay" String="\b&varname;" />
+        <DetectChar attribute="Variable" context="Subscript" char="[" />
+        <DetectChar attribute="Variable" context="Assign" char="=" />
+        <IncludeRules context="FindMost" />
+        <!-- stay here in spaces and other safe characters -->
+        <RegExpr attribute="Normal Text" context="#stay" String="[^]})|;`&amp;&gt;&lt;]" />
+      </context>
+
+      <!-- ProcessSubst handles <(command) and >(command) -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="ProcessSubst">
+        <DetectChar attribute="Redirection" context="#pop" char=")" />
+        <IncludeRules context="FindCommentsParen" />
+        <IncludeRules context="FindCommands" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+      </context>
+
+      <!-- StringSQ consumes anything till ' -->
+      <context attribute="String SingleQ" lineEndContext="#stay" name="StringSQ">
+        <DetectChar attribute="String SingleQ" context="#pop" char="'" />
+      </context>
+
+      <!-- StringDQ consumes anything till ", substitutes vars and expressions -->
+      <context attribute="String DoubleQ" lineEndContext="#stay" name="StringDQ">
+        <DetectChar attribute="String DoubleQ" context="#pop" char="&quot;" />
+        <RegExpr attribute="String Escape" context="#stay" String="\\[`&quot;\\$\n]" />
+        <IncludeRules context="FindSubstitutions" />
+      </context>
+
+      <!-- StringEsc eats till ', but escaping many characters -->
+      <context attribute="String SingleQ" lineEndContext="#stay" name="StringEsc">
+        <DetectChar attribute="String SingleQ" context="#pop" char="'" />
+        <RegExpr attribute="String Escape" context="#stay" String="\\[abefnrtv\\']" />
+        <RegExpr attribute="String Escape" context="#stay" String="\\([0-7]{1,3}|x[A-Fa-f0-9]{1,2}|c.)" />
+      </context>
+
+      <!-- VarBrace is called as soon as ${xxx is encoutered -->
+      <context attribute="Variable" lineEndContext="#stay" name="VarBrace">
+        <DetectChar attribute="Variable" context="#pop" char="}" />
+        <DetectChar attribute="Variable" context="Subscript" char="[" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <!-- TODO: highlight various special parameter expansions } -->
+      </context>
+
+      <!-- SubstFile is called after a <( or >( is encoutered -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="SubstFile">
+        <DetectChar attribute="Redirection" context="#pop" char=")" />
+        <IncludeRules context="FindCommentsParen" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+      </context>
+
+      <!-- SubstCommand is called after a $( is encountered -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="SubstCommand">
+        <DetectChar attribute="Variable" context="#pop" char=")" />
+        <IncludeRules context="FindCommentsParen" />
+        <IncludeRules context="FindCommands" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+      </context>
+
+      <!-- SubstBackq is called when a backquote is encountered -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="SubstBackq">
+        <DetectChar attribute="Backquote" context="#pop" char="`" />
+        <IncludeRules context="FindCommentsBackq" />
+        <IncludeRules context="FindCommands" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+      </context>
+
+      <!-- Switch is called after the switch keyword is encoutered. This is
+           left over from the bash highlighter where the lonely parentheses
+           would otherwise cause trouble. We keep it because it lets us do a
+           bit of extra syntax validation. -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="Switch">
+        <RegExpr attribute="Keyword" context="SwitchCase" String="\scase\b" />
+        <RegExpr attribute="Keyword" context="SwitchDefault" String="\sdefault\b" />
+        <RegExpr attribute="Keyword" context="#pop" String="\bendsw(?=$|[\s;)])" endRegion="switch" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- SwitchCase is called when the construct 'switch ... case' has been found. -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="SwitchCase">
+        <DetectChar attribute="Keyword" context="SwitchExpr" char=":" beginRegion="switchexpr" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- SwitchDefault is called when the construct 'switch ... default' has been found. -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="SwitchDefault">
+        <DetectChar attribute="Keyword" context="SwitchExpr" char=":" beginRegion="switchexpr" />
+      </context>
+
+      <!-- SwitchExpr eats shell input till breaksw -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="SwitchExpr">
+        <RegExpr attribute="Keyword" context="#pop#pop" String="\sbreaksw\b" endRegion="switchexpr" />
+        <RegExpr attribute="Keyword" context="#pop#pop" String="\scase\b" endRegion="switchexpr" lookAhead="true" />
+        <IncludeRules context="FindAll" />
+      </context>
+
+      <!-- HereDoc consumes Here-documents. It is called at the beginning of the "<<" construct. -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="HereDoc">
+        <RegExpr attribute="Redirection" context="HereDocIQ"  String="(&lt;&lt;-\s*&quot;(&word;)&quot;)" lookAhead="true" />
+        <RegExpr attribute="Redirection" context="HereDocIQ"  String="(&lt;&lt;-\s*'(&word;)')" lookAhead="true" />
+        <RegExpr attribute="Redirection" context="HereDocIQ"  String="(&lt;&lt;-\s*\\(&word;))" lookAhead="true" />
+        <RegExpr attribute="Redirection" context="HereDocINQ" String="(&lt;&lt;-\s*(&word;))" lookAhead="true" />
+        <RegExpr attribute="Redirection" context="HereDocQ"   String="(&lt;&lt;\s*&quot;(&word;)&quot;)" lookAhead="true" />
+        <RegExpr attribute="Redirection" context="HereDocQ"   String="(&lt;&lt;\s*'(&word;)')" lookAhead="true" />
+        <RegExpr attribute="Redirection" context="HereDocQ"   String="(&lt;&lt;\s*\\(&word;))" lookAhead="true" />
+        <RegExpr attribute="Redirection" context="HereDocNQ"  String="(&lt;&lt;\s*(&word;))" lookAhead="true" />
+        <StringDetect attribute="Redirection" context="#pop"  String="&lt;&lt;" /><!-- always met -->
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#pop" name="HereDocRemainder">
+        <IncludeRules context="FindAll" />
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#stay" name="HereDocQ" dynamic="true">
+        <RegExpr attribute="Redirection" context="HereDocRemainder" String="%1" dynamic="true" />
+        <RegExpr attribute="Redirection" context="#pop#pop" String="%2[\s;]*$" dynamic="true" column="0"/>
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#stay" name="HereDocNQ" dynamic="true">
+        <RegExpr attribute="Redirection" context="HereDocRemainder" String="%1" dynamic="true" />
+        <RegExpr attribute="Redirection" context="#pop#pop" String="%2[\s;]*$" dynamic="true" column="0"/>
+        <IncludeRules context="FindSubstitutions" />
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#stay" name="HereDocIQ" dynamic="true">
+        <RegExpr attribute="Redirection" context="HereDocRemainder" String="%1" dynamic="true" />
+        <RegExpr attribute="Redirection" context="#pop#pop" String="\s*%2[\s;]*$" dynamic="true" column="0"/>
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#stay" name="HereDocINQ" dynamic="true">
+        <RegExpr attribute="Redirection" context="HereDocRemainder" String="%1" dynamic="true" />
+        <RegExpr attribute="Redirection" context="#pop#pop" String="\s*%2[\s;]*$" dynamic="true" column="0"/>
+        <IncludeRules context="FindSubstitutions" />
+      </context>
+
+    </contexts>
+
+    <itemDatas>
+      <itemData name="Normal Text"	defStyleNum="dsNormal" />
+      <itemData name="Comment"		defStyleNum="dsComment" />
+      <itemData name="Keyword" 		defStyleNum="dsKeyword" />
+      <itemData name="Control" 		defStyleNum="dsKeyword" />
+      <itemData name="Label"            defStyleNum="dsOthers" />
+      <itemData name="Builtin" 		defStyleNum="dsKeyword" />
+      <itemData name="Command" 		defStyleNum="dsKeyword" />
+      <itemData name="Redirection" 	defStyleNum="dsKeyword" />
+      <itemData name="Escape" 		defStyleNum="dsDataType" />
+      <itemData name="String SingleQ" 	defStyleNum="dsString" />
+      <itemData name="String DoubleQ" 	defStyleNum="dsString" />
+      <itemData name="Backquote" 	defStyleNum="dsKeyword" />
+      <itemData name="String Transl." 	defStyleNum="dsString" />
+      <itemData name="String Escape" 	defStyleNum="dsDataType" />
+      <itemData name="Variable" 	defStyleNum="dsOthers" />
+      <itemData name="Expression" 	defStyleNum="dsOthers" />
+      <itemData name="Function" 	defStyleNum="dsFunction" />
+      <itemData name="Path" 		defStyleNum="dsNormal" />
+      <itemData name="Option" 		defStyleNum="dsNormal" />
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name="singleLine" start="#"/>
+    </comments>
+    <keywords casesensitive="1" weakDeliminator="^%#[]$._{}:-" additionalDeliminator="`"/>
+  </general>
+</language>
diff --git a/kate/data/txt2tags.xml b/kate/data/txt2tags.xml
index 61dc77e62..581f469f6 100644
--- a/kate/data/txt2tags.xml
+++ b/kate/data/txt2tags.xml
@@ -2,29 +2,32 @@
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- Created by Juliano Dorneles dos Santos <[email protected]> -->
 <!-- Fixed for 3.2 Helio Chissini de Castro <[email protected]> -->
-<language name="txt2tags" extensions="*.t2t" section="Markup" mimetype="text/txt2tags" version="1.01" kateversion="2.4" casesensitive="1">
+<!-- Extended and adapted (v1.20) by Eric Forgeot < http://esclinux.tk > -->
+<language name="txt2tags" extensions="*.t2t" section="Markup" mimetype="text/txt2tags" version="1.20" kateversion="2.4" casesensitive="1">
 <highlighting>
 
 <contexts>
 	<context name="Context" attribute="Normal" lineEndContext="#stay">
 		<RegExpr attribute="Date" context="Context" String="%%date(\(.*\))?"/>
 		<RegExpr attribute="Comment" context="Context" String="%.*"/>
-		<RegExpr attribute="Bold" context="Context" String="\*\*.*\*\*"/>
-		<RegExpr attribute="Italic" context="Context" String="//.*//"/>
-		<RegExpr attribute="BoldItalic" context="Context" String="\*\*//.*//\*\*"/>
-		<RegExpr attribute="BoldItalic" context="Context" String="__.*__"/>
-		<RegExpr attribute="Monospaced" context="Context" String="``.*``"/>
+		<RegExpr attribute="BoldItalic" context="Context" String="\*\*//(.*)//\*\*" minimal="true"/>
+		<RegExpr attribute="BoldItalic" context="Context" String="//\*\*(.*)\*\*//" minimal="true" />
+		<RegExpr attribute="Bold" context="Context" String="\*\*.*\*\*" minimal="true"/>
+		<RegExpr attribute="Italic" context="Context" String="//.*//" minimal="true"/>
+		<RegExpr attribute="Underline" context="Context" String="__.*__" minimal="true"/>
+		<RegExpr attribute="Strikeout" context="Context" String="--.*--" minimal="true"/>
+		<RegExpr attribute="Monospaced" context="Context" String="``.*``" minimal="true"/>
 		<RegExpr attribute="Verbatim Line" context="Context" String="``` .*"/>
-		<RegExpr attribute="Title" context="Context" String=" *=[^=].*[^=]=\s*$" column="0"/>
-		<RegExpr attribute="Title" context="Context" String=" *==[^=].*[^=]==\s*$" column="0"/>
-		<RegExpr attribute="Title" context="Context" String=" *===[^=].*[^=]===\s*$" column="0"/>
-		<RegExpr attribute="Title" context="Context" String=" *====[^=].*[^=]====\s*$" column="0"/>
-		<RegExpr attribute="Title" context="Context" String=" *=====[^=].*[^=]=====\s*$" column="0"/>
-		<RegExpr attribute="Title" context="Context" String=" *\+[^=].*[^=]\+\s*$" column="0"/>
-		<RegExpr attribute="Title" context="Context" String=" *\+\+[^=].*[^=]\+\+\s*$" column="0"/>
-		<RegExpr attribute="Title" context="Context" String=" *\+\+\+[^=].*[^=]\+\+\+\s*$" column="0"/>
-		<RegExpr attribute="Title" context="Context" String=" *\+\+\+\+[^=].*[^=]\+\+\+\+\s*$" column="0"/>
-		<RegExpr attribute="Title" context="Context" String=" *\+\+\+\+\+[^=].*[^=]\+\+\+\+\+\s*$" column="0"/>
+		<RegExpr attribute="Title" context="Context" String=" *=[^=].*[^=]=(\[.*\])?\s*$" column="0" beginRegion="Header" endRegion="Header"/>
+		<RegExpr attribute="Title" context="Context" String=" *==[^=].*[^=]==(\[.*\])?\s*$" column="0" beginRegion="Header" endRegion="Header"/>
+		<RegExpr attribute="Title" context="Context" String=" *===[^=].*[^=]===(\[.*\])?\s*$" column="0" beginRegion="Header" endRegion="Header"/>
+		<RegExpr attribute="Title" context="Context" String=" *====[^=].*[^=]====(\[.*\])?\s*$" column="0" beginRegion="Header" endRegion="Header"/>
+		<RegExpr attribute="Title" context="Context" String=" *=====[^=].*[^=]=====(\[.*\])?\s*$" column="0" beginRegion="Header" endRegion="Header"/>
+		<RegExpr attribute="Title" context="Context" String=" *\+[^=].*[^=]\+(\[.*\])?\s*$" column="0" beginRegion="Header" endRegion="Header"/>
+		<RegExpr attribute="Title" context="Context" String=" *\+\+[^=].*[^=]\+\+(\[.*\])?\s*$" column="0" beginRegion="Header" endRegion="Header"/>
+		<RegExpr attribute="Title" context="Context" String=" *\+\+\+[^=].*[^=]\+\+\+(\[.*\])?\s*$" column="0" beginRegion="Header" endRegion="Header"/>
+		<RegExpr attribute="Title" context="Context" String=" *\+\+\+\+[^=].*[^=]\+\+\+\+(\[.*\])?\s*$" column="0" beginRegion="Header" endRegion="Header"/>
+		<RegExpr attribute="Title" context="Context" String=" *\+\+\+\+\+[^=].*[^=]\+\+\+\+\+(\[.*\])?\s*$" column="0" beginRegion="Header" endRegion="Header"/>
 		<RangeDetect attribute="Link" char="[" char1="]"/>
 		<RegExpr attribute="Tabel" context="Context" String=" *\|\| .*" column="0"/>
 		<RegExpr attribute="Tabel" context="Context" String=" *\| .*" column="0"/>
@@ -33,6 +36,7 @@
 		<RegExpr attribute="NumList" context="Context" String=" *\+ .*" column="0"/>
 		<RegExpr attribute="Quote" context="Context" String="\t.*"/>
 		<RegExpr attribute="Bar" context="Context" String="\s*([_=-]{20,})\s*$"/>
+		<RegExpr attribute="EOF" context="Context" String="$$" column="0" beginRegion="Header" endRegion="Header"/>
 	</context>
 </contexts>
 
@@ -40,18 +44,20 @@
 	<itemData name="Normal" defStyleNum="dsNormal" />
 	<itemData name="Date" defStyleNum="dsNormal" color="#FF0000" italic="1" />
 	<itemData name="Comment" defStyleNum="dsNormal" color="#666666" italic="1" />
-	<itemData name="Bold" defStyleNum="dsNormal" bold="1" />
-	<itemData name="Italic" defStyleNum="dsNormal" italic="1" />
 	<itemData name="BoldItalic" defStyleNum="dsNormal" bold="1" italic="1" />
+	<itemData name="Bold" defStyleNum="dsNormal" color="#445675" bold="1" />
+	<itemData name="Italic" defStyleNum="dsNormal" color="#653A39" italic="1" />
+	<itemData name="Underline" defStyleNum="dsNormal" color="#386742" underline="1" />
+	<itemData name="Strikeout" defStyleNum="dsNormal" color="#644A9B" strikeOut="1" />
 	<itemData name="Monospaced" defStyleNum="dsNormal" color="#006600" />
 	<itemData name="Verbatim Line" defStyleNum="dsNormal" color="#006600" />
 	<itemData name="Verbatim Area" defStyleNum="dsNormal" color="#006600" />
 	<itemData name="Title" defStyleNum="dsNormal" color="#990000" />
-	<itemData name="Link" defStyleNum="dsNormal" color="#000099" />
+	<itemData name="Link" defStyleNum="dsNormal" color="#0930DE" />
 	<itemData name="Tabel" defStyleNum="dsNormal" color="#FF0000" />
-	<itemData name="DefList" defStyleNum="dsNormal" color="#FFCC66" />
-	<itemData name="List" defStyleNum="dsNormal" color="#FFCC66" />
-	<itemData name="NumList" defStyleNum="dsNormal" color="#FFCC66" />
+	<itemData name="DefList" defStyleNum="dsNormal" color="#E300EE" />
+	<itemData name="List" defStyleNum="dsNormal" color="#E300EE" />
+	<itemData name="NumList" defStyleNum="dsNormal" color="#E300EE" />
 	<itemData name="Quote" defStyleNum="dsNormal" color="brown" />
 	<itemData name="Bar" defStyleNum="dsNormal" color="#C0C0C0" />
 </itemDatas>
diff --git a/kate/data/valgrind-suppression.xml b/kate/data/valgrind-suppression.xml
new file mode 100644
index 000000000..9ac949841
--- /dev/null
+++ b/kate/data/valgrind-suppression.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<language name="Valgrind Suppression" section="Other" extensions="*.supp;" mimetype="" version="1.0" kateversion="2.0" author="Milian Wolff ([email protected])" license="LGPL">
+<highlighting>
+<contexts>
+  <context name="File" attribute="Normal Text" lineEndContext="#stay">
+    <DetectChar char="#" attribute="Comment" context="Comment" firstNonSpace="true" />
+    <DetectChar char="{" attribute="Normal Text" context="Rule" firstNonSpace="true" />
+ </context>
+
+  <context name="Rule" attribute="Normal Text" lineEndContext="#stay" >
+    <RegExpr attribute="RuleName" String="^[^\}]+$" context="Rule2" />
+    <DetectChar char="}" attribute="Normal Text" context="#pop" firstNonSpace="true" />
+  </context>
+
+  <context name="Rule2" attribute="Normal Text" lineEndContext="#stay" >
+    <RegExpr attribute="ErrorKind" String="\w+:\w+" context="Rule3" />
+    <DetectChar char="}" attribute="Normal Text" context="#pop#pop" firstNonSpace="true" />
+  </context>
+
+  <context name="Rule3" attribute="Normal Text" lineEndContext="#stay" >
+    <RegExpr attribute="FrameKind" String="fun:|obj:|\.\.\." context="#stay" />
+    <DetectChar char="}" attribute="Normal Text" context="#pop#pop#pop" firstNonSpace="true" />
+  </context>
+
+  <context name="Comment" attribute="Comment" lineEndContext="#pop">
+    <DetectSpaces />
+    <IncludeRules context="##Alerts" />
+    <DetectIdentifier />
+  </context>
+</contexts>
+
+
+<itemDatas>
+ <itemData name="Normal Text" defStyleNum="dsNormal" />
+ <itemData name="RuleName" defStyleNum="dsKeyword" />
+ <itemData name="Comment" defStyleNum="dsComment" />
+ <itemData name="ErrorKind" defStyleNum="dsOthers" />
+ <itemData name="FrameKind" defStyleNum="dsFunction" />
+</itemDatas>
+</highlighting>
+
+
+<general>
+ <comments>
+  <comment name="singleLine" start="#" />
+ </comments>
+ <keywords casesensitive="0" />
+</general>
+
+</language>
diff --git a/kate/data/vera.xml b/kate/data/vera.xml
new file mode 100644
index 000000000..aadb4b4a6
--- /dev/null
+++ b/kate/data/vera.xml
@@ -0,0 +1,648 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************************-->
+<!-- $Id: vera.xml 6 2008-12-07 21:19:40Z seanoboyle $                     -->
+<!--***********************************************************************-->
+<!--  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 3 of the License, or    -->
+<!--  (at your option) 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, see <http://www.gnu.org/licenses/>.-->
+<!--                                                                       -->
+<!--***********************************************************************-->
+<!-- Title:        Vera Language Keywords File for Kate Editor             -->
+<!-- Description:  This file contains the Vera keywords defined in the     -->
+<!--               OpenVera LRM: Testbench Ver 1.4.4 in the format expected-->
+<!--               by the Kate Editor.                                     -->
+<!--                                                                       -->
+<!-- Original Author: Sean O'Boyle                                         -->
+<!-- Contact:         [email protected]                         -->
+<!-- Company:         Intelligent Design Verification                      -->
+<!-- Company URL:     http://intelligentdv.com                             -->
+<!--                                                                       -->
+<!-- Download the most recent version here:                                -->
+<!--                  http://intelligentdv.com/downloads                   -->
+<!--                                                                       -->
+<!-- File Bugs Here:  http://bugs.intelligentdv.com                        -->
+<!--        Project:  SyntaxKateVera                                       -->
+<!--                                                                       -->
+<!-- File: vera.xml                                                        -->
+<!-- $LastChangedBy: seanoboyle $                                          -->
+<!-- $LastChangedDate: 2008-12-07 13:19:40 -0800 (Sun, 07 Dec 2008) $      -->
+<!-- $LastChangedRevision: 6 $                                             -->
+<!--                                                                       -->
+<!--***********************************************************************-->
+<!DOCTYPE language SYSTEM "language.dtd">
+<language name="Vera" version="1.01" kateversion="2.5" section="Hardware" extensions="*.vr;*.vri;*.vrh" mimetype="text/x-vera-src" author="Sean O'Boyle ([email protected])" license="GPL">
+  <highlighting>
+    <list name="keywords">
+       <item>after</item>
+       <item>all</item>
+       <item>any</item>
+       <item>around</item>
+       <item>assoc_index</item>
+       <item>assoc_size</item>
+       <item>async</item>
+       <item>bad_state</item>
+       <item>bad_trans</item>
+       <item>before</item>
+       <item>begin</item>
+       <item>big_endian</item>
+       <item>bind</item>
+       <item>bin_activation</item>
+       <item>bit_normal</item>
+       <item>bit_reverse</item>
+       <item>break</item>
+       <item>breakpoint</item>
+       <item>case</item>
+       <item>casex</item>
+       <item>casez</item>
+       <item>class</item>
+       <item>constraint</item>
+       <item>continue</item>
+       <item>coverage</item>
+       <item>coverage_block</item>
+       <item>coverage_def</item>
+       <item>coverage_depth</item>
+       <item>coverage_goal</item>
+       <item>coverage_group</item>
+       <item>coverage_option</item>
+       <item>coverage_val</item>
+       <item>cross_num_print_missing</item>
+       <item>cross_auto_bin_max</item>
+       <item>cov_comment</item>
+       <item>default</item>
+       <item>depth</item>
+       <item>dist</item>
+       <item>do</item>
+       <item>else</item>
+       <item>end</item>
+       <item>enum</item>
+       <item>exhaustive</item>
+       <item>export</item>
+       <item>extends</item>
+       <item>extern</item>
+       <item>for</item>
+       <item>foreach</item>
+       <item>fork</item>
+       <item>function</item>
+       <item>hdl_task</item>
+       <item>hdl_node</item>
+       <item>hide</item>
+       <item>if</item>
+       <item>illegal_self_transition</item>
+       <item>illegal_state</item>
+       <item>illegal_transition</item>
+       <item>in</item>
+       <item>interface</item>
+       <item>invisible</item>
+       <item>join</item>
+       <item>little_endian</item>
+       <item>local</item>
+       <item>m_bad_state</item>
+       <item>m_bad_trans</item>
+       <item>m_state</item>
+       <item>m_trans</item>
+       <item>negedge</item>
+       <item>new</item>
+       <item>newcov</item>
+       <item>non_rand</item>
+       <item>none</item>
+       <item>not</item>
+       <item>null</item>
+       <item>or</item>
+       <item>ordered</item>
+       <item>packed</item>
+       <item>port</item>
+       <item>posedge</item>
+       <item>proceed</item>
+       <item>prod</item>
+       <item>prodget</item>
+       <item>prodset</item>
+       <item>program</item>
+       <item>protected</item>
+       <item>public</item>
+       <item>rand</item>
+       <item>randc</item>
+       <item>randcase</item>
+       <item>randseq</item>
+       <item>repeat</item>
+       <item>return</item>
+       <item>rules</item>
+       <item>sample</item>
+       <item>sample_event</item>
+       <item>shadow</item>
+       <item>soft</item>
+       <item>state</item>
+       <item>static</item>
+       <item>super</item>
+       <item>task</item>
+       <item>terminate</item>
+       <item>this</item>
+       <item>trans</item>
+       <item>typedef</item>
+       <item>unpacked</item>
+       <item>var</item>
+       <item>vca</item>
+       <item>vector</item>
+       <item>verilog_node</item>
+       <item>verilog_task</item>
+       <item>vhdl_node</item>
+       <item>vhdl_task</item>
+       <item>virtual</item>
+       <item>virtuals</item>
+       <item>visible</item>
+       <item>void</item>
+       <item>while</item>
+       <item>wildcard</item>
+       <item>with</item>
+    </list>
+    <list name="types">
+       <item>integer</item>
+       <item>bit</item>
+       <item>reg</item>
+       <item>string</item>
+       <item>bind_var</item>
+       <item>event</item>
+       <item>inout</item>
+       <item>input</item>
+       <item>output</item>
+       <item>ASYNC</item>
+       <item>CLOCK</item>
+       <item>NDRIVE</item>
+       <item>NHOLD</item>
+       <item>NRX</item>
+       <item>NRZ</item>
+       <item>NR0</item>
+       <item>NR1</item>
+       <item>NSAMPLE</item>
+       <item>PDRIVE</item>
+       <item>PHOLD</item>
+       <item>PRX</item>
+       <item>PRZ</item>
+       <item>PR0</item>
+       <item>PR1</item>
+       <item>PSAMPLE</item>
+    </list>
+    <list name="q_values">
+       <item>gnr</item>
+       <item>grx</item>
+       <item>grz</item>
+       <item>gr0</item>
+       <item>gr1</item>
+       <item>nr</item>
+       <item>rx</item>
+       <item>rz</item>
+       <item>r0</item>
+       <item>r1</item>
+       <item>snr</item>
+       <item>srx</item>
+       <item>srz</item>
+       <item>sr0</item>
+       <item>sr1</item>
+    </list>
+    <list name="methods">
+       <!-- system functions and tasks -->
+       <item>alloc</item>
+       <item>call_func</item>
+       <item>call_task</item>
+       <item>cast_assign</item>
+       <item>close_conn</item>
+       <item>cm_coverage</item>
+       <item>cm_get_coverage</item>
+       <item>cm_get_limit</item>
+       <item>coverage_backup_database_file</item>
+       <item>coverage_save_database</item>
+       <item>delay</item>
+       <item>error</item>
+       <item>error_mode</item>
+       <item>error_wait</item>
+       <item>exit</item>
+       <item>fclose</item>
+       <item>feof</item>
+       <item>ferror</item>
+       <item>fflush</item>
+       <item>flag</item>
+       <item>fopen</item>
+       <item>fprintf</item>
+       <item>freadb</item>
+       <item>freadb</item>
+       <item>freadh</item>
+       <item>freadstr</item>
+       <item>get_bind</item>
+       <item>get_bind_id</item>
+       <item>get_conn_err</item>
+       <item>get_cycle</item>
+       <item>get_env</item>
+       <item>get_memsize</item>
+       <item>get_plus_arg</item>
+       <item>get_systime</item>
+       <item>get_time</item>
+       <item>get_time_unit</item>
+       <item>getstate</item>
+       <item>initstate</item>
+       <item>lock_file</item>
+       <item>mailbox_get</item>
+       <item>mailbox_put</item>
+       <item>mailbox_receive</item>
+       <item>mailbox_send</item>
+       <item>make_client</item>
+       <item>make_server</item>
+       <item>os_command</item>
+       <item>printf</item>
+       <item>psprintf</item>
+       <item>query</item>
+       <item>query_str</item>
+       <item>query_x</item>
+       <item>rand48</item>
+       <item>random</item>
+       <item>region_enter</item>
+       <item>region_exit</item>
+       <item>rewind</item>
+       <item>semaphore_get</item>
+       <item>semaphore_put</item>
+       <item>setstate</item>
+       <item>signal_connect</item>
+       <item>simwave_plot</item>
+       <item>srandom</item>
+       <item>sprintf</item>
+       <item>sscanf</item>
+       <item>stop</item>
+       <item>suspend_thread</item>
+       <item>sync</item>
+       <item>timeout</item>
+       <item>trace</item>
+       <item>trigger</item>
+       <item>unit_delay</item>
+       <item>unlock_file</item>
+       <item>up_connections</item>
+       <item>urand48</item>
+       <item>urandom</item>
+       <item>urandom_range</item>
+       <item>vera_bit_reverse</item>
+       <item>vera_crc</item>
+       <item>vera_pack</item>
+       <item>vera_pack_big_endian</item>
+       <item>vera_plot</item>
+       <item>vera_report_profile</item>
+       <item>vera_unpack</item>
+       <item>vera_unpack_big_endian</item>
+       <item>vsv_call_func</item>
+       <item>vsv_call_task</item>
+       <item>vsv_close_conn</item>
+       <item>vsv_get_conn_err</item>
+       <item>vsv_make_client</item>
+       <item>vsv_make_server</item>
+       <item>vsv_up_connections</item>
+       <item>vsv_wait_for_done</item>
+       <item>vsv_wait_for_input</item>
+       <item>wait_child</item>
+       <item>wait_var</item>
+       <!-- class methods -->
+       <item>Configure</item>
+       <item>DisableTrigger</item>
+       <item>DoAction</item>
+       <item>EnableCount</item>
+       <item>EnableTrigger</item>
+       <item>Event</item>
+       <item>GetAssert</item>
+       <item>GetCount</item>
+       <item>GetFirstAssert</item>
+       <item>GetName</item>
+       <item>GetNextAssert</item>
+       <item>Wait</item>
+       <item>atobin</item>
+       <item>atohex</item>
+       <item>atoi</item>
+       <item>atooct</item>
+       <item>backref</item>
+       <item>bittostr</item>
+       <item>capacity</item>
+       <item>compare</item>
+       <item>constraint_mode</item>
+       <item>delete</item>
+       <item>empty</item>
+       <item>find</item>
+       <item>find_index</item>
+       <item>first</item>
+       <item>first_index</item>
+       <item>get_at_least</item>
+       <item>get_auto_bin</item>
+       <item>get_cov_weight</item>
+       <item>get_coverage_goal</item>
+       <item>get_cross_bin_max</item>
+       <item>get_status</item>
+       <item>get_status_msg</item>
+       <item>getc</item>
+       <item>hash</item>
+       <item>icompare</item>
+       <item>insert</item>
+       <item>inst_get_at_least</item>
+       <item>inst_get_auto_bin_max</item>
+       <item>inst_get_collect</item>
+       <item>inst_get_cov_weight</item>
+       <item>inst_get_coverage_goal</item>
+       <item>inst_getcross_bin_max</item>
+       <item>inst_query</item>
+       <item>inst_set_at_least</item>
+       <item>inst_set_auto_bin_max</item>
+       <item>inst_set_bin_activiation</item>
+       <item>inst_set_collect</item>
+       <item>inst_set_cov_weight</item>
+       <item>inst_set_coverage_goal</item>
+       <item>inst_set_cross_bin_max</item>
+       <item>itoa</item>
+       <item>last</item>
+       <item>last_index</item>
+       <item>len</item>
+       <item>load</item>
+       <item>match</item>
+       <item>max</item>
+       <item>max_index</item>
+       <item>min</item>
+       <item>min_index</item>
+       <item>object_compare</item>
+       <item>object_copy</item>
+       <item>object_print</item>
+       <item>pack</item>
+       <item>pick_index</item>
+       <item>pop_back</item>
+       <item>pop_front</item>
+       <item>post_pack</item>
+       <item>post_randomize</item>
+       <item>post_unpack</item>
+       <item>postmatch</item>
+       <item>pre_pack</item>
+       <item>pre_randomize</item>
+       <item>prematch</item>
+       <item>push_back</item>
+       <item>push_front</item>
+       <item>putc</item>
+       <item>query</item>
+       <item>query_str</item>
+       <item>rand_mode</item>
+       <item>randomize</item>
+       <item>reserve</item>
+       <item>reverse</item>
+       <item>rsort</item>
+       <item>search</item>
+       <item>set_at_least</item>
+       <item>set_auto_bin_max</item>
+       <item>set_bin_activiation</item>
+       <item>set_cov_weight</item>
+       <item>set_coverage_goal</item>
+       <item>set_cross_bin_max</item>
+       <item>set_name</item>
+       <item>size</item>
+       <item>sort</item>
+       <item>substr</item>
+       <item>sum</item>
+       <item>thismatch</item>
+       <item>tolower</item>
+       <item>toupper</item>
+       <item>unique_index</item>
+       <item>unpack</item>
+       <!-- empty methods -->
+       <item>new</item>
+       <item>object_compare</item>
+       <item>post_boundary</item>
+       <item>post_pack</item>
+       <item>post_randomize</item>
+       <item>post_unpack</item>
+       <item>pre-randomize</item>
+       <item>pre_boundary</item>
+       <item>pre_pack</item>
+       <item>pre_unpack</item>
+       <!-- vera-constants -->
+       <item>ALL</item>
+       <item>ANY</item>
+       <item>BAD_STATE</item>
+       <item>BAD_TRANS</item>
+       <item>CALL</item>
+       <item>CHECK</item>
+       <item>CHGEDGE</item>
+       <item>CLEAR</item>
+       <item>COPY_NO_WAIT</item>
+       <item>COPY_WAIT</item>
+       <item>CROSS</item>
+       <item>CROSS_TRANS</item>
+       <item>DEBUG</item>
+       <item>DELETE</item>
+       <item>EC_ARRAYX</item>
+       <item>EC_CODE_END</item>
+       <item>EC_CONFLICT</item>
+       <item>EC_EVNTIMOUT</item>
+       <item>EC_EXPECT</item>
+       <item>EC_FULLEXPECT</item>
+       <item>EC_MBXTMOUT</item>
+       <item>EC_NEXPECT</item>
+       <item>EC_RETURN</item>
+       <item>EC_RGNTMOUT</item>
+       <item>EC_SCONFLICT</item>
+       <item>EC_SEMTMOUT</item>
+       <item>EC_SEXPECT</item>
+       <item>EC_SFULLEXPECT</item>
+       <item>EC_SNEXTPECT</item>
+       <item>EC_USERSET</item>
+       <item>EQ</item>
+       <item>EVENT</item>
+       <item>FAIL</item>
+       <item>FIRST</item>
+       <item>FORK</item>
+       <item>GE</item>
+       <item>GOAL</item>
+       <item>GT</item>
+       <item>HAND_SHAKE</item>
+       <item>HI</item>
+       <item>HIGH</item>
+       <item>HNUM</item>
+       <item>LE</item>
+       <item>LIC_EXIT</item>
+       <item>LIC_PRERR</item>
+       <item>LIC_PRWARN</item>
+       <item>LIC_WAIT</item>
+       <item>LO</item>
+       <item>LOAD</item>
+       <item>LOW</item>
+       <item>LT</item>
+       <item>MAILBOX</item>
+       <item>MAX_COM</item>
+       <item>NAME</item>
+       <item>NE</item>
+       <item>NEGEDGE</item>
+       <item>NEXT</item>
+       <item>NO_OVERLAP</item>
+       <item>NO_OVERLAP_STATE</item>
+       <item>NO_OVERLAP_TRANS</item>
+       <item>NO_VARS</item>
+       <item>NO_WAIT</item>
+       <item>NUM</item>
+       <item>NUM_BIN</item>
+       <item>NUM_DET</item>
+       <item>OFF</item>
+       <item>OK</item>
+       <item>OK_LAST</item>
+       <item>ON</item>
+       <item>ONE_BLAST</item>
+       <item>ONE_SHOT</item>
+       <item>ORDER</item>
+       <item>PAST_IT</item>
+       <item>PERCENT</item>
+       <item>POSEDGE</item>
+       <item>PROGRAM</item>
+       <item>RAWIN</item>
+       <item>REGION</item>
+       <item>REPORT</item>
+       <item>SAMPLE</item>
+       <item>SAVE</item>
+       <item>SEMAPHORE</item>
+       <item>SET</item>
+       <item>SILENT</item>
+       <item>STATE</item>
+       <item>STR</item>
+       <item>STR_ERR_OUT_OF_RANGE</item>
+       <item>STR_ERR_REGEXP_SYNTAX</item>
+       <item>SUM</item>
+       <item>TRANS</item>
+       <item>VERBOSE</item>
+       <item>WAIT</item>
+       <item>stderr</item>
+       <item>stdin</item>
+       <item>stdout</item>
+    </list>
+    
+    
+    <contexts>
+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
+        <DetectSpaces />
+        <RegExpr attribute="Preprocessor" context="Outscoped" String="#\s*if\s+0" beginRegion="PP" firstNonSpace="true" />
+        <DetectChar context="AfterHash" char="#" firstNonSpace="true" lookAhead="true" />
+        <keyword attribute="Keyword" context="#stay" String="keywords"/>
+        <keyword attribute="Data Type" context="#stay" String="types"/>
+        <keyword attribute="Q Values" context="#stay" String="q_values"/>
+        <keyword attribute="Methods" context="#stay" String="methods"/>
+        <DetectChar attribute="String" context="String" char="&quot;"/>
+        <RegExpr attribute="Decimal" context="#stay" String="[\d_]*'d[\d_]+"/>
+        <RegExpr attribute="Octal" context="#stay" String="[\d_]*'o[0-7xXzZ_]+"/>
+        <RegExpr attribute="Hex" context="#stay" String="[\d_]*'h[\da-fA-FxXzZ_]+"/>
+        <RegExpr attribute="Binary" context="#stay" String="[\d_]*'b[01_zZxX]+"/>
+        <Float attribute="Float" context="#stay"/>
+        <Int attribute="Integer" context="#stay"/>
+        <IncludeRules context="##Doxygen" />
+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
+        <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
+        <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
+        <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]{|}~^&#59;"/>
+      </context>
+
+      <context attribute="String" lineEndContext="#pop" name="String">
+        <LineContinue attribute="String" context="#stay"/>
+        <HlCStringChar attribute="String Char" context="#stay"/>
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+      </context>
+
+      <context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
+        <LineContinue attribute="Comment" context="#stay"/>
+        <DetectSpaces />
+        <IncludeRules context="##Alerts" />
+        <DetectIdentifier />
+      </context>
+
+      <context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
+        <DetectSpaces />
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
+        <IncludeRules context="##Alerts" />
+        <DetectIdentifier />
+      </context>
+
+      <context attribute="Error" lineEndContext="#pop" name="AfterHash">
+        <!-- define, elif, else, endif, error, if, ifdef, ifndef, include, include_next, line, pragma, undef, warning -->
+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*if(?:def|ndef)?(?=\s+\S)" insensitive="true" beginRegion="PP" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*endif" insensitive="true" endRegion="PP" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Define" String="#\s*define.*((?=\\))" insensitive="true" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*(?:el(?:se|if)|include(?:_next)?|define|undef|line|error|warning|pragma)" insensitive="true" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s+[0-9]+" insensitive="true" firstNonSpace="true" />
+      </context>
+
+      <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor">
+        <LineContinue attribute="Preprocessor" context="#stay"/>
+        <RangeDetect attribute="Prep. Lib" context="#stay" char="&quot;" char1="&quot;"/>
+        <RangeDetect attribute="Prep. Lib" context="#stay" char="&lt;" char1="&gt;"/>
+        <IncludeRules context="##Doxygen" />
+        <Detect2Chars attribute="Comment" context="Commentar/Preprocessor" char="/" char1="*" beginRegion="Comment2" />
+
+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+      </context>
+
+      <context attribute="Preprocessor" lineEndContext="#pop" name="Define">
+        <LineContinue attribute="Preprocessor" context="#stay"/>
+      </context>
+
+      <context attribute="Comment" lineEndContext="#stay" name="Commentar/Preprocessor">
+        <DetectSpaces />
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment2" />
+        <DetectIdentifier />
+      </context>
+
+      <context attribute="Comment" lineEndContext="#stay" name="Outscoped" >
+        <DetectSpaces />
+        <IncludeRules context="##Alerts" />
+        <DetectIdentifier />
+        <DetectChar attribute="String" context="String" char="&quot;"/>
+        <IncludeRules context="##Doxygen" />
+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
+        <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="PP" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="#pop" String="#\s*el(?:se|if)" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="#pop" String="#\s*endif" endRegion="PP" firstNonSpace="true" />
+      </context>
+
+      <context attribute="Comment" lineEndContext="#stay" name="Outscoped intern">
+        <DetectSpaces />
+        <IncludeRules context="##Alerts" />
+        <DetectIdentifier />
+        <DetectChar attribute="String" context="String" char="&quot;"/>
+        <IncludeRules context="##Doxygen" />
+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
+        <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="PP" firstNonSpace="true" />
+        <RegExpr attribute="Comment" context="#pop" String="#\s*endif" endRegion="PP" firstNonSpace="true" />
+      </context>
+    </contexts>
+    
+    <itemDatas>
+      <itemData name="Normal Text"  defStyleNum="dsNormal"/>
+      <itemData name="Keyword"      defStyleNum="dsKeyword"/>
+      <itemData name="Q Values"     defStyleNum="dsKeyword"/>
+      <itemData name="Methods"      defStyleNum="dsKeyword"/>
+      <itemData name="Data Type"    defStyleNum="dsDataType"/>
+      <itemData name="Decimal"      defStyleNum="dsDecVal"/>
+      <itemData name="Octal"        defStyleNum="dsBaseN"/>
+      <itemData name="Hex"          defStyleNum="dsBaseN"/>
+      <itemData name="Float"        defStyleNum="dsFloat"/>
+      <itemData name="Char"         defStyleNum="dsChar"/>
+      <itemData name="String"       defStyleNum="dsString"/>
+      <itemData name="String Char"  defStyleNum="dsChar"/>
+      <itemData name="Comment"      defStyleNum="dsComment"/>
+      <itemData name="Symbol"       defStyleNum="dsNormal"/>
+      <itemData name="Preprocessor" defStyleNum="dsOthers"/>
+      <itemData name="Prep. Lib"    defStyleNum="dsOthers"/>
+      <itemData name="Error"        defStyleNum="dsError" />
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name="singleLine" start="//" />
+      <comment name="multiLine" start="/*" end="*/" region="Comment"/>
+    </comments>
+    <keywords casesensitive="1"/>
+  </general>
+
+</language>
diff --git a/kate/data/verilog.xml b/kate/data/verilog.xml
index ffb5bac35..12619f2e8 100644
--- a/kate/data/verilog.xml
+++ b/kate/data/verilog.xml
@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Verilog" version="1.08" kateversion="2.4" section="Hardware" extensions="*.v;*.V;*.vl" mimetype="text/x-verilog-src" author="Yevgen Voronenko ([email protected])" license="">
+<language name="Verilog" version="1.09" kateversion="2.4" section="Hardware" extensions="*.v;*.V;*.vl" mimetype="text/x-verilog-src" author="Yevgen Voronenko ([email protected]), Ryan Dalzell ([email protected])" license="">
   <highlighting>
     <list name="keywords">
       <item> macromodule </item>
-      <item> task </item>
-      <item> endtask </item>
-      <item> function </item>
-      <item> endfunction </item>
       <item> table </item>
       <item> endtable </item>
       <item> specify </item>
       <item> specparam </item>
       <item> endspecify </item>
-      <item> case </item>
-      <item> casex </item>
-      <item> casez </item>
-      <item> endcase </item>
-      <item> fork </item>
-      <item> join </item>
 
       <item> defparam </item>
       <item> default </item>
@@ -42,6 +32,38 @@
       <item> edge </item>
       <item> posedge </item>
       <item> negedge </item>
+
+      <!-- verilog-2001 keywords -->
+      <item> config </item>
+      <item> endconfig </item>
+      <item> library </item>
+      <item> design </item>
+      <item> liblist </item>
+      <item> cell </item>
+      <item> use </item>
+      <item> instance </item>
+    </list>
+
+    <list name="beginwords">
+        <item> begin </item>
+        <item> fork </item>
+        <item> module </item>
+        <item> case </item>
+        <item> casex </item>
+        <item> casez </item>
+        <item> task </item>
+        <item> function </item>
+        <item> generate </item>
+    </list>
+
+    <list name="endwords">
+        <item> end </item>
+        <item> join </item>
+        <item> endmodule </item>
+        <item> endcase </item>
+        <item> endtask </item>
+        <item> endfunction </item>
+        <item> endgenerate </item>
     </list>
 
     <list name="strength">
@@ -118,36 +140,26 @@
       <!-- other -->
       <item> parameter </item>
       <item> event </item>
-    </list>
-
-    <list name="begin">
-    <item>begin</item>
-    </list>
-    <list name="end">
-    <item>end</item>
-    </list>
-    <list name="module">
-    <item>module</item>
-    </list>
-    <list name="endmodule">
-    <item>endmodule</item>
+      <!-- verilog-2001 types -->
+      <item> signed </item>
+      <item> automatic </item>
+      <item> genvar </item>
+      <item> localparam </item>
     </list>
 
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
-        <RegExpr attribute="Keyword" context="Block name" String="begin\ *:" beginRegion="beginend"/>
-        <keyword  attribute="Keyword" context="#stay" String="begin" beginRegion="beginend"/>
-        <keyword attribute="Keyword" context="#stay" String="end" endRegion="beginend"/>
-        <keyword  attribute="Keyword" context="#stay" String="module" beginRegion="moduleEndmodule"/>
-        <keyword attribute="Keyword" context="#stay" String="endmodule" endRegion="moduleEndmodule"/>
+        <DetectSpaces />
+        <RegExpr attribute="Keyword" context="Block name" String="begin\ *:" beginRegion="Block"/>
+        <RegExpr attribute="Keyword" context="Block name" String="fork\ *:" beginRegion="Block"/>
+        <keyword attribute="Keyword" String="beginwords" context="#stay" beginRegion="Block"/>
+        <keyword attribute="Keyword" String="endwords" context="#stay" endRegion="Block"/>
+
         <keyword attribute="Keyword" context="#stay" String="keywords" />
         <keyword attribute="Data Type" context="#stay" String="types" />
         <keyword attribute="Drive/charge strength" context="#stay" String="strength" />
         <keyword attribute="Gate instantiation" context="#stay" String="gates" />
 
-        <RegExpr attribute="Normal Text" context="#stay" String="[a-zA-Z]+[\w$]*"/>
-        <RegExpr attribute="Normal Text" context="#stay" String="\\[^ ]+ "/>
-
         <RegExpr attribute="Decimal" context="#stay" String="[\d_]*'d[\d_]+"/>
         <RegExpr attribute="Octal" context="#stay" String="[\d_]*'o[0-7xXzZ_]+"/>
         <RegExpr attribute="Hex" context="#stay" String="[\d_]*'h[\da-fA-FxXzZ_]+"/>
@@ -155,19 +167,19 @@
         <Float attribute="Float" context="#stay"/>
         <Int attribute="Integer" context="#stay" />
 
-        <RegExpr attribute="Port connection" context="#stay" String="[^\w$]\.[a-zA-Z]+[\w$]*"/>
+        <RegExpr attribute="Case label" context="#stay" String="[a-zA-Z0-9_, \t]+\s*:" firstNonSpace="true"/>
+        <!--<RegExpr attribute="Port map" context="Port" String="\.[a-zA-Z0-9_]+"/>-->
 
         <DetectChar attribute="String" context="String" char="&quot;"/>
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
-        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="comment"/>
+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
         <AnyChar attribute="Symbol" context="#stay" String="!%&amp;()+,-&lt;=+/:;&gt;?[]^{|}~@"/>
 
-        <StringDetect attribute="Comment" context="Some Context2" String="#if 0" insensitive="FALSE" firstNonSpace="true"/>
-
         <DetectChar attribute="Preprocessor" context="Preprocessor" char="`" column="0"/>
         <RegExpr attribute="Preprocessor" context="#stay" String="\`[a-zA-Z_]+\w*" />
         <RegExpr attribute="System Task" context="#stay" String="\$[a-zA-Z_]+\w*" />
         <RegExpr attribute="Delay" context="#stay" String="#[\d_]+" />
+
       </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="Some Context"/>
@@ -175,11 +187,11 @@
         <DetectChar attribute="String" context="#pop" char="&quot;"/>
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
-        <RegExpr attribute="Alert" context="#stay" String="(FIXME|TODO)" />
+        <IncludeRules context="##Alerts" />
       </context>
       <context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
-        <RegExpr attribute="Alert" context="#stay" String="(FIXME|TODO)" />
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="comment"/>
+        <IncludeRules context="##Alerts" />
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
       </context>
       <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor">
         <LineContinue attribute="Preprocessor" context="Some Context"/>
@@ -193,12 +205,16 @@
       </context>
       <context attribute="Normal Text" lineEndContext="#pop" name="Some Context"/>
       <context attribute="Comment" lineEndContext="#stay" name="Some Context2">
-          <RegExpr attribute="Alert" context="#stay" String="(FIXME|TODO)" />
+          <IncludeRules context="##Alerts" />
           <StringDetect attribute="Comment" context="#pop" String="#endif" firstNonSpace="true"/>
       </context>
 
       <context attribute="Block name" lineEndContext="#pop" name="Block name">
-          <RegExpr attribute="Data Type" context="#pop" String="[^ ]+"/>
+          <DetectIdentifier attribute="Data Type" context="#pop"/>
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#stay" name="Port">
+          <DetectIdentifier attribute="Normal Text" context="#pop"/>
       </context>
     </contexts>
 
@@ -227,13 +243,14 @@
       <itemData name="Block name" defStyleNum="dsDataType"/>
       <itemData name="Drive/charge strength" defStyleNum="dsBaseN"/>
       <itemData name="Gate instantiation" defStyleNum="dsDataType"/>
-      <itemData name="Port connection" defStyleNum="dsDataType"/>
-      </itemDatas>
+      <itemData name="Port map" defStyleNum="dsDataType"/>
+      <itemData name="Case label" defStyleNum="dsDecVal"/>
+    </itemDatas>
   </highlighting>
   <general>
     <comments>
       <comment name="singleLine" start="//" />
-      <comment name="multiLine" start="/*" end="*/" />
+      <comment name="multiLine" start="/*" end="*/" region="Comment"/>
     </comments>
     <keywords casesensitive="1" />
   </general>
diff --git a/kate/data/vhdl.xml b/kate/data/vhdl.xml
index 5b1b69494..c2ff48999 100644
--- a/kate/data/vhdl.xml
+++ b/kate/data/vhdl.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
-[
+<!DOCTYPE language SYSTEM "language.dtd" [
   <!ENTITY funcname "[A-Za-z_:][A-Za-z0-9_:#&#37;@-]*">
-  <!ENTITY varname  "[A-Za-z_][A-Za-z0-9_]*">
-  <!ENTITY bos      "(|[^&quot;-]*)\b">			<!-- bol or space following -->
-<!--  <!ENTITY bos      "^(|.*\s)">-->			<!-- bol or space following -->
-  <!ENTITY eos      "\b">		<!-- eol or space following -->
-<!--  <!ENTITY eos      "(?=($|\s))">-->		<!-- eol or space following -->
-  <!ENTITY noword   "(?![\w$+-])">		<!-- no word, $, + or - following -->
+  <!ENTITY varname  "\b(?!(?:process|constant|signal|variable))([A-Za-z_][A-Za-z0-9_]*)\b">
+  <!ENTITY bos      "(\b)">                        <!-- bol or space following -->
+<!--  <!ENTITY bos      "^(|.*\s)">-->                        <!-- bol or space following -->
+  <!ENTITY eos      "\b">                <!-- eol or space following -->
+<!--  <!ENTITY eos      "(?=($|\s))">-->                <!-- eol or space following -->
+  <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
   <!ENTITY label     "((&varname;)\s*:\s*)?">
-  
+
 ]>
-<language name="VHDL" version="1.08" kateversion="2.3" section="Hardware" extensions="*.vhdl;*.vhd" mimetype="text/x-vhdl" author="Rocky Scaletta ([email protected]), Stefan Endrullis ([email protected]), Jan Michel ([email protected])">
+
+<language name="VHDL" version="1.10" kateversion="2.3" section="Hardware" extensions="*.vhdl;*.vhd" mimetype="text/x-vhdl" author="Rocky Scaletta ([email protected]), Stefan Endrullis ([email protected]), Florent Ouchet ([email protected]), Chris Higgs ([email protected]), Jan Michel ([email protected])">
   <highlighting>
     <list name="keywordsToplevel">
       <item> file </item>
-      <item> package </item>
+<!--      <item> package </item>-->
       <item> library </item>
       <item> use </item>
 <!--
@@ -24,23 +24,35 @@
       <item> of </item>
       <item> configuration </item>
 -->
+
+
     </list>
     <list name="keywords">
       <item> access </item>
       <item> after </item>
       <item> alias </item>
       <item> all </item>
+      <item> array </item>
       <item> assert </item>
+      <item> assume </item>
+      <item> assume_guarantee </item>
+      <item> attribute </item>
       <item> begin </item>
       <item> block </item>
       <item> body </item>
       <item> bus </item>
       <item> component </item>
       <item> constant </item>
+      <item> context </item>
+      <item> cover </item>
+      <item> default </item>
       <item> disconnect </item>
       <item> downto </item>
       <item> end </item>
       <item> exit </item>
+      <item> fairness </item>
+      <item> file </item>
+      <item> force </item>
       <item> function </item>
       <item> generate </item>
       <item> generic </item>
@@ -56,26 +68,32 @@
       <item> new </item>
       <item> next </item>
       <item> null </item>
+      <item> of </item>
       <item> on </item>
       <item> open </item>
       <item> others </item>
+      <item> parameter </item>
       <item> port </item>
       <item> postponed </item>
       <item> procedure </item>
       <item> process </item>
+      <item> property </item>
+      <item> protected </item>
       <item> pure </item>
       <item> range </item>
       <item> record </item>
       <item> register </item>
       <item> reject </item>
+      <item> release </item>
       <item> report </item>
       <item> return </item>
       <item> select </item>
+      <item> sequence </item>
       <item> severity </item>
       <item> signal </item>
       <item> shared </item>
+      <item> strong </item>
       <item> subtype </item>
-      <item> then </item>
       <item> to </item>
       <item> transport </item>
       <item> type </item>
@@ -83,6 +101,9 @@
       <item> units </item>
       <item> until </item>
       <item> variable </item>
+      <item> vmode </item>
+      <item> vprop </item>
+      <item> vunit </item>
       <item> wait </item>
       <item> when </item>
       <item> with </item>
@@ -95,65 +116,101 @@
       <item> out </item>
       <item> buffer </item>
       <item> and </item>
+      <item> abs </item>
       <item> or </item>
       <item> xor </item>
+      <item> xnor </item>
       <item> not </item>
+      <item> mod </item>
+      <item> nand </item>
+      <item> nor </item>
+      <item> rem </item>
+      <item> rol </item>
+      <item> ror </item>
+      <item> sla </item>
+      <item> sra </item>
+      <item> sll </item>
+      <item> srl </item>
     </list>
-    
+
     <list name="if">
+      <item> if </item>
       <item> else </item>
       <item> elsif </item>
+      <item> then </item>
     </list>
-    
+
     <list name="forOrWhile">
       <item> loop </item>
     </list>
-      
+
     <list name="directions">
       <item> in </item>
       <item> inout </item>
       <item> out </item>
       <item> buffer </item>
+      <item> linkage </item>
     </list>
-    
+
     <list name="signals">
       <item> signal </item>
       <item> variable </item>
       <item> constant </item>
-      <item> type </item>      
+      <item> type </item>
     </list>
  <!--   <list name="logics">
       <item> and </item>
       <item> or </item>
       <item> xor </item>
       <item> not </item>
-    </list>
-    
-    <list name="rangeDirection">
+    </list>-->
+
+    <list name="range">
       <item> to </item>
       <item> downto </item>
-    </list>-->
-    
+      <item> others </item>
+    </list>
+
+    <list name="case">
+      <item> case </item>
+      <item> when </item>
+    </list>
+
     <list name="types">
       <item> bit </item>
       <item> bit_vector </item>
       <item> character </item>
       <item> boolean </item>
+      <item> boolean_vector </item>
       <item> integer </item>
+      <item> integer_vector </item>
       <item> real </item>
+      <item> real_vector </item>
       <item> time </item>
+      <item> time_vector </item>
+      <item> delay_length </item>
       <item> string </item>
       <item> severity_level </item>
       <item> positive </item>
       <item> natural </item>
+      <item> file_open_kind </item>
+      <item> file_open_status </item>
       <item> signed </item>
       <item> unsigned </item>
+      <item> unresolved_unsigned </item>
+      <item> unresolved_signed </item>
       <item> line </item>
       <item> text </item>
+      <item> side </item>
+      <item> width </item>
       <item> std_logic </item>
       <item> std_logic_vector </item>
       <item> std_ulogic </item>
       <item> std_ulogic_vector </item>
+      <item> x01 </item>
+      <item> x01z </item>
+      <item> ux01 </item>
+      <item> ux01z </item>
       <item> qsim_state </item>
       <item> qsim_state_vector </item>
       <item> qsim_12state </item>
@@ -166,159 +223,268 @@
       <item> wor_bit </item>
       <item> wor_vector </item>
     </list>
+
+
     <contexts>
-      <!-- start / global environment -->
-      <context name="start" attribute="Normal Text" lineEndContext="#stay">
-        <RegExpr attribute="Normal Text" context="entity" String="&bos;(entity\s*(&varname;)\s*is)&eos;" beginRegion="EntityRegion1" lookAhead="true" insensitive="true" />
-        <RegExpr attribute="Normal Text" context="architecture" String="&bos;(architecture\s*(&varname;)\s*of\s*&varname;\s*is)&eos;" beginRegion="ArchitectureRegion1" lookAhead="true" insensitive="true" />
-        <Detect2Chars attribute="Comment" context="comment" char="-" char1="-" />
+
+<!-- start / global environment -->
+      <context name="start" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
+        <IncludeRules  context="preDetection" />
+
+        <RegExpr       attribute="Control"  context="architecture_main"  insensitive="true"  dynamic="true"  lookAhead="true"
+                       String="architecture\s+(&varname;)" />
+        <StringDetect  attribute="Control"  context="entity"         String="entity"      />
+        <RegExpr       attribute="Normal Text" context="package"  insensitive="true"  lookAhead="true"  beginRegion="PackageRegion1" 
+                       String="&bos;(package\s+(&varname;)\s+is)&eos;"/>
+        <RegExpr       attribute="Normal Text" context="packagebody"   lookAhead="true" insensitive="true" beginRegion="PackageBodyRegion1"
+                       String="&bos;(package\s+body\s+(&varname;)\s+is)&eos;"/>            
+       <!-- <StringDetect  attribute="Control"  context="arch_decl"      String="package"     />temporary-->
+
         <keyword attribute="Keyword" context="#stay"  String="keywordsToplevel"/>
       </context>
-      
-      <context name="preDetection" attribute="Normal Text" lineEndContext="#stay">
-        <Detect2Chars attribute="Comment" context="comment" char="-" char1="-" />
-        <DetectChar attribute="Vector" context="string" char="&quot;" />
-        <AnyChar attribute="Operator" context="#stay" String="[&amp;&gt;&lt;=:+\-*\/|]().,;" />
-        <DetectChar attribute="Attribute" context="attribute" char="'" />
-      </context>
-      
-      <!-- general keywords detection -->
-      <context name="generalDetection" attribute="Normal Text" lineEndContext="#stay">
-        <keyword attribute="Data Type" context="#stay"  String="types"/>
-        <keyword attribute="Signal" context="#stay"  String="signals"/>
-        <keyword attribute="Keyword" context="#stay"  String="keywords"/>
-        <Int attribute="Integer" context="#stay" />
-        <HlCChar attribute="Bit" context="#stay" />
-      </context>
-      
 
-      
-      <!-- entity environment -->
-      <context name="entity" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
+
+      <context name="package" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
         <StringDetect attribute="Redirection" context="#stay" String="%2" dynamic="true" />
         <IncludeRules context="preDetection" />
-        <RegExpr attribute="Redirection" context="#pop" String="^(|\s.*)end(\s*entity)?\s*(%3)?\s*;" dynamic="true" endRegion="EntityRegion1" insensitive="true" />
-        <!--<RegExpr attribute="Alert" context="generic" String="generic"/>-->
+        <StringDetect attribute="Redirection" context="#stay" String="begin" insensitive="true" />
+        <RegExpr attribute="Redirection" context="#pop" String="&bos;end(\s+package)?(\s+%3)?\s*;" dynamic="true" endRegion="PackageRegion1"  insensitive="true" />
         <IncludeRules context="generalDetection" />
       </context>
-<!--      <context name="generic" attribute="Normal Text" lineEndContext="#stay">
-        <DetectChar attribute="Operator" context="range" char="("/>
-        <Detect2Chars attribute="Alert" context="#pop" char=")" char1=";"/>
-      </context>
-      <context name="range" attribute="Normal Text" lineEndContext="#stay">
-        <keyword attribute="Keyword" context="#stay"  String="rangeDirection"/>
-        <Int attribute="Integer" context="#stay" />
-        <HlCChar attribute="Bit" context="#stay" />
-        <DetectChar attribute="Vector" context="string" char="&quot;" />
-        <DetectChar attribute="Operator" context="#pop" char=")"/>
-      </context>-->
       
-      <!-- architecture environment -->
-      <context name="architecture" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
+      <!-- package body environment -->
+
+      <context name="packagebody" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
         <StringDetect attribute="Redirection" context="#stay" String="%2" dynamic="true" />
         <IncludeRules context="preDetection" />
         <StringDetect attribute="Redirection" context="#stay" String="begin" insensitive="true" />
-        <RegExpr attribute="Redirection" context="#pop" String="&bos;end(\s+architecture)?(\s+%3)?\s*;" dynamic="true" endRegion="ArchitectureRegion1"  insensitive="true" />
-        <RegExpr attribute="Normal Text" context="component" String="&bos;(component\s+(&varname;)(\s+is)?)&eos;" beginRegion="ComponentRegion1" lookAhead="true"  insensitive="true" />
-        <RegExpr attribute="Normal Text" context="process1" String="^(|\s+)(&label;process)&eos;" beginRegion="ProcessRegion1" lookAhead="true"  insensitive="true" />
-        <RegExpr attribute="Normal Text" context="generate1" String="^(|\s+)((&varname;)\s*:\s*((for\s+.+\s+in\s+.+)|(if\s+.+))\s+generate)&eos;" beginRegion="GenerateRegion1" lookAhead="true" insensitive="true" />
-        <RegExpr attribute="Normal Text" context="instance" String="^(|\s+)((&varname;)\s*:\s*(&varname;))&eos;" beginRegion="InstanceRegion1" lookAhead="true"  insensitive="true" />
+        <RegExpr attribute="Redirection" context="#pop" String="&bos;end(\s+package)?(\s+%3)?\s*;" dynamic="true" endRegion="PackageBodyRegion1"  insensitive="true" />
         <IncludeRules context="generalDetection" />
       </context>
-<!--      <context name="architectureBeforeBegin" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <StringDetect attribute="Redirection" context="#stay" String="%1" dynamic="true" />
-        <RegExpr attribute="Redirection" context="#pop" String="end\s*%2\s*;" dynamic="true" endRegion="ArchitectureRegion1" />
-        <StringDetect attribute="Redirection" context="architectureAfterBegin" String="begin" />
-        <RegExpr attribute="Redirection" context="#pop#pop" String="end\s*%2\s*;" dynamic="true" endRegion="ArchitectureRegion1" />
-        <IncludeRules context="normal" />
+
+<!--====ARCHITECTURE ===============-->
+      <context  name="architecture_main"  attribute="Normal Text"  lineEndContext="#stay"  dynamic="true">
+        <IncludeRules  context="preDetection" />
+        <RegExpr       attribute="Control"  context="arch_decl"   insensitive="true"  beginRegion="ArchitectureRegion1"
+                       String="architecture\s+(&varname;)\s+of\s+(&varname;)\s+is"   />
+        <RegExpr       attribute="Control"  context="#pop#pop"    insensitive="true"  dynamic="true" endRegion="ArchitectureRegion1"
+                       String="&bos;end(\s+architecture)?(\s+%1)?\s*;"   />
+        <RegExpr       attribute="Error"    context="#pop#pop"    insensitive="true"  dynamic="true" endRegion="ArchitectureRegion1"
+                       String="&bos;end(\s+architecture)?(\s+&varname;)\s*;"   />
+        <IncludeRules  context="detect_arch_parts" />
       </context>
-      <context name="architectureAfterBegin" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <StringDetect attribute="Redirection" context="#stay" String="%1" dynamic="true" />
-        <IncludeRules context="normal" />
-      </context>-->
-      
-      <!-- component environment -->
-      <context name="component" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <StringDetect attribute="Redirection" context="" String="%2" dynamic="true" />
-        <IncludeRules context="preDetection" />
-        <RegExpr attribute="Redirection" context="#pop" String="&bos;end\s+component(\s+%3)?\s*;" dynamic="true" endRegion="ComponentRegion1" insensitive="true" />
-        <IncludeRules context="generalDetection" />
+
+<!-- architecture environment "before begin" -->
+      <context name="arch_decl" attribute="Normal Text" lineEndContext="#stay" >
+        <IncludeRules  context="preDetection" />
+        <keyword       attribute="Signal"       context="signal"     insensitive="true"  String="signals"/>
+        <StringDetect  attribute="Control"      context="entity"     insensitive="true"  String="component"/>
+        <StringDetect  attribute="Control"      context="#pop"       insensitive="true"  String="begin"/>
+        <IncludeRules  context="generalDetection" />
       </context>
 
-      <!-- generate statement -->
+<!-- parts of architecture body -->
+      <context name="detect_arch_parts" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
+        <RegExpr attribute="Normal Text"   context="generate1"  lookAhead="true"  insensitive="true"  dynamic="true"
+                 String="&bos;((&varname;)\s*:\s*)(if|for).*\s+generate&eos;" />
+        <RegExpr attribute="Normal Text"   context="process1"   lookAhead="true"  insensitive="true"  dynamic="true"
+                 String="&bos;((&varname;)\s*:\s*)?process&eos;" />
+        <RegExpr attribute="Normal Text"   context="instance"   lookAhead="true"  insensitive="true"   dynamic="true"  beginRegion="InstanceRegion1"
+                 String="\b(&varname;)\s*:\s*(&varname;)" />
+
+        <IncludeRules  context="generalDetection" />
+      </context>
+
+<!--====generate ===============-->
       <context name="generate1" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <StringDetect attribute="Process" context="generate2" String="%2" dynamic="true" />
+        <IncludeRules  context="preDetection" />
+        <RegExpr       attribute="Control"      context="generate2"                 insensitive="true"  beginRegion="GenerateRegion"
+                       String="&bos;generate&eos;" />
+        <RegExpr       attribute="Name"         context="#stay"     dynamic="true"  insensitive="true"
+                       String="&bos;%3&eos;" />
+        <StringDetect  attribute="Control"      context="#stay"     insensitive="true"  String="for"/>
+        <StringDetect  attribute="Control"      context="#stay"     insensitive="true"  String="if"/>
+        <IncludeRules  context="generalDetection" />
       </context>
+
       <context name="generate2" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <IncludeRules context="architecture" />
-        <RegExpr attribute="Process" context="#pop#pop" String="^(|\s.*)end\s+generate(?:\s+%3)?\s*;" dynamic="true" endRegion="GenerateRegion1" insensitive="true" />
+        <IncludeRules  context="preDetection" />
+        <StringDetect  attribute="Control"  context="#stay"     insensitive="true"
+                       String="begin"/>
+        <RegExpr       attribute="Control"  context="#pop#pop"  insensitive="true"  endRegion="GenerateRegion"
+                       String="&bos;end\s+generate(\s+&varname;)?\s*;"/>
+        <IncludeRules context="detect_arch_parts" />
       </context>
 
-      <context name="instance" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <StringDetect attribute="Redirection" context="#stay" String="%2" dynamic="true" />
-        <Detect2Chars attribute="Comment" context="comment" char="-" char1="-" />
-        <DetectChar attribute="Vector" context="string" char="&quot;" />
-        <Detect2Chars attribute="Normal Text" context="#pop" char=")" char1=";" endRegion="InstanceRegion1" />
-        <IncludeRules context="generalDetection" />
-        <AnyChar attribute="Operator" context="#stay" String="[&amp;&gt;&lt;=:+\-*\/|]().,;" />
-        <DetectChar attribute="Attribute" context="attribute" char="'" />
-      </context>
-      
-      <!-- process environment -->
+
+<!--====process ===============-->
+<!-- process environment -->
+
       <context name="process1" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <StringDetect attribute="Process" context="process2" String="%2" dynamic="true" />
-        <RegExpr attribute="Process" context="#pop" String="^(|\s.*)end\s+process(\s+%4)?\s*;" endRegion="ProcessRegion1" insensitive="true" dynamic="true" />
+        <IncludeRules  context="preDetection" />
+        <RegExpr       attribute="Process"  context="#pop"   insensitive="true"  dynamic="true" endRegion="RegionProcess"
+                       String="end\s+process(\s+%3)?\s*;" />
+        <RegExpr       attribute="Error"  context="#pop"   insensitive="true"  dynamic="true" endRegion="RegionProcess"
+                       String="end\s+process(\s+&varname;)?" />
+        <StringDetect  attribute="Process"  context="#stay"  insensitive="true"  beginRegion="RegionProcess"
+                       String="process"  />
+        <StringDetect  attribute="Process"  context="#stay"  insensitive="true"
+                       String="begin"  />
+
+
+        <IncludeRules  context="proc_rules" />
       </context>
-      <context name="process2" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <RegExpr attribute="Process" context="#pop" String="^(|\s.*)end\s+process" insensitive="true" lookAhead="true" />
-        <StringDetect attribute="Process" context="#stay" String="begin" insensitive="true" />
-        <IncludeRules context="processContext" />
+
+      <context name="proc_rules" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
+         <RegExpr attribute="Name"          context="#stay"    insensitive="true"
+                  String="&bos;&varname;(?=\s*:(?!=))" />
+         <RegExpr attribute="Control"       context="if_start" insensitive="true"
+                  String="&bos;(if)&eos;" />
+         <RegExpr attribute="Control"       context="case1"  lookAhead="true"  insensitive="true"   dynamic="true"  beginRegion="CaseRegion1"
+                  String="&bos;(case)&eos;" />
+         <RegExpr attribute="Control"       context="forOrWhile"   insensitive="true"  beginRegion="ForOrWhileRegion1"
+                  String="&bos;&label;((for|while)\s+.+\s+)?loop&eos;"/>
+         <IncludeRules  context="generalDetection" />
       </context>
 
-      <context name="processContext" attribute="Normal Text" lineEndContext="#stay">
+
+
+
+<!--====instance =============== -->
+
+      <context name="instance" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
         <IncludeRules context="preDetection" />
-        <RegExpr attribute="Control" context="case1" String="&bos;&label;(case)&eos;" beginRegion="CaseRegion1" insensitive="true" />
-        <RegExpr attribute="Control" context="if" String="&bos;&label;(if)&eos;" beginRegion="IfRegion1" insensitive="true" />
-        <RegExpr attribute="Control" context="forOrWhile" String="&bos;&label;((for|while)\s+.+\s+)?loop&eos;" beginRegion="ForOrWhileRegion1" insensitive="true" />
+        <RegExpr attribute="Name"        context="#stay"     String="\b%1\b"  dynamic="true" />
+        <RegExpr attribute="Name"        context="#stay"     String="\b%2\b"  dynamic="true" />
+        <Detect2Chars attribute="Normal Text" context="#pop"      char=")" char1=";"   endRegion="InstanceRegion1" />
+      <!--  <DetectChar   attribute="Error" context="#stay"      char=";" />-->
+
         <IncludeRules context="generalDetection" />
       </context>
+
+<!--====loop ===============-->
+      <context name="forOrWhile" attribute="Normal Text" lineEndContext="#stay">
+        <RegExpr attribute="Control" context="#pop"  endRegion="ForOrWhileRegion1" insensitive="true"
+                 String="&bos;end\s+loop(\s+&varname;)?\s*;"/>
+        <keyword attribute="Control" context="#stay"  String="forOrWhile"/>
+        <IncludeRules context="proc_rules" />
+      </context>
+
+<!--====if ===============-->
+      <context name="if_start" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
+        <IncludeRules  context="preDetection" />
+        <StringDetect  attribute="Control"   context="if"     insensitive="true"  beginRegion="IfRegion1"
+                       String="then" />
+        <IncludeRules  context="generalDetection" />
+      </context>
+
+      <context name="if" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
+        <IncludeRules  context="preDetection" />
+        <RegExpr attribute="Control" context="#pop#pop"    insensitive="true"  endRegion="IfRegion1"
+                 String="&bos;end\s+if(\s+&varname;)?\s*;"/>
+        <IncludeRules context="proc_rules" />
+        <keyword       attribute="Control"   context="#stay"     insensitive="true"
+                       String="if"/>
+      </context>
+
+
+<!--====case ===============-->
       <context name="case1" attribute="Normal Text" lineEndContext="#stay">
-        <StringDetect attribute="Keyword" context="case2" String="is" insensitive="true" />
+        <IncludeRules  context="preDetection" />
+        <StringDetect  attribute="Keyword"   context="case2"     insensitive="true"
+                       String="is"/>
+        <keyword       attribute="Control"   context="#stay"     insensitive="true"
+                       String="case"/>
       </context>
       <context name="case2" attribute="Normal Text" lineEndContext="#stay">
-        <RegExpr attribute="Control" context="#pop#pop" String="&bos;end\s+case(\s+&varname;)?\s*;" endRegion="CaseRegion1" insensitive="true" />
-        <RegExpr attribute="Control" context="caseWhen" String="&bos;when&eos;" beginRegion="CaseWhenRegion1" insensitive="true" />
-        <IncludeRules context="processContext" />
+        <IncludeRules  context="preDetection" />
+        <RegExpr       attribute="Control"   context="#pop#pop"  insensitive="true"  endRegion="CaseRegion1"
+                       String="&bos;end\s+case(\s+&varname;)?\s*;"/>
+        <StringDetect  attribute="Control"   context="caseWhen"  insensitive="true"  beginRegion="CaseWhenRegion1"
+                       String="when"/>
+        <IncludeRules context="proc_rules" />
       </context>
       <context name="caseWhen" attribute="Normal Text" lineEndContext="#stay">
-        <RegExpr attribute="Control" context="#pop" String="&bos;when&eos;" endRegion="CaseWhenRegion1" lookAhead="true" insensitive="true" />
-        <RegExpr attribute="Control" context="#pop" String="&bos;end\s+case(\s+&varname;)?\s*;" endRegion="CaseWhenRegion1" lookAhead="true" insensitive="true" />
-        <IncludeRules context="process2" />
+        <IncludeRules  context="preDetection" />
+        <RegExpr       attribute="Control" context="#pop"  lookAhead="true"  insensitive="true"    endRegion="CaseWhenRegion1"
+                       String="&bos;when&eos;" />
+        <RegExpr       attribute="Control" context="#pop"  lookAhead="true"  insensitive="true"    endRegion="CaseWhenRegion1"
+                       String="&bos;end\s+case(\s+&varname;)?\s*;"/>
+        <IncludeRules context="proc_rules" />
       </context>
-      <context name="if" attribute="Normal Text" lineEndContext="#stay">
-        <RegExpr attribute="Control" context="#pop" String="&bos;end\s+if(\s+&varname;)?\s*;" endRegion="IfRegion1" insensitive="true" />
-        <keyword attribute="Control" context="#stay"  String="if"/>
-        <IncludeRules context="processContext" />
+
+
+
+
+
+<!--====ENTITY ===============-->
+<!-- entity environment -->
+
+      <context  name="entity"  attribute="Normal Text"  lineEndContext="#stay"  dynamic="true">
+        <IncludeRules  context="preDetection" />
+        <RegExpr attribute="Name"  context="entity_main"  beginRegion="EntityRegion1"  insensitive="true"  String="(&varname;)" />
+        <IncludeRules  context="generalDetection" />
       </context>
-      <context name="forOrWhile" attribute="Normal Text" lineEndContext="#stay">
-        <RegExpr attribute="Control" context="#pop" String="&bos;end\s+loop(\s+&varname;)?\s*;" endRegion="ForOrWhileRegion1" insensitive="true" />
-        <keyword attribute="Control" context="#stay"  String="forOrWhile"/>
-        <IncludeRules context="processContext" />
+
+
+      <context name="entity_main" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
+        <IncludeRules context="preDetection" />
+        <RegExpr attribute="Control" context="#pop#pop"   dynamic="true"  insensitive="true" endRegion="EntityRegion1"
+                 String="&bos;end(\s+(entity|component))?(\s+%1)?\s*;" />
+        <RegExpr attribute="Error" context="#pop#pop"   dynamic="true"  insensitive="true" endRegion="EntityRegion1"
+                 String="&bos;end(\s+(entity|component))?(\s+&varname;)?\s*;" />
+        <RegExpr attribute="Control" context="#stay" String="generic"/>
+        <RegExpr attribute="Control" context="#stay" String="port"/>
+        <IncludeRules context="generalDetection" />
       </context>
-      
-      <!-- other environments -->
+
+
+
+<!--====Basic Stuff ===============-->
+<!-- basic rules -->
+      <context name="preDetection" attribute="Normal Text" lineEndContext="#stay">
+        <Detect2Chars attribute="Comment"     context="comment"   char="-" char1="-" />
+        <DetectChar   attribute="Vector"      context="string"    char="&quot;" />
+        <AnyChar      attribute="Operator"    context="#stay"     String="[&amp;&gt;&lt;=:+\-*\/|].," />
+        <DetectChar   attribute="Attribute"   context="attribute" char="'" />
+      </context>
+
+<!-- general detection -->
+      <context name="generalDetection"  attribute="Normal Text"  lineEndContext="#stay">
+        <keyword   attribute="Data Type" context="#stay"  String="types"/>
+        <keyword   attribute="Signal"    context="signal" String="signals" beginRegion="sig"/>
+        <keyword   attribute="Range"     context="#stay"  String="range"/>
+        <keyword   attribute="Keyword"   context="#stay"  String="keywords"/>
+        <Int       attribute="Integer"   context="#stay" />
+        <HlCChar   attribute="Bit"       context="#stay" />
+        <DetectSpaces attribute="Normal Text" context="#stay" />
+      </context>
+
+<!-- other environments -->
       <context name="comment" attribute="Comment" lineEndContext="#pop" />
+
       <context name="string" attribute="Vector" lineEndContext="#stay" >
-        <DetectChar attribute="Vector" context="#pop" char="&quot;" />
+        <DetectChar attribute="Vector"       context="#pop"        char="&quot;" />
       </context>
+
       <context name="attribute" attribute="Attribute" lineEndContext="#pop">
-        <DetectChar attribute="Attribute" context="quot in att" char="&quot;" />
-        <DetectChar attribute="Normal Text" context="#pop" char=" " />
-        <AnyChar attribute="Attribute" context="#pop" String=")=&lt;&gt;" />
+        <DetectChar attribute="Attribute"    context="quot in att" char="&quot;" />
+        <DetectChar attribute="Normal Text"  context="#pop"        char=" " />
+        <DetectChar attribute="Attribute"    context="#pop"        char="'" />
+        <AnyChar    attribute="Attribute"    context="#pop"        String="()=&lt;&gt;" />
       </context>
+
       <context name="quot in att" attribute="Attribute" lineEndContext="#stay">
-        <DetectChar attribute="Attribute" context="#pop" char="&quot;" />
+        <DetectChar attribute="Attribute"    context="#pop"        char="&quot;" />
       </context>
+
+      <context name="signal" attribute="Normal Text" lineEndContext="#stay">
+        <IncludeRules context="preDetection" />
+        <DetectChar attribute="Normal Text"    context="#pop"        char=";" endRegion="sig" />
+        <IncludeRules context="generalDetection" />
+      </context>
+
+
     </contexts>
     <itemDatas>
       <itemData name="Normal Text" defStyleNum="dsNormal" />
@@ -327,14 +493,17 @@
       <itemData name="Comment" defStyleNum="dsComment" />
       <itemData name="Integer" defStyleNum="dsDecVal" />
       <itemData name="Bit" defStyleNum="dsChar" />
+      <itemData name="Error" defStyleNum="dsError" color="#f00" bold="1" />
       <itemData name="Vector" defStyleNum="dsString" />
       <itemData name="Operator" defStyleNum="dsOthers" />
       <itemData name="Attribute" defStyleNum="dsBaseN" />
       <itemData name="Region Marker" defStyleNum="dsRegionMarker" />
       <itemData name="Signal" defStyleNum="dsOthers"/>
+      <itemData name="Range" defStyleNum="dsOthers"/>
       <itemData name="Redirection" defStyleNum="dsKeyword" color="#238" />
       <itemData name="Process" defStyleNum="dsKeyword" color="#09A" />
-      <itemData name="Control" defStyleNum="dsKeyword" color="#008" />
+      <itemData name="Control" defStyleNum="dsKeyword" color="#238" />
+      <itemData name="Name" defStyleNum="dsKeyword" color="#b60" bold="1"  />
     </itemDatas>
   </highlighting>
   <general>
diff --git a/kate/data/wml.xml b/kate/data/wml.xml
new file mode 100644
index 000000000..277893e26
--- /dev/null
+++ b/kate/data/wml.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!--
+  Thread for discussions: http://www.wesnoth.org/forum/viewtopic.php?f=21&t=13781
+  Alternatively try the "normal" way: #kate@freenode, [email protected]
+  Changelog (0.35 and later):
+  ***************************
+* 0.41
+  - 2011-04-15 <[email protected]>:
+    * Added preprocessor directives: #if(n)have, #if(n)ver
+    * Revalidated against language.dtd
+
+* 0.40
+  - 2010-06-13 <[email protected]>:
+    * Added lua-highlighting between << and >>.
+    * Added pango-highlighting between " and "
+    * Folding for macro-strings between paretheses
+    * Changed colors.
+    * This file is licensed under GPLv2+
+
+* 0.37
+  - 2008-03-29 <[email protected]>:
+    * WML preprocessor directive (define, if) blocks can be collapsed/expanded
+    * attribute_name = "string" WML constructs (note the space surrounding '=') are recognized too
+      (designed considering the mainline about.cfg structure case
+    * Changed various context names and styles
+
+- 2008-03-21 <[email protected]>:
+    * WML nodes and multiline preprocessing macro/include blocks can be collapsed/expanded
+    * WML nodes that are opened and closed in a single line are properly highlighted now
+  * 0.36
+  - 2008-03-05 <[email protected]>:
+    * Added wmlscope to list of utility control commands
+
+  * 0.35
+  - 2008-02-23 <[email protected]>:
+    * Made it possible to comment/uncomment line(s) using the default
+      CTRL-D / CTRL-SHIFT-D shortcuts
+  - 2008-01-27 <[email protected]>:
+    * Added the *.pbl file name pattern
+    * Made the standard alerts (i.e. TODO, HACK, FIXME,...) be highlighted too
+    * Made the key comments for Wesnoth's mainline maintenance scripts be highlighted (at the moment
+      they are only used for wmllint and wmlindent)
+  - 2008-01-?? <[email protected]>:
+    * Made #textdomain another preprocessor directive, as is handled by the game at /src/serialization/preprocessor.cpp
+      line 634 and around
+  - 2007-11-?? <[email protected]>:
+    * Minor improvements?
+  - 2007-11-?? <[email protected]>:
+    * Made the new #ifndef directive be recognized (implemented on Wesnoth 1.3.11 and later)
+-->
+
+<language name="Wesnoth Markup Language" section="Markup" extensions="*.cfg;*.pbl;*.CFG;*.PBL" version="0.41"
+          kateversion="2.5" casesensitive="true" author="Zachary Palmer ([email protected]), modif. by Ignacio Riquelme Morelle ([email protected]) and Jonathan Schmidt-Dominé ([email protected])" license="GPL">
+    <highlighting>
+        <list name="alerts_wml_utils">
+            <item> wmllint</item>
+            <item> wmlindent</item>
+            <item> wmlscope</item>
+        </list>
+        <list name="preprocessor_directive_statements">
+                <item>#textdomain</item>
+                <item>#else</item>
+                <item>#undef</item>
+        </list>
+        <list name="preprocessor_block_begin_statements">
+                <item>#define</item>
+                <item>#ifdef</item>
+                <item>#ifndef</item>
+                <item>#ifhave</item>
+                <item>#ifnhave</item>
+                <item>#ifver</item>
+                <item>#ifnver</item>
+        </list>
+        <list name="preprocessor_block_end_statements">
+                <item>#enddef</item>
+                <item>#endif</item>
+        </list>
+        <contexts>            
+            <!-- Main contexts -->
+            <context attribute="Normal WML Text" name="text" lineEndContext="#stay">
+                <RegExpr String="(_ *)?&quot;" attribute="String" context="string" />
+                
+                <RegExpr String=" *&lt;&lt;" attribute="String" context="luastring" beginRegion="wml_lua" />
+                
+                <keyword String="preprocessor_directive_statements" attribute="Preprocessor" context="preprocessor" />
+                <keyword String="preprocessor_block_begin_statements" attribute="Preprocessor" context="preprocessor" beginRegion="wmlpp_block" />
+                <keyword String="preprocessor_block_end_statements" attribute="Preprocessor" context="preprocessor" endRegion="wmlpp_block" />
+                
+                <DetectChar char="#" attribute="Comment" context="comment" />
+                
+                <DetectChar char="{" attribute="Macro/Include" context="macro" beginRegion="macro_block" />
+
+                <!--<DetectChar char="[" attribute="WML Node" context="section" firstNonSpace="true" />-->
+                <RegExpr String="\[(?!/)" attribute="WML Node" context="section" beginRegion="wml_node" />
+                <RegExpr String="\[/" attribute="WML Node" context="section" endRegion="wml_node" />
+
+                <RegExpr String="(\w|,| )+=" attribute="WML Attribute" context="value"
+                                    lookAhead="true" />
+                
+                <IncludeRules context="variableSubstitutionRule" />
+            </context>
+            
+            <context attribute="String" lineEndContext="#stay" name="string">
+                <DetectChar char="&quot;" attribute="String" context="#pop" />
+                <DetectChar char="{" attribute="Macro/Include" context="macro" />
+                <IncludeRules context="variableSubstitutionRule" />
+                <IncludeRules context="##Pango" includeAttrib="false"/>
+            </context>
+
+            <context attribute="String" name="luastring" lineEndContext="#stay">
+                <RegExpr String="&gt;&gt;" attribute="String" context="#pop" endRegion="wml_lua" />
+                <IncludeRules context="##Lua" includeAttrib="true"/>
+            </context>
+            
+            <context attribute="Macro String" name="luamacrostring" lineEndContext="#stay">
+                <RegExpr String="&gt;&gt;" attribute="Macro String" context="#pop" endRegion="wml_lua" />
+                <IncludeRules context="##Lua" includeAttrib="true"/>
+            </context>
+            
+            <context attribute="Comment" lineEndContext="#pop" name="comment">
+                <keyword attribute="Maintenance script statement" context="#stay" String="alerts_wml_utils" />
+                <IncludeRules context="##Alerts" />
+            </context>
+            
+            <context attribute="Macro/Include" lineEndContext="#stay" name="macro">
+                <DetectChar char="{" attribute="Macro/Include" context="macro" beginRegion="macro_block"/>
+                <RegExpr String="(_ *)?&quot;" attribute="Macro String" context="macroString" />
+                <RegExpr String=" *&lt;&lt;" attribute="Macro String" context="luamacrostring" beginRegion="wml_lua" />
+                <DetectChar char="(" attribute="Macro String" context="macroString2" beginRegion="macro_paren_string" />
+                <DetectChar char="}" attribute="Macro/Include" context="#pop" endRegion="macro_block" />
+                <IncludeRules context="variableSubstitutionRule" />
+            </context>
+            
+            <context attribute="Macro String" lineEndContext="#stay" name="macroString">
+                <DetectChar char="&quot;" attribute="Macro String" context="#pop" />
+                <DetectChar char="{" attribute="Macro/Include" context="macro" beginRegion="macro_block" />
+                <IncludeRules context="variableSubstitutionRule" />
+                <IncludeRules context="##Pango" includeAttrib="false"/>
+            </context>
+            
+            <context attribute="Macro String" lineEndContext="#stay" name="macroString2">
+                <DetectChar char=")" attribute="Macro String" context="#pop" endRegion="macro_paren_string" />
+                <DetectChar char="{" attribute="Macro/Include" context="macro" beginRegion="macro_block" />
+                <IncludeRules context="text" />
+            </context>
+            
+            <context attribute="WML Node" lineEndContext="error" name="section">
+                <DetectChar char="]" attribute="WML Node" context="#pop" />
+            </context>
+            
+            <context attribute="WML Attribute" lineEndContext="#pop" name="value">
+                <DetectChar char="=" attribute="Normal WML Text" context="#pop" />
+            </context>
+            
+            <context attribute="Preprocessor" lineEndContext="#pop" name="preprocessor">
+            </context>
+            
+            <context attribute="Error" lineEndContext="#pop" name="error">
+            </context>
+            
+            <context attribute="Variable Substitution" lineEndContext="#pop"
+                     name="variableSubstitution">
+                <DetectChar char="|" attribute="Variable Substitution" context="#pop" />
+                <DetectChar char="$" attribute="Variable Substitution" context="variableSubstitution" />
+                <DetectChar char="[" attribute="Variable Subscript" context="variableSubscript" />
+                <RegExpr String="[^A-Za-z0-9_\.]" attribute="Variable Substitution" context="#pop"
+                         lookAhead="true" />
+            </context>
+            
+            <context attribute="Variable Subscript" lineEndContext="error" name="variableSubscript">
+                <DetectChar char="]" attribute="Variable Subscript" context="#pop" />
+            </context>
+            
+            <!-- Include contexts -->
+            <context attribute="Variable Substitution" lineEndContext="#pop" name="variableSubstitutionRule">
+                <DetectChar char="$" attribute="Variable Substitution" context="variableSubstitution" />
+            </context>
+            
+        </contexts>
+        <itemDatas>
+            <itemData name="Normal WML Text" defStyleNum="dsNormal" />
+            <itemData name="Normal Text" defStyleNum="dsString" /> <!--For Pango-->
+            <itemData name="Maintenance script statement" defStyleNum="dsAlert"/>
+            <itemData name="String" defStyleNum="dsString" />
+            <itemData name="Comment" defStyleNum="dsComment" />
+            <itemData name="Macro/Include" defStyleNum="dsFunction" />
+            <itemData name="WML Node" defStyleNum="dsKeyword" />
+            <itemData name="WML Attribute" defStyleNum="dsDataType" />
+            <itemData name="Preprocessor" defStyleNum="dsOthers" />
+            <itemData name="Error" defStyleNum="dsError" />
+            <itemData name="Macro String" defStyleNum="dsChar" />
+            <itemData name="Variable Substitution" defStyleNum="dsDecVal" />
+            <itemData name="Variable Subscript" defStyleNum="dsBaseN" />
+        </itemDatas>
+    </highlighting>
+    <general>
+        <comments>
+            <comment name="singleLine" start="#"/>
+        </comments>
+        <keywords casesensitive="1"/>
+    </general>
+</language>
diff --git a/kate/data/xml.xml b/kate/data/xml.xml
index 6ccf8fa09..65e9be2b6 100644
--- a/kate/data/xml.xml
+++ b/kate/data/xml.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd"
 [
-	<!ENTITY name    "[A-Za-z_:][\w.:_-]*">
+	<!-- names must start with a letter, ideogram or underscore. \w matches any
+		 word character *or* a number, hence the lookahead -->
+	<!ENTITY name    "(?![0-9])[\w_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-<language name="XML" version="1.97" kateversion="2.4" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf" mimetype="text/xml;text/book;text/daml;text/rdf;application/rss+xml;application/xspf+xml" casesensitive="1" author="Wilbert Berendsen ([email protected])" license="LGPL">
+<language name="XML" version="2.03" kateversion="2.4" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf;*.xsd;*.svg;*.ui;*.kcfg;*.qrc;*.wsdl" mimetype="text/xml;text/book;text/daml;text/rdf;application/rss+xml;application/xspf+xml;image/svg+xml;application/x-designer;application/xml" casesensitive="1" author="Wilbert Berendsen ([email protected])" license="LGPL">
 
 <highlighting>
 <contexts>
@@ -23,12 +25,12 @@
     <DetectIdentifier />
   </context>
 
-  <context name="FindEntityRefs" attribute="Normal Text" lineEndContext="#stay">
+  <context name="FindEntityRefs" attribute="Other Text" lineEndContext="#stay">
     <RegExpr attribute="EntityRef" context="#stay" String="&entref;" />
     <AnyChar attribute="Error" context="#stay" String="&amp;&lt;" />
   </context>
 
-  <context name="FindPEntityRefs" attribute="Normal Text" lineEndContext="#stay">
+  <context name="FindPEntityRefs" attribute="Other Text" lineEndContext="#stay">
     <RegExpr attribute="EntityRef" context="#stay" String="&entref;" />
     <RegExpr attribute="PEntityRef" context="#stay" String="%&name;;" />
     <AnyChar attribute="Error" context="#stay" String="&amp;%" />
@@ -43,23 +45,23 @@
     <DetectIdentifier />
   </context>
 
-  <context name="CDATA" attribute="Normal Text" lineEndContext="#stay">
+  <context name="CDATA" attribute="Other Text" lineEndContext="#stay">
     <DetectSpaces />
     <DetectIdentifier />
     <StringDetect attribute="CDATA" context="#pop" String="]]&gt;" endRegion="cdata" />
     <StringDetect attribute="EntityRef" context="#stay" String="]]&amp;gt;" />
   </context>
 
-  <context name="PI" attribute="Normal Text" lineEndContext="#stay">
+  <context name="PI" attribute="Other Text" lineEndContext="#stay">
     <Detect2Chars attribute="Processing Instruction" context="#pop" char="?" char1="&gt;" endRegion="pi" />
   </context>
 
-  <context name="Doctype" attribute="Normal Text" lineEndContext="#stay">
+  <context name="Doctype" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Doctype" context="#pop" char="&gt;" endRegion="doctype" />
     <DetectChar attribute="Doctype" context="Doctype Internal Subset" char="[" beginRegion="int_subset" />
   </context>
 
-  <context name="Doctype Internal Subset" attribute="Normal Text" lineEndContext="#stay">
+  <context name="Doctype Internal Subset" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Doctype" context="#pop" char="]" endRegion="int_subset" />
     <RegExpr attribute="Doctype" context="Doctype Markupdecl" String="&lt;!(ELEMENT|ENTITY|ATTLIST|NOTATION)\b" />
     <StringDetect attribute="Comment" context="Comment" String="&lt;!--" beginRegion="comment" />
@@ -67,7 +69,7 @@
     <IncludeRules context="FindPEntityRefs" />
   </context>
 
-  <context name="Doctype Markupdecl" attribute="Normal Text" lineEndContext="#stay">
+  <context name="Doctype Markupdecl" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Doctype" context="#pop" char="&gt;" />
     <DetectChar attribute="Value" context="Doctype Markupdecl DQ" char="&quot;" />
     <DetectChar attribute="Value" context="Doctype Markupdecl SQ" char="&apos;" />
@@ -83,7 +85,7 @@
     <IncludeRules context="FindPEntityRefs" />
   </context>
 
-  <context name="Element" attribute="Normal Text" lineEndContext="#stay">
+  <context name="Element" attribute="Other Text" lineEndContext="#stay">
     <Detect2Chars attribute="Element" context="#pop" char="/" char1="&gt;" endRegion="element" />
     <DetectChar attribute="Element" context="El Content" char="&gt;" />
     <RegExpr attribute="Attribute" context="Attribute" String="^&name;" />
@@ -91,22 +93,22 @@
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
-  <context name="El Content" attribute="Normal Text" lineEndContext="#stay">
+  <context name="El Content" attribute="Other Text" lineEndContext="#stay">
     <RegExpr attribute="Element" context="El End" String="&lt;/&name;" />
     <IncludeRules context="FindXML" />
   </context>
 
-  <context name="El End" attribute="Normal Text" lineEndContext="#stay">
+  <context name="El End" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Element" context="#pop#pop#pop" char="&gt;" endRegion="element" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
-  <context name="Attribute" attribute="Normal Text" lineEndContext="#stay">
+  <context name="Attribute" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Attribute" context="Value" char="=" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
-  <context name="Value" attribute="Normal Text" lineEndContext="#stay">
+  <context name="Value" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Value" context="Value DQ" char="&quot;" />
     <DetectChar attribute="Value" context="Value SQ" char="&apos;" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
@@ -125,16 +127,17 @@
 </contexts>
 <itemDatas>
   <itemData name="Normal Text" defStyleNum="dsNormal" />
-  <itemData name="Comment" defStyleNum="dsComment" />
-  <itemData name="CDATA" defStyleNum="dsBaseN" bold="1" />
-  <itemData name="Processing Instruction" defStyleNum="dsKeyword" />
-  <itemData name="Doctype" defStyleNum="dsDataType" bold="1" />
-  <itemData name="Element" defStyleNum="dsKeyword" />
-  <itemData name="Attribute" defStyleNum="dsOthers" />
-  <itemData name="Value" defStyleNum="dsString" color="#a00" />
-  <itemData name="EntityRef" defStyleNum="dsDecVal" />
-  <itemData name="PEntityRef" defStyleNum="dsDecVal" />
-  <itemData name="Error" defStyleNum="dsError" />
+  <itemData name="Other Text" defStyleNum="dsNormal" />
+  <itemData name="Comment" defStyleNum="dsComment" spellChecking="false" />
+  <itemData name="CDATA" defStyleNum="dsBaseN" bold="1" spellChecking="false" />
+  <itemData name="Processing Instruction" defStyleNum="dsKeyword" spellChecking="false" />
+  <itemData name="Doctype" defStyleNum="dsDataType" bold="1" spellChecking="false" />
+  <itemData name="Element" defStyleNum="dsKeyword" spellChecking="false" />
+  <itemData name="Attribute" defStyleNum="dsOthers" spellChecking="false" />
+  <itemData name="Value" defStyleNum="dsString" color="#a00" spellChecking="false" />
+  <itemData name="EntityRef" defStyleNum="dsDecVal" spellChecking="false" />
+  <itemData name="PEntityRef" defStyleNum="dsDecVal" spellChecking="false" />
+  <itemData name="Error" defStyleNum="dsError" spellChecking="false" />
 </itemDatas>
 
 </highlighting>
diff --git a/kate/data/zsh.xml b/kate/data/zsh.xml
new file mode 100644
index 000000000..5d0575ab9
--- /dev/null
+++ b/kate/data/zsh.xml
@@ -0,0 +1,959 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+        <!ENTITY funcname "[A-Za-z_:][A-Za-z0-9_:#&#37;@-]*">
+        <!ENTITY varname  "[A-Za-z_][A-Za-z0-9_]*">
+        <!ENTITY word     "[^|&amp;;()&lt;&gt;\s]+">    <!-- see man bash -->
+        <!ENTITY eos      "(?=($|\s))">                 <!-- eol or space following -->
+        <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
+        <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
+]>
+<language name="Zsh" version="0.1" kateversion="2.4" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Kolberg ([email protected])" license="LGPL">
+
+<!-- (c) 2011 by Jonathan Kolberg ([email protected])
+  modified for zsh -->
+<!-- (c) 2004 by Wilbert Berendsen ([email protected])
+    Changes by Matthew Woehlke ([email protected])
+    Changes by Sebastian Pipping ([email protected])
+    Released under the LGPL, part of tdelibs/kate -->
+
+  <highlighting>
+    <list name="keywords">
+      <item> else </item>
+      <item> for </item>
+      <item> function </item>
+      <item> in </item>
+      <item> select </item>
+      <item> until </item>
+      <item> while </item>
+      <item> elif </item>
+      <item> then </item>
+      <item> set </item>
+    </list>
+
+<list name="builtins"><!-- see man zshbuiltins -->
+	<item> - </item>
+	<item> . </item>
+	<item> : </item>
+	<item> alias </item>
+	<item> autoload </item>
+	<item> bg </item>
+	<item> bindkey </item>
+	<item> break </item>
+	<item> builtin </item>
+	<item> bye </item>
+	<item> cap </item>
+	<item> cd </item>
+	<item> chdir </item>
+	<item> clone </item>
+	<item> command </item>
+	<item> comparguments </item>
+	<item> compcall </item>
+	<item> compctl </item>
+	<item> compdescribe </item>
+	<item> compfiles </item>
+	<item> compgroups </item>
+	<item> compquote </item>
+	<item> comptags </item>
+	<item> comptry </item>
+	<item> compvalues </item>
+	<item> continue </item>
+	<item> dirs </item>
+	<item> disable </item>
+	<item> disown </item>
+	<item> echo </item>
+	<item> echotc </item>
+	<item> echoti </item>
+	<item> emulate </item>
+	<item> enable </item>
+	<item> eval </item>
+	<item> exec </item>
+	<item> exit </item>
+	<item> false </item>
+	<item> fc </item>
+	<item> fg </item>
+	<item> functions </item>
+	<item> getcap </item>
+	<item> getopts </item>
+	<item> hash </item>
+	<item> history </item>
+	<item> jobs </item>
+	<item> kill </item>
+	<item> let </item>
+	<item> limit </item>
+	<item> log </item>
+	<item> logout </item>
+	<item> noglob </item>
+	<item> popd </item>
+	<item> print </item>
+	<item> printf </item>
+	<item> pushd </item>
+	<item> pushln </item>
+	<item> pwd </item>
+	<item> r </item>
+	<item> rehash </item>
+	<item> return </item>
+	<item> sched </item>
+	<item> set </item>
+	<item> setcap </item>
+	<item> setopt </item>
+	<item> shift </item>
+	<item> source </item>
+	<item> stat </item>
+	<item> suspend </item>
+	<item> test </item>
+	<item> times </item>
+	<item> trap </item>
+	<item> true </item>
+	<item> ttyctl </item>
+	<item> type </item>
+	<item> ulimit </item>
+	<item> umask </item>
+	<item> unalias </item>
+	<item> unfunction </item>
+	<item> unhash </item>
+	<item> unlimit </item>
+	<item> unset </item>
+	<item> unsetopt </item>
+	<item> vared </item>
+	<item> wait </item>
+	<item> whence </item>
+	<item> where </item>
+	<item> which </item>
+	<item> zcompile </item>
+	<item> zformat </item>
+	<item> zftp </item>
+	<item> zle </item>
+	<item> zmodload </item>
+	<item> zparseopts </item>
+	<item> zprof </item>
+	<item> zpty </item>
+	<item> zregexparse </item>
+	<item> zsocket </item>
+	<item> zstyle </item>
+	<item> ztcp </item>
+    </list>
+
+    <list name="builtins_var">
+	<item> declare </item>
+	<item> export </item>
+	<item> float </item>
+	<item> getln </item>
+	<item> integer </item>
+	<item> unset </item>
+	<item> declare </item>
+	<item> typeset </item>
+	<item> local </item>
+	<item> read </item>
+	<item> readonly </item>
+    </list>
+
+    <list name="unixcommands">
+      <!-- /bin -->
+      <item> arch </item>
+      <item> awk </item>
+      <item> bash </item>
+      <item> bunzip2 </item>
+      <item> bzcat </item>
+      <item> bzcmp </item>
+      <item> bzdiff </item>
+      <item> bzegrep </item>
+      <item> bzfgrep </item>
+      <item> bzgrep </item>
+      <item> bzip2 </item>
+      <item> bzip2recover </item>
+      <item> bzless </item>
+      <item> bzmore </item>
+      <item> cat </item>
+      <item> chattr </item>
+      <item> chgrp </item>
+      <item> chmod </item>
+      <item> chown </item>
+      <item> chvt </item>
+      <item> cp </item>
+      <item> date </item>
+      <item> dd </item>
+      <item> deallocvt </item>
+      <item> df </item>
+      <item> dir </item>
+      <item> dircolors </item>
+      <item> dmesg </item>
+      <item> dnsdomainname </item>
+      <item> domainname </item>
+      <item> du </item>
+      <item> dumpkeys </item>
+      <item> echo </item>
+      <item> ed </item>
+      <item> egrep </item>
+      <item> false </item>
+      <item> fgconsole </item>
+      <item> fgrep </item>
+      <item> fuser </item>
+      <item> gawk </item>
+      <item> getkeycodes </item>
+      <item> gocr </item>
+      <item> grep </item>
+      <item> groff </item>
+      <item> groups </item>
+      <item> gunzip </item>
+      <item> gzexe </item>
+      <item> gzip </item>
+      <item> hostname </item>
+      <item> igawk </item>
+      <item> install </item>
+      <item> kbd_mode </item>
+      <item> kbdrate </item>
+      <item> killall </item>
+      <item> last </item>
+      <item> lastb </item>
+      <item> link </item>
+      <item> ln </item>
+      <item> loadkeys </item>
+      <item> loadunimap </item>
+      <item> login </item>
+      <item> ls </item>
+      <item> lsattr </item>
+      <item> lsmod </item>
+      <item> lsmod.old </item>
+      <item> lzcat </item>
+      <item> lzcmp </item>
+      <item> lzdiff </item>
+      <item> lzegrep </item>
+      <item> lzfgrep </item>
+      <item> lzgrep </item>
+      <item> lzless </item>
+      <item> lzcat </item>
+      <item> lzma </item>
+      <item> lzmainfo </item>
+      <item> lzmore </item>
+      <item> mapscrn </item>
+      <item> mesg </item>
+      <item> mkdir </item>
+      <item> mkfifo </item>
+      <item> mknod </item>
+      <item> mktemp </item>
+      <item> more </item>
+      <item> mount </item>
+      <item> mv </item>
+      <item> nano </item>
+      <item> netstat </item>
+      <item> nisdomainname </item>
+      <item> nroff </item>
+      <item> openvt </item>
+      <item> pgawk </item>
+      <item> pidof </item>
+      <item> ping </item>
+      <item> ps </item>
+      <item> pstree </item>
+      <item> pwd </item>
+      <item> rbash </item>
+      <item> readlink </item>
+      <item> red </item>
+      <item> resizecons </item>
+      <item> rm </item>
+      <item> rmdir </item>
+      <item> run-parts </item>
+      <item> sash </item>
+      <item> sed </item>
+      <item> setfont </item>
+      <item> setkeycodes </item>
+      <item> setleds </item>
+      <item> setmetamode </item>
+      <item> setserial </item>
+      <item> sh </item>
+      <item> showkey </item>
+      <item> shred </item>
+      <item> sleep </item>
+      <item> ssed </item>
+      <item> stat </item>
+      <item> stty </item>
+      <item> su </item>
+      <item> sync </item>
+      <item> tar </item>
+      <item> tempfile </item>
+      <item> touch </item>
+      <item> troff </item>
+      <item> true </item>
+      <item> umount </item>
+      <item> uname </item>
+      <item> unicode_start </item>
+      <item> unicode_stop </item>
+      <item> unlink </item>
+      <item> unlzma </item>
+      <item> unxz </item>
+      <item> utmpdump </item>
+      <item> uuidgen </item>
+      <item> vdir </item>
+      <item> wall </item>
+      <item> wc </item>
+      <item> xz </item>
+      <item> xzcat </item>
+      <item> ypdomainname </item>
+      <item> zcat </item>
+      <item> zcmp </item>
+      <item> zdiff </item>
+      <item> zegrep </item>
+      <item> zfgrep </item>
+      <item> zforce </item>
+      <item> zgrep </item>
+      <item> zless </item>
+      <item> zmore </item>
+      <item> znew </item>
+      <item> zsh </item>
+
+      <!-- some from /usr/bin -->
+      <item> aclocal </item>
+      <item> aconnect </item>
+      <item> aplay </item>
+      <item> apm </item>
+      <item> apmsleep </item>
+      <item> apropos </item>
+      <item> ar </item>
+      <item> arecord </item>
+      <item> as </item>
+      <item> as86 </item>
+      <item> autoconf </item>
+      <item> autoheader </item>
+      <item> automake </item>
+      <item> awk </item>
+      <item> basename </item>
+      <item> bc </item>
+      <item> bison </item>
+      <item> c++ </item>
+      <item> cal </item>
+      <item> cat </item>
+      <item> cc </item>
+      <item> cdda2wav </item>
+      <item> cdparanoia </item>
+      <item> cdrdao </item>
+      <item> cd-read </item>
+      <item> cdrecord </item>
+      <item> chfn </item>
+      <item> chgrp </item>
+      <item> chmod </item>
+      <item> chown </item>
+      <item> chroot </item>
+      <item> chsh </item>
+      <item> clear </item>
+      <item> cmp </item>
+      <item> co </item>
+      <item> col </item>
+      <item> comm </item>
+      <item> cp </item>
+      <item> cpio </item>
+      <item> cpp </item>
+      <item> cut </item>
+      <item> dc </item>
+      <item> dd </item>
+      <item> df </item>
+      <item> diff </item>
+      <item> diff3 </item>
+      <item> dir </item>
+      <item> dircolors </item>
+      <item> directomatic </item>
+      <item> dirname </item>
+      <item> du </item>
+      <item> env </item>
+      <item> expr </item>
+      <item> fbset </item>
+      <item> file </item>
+      <item> find </item>
+      <item> flex </item>
+      <item> flex++ </item>
+      <item> fmt </item>
+      <item> free </item>
+      <item> ftp </item>
+      <item> funzip </item>
+      <item> fuser </item>
+      <item> g++ </item>
+      <item> gawk </item>
+      <item> gc </item>
+      <item> gcc </item>
+      <item> gdb </item>
+      <item> getent </item>
+      <item> getopt </item>
+      <item> gettext </item>
+      <item> gettextize </item>
+      <item> gimp </item>
+      <item> gimp-remote </item>
+      <item> gimptool </item>
+      <item> gmake </item>
+      <item> gs </item>
+      <item> head </item>
+      <item> hexdump </item>
+      <item> id </item>
+      <item> install </item>
+      <item> join </item>
+      <item> kill </item>
+      <item> killall </item>
+      <item> ld </item>
+      <item> ld86 </item>
+      <item> ldd </item>
+      <item> less </item>
+      <item> lex </item>
+      <item> ln </item>
+      <item> locate </item>
+      <item> lockfile </item>
+      <item> logname </item>
+      <item> lp </item>
+      <item> lpr </item>
+      <item> ls </item>
+      <item> lynx </item>
+      <item> m4 </item>
+      <item> make </item>
+      <item> man </item>
+      <item> mkdir </item>
+      <item> mknod </item>
+      <item> msgfmt </item>
+      <item> mv </item>
+      <item> namei </item>
+      <item> nasm </item>
+      <item> nawk </item>
+      <item> nice </item>
+      <item> nl </item>
+      <item> nm </item>
+      <item> nm86 </item>
+      <item> nmap </item>
+      <item> nohup </item>
+      <item> nop </item>
+      <item> od </item>
+      <item> passwd </item>
+      <item> patch </item>
+      <item> pcregrep </item>
+      <item> pcretest </item>
+      <item> perl </item>
+      <item> perror </item>
+      <item> pidof </item>
+      <item> pr </item>
+      <item> printf </item>
+      <item> procmail </item>
+      <item> prune </item>
+      <item> ps2ascii </item>
+      <item> ps2epsi </item>
+      <item> ps2frag </item>
+      <item> ps2pdf </item>
+      <item> ps2ps </item>
+      <item> psbook </item>
+      <item> psmerge </item>
+      <item> psnup </item>
+      <item> psresize </item>
+      <item> psselect </item>
+      <item> pstops </item>
+      <item> rcs </item>
+      <item> rev </item>
+      <item> rm </item>
+      <item> scp </item>
+      <item> sed </item>
+      <item> seq </item>
+      <item> setterm </item>
+      <item> shred </item>
+      <item> size </item>
+      <item> size86 </item>
+      <item> skill </item>
+      <item> slogin </item>
+      <item> snice </item>
+      <item> sort </item>
+      <item> sox </item>
+      <item> split </item>
+      <item> ssh </item>
+      <item> ssh-add </item>
+      <item> ssh-agent </item>
+      <item> ssh-keygen </item>
+      <item> ssh-keyscan </item>
+      <item> stat </item>
+      <item> strings </item>
+      <item> strip </item>
+      <item> sudo </item>
+      <item> suidperl </item>
+      <item> sum </item>
+      <item> tac </item>
+      <item> tail </item>
+      <item> tee </item>
+      <item> test </item>
+      <item> tr </item>
+      <item> uniq </item>
+      <item> unlink </item>
+      <item> unzip </item>
+      <item> updatedb </item>
+      <item> updmap </item>
+      <item> uptime </item>
+      <item> users </item>
+      <item> vmstat </item>
+      <item> w </item>
+      <item> wc </item>
+      <item> wget </item>
+      <item> whatis </item>
+      <item> whereis </item>
+      <item> which </item>
+      <item> who </item>
+      <item> whoami </item>
+      <item> write </item>
+      <item> xargs </item>
+      <item> yacc </item>
+      <item> yes </item>
+      <item> zip </item>
+      <item> zsoelim </item>
+
+      <!-- others -->
+      <item> dcop </item>
+      <item> kdialog </item>
+      <item> kfile </item>
+      <item> xhost </item>
+      <item> xmodmap </item>
+      <item> xset </item>
+    </list>
+
+
+    <contexts>
+      <context attribute="Normal Text" lineEndContext="#stay" name="Start">
+        <IncludeRules context="FindAll" />
+      </context>
+
+<!-- ====== The following rulessets are meant to be included ======== -->
+      <!-- FindAll tries to interpret everything -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindAll">
+        <IncludeRules context="FindComments" />
+        <IncludeRules context="FindCommands" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+      </context>
+
+      <!-- FindMost tries to interpret anything except commands -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindMost">
+        <IncludeRules context="FindComments" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+      </context>
+
+
+      <!-- FindComments consumes shell comments till EOL -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="FindComments">
+        <DetectChar attribute="Comment" context="Comment" char="#" firstNonSpace="true"/>
+        <RegExpr attribute="Normal Text" context="Comment" String="[\s;](?=#)" />
+      </context>
+      <context attribute="Comment" lineEndContext="#pop" name="Comment">
+        <IncludeRules context="##Alerts" />
+      </context>
+
+      <!-- FindCommentsParen consumes shell comments till EOL or a closing parenthese -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="FindCommentsParen">
+        <DetectChar attribute="Comment" context="CommentParen" char="#" firstNonSpace="true"/>
+        <RegExpr attribute="Normal Text" context="CommentParen" String="[\s;](?=#)" />
+      </context>
+      <context attribute="Comment" lineEndContext="#pop" name="CommentParen">
+        <RegExpr attribute="Comment" context="#pop" String="[^)](?=\))" />
+        <IncludeRules context="##Alerts" />
+      </context>
+
+      <!-- FindCommentsBackq consumes shell comments till EOL or a backquote -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="FindCommentsBackq">
+        <DetectChar attribute="Comment" context="CommentBackq" char="#" firstNonSpace="true"/>
+        <RegExpr attribute="Normal Text" context="CommentBackq" String="[\s;](?=#)" />
+      </context>
+      <context attribute="Comment" lineEndContext="#pop" name="CommentBackq">
+        <RegExpr attribute="Comment" context="#pop" String="[^`](?=`)" />
+        <IncludeRules context="##Alerts" />
+      </context>
+
+
+      <!-- FindCommands matches many items that can be expected outside strings, substitutions etc. -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindCommands">
+        <!-- start expression in double parentheses -->
+        <Detect2Chars attribute="Keyword" context="ExprDblParen" char="(" char1="(" beginRegion="expression" />
+        <!-- start expression in double brackets -->
+        <RegExpr attribute="Keyword" context="ExprDblBracket" String="\[\[&eos;" beginRegion="expression" column="0"/>
+        <RegExpr attribute="Keyword" context="ExprDblBracket" String="\s\[\[&eos;" beginRegion="expression" />
+        <!-- start expression in single brackets -->
+        <RegExpr attribute="Builtin" context="ExprBracket" String="\[&eos;" beginRegion="expression" column="0"/>
+        <RegExpr attribute="Builtin" context="ExprBracket" String="\s\[&eos;" beginRegion="expression" />
+        <!-- start a group command with { -->
+        <RegExpr attribute="Keyword" context="Group" String="\{&eos;" beginRegion="group" />
+        <!-- start a subshell -->
+        <DetectChar attribute="Keyword" context="SubShell" char="(" beginRegion="subshell" />
+        <!-- match do and if blocks -->
+        <RegExpr attribute="Keyword" context="#stay" String="\bdo&noword;" beginRegion="do" />
+        <RegExpr attribute="Keyword" context="#stay" String="\bdone&noword;" endRegion="do" />
+        <RegExpr attribute="Keyword" context="#stay" String="\bif&eos;" beginRegion="if" />
+        <RegExpr attribute="Keyword" context="#stay" String="\bfi&noword;" endRegion="if" />
+        <!-- handle case as a special case -->
+        <RegExpr attribute="Keyword" context="Case" String="\bcase&noword;" beginRegion="case" />
+        <!-- handle command line options -->
+        <RegExpr attribute="Option" context="#stay" String="-[A-Za-z0-9][A-Za-z0-9_]*" />
+        <RegExpr attribute="Option" context="#stay" String="--[a-z][A-Za-z0-9_-]*" />
+        <!-- handle variable assignments -->
+        <RegExpr attribute="Variable" context="Assign" String="\b&varname;\+?=" />
+        <RegExpr attribute="Variable" context="AssignSubscr" String="\b&varname;(?=\[.+\]\+?=)" />
+        <!-- handle functions with function keyword before keywords -->
+        <StringDetect attribute="Function" context="#stay" String=":()" />
+        <RegExpr attribute="Keyword" context="FunctionDef" String="\bfunction\b" />
+        <!-- handle keywords -->
+        <keyword attribute="Keyword" context="#stay" String="keywords" />
+        <RegExpr attribute="Builtin" context="#stay" String="\.(?=\s)" />
+        <keyword attribute="Builtin" context="#stay" String="builtins" />
+        <keyword attribute="Command" context="#stay" String="unixcommands" />
+        <!-- handle commands that have variable names as argument -->
+        <keyword attribute="Builtin" context="VarName" String="builtins_var" />
+        <!-- handle here-string -->
+        <RegExpr attribute="Redirection" context="#stay" String="\d*&lt;&lt;&lt;" />
+        <!-- handle here document -->
+        <StringDetect attribute="Redirection" context="HereDoc" String="&lt;&lt;" lookAhead="true" />
+        <!-- handle process subst -->
+        <RegExpr attribute="Redirection" context="ProcessSubst" String="[&lt;&gt;]\(" />
+        <!-- handle redirection -->
+        <RegExpr attribute="Redirection" context="#stay" String="([0-9]*(&gt;{1,2}|&lt;)(&amp;[0-9]+-?)?|&amp;&gt;|&gt;&amp;|[0-9]*&lt;&gt;)" />
+        <!-- handle &, &&, | and || -->
+        <RegExpr attribute="Control" context="#stay" String="([|&amp;])\1?" />
+        <!-- mark function definitions without function keyword -->
+        <RegExpr attribute="Function" context="#stay" String="&funcname;\s*\(\)" />
+      </context>
+
+      <!-- FindOthers contains various rules to mark different shell input -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindOthers">
+        <RegExpr attribute="Escape" context="#stay" String="\\[][;\\$`{}()|&amp;&lt;&gt;* ]" />
+        <RegExpr attribute="Keyword" context="#stay" String="\\$" />
+        <RegExpr attribute="Escape" context="#stay" String="\{(?!(\s|$))\S*\}" />
+        <RegExpr attribute="Path" context="#stay" String="&pathpart;*(?=/)" />
+        <RegExpr attribute="Path" context="#stay" String="~\w*" />
+        <RegExpr attribute="Path" context="#stay" String="/&pathpart;*(?=([\s/):;$`'&quot;]|$))" />
+        <!-- TODO: shell globs beside * and ? (in Path's) -->
+      </context>
+
+      <!-- FindStrings looks for single and double quoted strings, also with $-prefix -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindStrings">
+        <Detect2Chars attribute="Escape" context="#stay" char="\\" char1="'" />
+        <Detect2Chars attribute="Escape" context="#stay" char="\\" char1="&quot;" />
+        <DetectChar attribute="String SingleQ" context="StringSQ" char="'" />
+        <DetectChar attribute="String DoubleQ" context="StringDQ" char="&quot;" />
+        <Detect2Chars attribute="String SingleQ" context="StringEsc" char="$" char1="'" />
+        <Detect2Chars attribute="String Transl." context="StringDQ" char="$" char1="&quot;" />
+      </context>
+
+      <!-- FindSubstitutions goes after anything starting with $ and ` and their escapes -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindSubstitutions">
+        <RegExpr attribute="Variable" context="Subscript" String="\$&varname;\[" />
+        <RegExpr attribute="Variable" context="#stay" String="\$&varname;" />
+        <RegExpr attribute="Variable" context="#stay" String="\$[*@#?$!_0-9-]" />
+        <RegExpr attribute="Variable" context="#stay" String="\$\{[*@#?$!_0-9-]\}" />
+        <RegExpr attribute="Variable" context="#stay" String="\$\{#&varname;(\[[*@]\])?\}" />
+        <RegExpr attribute="Variable" context="#stay" String="\$\{!&varname;(\[[*@]\]|[*@])?\}" />
+        <RegExpr attribute="Variable" context="VarBrace" String="\$\{&varname;" />
+        <RegExpr attribute="Variable" context="VarBrace" String="\$\{[*@#?$!_0-9-](?=[:#%/=?+-])" />
+        <StringDetect attribute="Variable" context="ExprDblParenSubst" String="$((" beginRegion="expression" />
+        <StringDetect attribute="Redirection" context="SubstFile" String="$(&lt;" />
+        <StringDetect attribute="Variable" context="SubstCommand" String="$(" />
+        <DetectChar attribute="Backquote" context="SubstBackq" char="`" />
+        <RegExpr attribute="Escape" context="#stay" String="\\[`$\\]" />
+      </context>
+
+      <!-- FindTests finds operators valid in tests -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindTests">
+        <RegExpr attribute="Expression" context="#stay" String="-[abcdefghkprstuwxOGLSNozn](?=\s)"/>
+        <RegExpr attribute="Expression" context="#stay" String="-([no]t|ef)(?=\s)"/>
+        <RegExpr attribute="Expression" context="#stay" String="([!=]=?|[&gt;&lt;])(?=\s)"/>
+        <RegExpr attribute="Expression" context="#stay" String="-(eq|ne|[gl][te])(?=\s)"/>
+      </context>
+
+
+<!-- ====== These are the contexts that can be branched to ======= -->
+
+      <!-- ExprDblParen consumes an expression started in command mode till )) -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblParen">
+        <Detect2Chars attribute="Keyword" context="#pop" char=")" char1=")" endRegion="expression" />
+        <DetectChar attribute="Normal Text" context="ExprSubParen" char="(" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- ExprDblParenSubst like ExprDblParen but matches )) as Variable -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblParenSubst">
+        <Detect2Chars attribute="Variable" context="#pop" char=")" char1=")" endRegion="expression" />
+        <DetectChar attribute="Normal Text" context="ExprSubParen" char="(" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- ExprSubParen consumes an expression till ) -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprSubParen">
+        <DetectChar attribute="Normal Text" context="#pop" char=")" />
+        <DetectChar attribute="Normal Text" context="ExprSubParen" char="(" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- ExprBracket consumes an expression till ] -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracket">
+        <RegExpr attribute="Builtin" context="#pop" String="\s\](?=($|[\s;|&amp;]))" endRegion="expression" />
+        <RegExpr attribute="Builtin" context="#pop" String="\](?=($|[\s;|&amp;]))" endRegion="expression" column="0"/>
+        <DetectChar attribute="Normal Text" context="ExprSubParen" char="(" />
+        <IncludeRules context="FindTests" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- ExprDblBracket consumes an expression till ]] -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracket">
+        <RegExpr attribute="Keyword" context="#pop" String="\s\]\](?=($|[\s;|&amp;]))" endRegion="expression" />
+        <RegExpr attribute="Keyword" context="#pop" String="\]\](?=($|[\s;|&amp;]))" endRegion="expression" column="0"/>
+        <DetectChar attribute="Normal Text" context="ExprSubParen" char="(" />
+        <IncludeRules context="FindTests" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- Group consumes shell input till } -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="Group">
+        <DetectChar attribute="Keyword" context="#pop" char="}" endRegion="group" />
+        <IncludeRules context="FindAll" />
+      </context>
+
+      <!-- SubShell consumes shell input till ) -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="SubShell">
+        <DetectChar attribute="Keyword" context="#pop" char=")" endRegion="subshell" />
+        <IncludeRules context="FindAll" />
+      </context>
+
+      <!-- Assign consumes an expression till EOL or whitespace -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="Assign" fallthrough="true" fallthroughContext="#pop">
+        <DetectChar attribute="Variable" context="AssignArray" char="(" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+        <RegExpr attribute="Normal Text" context="#stay" String="[\w:,+_./-]" />
+      </context>
+
+      <!-- AssignArray consumes everything till ), marking assignments -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="AssignArray">
+        <DetectChar attribute="Variable" context="#pop" char=")" />
+        <DetectChar attribute="Variable" context="Subscript" char="[" />
+        <DetectChar attribute="Variable" context="Assign" char="=" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- AssignSubscr first expects a [ then parses subscript and continues with '=value' -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="AssignSubscr" fallthrough="true" fallthroughContext="#pop">
+        <DetectChar attribute="Variable" context="Subscript" char="[" />
+        <Detect2Chars attribute="Variable" context="Assign" char="+" char1="=" />
+        <DetectChar attribute="Variable" context="Assign" char="=" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+      </context>
+
+      <!-- Subscript consumes anything till ], marks as Variable -->
+      <context attribute="Variable" lineEndContext="#stay" name="Subscript">
+        <DetectChar attribute="Variable" context="#pop" char="]" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+      </context>
+
+      <!-- FunctionDef consumes a name, possibly with (), marks as Function -->
+      <context attribute="Function" lineEndContext="#pop" name="FunctionDef" fallthrough="true" fallthroughContext="#pop">
+        <RegExpr attribute="Function" context="#pop" String="\s+&funcname;(\s*\(\))?" />
+      </context>
+
+      <!-- VarName consumes spare variable names and assignments -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="VarName" fallthrough="true" fallthroughContext="#pop">
+        <!-- handle command line options -->
+        <RegExpr attribute="Option" context="#stay" String="-[A-Za-z0-9]+" />
+        <RegExpr attribute="Option" context="#stay" String="--[a-z][A-Za-z0-9_-]*" />
+        <RegExpr attribute="Variable" context="#stay" String="\b&varname;" />
+        <DetectChar attribute="Variable" context="Subscript" char="[" />
+        <DetectChar attribute="Variable" context="Assign" char="=" />
+        <IncludeRules context="FindMost" />
+        <!-- stay here in spaces and other safe characters -->
+        <RegExpr attribute="Normal Text" context="#stay" String="[^]})|;`&amp;&gt;&lt;]" />
+      </context>
+
+      <!-- ProcessSubst handles <(command) and >(command) -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="ProcessSubst">
+        <DetectChar attribute="Redirection" context="#pop" char=")" />
+        <IncludeRules context="FindCommentsParen" />
+        <IncludeRules context="FindCommands" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+      </context>
+
+      <!-- StringSQ consumes anything till ' -->
+      <context attribute="String SingleQ" lineEndContext="#stay" name="StringSQ">
+        <DetectChar attribute="String SingleQ" context="#pop" char="'" />
+      </context>
+
+      <!-- StringDQ consumes anything till ", substitutes vars and expressions -->
+      <context attribute="String DoubleQ" lineEndContext="#stay" name="StringDQ">
+        <DetectChar attribute="String DoubleQ" context="#pop" char="&quot;" />
+        <RegExpr attribute="String Escape" context="#stay" String="\\[`&quot;\\$\n]" />
+        <IncludeRules context="FindSubstitutions" />
+      </context>
+
+      <!-- StringEsc eats till ', but escaping many characters -->
+      <context attribute="String SingleQ" lineEndContext="#stay" name="StringEsc">
+        <DetectChar attribute="String SingleQ" context="#pop" char="'" />
+        <RegExpr attribute="String Escape" context="#stay" String="\\[abefnrtv\\']" />
+        <RegExpr attribute="String Escape" context="#stay" String="\\([0-7]{1,3}|x[A-Fa-f0-9]{1,2}|c.)" />
+      </context>
+
+      <!-- VarBrace is called as soon as ${xxx is encoutered -->
+      <context attribute="Error" lineEndContext="#stay" name="VarBrace">
+        <DetectChar attribute="Variable" context="#pop" char="}" />
+        <DetectChar attribute="Variable" context="Subscript" char="[" />
+        <RegExpr attribute="Variable" context="VarAlt" String="(:?[-=?+]|##?|%%?)" />
+        <RegExpr attribute="Variable" context="VarSubst" String="//?" />
+        <DetectChar attribute="Variable" context="VarSub" char=":" />
+      </context>
+
+      <!-- VarAlt is to handle default/alternate/etc values of variables -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="VarAlt">
+        <DetectChar attribute="Variable" context="#pop#pop" char="}" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+      </context>
+
+      <!-- VarSubst is to handle substitutions on variables -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="VarSubst">
+        <DetectChar attribute="Variable" context="#pop#pop" char="}" />
+        <DetectChar attribute="Variable" context="VarSubst2" char="/" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+      </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="VarSubst2">
+        <DetectChar attribute="Variable" context="#pop#pop#pop" char="}" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+      </context>
+
+      <!-- VarSub is to substrings of variables -->
+      <context attribute="Error" lineEndContext="#stay" name="VarSub">
+        <DetectChar attribute="Variable" context="VarSub2" char=":" />
+        <DetectChar attribute="Variable" context="#pop#pop" char="}" />
+        <RegExpr attribute="Variable" context="#stay" String="&varname;" />
+        <RegExpr attribute="Variable" context="#stay" String="[0-9]+(?=[:}])" />
+        <IncludeRules context="FindSubstitutions" />
+      </context>
+      <context attribute="Error" lineEndContext="#stay" name="VarSub2">
+        <DetectChar attribute="Variable" context="#pop#pop#pop" char="}" />
+        <RegExpr attribute="Variable" context="#stay" String="&varname;" />
+        <RegExpr attribute="Variable" context="#stay" String="[0-9](?=[:}])" />
+        <IncludeRules context="FindSubstitutions" />
+      </context>
+
+
+      <!-- SubstFile is called after a <( or >( is encoutered -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="SubstFile">
+        <DetectChar attribute="Redirection" context="#pop" char=")" />
+        <IncludeRules context="FindCommentsParen" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+      </context>
+
+      <!-- SubstCommand is called after a $( is encountered -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="SubstCommand">
+        <DetectChar attribute="Variable" context="#pop" char=")" />
+        <IncludeRules context="FindCommentsParen" />
+        <IncludeRules context="FindCommands" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+      </context>
+
+      <!-- SubstBackq is called when a backquote is encountered -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="SubstBackq">
+        <DetectChar attribute="Backquote" context="#pop" char="`" />
+        <IncludeRules context="FindCommentsBackq" />
+        <IncludeRules context="FindCommands" />
+        <IncludeRules context="FindStrings" />
+        <IncludeRules context="FindSubstitutions" />
+        <IncludeRules context="FindOthers" />
+      </context>
+
+      <!-- Case is called after the case keyword is encoutered. We handle this because of
+           the lonely closing parentheses that would otherwise disturb the expr matching -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="Case">
+        <RegExpr attribute="Keyword" context="CaseIn" String="\sin\b" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- CaseIn is called when the construct 'case ... in' has been found. -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="CaseIn">
+        <RegExpr attribute="Keyword" context="#pop#pop" String="\besac(?=$|[\s;)])" endRegion="case" />
+        <DetectChar attribute="Keyword" context="CaseExpr" char=")" beginRegion="caseexpr" />
+        <AnyChar attribute="Keyword" context="#stay" String="(|" />
+        <IncludeRules context="FindMost" />
+      </context>
+
+      <!-- CaseExpr eats shell input till ;; -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="CaseExpr">
+        <Detect2Chars attribute="Keyword" context="#pop" char=";" char1=";" endRegion="caseexpr" />
+        <RegExpr attribute="Keyword" context="#pop" String="esac(?=$|[\s;)])" lookAhead="true" firstNonSpace="true" endRegion="caseexpr"/>
+        <IncludeRules context="FindAll" />
+      </context>
+
+      <!-- HereDoc consumes Here-documents. It is called at the beginning of the "<<" construct. -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="HereDoc">
+        <RegExpr attribute="Redirection" context="HereDocIQ"  String="(&lt;&lt;-\s*&quot;(&word;)&quot;)" lookAhead="true" />
+        <RegExpr attribute="Redirection" context="HereDocIQ"  String="(&lt;&lt;-\s*'(&word;)')" lookAhead="true" />
+        <RegExpr attribute="Redirection" context="HereDocIQ"  String="(&lt;&lt;-\s*\\(&word;))" lookAhead="true" />
+        <RegExpr attribute="Redirection" context="HereDocINQ" String="(&lt;&lt;-\s*(&word;))" lookAhead="true" />
+        <RegExpr attribute="Redirection" context="HereDocQ"   String="(&lt;&lt;\s*&quot;(&word;)&quot;)" lookAhead="true" />
+        <RegExpr attribute="Redirection" context="HereDocQ"   String="(&lt;&lt;\s*'(&word;)')" lookAhead="true" />
+        <RegExpr attribute="Redirection" context="HereDocQ"   String="(&lt;&lt;\s*\\(&word;))" lookAhead="true" />
+        <RegExpr attribute="Redirection" context="HereDocNQ"  String="(&lt;&lt;\s*(&word;))" lookAhead="true" />
+        <StringDetect attribute="Redirection" context="#pop"  String="&lt;&lt;" /><!-- always met -->
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#pop" name="HereDocRemainder">
+        <IncludeRules context="FindAll" />
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#stay" name="HereDocQ" dynamic="true">
+        <RegExpr attribute="Redirection" context="HereDocRemainder" String="%1" dynamic="true" />
+        <RegExpr attribute="Redirection" context="#pop#pop" String="^%2\b" dynamic="true" column="0"/>
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#stay" name="HereDocNQ" dynamic="true">
+        <RegExpr attribute="Redirection" context="HereDocRemainder" String="%1" dynamic="true" />
+        <RegExpr attribute="Redirection" context="#pop#pop" String="^%2\b" dynamic="true" column="0"/>
+        <IncludeRules context="FindSubstitutions" />
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#stay" name="HereDocIQ" dynamic="true">
+        <RegExpr attribute="Redirection" context="HereDocRemainder" String="%1" dynamic="true" />
+        <RegExpr attribute="Redirection" context="#pop#pop" String="^\t*%2\b" dynamic="true" column="0"/>
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#stay" name="HereDocINQ" dynamic="true">
+        <RegExpr attribute="Redirection" context="HereDocRemainder" String="%1" dynamic="true" />
+        <RegExpr attribute="Redirection" context="#pop#pop" String="^\t*%2\b" dynamic="true" column="0"/>
+        <IncludeRules context="FindSubstitutions" />
+      </context>
+
+    </contexts>
+
+    <itemDatas>
+      <itemData name="Normal Text"	defStyleNum="dsNormal" />
+      <itemData name="Comment"		defStyleNum="dsComment" />
+      <itemData name="Keyword" 		defStyleNum="dsKeyword" />
+      <itemData name="Control" 		defStyleNum="dsKeyword" />
+      <itemData name="Builtin" 		defStyleNum="dsKeyword" color="#808" />
+      <itemData name="Command" 		defStyleNum="dsKeyword" color="#c0c" />
+      <itemData name="Redirection" 	defStyleNum="dsKeyword" color="#238" />
+      <itemData name="Escape" 		defStyleNum="dsDataType" />
+      <itemData name="String SingleQ" 	defStyleNum="dsString" />
+      <itemData name="String DoubleQ" 	defStyleNum="dsString" />
+      <itemData name="Backquote" 	defStyleNum="dsKeyword" />
+      <itemData name="String Transl." 	defStyleNum="dsString" />
+      <itemData name="String Escape" 	defStyleNum="dsDataType" />
+      <itemData name="Variable" 	defStyleNum="dsOthers" />
+      <itemData name="Expression" 	defStyleNum="dsOthers" />
+      <itemData name="Function" 	defStyleNum="dsFunction" />
+      <itemData name="Path" 		defStyleNum="dsNormal" />
+      <itemData name="Option" 		defStyleNum="dsNormal" />
+      <itemData name="Error"            defStyleNum="dsError" />
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name="singleLine" start="#"/>
+    </comments>
+    <keywords casesensitive="1" weakDeliminator="^%#[]$._{}:-/" additionalDeliminator="`"/>
+  </general>
+</language>