Rename Note to Annotation and move Edit>Show/Hide note to View>Toggle Annotation.

Author: gnachman

English.lproj/MainMenu.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A2093" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment defaultVersion="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -501,35 +501,30 @@ DQ
                                     <action selector="jumpToSavedScrollPosition:" target="-1" id="1248"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Previous mark/note" keyEquivalent="" id="sZa-7I-YDa">
+                            <menuItem title="Previous Mark/Annotation" keyEquivalent="" id="sZa-7I-YDa">
                                 <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
                                 <connections>
                                     <action selector="previousMarkOrNote:" target="-1" id="Qrg-Y8-KM2"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Next mark/note" keyEquivalent="" id="mcu-LX-9Aj">
+                            <menuItem title="Next Mark/Annotation" keyEquivalent="" id="mcu-LX-9Aj">
                                 <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
                                 <connections>
                                     <action selector="nextMarkOrNote:" target="-1" id="HSR-a4-u0F"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Alert on next mark" keyEquivalent="a" id="Qj6-xH-l9X">
+                            <menuItem title="Alert on Next Mark" keyEquivalent="a" id="Qj6-xH-l9X">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                 <connections>
                                     <action selector="toggleAlertOnNextMark:" target="-1" id="hTO-Iy-yuC"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Add note at cursor" keyEquivalent="m" id="Fna-Ng-9y6">
+                            <menuItem title="Add Annotation at Cursor" keyEquivalent="m" id="Fna-Ng-9y6">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                 <connections>
                                     <action selector="addNoteAtCursor:" target="-1" id="B5P-c8-bDe"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Show/Hide notes" keyEquivalent="\" id="pAu-j3-wEC">
-                                <connections>
-                                    <action selector="showHideNotes:" target="-1" id="bWx-ZS-6aE"/>
-                                </connections>
-                            </menuItem>
                             <menuItem isSeparatorItem="YES" id="1238">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                                 <menu key="submenu" id="1239">
@@ -613,6 +608,11 @@ DQ
                                     <action selector="toggleShowTimestamps:" target="-1" id="oGg-h2-Ex7"/>
                                 </connections>
                             </menuItem>
+                            <menuItem title="Toggle Annotations" keyEquivalent="\" id="pAu-j3-wEC">
+                                <connections>
+                                    <action selector="showHideNotes:" target="-1" id="bWx-ZS-6aE"/>
+                                </connections>
+                            </menuItem>
                             <menuItem title="Automatic Command History" keyEquivalent="Y" id="9DF-nf-qif">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                 <connections>
@@ -928,7 +928,7 @@ DQ
             </connections>
         </customObject>
         <customObject id="266" userLabel="Font Manager" customClass="NSFontManager"/>
-        <window title="About iTerm" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" wantsToBeColor="NO" visibleAtLaunch="NO" animationBehavior="default" id="498" userLabel="About" customClass="iTermAboutWindow">
+        <window title="About iTerm" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="498" userLabel="About" customClass="iTermAboutWindow">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="386" y="524" width="354" height="164"/>
@@ -1040,4 +1040,4 @@ DQ
     <resources>
         <image name="NSApplicationIcon" width="128" height="128"/>
     </resources>
-</document>
+</document>

VT100Terminal.m

@@ -1626,9 +1626,11 @@ - (void)executeXtermSetKvp:(VT100Token *)token {
         [delegate_ terminalCurrentDirectoryDidChangeTo:value];
     } else if ([key isEqualToString:@"SetProfile"]) {
         [delegate_ terminalProfileShouldChangeTo:(NSString *)value];
-    } else if ([key isEqualToString:@"AddNote"]) {
+    } else if ([key isEqualToString:@"AddNote"] ||  // Deprecated
+               [key isEqualToString:@"AddAnnotation"]) {
         [delegate_ terminalAddNote:(NSString *)value show:YES];
-    } else if ([key isEqualToString:@"AddHiddenNote"]) {
+    } else if ([key isEqualToString:@"AddHiddenNote"] ||  // Deprecated
+               [key isEqualToString:@"AddHiddenAnnotation"]) {
         [delegate_ terminalAddNote:(NSString *)value show:NO];
     } else if ([key isEqualToString:@"HighlightCursorLine"]) {
         [delegate_ terminalSetHighlightCursorLine:value.length ? [value boolValue] : YES];

tests/annotation

@@ -0,0 +1,5 @@
+The word NOTE should have an annotation
+The word ]1337;AddAnnotation=4|This is the word notenote should have an annotation.
+There should be an annotation from here ->]1337;AddAnnotation=A note til EOLtil the end of the line
+The word ]1337;AddHiddenAnnotation=4|Hidden annotationnote should have a hidden annotation
+]1337;AddAnnotation=9|0|4|Absolute position