Commit Graph

60 Commits

Author SHA1 Message Date
Alex Schroeder
b44202933a (TocAfterApplyRule): Removed as a rule to be on
@MyAfterApplyRules.
(NewTocApplyRules): Moved code here and rewrote such as not to use
references where necessary.
2008-12-08 01:13:16 +00:00
Alex Schroeder
96d9b888e5 * wiki.pl (PrintWikiToHTML): Moved "@MyBeforeApplyRules"-specific
code into the ApplyRules() routine. This corrects a number of
subtle issues with the Crossbar module: especially, the Crossbar
module's erroneous handling of uploaded files. (Thanks, Ingo
Belka!)
* modules/crossbar.pl (CrossbarBeforeApplyRule): Corrected this
module's erroneous handling of uploaded files.
(RunMyRulesTocCrossbar): New function, offloading a Crossbar-
specific hack from "toc.pl" into this file. (This is still...
slightly hacky, but a bit better.)
* modules/toc.pl (TocRule): Allowed more than one table of contents
per page. Before, this module only recognized the first "<toc...>"
markup for a Wiki page: all subsequent "<toc...>" markup for that
page was studiously ignored. Correcting this improves integration
with the Crossbar module.
(RunMyRulesToc): Removed a Crossbar-specific hack.
(TocAfterApplyRule): Allowed more than one table of contents.
($TocIsApplyingAutomaticRules): New option, providing slightly
finer-grained control over Table of Contents handling.
2008-12-03 11:46:48 +00:00
Alex Schroeder
67e80f3960 * modules/toc.pl (TocRule): Corrected a minor issue re: integration
with the Sidebar and Crossbar modules.
2008-11-24 03:48:17 +00:00
Alex Schroeder
bbfdf96d5b * modules/crossbar.pl: New module. Provides a sustainable
replacement for the Sidebar module, for all Sidebar users
requiring a cleaner integration of that module with other modules
such as "toc.pl" and "footnotes.pl". This new module also improves
Sidebar customizability by permitting users to place the "Crossbar"
at any position in any page.
* modules/forms.pl (FormsRules): Generalized so as to support both
the Sidebar and Crossbar modules.
* modules/toc.pl (RunMyRulesToc): Generalized so as to support both
the Sidebar and Crossbar modules.
* t/crossbar.t: New test suite, testing the Crossbar module.
2008-11-23 22:13:29 +00:00
Alex Schroeder
dca2a6af50 * wiki.pl (PrintWikiToHTML): Slightly reordered function calls,
so as to optimize a few edge cases.
2008-11-16 01:00:04 +00:00
Alex Schroeder
d1f0e9ebe4 * modules/sidebar.pl: Refactored. This is a complete rewrite
removing all previous module-specific hacks. However, as it is a
rewrite, it may still have issues. (Fortunately, time is the mother
of invention and bug fixes.)
* modules/toc.pl: Refactored. This is a complete rewrite
removing all previous module-specific hacks. As with "sidebar.pl",
it may still have issues. That said -- I'm relatively proud of it,
and confident that it (should) stand up under rigorous scrutinies,
utilization, and brutalization.
* modules/forms.pl (FormsRule): Slightly revised, so as to comply
with the "sidebar.pl" refactoring.
2008-11-15 12:48:13 +00:00
Alex Schroeder
1bddaf7b93 * modules/toc.pl (TocInit): Context-sensitively set the
"$TocConvertH1TagsToH2Tags" option, if not already set.
Basically, we only need the option enabled when the Usemod
markup module is also installed.
2008-11-05 10:11:48 +00:00
Alex Schroeder
03de875729 * modules/toc.pl ($TocIsConvertingH1TagsToH2Tags): Renamed from
"$TocConvertH1TagsToH2Tags".
2008-11-05 06:19:18 +00:00
Alex Schroeder
9e1905b9dd * modules/toc.pl ($TocConvertH1TagsToH2Tags): New option.
(TocRule): Use the new option; principally, this permits Wiki
administrators to prevent this module from converting
"<h1>...</h1>" tags "<h2>...</h2>" tags.
2008-11-05 03:30:04 +00:00
Alex Schroeder
347abd8dba (TocRule, TocHeadings): Make sure no h1 headers
can be generated. This makes sure that the headings work just like
they do in the UseMod markup extension.
2008-10-25 16:31:26 +00:00
Alex Schroeder
217b9e22f7 * modules/toc.pl: New perldoc-style documentation.
($TocHeaderText): New option.
(TocPageHtml): Introduced a Footnotes extension-specific hack, so
as to circumvent footnote indexing errors after generating the
table of contents.
2008-09-29 03:14:39 +00:00
Alex Schroeder
9000850599 (TocHeadings): No idea why this solves the
problem with disappearing TOC. TocProcessing is allowed one more
level of recursion.
2007-11-14 22:06:05 +00:00
Alex Schroeder
b4c0f0a9ec Fix $ModulesDescription 2007-10-29 02:27:15 +00:00
Alex Schroeder
dfb1751748 (TocHeadings, TocPageHtml): Use TocPageHtml
instead of PageHtml. There, localize the HTML cache to make sure
the updated cache will in fact get saved.
2007-08-29 13:51:36 +00:00
Alex Schroeder
e1128e32d3 (TocRule): Add explanation. Renamed $key to
$id_required.
(TocHeadings): Use $TocPage as the template for the TOC.
2007-08-17 16:03:09 +00:00
Alex Schroeder
578c8fd179 Fix license. 2007-08-17 00:31:33 +00:00
Alex Schroeder
cce733196c Switch to GPLv3 2007-08-17 00:28:10 +00:00
Alex Schroeder
5f6abd07ab (TocInit): Moved some init code here. 2007-08-17 00:24:14 +00:00
Alex Schroeder
90511ec5a8 (TocHeadings): Major overhaul using a call to
PageHtml() to generate the HTML of the page without table of
contents, extracting the generated HTML headings, producing the
table of contents, and finish generating the real HTML of the
page.
2007-08-12 23:43:15 +00:00
Alex Schroeder
f341742315 (TocRule, TocHeadings): Accept classes for <toc>
tag.
2007-02-15 21:58:02 +00:00
Alex Schroeder
7c0bdbe25b (TocInit): New.
(TocRule, TocHeadings): Simplify the code so that id attributes
are only generated for the "main" page (the one returned by
GetId).
2007-02-09 21:52:45 +00:00
Alex Schroeder
37b13207c3 Updated copyright year. 2007-01-14 16:30:09 +00:00
Alex Schroeder
3f8c2acca9 (TocRule): Make it compatible with creole.pl. 2007-01-12 20:57:48 +00:00
Alex Schroeder
2a2da63d1a ($TocAutomatic): Reset the default to 1, so that
all the relevant tests don't fail.
2006-12-27 22:06:30 +00:00
Alex Schroeder
185839112a Typo in german-utf8.pl 2006-10-30 11:19:17 +00:00
Alex Schroeder
c6363fb87a set $key.
(TocHeadings): Use $key.
2006-08-06 23:18:14 +00:00
Alex Schroeder
29d74cb970 (TocRule): Support headers markup headers if
headers.pl is loaded. Only support usemod markup headers if
usemod.pl is loaded.
(TocHeadings): Transform headers.pl headers into
usemod.pl headers so that the TOC can be generated correctly.
2006-07-14 07:16:59 +00:00
Alex Schroeder
b596a62919 update copyright years 2006-06-04 21:31:27 +00:00
Alex Schroeder
6c26b38619 (TocHeadings): Add markup module escaping rules. 2006-05-26 07:48:33 +00:00
Alex Schroeder
367d5ca826 (TocHeadings): Fix usemod escaping rules. 2006-05-26 07:35:43 +00:00
Alex Schroeder
b15c0eac5f (TocRule): Skip the a element inside headings. 2006-03-16 19:22:53 +00:00
Alex Schroeder
413fdfe665 (TocRule): Prevent H1. 2005-12-28 01:51:28 +00:00
Alex Schroeder
4bd155f3ab (TocRule, TocHeadings): Change how anchor names are determined to
rule out conflicts with included pages such as the sidebar.
2005-12-08 12:42:36 +00:00
Alex Schroeder
da80d7cc5b (TocRule): Only set $TocShown if $TocAutomatic is
true, and therefore a table of contents has in fact been shown.
This solves the problem of <toc> only working before the first
heading (and requiring no headings in the sidebar).
2005-12-08 10:34:49 +00:00
Alex Schroeder
4af86f973a (TocRule): Try to avoid empty element shorthand
for anchor id when $UseModMarkupInTitles is set.
2005-09-14 17:10:59 +00:00
Alex Schroeder
c7889d2241 (TocRule): Revers order of match and InElement
check as suggested by Markus Lude.  Without this patch, single
equal signs are eaten when $UseModMarkupInTitles is true.
2005-09-04 02:21:44 +00:00
Alex Schroeder
6bebaddfd7 ($TocAutomatic): New option to control whether the table of
contents is inserted automatically.
2005-08-28 17:38:22 +00:00
Alex Schroeder
b14ed2b4ca (TocRule): Added <toc> rule. Fixed some markup
bugs (such that the toc div will now come after the closing of the
portrait div instead of nested within.
(TocHeadings): Protected pos in order to make this sub usable in
TocRule without the pos remembering workaround.
2005-08-28 17:31:01 +00:00
Alex Schroeder
0903c8496f (TocRule): Move TOC to just before the first
header.
(NewTocGetHeader): Deleted.
(TocHeadings): No longer take an argument.
2005-08-25 16:27:59 +00:00
Alex Schroeder
7fd2b4e626 (TocRule): AddHtmlEnvironment('p') 2004-12-05 04:03:32 +00:00
Alex Schroeder
6c1031f316 (TocRule): Reset $PortraitSupportColor after
headers.
2004-12-03 08:43:33 +00:00
Alex Schroeder
8ef12c6dae ($MyColorDiv): Renamed to $PortraitSupportColorDiv. 2004-11-27 21:25:07 +00:00
Alex Schroeder
1db3c5a6e3 (TocRule): Added PortraitSupportColorDiv support. 2004-11-27 21:18:02 +00:00
Alex Schroeder
55814931f3 ($TocCounter): New variable.
(TocRule): Use it to provide an ID to the toc entry.
(TocWikiHeading): Deleted.
(TocHeadings): Use ID instead of encoded text.
2004-11-27 00:57:15 +00:00
Alex Schroeder
14a6f07b89 (TocWikiHeading): Don't UrlEncode the anchor name. 2004-11-25 19:49:32 +00:00
Alex Schroeder
b37840e6e3 (TocHeadings, TocWikiHeading): Use FreeToNormal
on the anchor name.
2004-11-25 19:09:54 +00:00
Alex Schroeder
35336195df whitespace 2004-11-01 03:22:46 +00:00
Alex Schroeder
9d563dc0f3 perltidy -pt=2 -ce -b toc.pl 2004-10-31 19:34:15 +00:00
Alex Schroeder
2338a0ae1f (TocHeadings): Removed debugging info. 2004-10-31 19:31:01 +00:00
Alex Schroeder
216ec1b401 (TocRule): Call TocWikiHeading instead of
WikiHeading.
(TocHeadings): If the first subtitle is a H1, assume that this is
the "start".
2004-10-31 19:20:45 +00:00