[phpwiki-checkins] CVS: phpwiki/pgsrc TextFormattingRules,1.14,1.15

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv26062/pgsrc

Modified Files:
	TextFormattingRules 
Log Message:
Merged back some stuff which inadvertently (I think) got tossed during
the last edit.


Index: TextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** TextFormattingRules	2001/08/26 17:00:50	1.14
--- TextFormattingRules	2001/09/18 18:20:59	1.15
***************
*** 50,60 ****
  * Hyperlinks to other pages within the Wiki are made by placing the page name in square brackets: [this is a page link] or UsingWikiWords (preferred)
  * Hyperlinks to external pages are done like this: [http://www.wcsb.org/]
! * You can name the links by providing a name, a bar (|) and then the hyperlink or pagename: [PhpWiki home page | http://phpwiki.sourceforge.net/]  - [the front page | FrontPage]
  * You can suppress linking to old-style references and URIs by preceding the word with a '!', e.g. !NotLinkedAsWikiName, !http://not.linked.to/
! * [1], [2], [3], [4] refer to remote references. Click EditLinks on the edit form to enter URLs. These differ from the newer linking scheme; references are unique to a page.
  * Also, the old way of linking URL's is still supported: precede URLs with "http:", "ftp:" or "mailto:" to create links automatically as in: http://c2.com/
  * URLs ending with .png, .gif, or .jpg are inlined if in square brackets, by themselves: [http://phpwiki.sourceforge.net/phpwiki/images/png.png]
  
  
  ! HTML Mark-Up Language
  
--- 50,75 ----
  * Hyperlinks to other pages within the Wiki are made by placing the page name in square brackets: [this is a page link] or UsingWikiWords (preferred)
  * Hyperlinks to external pages are done like this: [http://www.wcsb.org/]
! * You can name the links by providing a name, a bar (|) and then the hyperlink or pagename: [PhpWiki home page | http://phpwiki.sourceforge.net/]  - [the front page | HomePage]
  * You can suppress linking to old-style references and URIs by preceding the word with a '!', e.g. !NotLinkedAsWikiName, !http://not.linked.to/
! * You can create footnotes by using [[1], [[2], [[3], ... like this here [1]. See footnote for counterpart.  (If the [[ is in the first column, it is a footnote ''definition'' rather than a footnote ''reference'' [1].)
  * Also, the old way of linking URL's is still supported: precede URLs with "http:", "ftp:" or "mailto:" to create links automatically as in: http://c2.com/
  * URLs ending with .png, .gif, or .jpg are inlined if in square brackets, by themselves: [http://phpwiki.sourceforge.net/phpwiki/images/png.png]
  
+ ! Tables
  
+ * Simple tables are available.  A table row is introduced by a __|__ in the first column.  It is best described by example:
+       ||  _''''_Name_''''_               |v _''''_Cost_''''_   |v _''''_Notes_''''_
+       | _''''_First_''''_   | _''''_Last_''''_
+       |> Jeff       |< Dairiki   |^  Cheap     |< Not worth it
+       |> Marco      |< Polo      | Cheaper     |< Not available
+ ;: will generate
+ ||  __Name__               |v __Cost__   |v __Notes__
+ | __First__   | __Last__
+ |> Jeff       |< Dairiki   |^  Cheap     |< Not worth it
+ |> Marco      |< Polo      | Cheaper     |< Not available
+ 
+ ;: Note that multiple __|__'s lead to spanned columns, and __v__'s can be used to span rows.  A __>__ generates a right justified column, __<__ a left justified column and __^__ a centered column (which is the default.)
+ 
+ 
  ! HTML Mark-Up Language
  
***************
*** 63,64 ****
--- 78,90 ----
  * The & characters will not work
  * If you really must use HTML, your system administrator can enable this feature. Start each line with a bar (|). Note that this feature is disabled by default.
+ 
+ ! More detail than you want to know
+ 
+ See [MagicPhpWikiURLs] for gory details on how to write
+ various kind of wiki maintainance links.
+ 
+ -----
+ 
+ Footnotes:
+ 
+ [1] By using [[1] a second time (in the first column) the footnote itself is ''defined''.  You may refer to a footnote as many times as you want, but you may only define it once on the page.  Note the the [[1] in the footnote links back to the first reference, if there are multiple references there will be +'s after the [[1] which will link to the other references.  (References which come ''after'' the footnote ''definition'' will not be linked to.)