lp:~masmullin/scintilla-cocoa/updates
Created by
masmullin
and last modified
- Get this branch:
- bzr branch lp:~masmullin/scintilla-cocoa/updates
Branch merges
Propose for merging
No branches
dependent on this one.
- Mike Lischke: Needs Resubmitting
-
Diff: 64766 lines (+43006/-6001) (has conflicts)242 files modified.bzrignore (+0/-10)
.hgeol (+42/-0)
.hgignore (+59/-0)
.hgtags (+95/-0)
README (+3/-6)
bin/.cvsignore (+2/-0)
bin/__init__.py (+1/-0)
bin/empty.txt (+1/-0)
cocoa/Framework.mk (+5/-8)
cocoa/InfoBar.h (+3/-3)
cocoa/InfoBar.mm (+42/-36)
cocoa/PlatCocoa.h (+19/-2)
cocoa/PlatCocoa.mm (+287/-159)
cocoa/QuartzTextLayout.h (+14/-14)
cocoa/ScintillaCocoa.h (+55/-37)
cocoa/ScintillaCocoa.mm (+799/-276)
cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj (+172/-25)
cocoa/ScintillaTest/AppController.mm (+14/-0)
cocoa/ScintillaTest/English.lproj/MainMenu.xib (+124/-0)
cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj (+16/-0)
cocoa/ScintillaView.h (+102/-17)
cocoa/ScintillaView.mm (+634/-245)
cocoa/checkbuildosx.sh (+66/-0)
cocoa/common.mk (+28/-5)
cppcheck.suppress (+45/-0)
delbin.bat (+4/-0)
doc/Lexer.txt (+228/-0)
doc/ScintillaDoc.html (+803/-148)
doc/ScintillaDownload.html (+17/-0)
doc/ScintillaHistory.html (+1989/-43)
doc/ScintillaRelated.html (+59/-26)
doc/ScintillaToDo.html (+2/-2)
doc/index.html (+23/-4)
gtk/Converter.h (+15/-2)
gtk/PlatGTK.cxx (+184/-60)
gtk/ScintillaGTK.cxx (+241/-240)
gtk/deps.mak (+420/-19)
gtk/makefile (+35/-4)
include/.cvsignore (+2/-0)
include/ILexer.h (+62/-26)
include/Platform.h (+41/-23)
include/SciLexer.h (+220/-8)
include/Scintilla.h (+117/-35)
include/Scintilla.iface (+491/-60)
lexers/LexA68k.cxx (+111/-82)
lexers/LexAU3.cxx (+2/-2)
lexers/LexAVE.cxx (+2/-2)
lexers/LexAVS.cxx (+293/-0)
lexers/LexAbaqus.cxx (+0/-15)
lexers/LexAda.cxx (+1/-16)
lexers/LexAsm.cxx (+1/-1)
lexers/LexAsn1.cxx (+1/-1)
lexers/LexBash.cxx (+24/-2)
lexers/LexBasic.cxx (+74/-18)
lexers/LexBullant.cxx (+1/-1)
lexers/LexCOBOL.cxx (+5/-3)
lexers/LexCPP.cxx (+175/-27)
lexers/LexCmake.cxx (+5/-9)
lexers/LexCoffeeScript.cxx (+563/-0)
lexers/LexConf.cxx (+7/-7)
lexers/LexCrontab.cxx (+5/-5)
lexers/LexCsound.cxx (+1/-1)
lexers/LexD.cxx (+4/-4)
lexers/LexDMAP.cxx (+228/-0)
lexers/LexECL.cxx (+521/-0)
lexers/LexForth.cxx (+8/-17)
lexers/LexFortran.cxx (+153/-41)
lexers/LexGAP.cxx (+1/-1)
lexers/LexGui4Cli.cxx (+2/-6)
lexers/LexHTML.cxx (+33/-33)
lexers/LexHaskell.cxx (+1009/-266)
lexers/LexInno.cxx (+5/-5)
lexers/LexKVIrc.cxx (+473/-0)
lexers/LexLaTeX.cxx (+539/-0)
lexers/LexLisp.cxx (+3/-3)
lexers/LexLout.cxx (+1/-1)
lexers/LexLua.cxx (+10/-27)
lexers/LexMMIXAL.cxx (+1/-1)
lexers/LexMPT.cxx (+1/-1)
lexers/LexMSSQL.cxx (+2/-15)
lexers/LexMatlab.cxx (+87/-15)
lexers/LexModula.cxx (+7/-7)
lexers/LexMySQL.cxx (+0/-7)
lexers/LexNsis.cxx (+2/-0)
lexers/LexOScript.cxx (+548/-0)
lexers/LexOpal.cxx (+4/-4)
lexers/LexOthers.cxx (+22/-9)
lexers/LexPO.cxx (+213/-0)
lexers/LexPascal.cxx (+11/-10)
lexers/LexPerl.cxx (+284/-31)
lexers/LexPowerShell.cxx (+49/-2)
lexers/LexPython.cxx (+1/-1)
lexers/LexR.cxx (+1/-1)
lexers/LexRuby.cxx (+2/-2)
lexers/LexRust.cxx (+781/-0)
lexers/LexSQL.cxx (+229/-31)
lexers/LexSTTXT.cxx (+406/-0)
lexers/LexScriptol.cxx (+1/-1)
lexers/LexSpice.cxx (+0/-25)
lexers/LexTCMD.cxx (+506/-0)
lexers/LexVHDL.cxx (+1/-1)
lexers/LexVisualProlog.cxx (+504/-0)
lexers/LexYAML.cxx (+1/-1)
lexlib/Accessor.cxx (+2/-2)
lexlib/Accessor.h (+38/-0)
lexlib/CharacterCategory.cxx (+3304/-0)
lexlib/CharacterCategory.h (+31/-0)
lexlib/CharacterSet.cxx (+1/-1)
lexlib/LexAccessor.h (+51/-7)
lexlib/LexerBase.cxx (+1/-1)
lexlib/LexerModule.cxx (+4/-6)
lexlib/LexerNoExceptions.cxx (+1/-1)
lexlib/LexerNoExceptions.h (+2/-2)
lexlib/LexerSimple.cxx (+1/-1)
lexlib/LexerSimple.h (+1/-1)
lexlib/OptionSet.h (+3/-3)
lexlib/PropSetSimple.cxx (+9/-18)
lexlib/PropSetSimple.h (+0/-1)
lexlib/SparseState.h (+1/-1)
lexlib/StringCopy.h (+36/-0)
lexlib/StyleContext.cxx (+1/-1)
lexlib/StyleContext.h (+110/-11)
lexlib/SubStyles.h (+177/-0)
lexlib/WordList.cxx (+41/-20)
lexlib/WordList.h (+6/-6)
qt/README (+36/-0)
qt/ScintillaEdit/ScintillaDocument.cpp (+295/-0)
qt/ScintillaEdit/ScintillaDocument.h (+99/-0)
qt/ScintillaEdit/ScintillaEdit.cpp.template (+84/-0)
qt/ScintillaEdit/ScintillaEdit.h.template (+74/-0)
qt/ScintillaEdit/ScintillaEdit.pro (+76/-0)
qt/ScintillaEdit/WidgetGen.py (+259/-0)
qt/ScintillaEditBase/Notes.txt (+18/-0)
qt/ScintillaEditBase/PlatQt.cpp (+1283/-0)
qt/ScintillaEditBase/PlatQt.h (+127/-0)
qt/ScintillaEditBase/ScintillaEditBase.cpp (+659/-0)
qt/ScintillaEditBase/ScintillaEditBase.h (+152/-0)
qt/ScintillaEditBase/ScintillaEditBase.pro (+118/-0)
qt/ScintillaEditBase/ScintillaQt.cpp (+750/-0)
qt/ScintillaEditBase/ScintillaQt.h (+160/-0)
qt/ScintillaEditPy/README (+86/-0)
qt/ScintillaEditPy/ScintillaConstants.py.template (+6/-0)
qt/ScintillaEditPy/ScintillaEditPy.pro (+118/-0)
qt/ScintillaEditPy/global.h (+4/-0)
qt/ScintillaEditPy/sepbuild.py (+340/-0)
qt/ScintillaEditPy/testsepq.py (+157/-0)
qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template (+65/-0)
scripts/Face.py (+117/-0)
scripts/FileGenerator.py (+158/-0)
scripts/GenerateCaseConvert.py (+126/-0)
scripts/GenerateCharacterCategory.py (+36/-0)
scripts/HFacer.py (+58/-0)
scripts/LexGen.py (+54/-0)
scripts/ScintillaData.py (+193/-0)
src/AutoComplete.cxx (+138/-18)
src/AutoComplete.h (+28/-6)
src/CallTip.cxx (+25/-12)
src/CallTip.h (+2/-2)
src/CaseConvert.cxx (+634/-0)
src/CaseConvert.h (+47/-0)
src/CaseFolder.cxx (+68/-0)
src/CaseFolder.h (+45/-0)
src/Catalogue.cxx (+14/-10)
src/CellBuffer.cxx (+75/-20)
src/CellBuffer.h (+7/-7)
src/ContractionState.cxx (+3/-1)
src/Decoration.cxx (+10/-3)
src/Decoration.h (+3/-3)
src/Document.cxx (+224/-139)
src/Document.h (+62/-70)
src/Editor.cxx (+1700/-554)
src/Editor.h (+197/-44)
src/ExternalLexer.cxx (+4/-6)
src/ExternalLexer.h (+2/-5)
src/FontQuality.h (+25/-3)
src/Indicator.cxx (+3/-0)
src/KeyMap.cxx (+11/-32)
src/KeyMap.h (+20/-6)
src/LineMarker.cxx (+61/-8)
src/LineMarker.h (+0/-1)
src/Partitioning.h (+11/-2)
src/PerLine.cxx (+14/-21)
src/PerLine.h (+3/-5)
src/PositionCache.cxx (+148/-136)
src/PositionCache.h (+44/-14)
src/RESearch.cxx (+31/-80)
src/RESearch.h (+77/-0)
src/RunStyles.cxx (+42/-5)
src/RunStyles.h (+5/-3)
src/ScintillaBase.cxx (+281/-114)
src/ScintillaBase.h (+9/-2)
src/Selection.cxx (+25/-5)
src/Selection.h (+3/-2)
src/SplitVector.h (+30/-2)
src/Style.cxx (+26/-2)
src/Style.h (+3/-2)
src/UniConversion.cxx (+137/-0)
src/UniConversion.h (+79/-28)
src/UnicodeFromUTF8.h (+32/-0)
src/ViewStyle.cxx (+306/-77)
src/ViewStyle.h (+91/-14)
src/XPM.cxx (+59/-29)
src/XPM.h (+24/-38)
test/README (+10/-4)
test/ScintillaCallable.py (+159/-0)
test/XiteQt.py (+65/-0)
test/XiteWin.py (+38/-161)
test/examples/x.lua (+7/-0)
test/examples/x.lua.styled (+7/-0)
test/examples/x.pl (+5/-0)
test/examples/x.pl.styled (+5/-0)
test/examples/x.rb (+6/-0)
test/examples/x.rb.styled (+6/-0)
test/lexTests.py (+25/-12)
test/performanceTests.py (+45/-4)
test/simpleTests.py (+998/-296)
test/unit/LICENSE_1_0.txt (+23/-0)
test/unit/README (+13/-12)
test/unit/SciTE.properties (+2/-1)
test/unit/catch.hpp (+7832/-0)
test/unit/makefile (+44/-44)
test/unit/test.mak (+32/-0)
test/unit/testCellBuffer.cxx (+140/-0)
test/unit/testCharClassify.cxx (+122/-0)
test/unit/testContractionState.cxx (+125/-131)
test/unit/testDecoration.cxx (+89/-0)
test/unit/testPartitioning.cxx (+161/-187)
test/unit/testRunStyles.cxx (+311/-1)
test/unit/testSparseState.cxx (+214/-230)
test/unit/testSplitVector.cxx (+199/-205)
test/unit/unitTest.cxx (+15/-8)
version.txt (+4/-0)
win32/.cvsignore (+3/-0)
win32/CheckD2D.cxx (+3/-0)
win32/PlatWin.cxx (+1302/-124)
win32/PlatWin.h (+29/-0)
win32/SciLexer.vcxproj (+129/-0)
win32/ScintRes.rc (+6/-0)
win32/ScintillaWin.cxx (+437/-295)
win32/deps.mak (+299/-286)
win32/makefile (+24/-5)
win32/scintilla.mak (+149/-77)
Branch information
Recent revisions
- 71. By masmullin
-
Pull from hg clone http://
hg.code. sf.net/ p/scintilla/ code scintilla-code on Jan 23 9:43pm (parent: 4968:7cb4eedf5a84 tip) - 66. By Michael Mullin <email address hidden>
-
I needed this change to compile clang-2.9 on ubuntu 11.04
- 65. By masmullin
-
update to cs 3814 from http://
scintilla. hg.sourceforge. net:8000/ hgroot/ scintilla/ scintilla - 64. By masmullin
-
http://
scintilla. hg.sourceforge. net:8000/ hgroot/ scintilla/ scintilla @ 3810... forgot the main.xib
Branch metadata
- Branch format:
- Branch format 6
- Repository format:
- Bazaar pack repository format 1 (needs bzr 0.92)