Compare commits
No commits in common. "site" and "master" have entirely different histories.
23 changed files with 2135 additions and 152 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +0,0 @@
|
||||||
out/
|
|
||||||
674
COPYING
Normal file
674
COPYING
Normal file
|
|
@ -0,0 +1,674 @@
|
||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
||||||
64
Makefile
Normal file
64
Makefile
Normal file
|
|
@ -0,0 +1,64 @@
|
||||||
|
# Copyright (C) 2012, 2013 Tom Willemsen
|
||||||
|
#
|
||||||
|
# This file is part of Markam
|
||||||
|
#
|
||||||
|
# Markam is free software: you can redistribute it and/or modify it
|
||||||
|
# under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# Markam is distributed in the hope that it will be useful, but
|
||||||
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
# General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with Markam. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
INSTALL = install -D
|
||||||
|
|
||||||
|
export DESTDIR ?= /usr/local
|
||||||
|
export INSTALL_PROGRAM = $(INSTALL)
|
||||||
|
export INSTALL_DATA = $(INSTALL) -m 644
|
||||||
|
|
||||||
|
dirs = src doc conkeror
|
||||||
|
install-dirs = $(addprefix install-,$(dirs))
|
||||||
|
uninstall-dirs = $(addprefix uninstall-,$(dirs))
|
||||||
|
install-strip-dirs = $(addprefix installstrip-,$(dirs))
|
||||||
|
|
||||||
|
.PHONY: all $(dirs) install $(install-dirs) uninstall $(uninstall-dirs) \
|
||||||
|
dvi install-dvi pdf install-pdf ps install-ps
|
||||||
|
|
||||||
|
all: $(dirs)
|
||||||
|
install: $(install-dirs)
|
||||||
|
uninstall: $(uninstall-dirs)
|
||||||
|
install-strip: $(install-strip-dirs)
|
||||||
|
|
||||||
|
$(dirs):
|
||||||
|
$(MAKE) -C $@
|
||||||
|
|
||||||
|
$(install-dirs): install-%:
|
||||||
|
$(MAKE) -C $*/ install
|
||||||
|
|
||||||
|
$(uninstall-dirs): uninstall-%:
|
||||||
|
$(MAKE) -C $*/ uninstall
|
||||||
|
|
||||||
|
$(install-strip-dirs): installstrip-%:
|
||||||
|
$(MAKE) -C $*/ install-strip
|
||||||
|
|
||||||
|
dvi:
|
||||||
|
$(MAKE) -C doc/ dvi
|
||||||
|
|
||||||
|
pdf:
|
||||||
|
$(MAKE) -C doc/ pdf
|
||||||
|
|
||||||
|
ps:
|
||||||
|
$(MAKE) -C doc/ ps
|
||||||
|
|
||||||
|
install-dvi:
|
||||||
|
$(MAKE) -C doc/ install-dvi
|
||||||
|
|
||||||
|
install-pdf:
|
||||||
|
$(MAKE) -C doc/ install-pdf
|
||||||
|
|
||||||
|
install-ps:
|
||||||
|
$(MAKE) -C doc/ install-ps
|
||||||
66
NEWS
Normal file
66
NEWS
Normal file
|
|
@ -0,0 +1,66 @@
|
||||||
|
Markam NEWS -- history of user-visible changes.
|
||||||
|
|
||||||
|
Copyright (C) 2013 Tom Willemsen
|
||||||
|
See the end of the file for license conditions.
|
||||||
|
|
||||||
|
Please send Markam bug reports to tom at ryuslash dot org.
|
||||||
|
|
||||||
|
|
||||||
|
* Next
|
||||||
|
|
||||||
|
** Add NEWS file.
|
||||||
|
|
||||||
|
|
||||||
|
* Version 0.2.0
|
||||||
|
|
||||||
|
** Add targets to Makefile.
|
||||||
|
|
||||||
|
Add the `install', `uninstall', `install-strip' and several
|
||||||
|
documentation format targets to the Makefile to make installation
|
||||||
|
easier.
|
||||||
|
|
||||||
|
** Add simplistic searching.
|
||||||
|
|
||||||
|
It looks for either bookmarks having a tag that matches the given
|
||||||
|
string or where the given string is in the bookmark's title.
|
||||||
|
|
||||||
|
** Add a `--script' switch.
|
||||||
|
|
||||||
|
This switch causes output of bookmarks to change. When given each
|
||||||
|
bookmark's title, description and url are printed separated by a `C-^'
|
||||||
|
character and each bookmark is separated by a `C-_' character. This is
|
||||||
|
to help other programs parse these fields.
|
||||||
|
|
||||||
|
** Add searching and completion to Conkeror interface.
|
||||||
|
|
||||||
|
This uses the new `--script' switch to search through a user's
|
||||||
|
bookmarks and suggest the matching ones to Conkeror as completion
|
||||||
|
candidates.
|
||||||
|
|
||||||
|
|
||||||
|
* Version 0.1.0
|
||||||
|
|
||||||
|
** Initial release
|
||||||
|
|
||||||
|
|
||||||
|
----------------------------------------------------------------------
|
||||||
|
This file is part of Markam
|
||||||
|
|
||||||
|
Markam is free software: you can redistribute it and/or modify it
|
||||||
|
under the terms of the GNU General Public License as published by the
|
||||||
|
Free Software Foundation, either version 3 of the License, or (at your
|
||||||
|
option) any later version.
|
||||||
|
|
||||||
|
Markam is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with Markam. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
|
||||||
|
Local Variables:
|
||||||
|
mode: outline
|
||||||
|
paragraph-separate: "[ ]*$"
|
||||||
|
End:
|
||||||
25
README.org
Normal file
25
README.org
Normal file
|
|
@ -0,0 +1,25 @@
|
||||||
|
#+STARTUP: showall
|
||||||
|
|
||||||
|
Copyright (C) 2012, 2013 Tom Willemsen
|
||||||
|
See the end of the file for license conditions.
|
||||||
|
|
||||||
|
* Markam
|
||||||
|
|
||||||
|
Collects bookmarks.
|
||||||
|
|
||||||
|
* License
|
||||||
|
|
||||||
|
This file is part of Markam
|
||||||
|
|
||||||
|
Markam is free software: you can redistribute it and/or modify it
|
||||||
|
under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
Markam is distributed in the hope that it will be useful, but
|
||||||
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with Markam. If not, see <http://www.gnu.org/licenses/>.
|
||||||
30
conkeror/Makefile
Normal file
30
conkeror/Makefile
Normal file
|
|
@ -0,0 +1,30 @@
|
||||||
|
# Copyright (C) 2012, 2013 Tom Willemsen
|
||||||
|
#
|
||||||
|
# This file is part of Markam
|
||||||
|
#
|
||||||
|
# Markam is free software: you can redistribute it and/or modify it
|
||||||
|
# under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# Markam is distributed in the hope that it will be useful, but
|
||||||
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
# General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with Markam. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
DESTDIR ?= /usr/local
|
||||||
|
|
||||||
|
.PHONY: all install uninstall
|
||||||
|
|
||||||
|
all:
|
||||||
|
install: markam.js
|
||||||
|
$(INSTALL_DATA) markam.js \
|
||||||
|
"$(DESTDIR)/share/conkeror/modules/markam.js"
|
||||||
|
|
||||||
|
install-strip:
|
||||||
|
$(MAKE) install
|
||||||
|
|
||||||
|
uninstall:
|
||||||
|
rm -f "$(DESTDIR)/share/conkeror/modules/markam.js"
|
||||||
138
conkeror/markam.js
Normal file
138
conkeror/markam.js
Normal file
|
|
@ -0,0 +1,138 @@
|
||||||
|
/* markam -- Store/retrieve/manage bookmarks
|
||||||
|
Copyright (C) 2012,2013 Tom Willemsen <tom at ryuslash dot org>
|
||||||
|
|
||||||
|
This file is part of Markam
|
||||||
|
|
||||||
|
Markam is free software: you can redistribute it and/or modify it
|
||||||
|
under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
Markam is distributed in the hope that it will be useful, but
|
||||||
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with Markam. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
/// Commentary:
|
||||||
|
|
||||||
|
// A wrapper script that should allow conkeror to interface with
|
||||||
|
// markam. Does not yet allow searching through collected bookmarks,
|
||||||
|
// only adding new ones.
|
||||||
|
|
||||||
|
/// Code:
|
||||||
|
|
||||||
|
define_variable("markam_program", "markam",
|
||||||
|
"The location of the markam executable.");
|
||||||
|
|
||||||
|
define_browser_object_class(
|
||||||
|
"markam-bookmark", null,
|
||||||
|
function (I, prompt) {
|
||||||
|
check_buffer(I.buffer, content_buffer);
|
||||||
|
var result = yield I.buffer.window.minibuffer.read(
|
||||||
|
$prompt = prompt, $completer = markam_complete
|
||||||
|
);
|
||||||
|
yield co_return(result);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
function markam_add_url(I, url, title)
|
||||||
|
{ // Add URL to markam, ask for a title (provide TITLE as a
|
||||||
|
// default), description and any number of tags.
|
||||||
|
let url_string = load_spec_uri_string(load_spec(url));
|
||||||
|
let title = yield I.minibuffer.read($prompt="name (required): ",
|
||||||
|
$initial_value=title);
|
||||||
|
let description = yield I.minibuffer.read(
|
||||||
|
$prompt="extended description: "
|
||||||
|
);
|
||||||
|
let tags = yield I.minibuffer.read(
|
||||||
|
$prompt="tags (comma delimited): "
|
||||||
|
);
|
||||||
|
let command = markam_program + ' "' + url_string + '" "' + title
|
||||||
|
+ '" "' + description + '" \''
|
||||||
|
+ tags.split(',').map(function (str)
|
||||||
|
{ return str.trim(); }).join("' '")
|
||||||
|
+ "'";
|
||||||
|
yield shell_command(command);
|
||||||
|
}
|
||||||
|
|
||||||
|
function markam_add(I) {
|
||||||
|
check_buffer(I.buffer, content_buffer);
|
||||||
|
let result = yield markam_add_url(I, I.buffer.top_frame,
|
||||||
|
I.buffer.title);
|
||||||
|
|
||||||
|
if (!result)
|
||||||
|
I.window.minibuffer.message('Added to markam');
|
||||||
|
else
|
||||||
|
I.window.minibuffer.message('Couldn\'t add to markam');
|
||||||
|
}
|
||||||
|
interactive("markam-add",
|
||||||
|
"Bookmark the current page in markam",
|
||||||
|
markam_add);
|
||||||
|
|
||||||
|
function markam_add_link(I) {
|
||||||
|
check_buffer(I.buffer, content_buffer);
|
||||||
|
bo = yield read_browser_object(I);
|
||||||
|
let result = yield markam_add_url(I, encodeURIComponent(bo),
|
||||||
|
bo.textContent);
|
||||||
|
|
||||||
|
if (!result)
|
||||||
|
I.window.minibuffer.message('Added to markam');
|
||||||
|
else
|
||||||
|
I.window.minibuffer.message('Couldn\'t add to markam');
|
||||||
|
}
|
||||||
|
interactive("markam-add-link",
|
||||||
|
"Select and bookmark a link in markam",
|
||||||
|
markam_add_link);
|
||||||
|
|
||||||
|
function markam_complete(input, pos, conservative)
|
||||||
|
{
|
||||||
|
if (pos == 0 && conservative)
|
||||||
|
yield co_return(undefined);
|
||||||
|
|
||||||
|
let str = input.substring(0, pos);
|
||||||
|
|
||||||
|
var data = "", error = "", ret = [];
|
||||||
|
var result = 0;
|
||||||
|
|
||||||
|
if (str == "")
|
||||||
|
result = yield shell_command(
|
||||||
|
markam_program + " --script",
|
||||||
|
$fds = [{ output: async_binary_string_writer("") },
|
||||||
|
{ input: async_binary_reader(function (s) data += s || "") },
|
||||||
|
{ input: async_binary_reader(function (s) error += s || "") }]);
|
||||||
|
else
|
||||||
|
result = yield shell_command_with_argument(
|
||||||
|
markam_program + " --script search {}", str,
|
||||||
|
$fds = [{ output: async_binary_string_writer("") },
|
||||||
|
{ input: async_binary_reader(function (s) data += s || "") },
|
||||||
|
{ input: async_binary_reader(function (s) error += s || "") }]);
|
||||||
|
|
||||||
|
if (result != 0 || error != "")
|
||||||
|
throw new Error("result: " + result + ", error: " + error);
|
||||||
|
else if (data != "") {
|
||||||
|
data.split(' ').forEach(function (row) {
|
||||||
|
ret.push(row.split(' '));
|
||||||
|
});
|
||||||
|
|
||||||
|
let c = { count: ret.length,
|
||||||
|
get_string: function (i) ret[i][0],
|
||||||
|
get_description: function (i) ret[i][1],
|
||||||
|
get_input_state: function (i) [ret[i][2]] };
|
||||||
|
yield co_return(c);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
interactive("markam-find-url",
|
||||||
|
"Find a page from markam in the current buffer",
|
||||||
|
"find-url",
|
||||||
|
$browser_object = browser_object_markam_bookmark);
|
||||||
|
interactive("markam-find-url-new-buffer",
|
||||||
|
"Find a page from markam in a new buffer",
|
||||||
|
"find-url-new-buffer",
|
||||||
|
$browser_object = browser_object_markam_bookmark);
|
||||||
|
|
||||||
|
|
||||||
|
provide("markam");
|
||||||
13
doc/.gitignore
vendored
Normal file
13
doc/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
*.info
|
||||||
|
*.aux
|
||||||
|
*.cp
|
||||||
|
*.dvi
|
||||||
|
*.fn
|
||||||
|
*.ky
|
||||||
|
*.log
|
||||||
|
*.pdf
|
||||||
|
*.pg
|
||||||
|
*.ps
|
||||||
|
*.toc
|
||||||
|
*.tp
|
||||||
|
*.vr
|
||||||
72
doc/Makefile
Normal file
72
doc/Makefile
Normal file
|
|
@ -0,0 +1,72 @@
|
||||||
|
# Copyright (C) 2012, 2013 Tom Willemsen
|
||||||
|
#
|
||||||
|
# This file is part of Markam
|
||||||
|
#
|
||||||
|
# Markam is free software: you can redistribute it and/or modify it
|
||||||
|
# under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# Markam is distributed in the hope that it will be useful, but
|
||||||
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
# General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with Markam. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
DESTDIR ?= /usr/local
|
||||||
|
INSTALL_INFO = install-info
|
||||||
|
TEXI2PDF = texi2pdf
|
||||||
|
DVIPS = dvips
|
||||||
|
|
||||||
|
.PHONY: all html dvi pdf ps install uninstall install-dvi install-pdf \
|
||||||
|
install-ps
|
||||||
|
|
||||||
|
all: markam.info
|
||||||
|
|
||||||
|
install: markam.info
|
||||||
|
$(INSTALL_DATA) markam.info "$(DESTDIR)/share/info/markam.info"
|
||||||
|
$(INSTALL_INFO) --dir-file="$(DESTDIR)/share/info/dir" \
|
||||||
|
"$(DESTDIR)/share/info/markam.info"
|
||||||
|
|
||||||
|
install-strip:
|
||||||
|
$(MAKE) install
|
||||||
|
|
||||||
|
uninstall:
|
||||||
|
$(INSTALL_INFO) --dir-file="$(DESTDIR)/share/info/dir" \
|
||||||
|
--delete "$(DESTDIR)/share/info/markam.info"
|
||||||
|
rm -f "$(DESTDIR)/share/info/markam.info"
|
||||||
|
rm -f "$(DESTDIR)/share/doc/markam/dvi/markam.dvi"
|
||||||
|
rm -f "$(DESTDIR)/share/doc/markam/pdf/markam.pdf"
|
||||||
|
rm -f "$(DESTDIR)/share/doc/markam/ps/markam.ps"
|
||||||
|
rm -rf "$(DESTDIR)/share/doc/markam/html/"
|
||||||
|
|
||||||
|
install-dvi: markam.dvi
|
||||||
|
$(INSTALL_DATA) markam.dvi \
|
||||||
|
"$(DESTDIR)/share/doc/markam/dvi/markam.dvi"
|
||||||
|
|
||||||
|
install-pdf: markam.pdf
|
||||||
|
$(INSTALL_DATA) markam.pdf \
|
||||||
|
"$(DESTDIR)/share/doc/markam/pdf/markam.pdf"
|
||||||
|
|
||||||
|
install-ps: markam.ps
|
||||||
|
$(INSTALL_DATA) markam.ps \
|
||||||
|
"$(DESTDIR)/share/doc/markam/ps/markam.ps"
|
||||||
|
|
||||||
|
markam.info: markam.texi
|
||||||
|
|
||||||
|
html: markam.texi
|
||||||
|
$(MAKEINFO) --html markam.texi -o html
|
||||||
|
|
||||||
|
dvi: markam.dvi
|
||||||
|
pdf: markam.pdf
|
||||||
|
ps: markam.ps
|
||||||
|
|
||||||
|
markam.dvi: markam.texi
|
||||||
|
$(TEXI2DVI) markam.texi
|
||||||
|
|
||||||
|
markam.pdf: markam.texi
|
||||||
|
$(TEXI2PDF) markam.texi
|
||||||
|
|
||||||
|
markam.ps: markam.dvi
|
||||||
|
$(DVIPS) markam.dvi
|
||||||
505
doc/fdl.texi
Normal file
505
doc/fdl.texi
Normal file
|
|
@ -0,0 +1,505 @@
|
||||||
|
@c The GNU Free Documentation License.
|
||||||
|
@center Version 1.3, 3 November 2008
|
||||||
|
|
||||||
|
@c This file is intended to be included within another document,
|
||||||
|
@c hence no sectioning command or @node.
|
||||||
|
|
||||||
|
@display
|
||||||
|
Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
|
||||||
|
@uref{http://fsf.org/}
|
||||||
|
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
@end display
|
||||||
|
|
||||||
|
@enumerate 0
|
||||||
|
@item
|
||||||
|
PREAMBLE
|
||||||
|
|
||||||
|
The purpose of this License is to make a manual, textbook, or other
|
||||||
|
functional and useful document @dfn{free} in the sense of freedom: to
|
||||||
|
assure everyone the effective freedom to copy and redistribute it,
|
||||||
|
with or without modifying it, either commercially or noncommercially.
|
||||||
|
Secondarily, this License preserves for the author and publisher a way
|
||||||
|
to get credit for their work, while not being considered responsible
|
||||||
|
for modifications made by others.
|
||||||
|
|
||||||
|
This License is a kind of ``copyleft'', which means that derivative
|
||||||
|
works of the document must themselves be free in the same sense. It
|
||||||
|
complements the GNU General Public License, which is a copyleft
|
||||||
|
license designed for free software.
|
||||||
|
|
||||||
|
We have designed this License in order to use it for manuals for free
|
||||||
|
software, because free software needs free documentation: a free
|
||||||
|
program should come with manuals providing the same freedoms that the
|
||||||
|
software does. But this License is not limited to software manuals;
|
||||||
|
it can be used for any textual work, regardless of subject matter or
|
||||||
|
whether it is published as a printed book. We recommend this License
|
||||||
|
principally for works whose purpose is instruction or reference.
|
||||||
|
|
||||||
|
@item
|
||||||
|
APPLICABILITY AND DEFINITIONS
|
||||||
|
|
||||||
|
This License applies to any manual or other work, in any medium, that
|
||||||
|
contains a notice placed by the copyright holder saying it can be
|
||||||
|
distributed under the terms of this License. Such a notice grants a
|
||||||
|
world-wide, royalty-free license, unlimited in duration, to use that
|
||||||
|
work under the conditions stated herein. The ``Document'', below,
|
||||||
|
refers to any such manual or work. Any member of the public is a
|
||||||
|
licensee, and is addressed as ``you''. You accept the license if you
|
||||||
|
copy, modify or distribute the work in a way requiring permission
|
||||||
|
under copyright law.
|
||||||
|
|
||||||
|
A ``Modified Version'' of the Document means any work containing the
|
||||||
|
Document or a portion of it, either copied verbatim, or with
|
||||||
|
modifications and/or translated into another language.
|
||||||
|
|
||||||
|
A ``Secondary Section'' is a named appendix or a front-matter section
|
||||||
|
of the Document that deals exclusively with the relationship of the
|
||||||
|
publishers or authors of the Document to the Document's overall
|
||||||
|
subject (or to related matters) and contains nothing that could fall
|
||||||
|
directly within that overall subject. (Thus, if the Document is in
|
||||||
|
part a textbook of mathematics, a Secondary Section may not explain
|
||||||
|
any mathematics.) The relationship could be a matter of historical
|
||||||
|
connection with the subject or with related matters, or of legal,
|
||||||
|
commercial, philosophical, ethical or political position regarding
|
||||||
|
them.
|
||||||
|
|
||||||
|
The ``Invariant Sections'' are certain Secondary Sections whose titles
|
||||||
|
are designated, as being those of Invariant Sections, in the notice
|
||||||
|
that says that the Document is released under this License. If a
|
||||||
|
section does not fit the above definition of Secondary then it is not
|
||||||
|
allowed to be designated as Invariant. The Document may contain zero
|
||||||
|
Invariant Sections. If the Document does not identify any Invariant
|
||||||
|
Sections then there are none.
|
||||||
|
|
||||||
|
The ``Cover Texts'' are certain short passages of text that are listed,
|
||||||
|
as Front-Cover Texts or Back-Cover Texts, in the notice that says that
|
||||||
|
the Document is released under this License. A Front-Cover Text may
|
||||||
|
be at most 5 words, and a Back-Cover Text may be at most 25 words.
|
||||||
|
|
||||||
|
A ``Transparent'' copy of the Document means a machine-readable copy,
|
||||||
|
represented in a format whose specification is available to the
|
||||||
|
general public, that is suitable for revising the document
|
||||||
|
straightforwardly with generic text editors or (for images composed of
|
||||||
|
pixels) generic paint programs or (for drawings) some widely available
|
||||||
|
drawing editor, and that is suitable for input to text formatters or
|
||||||
|
for automatic translation to a variety of formats suitable for input
|
||||||
|
to text formatters. A copy made in an otherwise Transparent file
|
||||||
|
format whose markup, or absence of markup, has been arranged to thwart
|
||||||
|
or discourage subsequent modification by readers is not Transparent.
|
||||||
|
An image format is not Transparent if used for any substantial amount
|
||||||
|
of text. A copy that is not ``Transparent'' is called ``Opaque''.
|
||||||
|
|
||||||
|
Examples of suitable formats for Transparent copies include plain
|
||||||
|
ASCII without markup, Texinfo input format, La@TeX{} input
|
||||||
|
format, SGML or XML using a publicly available
|
||||||
|
DTD, and standard-conforming simple HTML,
|
||||||
|
PostScript or PDF designed for human modification. Examples
|
||||||
|
of transparent image formats include PNG, XCF and
|
||||||
|
JPG@. Opaque formats include proprietary formats that can be
|
||||||
|
read and edited only by proprietary word processors, SGML or
|
||||||
|
XML for which the DTD and/or processing tools are
|
||||||
|
not generally available, and the machine-generated HTML,
|
||||||
|
PostScript or PDF produced by some word processors for
|
||||||
|
output purposes only.
|
||||||
|
|
||||||
|
The ``Title Page'' means, for a printed book, the title page itself,
|
||||||
|
plus such following pages as are needed to hold, legibly, the material
|
||||||
|
this License requires to appear in the title page. For works in
|
||||||
|
formats which do not have any title page as such, ``Title Page'' means
|
||||||
|
the text near the most prominent appearance of the work's title,
|
||||||
|
preceding the beginning of the body of the text.
|
||||||
|
|
||||||
|
The ``publisher'' means any person or entity that distributes copies
|
||||||
|
of the Document to the public.
|
||||||
|
|
||||||
|
A section ``Entitled XYZ'' means a named subunit of the Document whose
|
||||||
|
title either is precisely XYZ or contains XYZ in parentheses following
|
||||||
|
text that translates XYZ in another language. (Here XYZ stands for a
|
||||||
|
specific section name mentioned below, such as ``Acknowledgements'',
|
||||||
|
``Dedications'', ``Endorsements'', or ``History''.) To ``Preserve the Title''
|
||||||
|
of such a section when you modify the Document means that it remains a
|
||||||
|
section ``Entitled XYZ'' according to this definition.
|
||||||
|
|
||||||
|
The Document may include Warranty Disclaimers next to the notice which
|
||||||
|
states that this License applies to the Document. These Warranty
|
||||||
|
Disclaimers are considered to be included by reference in this
|
||||||
|
License, but only as regards disclaiming warranties: any other
|
||||||
|
implication that these Warranty Disclaimers may have is void and has
|
||||||
|
no effect on the meaning of this License.
|
||||||
|
|
||||||
|
@item
|
||||||
|
VERBATIM COPYING
|
||||||
|
|
||||||
|
You may copy and distribute the Document in any medium, either
|
||||||
|
commercially or noncommercially, provided that this License, the
|
||||||
|
copyright notices, and the license notice saying this License applies
|
||||||
|
to the Document are reproduced in all copies, and that you add no other
|
||||||
|
conditions whatsoever to those of this License. You may not use
|
||||||
|
technical measures to obstruct or control the reading or further
|
||||||
|
copying of the copies you make or distribute. However, you may accept
|
||||||
|
compensation in exchange for copies. If you distribute a large enough
|
||||||
|
number of copies you must also follow the conditions in section 3.
|
||||||
|
|
||||||
|
You may also lend copies, under the same conditions stated above, and
|
||||||
|
you may publicly display copies.
|
||||||
|
|
||||||
|
@item
|
||||||
|
COPYING IN QUANTITY
|
||||||
|
|
||||||
|
If you publish printed copies (or copies in media that commonly have
|
||||||
|
printed covers) of the Document, numbering more than 100, and the
|
||||||
|
Document's license notice requires Cover Texts, you must enclose the
|
||||||
|
copies in covers that carry, clearly and legibly, all these Cover
|
||||||
|
Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
|
||||||
|
the back cover. Both covers must also clearly and legibly identify
|
||||||
|
you as the publisher of these copies. The front cover must present
|
||||||
|
the full title with all words of the title equally prominent and
|
||||||
|
visible. You may add other material on the covers in addition.
|
||||||
|
Copying with changes limited to the covers, as long as they preserve
|
||||||
|
the title of the Document and satisfy these conditions, can be treated
|
||||||
|
as verbatim copying in other respects.
|
||||||
|
|
||||||
|
If the required texts for either cover are too voluminous to fit
|
||||||
|
legibly, you should put the first ones listed (as many as fit
|
||||||
|
reasonably) on the actual cover, and continue the rest onto adjacent
|
||||||
|
pages.
|
||||||
|
|
||||||
|
If you publish or distribute Opaque copies of the Document numbering
|
||||||
|
more than 100, you must either include a machine-readable Transparent
|
||||||
|
copy along with each Opaque copy, or state in or with each Opaque copy
|
||||||
|
a computer-network location from which the general network-using
|
||||||
|
public has access to download using public-standard network protocols
|
||||||
|
a complete Transparent copy of the Document, free of added material.
|
||||||
|
If you use the latter option, you must take reasonably prudent steps,
|
||||||
|
when you begin distribution of Opaque copies in quantity, to ensure
|
||||||
|
that this Transparent copy will remain thus accessible at the stated
|
||||||
|
location until at least one year after the last time you distribute an
|
||||||
|
Opaque copy (directly or through your agents or retailers) of that
|
||||||
|
edition to the public.
|
||||||
|
|
||||||
|
It is requested, but not required, that you contact the authors of the
|
||||||
|
Document well before redistributing any large number of copies, to give
|
||||||
|
them a chance to provide you with an updated version of the Document.
|
||||||
|
|
||||||
|
@item
|
||||||
|
MODIFICATIONS
|
||||||
|
|
||||||
|
You may copy and distribute a Modified Version of the Document under
|
||||||
|
the conditions of sections 2 and 3 above, provided that you release
|
||||||
|
the Modified Version under precisely this License, with the Modified
|
||||||
|
Version filling the role of the Document, thus licensing distribution
|
||||||
|
and modification of the Modified Version to whoever possesses a copy
|
||||||
|
of it. In addition, you must do these things in the Modified Version:
|
||||||
|
|
||||||
|
@enumerate A
|
||||||
|
@item
|
||||||
|
Use in the Title Page (and on the covers, if any) a title distinct
|
||||||
|
from that of the Document, and from those of previous versions
|
||||||
|
(which should, if there were any, be listed in the History section
|
||||||
|
of the Document). You may use the same title as a previous version
|
||||||
|
if the original publisher of that version gives permission.
|
||||||
|
|
||||||
|
@item
|
||||||
|
List on the Title Page, as authors, one or more persons or entities
|
||||||
|
responsible for authorship of the modifications in the Modified
|
||||||
|
Version, together with at least five of the principal authors of the
|
||||||
|
Document (all of its principal authors, if it has fewer than five),
|
||||||
|
unless they release you from this requirement.
|
||||||
|
|
||||||
|
@item
|
||||||
|
State on the Title page the name of the publisher of the
|
||||||
|
Modified Version, as the publisher.
|
||||||
|
|
||||||
|
@item
|
||||||
|
Preserve all the copyright notices of the Document.
|
||||||
|
|
||||||
|
@item
|
||||||
|
Add an appropriate copyright notice for your modifications
|
||||||
|
adjacent to the other copyright notices.
|
||||||
|
|
||||||
|
@item
|
||||||
|
Include, immediately after the copyright notices, a license notice
|
||||||
|
giving the public permission to use the Modified Version under the
|
||||||
|
terms of this License, in the form shown in the Addendum below.
|
||||||
|
|
||||||
|
@item
|
||||||
|
Preserve in that license notice the full lists of Invariant Sections
|
||||||
|
and required Cover Texts given in the Document's license notice.
|
||||||
|
|
||||||
|
@item
|
||||||
|
Include an unaltered copy of this License.
|
||||||
|
|
||||||
|
@item
|
||||||
|
Preserve the section Entitled ``History'', Preserve its Title, and add
|
||||||
|
to it an item stating at least the title, year, new authors, and
|
||||||
|
publisher of the Modified Version as given on the Title Page. If
|
||||||
|
there is no section Entitled ``History'' in the Document, create one
|
||||||
|
stating the title, year, authors, and publisher of the Document as
|
||||||
|
given on its Title Page, then add an item describing the Modified
|
||||||
|
Version as stated in the previous sentence.
|
||||||
|
|
||||||
|
@item
|
||||||
|
Preserve the network location, if any, given in the Document for
|
||||||
|
public access to a Transparent copy of the Document, and likewise
|
||||||
|
the network locations given in the Document for previous versions
|
||||||
|
it was based on. These may be placed in the ``History'' section.
|
||||||
|
You may omit a network location for a work that was published at
|
||||||
|
least four years before the Document itself, or if the original
|
||||||
|
publisher of the version it refers to gives permission.
|
||||||
|
|
||||||
|
@item
|
||||||
|
For any section Entitled ``Acknowledgements'' or ``Dedications'', Preserve
|
||||||
|
the Title of the section, and preserve in the section all the
|
||||||
|
substance and tone of each of the contributor acknowledgements and/or
|
||||||
|
dedications given therein.
|
||||||
|
|
||||||
|
@item
|
||||||
|
Preserve all the Invariant Sections of the Document,
|
||||||
|
unaltered in their text and in their titles. Section numbers
|
||||||
|
or the equivalent are not considered part of the section titles.
|
||||||
|
|
||||||
|
@item
|
||||||
|
Delete any section Entitled ``Endorsements''. Such a section
|
||||||
|
may not be included in the Modified Version.
|
||||||
|
|
||||||
|
@item
|
||||||
|
Do not retitle any existing section to be Entitled ``Endorsements'' or
|
||||||
|
to conflict in title with any Invariant Section.
|
||||||
|
|
||||||
|
@item
|
||||||
|
Preserve any Warranty Disclaimers.
|
||||||
|
@end enumerate
|
||||||
|
|
||||||
|
If the Modified Version includes new front-matter sections or
|
||||||
|
appendices that qualify as Secondary Sections and contain no material
|
||||||
|
copied from the Document, you may at your option designate some or all
|
||||||
|
of these sections as invariant. To do this, add their titles to the
|
||||||
|
list of Invariant Sections in the Modified Version's license notice.
|
||||||
|
These titles must be distinct from any other section titles.
|
||||||
|
|
||||||
|
You may add a section Entitled ``Endorsements'', provided it contains
|
||||||
|
nothing but endorsements of your Modified Version by various
|
||||||
|
parties---for example, statements of peer review or that the text has
|
||||||
|
been approved by an organization as the authoritative definition of a
|
||||||
|
standard.
|
||||||
|
|
||||||
|
You may add a passage of up to five words as a Front-Cover Text, and a
|
||||||
|
passage of up to 25 words as a Back-Cover Text, to the end of the list
|
||||||
|
of Cover Texts in the Modified Version. Only one passage of
|
||||||
|
Front-Cover Text and one of Back-Cover Text may be added by (or
|
||||||
|
through arrangements made by) any one entity. If the Document already
|
||||||
|
includes a cover text for the same cover, previously added by you or
|
||||||
|
by arrangement made by the same entity you are acting on behalf of,
|
||||||
|
you may not add another; but you may replace the old one, on explicit
|
||||||
|
permission from the previous publisher that added the old one.
|
||||||
|
|
||||||
|
The author(s) and publisher(s) of the Document do not by this License
|
||||||
|
give permission to use their names for publicity for or to assert or
|
||||||
|
imply endorsement of any Modified Version.
|
||||||
|
|
||||||
|
@item
|
||||||
|
COMBINING DOCUMENTS
|
||||||
|
|
||||||
|
You may combine the Document with other documents released under this
|
||||||
|
License, under the terms defined in section 4 above for modified
|
||||||
|
versions, provided that you include in the combination all of the
|
||||||
|
Invariant Sections of all of the original documents, unmodified, and
|
||||||
|
list them all as Invariant Sections of your combined work in its
|
||||||
|
license notice, and that you preserve all their Warranty Disclaimers.
|
||||||
|
|
||||||
|
The combined work need only contain one copy of this License, and
|
||||||
|
multiple identical Invariant Sections may be replaced with a single
|
||||||
|
copy. If there are multiple Invariant Sections with the same name but
|
||||||
|
different contents, make the title of each such section unique by
|
||||||
|
adding at the end of it, in parentheses, the name of the original
|
||||||
|
author or publisher of that section if known, or else a unique number.
|
||||||
|
Make the same adjustment to the section titles in the list of
|
||||||
|
Invariant Sections in the license notice of the combined work.
|
||||||
|
|
||||||
|
In the combination, you must combine any sections Entitled ``History''
|
||||||
|
in the various original documents, forming one section Entitled
|
||||||
|
``History''; likewise combine any sections Entitled ``Acknowledgements'',
|
||||||
|
and any sections Entitled ``Dedications''. You must delete all
|
||||||
|
sections Entitled ``Endorsements.''
|
||||||
|
|
||||||
|
@item
|
||||||
|
COLLECTIONS OF DOCUMENTS
|
||||||
|
|
||||||
|
You may make a collection consisting of the Document and other documents
|
||||||
|
released under this License, and replace the individual copies of this
|
||||||
|
License in the various documents with a single copy that is included in
|
||||||
|
the collection, provided that you follow the rules of this License for
|
||||||
|
verbatim copying of each of the documents in all other respects.
|
||||||
|
|
||||||
|
You may extract a single document from such a collection, and distribute
|
||||||
|
it individually under this License, provided you insert a copy of this
|
||||||
|
License into the extracted document, and follow this License in all
|
||||||
|
other respects regarding verbatim copying of that document.
|
||||||
|
|
||||||
|
@item
|
||||||
|
AGGREGATION WITH INDEPENDENT WORKS
|
||||||
|
|
||||||
|
A compilation of the Document or its derivatives with other separate
|
||||||
|
and independent documents or works, in or on a volume of a storage or
|
||||||
|
distribution medium, is called an ``aggregate'' if the copyright
|
||||||
|
resulting from the compilation is not used to limit the legal rights
|
||||||
|
of the compilation's users beyond what the individual works permit.
|
||||||
|
When the Document is included in an aggregate, this License does not
|
||||||
|
apply to the other works in the aggregate which are not themselves
|
||||||
|
derivative works of the Document.
|
||||||
|
|
||||||
|
If the Cover Text requirement of section 3 is applicable to these
|
||||||
|
copies of the Document, then if the Document is less than one half of
|
||||||
|
the entire aggregate, the Document's Cover Texts may be placed on
|
||||||
|
covers that bracket the Document within the aggregate, or the
|
||||||
|
electronic equivalent of covers if the Document is in electronic form.
|
||||||
|
Otherwise they must appear on printed covers that bracket the whole
|
||||||
|
aggregate.
|
||||||
|
|
||||||
|
@item
|
||||||
|
TRANSLATION
|
||||||
|
|
||||||
|
Translation is considered a kind of modification, so you may
|
||||||
|
distribute translations of the Document under the terms of section 4.
|
||||||
|
Replacing Invariant Sections with translations requires special
|
||||||
|
permission from their copyright holders, but you may include
|
||||||
|
translations of some or all Invariant Sections in addition to the
|
||||||
|
original versions of these Invariant Sections. You may include a
|
||||||
|
translation of this License, and all the license notices in the
|
||||||
|
Document, and any Warranty Disclaimers, provided that you also include
|
||||||
|
the original English version of this License and the original versions
|
||||||
|
of those notices and disclaimers. In case of a disagreement between
|
||||||
|
the translation and the original version of this License or a notice
|
||||||
|
or disclaimer, the original version will prevail.
|
||||||
|
|
||||||
|
If a section in the Document is Entitled ``Acknowledgements'',
|
||||||
|
``Dedications'', or ``History'', the requirement (section 4) to Preserve
|
||||||
|
its Title (section 1) will typically require changing the actual
|
||||||
|
title.
|
||||||
|
|
||||||
|
@item
|
||||||
|
TERMINATION
|
||||||
|
|
||||||
|
You may not copy, modify, sublicense, or distribute the Document
|
||||||
|
except as expressly provided under this License. Any attempt
|
||||||
|
otherwise to copy, modify, sublicense, or distribute it is void, and
|
||||||
|
will automatically terminate your rights under this License.
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your license
|
||||||
|
from a particular copyright holder is reinstated (a) provisionally,
|
||||||
|
unless and until the copyright holder explicitly and finally
|
||||||
|
terminates your license, and (b) permanently, if the copyright holder
|
||||||
|
fails to notify you of the violation by some reasonable means prior to
|
||||||
|
60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, receipt of a copy of some or all of the same material does
|
||||||
|
not give you any rights to use it.
|
||||||
|
|
||||||
|
@item
|
||||||
|
FUTURE REVISIONS OF THIS LICENSE
|
||||||
|
|
||||||
|
The Free Software Foundation may publish new, revised versions
|
||||||
|
of the GNU Free Documentation License from time to time. Such new
|
||||||
|
versions will be similar in spirit to the present version, but may
|
||||||
|
differ in detail to address new problems or concerns. See
|
||||||
|
@uref{http://www.gnu.org/copyleft/}.
|
||||||
|
|
||||||
|
Each version of the License is given a distinguishing version number.
|
||||||
|
If the Document specifies that a particular numbered version of this
|
||||||
|
License ``or any later version'' applies to it, you have the option of
|
||||||
|
following the terms and conditions either of that specified version or
|
||||||
|
of any later version that has been published (not as a draft) by the
|
||||||
|
Free Software Foundation. If the Document does not specify a version
|
||||||
|
number of this License, you may choose any version ever published (not
|
||||||
|
as a draft) by the Free Software Foundation. If the Document
|
||||||
|
specifies that a proxy can decide which future versions of this
|
||||||
|
License can be used, that proxy's public statement of acceptance of a
|
||||||
|
version permanently authorizes you to choose that version for the
|
||||||
|
Document.
|
||||||
|
|
||||||
|
@item
|
||||||
|
RELICENSING
|
||||||
|
|
||||||
|
``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any
|
||||||
|
World Wide Web server that publishes copyrightable works and also
|
||||||
|
provides prominent facilities for anybody to edit those works. A
|
||||||
|
public wiki that anybody can edit is an example of such a server. A
|
||||||
|
``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the
|
||||||
|
site means any set of copyrightable works thus published on the MMC
|
||||||
|
site.
|
||||||
|
|
||||||
|
``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0
|
||||||
|
license published by Creative Commons Corporation, a not-for-profit
|
||||||
|
corporation with a principal place of business in San Francisco,
|
||||||
|
California, as well as future copyleft versions of that license
|
||||||
|
published by that same organization.
|
||||||
|
|
||||||
|
``Incorporate'' means to publish or republish a Document, in whole or
|
||||||
|
in part, as part of another Document.
|
||||||
|
|
||||||
|
An MMC is ``eligible for relicensing'' if it is licensed under this
|
||||||
|
License, and if all works that were first published under this License
|
||||||
|
somewhere other than this MMC, and subsequently incorporated in whole
|
||||||
|
or in part into the MMC, (1) had no cover texts or invariant sections,
|
||||||
|
and (2) were thus incorporated prior to November 1, 2008.
|
||||||
|
|
||||||
|
The operator of an MMC Site may republish an MMC contained in the site
|
||||||
|
under CC-BY-SA on the same site at any time before August 1, 2009,
|
||||||
|
provided the MMC is eligible for relicensing.
|
||||||
|
|
||||||
|
@end enumerate
|
||||||
|
|
||||||
|
@page
|
||||||
|
@heading ADDENDUM: How to use this License for your documents
|
||||||
|
|
||||||
|
To use this License in a document you have written, include a copy of
|
||||||
|
the License in the document and put the following copyright and
|
||||||
|
license notices just after the title page:
|
||||||
|
|
||||||
|
@smallexample
|
||||||
|
@group
|
||||||
|
Copyright (C) @var{year} @var{your name}.
|
||||||
|
Permission is granted to copy, distribute and/or modify this document
|
||||||
|
under the terms of the GNU Free Documentation License, Version 1.3
|
||||||
|
or any later version published by the Free Software Foundation;
|
||||||
|
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
|
||||||
|
Texts. A copy of the license is included in the section entitled ``GNU
|
||||||
|
Free Documentation License''.
|
||||||
|
@end group
|
||||||
|
@end smallexample
|
||||||
|
|
||||||
|
If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
|
||||||
|
replace the ``with@dots{}Texts.''@: line with this:
|
||||||
|
|
||||||
|
@smallexample
|
||||||
|
@group
|
||||||
|
with the Invariant Sections being @var{list their titles}, with
|
||||||
|
the Front-Cover Texts being @var{list}, and with the Back-Cover Texts
|
||||||
|
being @var{list}.
|
||||||
|
@end group
|
||||||
|
@end smallexample
|
||||||
|
|
||||||
|
If you have Invariant Sections without Cover Texts, or some other
|
||||||
|
combination of the three, merge those two alternatives to suit the
|
||||||
|
situation.
|
||||||
|
|
||||||
|
If your document contains nontrivial examples of program code, we
|
||||||
|
recommend releasing these examples in parallel under your choice of
|
||||||
|
free software license, such as the GNU General Public License,
|
||||||
|
to permit their use in free software.
|
||||||
|
|
||||||
|
@c Local Variables:
|
||||||
|
@c ispell-local-pdict: "ispell-dict"
|
||||||
|
@c End:
|
||||||
146
doc/markam.texi
Normal file
146
doc/markam.texi
Normal file
|
|
@ -0,0 +1,146 @@
|
||||||
|
\input texinfo @c -*-texinfo-*-
|
||||||
|
@c %**start of header
|
||||||
|
@setfilename markam.info
|
||||||
|
@settitle markam User Manual
|
||||||
|
@c %**end of header
|
||||||
|
@copying
|
||||||
|
The user manual for markam.
|
||||||
|
|
||||||
|
Copyright @copyright{} 2012 Tom Willemsen
|
||||||
|
|
||||||
|
@quotation
|
||||||
|
Permission is granted to copy, distribute and/or modify this document
|
||||||
|
under the terms of the GNU Free Documentation License, Version 1.3
|
||||||
|
or any later version published by the Free Software Foundation;
|
||||||
|
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
|
||||||
|
A copy of the license is included in the section entitled ``GNU
|
||||||
|
Free Documentation License''.
|
||||||
|
|
||||||
|
A copy of the license is also available from the Free Software
|
||||||
|
Foundation Web site at @url{http://www.gnu.org/licenses/fdl.html}.
|
||||||
|
|
||||||
|
@end quotation
|
||||||
|
|
||||||
|
The document was typeset with
|
||||||
|
@uref{http://www.texinfo.org/, GNU Texinfo}.
|
||||||
|
|
||||||
|
@end copying
|
||||||
|
|
||||||
|
@titlepage
|
||||||
|
@title markam User Manual
|
||||||
|
@subtitle The user manual for markam
|
||||||
|
@author Tom Willemsen
|
||||||
|
@page
|
||||||
|
@vskip 0pt plus 1filll
|
||||||
|
@insertcopying
|
||||||
|
@end titlepage
|
||||||
|
|
||||||
|
@dircategory Individual utilities
|
||||||
|
@direntry
|
||||||
|
* Markam: (markam). Keeps bookmarks.
|
||||||
|
@end direntry
|
||||||
|
|
||||||
|
@c Output the table of the contents at the beginning.
|
||||||
|
@contents
|
||||||
|
|
||||||
|
@ifnottex
|
||||||
|
@node Top, Usage, (dir), (dir)
|
||||||
|
@top markam User Manual
|
||||||
|
|
||||||
|
@insertcopying
|
||||||
|
@end ifnottex
|
||||||
|
|
||||||
|
@c Generate the nodes for this menu with `C-c C-u C-m'.
|
||||||
|
@menu
|
||||||
|
* Usage:: How to use markam
|
||||||
|
* Copying This Manual::
|
||||||
|
* Index::
|
||||||
|
@end menu
|
||||||
|
|
||||||
|
@c Update all node entries with `C-c C-u C-n'.
|
||||||
|
@c Insert new nodes with `C-c C-c n'.
|
||||||
|
@node Usage, Copying This Manual, Top, Top
|
||||||
|
@chapter How to use
|
||||||
|
|
||||||
|
For the moment markam is a simple program, it has 3 functions.
|
||||||
|
|
||||||
|
@menu
|
||||||
|
* List:: List all
|
||||||
|
* Search:: Search
|
||||||
|
* Add:: Add/Store/Save
|
||||||
|
@end menu
|
||||||
|
|
||||||
|
@node List, Search, Usage, Usage
|
||||||
|
@section List all
|
||||||
|
|
||||||
|
In order to view a list of all your bookmarks you can use:
|
||||||
|
|
||||||
|
@example
|
||||||
|
markam
|
||||||
|
@end example
|
||||||
|
|
||||||
|
@noindent
|
||||||
|
This will show the list of all stored bookmarks, showing the URL, name
|
||||||
|
and description. This list is unsorted and unpaged.
|
||||||
|
|
||||||
|
@node Search, Add, List, Usage
|
||||||
|
@section Search
|
||||||
|
|
||||||
|
You can also search through your stored bookmarks by using the
|
||||||
|
@code{search} command:
|
||||||
|
|
||||||
|
@deffn Command search STRING
|
||||||
|
Search through the database for any bookmarks that either have
|
||||||
|
@var{string} as a tag or have @var{string} somewhere in its title.
|
||||||
|
@end deffn
|
||||||
|
|
||||||
|
@noindent
|
||||||
|
To perform a search for any bookmarks that have ``markam'' as a tag
|
||||||
|
and also any that have ``markam'' anywhere in their title you should
|
||||||
|
use:
|
||||||
|
|
||||||
|
@example
|
||||||
|
markam search markam
|
||||||
|
@end example
|
||||||
|
|
||||||
|
@node Add, , Search, Usage
|
||||||
|
@section Add/Store/Save
|
||||||
|
|
||||||
|
The last function is to add a new bookmark, which can be done with:
|
||||||
|
|
||||||
|
@example
|
||||||
|
markam http://example.org Example \
|
||||||
|
"Some description about Example" \
|
||||||
|
example some more tags
|
||||||
|
@end example
|
||||||
|
|
||||||
|
@noindent
|
||||||
|
This will store the bookmark with the URL of ``http://example.org'',
|
||||||
|
name ``Example'', description ``Some description about Example'' and
|
||||||
|
the tags ``example'', ``some'', ``more'' and ``tags''. Any arguments
|
||||||
|
following the description will be considered tags.
|
||||||
|
|
||||||
|
For the moment markam is rather stupid, assuming that all URLs start
|
||||||
|
with @code{http://} or @code{https://}, so other bookmarks can't be
|
||||||
|
added (yet).
|
||||||
|
|
||||||
|
@node Copying This Manual, Index, Usage, Top
|
||||||
|
@appendix Copying This Manual
|
||||||
|
|
||||||
|
@menu
|
||||||
|
* GNU Free Documentation License:: License for copying this manual.
|
||||||
|
@end menu
|
||||||
|
|
||||||
|
@c Get fdl.texi from http://www.gnu.org/licenses/fdl.html
|
||||||
|
@node GNU Free Documentation License, , Copying This Manual, Copying This Manual
|
||||||
|
@appendixsec
|
||||||
|
@include fdl.texi
|
||||||
|
|
||||||
|
@node Index, , Copying This Manual, Top
|
||||||
|
@unnumbered Index
|
||||||
|
|
||||||
|
@printindex cp
|
||||||
|
|
||||||
|
@bye
|
||||||
|
|
||||||
|
@c markam.texi ends here
|
||||||
1
hyde.scm
1
hyde.scm
|
|
@ -1 +0,0 @@
|
||||||
(use hyde)
|
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
;; -*- mode: scheme; -*-
|
|
||||||
((site-title . "Markam")
|
|
||||||
(menu-items-left
|
|
||||||
. (("Downloads" . "downloads.html")))
|
|
||||||
(menu-items-right
|
|
||||||
. (("Browse Source" .
|
|
||||||
"http://code.ryuslash.org/cgit.cgi/markam/")
|
|
||||||
("View README" .
|
|
||||||
"http://code.ryuslash.org/cgit.cgi/markam/about/")))
|
|
||||||
(print-item
|
|
||||||
. (lambda (mnu)
|
|
||||||
`(li (a (@ (href ,(cdr mnu))) ,(car mnu))))))
|
|
||||||
|
|
||||||
`((doctype-html)
|
|
||||||
(html (@ (lang "en"))
|
|
||||||
(head
|
|
||||||
(title ,($ 'site-title) ": " ,($ 'title))
|
|
||||||
(link (@ (rel "stylesheet") (type "text/css")
|
|
||||||
(href "css/bootstrap.min.css")))
|
|
||||||
(link (@ (rel "stylesheet") (type "text/css")
|
|
||||||
(href "css/extra.css"))))
|
|
||||||
(body
|
|
||||||
(div (@ (class "navbar navbar-static-top"))
|
|
||||||
(div (@ (class "container"))
|
|
||||||
(div (@ (class "container"))
|
|
||||||
(a (@ (href "index.html") (class "brand"))
|
|
||||||
,($ 'site-title))
|
|
||||||
(ul (@ (class "nav"))
|
|
||||||
,@(map (eval ($ 'print-item))
|
|
||||||
($ 'menu-items-left)))
|
|
||||||
(ul (@ (class "nav pull-right"))
|
|
||||||
,@(map (eval ($ 'print-item))
|
|
||||||
($ 'menu-items-right))))))
|
|
||||||
(div (@ (class "container"))
|
|
||||||
(div (@ (class "page-header"))
|
|
||||||
(h1 ,($ 'site-title)
|
|
||||||
(small ", " ,($ 'title))))
|
|
||||||
(inject ,contents)
|
|
||||||
(div (@ (class "centered"))
|
|
||||||
(small
|
|
||||||
"This site has been generated by "
|
|
||||||
(a (@ (href "http://wiki.call-cc.org/eggref/4/hyde"))
|
|
||||||
"Hyde") " and is powered by "
|
|
||||||
(a (@ (href "http://twitter.github.com/bootstrap/"))
|
|
||||||
"Bootstrap") " and "
|
|
||||||
(a (@ (href "http://glyphicons.com/"))
|
|
||||||
"Glyphicons") "."))))))
|
|
||||||
3
src/.gitignore
vendored
Normal file
3
src/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
markam-convert
|
||||||
|
markam
|
||||||
|
*.o
|
||||||
47
src/Makefile
Normal file
47
src/Makefile
Normal file
|
|
@ -0,0 +1,47 @@
|
||||||
|
# Copyright (C) 2012, 2013 Tom Willemsen
|
||||||
|
#
|
||||||
|
# This file is part of Markam
|
||||||
|
#
|
||||||
|
# Markam is free software: you can redistribute it and/or modify it
|
||||||
|
# under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# Markam is distributed in the hope that it will be useful, but
|
||||||
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
# General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with Markam. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
DESTDIR ?= /usr/local
|
||||||
|
CSC = csc
|
||||||
|
|
||||||
|
binaries = markam markam-convert
|
||||||
|
install-binaries = $(addprefix install-,$(binaries))
|
||||||
|
uninstall-binaries = $(addprefix uninstall-,$(binaries))
|
||||||
|
objects = paths.o common.o
|
||||||
|
|
||||||
|
.PHONY: all install $(install-binaries) uninstall $(uninstall-binaries) \
|
||||||
|
install-strip
|
||||||
|
|
||||||
|
all: $(binaries)
|
||||||
|
install: $(install-binaries)
|
||||||
|
uninstall: $(uninstall-binaries)
|
||||||
|
install-strip:
|
||||||
|
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
|
||||||
|
|
||||||
|
markam: markam.scm $(objects)
|
||||||
|
$(CSC) $^ -o $@
|
||||||
|
|
||||||
|
markam-convert: markam-convert.scm $(objects)
|
||||||
|
$(CSC) $^ -o $@
|
||||||
|
|
||||||
|
$(install-binaries): install-%: %
|
||||||
|
$(INSTALL_PROGRAM) $* "$(DESTDIR)/bin/$*"
|
||||||
|
|
||||||
|
$(uninstall-binaries): uninstall-%:
|
||||||
|
rm -f "$(DESTDIR)/bin/$*"
|
||||||
|
|
||||||
|
$(objects): %.o: %.scm
|
||||||
|
$(CSC) -c $^
|
||||||
32
src/common.scm
Normal file
32
src/common.scm
Normal file
|
|
@ -0,0 +1,32 @@
|
||||||
|
;;; markam -- Store/retrieve/manage bookmarks
|
||||||
|
;; Copyright (C) 2012, 2013 Tom Willemsen <tom at ryuslash dot org>
|
||||||
|
|
||||||
|
;; This file is part of Markam
|
||||||
|
|
||||||
|
;; Markam is free software: you can redistribute it and/or modify it
|
||||||
|
;; under the terms of the GNU General Public License as published by
|
||||||
|
;; the Free Software Foundation, either version 3 of the License, or
|
||||||
|
;; (at your option) any later version.
|
||||||
|
;;
|
||||||
|
;; Markam is distributed in the hope that it will be useful, but
|
||||||
|
;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
;; General Public License for more details.
|
||||||
|
;;
|
||||||
|
;; You should have received a copy of the GNU General Public License
|
||||||
|
;; along with Markam. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
;;; Commentary:
|
||||||
|
|
||||||
|
;; Common variables and procedures, used by several or all parts of
|
||||||
|
;; this program.
|
||||||
|
|
||||||
|
;;; Code:
|
||||||
|
|
||||||
|
(declare (unit common))
|
||||||
|
|
||||||
|
(define version "0.1.0")
|
||||||
|
|
||||||
|
(define (display-version)
|
||||||
|
;; Display markam's version number.
|
||||||
|
(format #t "markam version ~a~%" version))
|
||||||
9
src/css/bootstrap.min.css
vendored
9
src/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +0,0 @@
|
||||||
((title . "extra"))
|
|
||||||
|
|
||||||
'(css ((= class centered)
|
|
||||||
(text-align center)))
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
;; -*- mode: scheme; -*-
|
|
||||||
((title . "downloads")
|
|
||||||
(versions . ("master" "0.2.0" "0.1.0")))
|
|
||||||
|
|
||||||
`((ul
|
|
||||||
,@(map (lambda (version)
|
|
||||||
`(li ,version ": "
|
|
||||||
(a (@ (href "http://code.ryuslash.org/cgit.cgi/markam/snapshot/markam-"
|
|
||||||
,version ".tar.gz"))
|
|
||||||
"tar.gz")
|
|
||||||
", "
|
|
||||||
(a (@ (href "http://code.ryuslash.org/cgit.cgi/markam/snapshot/markam-"
|
|
||||||
,version ".zip"))
|
|
||||||
"zip")))
|
|
||||||
($ 'versions))))
|
|
||||||
|
|
@ -1,75 +0,0 @@
|
||||||
;; -*- mode: scheme; -*-
|
|
||||||
((title . "store bookmarks")
|
|
||||||
(conkeror . (a (@ (href "http://conkeror.org")) "Conkeror"))
|
|
||||||
(chicken . (a (@ (href "http://call-cc.org")) "CHICKEN scheme"))
|
|
||||||
(chicken-sqlite . (a (@ (href "http://wiki.call-cc.org/eggref/4/sqlite3")) "sqlite3"))
|
|
||||||
(tar-gz
|
|
||||||
. "http://code.ryuslash.org/cgit.cgi/markam/snapshot/markam-0.2.0.tar.gz")
|
|
||||||
(zip
|
|
||||||
. "http://code.ryuslash.org/cgit.cgi/markam/snapshot/markam-0.2.0.zip")
|
|
||||||
(dev-tar-gz
|
|
||||||
. "http://code.ryuslash.org/cgit.cgi/markam/snapshot/markam-master.tar.gz")
|
|
||||||
(dev-zip
|
|
||||||
. "http://code.ryuslash.org/cgit.cgi/markam/snapshot/markam-master.zip"))
|
|
||||||
|
|
||||||
`((div (@ (class "hero-unit"))
|
|
||||||
(p "Store bookmarks without being stuck to a single browser.")
|
|
||||||
(div (@ (class "row"))
|
|
||||||
(div (@ (class "span3 centered"))
|
|
||||||
(h3 "Version")
|
|
||||||
"0.2.0")
|
|
||||||
(div (@ (class "span4 centered"))
|
|
||||||
(h3 "Language")
|
|
||||||
,($ 'chicken))
|
|
||||||
(div (@ (class "span3 centered"))
|
|
||||||
(h3 "License")
|
|
||||||
"GPLv3")))
|
|
||||||
(div (@ (class "row"))
|
|
||||||
(div (@ (class "span6"))
|
|
||||||
(h2 "Features")
|
|
||||||
(ul
|
|
||||||
(li "Save and tag bookmarks.")
|
|
||||||
(li "Search bookmarks by title and tags.")
|
|
||||||
(li "Use it directly from " ,($ 'conkeror) ":"
|
|
||||||
(ul
|
|
||||||
(li "Save the current website or a link on the "
|
|
||||||
"current page.")
|
|
||||||
(li "Search through saved bookmarks and open one "
|
|
||||||
"directly, either in the current window or a new "
|
|
||||||
"one.")))))
|
|
||||||
(div (@ (class "span6"))
|
|
||||||
(h2 "Dependencies")
|
|
||||||
(dl
|
|
||||||
(dt ,($ 'chicken))
|
|
||||||
(dd "Markam has been developed with Version 4.8.0.1, but "
|
|
||||||
"if it doesn't work with your version of "
|
|
||||||
,($ 'chicken) ", please let me know. It also requires "
|
|
||||||
"the " ,($ 'chicken-sqlite) " egg.")
|
|
||||||
(dt ,($ 'conkeror) " (optional)")
|
|
||||||
(dd "The latest git version is required. Though this is "
|
|
||||||
"only relevant if you want to use markam with "
|
|
||||||
"conkeror."))))
|
|
||||||
(h2 "Download")
|
|
||||||
(div (@ (class "row"))
|
|
||||||
(div (@ (class "span6"))
|
|
||||||
(h3 "Latest version"))
|
|
||||||
(div (@ (class "span6"))
|
|
||||||
(h3 "Development version")))
|
|
||||||
(div (@ (class "row"))
|
|
||||||
(div (@ (class "span6"))
|
|
||||||
(a (@ (href ,($ 'tar-gz))
|
|
||||||
(class "btn btn-large btn-block"))
|
|
||||||
"Download 0.2.0 .tar.gz")
|
|
||||||
(a (@ (href ,($ 'zip))
|
|
||||||
(class "btn btn-large btn-block"))
|
|
||||||
"Download 0.2.0 .zip"))
|
|
||||||
(div (@ (class "span6"))
|
|
||||||
(a (@ (href ,($ 'dev-tar-gz))
|
|
||||||
(class "btn btn-large btn-block"))
|
|
||||||
"Download .tar.gz")
|
|
||||||
(a (@ (href ,($ 'dev-zip))
|
|
||||||
(class "btn btn-large btn-block"))
|
|
||||||
"Download .zip")))
|
|
||||||
(hr)
|
|
||||||
(h2 "More...")
|
|
||||||
(p "For more information please read the README."))
|
|
||||||
118
src/markam-convert.scm
Normal file
118
src/markam-convert.scm
Normal file
|
|
@ -0,0 +1,118 @@
|
||||||
|
;;; markam -- Store/retrieve/manage bookmarks
|
||||||
|
;; Copyright (C) 2012, 2013 Tom Willemsen <tom at ryuslash dot org>
|
||||||
|
|
||||||
|
;; This file is part of Markam
|
||||||
|
|
||||||
|
;; Markam is free software: you can redistribute it and/or modify it
|
||||||
|
;; under the terms of the GNU General Public License as published by
|
||||||
|
;; the Free Software Foundation, either version 3 of the License, or
|
||||||
|
;; (at your option) any later version.
|
||||||
|
;;
|
||||||
|
;; Markam is distributed in the hope that it will be useful, but
|
||||||
|
;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
;; General Public License for more details.
|
||||||
|
;;
|
||||||
|
;; You should have received a copy of the GNU General Public License
|
||||||
|
;; along with Markam. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
;;; Commentary:
|
||||||
|
|
||||||
|
;; Convert any old database file to one usable with this version of
|
||||||
|
;; markam. If you're just starting to use markam there should be
|
||||||
|
;; no need to use this.
|
||||||
|
|
||||||
|
;;; Code:
|
||||||
|
|
||||||
|
(declare (uses paths
|
||||||
|
common))
|
||||||
|
#+chicken-script
|
||||||
|
(begin
|
||||||
|
(load "paths")
|
||||||
|
(load "common"))
|
||||||
|
|
||||||
|
(require-extension sqlite3)
|
||||||
|
(require-library srfi-4)
|
||||||
|
|
||||||
|
(define (blob->seconds blob)
|
||||||
|
;; Convert BLOB to an integer representing the seconds since
|
||||||
|
;; 01-01-1970 (standard unix timstamp). This has to be done because
|
||||||
|
;; in the previous version of markam I stored the timestamp as a
|
||||||
|
;; blob and CHICKEN doesn't seem to like blobs much.
|
||||||
|
(if (u32vector? blob)
|
||||||
|
(u32vector-ref (blob->u32vector blob) 0)
|
||||||
|
0))
|
||||||
|
|
||||||
|
(define (convert-table db name converter #!optional select)
|
||||||
|
;; Convert NAME from DB using CONVERTER for each specific row. The
|
||||||
|
;; optional SELECT should be an SQL query that will be used to fetch
|
||||||
|
;; the rows to convert.
|
||||||
|
(let ((count (first-result db (string-append "SELECT COUNT(*) FROM " name)))
|
||||||
|
(progress 0))
|
||||||
|
(for-each-row (lambda args
|
||||||
|
(apply converter args)
|
||||||
|
(set! progress (+ progress 1))
|
||||||
|
(format #t "Converted ~s of ~s ~a rows\r~!" progress count name))
|
||||||
|
db (or select (string-append "SELECT * FROM " name)))
|
||||||
|
(newline)))
|
||||||
|
|
||||||
|
(define (convert)
|
||||||
|
;; Convert an old database into a new one and then replace the old
|
||||||
|
;; with the new.
|
||||||
|
(let ((old-db (open-database (data-file "linkwave.db" "linkwave")))
|
||||||
|
(new-db (open-database (data-file "markam.db"))))
|
||||||
|
(execute new-db "CREATE TABLE bookmark (url VARCHAR(255) UNIQUE, date INTEGER, name VARCHAR(255), description TEXT)")
|
||||||
|
(execute new-db "CREATE TABLE tag (name VARCHAR(255) UNIQUE)")
|
||||||
|
(execute new-db "CREATE TABLE bookmark_tag (bookmark_id INTEGER REFERENCES bookmark(rowid), tag_id INTEGER REFERENCES tag(rowid), PRIMARY KEY (bookmark_id, tag_id))")
|
||||||
|
|
||||||
|
(convert-table old-db "bookmark"
|
||||||
|
(lambda (url dateblob name description)
|
||||||
|
(execute new-db "INSERT INTO bookmark VALUES (?, ?, ?, ?)"
|
||||||
|
url (blob->seconds dateblob) name description)))
|
||||||
|
|
||||||
|
(convert-table old-db "tag"
|
||||||
|
(lambda (name)
|
||||||
|
(execute new-db "INSERT INTO tag VALUES (?)" name)))
|
||||||
|
|
||||||
|
(convert-table old-db "bookmark_tag"
|
||||||
|
(lambda (url tag)
|
||||||
|
(execute new-db "INSERT INTO bookmark_tag VALUES (?, ?)"
|
||||||
|
(first-result new-db "SELECT rowid FROM bookmark WHERE url = ?" url)
|
||||||
|
(first-result new-db "SELECT rowid FROM tag WHERE name = ?" tag)))
|
||||||
|
"SELECT url, name FROM bookmark_tag JOIN tag ON (tag_id = tag.rowid)")
|
||||||
|
|
||||||
|
(format #t "Database converted.~%")))
|
||||||
|
|
||||||
|
(define (display-help)
|
||||||
|
;; Display markam's help message.
|
||||||
|
(format #t (string-append
|
||||||
|
"Usage: markam-convert [options]...~%"
|
||||||
|
"~%"
|
||||||
|
"Possible options:~%"
|
||||||
|
"~%"
|
||||||
|
"--help, -h Display this help and exit~%"
|
||||||
|
"--version, -v Output version information and exit~%")))
|
||||||
|
|
||||||
|
(define (main args)
|
||||||
|
;; Convert an old database file unless a conversion database already
|
||||||
|
;; exists.
|
||||||
|
(if (null? args)
|
||||||
|
(if (file-exists? (data-file "markam.db"))
|
||||||
|
(format #t (string-append "Converted database already exists, or something may have gone "
|
||||||
|
"wrong during the last run~%"))
|
||||||
|
(convert))
|
||||||
|
(do ((arg (car args) (and (not (null? args))
|
||||||
|
(car args))))
|
||||||
|
((or (null? arg) (not arg)))
|
||||||
|
(cond
|
||||||
|
((or (string= arg "-v") (string= arg "--version"))
|
||||||
|
(display-version)
|
||||||
|
(exit 0))
|
||||||
|
((or (string= arg "-h") (string= arg "--help"))
|
||||||
|
(display-help)
|
||||||
|
(exit 0))
|
||||||
|
(else
|
||||||
|
(format #t "Unrecognized option: ~a~%" (car args))))
|
||||||
|
(set! args (cdr args)))))
|
||||||
|
|
||||||
|
(main (command-line-arguments))
|
||||||
155
src/markam.scm
Normal file
155
src/markam.scm
Normal file
|
|
@ -0,0 +1,155 @@
|
||||||
|
;;; markam -- Store/retrieve/manage bookmarks
|
||||||
|
;; Copyright (C) 2012,2013 Tom Willemsen <tom at ryuslash dot org>
|
||||||
|
|
||||||
|
;; This program is free software: you can redistribute it and/or modify
|
||||||
|
;; it under the terms of the GNU General Public License as published by
|
||||||
|
;; the Free Software Foundation, either version 3 of the License, or
|
||||||
|
;; (at your option) any later version.
|
||||||
|
|
||||||
|
;; This program is distributed in the hope that it will be useful,
|
||||||
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
;; GNU General Public License for more details.
|
||||||
|
|
||||||
|
;; You should have received a copy of the GNU General Public License
|
||||||
|
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
;;; Commentary:
|
||||||
|
|
||||||
|
;; The main program. For documentation you should consult the
|
||||||
|
;; README.org and/or any Texinfo documentation provided.
|
||||||
|
|
||||||
|
;;; Code:
|
||||||
|
|
||||||
|
(declare (uses paths
|
||||||
|
common))
|
||||||
|
|
||||||
|
(require-extension sqlite3)
|
||||||
|
(require-library posix srfi-4)
|
||||||
|
|
||||||
|
(define version "0.1.0")
|
||||||
|
|
||||||
|
;; If STR contains a \0 byte at the end, remove it, otherwise return
|
||||||
|
;; STR unchanged.
|
||||||
|
(: string-no-null (string -> string))
|
||||||
|
(define (string-no-null str)
|
||||||
|
(if (and (> (string-length str) 0)
|
||||||
|
(char=? (string-ref str (- (string-length str) 1)) #\nul))
|
||||||
|
(substring str 0 (- (string-length str) 1))
|
||||||
|
str))
|
||||||
|
|
||||||
|
;; Print URL, SECONDS, NAME and DESCRIPTION to the standard output
|
||||||
|
;; stream.
|
||||||
|
(: print-row (string fixnum string string -> void))
|
||||||
|
(define (print-row url seconds name description)
|
||||||
|
(if script?
|
||||||
|
(format #t "~a ~a ~a "
|
||||||
|
(string-no-null name) (string-no-null description)
|
||||||
|
(string-no-null url))
|
||||||
|
(format #t "~a~% ~a~% ~a~% ~a~%~%" (string-no-null name)
|
||||||
|
(string-no-null description) (string-no-null url)
|
||||||
|
(seconds->string seconds))))
|
||||||
|
|
||||||
|
;; Add NAME to the `tag' table in DB.
|
||||||
|
(define (add-tag db name)
|
||||||
|
(execute db "INSERT INTO tag VALUES (?)" name)
|
||||||
|
(last-insert-rowid db))
|
||||||
|
|
||||||
|
;; Add a bookmark to the `bookmark' table in DB. URL is the url of the
|
||||||
|
;; bookmark, NAME the title, DESCRIPTION a (possibly longer)
|
||||||
|
;; description of the bookmark and TAGS is a list of tags to assign to
|
||||||
|
;; it. Each tag will be created if necessary.
|
||||||
|
(define (add-bookmark db url name description tags)
|
||||||
|
(execute db "INSERT INTO bookmark VALUES (?, STRFTIME('%s'), ?, ?)"
|
||||||
|
url name description)
|
||||||
|
(let ((bookmark-id (last-insert-rowid db)))
|
||||||
|
(for-each (lambda (tag)
|
||||||
|
(let ((tag-id '()))
|
||||||
|
(condition-case
|
||||||
|
(set! tag-id
|
||||||
|
(first-result
|
||||||
|
db "SELECT rowid FROM tag WHERE name = ?" tag))
|
||||||
|
(exn (exn sqlite3)
|
||||||
|
(if (eq? (get-condition-property
|
||||||
|
exn 'sqlite3 'status) 'done)
|
||||||
|
(set! tag-id (add-tag db tag))
|
||||||
|
(signal exn))))
|
||||||
|
(execute db "INSERT INTO bookmark_tag VALUES (?, ?)"
|
||||||
|
bookmark-id tag-id)))
|
||||||
|
tags)))
|
||||||
|
|
||||||
|
(define (search-bookmarks db str)
|
||||||
|
(for-each-row print-row db #<<END
|
||||||
|
SELECT *
|
||||||
|
FROM bookmark
|
||||||
|
WHERE name LIKE ?
|
||||||
|
OR ? IN (SELECT name
|
||||||
|
FROM tag
|
||||||
|
JOIN bookmark_tag ON (tag_id = tag.rowid)
|
||||||
|
WHERE bookmark_id = bookmark.rowid)
|
||||||
|
END
|
||||||
|
(string-append "%" str "%") str))
|
||||||
|
|
||||||
|
;; Is STR a URL? Very naïve, assumes all URLs begin with either
|
||||||
|
;; `http://' or `https://', should be improved.
|
||||||
|
(define (url-string? str)
|
||||||
|
(and (> (string-length str) 7)
|
||||||
|
(or (string= (substring str 0 7) "http://")
|
||||||
|
(string= (substring str 0 8) "https://"))))
|
||||||
|
|
||||||
|
;; Display markam's help message.
|
||||||
|
(define (display-help)
|
||||||
|
(format #t (string-append
|
||||||
|
"Usage: markam [options]...~%"
|
||||||
|
" markam <url> <name> <description> [<tag>...]~%"
|
||||||
|
"~%"
|
||||||
|
"Possible options:~%"
|
||||||
|
"~%"
|
||||||
|
"--help, -h Display this help and exit~%"
|
||||||
|
"--version, -v Output version information and exit~%")))
|
||||||
|
|
||||||
|
;; Parse "other" command-line arguments
|
||||||
|
(define (handle-regular-args args)
|
||||||
|
(do ((arg (car args) (and (not (null? args))
|
||||||
|
(car args))))
|
||||||
|
((or (null? arg) (not arg)))
|
||||||
|
(cond
|
||||||
|
((or (string= arg "-v") (string= arg "--version"))
|
||||||
|
(display-version)
|
||||||
|
(exit 0))
|
||||||
|
((or (string= arg "-h") (string= arg "--help"))
|
||||||
|
(display-help)
|
||||||
|
(exit 0))
|
||||||
|
(else
|
||||||
|
(format #t "Unrecognized option: ~a~%" (car args))))
|
||||||
|
(set! args (cdr args))))
|
||||||
|
|
||||||
|
(define (check-script args)
|
||||||
|
(if (member "--script" args)
|
||||||
|
(begin
|
||||||
|
(set! script? #t)
|
||||||
|
(delete "--script" args))
|
||||||
|
args))
|
||||||
|
|
||||||
|
(define script? #f)
|
||||||
|
|
||||||
|
;; Open a database connection, list bookmarks, create a bookmark or
|
||||||
|
;; pass arguments on to `handle-regular-args'.
|
||||||
|
(define (main args)
|
||||||
|
(set! args (check-script args))
|
||||||
|
(let ((db (open-database (data-file "markam.db"))))
|
||||||
|
(cond
|
||||||
|
((null? args)
|
||||||
|
(for-each-row print-row db "select * from bookmark"))
|
||||||
|
((url-string? (car args))
|
||||||
|
(with-transaction
|
||||||
|
db (lambda ()
|
||||||
|
(add-bookmark
|
||||||
|
db (car args) (cadr args) (caddr args) (cdddr args)) #t)))
|
||||||
|
((string= (car args) "search")
|
||||||
|
(search-bookmarks db (cadr args)))
|
||||||
|
(else
|
||||||
|
(handle-regular-args args)))
|
||||||
|
(finalize! db #t)))
|
||||||
|
|
||||||
|
(main (command-line-arguments))
|
||||||
47
src/paths.scm
Normal file
47
src/paths.scm
Normal file
|
|
@ -0,0 +1,47 @@
|
||||||
|
;;; markam -- Store/retrieve/manage bookmarks
|
||||||
|
;; Copyright (C) 2012, 2013 Tom Willemsen <tom at ryuslash dot org>
|
||||||
|
|
||||||
|
;; This file is part of Markam
|
||||||
|
|
||||||
|
;; Markam is free software: you can redistribute it and/or modify it
|
||||||
|
;; under the terms of the GNU General Public License as published by
|
||||||
|
;; the Free Software Foundation, either version 3 of the License, or
|
||||||
|
;; (at your option) any later version.
|
||||||
|
;;
|
||||||
|
;; Markam is distributed in the hope that it will be useful, but
|
||||||
|
;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
;; General Public License for more details.
|
||||||
|
;;
|
||||||
|
;; You should have received a copy of the GNU General Public License
|
||||||
|
;; along with Markam. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
;;; Commentary:
|
||||||
|
|
||||||
|
;; Path-related functions.
|
||||||
|
|
||||||
|
;;; Code:
|
||||||
|
|
||||||
|
(declare (unit paths))
|
||||||
|
|
||||||
|
(define (stored-file xdg-env file #!optional dir)
|
||||||
|
;; Get FILE either from `XDG-ENV/markam/' or from `$HOME/.markam/'.
|
||||||
|
;; Prefer any existing file over any other, but prefer files using
|
||||||
|
;; XDG-ENV over `$HOME'.
|
||||||
|
(let* ((xdg (get-environment-variable xdg-env))
|
||||||
|
(dir (or dir "markam"))
|
||||||
|
(stored-file (string-append (get-environment-variable "HOME") "/." dir "/" file)))
|
||||||
|
(unless (or (file-exists? stored-file) (not xdg))
|
||||||
|
(set! stored-file (string-append xdg "/" dir "/" file)))
|
||||||
|
stored-file))
|
||||||
|
|
||||||
|
(define (config-file file)
|
||||||
|
;; Use `stored-file' to get configuration file FILE. Configuration
|
||||||
|
;; files are stored under `$XDG_CONFIG_HOME' if the XDG standard is
|
||||||
|
;; used.
|
||||||
|
(stored-file "XDG_CONFIG_HOME" file))
|
||||||
|
|
||||||
|
(define (data-file file #!optional dir)
|
||||||
|
;; Use `stored-file' to get data file FILE. Data files are stored
|
||||||
|
;; under `$XDG_DATA_HOME' if the XDG standard is used.
|
||||||
|
(stored-file "XDG_DATA_HOME" file dir))
|
||||||
Loading…
Reference in a new issue