diff options
| author |  mitchell <70453897+667e-11@users.noreply.github.com> | 2014-01-12 23:44:33 -0500 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2014-01-12 23:44:33 -0500 |
| commit | c297daed8a7b1a0df7c5c63ca7d8db5e2314bd8f (patch) | |
| tree | a2762e1601ca1a684257de8de296952d1249a30d | |
| parent | 61fa3e6da76fda9cb858eddf6d10b5127daec95d (diff) | |
New home page along with some documentation content and layout changes.
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | doc/.header.md | 3 | ||||
| -rw-r--r-- | doc/images/feed.png | bin | 0 -> 1737 bytes | |||
| -rw-r--r-- | doc/images/header.png | bin | 0 -> 104022 bytes | |||
| -rw-r--r-- | doc/images/logo_large.png | bin | 0 -> 30923 bytes | |||
| -rw-r--r-- | doc/index.html | 272 | ||||
| -rw-r--r-- | doc/markdowndoc.lua | 1 | ||||
| -rw-r--r-- | src/Makefile | 27 |
9 files changed, 298 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c8adbb7..85ce333b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,10 @@ [Atom Feed][] -**Please consider making a [donation][] or purchasing the [book][] to help fund -Textadept's continuous development. It really helps.** +**Please [donate][] or purchase the [book][] to fund continuous development.** [Atom Feed]: feed -[donation]: http://gum.co/textadept +[donate]: http://gum.co/textadept [book]: MEDIA.html#Book ## 7.2 alpha (01 Jan 2014) @@ -40,6 +39,7 @@ Changes: * Renamed "hypertext" lexer and its corresponding module to "html". * Added configurable tab context menus via [`textadept.menu.set_contextmenus()`][]. +* New GUI theme for Mac OSX. * [Experimental] Merged separate lexer states into Textadept's Lua state. * Updated to [Lua][] 5.2.3. * Updated to [Scintilla][] 3.3.7. @@ -36,8 +36,7 @@ The terminal version of Textadept requires only an implementation of curses like ## Download -**Please consider making a [donation][] or purchasing the [book][] to help fund -Textadept's continuous development. It really helps.** +**Please [donate][] or purchase the [book][] to fund continuous development.** Download Textadept from the project's [download page][] or from these quick links: diff --git a/doc/.header.md b/doc/.header.md index 42c1289c..4b5fd35e 100644 --- a/doc/.header.md +++ b/doc/.header.md @@ -3,7 +3,8 @@ * [Home](http://foicica.com/textadept) | * [Download](http://foicica.com/textadept/download) | * [Book](http://foicica.com/textadept/MEDIA.html#book) | -* [Lua API](http://foicica.com/textadept/api) | +* [Manual](http://foicica.com/textadept/01_Introduction.html) | +* [API](http://foicica.com/textadept/api) | * [Source](http://foicica.com/hg/textadept) | * [Language Modules](http://foicica.com/hg) | * [Stats](http://foicica.com/textadept/stats) | diff --git a/doc/images/feed.png b/doc/images/feed.png Binary files differnew file mode 100644 index 00000000..d64c669c --- /dev/null +++ b/doc/images/feed.png diff --git a/doc/images/header.png b/doc/images/header.png Binary files differnew file mode 100644 index 00000000..aaf5b55d --- /dev/null +++ b/doc/images/header.png diff --git a/doc/images/logo_large.png b/doc/images/logo_large.png Binary files differnew file mode 100644 index 00000000..899dc4d9 --- /dev/null +++ b/doc/images/logo_large.png diff --git a/doc/index.html b/doc/index.html new file mode 100644 index 00000000..18064afc --- /dev/null +++ b/doc/index.html @@ -0,0 +1,272 @@ +<!doctype html> +<html> + <head> + <title>Textadept</title> + <link rel="stylesheet" href="style.css" type="text/css" /> + <link rel="icon" href="icon.png" type="image/png" /> + <meta charset="utf-8" /> + </head> + <body> + <div id="content"> + <div id="header" style="text-align: center;"> + <h1 style="background-image:url('images/header.png'); + background-position: bottom; font-size: 2em;"> + Textadept + </h1> + <p> + A fast, minimalist, and remarkably extensible cross-platform text + editor + </p> + </div> + + <div id="nav"> + <a id="download"></a> + <h2>Download (v7.1)</h2> + <a href="feed"> + <img src="images/feed.png" style="float: right; margin: 0.25em;" + alt="Atom" /> + </a> + <ul> + <li><a href="download/textadept_LATEST.win32.zip">Win32</a></li> + <li><a href="download/textadept_LATEST.osx.zip">Mac OSX</a></li> + <li><a href="download/textadept_LATEST.i386.tgz">Linux</a></li> + <li> + <a href="download/textadept_LATEST.x86_64.tgz">Linux x86_64</a> + </li> + <li><a href="download/textadept_LATEST.modules.zip">Modules</a></li> + </ul> + <hr style="margin: 0.25em 0.5em 0.25em 0.5em;" /> + <ul> + <li><a href="http://foicica.com/hg/textadept">Source</a></li> + <li><a href="CHANGELOG.html">Older versions</a></li> + </ul> + + <h2>Nightly<a href="#nightly">*</a> Builds</h2> + <ul> + <li><a href="download/textadept_NIGHTLY.win32.zip">Win32</a></li> + <li><a href="download/textadept_NIGHTLY.osx.zip">Mac OSX</a></li> + <li><a href="download/textadept_NIGHTLY.i386.tgz">Linux</a></li> + <li> + <a href="download/textadept_NIGHTLY.x86_64.tgz">Linux x86_64</a> + </li> + <li><a href="download/textadept_NIGHTLY.modules.zip">Modules</a></li> + </ul> + </div> + + <div id="toc" style="width: 10em;"> + <h2>Support</h2> + <ul> + <li><a href="01_Introduction.html">Manual</a></li> + <li><a href="api">API</a></li> + <li><a href="http://foicica.com/lists">Mailing list</a></li> + <li><a href="http://foicica.com/wiki/textadept">Wiki</a></li> + </ul> + + <h2>Quick Reference</h2> + <p style="margin: 0.25em 0 0.25em 0; text-align: center;"> + <a href="MEDIA.html#Book"> + <img src="book/ta_quickref_small.png" alt="Cover" + style="border-width: 1px; margin-top: 0.25em;" /> + </a> + </p> + </div> + + <div id="main" style="margin-left: 0em;"> + <p style="text-align: center;"> + <img src="images/logo_large.png" alt="Textadept Logo" /> + </p> + <p style="font-size: smaller; font-weight: bold;"> + Please <a href="http://gum.co/textadept">donate</a> or purchase the + <a href="MEDIA.html#Book">quick reference</a> to fund continuous + development. + </p> + + <div class="head-col"><hr /><h2>Features</h2><hr /></div> + + <div class="left-col"> + <h3>Fast and Minimalist</h3> + <p> + Textadept’s user interface is sleek and simple. Relentlessly + optimized for speed and minimalism over the years, the editor + consists of less than 2000 lines of C code and less than 4000 lines + of <a href="http://lua.org">Lua</a> code. + </p> + <p class="center"> + <img src="images/textadept.png" alt="Textadept" /> + </p> + </div> + <div class="right-col"> + <h3>Cross Platform</h3> + <p> + Textadept runs on Windows, Mac OSX, Linux, and BSD. It also has a + terminal version, which is ideal for work on remote machines. + </p> + <p class="center"> + <img src="images/linux.png" alt="Linux" /> + <img src="images/macosx.png" alt="Mac OSX" /> + </p> + <p class="center"> + <img src="images/win32.png" alt="Win32" /> + <img src="images/ncurses.png" alt="curses" /> + </p> + </div> + <div class="clear-col"></div> + <div class="left-col"> + <h3>Remarkably Extensible</h3> + <p> + Textadept is an ideal editor for programmers who want endless + extensibility without sacrificing speed or succumbing to code bloat + and featuritis. The editor gives you complete control over the + entire application using the Lua programming language. Everything + from moving the caret to changing menus and key commands on-the-fly + to handling core events is possible. Its potential is vast. + </p> + </div> + <div class="right-col"> + <h3>Multiple Language Support</h3> + <p> + Being a programmer’s editor, Textadept excels at editing source + code. It understands the syntax and structure of more than 80 + different programming languages and recognizes hundreds of file + types. Textadept uses this knowledge to make viewing and editing + code faster and easier. It can also compile and run simple source + files. + </p> + </div> + <div class="clear-col"></div> + <div class="left-col"> + <h3>Unlimited Split Views</h3> + <p> + The graphical version of Textadept supports unlimited view splitting + both vertically and horizontally. + </p> + <p class="center"> + <img src="images/splitviews.png" alt="Split Views" /> + </p> + </div> + <div class="right-col"> + <h3>Customizable Themes</h3> + <p> + Textadept uses themes to customize its look and feel. It comes with + built-in light, dark, and terminal themes. + </p> + <p class="center"> + <img src="images/lighttheme.png" alt="Light Theme" /> + <img src="images/darktheme.png" alt="Dark Theme" /> + </p> + <p class="center"> + <img src="images/termtheme.png" alt="Term Theme" /> + </p> + </div> + <div class="clear-col"></div> + <div class="left-col"> + <h3>Code Autocompletion</h3> + <p> + Not only can Textadept autocomplete words in files, but it can also + autocomplete symbols for programming languages and display API + documentation. + </p> + <p class="center"> + <img src="images/adeptsense_lua.png" alt="Adeptsense Lua" /> + <img src="images/adeptsense_string.png" + alt="Adeptsense Lua String" /> + </p> + </div> + <div class="right-col"> + <h3>Keyboard Driven</h3> + <p> + Textadept is entirely keyboard driven. The editor defines key + bindings for nearly every action. You can easily reassign existing + bindings or create new ones. Keys may be chained together or grouped + into language-specific keys or key modes. + </p> + <h3>Self Contained</h3> + <p> + Textadept’s binary packages are self-contained and need not be + installed. No administrator privilages are required either. + </p> + </div> + + <div class="head-col"><hr /><h2>Learn More</h2><hr /></div> + + <div class="left-col"> + <h3>Comprehensive Manual</h3> + <p> + Textadept comes with a comprehensive user manual in the + application’s <em>doc/</em> directory. This manual is also available + <a href="01_Introduction.html">online</a>. It covers all of + Textadept’s main features, including installation, usage, + configuration, theming, scripting, and compilation. + </p> + </div> + <div class="right-col"> + <h3>Exhaustive API Documentation</h3> + <p> + Since Textadept is entirely scriptable with Lua, its API is heavily + documented. This documentation is located in the <em>doc/api/</em> + directory (also available <a href="api">online</a>), and is the + ultimate resource on scripting Textadept. (The editor’s Lua + internals also provide abundant scripting examples.) + </p> + </div> + <div class="clear-col"></div> + <div class="left-col"> + <h3>Quick Reference</h3> + <p style="float: left; margin-top: 0;"> + <a href="MEDIA.html#Book"> + <img src="book/ta_quickref_small.png" alt="Cover2" + style="border-width: 1px;" /> + </a> + </p> + <p> + This reference contains a wealth of knowledge on how to script and + configure Textadept using Lua. It groups the editor’s rich API into + a series of tasks in a convenient and easy-to-use manner. It serves + as the perfect complement to Textadept’s Manual and API + documentation. + </p> + </div> + <div class="right-col"> + <h3>Try It Yourself</h3> + <p> + Learn even more about Textadept by downloading and trying it out + yourself. If you’re not completely satisfied, contact us on the + <a href="http://foicica.com/lists">mailing list</a> or e-mail me + personally (mitchell.att.foicica.com). You may also fork the project + or submit patches. Textadept is 100% open source. + </p> + <p style="background-color: #80cc80; color: #4d4d4d; font-size: 1.5em; + margin: 0 auto 0 auto; padding: 0.25em; text-align: center; + width: 6em;"> + <a href="#download" style="color: inherit; display: block; + text-decoration: none;"> + Download + </a> + </p> + </div> + + <hr style="clear: both;" /> + <p style="text-align: center;"> + <a href="FAQ.html">FAQ</a> · + <a href="MEDIA.html">Media</a> · + <a href="THANKS.html">Credits</a> + </p> + + <hr style="clear: both;" /> + <div class="clear-col"></div> + <p style="color: #994d4d;"> + <a id="nightly"></a> + *<em>Warning</em>: nightly builds are untested, may have bugs, and are + the absolute cutting-edge versions of Textadept. Do not use them in + production, but for testing purposes only. + </p> + </div> + + <div id="footer"> + <p style="text-align:center;"> + © 2007-2014 Mitchell mitchell.att.foicica.com + </p> + </div> + </div> + </body> +</html> diff --git a/doc/markdowndoc.lua b/doc/markdowndoc.lua index e8947784..2ee19ac0 100644 --- a/doc/markdowndoc.lua +++ b/doc/markdowndoc.lua @@ -170,6 +170,7 @@ function M.start(doc) local p = io_popen('markdown "'..navfile..'"') local nav = p:read('*all') p:close() + os.remove(navfile) -- Write index.html. template.nav = nav diff --git a/src/Makefile b/src/Makefile index 2146947b..10a9f35a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -136,6 +136,7 @@ ifneq (, $(or $(findstring Linux, $(kernel)), $(findstring BSD, $(kernel)))) # # luadoc = luadoc endif +bombay = ../doc/bombay # No debugging unless DEBUG=1. ifdef DEBUG @@ -147,8 +148,7 @@ endif sci_flags = -pedantic -Os $(plat_flag) -DSCI_LEXER -DNDEBUG \ -DG_THREADS_IMPL_NONE -Iscintilla/include -Iscintilla/src \ - -Iscintilla/lexlib -Wall -Wno-missing-braces -Wno-char-subscripts \ - -Wno-long-long + -Iscintilla/lexlib -Wall -Wno-char-subscripts sci_objs = AutoComplete.o CallTip.o CaseConvert.o CaseFolder.o Catalogue.o \ CellBuffer.o CharClassify.o ContractionState.o Decoration.o \ @@ -205,7 +205,7 @@ osx-curses: textadept-curses textadeptjit-curses # Dependencies. base_deps = scintilla scintilla/term scintillua lua lualibs luajit gtdialog \ - cdk ../doc/bombay + cdk $(bombay) deps: $(base_deps) termkey win32-deps: $(base_deps) win32gtk win32curses osx-deps: $(base_deps) gtkosx termkey @@ -324,9 +324,11 @@ clean: # Documentation. -doc: manual luadoc adeptsense -manual: ../doc/*.md ../*.md | ../doc/bombay - $| -d ../doc -t ../doc --title Textadept --navtitle Manual $^ +doc: rootdoc manual luadoc adeptsense +rootdoc: ../*.md + $(bombay) -d ../doc -t ../doc --title Textadept --navtitle '' $^ +manual: ../doc/*.md + $(bombay) -d ../doc -t ../doc --title Textadept --navtitle Manual $^ luadoc: ../modules ../core ../lexers cd ../doc && $(luadoc) -d . -t . --doclet markdowndoc $^/lexer.lua adeptsense: ../modules ../core ../lexers @@ -418,7 +420,7 @@ osx-app: ../textadept ../textadeptjit ../textadept-curses \ # External dependencies. -scintilla_tgz = scintilla337.tgz?download +scintilla_tgz = scintilla337.tgz scinterm_zip = scinterm.zip scintillua_zip = scintillua.zip lua_tgz = lua-5.2.3.tar.gz @@ -437,6 +439,7 @@ win32curses_zip = win32curses.zip pdcurses_zip = download gtkosx_zip = gtkosx-2.24.16.zip bombay_zip = bombay.zip +cloc = cloc-1.60.pl $(scintilla_tgz): ; wget "http://prdownloads.sourceforge.net/scintilla/$@" -O $@ scintilla: scintilla.patch | $(scintilla_tgz) @@ -507,6 +510,14 @@ win32curses: | $(win32curses_zip) $(pdcurses_zip) $(gtkosx_zip): ; wget "http://foicica.com/textadept/download/$@" gtkosx: | $(gtkosx_zip) ; mkdir $@ && unzip -d $@ $| && mv $@/*/* $@ $(bombay_zip): ; wget "http://foicica.com/hg/bombay/archive/tip.zip" -O $@ -../doc/bombay: | $(bombay_zip) +$(bombay): | $(bombay_zip) mkdir $(notdir $@) && unzip -d $(notdir $@) $| && \ mv $(notdir $@)/*/* $(dir $@) +$(cloc): ; wget "http://prdownloads.sourceforge.net/cloc/$@" -O $@ + +# Count lines of code. + +sources = ../core ../modules/ansi_c ../modules/lua ../modules/textadept \ + ../themes textadept.c Makefile ../init.lua ../properties.lua +count: $(cloc) + perl $< $(sources) --not-match-f=adeptsensedoc.lua |
