Mercurial > emacs
view etc/nxml/1D100-1D1FF.el @ 112231:f4a73cf7587b
* lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively.
(smerge-resolve--normalize-re): New var.
(smerge-resolve--extract-comment, smerge-resolve--normalize): New funs.
(smerge-resolve): Use them.
* lisp/newcomment.el (comment-only-p): New function.
(comment-or-uncomment-region): Use it.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 14 Jan 2011 13:10:15 -0500 |
parents | 934645da1dbd |
children | ef719132ddfa |
line wrap: on
line source
(nxml-define-char-name-set 'musical-symbols '(("MUSICAL SYMBOL SINGLE BARLINE" #x1D100) ("MUSICAL SYMBOL DOUBLE BARLINE" #x1D101) ("MUSICAL SYMBOL FINAL BARLINE" #x1D102) ("MUSICAL SYMBOL REVERSE FINAL BARLINE" #x1D103) ("MUSICAL SYMBOL DASHED BARLINE" #x1D104) ("MUSICAL SYMBOL SHORT BARLINE" #x1D105) ("MUSICAL SYMBOL LEFT REPEAT SIGN" #x1D106) ("MUSICAL SYMBOL RIGHT REPEAT SIGN" #x1D107) ("MUSICAL SYMBOL REPEAT DOTS" #x1D108) ("MUSICAL SYMBOL DAL SEGNO" #x1D109) ("MUSICAL SYMBOL DA CAPO" #x1D10A) ("MUSICAL SYMBOL SEGNO" #x1D10B) ("MUSICAL SYMBOL CODA" #x1D10C) ("MUSICAL SYMBOL REPEATED FIGURE-1" #x1D10D) ("MUSICAL SYMBOL REPEATED FIGURE-2" #x1D10E) ("MUSICAL SYMBOL REPEATED FIGURE-3" #x1D10F) ("MUSICAL SYMBOL FERMATA" #x1D110) ("MUSICAL SYMBOL FERMATA BELOW" #x1D111) ("MUSICAL SYMBOL BREATH MARK" #x1D112) ("MUSICAL SYMBOL CAESURA" #x1D113) ("MUSICAL SYMBOL BRACE" #x1D114) ("MUSICAL SYMBOL BRACKET" #x1D115) ("MUSICAL SYMBOL ONE-LINE STAFF" #x1D116) ("MUSICAL SYMBOL TWO-LINE STAFF" #x1D117) ("MUSICAL SYMBOL THREE-LINE STAFF" #x1D118) ("MUSICAL SYMBOL FOUR-LINE STAFF" #x1D119) ("MUSICAL SYMBOL FIVE-LINE STAFF" #x1D11A) ("MUSICAL SYMBOL SIX-LINE STAFF" #x1D11B) ("MUSICAL SYMBOL SIX-STRING FRETBOARD" #x1D11C) ("MUSICAL SYMBOL FOUR-STRING FRETBOARD" #x1D11D) ("MUSICAL SYMBOL G CLEF" #x1D11E) ("MUSICAL SYMBOL G CLEF OTTAVA ALTA" #x1D11F) ("MUSICAL SYMBOL G CLEF OTTAVA BASSA" #x1D120) ("MUSICAL SYMBOL C CLEF" #x1D121) ("MUSICAL SYMBOL F CLEF" #x1D122) ("MUSICAL SYMBOL F CLEF OTTAVA ALTA" #x1D123) ("MUSICAL SYMBOL F CLEF OTTAVA BASSA" #x1D124) ("MUSICAL SYMBOL DRUM CLEF-1" #x1D125) ("MUSICAL SYMBOL DRUM CLEF-2" #x1D126) ("MUSICAL SYMBOL DOUBLE SHARP" #x1D12A) ("MUSICAL SYMBOL DOUBLE FLAT" #x1D12B) ("MUSICAL SYMBOL FLAT UP" #x1D12C) ("MUSICAL SYMBOL FLAT DOWN" #x1D12D) ("MUSICAL SYMBOL NATURAL UP" #x1D12E) ("MUSICAL SYMBOL NATURAL DOWN" #x1D12F) ("MUSICAL SYMBOL SHARP UP" #x1D130) ("MUSICAL SYMBOL SHARP DOWN" #x1D131) ("MUSICAL SYMBOL QUARTER TONE SHARP" #x1D132) ("MUSICAL SYMBOL QUARTER TONE FLAT" #x1D133) ("MUSICAL SYMBOL COMMON TIME" #x1D134) ("MUSICAL SYMBOL CUT TIME" #x1D135) ("MUSICAL SYMBOL OTTAVA ALTA" #x1D136) ("MUSICAL SYMBOL OTTAVA BASSA" #x1D137) ("MUSICAL SYMBOL QUINDICESIMA ALTA" #x1D138) ("MUSICAL SYMBOL QUINDICESIMA BASSA" #x1D139) ("MUSICAL SYMBOL MULTI REST" #x1D13A) ("MUSICAL SYMBOL WHOLE REST" #x1D13B) ("MUSICAL SYMBOL HALF REST" #x1D13C) ("MUSICAL SYMBOL QUARTER REST" #x1D13D) ("MUSICAL SYMBOL EIGHTH REST" #x1D13E) ("MUSICAL SYMBOL SIXTEENTH REST" #x1D13F) ("MUSICAL SYMBOL THIRTY-SECOND REST" #x1D140) ("MUSICAL SYMBOL SIXTY-FOURTH REST" #x1D141) ("MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH REST" #x1D142) ("MUSICAL SYMBOL X NOTEHEAD" #x1D143) ("MUSICAL SYMBOL PLUS NOTEHEAD" #x1D144) ("MUSICAL SYMBOL CIRCLE X NOTEHEAD" #x1D145) ("MUSICAL SYMBOL SQUARE NOTEHEAD WHITE" #x1D146) ("MUSICAL SYMBOL SQUARE NOTEHEAD BLACK" #x1D147) ("MUSICAL SYMBOL TRIANGLE NOTEHEAD UP WHITE" #x1D148) ("MUSICAL SYMBOL TRIANGLE NOTEHEAD UP BLACK" #x1D149) ("MUSICAL SYMBOL TRIANGLE NOTEHEAD LEFT WHITE" #x1D14A) ("MUSICAL SYMBOL TRIANGLE NOTEHEAD LEFT BLACK" #x1D14B) ("MUSICAL SYMBOL TRIANGLE NOTEHEAD RIGHT WHITE" #x1D14C) ("MUSICAL SYMBOL TRIANGLE NOTEHEAD RIGHT BLACK" #x1D14D) ("MUSICAL SYMBOL TRIANGLE NOTEHEAD DOWN WHITE" #x1D14E) ("MUSICAL SYMBOL TRIANGLE NOTEHEAD DOWN BLACK" #x1D14F) ("MUSICAL SYMBOL TRIANGLE NOTEHEAD UP RIGHT WHITE" #x1D150) ("MUSICAL SYMBOL TRIANGLE NOTEHEAD UP RIGHT BLACK" #x1D151) ("MUSICAL SYMBOL MOON NOTEHEAD WHITE" #x1D152) ("MUSICAL SYMBOL MOON NOTEHEAD BLACK" #x1D153) ("MUSICAL SYMBOL TRIANGLE-ROUND NOTEHEAD DOWN WHITE" #x1D154) ("MUSICAL SYMBOL TRIANGLE-ROUND NOTEHEAD DOWN BLACK" #x1D155) ("MUSICAL SYMBOL PARENTHESIS NOTEHEAD" #x1D156) ("MUSICAL SYMBOL VOID NOTEHEAD" #x1D157) ("MUSICAL SYMBOL NOTEHEAD BLACK" #x1D158) ("MUSICAL SYMBOL NULL NOTEHEAD" #x1D159) ("MUSICAL SYMBOL CLUSTER NOTEHEAD WHITE" #x1D15A) ("MUSICAL SYMBOL CLUSTER NOTEHEAD BLACK" #x1D15B) ("MUSICAL SYMBOL BREVE" #x1D15C) ("MUSICAL SYMBOL WHOLE NOTE" #x1D15D) ("MUSICAL SYMBOL HALF NOTE" #x1D15E) ("MUSICAL SYMBOL QUARTER NOTE" #x1D15F) ("MUSICAL SYMBOL EIGHTH NOTE" #x1D160) ("MUSICAL SYMBOL SIXTEENTH NOTE" #x1D161) ("MUSICAL SYMBOL THIRTY-SECOND NOTE" #x1D162) ("MUSICAL SYMBOL SIXTY-FOURTH NOTE" #x1D163) ("MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE" #x1D164) ("MUSICAL SYMBOL COMBINING STEM" #x1D165) ("MUSICAL SYMBOL COMBINING SPRECHGESANG STEM" #x1D166) ("MUSICAL SYMBOL COMBINING TREMOLO-1" #x1D167) ("MUSICAL SYMBOL COMBINING TREMOLO-2" #x1D168) ("MUSICAL SYMBOL COMBINING TREMOLO-3" #x1D169) ("MUSICAL SYMBOL FINGERED TREMOLO-1" #x1D16A) ("MUSICAL SYMBOL FINGERED TREMOLO-2" #x1D16B) ("MUSICAL SYMBOL FINGERED TREMOLO-3" #x1D16C) ("MUSICAL SYMBOL COMBINING AUGMENTATION DOT" #x1D16D) ("MUSICAL SYMBOL COMBINING FLAG-1" #x1D16E) ("MUSICAL SYMBOL COMBINING FLAG-2" #x1D16F) ("MUSICAL SYMBOL COMBINING FLAG-3" #x1D170) ("MUSICAL SYMBOL COMBINING FLAG-4" #x1D171) ("MUSICAL SYMBOL COMBINING FLAG-5" #x1D172) ("MUSICAL SYMBOL BEGIN BEAM" #x1D173) ("MUSICAL SYMBOL END BEAM" #x1D174) ("MUSICAL SYMBOL BEGIN TIE" #x1D175) ("MUSICAL SYMBOL END TIE" #x1D176) ("MUSICAL SYMBOL BEGIN SLUR" #x1D177) ("MUSICAL SYMBOL END SLUR" #x1D178) ("MUSICAL SYMBOL BEGIN PHRASE" #x1D179) ("MUSICAL SYMBOL END PHRASE" #x1D17A) ("MUSICAL SYMBOL COMBINING ACCENT" #x1D17B) ("MUSICAL SYMBOL COMBINING STACCATO" #x1D17C) ("MUSICAL SYMBOL COMBINING TENUTO" #x1D17D) ("MUSICAL SYMBOL COMBINING STACCATISSIMO" #x1D17E) ("MUSICAL SYMBOL COMBINING MARCATO" #x1D17F) ("MUSICAL SYMBOL COMBINING MARCATO-STACCATO" #x1D180) ("MUSICAL SYMBOL COMBINING ACCENT-STACCATO" #x1D181) ("MUSICAL SYMBOL COMBINING LOURE" #x1D182) ("MUSICAL SYMBOL ARPEGGIATO UP" #x1D183) ("MUSICAL SYMBOL ARPEGGIATO DOWN" #x1D184) ("MUSICAL SYMBOL COMBINING DOIT" #x1D185) ("MUSICAL SYMBOL COMBINING RIP" #x1D186) ("MUSICAL SYMBOL COMBINING FLIP" #x1D187) ("MUSICAL SYMBOL COMBINING SMEAR" #x1D188) ("MUSICAL SYMBOL COMBINING BEND" #x1D189) ("MUSICAL SYMBOL COMBINING DOUBLE TONGUE" #x1D18A) ("MUSICAL SYMBOL COMBINING TRIPLE TONGUE" #x1D18B) ("MUSICAL SYMBOL RINFORZANDO" #x1D18C) ("MUSICAL SYMBOL SUBITO" #x1D18D) ("MUSICAL SYMBOL Z" #x1D18E) ("MUSICAL SYMBOL PIANO" #x1D18F) ("MUSICAL SYMBOL MEZZO" #x1D190) ("MUSICAL SYMBOL FORTE" #x1D191) ("MUSICAL SYMBOL CRESCENDO" #x1D192) ("MUSICAL SYMBOL DECRESCENDO" #x1D193) ("MUSICAL SYMBOL GRACE NOTE SLASH" #x1D194) ("MUSICAL SYMBOL GRACE NOTE NO SLASH" #x1D195) ("MUSICAL SYMBOL TR" #x1D196) ("MUSICAL SYMBOL TURN" #x1D197) ("MUSICAL SYMBOL INVERTED TURN" #x1D198) ("MUSICAL SYMBOL TURN SLASH" #x1D199) ("MUSICAL SYMBOL TURN UP" #x1D19A) ("MUSICAL SYMBOL ORNAMENT STROKE-1" #x1D19B) ("MUSICAL SYMBOL ORNAMENT STROKE-2" #x1D19C) ("MUSICAL SYMBOL ORNAMENT STROKE-3" #x1D19D) ("MUSICAL SYMBOL ORNAMENT STROKE-4" #x1D19E) ("MUSICAL SYMBOL ORNAMENT STROKE-5" #x1D19F) ("MUSICAL SYMBOL ORNAMENT STROKE-6" #x1D1A0) ("MUSICAL SYMBOL ORNAMENT STROKE-7" #x1D1A1) ("MUSICAL SYMBOL ORNAMENT STROKE-8" #x1D1A2) ("MUSICAL SYMBOL ORNAMENT STROKE-9" #x1D1A3) ("MUSICAL SYMBOL ORNAMENT STROKE-10" #x1D1A4) ("MUSICAL SYMBOL ORNAMENT STROKE-11" #x1D1A5) ("MUSICAL SYMBOL HAUPTSTIMME" #x1D1A6) ("MUSICAL SYMBOL NEBENSTIMME" #x1D1A7) ("MUSICAL SYMBOL END OF STIMME" #x1D1A8) ("MUSICAL SYMBOL DEGREE SLASH" #x1D1A9) ("MUSICAL SYMBOL COMBINING DOWN BOW" #x1D1AA) ("MUSICAL SYMBOL COMBINING UP BOW" #x1D1AB) ("MUSICAL SYMBOL COMBINING HARMONIC" #x1D1AC) ("MUSICAL SYMBOL COMBINING SNAP PIZZICATO" #x1D1AD) ("MUSICAL SYMBOL PEDAL MARK" #x1D1AE) ("MUSICAL SYMBOL PEDAL UP MARK" #x1D1AF) ("MUSICAL SYMBOL HALF PEDAL MARK" #x1D1B0) ("MUSICAL SYMBOL GLISSANDO UP" #x1D1B1) ("MUSICAL SYMBOL GLISSANDO DOWN" #x1D1B2) ("MUSICAL SYMBOL WITH FINGERNAILS" #x1D1B3) ("MUSICAL SYMBOL DAMP" #x1D1B4) ("MUSICAL SYMBOL DAMP ALL" #x1D1B5) ("MUSICAL SYMBOL MAXIMA" #x1D1B6) ("MUSICAL SYMBOL LONGA" #x1D1B7) ("MUSICAL SYMBOL BREVIS" #x1D1B8) ("MUSICAL SYMBOL SEMIBREVIS WHITE" #x1D1B9) ("MUSICAL SYMBOL SEMIBREVIS BLACK" #x1D1BA) ("MUSICAL SYMBOL MINIMA" #x1D1BB) ("MUSICAL SYMBOL MINIMA BLACK" #x1D1BC) ("MUSICAL SYMBOL SEMIMINIMA WHITE" #x1D1BD) ("MUSICAL SYMBOL SEMIMINIMA BLACK" #x1D1BE) ("MUSICAL SYMBOL FUSA WHITE" #x1D1BF) ("MUSICAL SYMBOL FUSA BLACK" #x1D1C0) ("MUSICAL SYMBOL LONGA PERFECTA REST" #x1D1C1) ("MUSICAL SYMBOL LONGA IMPERFECTA REST" #x1D1C2) ("MUSICAL SYMBOL BREVIS REST" #x1D1C3) ("MUSICAL SYMBOL SEMIBREVIS REST" #x1D1C4) ("MUSICAL SYMBOL MINIMA REST" #x1D1C5) ("MUSICAL SYMBOL SEMIMINIMA REST" #x1D1C6) ("MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE PERFECTA" #x1D1C7) ("MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE IMPERFECTA" #x1D1C8) ("MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE PERFECTA DIMINUTION-1" #x1D1C9) ("MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE PERFECTA" #x1D1CA) ("MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA" #x1D1CB) ("MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-1" #x1D1CC) ("MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-2" #x1D1CD) ("MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-3" #x1D1CE) ("MUSICAL SYMBOL CROIX" #x1D1CF) ("MUSICAL SYMBOL GREGORIAN C CLEF" #x1D1D0) ("MUSICAL SYMBOL GREGORIAN F CLEF" #x1D1D1) ("MUSICAL SYMBOL SQUARE B" #x1D1D2) ("MUSICAL SYMBOL VIRGA" #x1D1D3) ("MUSICAL SYMBOL PODATUS" #x1D1D4) ("MUSICAL SYMBOL CLIVIS" #x1D1D5) ("MUSICAL SYMBOL SCANDICUS" #x1D1D6) ("MUSICAL SYMBOL CLIMACUS" #x1D1D7) ("MUSICAL SYMBOL TORCULUS" #x1D1D8) ("MUSICAL SYMBOL PORRECTUS" #x1D1D9) ("MUSICAL SYMBOL PORRECTUS FLEXUS" #x1D1DA) ("MUSICAL SYMBOL SCANDICUS FLEXUS" #x1D1DB) ("MUSICAL SYMBOL TORCULUS RESUPINUS" #x1D1DC) ("MUSICAL SYMBOL PES SUBPUNCTIS" #x1D1DD) )) ;; arch-tag: 4e6bd082-bedb-46a2-81be-06f86fbb74f4