resolve merge

[lilypond.git] / scm / document-identifiers.scm

diff --git a/scm/document-identifiers.scm b/scm/document-identifiers.scm
index 67e282bd862cd594beb8c26680ac25d0697021a2..ffccf72c30e06294902362e10ba4fc4703ac7fc5 100644 (file)
--- a/scm/document-identifiers.scm
+++ b/scm/document-identifiers.scm
@@ -1,11 +1,19 @@
-;;
-;; document-identifiers.scm -- implement documentation
-;; of identifiers from .ly file.
-;;
-;; source file of the GNU LilyPond music typesetter
-;;
-;; (c) 2006 Han-Wen Nienhuys <hanwen@lilypond.org>
-;;
+;;;; This file is part of LilyPond, the GNU music typesetter.
+;;;;
+;;;; Copyright (C) 2006--2011 Han-Wen Nienhuys <hanwen@lilypond.org>
+;;;;
+;;;; LilyPond 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.
+;;;;
+;;;; LilyPond 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 LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 (use-modules (ice-9 format))
 
@@ -46,7 +54,7 @@
 
 
 (define (identifier<? a b)
-  (string<?
+  (ly:string-ci<?
    (symbol->string (car a))
    (symbol->string (car b))))