commit - 4b446633725989d2fbaaa3c0de68ea61c80c9938
commit + 0e4c3d624c98e58a4d93f36569251c545e90f933
blob - 93654bb9ac5d9aae6e6f3ff7ca8b719b5a0deac7
blob + 11f0fd373a66afce832a079663cea569d854bac3
--- Makefile.am
+++ Makefile.am
u/emoji-matcher.c: $(srcdir)/data/emoji.txt $(srcdir)/u/genemoji.sh
$(srcdir)/u/genemoji.sh $(srcdir)/data/emoji.txt > $@
-PAGES = $(srcdir)/pages/about_about.gmi \
- $(srcdir)/pages/about_blank.gmi \
- $(srcdir)/pages/about_crash.gmi \
- $(srcdir)/pages/about_help.gmi \
- $(srcdir)/pages/about_license.gmi \
- $(srcdir)/pages/about_new.gmi
+PAGES = $(builddir)/pages/about_about.gmi \
+ $(builddir)/pages/about_blank.gmi \
+ $(builddir)/pages/about_crash.gmi \
+ $(builddir)/pages/about_help.gmi \
+ $(builddir)/pages/about_license.gmi \
+ $(builddir)/pages/about_new.gmi
pages.c: pagebundler $(srcdir)/include/pages.h ${PAGES}
echo > $@
echo "#include \"include/pages.h\"" >> $@
- ./pagebundler $(srcdir)/pages/about_about.gmi >> $@
- ./pagebundler $(srcdir)/pages/about_blank.gmi >> $@
- ./pagebundler $(srcdir)/pages/about_crash.gmi >> $@
- ./pagebundler $(srcdir)/pages/about_help.gmi >> $@
- ./pagebundler $(srcdir)/pages/about_license.gmi >> $@
- ./pagebundler $(srcdir)/pages/about_new.gmi >> $@
- ./pagebundler $(srcdir)/pages/bookmarks.gmi >> $@
+ ./pagebundler $(builddir)/pages/about_about.gmi >> $@
+ ./pagebundler $(builddir)/pages/about_blank.gmi >> $@
+ ./pagebundler $(builddir)/pages/about_crash.gmi >> $@
+ ./pagebundler $(builddir)/pages/about_help.gmi >> $@
+ ./pagebundler $(builddir)/pages/about_license.gmi >> $@
+ ./pagebundler $(builddir)/pages/about_new.gmi >> $@
+ ./pagebundler $(builddir)/pages/bookmarks.gmi >> $@
blob - ca17f620221b63e1689a16dbeab0f0ab333c3856
blob + 7a5cd9ea4e6e3018bb5f5c8ff33fbbe673044ae9
--- configure.ac
+++ configure.ac
AC_CONFIG_FILES([
Makefile
test/Makefile
- pages/about_new.gmi
+ pages/about_about.gmi
+ pages/about_blank.gmi
pages/about_crash.gmi
+ pages/about_help.gmi
+ pages/about_license.gmi
+ pages/about_new.gmi
+ pages/bookmarks.gmi
])
AC_OUTPUT
blob - 75a06796029354c909019f46077d127c2af8b51c (mode 644)
blob + /dev/null
--- pages/about_about.gmi
+++ /dev/null
-# About pages
-
-Telescope has a number of “special” built-in pages:
-
-=> about:about
-=> about:blank
-=> about:bookmarks
-=> about:crash
-=> about:help
-=> about:license
-=> about:new
blob - /dev/null
blob + 75a06796029354c909019f46077d127c2af8b51c (mode 644)
--- /dev/null
+++ pages/about_about.gmi.in
+# About pages
+
+Telescope has a number of “special” built-in pages:
+
+=> about:about
+=> about:blank
+=> about:bookmarks
+=> about:crash
+=> about:help
+=> about:license
+=> about:new
blob - e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 (mode 644)
blob + /dev/null
blob - /dev/null
blob + e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 (mode 644)
blob - 77361f39de5371dae0ed08f9cd00b8a2226b2039 (mode 644)
blob + /dev/null
--- pages/about_help.gmi
+++ /dev/null
-# Help
-
-Welcome to Telescope!
-
-Essential key bindings: arrow keys to move the cursor and read the page, > to enter an URL, B and F (uppercase) to navigate backward and forward in the history. ‘q’ to quit.
-
-This page is always available as
-
-> $ telescope about:help
-
-
-## What is Telescope?
-
-Telescope is a Gemini browser written for fun, as hobbystic project in my free time. As such, it lacks tons of features available in others, more mature Gemini browsers, but it also has some unique ones.
-
-The UI is strongly inspired from Emacs and w3m, so it’s possible to notice various familiar concepts, such as the minibuffer or the tab line. Care has been taken to make it as familiar as possible for vi and “CUA” users too.
-
-=> gemini://telescope.omarpolo.com Telescope Project Homepage
-
-> Tip: move the cursor over a link and press M-RET (alt + enter) to open it in another tab. Then use [ and ] to switch between tabs.
-
-Telescope is documented carefully, so please refer to the manual page to know more about all the available keybindings, the format and location of the configuration file and more:
-
-> man telescope
-
-
-## Operate the Telescope
-
-By default Telescope includes various keys inspired from either Emacs or vi. However, knowledge of these editors is not required. Here’s a list of essential commands
-
-* > to prompt for a URL;
-* < to edit the current URL;
-* arrow keys to move the cursor;
-* page up/down to scroll;
-* tab and shift-tab to jump to the next/previous link;
-* F and B (uppercase) to navigate forward and backward in the history;
-* enter to open the link under the cursor;
-* alt-enter to open the link under the cursor in a new tab;
-* [ and ] to move between tabs;
-* control + t to open a new tab;
-* control + w to close the current tab;
-* u to re-open a closed tab;
-* q to quit.
-
-
-## Operate — Emacs version
-
-If you’re familiar with Emacs, most of the keybindings are available on Telescope by default! C-{b,f,n,p} works as expected, as well as C-x C-c, C-x t o, C-v/M-v and even M-x!
-
-
-## Operate — vi version
-
-Telescope strives to be familiar for vi/vim users too! hjkl is available by default, as well as ‘g t’, ‘g T’ etc. :tabnew, :tabn and :wq work too!
-
-
-## Appearance
-
-Telescope is fully customizable. The configuration file is
-
-> ~/.config/telescope/config
-
-By default Telescope doesn’t use colours too much in order to adapt to both light and dark-themed terminals. This doesn’t mean that Telescope cannot use colours though! See for example contrib/light.config and contrib/dark.config.
-
-
-## Custom pages
-
-> Tip: on long and structured pages like this one, try to use the ‘toc’ command. Press ‘t’ to open the table of content and jump to a specific heading.
-
-All the ‘about:*’ pages can be locally overridden. For example, to customise about:new create:
-
-> ~/.local/share/telescope/pages/about_new.gmi
-
-about:bookmarks is the only page that doesn’t follow this pattern; it’s located at
-
-> ~/.local/share/telescope/bookmarks.gmi
-
-
-## Protocol Proxies
-
-Telescope supports custom protocol proxies (proxies that translate between protocols). Thanks to programs like the duckling-proxy, it’s possible to navigate the web using a Gemini browser.
-
-=> https://github.com/LukeEmmet/duckling-proxy The Duckling Proxy
-
-Configuring telescope to use a proxy is easy, just drop something like the following to your configuration file:
-
-```Example of protocol proxy configuration for http and https
-proxy "http" via "gemini://127.0.0.1:1965"
-proxy "https" via "gemini://127.0.0.1:1965"
-```
-
-
-# What is Gemini?
-
-Gemini is a new internet protocol which:
-
-* is heavier than gopher
-* is lighter than the web
-* will not replace either
-* strives for maximum power to weight ratio
-* takes user privacy very seriously
-
-=> gemini://gemini.circumlunar.space Project Gemini Homepage
blob - /dev/null
blob + 77361f39de5371dae0ed08f9cd00b8a2226b2039 (mode 644)
--- /dev/null
+++ pages/about_help.gmi.in
+# Help
+
+Welcome to Telescope!
+
+Essential key bindings: arrow keys to move the cursor and read the page, > to enter an URL, B and F (uppercase) to navigate backward and forward in the history. ‘q’ to quit.
+
+This page is always available as
+
+> $ telescope about:help
+
+
+## What is Telescope?
+
+Telescope is a Gemini browser written for fun, as hobbystic project in my free time. As such, it lacks tons of features available in others, more mature Gemini browsers, but it also has some unique ones.
+
+The UI is strongly inspired from Emacs and w3m, so it’s possible to notice various familiar concepts, such as the minibuffer or the tab line. Care has been taken to make it as familiar as possible for vi and “CUA” users too.
+
+=> gemini://telescope.omarpolo.com Telescope Project Homepage
+
+> Tip: move the cursor over a link and press M-RET (alt + enter) to open it in another tab. Then use [ and ] to switch between tabs.
+
+Telescope is documented carefully, so please refer to the manual page to know more about all the available keybindings, the format and location of the configuration file and more:
+
+> man telescope
+
+
+## Operate the Telescope
+
+By default Telescope includes various keys inspired from either Emacs or vi. However, knowledge of these editors is not required. Here’s a list of essential commands
+
+* > to prompt for a URL;
+* < to edit the current URL;
+* arrow keys to move the cursor;
+* page up/down to scroll;
+* tab and shift-tab to jump to the next/previous link;
+* F and B (uppercase) to navigate forward and backward in the history;
+* enter to open the link under the cursor;
+* alt-enter to open the link under the cursor in a new tab;
+* [ and ] to move between tabs;
+* control + t to open a new tab;
+* control + w to close the current tab;
+* u to re-open a closed tab;
+* q to quit.
+
+
+## Operate — Emacs version
+
+If you’re familiar with Emacs, most of the keybindings are available on Telescope by default! C-{b,f,n,p} works as expected, as well as C-x C-c, C-x t o, C-v/M-v and even M-x!
+
+
+## Operate — vi version
+
+Telescope strives to be familiar for vi/vim users too! hjkl is available by default, as well as ‘g t’, ‘g T’ etc. :tabnew, :tabn and :wq work too!
+
+
+## Appearance
+
+Telescope is fully customizable. The configuration file is
+
+> ~/.config/telescope/config
+
+By default Telescope doesn’t use colours too much in order to adapt to both light and dark-themed terminals. This doesn’t mean that Telescope cannot use colours though! See for example contrib/light.config and contrib/dark.config.
+
+
+## Custom pages
+
+> Tip: on long and structured pages like this one, try to use the ‘toc’ command. Press ‘t’ to open the table of content and jump to a specific heading.
+
+All the ‘about:*’ pages can be locally overridden. For example, to customise about:new create:
+
+> ~/.local/share/telescope/pages/about_new.gmi
+
+about:bookmarks is the only page that doesn’t follow this pattern; it’s located at
+
+> ~/.local/share/telescope/bookmarks.gmi
+
+
+## Protocol Proxies
+
+Telescope supports custom protocol proxies (proxies that translate between protocols). Thanks to programs like the duckling-proxy, it’s possible to navigate the web using a Gemini browser.
+
+=> https://github.com/LukeEmmet/duckling-proxy The Duckling Proxy
+
+Configuring telescope to use a proxy is easy, just drop something like the following to your configuration file:
+
+```Example of protocol proxy configuration for http and https
+proxy "http" via "gemini://127.0.0.1:1965"
+proxy "https" via "gemini://127.0.0.1:1965"
+```
+
+
+# What is Gemini?
+
+Gemini is a new internet protocol which:
+
+* is heavier than gopher
+* is lighter than the web
+* will not replace either
+* strives for maximum power to weight ratio
+* takes user privacy very seriously
+
+=> gemini://gemini.circumlunar.space Project Gemini Homepage
blob - 508c471bdd13cc7d83f096e5d0aedee4e509b361 (mode 644)
blob + /dev/null
--- pages/about_license.gmi
+++ /dev/null
-# License
-
-Some general notes about the licenses and copyrights of the Telescope sources; check the source files for the exact copyright holders.
-
-## Telescope
-
-The majority of the code is distributed under the ISC license:
-
-> Copyright (c) 2021 Omar Polo <op@omarpolo.com>
->
-> Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
->
-> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-## compat/*.[ch]
-
-The files inside the compat directory have different copyright owners and slightly different licenses, but are all BSD-style.
-
-Copyright owners: (alphabetically sorted)
-
-* Henning Brauer <henning@openbsd.org>
-* Ian F. Darwin
-* Marc Espie <espie@openbsd.org>
-* Nicholas Marriott <nicholas.marriott@gmail.com>
-* Otto Moerbeek <otto@drijf.net>
-* Pierre-Yves Ritschard <pyr@openbsd.org>
-* Reyk Floeter <reyk@openbsd.org>
-* Rich Felker, et al
-* Ted Unangst
-* The Regents of the University of California
-* Todd C. Miller <millert@openbsd.org>
-
-Note the all of them probably don't know their code is being re-used here.
-
-## data/emoji.txt
-
-emoji.txt contains information about various UNICODE codepoints and it’s copyright © 1991-2021 Unicode, Inc.
-
-=> https://www.unicode.org/license.html UNICODE, Inc license agreement
blob - /dev/null
blob + 508c471bdd13cc7d83f096e5d0aedee4e509b361 (mode 644)
--- /dev/null
+++ pages/about_license.gmi.in
+# License
+
+Some general notes about the licenses and copyrights of the Telescope sources; check the source files for the exact copyright holders.
+
+## Telescope
+
+The majority of the code is distributed under the ISC license:
+
+> Copyright (c) 2021 Omar Polo <op@omarpolo.com>
+>
+> Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+>
+> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+## compat/*.[ch]
+
+The files inside the compat directory have different copyright owners and slightly different licenses, but are all BSD-style.
+
+Copyright owners: (alphabetically sorted)
+
+* Henning Brauer <henning@openbsd.org>
+* Ian F. Darwin
+* Marc Espie <espie@openbsd.org>
+* Nicholas Marriott <nicholas.marriott@gmail.com>
+* Otto Moerbeek <otto@drijf.net>
+* Pierre-Yves Ritschard <pyr@openbsd.org>
+* Reyk Floeter <reyk@openbsd.org>
+* Rich Felker, et al
+* Ted Unangst
+* The Regents of the University of California
+* Todd C. Miller <millert@openbsd.org>
+
+Note the all of them probably don't know their code is being re-used here.
+
+## data/emoji.txt
+
+emoji.txt contains information about various UNICODE codepoints and it’s copyright © 1991-2021 Unicode, Inc.
+
+=> https://www.unicode.org/license.html UNICODE, Inc license agreement
blob - 9dd8771c3768e5133f73b60628a815f3eb6d4f01 (mode 644)
blob + /dev/null
--- pages/bookmarks.gmi
+++ /dev/null
-# Bookmarks
-
-No bookmarks yet!
-
-Create ~/.local/share/telescope/bookmarks.gmi or use ‘bookmark-page’.
blob - /dev/null
blob + 9dd8771c3768e5133f73b60628a815f3eb6d4f01 (mode 644)
--- /dev/null
+++ pages/bookmarks.gmi.in
+# Bookmarks
+
+No bookmarks yet!
+
+Create ~/.local/share/telescope/bookmarks.gmi or use ‘bookmark-page’.
