summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-05-28 11:06:19 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-05-28 11:06:19 -0400
commit14cbc42b033c7270e988e42a625b35f54ed35929 (patch)
tree695b4a3308c6ac485d769a21761b1c0893695e9f
parent52dc080ed149c3c23511fedc513f5a49d1415510 (diff)
parent817a40b7812d8bb5eacf2d0a265ef175ac74e1ea (diff)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
-rw-r--r--doc/download.mdwn2
-rw-r--r--doc/plugins/contrib/po.mdwn10
-rw-r--r--doc/todo/latex.mdwn6
-rw-r--r--doc/users/jasonblevins.mdwn16
4 files changed, 24 insertions, 10 deletions
diff --git a/doc/download.mdwn b/doc/download.mdwn
index 507b250a5..448bdeeb9 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -32,6 +32,8 @@ FreeBSD has ikiwiki in its
Gentoo has an [ebuild](http://bugs.gentoo.org/show_bug.cgi?id=144453) in its bug database.
+The [openSUSE Build Service](http://software.opensuse.org/search?baseproject=ALL&p=1&q=ikiwiki) has packages for openSUSE
+
IkiWiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
by running `sudo port install ikiwiki`.
diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn
index 265f37fd2..364d8e6b2 100644
--- a/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@ -153,6 +153,14 @@ Any thoughts on this?
>> basewiki, which seems like it should be pretty easy to do, and would be
>> a great demo! --[[Joey]]
>>
+>>> I have a complete translation of basewiki into danish, and am working with
+>>> others on preparing one in german. For a complete translated user
+>>> experience, however, you will also need templates translated (there are a few
+>>> translatable strings there too). My not-yet-merged po4a Markdown improvements
+>>> (see [bug#530574](http://bugs.debian.org/530574)) correctly handles multiple
+>>> files in a single PO which might be relevant for template translation handling.
+>>> --[[JonasSmedegaard]]
+>>
>>> I've merged your changes into my own branch, and made great
>>> progress on the various todo items. Please note my repository
>>> location has changed a few days ago, my user page was updated
@@ -423,5 +431,3 @@ daring a timid "please pull"... or rather, please review again :)
>> --[[intrigeri]]
>>
>>> Did you get a chance to? --[[Joey]]
-
-Related to this is [bug#530574](http://bugs.debian.org/530574) with improved po4a Markdown support. -- [[JonasSmedegaard]]
diff --git a/doc/todo/latex.mdwn b/doc/todo/latex.mdwn
index 604c5e87f..4363003c1 100644
--- a/doc/todo/latex.mdwn
+++ b/doc/todo/latex.mdwn
@@ -7,10 +7,14 @@ render via [HeVeA](http://pauillac.inria.fr/~maranget/hevea/index.html),
similar. Useful for mathematics, as well as for stuff like the LaTeX version
of the ikiwiki [[/logo]].
+> [[users/JasonBlevins]] has also a plugin for including [[LaTeX]] expressions (by means of `itex2MML`) -- [[plugins/mdwn_itex]] (look at his page for the link). --Ivan Z.
+
----
ikiwiki could also support LaTeX as a document type, again rendering to HTML.
+> [[users/JasonBlevins]] has also a [[plugins/pandoc]] plugin (look at his page for the link): in principle, [Pandoc](http://johnmacfarlane.net/pandoc/) can read and write [[LaTeX]]. --Ivan Z.
+
----
Conversely, how about adding a plugin to support exporting to LaTeX?
@@ -25,6 +29,8 @@ Conversely, how about adding a plugin to support exporting to LaTeX?
>>>> Interesting, just yesterday I was playing with pandoc to make PDFs from my Markdown. Could someone advise me on how to embed these PDFs into ikiwiki? I need some guidance in implementing this. --[[JosephTurian]]
+>>>> [[users/JasonBlevins]] has a [[plugins/pandoc]] plugin (look at his page for the link). --Ivan Z.
+
----
[here](http://ng.l4x.org/gitweb/gitweb.cgi?p=ikiwiki.git/.git;a=blob;f=IkiWiki/Plugin/latex.pm) is a first stab at
diff --git a/doc/users/jasonblevins.mdwn b/doc/users/jasonblevins.mdwn
index 0030a30d3..b50e4844a 100644
--- a/doc/users/jasonblevins.mdwn
+++ b/doc/users/jasonblevins.mdwn
@@ -2,12 +2,12 @@
I'm currently hosting a private ikiwiki for keeping research notes
which, with some patches and a plugin (below), will
-convert inline LaTeX expressions to MathML. I'm working towards a
+convert inline [[todo/LaTeX]] expressions to [[MathML]]. I'm working towards a
patchset and instructions for others to do the same.
I've setup a test ikiwiki [here](http://xbeta.org/colab/) where I've
started keeping a few notes on my progress. There is an example of
-inline SVG on the homepage (note that the logo scales along with the
+inline [[todo/SVG]] on the homepage (note that the logo scales along with the
font size). There are a few example mathematical expressions in the
[sandbox](http://xbeta.org/colab/sandbox/). The MathML is generated
automatically from inline LaTeX expressions using an experimental
@@ -32,23 +32,23 @@ These plugins are experimental. Use them at your own risk. Read the
perldoc documentation for more details. Patches and suggestions are
welcome.
- * [mdwn_itex][] - Works with the `mdwn` plugin to convert inline LaTeX
- expressions to MathML using `itex2MML`.
+ * [mdwn_itex][] - Works with the [[`mdwn`|plugins/mdwn]] plugin to convert inline [[todo/LaTeX]]
+ expressions to [[MathML]] using `itex2MML`.
* [h1title][] - If present, use the leading level 1 Markdown header to
set the page title and remove it from the page body.
- * [code][] - Whole file and inline code snippet syntax highlighting
+ * [code][] - Whole file and inline code snippet [[todo/syntax highlighting]]
via GNU Source-highlight. The list of supported file extensions is
configurable. There is also some preliminary [documentation][code-doc].
See the [FortranWiki](http://fortranwiki.org) for examples.
- * [metamail][] - a plugin for loading metadata from email-style
+ * [metamail][] - a plugin for loading metadata from [[email]]-style
headers at top of a file (e.g., `title: Page Title` or
`date: November 2, 2008 11:14 EST`).
- * [pandoc][] - Markdown page processing via [Pandoc](http://johnmacfarlane.net/pandoc/) (a Haskell library for converting from one markup format to another). LaTeX and
- reStructuredText are optional.
+ * [pandoc][] - [[ikiwiki/Markdown]] page processing via [Pandoc](http://johnmacfarlane.net/pandoc/) (a Haskell library for converting from one markup format to another). [[todo/LaTeX]] and
+ [[reStructuredText|plugins/rst]] are optional.
* [path][] - Provides path-specific template conditionals such as
`IS_HOMEPAGE` and `IN_DIR_SUBDIR`.