Changed wiki parser to wikicloth.
* Temporarly removing of TOC.
This commit is contained in:
parent
55729e20f9
commit
5d9385cde4
39 changed files with 3474 additions and 64 deletions
|
@ -1,51 +1,34 @@
|
|||
module PagesHelper
|
||||
include WikiCloth
|
||||
|
||||
def wiki_link(wiki_words, link_text = nil)
|
||||
permalink = Page.permalink(wiki_words)
|
||||
if Page.exists?(:permalink => permalink)
|
||||
link_to((link_text || wiki_words), wiki_page_url(permalink))
|
||||
else
|
||||
link_to((link_text || wiki_words), wiki_page_url(permalink), :class => "new_wiki_link")
|
||||
end
|
||||
end
|
||||
|
||||
def build_internal_links(body)
|
||||
body.gsub(/\[\[(.*?)(\|(.*?))?\]\]/) { wiki_link($1, $3) }
|
||||
end
|
||||
|
||||
def build_anchors(body)
|
||||
body.gsub(/(<h\d{1}>(.+)<\/h\d{1}>)/) do
|
||||
header = $1
|
||||
token = $2.downcase.gsub(' ', '-')
|
||||
"<a name='#{token}'> </a>#{header}"
|
||||
end
|
||||
end
|
||||
# def build_anchors(body)
|
||||
# body.gsub(/(<h\d{1}>(.+)<\/h\d{1}>)/) do
|
||||
# header = $1
|
||||
# token = $2.downcase.gsub(' ', '-')
|
||||
# "<a name='#{token}'> </a>#{header}"
|
||||
# end
|
||||
# end
|
||||
|
||||
def wikified_body(body)
|
||||
body = Wikitext::Parser.new.parse body
|
||||
build_anchors(body)
|
||||
WikiCloth.new({:data => body, :link_handler => Wikilink.new}).to_html
|
||||
end
|
||||
|
||||
def wiki_header(body)
|
||||
body.gsub(/^(={1,6})\s*(.*)\s*={1,6}$/) { "h#{$1.size}. #{$2}" }
|
||||
end
|
||||
|
||||
def generate_toc(body)
|
||||
toc = ""
|
||||
body.gsub(/<h(\d{1})>(.+)<\/h\d{1}>/) do
|
||||
number = $1.to_i - 1
|
||||
name = $2
|
||||
|
||||
toc << "#" * number + " #{name}\n"
|
||||
end
|
||||
toc = Wikitext::Parser.new.parse toc
|
||||
|
||||
toc.gsub(/<li>([^<>\n]*)/) do
|
||||
name = $1
|
||||
token = name.downcase.gsub(' ', '-')
|
||||
|
||||
"<li><a href='##{token}'>#{name}</a>"
|
||||
end
|
||||
end
|
||||
# def generate_toc(body)
|
||||
# toc = ""
|
||||
# body.gsub(/^([=]{1,6})\s*(.*?)\s*(\1)/) do
|
||||
# number = $1.length - 1
|
||||
# name = $2
|
||||
#
|
||||
# toc << "#" * number + " #{name}\n"
|
||||
# end
|
||||
# toc = WikiCloth.new({:data => toc, :link_handler => Wikilink.new}).to_html
|
||||
#
|
||||
# toc.gsub(/<li>([^<>\n]*)/) do
|
||||
# name = $1
|
||||
# token = name.downcase.gsub(' ', '-')
|
||||
#
|
||||
# "<li><a href='##{token}'>#{name}</a>"
|
||||
# end
|
||||
# end
|
||||
|
||||
end
|
||||
|
|
|
@ -30,7 +30,7 @@ class Page < ActiveRecord::Base
|
|||
after_update :create_redirect
|
||||
|
||||
def self.permalink(title)
|
||||
title.gsub(" ", "_")
|
||||
title.gsub(/[\/\.,;@\s]/, "_").gsub(/[\"\']/, "")
|
||||
end
|
||||
|
||||
def set_permalink
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
- content = wikified_body @page.body
|
||||
#toc
|
||||
%h2 Inhaltsverzeichnis
|
||||
= generate_toc content
|
||||
//#toc
|
||||
//%h2 Inhaltsverzeichnis
|
||||
//= generate_toc @page.body
|
||||
#wiki_content= content
|
|
@ -7,7 +7,7 @@
|
|||
%ul
|
||||
- for version in @page.versions.reverse
|
||||
%li
|
||||
= link_to format_datetime(version.updated_at), version_page_path(@page, :version => version.lock_version)
|
||||
= link_to I18n.l(version.updated_at, :format => "%d.%m.%y %H:%M"), version_page_path(@page, :version => version.lock_version)
|
||||
= "(#{User.find(version.updated_by).nick})"
|
||||
|
||||
= render :partial => 'body'
|
||||
|
|
|
@ -68,7 +68,6 @@ Rails::Initializer.run do |config|
|
|||
config.gem "fastercsv"
|
||||
config.gem "prawn"
|
||||
config.gem "haml", :version => '>=2.0.6'
|
||||
config.gem "wikitext"
|
||||
|
||||
# The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
|
||||
# All files from config/locales/*.rb,yml are added automatically.
|
||||
|
|
19
lib/wikilink.rb
Normal file
19
lib/wikilink.rb
Normal file
|
@ -0,0 +1,19 @@
|
|||
class Wikilink < WikiCloth::WikiLinkHandler
|
||||
|
||||
def url_for(page)
|
||||
"/wiki/#{page}"
|
||||
end
|
||||
|
||||
def link_attributes_for(page)
|
||||
permalink = Page.permalink(page)
|
||||
if Page.exists?(:permalink => permalink)
|
||||
{ :href => url_for(permalink) }
|
||||
else
|
||||
{ :href => url_for(page), :class => "new_wiki_link"}
|
||||
end
|
||||
end
|
||||
|
||||
def section_link(section)
|
||||
""
|
||||
end
|
||||
end
|
|
@ -165,31 +165,31 @@ span.click-me {
|
|||
background: #f5f5f5;
|
||||
padding: 0 10px 0px 5px;
|
||||
float: left; }
|
||||
.menu ul, #start_nav ul {
|
||||
.menu ul, #start_nav ul {
|
||||
list-style-type: none;
|
||||
margin: 0 0 0.2em 0;
|
||||
padding: 0; }
|
||||
.menu ul li, #start_nav ul li {
|
||||
.menu ul li, #start_nav ul li {
|
||||
border-bottom: 1px solid #dedede;
|
||||
color: #666;
|
||||
margin: 0.8em 0 0 0;
|
||||
font-weight: bold; }
|
||||
.menu ul li a:link, .menu ul li a:visited, #start_nav ul li a:link, #start_nav ul li a:visited {
|
||||
.menu ul li a:link, .menu ul li a:visited, #start_nav ul li a:link, #start_nav ul li a:visited {
|
||||
display: block;
|
||||
padding: 0.25em 1em;
|
||||
text-decoration: none;
|
||||
width: 12em; }
|
||||
.menu ul li a:hover, .menu ul li a:focus, #start_nav ul li a:hover, #start_nav ul li a:focus {
|
||||
.menu ul li a:hover, .menu ul li a:focus, #start_nav ul li a:hover, #start_nav ul li a:focus {
|
||||
background-color: #e3e3e3; }
|
||||
.menu ul li ul, #start_nav ul li ul {
|
||||
.menu ul li ul, #start_nav ul li ul {
|
||||
margin: 0;
|
||||
padding: 0; }
|
||||
.menu ul li ul li, #start_nav ul li ul li {
|
||||
.menu ul li ul li, #start_nav ul li ul li {
|
||||
border-top: 1px solid #dedede;
|
||||
border-bottom: none;
|
||||
margin: 0;
|
||||
font-weight: normal; }
|
||||
.menu ul li ul li a:link, .menu ul li ul li a:visited, #start_nav ul li ul li a:link, #start_nav ul li ul li a:visited {
|
||||
.menu ul li ul li a:link, .menu ul li ul li a:visited, #start_nav ul li ul li a:link, #start_nav ul li ul li a:visited {
|
||||
width: 11.5em;
|
||||
padding: 0 1em 0.1em 1.5em;
|
||||
font-weight: normal;
|
||||
|
@ -447,3 +447,8 @@ a.new_wiki_link {
|
|||
|
||||
#toc {
|
||||
float: right; }
|
||||
|
||||
#wiki_content h1, #wiki_content h2, #wiki_content h3, #wiki_content h4, #wiki_content h5 {
|
||||
color: black; }
|
||||
#wiki_content span.editsection {
|
||||
display: none; }
|
||||
|
|
|
@ -165,31 +165,31 @@ span.click-me {
|
|||
background: #f5f5f5;
|
||||
padding: 0 10px 0px 5px;
|
||||
float: left; }
|
||||
.menu ul, #start_nav ul {
|
||||
.menu ul, #start_nav ul {
|
||||
list-style-type: none;
|
||||
margin: 0 0 0.2em 0;
|
||||
padding: 0; }
|
||||
.menu ul li, #start_nav ul li {
|
||||
.menu ul li, #start_nav ul li {
|
||||
border-bottom: 1px solid #dedede;
|
||||
color: #666;
|
||||
margin: 0.8em 0 0 0;
|
||||
font-weight: bold; }
|
||||
.menu ul li a:link, .menu ul li a:visited, #start_nav ul li a:link, #start_nav ul li a:visited {
|
||||
.menu ul li a:link, .menu ul li a:visited, #start_nav ul li a:link, #start_nav ul li a:visited {
|
||||
display: block;
|
||||
padding: 0.25em 1em;
|
||||
text-decoration: none;
|
||||
width: 12em; }
|
||||
.menu ul li a:hover, .menu ul li a:focus, #start_nav ul li a:hover, #start_nav ul li a:focus {
|
||||
.menu ul li a:hover, .menu ul li a:focus, #start_nav ul li a:hover, #start_nav ul li a:focus {
|
||||
background-color: #e3e3e3; }
|
||||
.menu ul li ul, #start_nav ul li ul {
|
||||
.menu ul li ul, #start_nav ul li ul {
|
||||
margin: 0;
|
||||
padding: 0; }
|
||||
.menu ul li ul li, #start_nav ul li ul li {
|
||||
.menu ul li ul li, #start_nav ul li ul li {
|
||||
border-top: 1px solid #dedede;
|
||||
border-bottom: none;
|
||||
margin: 0;
|
||||
font-weight: normal; }
|
||||
.menu ul li ul li a:link, .menu ul li ul li a:visited, #start_nav ul li ul li a:link, #start_nav ul li ul li a:visited {
|
||||
.menu ul li ul li a:link, .menu ul li ul li a:visited, #start_nav ul li ul li a:link, #start_nav ul li ul li a:visited {
|
||||
width: 11.5em;
|
||||
padding: 0 1em 0.1em 1.5em;
|
||||
font-weight: normal;
|
||||
|
@ -448,6 +448,11 @@ a.new_wiki_link {
|
|||
#toc {
|
||||
float: right; }
|
||||
|
||||
#wiki_content h1, #wiki_content h2, #wiki_content h3, #wiki_content h4, #wiki_content h5 {
|
||||
color: black; }
|
||||
#wiki_content span.editsection {
|
||||
display: none; }
|
||||
|
||||
#logininfo, #header, #footer {
|
||||
display: none; }
|
||||
|
||||
|
|
|
@ -493,3 +493,8 @@ a.new_wiki_link
|
|||
padding: 0 1em
|
||||
#toc
|
||||
float: right
|
||||
#wiki_content
|
||||
h1, h2, h3, h4, h5
|
||||
color: black
|
||||
span.editsection
|
||||
display: none
|
20
vendor/plugins/wikicloth/MIT-LICENSE
vendored
Normal file
20
vendor/plugins/wikicloth/MIT-LICENSE
vendored
Normal file
|
@ -0,0 +1,20 @@
|
|||
Copyright (c) 2009.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
"Software"), to deal in the Software without restriction, including
|
||||
without limitation the rights to use, copy, modify, merge, publish,
|
||||
distribute, sublicense, and/or sell copies of the Software, and to
|
||||
permit persons to whom the Software is furnished to do so, subject to
|
||||
the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be
|
||||
included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
0
vendor/plugins/wikicloth/README
vendored
Normal file
0
vendor/plugins/wikicloth/README
vendored
Normal file
23
vendor/plugins/wikicloth/Rakefile
vendored
Normal file
23
vendor/plugins/wikicloth/Rakefile
vendored
Normal file
|
@ -0,0 +1,23 @@
|
|||
require 'rake'
|
||||
require 'rake/testtask'
|
||||
require 'rake/rdoctask'
|
||||
|
||||
desc 'Default: run unit tests.'
|
||||
task :default => :test
|
||||
|
||||
desc 'Test the wikicloth plugin.'
|
||||
Rake::TestTask.new(:test) do |t|
|
||||
t.libs << 'lib'
|
||||
t.libs << 'test'
|
||||
t.pattern = 'test/**/*_test.rb'
|
||||
t.verbose = true
|
||||
end
|
||||
|
||||
desc 'Generate documentation for the wikicloth plugin.'
|
||||
Rake::RDocTask.new(:rdoc) do |rdoc|
|
||||
rdoc.rdoc_dir = 'rdoc'
|
||||
rdoc.title = 'WikiCloth'
|
||||
rdoc.options << '--line-numbers' << '--inline-source'
|
||||
rdoc.rdoc_files.include('README')
|
||||
rdoc.rdoc_files.include('lib/**/*.rb')
|
||||
end
|
5
vendor/plugins/wikicloth/init.rb
vendored
Normal file
5
vendor/plugins/wikicloth/init.rb
vendored
Normal file
|
@ -0,0 +1,5 @@
|
|||
require File.join(File.expand_path(File.dirname(__FILE__)), "lib", "core_ext")
|
||||
require File.join(File.expand_path(File.dirname(__FILE__)), "lib", "wiki_cloth")
|
||||
require File.join(File.expand_path(File.dirname(__FILE__)), "lib", "wiki_buffer")
|
||||
require File.join(File.expand_path(File.dirname(__FILE__)), "lib", "wiki_link_handler")
|
||||
String.send(:include, ExtendedString)
|
0
vendor/plugins/wikicloth/install.rb
vendored
Normal file
0
vendor/plugins/wikicloth/install.rb
vendored
Normal file
43
vendor/plugins/wikicloth/lib/core_ext.rb
vendored
Normal file
43
vendor/plugins/wikicloth/lib/core_ext.rb
vendored
Normal file
|
@ -0,0 +1,43 @@
|
|||
module ExtendedString
|
||||
|
||||
def blank?
|
||||
respond_to?(:empty?) ? empty? : !self
|
||||
end
|
||||
|
||||
def to_slug
|
||||
self.gsub(/\W+/, '-').gsub(/^-+/,'').gsub(/-+$/,'').downcase
|
||||
end
|
||||
|
||||
def auto_link
|
||||
url_check = Regexp.new( '(^|[\n ])([\w]+?://[\w]+[^ \"\r\n\t<]*)', Regexp::MULTILINE | Regexp::IGNORECASE )
|
||||
www_check = Regexp.new( '(^|[\n ])((www)\.[^ \"\t\n\r<]*)', Regexp::MULTILINE | Regexp::IGNORECASE )
|
||||
self.gsub!(url_check, '\1<a href="\2">\2</a>')
|
||||
self.gsub!(www_check, '\1<a href="http://\2">\2</a>')
|
||||
to_s
|
||||
end
|
||||
|
||||
def dump()
|
||||
ret = to_s
|
||||
delete!(to_s)
|
||||
ret
|
||||
end
|
||||
|
||||
def smart_split(char)
|
||||
ret = []
|
||||
tmp = ""
|
||||
inside = 0
|
||||
to_s.each_char do |x|
|
||||
if x == char && inside == 0
|
||||
ret << tmp
|
||||
tmp = ""
|
||||
else
|
||||
inside += 1 if x == "[" || x == "{" || x == "<"
|
||||
inside -= 1 if x == "]" || x == "}" || x == ">"
|
||||
tmp += x
|
||||
end
|
||||
end
|
||||
ret << tmp unless tmp.empty?
|
||||
ret
|
||||
end
|
||||
|
||||
end
|
279
vendor/plugins/wikicloth/lib/wiki_buffer.rb
vendored
Normal file
279
vendor/plugins/wikicloth/lib/wiki_buffer.rb
vendored
Normal file
|
@ -0,0 +1,279 @@
|
|||
module WikiCloth
|
||||
class WikiBuffer
|
||||
|
||||
def initialize(data="",options={})
|
||||
@options = options
|
||||
self.data = data
|
||||
self.buffer_type = nil
|
||||
@section_count = 0
|
||||
@buffers ||= [ ]
|
||||
@buffers << self
|
||||
@list_data = []
|
||||
end
|
||||
|
||||
def run_globals?
|
||||
true
|
||||
end
|
||||
|
||||
def skip_html?
|
||||
false
|
||||
end
|
||||
|
||||
def data
|
||||
@data ||= ""
|
||||
end
|
||||
|
||||
def params
|
||||
@params ||= [ "" ]
|
||||
end
|
||||
|
||||
def buffer_type
|
||||
@buffer_type
|
||||
end
|
||||
|
||||
def to_s
|
||||
"<p>" + self.params.join("\n") + "</p>"
|
||||
end
|
||||
|
||||
def check_globals()
|
||||
return false if self.class != WikiBuffer
|
||||
|
||||
if previous_char == "\n"
|
||||
if @indent == @buffers[-1].object_id && current_char != " "
|
||||
# close pre tag
|
||||
cc_temp = current_char
|
||||
"</pre>".each_char { |c| self.add_char(c) }
|
||||
# get the parser back on the right track
|
||||
"\n#{cc_temp}".each_char { |c| @buffers[-1].add_char(c) }
|
||||
@indent = nil
|
||||
return true
|
||||
end
|
||||
if current_char == " " && @indent.nil? && @buffers[-1].class != WikiBuffer::HTMLElement
|
||||
"<pre> ".each_char { |c| @buffers[-1].add_char(c) }
|
||||
@indent = @buffers[-1].object_id
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
if @buffers[-1].run_globals?
|
||||
# new html tag
|
||||
if @check_new_tag == true && current_char =~ /([a-z])/ && !@buffers[-1].skip_html?
|
||||
@buffers[-1].data.chop!
|
||||
parent = @buffers[-1].element_name if @buffers[-1].class == WikiBuffer::HTMLElement
|
||||
@buffers << WikiBuffer::HTMLElement.new("",@options,parent)
|
||||
end
|
||||
@check_new_tag = current_char == '<' ? true : false
|
||||
|
||||
# global
|
||||
case
|
||||
# start variable
|
||||
when previous_char == '{' && current_char == '{'
|
||||
@buffers[-1].data.chop!
|
||||
@buffers << WikiBuffer::Var.new("",@options)
|
||||
return true
|
||||
|
||||
# start link
|
||||
when current_char == '[' && previous_char != '['
|
||||
@buffers << WikiBuffer::Link.new("",@options)
|
||||
return true
|
||||
|
||||
# start table
|
||||
when previous_char == '{' && current_char == "|"
|
||||
@buffers[-1].data.chop!
|
||||
@buffers << WikiBuffer::Table.new("",@options)
|
||||
return true
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
return false
|
||||
end
|
||||
|
||||
def add_char(c)
|
||||
self.previous_char = self.current_char
|
||||
self.current_char = c
|
||||
|
||||
if self.check_globals() == false
|
||||
case
|
||||
when @buffers.size == 1
|
||||
return self.new_char()
|
||||
when @buffers[-1].add_char(c) == false && self.class == WikiBuffer
|
||||
tmp = @buffers.pop
|
||||
@buffers[-1].data += tmp.to_s
|
||||
# any data left in the buffer we feed into the parent
|
||||
unless tmp.data.blank?
|
||||
tmp.data.each_char { |c| self.add_char(c) }
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
protected
|
||||
# only executed in the default state
|
||||
def new_char()
|
||||
case
|
||||
when current_char == "\n"
|
||||
if @options[:extended_markup] == true
|
||||
self.data.gsub!(/---([^-]+)---/,"<strike>\\1</strike>")
|
||||
self.data.gsub!(/_([^_]+)_/,"<u>\\1</u>")
|
||||
end
|
||||
self.data.gsub!(/__([a-zA-Z0-9]+)__/) { |r|
|
||||
case $1
|
||||
when "NOEDITSECTION"
|
||||
@noeditsection = true
|
||||
end
|
||||
""
|
||||
}
|
||||
self.data.gsub!(/^([-]{4,})/) { |r| "<hr />" }
|
||||
self.data.gsub!(/^([=]{1,6})\s*(.*?)\s*(\1)/) { |r|
|
||||
@section_count += 1
|
||||
"<h#{$1.length}>" + (@noeditsection == true ? "" :
|
||||
"<span class=\"editsection\">[<a href=\"" + @options[:link_handler].section_link(@section_count) +
|
||||
"\" title=\"Edit section: #{$2}\">edit</a>]</span>") +
|
||||
" <span class=\"mw-headline\">#{$2}</span></h#{$1.length}>"
|
||||
}
|
||||
self.data.gsub!(/([\']{2,5})(.*?)(\1)/) { |r|
|
||||
tmp = "<i>#{$2}</i>" if $1.length == 2
|
||||
tmp = "<b>#{$2}</b>" if $1.length == 3
|
||||
tmp = "<b>'#{$2}'</b>" if $1.length == 4
|
||||
tmp = "<b><i>#{$2}</i></b>" if $1.length == 5
|
||||
tmp
|
||||
}
|
||||
lines = self.data.split("\n")
|
||||
self.data = ""
|
||||
for line in lines
|
||||
if !@list_data.empty? && (line.blank? || line =~ /^([^#\*:;]+)/)
|
||||
tmp = ""
|
||||
@list_data.reverse!
|
||||
@list_data.each { |x| tmp += "</" + list_inner_tag_for(x) + "></#{list_tag_for(x)}>" }
|
||||
line = "#{tmp} #{line}"
|
||||
@list_data = []
|
||||
end
|
||||
line.gsub!(/^([#\*:;]+)(.*)$/) { |r|
|
||||
cdata = []
|
||||
tmp = ""
|
||||
$1.each_char { |c| cdata << c }
|
||||
if @list_data.empty?
|
||||
tmp += "<#{list_tag_for(cdata[0])}>"
|
||||
cdata[1..-1].each { |x| tmp += "<" + list_inner_tag_for(cdata[0]) + "><#{list_tag_for(x)}>" } if cdata.size > 1
|
||||
else
|
||||
case
|
||||
when cdata.size > @list_data.size
|
||||
i = cdata.size-@list_data.size
|
||||
cdata[-i,i].each { |x| tmp += "<#{list_tag_for(x)}>" }
|
||||
when cdata.size < @list_data.size
|
||||
i = @list_data.size-cdata.size
|
||||
nlist = @list_data[-i,i].reverse
|
||||
nlist.each { |x| tmp += "</" + list_inner_tag_for(x) + "></#{list_tag_for(x)}>" }
|
||||
tmp += "</#{list_inner_tag_for(cdata.last)}>"
|
||||
else
|
||||
if cdata != @list_data
|
||||
# FIXME: this will only work if the change depth is one level
|
||||
unless (@list_data.last == ';' || @list_data.last == ':') && (cdata.last == ';' || cdata.last == ':')
|
||||
tmp += "</#{list_tag_for(@list_data.pop)}>"
|
||||
tmp += "<#{list_tag_for(cdata.last)}>"
|
||||
end
|
||||
else
|
||||
tmp += "</" + list_inner_tag_for(@list_data.last) + ">"
|
||||
end
|
||||
end
|
||||
end
|
||||
# FIXME: still probably does not detect the : properly
|
||||
peices = cdata.last == ";" ? $2.smart_split(":") : [ $2 ]
|
||||
if peices.size > 1
|
||||
tmp += "<#{list_inner_tag_for(cdata.last)}>#{peices[0]}</#{list_inner_tag_for(cdata.last)}>"
|
||||
tmp += "<dd>#{peices[1..-1].join(":")}</dd>"
|
||||
cdata[-1] = ":"
|
||||
else
|
||||
tmp += "<#{list_inner_tag_for(cdata.last)}>#{peices[0]}"
|
||||
end
|
||||
@list_data = cdata
|
||||
tmp
|
||||
}
|
||||
self.data += line + "\n"
|
||||
end
|
||||
|
||||
self.data = "</p><p>" if self.data.blank?
|
||||
|
||||
self.params << self.data.auto_link
|
||||
self.data = ""
|
||||
else
|
||||
self.data += current_char
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
def name_current_param()
|
||||
params[-1] = { :value => "", :name => params[-1] } unless params[-1].kind_of?(Hash) || params[-1].nil?
|
||||
end
|
||||
|
||||
def current_param=(val)
|
||||
unless self.params[-1].nil? || self.params[-1].kind_of?(String)
|
||||
self.params[-1][:value] = val
|
||||
else
|
||||
self.params[-1] = val
|
||||
end
|
||||
end
|
||||
|
||||
def params=(val)
|
||||
@params = val
|
||||
end
|
||||
|
||||
def buffer_type=(val)
|
||||
@buffer_type = val
|
||||
end
|
||||
|
||||
def data=(val)
|
||||
@data = val
|
||||
end
|
||||
|
||||
def current_char=(val)
|
||||
@current_char = val
|
||||
end
|
||||
|
||||
def current_char
|
||||
@current_char ||= ""
|
||||
end
|
||||
|
||||
def previous_char=(val)
|
||||
@previous_char = val
|
||||
end
|
||||
|
||||
def previous_char
|
||||
@previous_char
|
||||
end
|
||||
|
||||
def current_line=(val)
|
||||
@current_line = val
|
||||
end
|
||||
|
||||
def current_line
|
||||
@current_line ||= ""
|
||||
end
|
||||
|
||||
def list_tag_for(tag)
|
||||
case tag
|
||||
when "#" then "ol"
|
||||
when "*" then "ul"
|
||||
when ";" then "dl"
|
||||
when ":" then "dl"
|
||||
end
|
||||
end
|
||||
|
||||
def list_inner_tag_for(tag)
|
||||
case tag
|
||||
when "#" then "li"
|
||||
when "*" then "li"
|
||||
when ";" then "dt"
|
||||
when ":" then "dd"
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
require File.join(File.expand_path(File.dirname(__FILE__)), "wiki_buffer", "html_element")
|
||||
require File.join(File.expand_path(File.dirname(__FILE__)), "wiki_buffer", "table")
|
||||
require File.join(File.expand_path(File.dirname(__FILE__)), "wiki_buffer", "var")
|
||||
require File.join(File.expand_path(File.dirname(__FILE__)), "wiki_buffer", "link")
|
237
vendor/plugins/wikicloth/lib/wiki_buffer/html_element.rb
vendored
Normal file
237
vendor/plugins/wikicloth/lib/wiki_buffer/html_element.rb
vendored
Normal file
|
@ -0,0 +1,237 @@
|
|||
require 'rubygems'
|
||||
require 'builder'
|
||||
|
||||
module WikiCloth
|
||||
|
||||
class WikiBuffer::HTMLElement < WikiBuffer
|
||||
|
||||
ALLOWED_ELEMENTS = ['a','b','i','div','span','sup','sub','strike','s','u','font','big','ref','tt','del',
|
||||
'small','blockquote','strong','pre','code','references','ol','li','ul','dd','dt','dl','center',
|
||||
'h2','h3','h4','h5','h6']
|
||||
ALLOWED_ATTRIBUTES = ['id','name','style','class','href','start','value']
|
||||
ESCAPED_TAGS = [ 'nowiki', 'pre', 'code' ]
|
||||
SHORT_TAGS = [ 'meta','br','hr','img' ]
|
||||
NO_NEED_TO_CLOSE = ['li','p'] + SHORT_TAGS
|
||||
|
||||
def initialize(d="",options={},check=nil)
|
||||
super("",options)
|
||||
self.buffer_type = "Element"
|
||||
@in_quotes = false
|
||||
@in_single_quotes = false
|
||||
@start_tag = 1
|
||||
@tag_check = check unless check.nil?
|
||||
end
|
||||
|
||||
def run_globals?
|
||||
return ESCAPED_TAGS.include?(self.element_name) ? false : true
|
||||
end
|
||||
|
||||
def to_s
|
||||
if NO_NEED_TO_CLOSE.include?(self.element_name)
|
||||
return "<#{self.element_name} />" if SHORT_TAGS.include?(self.element_name)
|
||||
return "</#{self.element_name}><#{self.element_name}>" if @tag_check == self.element_name
|
||||
end
|
||||
|
||||
if ESCAPED_TAGS.include?(self.element_name)
|
||||
# escape all html inside this element
|
||||
self.element_content = self.element_content.gsub('<','<').gsub('>','>')
|
||||
# hack to fix <code><nowiki> nested mess
|
||||
self.element_content = self.element_content.gsub(/<[\/]*\s*nowiki\s*>/,'')
|
||||
end
|
||||
|
||||
lhandler = @options[:link_handler]
|
||||
case self.element_name
|
||||
when "ref"
|
||||
self.element_name = "sup"
|
||||
named_ref = self.name_attribute
|
||||
ref = lhandler.find_reference_by_name(named_ref) unless named_ref.nil?
|
||||
if ref.nil?
|
||||
lhandler.references << { :name => named_ref, :value => self.element_content, :count => 0 }
|
||||
ref = lhandler.references.last
|
||||
end
|
||||
ref_id = (named_ref.nil? ? "" : "#{named_ref}_") + "#{lhandler.reference_index(ref)}-#{ref[:count]}"
|
||||
self.params << { :name => "id", :value => "cite_ref-#{ref_id}" }
|
||||
self.params << { :name => "class", :value => "reference" }
|
||||
self.element_content = "[<a href=\"#cite_note-" + (named_ref.nil? ? "" : "#{named_ref}_") +
|
||||
"#{lhandler.reference_index(ref)}\">#{lhandler.reference_index(ref)}</a>]"
|
||||
ref[:count] += 1
|
||||
when "references"
|
||||
ref_count = 0
|
||||
self.element_name = "ol"
|
||||
self.element_content = lhandler.references.collect { |r|
|
||||
ref_count += 1
|
||||
ref_name = (r[:name].nil? ? "" : r[:name].to_slug + "_")
|
||||
ret = "<li id=\"cite_note-#{ref_name}#{ref_count}\"><b>"
|
||||
1.upto(r[:count]) { |x| ret += "<a href=\"#cite_ref-#{ref_name}#{ref_count}-#{x-1}\">" +
|
||||
(r[:count] == 1 ? "^" : (x-1).to_s(26).tr('0-9a-p', 'a-z')) + "</a> " }
|
||||
ret += "</b> #{r[:value]}</li>"
|
||||
}.to_s
|
||||
when "nowiki"
|
||||
return self.element_content
|
||||
end
|
||||
|
||||
tmp = elem.tag!(self.element_name, self.element_attributes) { |x| x << self.element_content }
|
||||
unless ALLOWED_ELEMENTS.include?(self.element_name)
|
||||
tmp.gsub!(/[\-!\|&"\{\}\[\]]/) { |r| self.escape_char(r) }
|
||||
return tmp.gsub('<', '<').gsub('>', '>')
|
||||
end
|
||||
tmp
|
||||
end
|
||||
|
||||
def name_attribute
|
||||
params.each { |p| return p[:value].to_slug if p.kind_of?(Hash) && p[:name] == "name" }
|
||||
return nil
|
||||
end
|
||||
|
||||
def element_attributes
|
||||
attr = {}
|
||||
params.each { |p| attr[p[:name]] = p[:value] if p.kind_of?(Hash) }
|
||||
if ALLOWED_ELEMENTS.include?(self.element_name.strip.downcase)
|
||||
attr.delete_if { |key,value| !ALLOWED_ATTRIBUTES.include?(key.strip) }
|
||||
end
|
||||
return attr
|
||||
end
|
||||
|
||||
def element_name
|
||||
@ename ||= ""
|
||||
end
|
||||
|
||||
def element_content
|
||||
@econtent ||= ""
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def escape_char(c)
|
||||
c = case c
|
||||
when '-' then '-'
|
||||
when '!' then '!'
|
||||
when '|' then '|'
|
||||
when '&' then '&'
|
||||
when '"' then '"'
|
||||
when '{' then '{'
|
||||
when '}' then '}'
|
||||
when '[' then '['
|
||||
when ']' then ']'
|
||||
when '*' then '*'
|
||||
when '#' then '#'
|
||||
when ':' then ':'
|
||||
when ';' then ';'
|
||||
when "'" then '''
|
||||
when '=' then '='
|
||||
else
|
||||
c
|
||||
end
|
||||
return c
|
||||
end
|
||||
|
||||
def elem
|
||||
Builder::XmlMarkup.new
|
||||
end
|
||||
|
||||
def element_name=(val)
|
||||
@ename = val
|
||||
end
|
||||
|
||||
def element_content=(val)
|
||||
@econtent = val
|
||||
end
|
||||
|
||||
def in_quotes?
|
||||
@in_quotes || @in_single_quotes ? true : false
|
||||
end
|
||||
|
||||
def new_char()
|
||||
case
|
||||
# tag name
|
||||
when @start_tag == 1 && current_char == ' '
|
||||
self.element_name = self.data.strip.downcase
|
||||
self.data = ""
|
||||
@start_tag = 2
|
||||
|
||||
# tag is closed <tag/> no attributes
|
||||
when @start_tag == 1 && previous_char == '/' && current_char == '>'
|
||||
self.data.chop!
|
||||
self.element_name = self.data.strip.downcase
|
||||
self.data = ""
|
||||
@start_tag = 0
|
||||
return false
|
||||
|
||||
# open tag
|
||||
when @start_tag == 1 && previous_char != '/' && current_char == '>'
|
||||
self.element_name = self.data.strip.downcase
|
||||
self.data = ""
|
||||
@start_tag = 0
|
||||
return false if SHORT_TAGS.include?(self.element_name)
|
||||
return false if self.element_name == @tag_check && NO_NEED_TO_CLOSE.include?(self.element_name)
|
||||
|
||||
# new tag attr
|
||||
when @start_tag == 2 && current_char == ' ' && self.in_quotes? == false
|
||||
self.current_param = self.data
|
||||
self.data = ""
|
||||
self.params << ""
|
||||
|
||||
# tag attribute name
|
||||
when @start_tag == 2 && current_char == '=' && self.in_quotes? == false
|
||||
self.current_param = self.data
|
||||
self.data = ""
|
||||
self.name_current_param()
|
||||
|
||||
# tag is now open
|
||||
when @start_tag == 2 && previous_char != '/' && current_char == '>'
|
||||
self.current_param = self.data
|
||||
self.data = ""
|
||||
@start_tag = 0
|
||||
return false if SHORT_TAGS.include?(self.element_name)
|
||||
return false if self.element_name == @tag_check && NO_NEED_TO_CLOSE.include?(self.element_name)
|
||||
|
||||
# tag is closed <example/>
|
||||
when @start_tag == 2 && previous_char == '/' && current_char == '>'
|
||||
self.current_param = self.data.chop
|
||||
self.data = ""
|
||||
@start_tag = 0
|
||||
return false
|
||||
|
||||
# in quotes
|
||||
when @start_tag == 2 && current_char == "'" && previous_char != '\\' && !@in_quotes
|
||||
@in_single_quotes = !@in_single_quotes
|
||||
|
||||
# in quotes
|
||||
when @start_tag == 2 && current_char == '"' && previous_char != '\\' && !@in_single_quotes
|
||||
@in_quotes = !@in_quotes
|
||||
|
||||
# start of a closing tag
|
||||
when @start_tag == 0 && previous_char == '<' && current_char == '/'
|
||||
self.element_content += self.data.chop
|
||||
self.data = ""
|
||||
@start_tag = 5
|
||||
|
||||
when @start_tag == 5 && (current_char == '>' || current_char == ' ') && !self.data.blank?
|
||||
self.data = self.data.strip.downcase
|
||||
if self.data == self.element_name
|
||||
self.data = ""
|
||||
return false
|
||||
else
|
||||
if @tag_check == self.data && NO_NEED_TO_CLOSE.include?(self.element_name)
|
||||
self.data = "</#{self.data}>"
|
||||
return false
|
||||
else
|
||||
self.element_content += "</#{self.data}>"
|
||||
@start_tag = 0
|
||||
self.data = ""
|
||||
end
|
||||
end
|
||||
|
||||
else
|
||||
if @start_tag == 0 && ESCAPED_TAGS.include?(self.element_name)
|
||||
self.data += self.escape_char(current_char)
|
||||
else
|
||||
self.data += current_char
|
||||
end
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
70
vendor/plugins/wikicloth/lib/wiki_buffer/link.rb
vendored
Normal file
70
vendor/plugins/wikicloth/lib/wiki_buffer/link.rb
vendored
Normal file
|
@ -0,0 +1,70 @@
|
|||
module WikiCloth
|
||||
|
||||
class WikiBuffer::Link < WikiBuffer
|
||||
|
||||
def initialize(data="",options={})
|
||||
super(data,options)
|
||||
@in_quotes = false
|
||||
end
|
||||
|
||||
def internal_link
|
||||
@internal_link ||= false
|
||||
end
|
||||
|
||||
def to_s
|
||||
link_handler = @options[:link_handler]
|
||||
unless self.internal_link
|
||||
return link_handler.external_link("#{params[0]}".strip, "#{params[1]}".strip)
|
||||
else
|
||||
case
|
||||
when params[0] =~ /^:(.*)/
|
||||
return link_handler.link_for(params[0],params[1])
|
||||
when params[0] =~ /^\s*([a-zA-Z0-9-]+)\s*:(.*)$/
|
||||
return link_handler.link_for_resource($1,$2,params[1..-1])
|
||||
else
|
||||
return link_handler.link_for(params[0],params[1])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
protected
|
||||
def internal_link=(val)
|
||||
@internal_link = (val == true ? true : false)
|
||||
end
|
||||
|
||||
def new_char()
|
||||
case
|
||||
# check if this link is internal or external
|
||||
when previous_char.blank? && current_char == '['
|
||||
self.internal_link = true
|
||||
|
||||
# Marks the beginning of another paramater for
|
||||
# the current object
|
||||
when current_char == '|' && self.internal_link == true && @in_quotes == false
|
||||
self.current_param = self.data
|
||||
self.data = ""
|
||||
self.params << ""
|
||||
|
||||
# URL label
|
||||
when current_char == ' ' && self.internal_link == false && params[1].nil? && !self.data.blank?
|
||||
self.current_param = self.data
|
||||
self.data = ""
|
||||
self.params << ""
|
||||
|
||||
# end of link
|
||||
when current_char == ']' && ((previous_char == ']' && self.internal_link == true) || self.internal_link == false) && @in_quotes == false
|
||||
self.data.chop! if self.internal_link == true
|
||||
self.current_param = self.data
|
||||
self.data = ""
|
||||
return false
|
||||
|
||||
else
|
||||
self.data += current_char unless current_char == ' ' && self.data.blank?
|
||||
end
|
||||
|
||||
return true
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
159
vendor/plugins/wikicloth/lib/wiki_buffer/table.rb
vendored
Normal file
159
vendor/plugins/wikicloth/lib/wiki_buffer/table.rb
vendored
Normal file
|
@ -0,0 +1,159 @@
|
|||
module WikiCloth
|
||||
|
||||
class WikiBuffer::Table < WikiBuffer
|
||||
|
||||
def initialize(data="",options={})
|
||||
super(data,options)
|
||||
self.buffer_type = "table"
|
||||
@start_table = true
|
||||
@start_row = false
|
||||
@start_caption = false
|
||||
@in_quotes = false
|
||||
end
|
||||
|
||||
def table_caption
|
||||
@caption ||= ""
|
||||
return @caption.kind_of?(Hash) ? @caption[:value] : @caption
|
||||
end
|
||||
|
||||
def table_caption_attributes
|
||||
@caption.kind_of?(Hash) ? @caption[:style] : ""
|
||||
end
|
||||
|
||||
def rows
|
||||
@rows ||= [ [] ]
|
||||
end
|
||||
|
||||
def to_s
|
||||
row_count = 0
|
||||
ret = "<table" + (params[0].blank? ? "" : " #{params[0].strip}") + ">"
|
||||
ret += "<caption" + (self.table_caption_attributes.blank? ? "" : " #{table_caption_attributes.strip}") +
|
||||
">#{table_caption.strip}</caption>" unless self.table_caption.blank?
|
||||
for row in rows
|
||||
row_count += 1
|
||||
ret += "<tr" + (params[row_count].nil? || params[row_count].blank? ? "" : " #{params[row_count].strip}") + ">"
|
||||
for cell in row
|
||||
cell_attributes = cell[:style].blank? ? "" : " #{cell[:style].strip}"
|
||||
ret += "<#{cell[:type]}#{cell_attributes}>\n#{cell[:value].strip}\n</#{cell[:type]}>"
|
||||
end
|
||||
ret += "</tr>"
|
||||
end
|
||||
ret += "</table>"
|
||||
end
|
||||
|
||||
protected
|
||||
def rows=(val)
|
||||
@rows = val
|
||||
end
|
||||
|
||||
def table_caption_attributes=(val)
|
||||
@caption = { :style => val, :value => self.table_caption } unless @caption.kind_of?(Hash)
|
||||
@caption[:style] = val if @caption.kind_of?(Hash)
|
||||
end
|
||||
|
||||
def table_caption=(val)
|
||||
@caption = val unless @caption.kind_of?(Hash)
|
||||
@caption[:value] = val if @caption.kind_of?(Hash)
|
||||
end
|
||||
|
||||
def next_row()
|
||||
self.params << ""
|
||||
self.rows << []
|
||||
end
|
||||
|
||||
def next_cell(type="td")
|
||||
if self.rows[-1].size == 0
|
||||
self.rows[-1] = [ { :type => type, :value => "", :style => "" } ]
|
||||
else
|
||||
self.rows[-1][-1][:value] = self.data
|
||||
self.rows[-1] << { :type => type, :value => "", :style => "" }
|
||||
end
|
||||
end
|
||||
|
||||
def new_char()
|
||||
if @check_cell_data == 1
|
||||
case
|
||||
when current_char != '|' && @start_caption == false && self.rows[-1][-1][:style].blank?
|
||||
self.rows[-1][-1][:style] = self.data
|
||||
self.data = ""
|
||||
when current_char != '|' && @start_caption == true && self.table_caption_attributes.blank?
|
||||
self.table_caption_attributes = self.data
|
||||
self.data = ""
|
||||
end
|
||||
@check_cell_data = 0
|
||||
end
|
||||
|
||||
case
|
||||
# Next table cell in row (TD)
|
||||
when current_char == "|" && (previous_char == "\n" || previous_char == "|") && @in_quotes == false
|
||||
self.data.chop!
|
||||
self.next_cell() unless self.data.blank? && previous_char == "|"
|
||||
self.data = ""
|
||||
|
||||
# Next table cell in row (TH)
|
||||
when current_char == "!" && (previous_char == "\n" || previous_char == "!") && @in_quotes == false
|
||||
self.data.chop!
|
||||
self.next_cell('th')
|
||||
self.data = ""
|
||||
|
||||
# End of a table
|
||||
when current_char == '}' && previous_char == '|'
|
||||
self.data = ""
|
||||
self.rows[-1].pop
|
||||
return false
|
||||
|
||||
# Start table caption
|
||||
when current_char == '+' && previous_char == '|' && @in_quotes == false
|
||||
self.data = ""
|
||||
self.rows[-1].pop
|
||||
@start_caption = true
|
||||
|
||||
# Table cell might have attributes
|
||||
when current_char == '|' && previous_char != "\n" && @in_quotes == false
|
||||
@check_cell_data = 1
|
||||
|
||||
# End table caption
|
||||
when current_char == "\n" && @start_caption == true && @in_quotes == false
|
||||
@start_caption = false
|
||||
self.table_caption = self.data
|
||||
self.data = ""
|
||||
|
||||
# in quotes
|
||||
when current_char == '"' && previous_char != '\\'
|
||||
@in_quotes = !@in_quotes
|
||||
self.data += '"'
|
||||
|
||||
# Table params
|
||||
when current_char == "\n" && @start_table == true && @in_quotes == false
|
||||
@start_table = false
|
||||
unless self.data.blank?
|
||||
self.current_param = self.data
|
||||
self.params << ""
|
||||
end
|
||||
self.data = ""
|
||||
|
||||
# Table row params
|
||||
when current_char == "\n" && @start_row == true && @in_quotes == false
|
||||
@start_row = false
|
||||
unless self.data.blank?
|
||||
self.current_param = self.data
|
||||
end
|
||||
self.data = ""
|
||||
|
||||
# Start new table row
|
||||
when current_char == '-' && previous_char == '|' && @in_quotes == false
|
||||
self.data.chop!
|
||||
self.rows[-1].pop
|
||||
self.next_row()
|
||||
@start_row = true
|
||||
|
||||
else
|
||||
self.data += current_char
|
||||
end
|
||||
|
||||
return true
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
77
vendor/plugins/wikicloth/lib/wiki_buffer/var.rb
vendored
Normal file
77
vendor/plugins/wikicloth/lib/wiki_buffer/var.rb
vendored
Normal file
|
@ -0,0 +1,77 @@
|
|||
module WikiCloth
|
||||
|
||||
class WikiBuffer::Var < WikiBuffer
|
||||
|
||||
def initialize(data="",options={})
|
||||
super(data,options)
|
||||
self.buffer_type = "var"
|
||||
@in_quotes = false
|
||||
end
|
||||
|
||||
def skip_html?
|
||||
true
|
||||
end
|
||||
|
||||
def function_name
|
||||
@fname
|
||||
end
|
||||
|
||||
def to_s
|
||||
if self.is_function?
|
||||
ret = "#{buffer_type}"
|
||||
ret += " function #{function_name}"
|
||||
ret += "(#{params.inspect})"
|
||||
ret += " [#{data}]"
|
||||
else
|
||||
ret = @options[:link_handler].include_resource("#{params[0]}".strip,params[1..-1])
|
||||
end
|
||||
ret ||= "<!-- TEMPLATE[#{params[0]}] NOT FOUND -->"
|
||||
ret
|
||||
end
|
||||
|
||||
def is_function?
|
||||
self.function_name.nil? || self.function_name.blank? ? false : true
|
||||
end
|
||||
|
||||
protected
|
||||
def function_name=(val)
|
||||
@fname = val
|
||||
end
|
||||
|
||||
def new_char()
|
||||
case
|
||||
when current_char == '|' && @in_quotes == false
|
||||
self.current_param = self.data
|
||||
self.data = ""
|
||||
self.params << ""
|
||||
|
||||
# Start of either a function or a namespace change
|
||||
when current_char == ':' && @in_quotes == false && self.params.size <= 1
|
||||
self.function_name = self.data
|
||||
self.data = ""
|
||||
puts "[found var function (#{function_name})"
|
||||
|
||||
# Dealing with variable names within functions
|
||||
# and variables
|
||||
when current_char == '=' && @in_quotes == false
|
||||
self.current_param = self.data
|
||||
self.data = ""
|
||||
self.name_current_param()
|
||||
|
||||
# End of a template, variable, or function
|
||||
when current_char == '}' && previous_char == '}'
|
||||
self.data.chop!
|
||||
self.current_param = self.data
|
||||
self.data = ""
|
||||
return false
|
||||
|
||||
else
|
||||
self.data += current_char
|
||||
end
|
||||
|
||||
return true
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
61
vendor/plugins/wikicloth/lib/wiki_cloth.rb
vendored
Normal file
61
vendor/plugins/wikicloth/lib/wiki_cloth.rb
vendored
Normal file
|
@ -0,0 +1,61 @@
|
|||
require 'jcode'
|
||||
|
||||
module WikiCloth
|
||||
|
||||
class WikiCloth
|
||||
|
||||
def initialize(opt={})
|
||||
self.load(opt[:data],opt[:params]) unless opt[:data].nil? || opt[:data].blank?
|
||||
self.options[:link_handler] = opt[:link_handler] unless opt[:link_handler].nil?
|
||||
end
|
||||
|
||||
def load(data,p={})
|
||||
data.gsub!(/<!--(.|\s)*?-->/,"")
|
||||
self.params = p
|
||||
self.html = data
|
||||
end
|
||||
|
||||
def render(opt={})
|
||||
self.options = { :output => :html, :link_handler => self.link_handler, :params => self.params }.merge(opt)
|
||||
self.options[:link_handler].params = options[:params]
|
||||
buffer = WikiBuffer.new("",options)
|
||||
self.html.each_char { |c| buffer.add_char(c) }
|
||||
buffer.to_s
|
||||
end
|
||||
|
||||
def to_html(opt={})
|
||||
self.render(opt)
|
||||
end
|
||||
|
||||
def link_handler
|
||||
self.options[:link_handler] ||= WikiLinkHandler.new
|
||||
end
|
||||
|
||||
def html
|
||||
@page_data
|
||||
end
|
||||
|
||||
def params
|
||||
@page_params ||= {}
|
||||
end
|
||||
|
||||
protected
|
||||
def options=(val)
|
||||
@options = val
|
||||
end
|
||||
|
||||
def options
|
||||
@options ||= {}
|
||||
end
|
||||
|
||||
def html=(val)
|
||||
@page_data = val
|
||||
end
|
||||
|
||||
def params=(val)
|
||||
@page_params = val
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
138
vendor/plugins/wikicloth/lib/wiki_link_handler.rb
vendored
Normal file
138
vendor/plugins/wikicloth/lib/wiki_link_handler.rb
vendored
Normal file
|
@ -0,0 +1,138 @@
|
|||
require 'rubygems'
|
||||
require 'builder'
|
||||
|
||||
module WikiCloth
|
||||
|
||||
class WikiLinkHandler
|
||||
|
||||
def references
|
||||
@references ||= []
|
||||
end
|
||||
|
||||
def section_link(section)
|
||||
""
|
||||
end
|
||||
|
||||
def params
|
||||
@params ||= {}
|
||||
end
|
||||
|
||||
def external_links
|
||||
@external_links ||= []
|
||||
end
|
||||
|
||||
def find_reference_by_name(n)
|
||||
references.each { |r| return r if !r[:name].nil? && r[:name].strip == n }
|
||||
return nil
|
||||
end
|
||||
|
||||
def reference_index(h)
|
||||
references.each_index { |r| return r+1 if references[r] == h }
|
||||
return nil
|
||||
end
|
||||
|
||||
def references=(val)
|
||||
@references = val
|
||||
end
|
||||
|
||||
def params=(val)
|
||||
@params = val
|
||||
end
|
||||
|
||||
def external_link(url,text)
|
||||
self.external_links << url
|
||||
elem.a({ :href => url }) { |x| x << (text.blank? ? url : text) }
|
||||
end
|
||||
|
||||
def external_links=(val)
|
||||
@external_links = val
|
||||
end
|
||||
|
||||
def url_for(page)
|
||||
"javascript:void(0)"
|
||||
end
|
||||
|
||||
def link_attributes_for(page)
|
||||
{ :href => url_for(page) }
|
||||
end
|
||||
|
||||
def link_for(page, text)
|
||||
ltitle = !text.nil? && text.blank? ? self.pipe_trick(page) : text
|
||||
ltitle = page if text.nil?
|
||||
elem.a(link_attributes_for(page)) { |x| x << ltitle.strip }
|
||||
end
|
||||
|
||||
def include_resource(resource, options=[])
|
||||
return self.params[resource] unless self.params[resource].nil?
|
||||
end
|
||||
|
||||
def link_for_resource(prefix, resource, options=[])
|
||||
ret = ""
|
||||
prefix.downcase!
|
||||
case
|
||||
when ["image","file","media"].include?(prefix)
|
||||
ret += wiki_image(resource,options)
|
||||
else
|
||||
title = options[0] ? options[0] : "#{prefix}:#{resource}"
|
||||
ret += link_for("#{prefix}:#{resource}",title)
|
||||
end
|
||||
ret
|
||||
end
|
||||
|
||||
protected
|
||||
def pipe_trick(page)
|
||||
t = page.split(":")
|
||||
t = t[1..-1] if t.size > 1
|
||||
return t.join("").split(/[,(]/)[0]
|
||||
end
|
||||
|
||||
# this code needs some work... lots of work
|
||||
def wiki_image(resource,options)
|
||||
pre_img = ''
|
||||
post_img = ''
|
||||
css = []
|
||||
loc = "right"
|
||||
type = nil
|
||||
w = 180
|
||||
h = nil
|
||||
title = nil
|
||||
ffloat = false
|
||||
|
||||
options.each do |x|
|
||||
case
|
||||
when ["thumb","thumbnail","frame","border"].include?(x.strip)
|
||||
type = x.strip
|
||||
when ["left","right","center","none"].include?(x.strip)
|
||||
ffloat = true
|
||||
loc = x.strip
|
||||
when x.strip =~ /^([0-9]+)\s*px$/
|
||||
w = $1
|
||||
css << "width:#{w}px"
|
||||
when x.strip =~ /^([0-9]+)\s*x\s*([0-9]+)\s*px$/
|
||||
w = $1
|
||||
css << "width:#{w}px"
|
||||
h = $2
|
||||
css << "height:#{h}px"
|
||||
else
|
||||
title = x.strip
|
||||
end
|
||||
end
|
||||
css << "float:#{loc}" if ffloat == true
|
||||
css << "border:1px solid #000" if type == "border"
|
||||
|
||||
sane_title = title.nil? ? "" : title.gsub(/<\/?[^>]*>/, "")
|
||||
if type == "thumb" || type == "thumbnail" || type == "frame"
|
||||
pre_img = '<div class="thumb t' + loc + '"><div class="thumbinner" style="width: ' + w.to_s +
|
||||
'px;"><a href="" class="image" title="' + sane_title + '">'
|
||||
post_img = '</a><div class="thumbcaption">' + title + '</div></div></div>'
|
||||
end
|
||||
"#{pre_img}<img src=\"#{resource}\" alt=\"#{sane_title}\" title=\"#{sane_title}\" style=\"#{css.join(";")}\" />#{post_img}"
|
||||
end
|
||||
|
||||
def elem
|
||||
Builder::XmlMarkup.new
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
48
vendor/plugins/wikicloth/run_tests.rb
vendored
Normal file
48
vendor/plugins/wikicloth/run_tests.rb
vendored
Normal file
|
@ -0,0 +1,48 @@
|
|||
require 'init'
|
||||
include WikiCloth
|
||||
|
||||
class CustomLinkHandler < WikiLinkHandler
|
||||
def include_resource(resource,options=[])
|
||||
case resource
|
||||
when "date"
|
||||
Time.now.to_s
|
||||
else
|
||||
# default behavior
|
||||
super(resource,options)
|
||||
end
|
||||
end
|
||||
def url_for(page)
|
||||
"javascript:alert('You clicked on: #{page}');"
|
||||
end
|
||||
def link_attributes_for(page)
|
||||
{ :href => url_for(page) }
|
||||
end
|
||||
end
|
||||
@wiki = WikiCloth::WikiCloth.new({
|
||||
:data => "<nowiki>{{test}}</nowiki> ''Hello {{test}}!''\n",
|
||||
:params => { "test" => "World" } })
|
||||
puts @wiki.to_html
|
||||
@wiki = WikiCloth::WikiCloth.new({
|
||||
:params => { "PAGENAME" => "Testing123" },
|
||||
:link_handler => CustomLinkHandler.new,
|
||||
:data => "\n[[Hello World]] From {{ PAGENAME }} on {{ date }}\n"
|
||||
})
|
||||
puts @wiki.to_html
|
||||
|
||||
Dir.glob("sample_documents/*.wiki").each do |x|
|
||||
|
||||
start_time = Time.now
|
||||
out_name = "#{x}.html"
|
||||
data = File.open(x) { |x| x.read }
|
||||
|
||||
tmp = WikiCloth::WikiCloth.new()
|
||||
tmp.load(data, { "PAGENAME" => "HelloWorld" })
|
||||
out = tmp.render({ :output => :html })
|
||||
out = "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\" dir=\"ltr\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /><link rel=\"stylesheet\" href=\"default.css\" type=\"text/css\" /></head><body>#{out}</body></html>"
|
||||
|
||||
File.open(out_name, "w") { |x| x.write(out) }
|
||||
end_time = Time.now
|
||||
puts "#{out_name}: Completed (#{end_time - start_time} sec) | External Links: #{tmp.link_handler.external_links.size} -- References: #{tmp.link_handler.references.size}"
|
||||
|
||||
end
|
||||
|
170
vendor/plugins/wikicloth/sample_documents/air_force_one.wiki
vendored
Normal file
170
vendor/plugins/wikicloth/sample_documents/air_force_one.wiki
vendored
Normal file
|
@ -0,0 +1,170 @@
|
|||
{{for|the current aircraft|Boeing VC-25}}
|
||||
{{otheruses}}
|
||||
<!-- This article is a part of [[Wikipedia:WikiProject Aircraft]]. Please see [[Wikipedia:WikiProject Aircraft/page content]] for recommended layout. -->
|
||||
{{Infobox Aviation
|
||||
|name = Air Force One
|
||||
|image = Image:Air Force One over Mt. Rushmore.jpg
|
||||
|caption = SAM 28000, one of the two VC-25s used as Air Force One, above [[Mount Rushmore]]
|
||||
}}
|
||||
|
||||
'''Air Force One''' is the [[air traffic control]] [[call sign]] of any [[United States Air Force]] aircraft carrying the [[President of the United States]].<ref name="foxtrot"> [http://www.faa.gov/airports_airtraffic/air_traffic/publications/atpubs/ATC/Chp2/atc0204.html#2-4-20 Order 7110.65R (Air Traffic Control)] Federal Aviation Administration 14 March 2007. Retrieved: 27 August 2007. </ref> Since 1990, the presidential fleet has consisted of two specifically configured, highly customized [[Boeing 747-200#747-200|Boeing 747-200B]] series aircraft – [[Tail Code|tail codes]] '''S'''pecial '''A'''ir '''M'''ission ('''SAM''') "28000" and '''SAM''' "29000" – with Air Force designation "[[Boeing VC-25|VC-25A]]". While these aircraft are referred to as "Air Force One" only while the president is on board, the term is commonly used to describe either of the two aircraft normally used and maintained by the U.S. Air Force solely for the president, as well as any additional Air Force aircraft used by the president; a recent example is when President [[Barack Obama]] flew to New York City aboard a U.S. Air Force [[Gulfstream V|C-37A]].<ref> Bosman, Julie. [http://www.nytimes.com/2009/05/31/nyregion/31obama.html?_r=1&scp=9&sq=obama%20broadway&st=cse "Politics Can Wait: The President Has a Date."] ''[[The New York Times]]'', May 30, 2009. Retrieved: June 17, 2009.</ref>
|
||||
|
||||
Air Force One is a prominent symbol of the [[United States|American]] presidency and its power.<ref name=Walsh/> The aircraft are among the most famous and most photographed in the world.<ref name="af1">Wallace, Chris (host). [http://www.foxnews.com/video-search/m/21504368/aboard_air_force_one.htm?pageid=23236 "Aboard Air Force One."] ''Fox News'', November 24, 2008. Retrieved: November 28, 2008.</ref>
|
||||
|
||||
==History==
|
||||
On October 11, 1910, [[Theodore Roosevelt]] became the first U.S. president to fly in an aircraft, although at the time of the flight in an early [[Wright Flyer]] from Kinloch Field (near [[St. Louis]], [[Missouri]]), he was no longer in office, having been succeeded by [[William Howard Taft]]. The record-making occasion was a brief overflight of the crowd at a country fair but was nonetheless, the beginning of presidential air travel.<ref> Hardesty 2003, pp. 31–32.</ref>
|
||||
|
||||
Prior to [[World War II]], overseas and cross-country presidential travel was rare. Lack of wireless telecommunication and quick transportation made long-distance travel impractical, as it took much time and isolated the president from events in [[Washington, D.C.]] By the late 1930s, with the arrival of aircraft such as the [[Douglas DC-3]], increasing numbers of the U.S. public saw passenger air travel as a reasonable mode of transportation. All-metal aircraft, more reliable engines, and new radio aids to navigation had made commercial airline travel safer and more convenient. Life insurance companies even began to offer airline pilots insurance policies, albeit at extravagant rates, and many commercial travelers and government officials began using the airlines in preference to rail travel, especially for longer trips.
|
||||
|
||||
[[Franklin D. Roosevelt]] was the first president to fly in an aircraft while in office. During World War II, Roosevelt traveled on the ''Dixie Clipper'', a Pan Am-crewed [[Boeing 314]] [[flying boat]] to the 1943 [[Casablanca Conference (1943)|Casablanca Conference]], in [[Morocco]], a flight that covered 5,500 miles (in three "legs").<ref> Hardesty 2003, pp. 38.</ref> The threat from the German submarines throughout the [[Battle of the Atlantic (1939–1945)|Battle of the Atlantic]] made transatlantic air travel the preferred method of transportation.<ref> Hardesty 2003, p. 39.</ref>
|
||||
|
||||
[[Image:Sacred Cow airplane.jpg|thumb|right|President Franklin D. Roosevelt's [[C-54 Skymaster]] aircraft, nicknamed "the Sacred Cow".]]
|
||||
|
||||
The first dedicated aircraft proposed for presidential use was a [[C-87 Liberator Express|C-87A]] VIP transport aircraft. This aircraft, number 41-24159, was re-modified in 1943 for use as a presidential VIP transport, the ''Guess Where II'', intended to carry President Franklin D. Roosevelt on international trips.<ref name= "Dorr"/> Had it been accepted, it would have been the first aircraft to be used in presidential service, in effect the first Air Force One. However, after a review of the C-87's highly controversial safety record in service, the [[United States Secret Service|Secret Service]] flatly refused to approve the ''Guess Where II'' for presidential carriage.<ref name= "Dorr">Dorr 2002, p. l34.</ref> The aircraft was then used to transport senior members of the Roosevelt administration on various trips. In March 1944, the ''Guess Where II'' transported [[Eleanor Roosevelt]] on a goodwill tour of several Latin American countries. The C-87 was scrapped in 1945.<ref name= "Dorr"/>
|
||||
|
||||
The Secret Service subsequently reconfigured a Douglas [[C-54 Skymaster]] for duty as a presidential transport. This aircraft, nicknamed the ''Sacred Cow'', included a sleeping area, radio telephone, and retractable elevator for Roosevelt's wheelchair. As modified, the presidential C-54 carried the president on several important trips.
|
||||
|
||||
[[Image:Independence aircraft.png|thumb|left|The ''Independence'' used primarily by President Truman]]
|
||||
|
||||
After Roosevelt died in spring 1945, Vice President [[Harry S. Truman]] became President. He replaced the C-54 in 1947 with a modified [[Douglas DC-6|C-118 Liftmaster]], calling it the ''Independence''. This was the first aircraft acting as Air Force One that had a distinctive exterior–a [[bald eagle]] head painted on its nose.
|
||||
|
||||
The presidential call sign was established for security purposes during the administration of [[Dwight D. Eisenhower]]. The change stemmed from a 1953 incident where an [[Eastern Air Lines|Eastern Airlines]] commercial flight (8610) had the same call sign as a flight the president was on (Air Force 8610). The aircraft accidentally entered the same airspace, and after the incident the unique call sign "Air Force One" was introduced for the presidential aircraft.
|
||||
|
||||
[[File:Lockheed VC-121E Super Constellation.jpg|thumb|right|The ''Columbine III'' used by President Eisenhower]]
|
||||
|
||||
Eisenhower also introduced four other [[propeller]] aircraft, the [[Lockheed Constellation|Lockheed C-121 Constellations]] (VC-121E) to presidential service. These aircraft were named ''Columbine II'' and ''Columbine III'' by [[Mamie Eisenhower]] after the [[Aquilegia caerulea|columbine]], the official state flower of Colorado, her adopted home state. Two [[Aero Commander 500|Aero Commanders]] were also added to the fleet and earned the distinction of being the smallest planes ever to serve as Air Force One. President Eisenhower also upgraded Air Force One's technology by adding an air-to-ground telephone and an air-to-ground teletype machine. Towards the end of Eisenhower's term in 1958, the Air Force added three [[C-137 Stratoliner|Boeing 707]] [[jet aircraft|jet]]s (as VC-137s designated SAM 970, 971, and 972), into the fleet. Eisenhower became the first president to use the VC-137 during his "Flight to Peace" Goodwill tour, from 3 December through 22 December 1959. He visited 11 Asian nations, flying {{convert|22000|mi|km}} in 19 days, about twice as fast as he would have on ''Columbine''.
|
||||
|
||||
===Boeing 707s===
|
||||
{{main|VC-137C SAM 26000|VC-137C SAM 27000}}
|
||||
[[File:VC-137-1 Air Force One .jpg|thumb|left|Boeing 707 ([[SAM 26000]]) served Presidents Kennedy to Clinton.]]
|
||||
|
||||
In October 1962, the [[John F. Kennedy]] administration purchased a [[C-137 Stratoliner]], [[SAM 26000|a modified long-range 707—Special Air Mission (SAM) 26000]], although he had used the Eisenhower-era jets for trips to Canada, France, Austria and the United Kingdom.
|
||||
|
||||
The Air Force had attempted a special presidential [[livery]] of their own design: a scheme in red and metallic gold, with the nation's name in block letters. Kennedy felt the aircraft appeared too regal, and, on advice from his wife, First Lady [[Jacqueline Kennedy]], he contacted the French-born American industrial designer [[Raymond Loewy]] for help in designing a new livery and interiors for the VC-137 jet.<ref name=Walsh>Walsh, Kenneth T. ''Air Force One: A History of the Presidents and Their Planes''. New York: Hyperion: 2003. ISBN 1-4013-0004-9.</ref> Loewy met with the president, and his earliest research on the project took him to the National Archives, where he looked at the first printed copy of the [[United States Declaration of Independence]], and saw the country's name set widely spaced and in upper case in a typeface called [[Caslon]]. He chose to expose the polished aluminum fuselage on the bottom side, and used two blues; a slate-blue associated with the early republic and the presidency, and a more contemporary [[cyan]] to represent the present and future. The [[Seal of the President of the United States|presidential seal]] was added to both sides of the fuselage near the nose, a large American flag was painted on the tail, and the sides of the aircraft read "United States of America" in all capital letters. Loewy's work won immediate praise from the president and the press. The VC-137 markings were adapted for the larger VC-25 when it entered service in 1990.<ref>Hardesty 2003, p. 70.</ref>
|
||||
|
||||
[[Image:Air Force One SAM 27000.jpg|thumb|right|Boeing 707 [[SAM 27000]] as Air Force One SAM 27000 served Presidents Nixon to Bush 43, and was the primary transport for Nixon to Reagan.]]
|
||||
SAM 26000 was in service from 1962 to 1998, serving Presidents Kennedy to [[Bill Clinton|Clinton]]. On November 22, 1963, SAM 26000 carried President Kennedy to Dallas, Texas, where it served as the backdrop as President and Mrs. Kennedy greeted well-wishers at Dallas' Love Field. Later that afternoon, Kennedy was assassinated, and Vice President [[Lyndon Johnson]] assumed the job of president and took the oath of office aboard SAM 26000. At Johnson's request, the plane carried Kennedy's body back to Washington. It also flew over [[Arlington National Cemetery]] as Kennedy was being laid to rest, following 50 fighter jets. A decade later, it brought Johnson's own body to Washington for his [[state funeral]] and then back home to Texas. As the former president was laid to rest at [[LBJ Ranch|his ranch]], a former pilot of SAM 26000 presented the flag to [[Lady Bird Johnson]].
|
||||
|
||||
President Johnson twice used Air Force One, in 1966 and 1967, to visit American troops in Vietnam. <ref>Hardesty 2003, p. 88.</ref> Another unusual use of the aircraft was a five-day odyssey beginning on December 19, 1967 when Johnson embarked on a world tour. Ostensibly the president was to attend the funeral of Prime Minister Harold Holt of Australia, but the press corps flying on a "no-frills" charter jet airliner derided the unscheduled and haphazard nature of the flights that ended with visits to the leaders of 14 countries covering a total of 28,210 miles.<ref>Hardesty 2003, pp. 88–89.</ref> A visit to [[Pope Paul VI]] ended the whirlwind trek, widely criticized by the world press as an "extravagant feat that mocked every role of protocol."<ref>Hardesty 2003, p. 94.</ref>
|
||||
|
||||
SAM 26000 was replaced in 1972 by another VC-137, [[SAM 27000|Special Air Mission 27000]], although SAM 26000 was kept as a backup until it was finally retired in 1998. SAM 26000 is now on display at the [[National Museum of the United States Air Force]]. [[Richard Nixon]] was the first president to use SAM 27000, and the newer aircraft served every president since Nixon, until it was replaced by two [[Boeing VC-25|VC-25]] aircraft (SAM 28000 and 29000) in 1990. After announcing his intention to resign, Nixon boarded SAM 27000 to travel to California. Over Missouri, the call sign for the airplane changed from Air Force One to SAM 27000 after Gerald Ford became president.
|
||||
|
||||
SAM 27000 was decommissioned in 2001 by President [[George W. Bush]], flown to [[San Bernardino International Airport]] in California, and later dismantled and taken to the [[Ronald Reagan Presidential Library]] in [[Simi Valley]], where it was reassembled and is currently on permanent display.
|
||||
|
||||
===Boeing 747s===
|
||||
{{see also|Boeing VC-25}}
|
||||
[[File:Barack Obama meets his staff in Air Force One Conference Room.jpg|thumb|left|President [[Barack Obama]] meets with staff in the conference room, April 3, 2009.]]
|
||||
|
||||
Though [[Ronald Reagan]]'s two terms as president saw no major changes to Air Force One, the fabrication of the current 747s began during his presidency. Reagan ordered two identical [[Boeing 747]]s to replace the aging 707 that he used for transport.<ref name="747-dod">Williams, Rudi. [https://www.defenselink.mil/news/newsarticle.aspx?id=26295 "Reagan Makes First, Last Flight in Jet He Ordered."] ''United States Department of Defense''. June 10, 2004. Retrieved: June 23, 2009.</ref> The interior designs were drawn up by First Lady [[Nancy Reagan]], who used designs reminiscent of the [[American Southwest]].<ref name="747-dod"/> The first aircraft was delivered in 1990, during the administration of [[George H. W. Bush]]. Delays were experienced to allow for additional work to protect the aircraft from [[electromagnetic pulse]] (EMP) effects.
|
||||
|
||||
The VC-25 is equipped with both secure and unsecure phone and computer communications systems, enabling the president to perform duties while in the air in the event of an attack on the United States.
|
||||
|
||||
When [[George W. Bush|President Bush]] came to the end of his second term, a VC-25 was used to transport him to Texas - for this purpose, the craft was called Special Air Mission 28000, as the aircraft did not carry the President of the United States.
|
||||
|
||||
[[Image:George and Laura Bush at Bagram Air Base in Afghanistan.jpg|thumb|right|President [[George W. Bush]] and first lady [[Laura Bush]] walk on the tarmac as Air Force One sits at [[Bagram Air Base]] in [[Afghanistan]], March 1, 2006.]]
|
||||
One of the most dramatic episodes aboard Air Force One happened during the [[September 11 attacks]]. President George W. Bush was interrupted at [[Emma E. Booker Elementary School]] in [[Sarasota, Florida]] after the attack on the World Trade Center South Tower in New York City. He flew on a VC-25 from [[Sarasota-Bradenton International Airport]] to [[Barksdale Air Force Base]] in Louisiana and then to [[Offutt Air Force Base]] in Nebraska before returning to Washington. The next day, officials at the White House and the Justice Department explained that President Bush did this because there was "specific and credible information that the White House and Air Force One were also intended targets."<ref>[http://georgewbush-whitehouse.archives.gov/news/releases/2001/09/20010912-8.html White House News releases]</ref> The White House later could not confirm evidence of a threat made against Air Force One, and subsequent investigation found the original claim to be a result of miscommunication.<ref>[http://www.washingtonpost.com/ac2/wp-dyn?pagename=article&node=&contentId=A32319-2001Sep26 "White House Drops Claim of Threat to Bush."] ''The Washington Post'', September 27, 2001. Retrieved: February 28, 2007.</ref>
|
||||
|
||||
The presidential air fleet is maintained by the [[89th Airlift Wing]] at [[Andrews Air Force Base]], [[Maryland]].
|
||||
Air Force One usually does not have fighter aircraft to escort the presidential aircraft over the United States, but this has occurred. In June 1974, while President Nixon was on his way to a scheduled stop in Syria, Syrian fighter jets intercepted Air Force One to act as escorts. However, the Air Force One crew was not informed in advance and, as a result, took evasive action including a dive.<ref> [http://www.washingtonpost.com/wp-srv/liveonline/03/special/books/sp_books_walsh052203.htm "Washington Post Book Review of ''Air Force One: A History of the Presidents and Their Planes''".] New York: Hyperion: 2003. ISBN 1-4013-0004-9.</ref>
|
||||
|
||||
On April 27, 2009, a low-flying VC-25 circled [[New York City]] for a [[photo-op]] and [[military exercise|training exercise]] and caused a scare for many in New York.<ref>[http://www.cnn.com/2009/POLITICS/04/28/low.flying.plane/index.html Photo-op]</ref> Fallout from the [[Air Force One photo op incident|photo op incident]] led to the resignation of the director of the White House Military Office.
|
||||
|
||||
The VC-25As are expected to be replaced, as they have become less cost-effective to operate. The USAF [[Air Mobility Command]] has been charged with looking into possible replacements, including the new [[Boeing 747-8]] and the [[EADS]] [[Airbus A380]].<ref>[http://www.flightglobal.com/articles/2007/10/17/218681/exclusive-us-considers-airbus-a380-as-air-force-one-and-potentially-a-c-5-replacement.html "US considers Airbus A380 as Air Force One and potentially a C-5 replacement."] ''Flight Global'', October 17, 2007. Retrieved: June 23, 2009.</ref> On January 7, 2009, the USAF [[Air Materiel Command]] issued a new requirement for a replacement aircraft to enter service beginning in 2017.<ref>[https://www.fbo.gov/index?s=opportunity&mode=form&id=e35e259abc36437e8e7665d42bdac9b2&tab=core&_cview=0 "USAF Presidential Aircraft Recapitalization (PAR) Program."] ''USAF Materiel Command'', 7 January 2007. Retrieved: 8 January 2009.</ref> On January 28, 2009, [[EADS]] announced they would not bid on the program, leaving Boeing the sole bidder, with either their Boeing 747-8 or [[Boeing 787]] being proposed.<ref>[http://www.aviationweek.com/aw/generic/story.jsp?id=news/AF1-012809.xml&headline=Boeing%20Only%20Contender%20for%20New%20Air%20Force%20One&channel=defense "Boeing Only Contender for New Air Force One".] ''AviationWeek.com'', January 28, 2009. Retrieved: June 23, 2009.</ref> <!-- This is a summary. Keep replacement details at [[Boeing VC-25]]. -->
|
||||
|
||||
==Other presidential aircraft==
|
||||
[[United Airlines]] has the distinction of being the only commercial airline to have operated ''[[Executive One]]'', the designation given to a civilian flight on which the U.S. President is aboard. On December 26, 1973, then-President [[Richard Nixon]] flew as a passenger aboard a [[Washington Dulles International Airport|Washington Dulles]] to [[Los Angeles International Airport|Los Angeles International]] flight. It was explained by his staff that this was done in order to conserve fuel by not having to fly the usual [[Boeing 707]] Air Force aircraft; however, the 707 followed behind in case of emergency.<ref name=Exec1CBS>[http://tvnews.vanderbilt.edu/program.pl?ID=226900 Vanderbilt Television News Archive "President / Commercial Airline Flight."] ''[[CBS News]]'', December 27, 1973. Retrieved: June 23, 2009.</ref>
|
||||
|
||||
On March 8, 2000, President [[Bill Clinton]] flew to Pakistan aboard an unmarked [[Gulfstream III]] while another aircraft with the call sign "Air Force One" flew on the same route a few minutes later.<ref>Sammon, Bill. "Clinton uses decoy flight for security." ''Washington Times'', March 26, 2000, p. C.1.</ref><ref>Haniffa, Aziz. "Playing hide-and-seek on trip to Islamabad." ''India Abroad''. New York: March 31, 2000, Vol. XXX, Issue 27, p. 22.</ref><ref>"Clinton's trip to Asia cost at least $50 million." ''Milwaukee Journal Sentinel'', April 9, 2000, p. 175 A.</ref> This diversion was reported by several U.S. press outlets.
|
||||
|
||||
Other heads of state also have special aircraft assigned. See [[Air transports of heads of state and government]] for further details.
|
||||
|
||||
==Air Force One aircraft on display==
|
||||
[[Image:George W. Bush Tours Air Force One.jpg|thumb|right|In 2005, President [[George W. Bush]], First Lady [[Laura Bush]], and former First Lady [[Nancy Reagan]] toured [[VC-137C SAM 27000|SAM 27000]], the aircraft that served seven presidents from 1972–2001; it is now housed at the [[Ronald Reagan Presidential Library]].]]
|
||||
|
||||
Several presidential aircraft that have formerly served as Air Force One (''Sacred Cow'', ''Independence'', ''Columbine III'', [[VC-137C SAM 26000|SAM 26000]], and other smaller presidential aircraft) are on display in the presidential hangar of the [[National Museum of the United States Air Force]] (located at [[Wright-Patterson Air Force Base|Wright-Patterson AFB]] near [[Dayton, Ohio|Dayton]], [[Ohio]]) and at the [[Museum of Flight]] in [[Seattle]], [[Washington]] (earlier VC-137B SAM 970). The Boeing 707 that served as Air Force One from the Nixon years through the George H. W. Bush administration ([[VC-137C SAM 27000|SAM 27000]]) is on display in [[Simi Valley]], [[California]] at the [[Ronald Reagan Presidential Library]]. The library's Air Force One Pavilion was opened to the public on October 24, 2005.
|
||||
|
||||
A [[Douglas DC-6|VC-118A Liftmaster]] used by [[John F. Kennedy]] is on display at the [[Pima Air & Space Museum]] in [[Tucson, Arizona|Tucson]], [[Arizona]].
|
||||
|
||||
==See also==
|
||||
{{portal|United States Air Force|Seal of the US Air Force.svg}}
|
||||
* [[Air Force Two]]
|
||||
* [[Air transports of heads of state and government]]
|
||||
* [[Cadillac One]]
|
||||
* [[Marine One]]
|
||||
* [[Marine Two]]
|
||||
* [[Army One]]
|
||||
* [[Navy One]]
|
||||
* [[Air Force One photo op incident]]
|
||||
|
||||
==References==
|
||||
===Notes===
|
||||
{{reflist}}
|
||||
<references />
|
||||
|
||||
===Bibliography===
|
||||
{{refbegin}}
|
||||
* Abbott James A. and Elaine M. Rice. ''Designing Camelot: The Kennedy White House Restoration.'' New York: Van Nostrand Reinhold, 1998. ISBN 0-442-02532-7.
|
||||
* Albertazzie, Ralph and [[Jerald TerHorst|Jerald F. TerHorst]]. ''Flying White House: The Story of Air Force One''. New York: Book Sales, 1979. ISBN 0-698-10930-9.
|
||||
* Braun, David. [http://news.nationalgeographic.com/news/2003/05/0529_030529_airforceone.html Q&A: U.S. Presidential Jet Air Force One.] ''National Geographic News,'' May 29, 2003.
|
||||
* Dorr, Robert F. ''Air Force One''. St. Paul, Minnesota: Motorbooks International, 2002. ISBN 0-7603-1055-6.
|
||||
* Hardesty, Von. ''Air Force One: The Aircraft that Shaped the Modern Presidency''. Chanhassen, Minnesota: Northword Press, 2003. ISBN 1-55971-894-3.
|
||||
* Harris, Tom. [http://www.howstuffworks.com/air-force-one.htm "How Air Force One Works."] ''HowStuffWorks.com''. Retrieved: October 10, 2006.
|
||||
* Technical Order 00-105E-9, Segment 9, Chapter 7 [http://www.0x4d.net/files/AF1/ Technical Order 00-105E-9]
|
||||
* Walsh, Kenneth T. ''Air Force One: A History of the Presidents and Their Planes''. New York: Hyperion, 2003. ISBN 1-4013-0004-9.
|
||||
{{refend}}
|
||||
|
||||
==External links==
|
||||
{{commons}}
|
||||
* [http://www.nationalmuseum.af.mil/factsheets/factsheet.asp?id=570 SAM 26000 at the National Museum of the United States Air Force]
|
||||
* [http://www.707sim.com/air-force-one.html Facts and History of 707 as Air Force One and "Where they are Now?"]
|
||||
* [http://www.reaganfoundation.org/airforceone/ Air Force One Pavilion]
|
||||
* [http://www.af.mil/factsheets/factsheet.asp?id=131 Air Force Fact Sheet, VC-25 - AIR FORCE ONE]
|
||||
* [http://www.whitehouse.gov/about/air_force_one/ Air Force One page on White House site]
|
||||
* [http://www.trumanlibrary.org/photographs/search.php?access=selectbycategory&keywords=Presidential+aircraft Truman Library & Museum]
|
||||
* [http://www.af.mil/photos/index.asp?galleryID=55 United States Air Force]
|
||||
* [http://www.boeing.com/history/boeing/airforceone.html Boeing History of Air Force One]
|
||||
|
||||
{{PresidentialCallsigns}}
|
||||
{{White House Military Office}}
|
||||
{{US Air Force navbox}}
|
||||
{{aviation lists}}
|
||||
|
||||
[[Category:Executive Office of the President of the United States]]
|
||||
[[Category:Presidency of the United States]]
|
||||
[[Category:Individual aircraft]]
|
||||
[[Category:Presidential aircraft]]
|
||||
[[Category:United States special-purpose aircraft]]
|
||||
[[Category:United States Air Force]]
|
||||
[[Category:Call signs]]
|
||||
|
||||
[[cs:Air Force One]]
|
||||
[[da:Air Force One]]
|
||||
[[de:Air Force One]]
|
||||
[[es:Air Force One]]
|
||||
[[eo:Air Force One]]
|
||||
[[fa:یکم نیروی هوایی]]
|
||||
[[fr:Air Force One]]
|
||||
[[ko:에어 포스 원]]
|
||||
[[hr:Air Force One]]
|
||||
[[id:Air Force One]]
|
||||
[[it:Air Force One]]
|
||||
[[lv:Air Force One]]
|
||||
[[he:אייר פורס 1]]
|
||||
[[hu:Air Force One]]
|
||||
[[nl:Air Force One (roepletter)]]
|
||||
[[ja:エアフォースワン]]
|
||||
[[no:Air Force One]]
|
||||
[[pl:Air Force One]]
|
||||
[[ro:Air Force One]]
|
||||
[[ru:Air Force One]]
|
||||
[[simple:Air Force One]]
|
||||
[[sk:Air Force One]]
|
||||
[[sl:Air Force One]]
|
||||
[[fi:Air Force One]]
|
||||
[[sv:Air Force One]]
|
||||
[[th:แอร์ฟอร์ซวัน]]
|
||||
[[tr:Air Force One]]
|
||||
[[vi:Air Force One]]
|
||||
[[yi:עיר פארס וואן]]
|
||||
[[zh:空军一号]]
|
||||
|
205
vendor/plugins/wikicloth/sample_documents/cheatsheet.wiki
vendored
Normal file
205
vendor/plugins/wikicloth/sample_documents/cheatsheet.wiki
vendored
Normal file
|
@ -0,0 +1,205 @@
|
|||
<div align="center">
|
||||
{{WP help pages (header bar)}}
|
||||
<!--COMMENT MARKUP. Displays:Edit mode only.-->
|
||||
{|align="center" style="width:100%; border:2px #a3b1bf solid; background:#f5faff; text-align:left;"
|
||||
|colspan="3" align="center" style="background:#cee0f2; text-align:center;" |{{shortcut|WP:CHEAT}}
|
||||
<h2 style="margin:.5em; margin-top:.1em; margin-bottom:.1em; border-bottom:0; font-weight:bold;">Wikipedia Cheatsheet</h2>
|
||||
<h4>For more advanced details, see [[Wikipedia:How to edit a page|How to edit a page]]</h4>
|
||||
|-<!--COLUMN HEADINGS-->
|
||||
| width="25%" style="background:#cee0f2; padding:0.3em; text-align:center;"|'''Description'''
|
||||
| style="background:#cee0f2; padding:0.3em; text-align:center;"|'''You type'''
|
||||
| width="25%" style="background:#cee0f2; padding:0.3em; text-align:center;"|'''You get'''
|
||||
|-<!--1ST ROW 1ST COLUMN-->
|
||||
|[[Wikipedia:How_to_edit_a_page#Character_formatting|Italic text]]{{Anchor|Italic text}}
|
||||
|<!--2ND COLUMN-->
|
||||
<tt><nowiki>''italic''</nowiki></tt>
|
||||
|<!--3RD COLUMN-->
|
||||
''italic''
|
||||
|-<!--HORIZONTAL LINE-->
|
||||
|colspan="3" style="border-top:1px solid #cee0f2;"|
|
||||
|-<!--2ND ROW 1ST COLUMN-->
|
||||
|[[Wikipedia:How_to_edit_a_page#Character_formatting|Bold text]]{{Anchor|Bold text}}
|
||||
|
|
||||
<tt><nowiki>'''bold'''</nowiki></tt>
|
||||
|
|
||||
'''bold'''
|
||||
|-
|
||||
|colspan="3" style="border-top:1px solid #cee0f2;"|
|
||||
|-
|
||||
|[[Wikipedia:How_to_edit_a_page#Character_formatting|Bold and italic]]{{Anchor|bold and italic}}
|
||||
|
|
||||
<tt><nowiki>'''''bold & italic'''''</nowiki></tt>
|
||||
|
|
||||
'''''bold & italic'''''
|
||||
|-
|
||||
|colspan="3" style="border-top:1px solid #cee0f2;"|
|
||||
|-
|
||||
||[[Wikipedia:How_to_edit_a_page#Links_and_URLs|Internal link]]{{Anchor|Internal link}}<br />
|
||||
<div style="padding: 0em .5em; font-size:0.9em;">''(within Wikipedia)''</div>
|
||||
|
|
||||
<tt><nowiki>[[Name of page]]</nowiki></tt><br />
|
||||
<tt><nowiki>[[Name of page|Text to display]]</nowiki></tt>
|
||||
|
|
||||
[[Name of page]]<br />
|
||||
[[Name of page|Text to display]]
|
||||
|-
|
||||
|colspan="3" style="border-top:1px solid #cee0f2;"|
|
||||
|-
|
||||
|[[Wikipedia:How_to_edit_a_page#Links_and_URLs|External link]]{{Anchor|External link}}<br />
|
||||
<div style="padding: 0em .5em; font-size:0.9em;">''(to other websites)''</div>
|
||||
|
|
||||
<tt><nowiki>[http://www.example.org Text to display]</nowiki></tt><br />
|
||||
<tt><nowiki>[http://www.example.org]</nowiki></tt><br />
|
||||
<tt><nowiki>http://www.example.org</nowiki></tt>
|
||||
|
|
||||
[http://www.example.org Text to display]<br />
|
||||
[http://www.example.org]<br />
|
||||
http://www.example.org
|
||||
|-
|
||||
|colspan="3" style="border-top:1px solid #cee0f2;"|
|
||||
|-
|
||||
|[[Wikipedia:Redirect|Redirect to another page]]{{Anchor|Redirect to another page}}
|
||||
|
|
||||
<tt><nowiki>#REDIRECT [[Target page]]</nowiki></tt>
|
||||
|
|
||||
[[Image:Redirect arrow without text.svg|30px]][[Target page]]
|
||||
|-
|
||||
|colspan="3" style="border-top:1px solid #cee0f2;"|
|
||||
|-
|
||||
|rowspan="3"|[[Help:Citations quick reference|Footnotes]]/[[Wikipedia:Referencing for beginners|References]]{{Anchor|Footnotes/References}}
|
||||
<div style="padding: 0em .5em; font-size:0.9em;">''Numbering is generated automatically.''</div>
|
||||
|<div style="margin-left:2em; font-size:0.9em;">''To create a footnote or reference, use this format:''</div>
|
||||
<tt><nowiki>Article text.<ref name="test">[http://www.example.org Link text], additional text.</ref></nowiki></tt>
|
||||
|rowspan="2"|Article text.<ref name="test">[http://www.example.org Link text], additional text.</ref>
|
||||
|-
|
||||
|<div style="margin-left:2em; font-size:0.9em;">''To reuse the same note, reuse the name with a trailing slash:''</div>
|
||||
<tt><nowiki>Article text.<ref name="test" /></nowiki></tt>
|
||||
|-
|
||||
|<div style="margin-left:2em; font-size:0.9em;">''To display notes, add '''either''' of these lines to the References section''</div>
|
||||
<tt><nowiki><references/></nowiki></tt><br/>
|
||||
<tt>{{tl|Reflist}}</tt>
|
||||
|<br/><references /><br/>
|
||||
|-
|
||||
|colspan="3" style="border-top:1px solid #cee0f2;"|
|
||||
|-
|
||||
|[[Wikipedia:How_to_edit_a_page#Headings|Section headings]]{{Anchor|Section headings}}<ref name="firstline">''Applies only at the very beginning of lines.''</ref><br />
|
||||
<div style="padding: 0em .5em; font-size:0.9em;">''A Table of Contents will automatically be generated when four headings are added to an article.''</div>
|
||||
|
|
||||
<tt><nowiki>== Level 1 ==</nowiki></tt><br />
|
||||
<tt><nowiki>=== Level 2 ===</nowiki></tt><br />
|
||||
<tt><nowiki>==== Level 3 ====</nowiki></tt><br />
|
||||
<tt><nowiki>===== Level 4 =====</nowiki></tt><br />
|
||||
<tt><nowiki>====== Level 5 ======</nowiki></tt>
|
||||
|
|
||||
== Level 1 ==
|
||||
=== Level 2 ===
|
||||
==== Level 3 ====
|
||||
===== Level 4 =====
|
||||
====== Level 5 ======
|
||||
|-
|
||||
|colspan="3" style="border-top:1px solid #cee0f2;"|
|
||||
|-
|
||||
|[[Help:List|Bulleted list]]{{Anchor|Bulleted list}}<ref name="firstline" />
|
||||
<div style="padding: 0em .5em; font-size:0.9em;">''Empty lines between list items discouraged, (see numbered lists).''</div>
|
||||
|
|
||||
<tt>* One</tt><br />
|
||||
<tt>* Two</tt><br />
|
||||
<tt>** Two point one</tt><br />
|
||||
<tt>* Three</tt>
|
||||
|
|
||||
* One
|
||||
* Two
|
||||
** Two point one
|
||||
* Three
|
||||
|-
|
||||
|colspan="3" style="border-top:1px solid #cee0f2;"|
|
||||
|-
|
||||
|[[Help:List|Numbered list]]{{Anchor|Numbered list}}<ref name="firstline" />
|
||||
<div style="padding: 0em .5em; font-size:0.9em;">''Empty lines between list items restarts numbering at 1.''</div>
|
||||
|
|
||||
<tt># One</tt><br />
|
||||
<tt># Two</tt><br />
|
||||
<tt>## Two point one</tt><br />
|
||||
<tt># Three</tt><br />
|
||||
|
|
||||
# One
|
||||
# Two
|
||||
## Two point one
|
||||
# Three
|
||||
|-
|
||||
|colspan="3" style="border-top:1px solid #cee0f2;"|
|
||||
|-
|
||||
|[[Wikipedia:Extended_image_syntax|Thumbnail image]]{{Anchor|Thumbnail image}}
|
||||
|
|
||||
<tt><nowiki>[[File:Wiki.png|thumb|Caption text]]</nowiki></tt>
|
||||
|
|
||||
[[File:Wiki.png|thumb|Caption text]]
|
||||
|-
|
||||
|
||||
|-<!--TALKPAGES-->
|
||||
| colspan="3" style="background:#E6F2FF; padding: 0.2em; font-family: sans-serif; font-size: 0.9em; text-align:center;" | For [[Wikipedia:Tutorial_%28Talk_pages%29|Talk Pages]]
|
||||
|-
|
||||
|Signature{{Anchor|Signature}}
|
||||
|
|
||||
<tt><nowiki>~~~~</nowiki></tt><hr />
|
||||
<tt><nowiki>~~~</nowiki></tt>
|
||||
|
|
||||
[[Special:Mypage|Username]] ([[Special:Mytalk|talk]]) {{CURRENTTIME}}, {{CURRENTDAY}} {{CURRENTMONTHNAME}} {{CURRENTYEAR}} (UTC)<hr />
|
||||
[[Special:Mypage|Username]] ([[Special:Mytalk|talk]])
|
||||
|-
|
||||
|colspan="3" style="border-top:1px solid #cee0f2;"|
|
||||
|-
|
||||
|Indenting text{{Anchor|Indenting text}}<ref name="firstline" />
|
||||
|
|
||||
<tt><nowiki>no indent (normal)</nowiki></tt><br/>
|
||||
<tt><nowiki>:first indent</nowiki></tt><br/>
|
||||
<tt><nowiki>::second indent</nowiki></tt><br/>
|
||||
<tt><nowiki>:::third indent</nowiki></tt>
|
||||
|
|
||||
no indent (normal)<br/>
|
||||
:first indent
|
||||
::second indent
|
||||
:::third indent
|
||||
|-
|
||||
|
||||
|colspan="3" style="border-top:1px solid #cee0f2; font-size:0.9em;"|<references/>
|
||||
|}
|
||||
</div>
|
||||
|
||||
==See also==
|
||||
[[File:User contributions detail.png|thumb|'''User contribution''' pages, '''article history''' pages, '''watch lists''', and '''recent changes''' are helpful in keeping track of what your fellow editors are doing. This graphic explains some of the features.]]
|
||||
* For a tour of features, see the [[Wikipedia:Introduction|Introduction to Wikipedia]].
|
||||
* [[mw:Help:Magic words|Magic Words]] of Wikipedia
|
||||
* For experimentation with editing, use the [[Wikipedia:Sandbox|sandbox]].
|
||||
* For a guide to more advanced page editing, see [[Wikipedia:How_to_edit_a_page|How to edit a page]]
|
||||
* The Wikipedia [[Wikipedia:Manual of Style|Manual of Style]]
|
||||
* For a checklist of elements required to make a "perfect" article, see [[Wikipedia:The perfect article|The perfect article]].
|
||||
* For print cheatsheets, see the [[:m:Help:Reference card|MediaWiki reference card]] or the [[:m:Cheatsheet|poster-size cheatsheet]] (available in many languages).
|
||||
* The encyclopedic article on [[cheat sheet]]s
|
||||
* [[Wikipedia:Citation templates|Citation templates]]
|
||||
|
||||
__NOTOC__ __NOEDITSECTION__
|
||||
|
||||
[[Category:Wikipedia basic information|{{PAGENAME}}]]
|
||||
|
||||
[[ar:مساعدة:أساسيات التحرير]]
|
||||
[[bg:Уикипедия:Наръчник/Уикипищов]]
|
||||
[[ca:Viquipèdia:Apunts d'ajuda]]
|
||||
[[cs:Nápověda:Rychlý přehled]]
|
||||
[[de:Hilfe:Textgestaltung]]
|
||||
[[es:Ayuda:Referencia rápida]]
|
||||
[[fa:ویکیپدیا:کارت راهنما]]
|
||||
[[id:Wikipedia:Pedoman ringkas]]
|
||||
[[hr:Wikipedija:Šalabahter]]
|
||||
[[ja:Help:早見表]]
|
||||
[[ka:ვიკიპედია:შპარგალკა]]
|
||||
[[ko:위키백과:편집 요약]]
|
||||
[[lo:ຊ່ອຍເຫຼືອ:ເຈ້ຍກ່າຍ]]
|
||||
[[mk:Википедија:Помошна табела]]
|
||||
[[mr:विकिपीडिया:टाचण]]
|
||||
[[nl:Wikipedia:Spiekbriefje]]
|
||||
[[pt:Wikipedia:Livro de estilo]]
|
||||
[[th:วิกิพีเดีย:วิธีการแก้ไขหน้าพื้นฐาน]]
|
||||
[[tr:Vikipedi:Hızlı rehber]]
|
||||
[[zh:Wikipedia:備忘單]]
|
||||
|
34
vendor/plugins/wikicloth/sample_documents/default.css
vendored
Normal file
34
vendor/plugins/wikicloth/sample_documents/default.css
vendored
Normal file
|
@ -0,0 +1,34 @@
|
|||
.thumb { background-color:#F8FCFF;border:1px solid #fff;margin-bottom:0.5em }
|
||||
.tright { border-width:0.5em 0 0.8em 1.4em;margin:0.5em 0 0.8em 1.4em;clear:right;float:right }
|
||||
.thumbinner {
|
||||
background-color:#F9F9F9;
|
||||
border:1px solid #CCCCCC;
|
||||
font-size:94%;
|
||||
overflow:hidden;
|
||||
padding:3px !important;
|
||||
text-align:center;
|
||||
}
|
||||
.thumbimage { border:1px solid #CCCCCC }
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
padding-bottom:0.17em;
|
||||
padding-top:0.5em;
|
||||
color:#000;
|
||||
}
|
||||
h2, h1 { border-bottom:1px solid #AAAAAA; }
|
||||
.editsection {
|
||||
font-size:76%;
|
||||
font-weight:normal;
|
||||
}
|
||||
.editsection {
|
||||
float:right;
|
||||
margin-left:5px;
|
||||
}
|
||||
|
||||
pre {
|
||||
background-color:#F9F9F9;
|
||||
border:1px dashed #2F6FAB;
|
||||
color:black;
|
||||
line-height:1.1em;
|
||||
padding:1em;
|
||||
}
|
7
vendor/plugins/wikicloth/sample_documents/elements.wiki
vendored
Normal file
7
vendor/plugins/wikicloth/sample_documents/elements.wiki
vendored
Normal file
|
@ -0,0 +1,7 @@
|
|||
<!-- should convert tags to normal text -->
|
||||
<script type="text/javascript">
|
||||
alert('boo');
|
||||
</script>
|
||||
|
||||
<!-- should drop the onclick attribute -->
|
||||
<a href="http://www.google.com/" onclick="alert('hello world');">test</a>
|
526
vendor/plugins/wikicloth/sample_documents/george_washington.wiki
vendored
Normal file
526
vendor/plugins/wikicloth/sample_documents/george_washington.wiki
vendored
Normal file
|
@ -0,0 +1,526 @@
|
|||
{{otheruses}}
|
||||
{{pp-semi-indef|small=yes}}{{pp-move-indef}}
|
||||
|
||||
{{Infobox President
|
||||
|name = George Washington
|
||||
|nationality = American
|
||||
|image = Gilbert Stuart Williamstown Portrait of George Washington.jpg
|
||||
|wh image = Gw1.gif
|
||||
|order = [[List of Presidents of the United States|1st]] [[President of the United States]]
|
||||
|term_start = April 30, 1789
|
||||
|term_end = March 4, 1797
|
||||
|vicepresident = [[John Adams]]
|
||||
|successor = [[John Adams]]
|
||||
|order2 = 1st [[Continental Army|Commander-in-Chief of the Continental Army]]
|
||||
|term_start2 = June 15, 1775
|
||||
|term_end2 = December 23, 1783
|
||||
|appointer2 = [[Continental Congress]]
|
||||
|successor2 = [[Henry Knox]]{{smallsup|b}}
|
||||
|order3 = 6th [[Commanding General of the United States Army|United States Army Senior Officer]]
|
||||
|term_start3 = July 13, 1798
|
||||
|term_end3 = December 14, 1799
|
||||
|president3 = [[John Adams]]
|
||||
|predecessor3 = [[James Wilkinson]]
|
||||
|successor3 = [[Alexander Hamilton]]
|
||||
|birth_date = {{birth date|1732|2|22|mf=y}}
|
||||
|birth_place = [[Westmoreland County, Virginia|Westmoreland County]], [[Colony of Virginia]], [[British America]]
|
||||
|death_date = {{death date and age|mf=yes|1799|12|14|1732|2|22}}
|
||||
|death_place = [[Mount Vernon]], [[Virginia]], [[United States]]
|
||||
|restingplace = Family vault, [[Mount Vernon]], [[Virginia]], [[United States]]
|
||||
|party = None
|
||||
|spouse = [[Martha Washington|Martha Dandridge Custis Washington]]
|
||||
|children = [[John Parke Custis]] (stepson)<br />Martha Parke Custis (stepdaughter)<br />[[Eleanor Parke Custis Lewis]] (step-granddaughter, raised by Washington)<br />[[George Washington Parke Custis]] (step-grandson, raised by Washington)
|
||||
|religion = [[Church of England]]{{\}}[[Episcopal Church (United States)|Episcopal]]
|
||||
|occupation = [[Farmer]] ([[Plantation|Planter]])<br/> [[Soldier]] ([[Officer (armed forces)|Officer]])
|
||||
|signature = George Washington signature.svg
|
||||
|allegiance = {{flagicon|United Kingdom|1606}} [[Kingdom of Great Britain]]<br/> {{flag|United States|1777}}
|
||||
|branch =
|
||||
|serviceyears = 1752–1758<br/> 1775–1783<br/> 1798–1799
|
||||
|rank = [[Lieutenant General (United States)|Lieutenant General]]<br/>[[General of the Armies|General of the Armies of the United States]] (posthumously in 1976)
|
||||
|commands = [[British Army]]'s [[Virginia Regiment]]<br/> [[Continental Army]]<br/> [[United States Army]]
|
||||
|battles = [[French and Indian War]]<br/>*[[Battle of Jumonville Glen]]<br/>*[[Battle of Fort Necessity]]<br/>*[[Battle of the Monongahela]]<br/>*[[Battle of Fort Duquesne]]<br/>[[American Revolutionary War]]<br/>*[[Boston campaign]]<br/>*[[New York and New Jersey campaigns|New York campaign]]<br/>*[[New York and New Jersey campaigns|New Jersey campaign]]<br/>*[[Philadelphia campaign]]<br/>*[[Yorktown Campaign|Yorktown campaign]]
|
||||
|awards = [[Congressional Gold Medal]], [[Thanks of Congress]]
|
||||
|footnotes = <sup>a</sup> See [[President of the Continental Congress|President of the United States, in Congress Assembled]].<br/><!----><sup>b</sup> General Knox served as the [[Commanding General of the United States Army|Senior Officer of the United States Army]].
|
||||
}}
|
||||
'''George Washington''' ({{OldStyleDateDY|February 22,|1732|February 11, 1731<!-- 1731 is correct. In Old Style, new year began March 25-->}}<ref name="Engber">Engber, Daniel (2006).[http://www.slate.com/id/2134455/ What's Benjamin Franklin's Birthday?]. (Both Franklin's and Washington's confusing birth dates are clearly explained.) Retrieved on June 17, 2009.</ref><ref name="calendar">The birth and death of George Washington are given using the [[Gregorian calendar]]. However, he was born when Britain and her colonies still used the Julian calendar, so contemporary records record his birth as February 11, 1731. The provisions of the [[Calendar (New Style) Act 1750]], implemented in 1752, altered the official British dating method to the Gregorian calendar with the start of the year on January 1.</ref><ref name="family">{{cite web |title=Image of page from family Bible |url=http://gwpapers.virginia.edu/project/faq/bible.html |publisher=Papers of George Washington |accessdate=2008-01-26}}</ref>{{ndash}} December 14, 1799) was the commander of the [[Continental Army]] in the [[American Revolutionary War]] (1775–1783) and served as the [[List of Presidents of the United States|first]] [[President of the United States|President]] of the [[United States]] of America (1789–1797).<ref>Under the Articles of Confederation Congress called its presiding officer "President of the United States in Congress Assembled." He had no executive powers, but the similarity of titles has confused people into thinking there were other presidents before Washington. Merrill Jensen, ''The Articles of Confederation'' (1959), 178–9</ref> For his essential roles in both war and peace, he is often referred to as the father of his country.<ref>{{cite web |url=http://www.americaslibrary.gov/cgi-bin/page.cgi/aa/wash |title=George Washington |publisher=[[Library of Congress]] |accessdate=June 27, 2009}}</ref><ref>{{cite web |url=http://www.pbs.org/georgewashington/father/index.html |title=Rediscovering George Washington |publisher=[[Public Broadcasting Service]] |accessdate=June 27, 2009}}</ref>
|
||||
|
||||
The [[Continental Congress]] appointed Washington [[Commander-in-chief#United States|commander-in-chief]] of the American revolutionary forces in 1775. The following year, he forced the [[Boston campaign#Siege ends|British out of Boston]], [[New York and New Jersey campaign#Capture of New York|lost New York City]], and crossed the [[Delaware River]] [[New York and New Jersey campaign#Washington's counterstrike|in New Jersey, defeating the surprised enemy units]] later that year. As a result of his strategy, Revolutionary forces captured the two main British combat armies at [[Battles of Saratoga|Saratoga]] and [[Siege of Yorktown|Yorktown]]. Negotiating with Congress, the colonial states, and [[Early Modern France|French allies]], he held together a tenuous army and a fragile nation amid the threats of disintegration and failure. Following the end of the war in 1783, Washington returned to private life and retired to his plantation at [[Mount Vernon, Virginia|Mount Vernon]], prompting an incredulous [[George III of the United Kingdom|King George III]] to state, "If he does that, he will be the greatest man in the world."<ref>{{cite book
|
||||
|title= George Washington: The Founding Father |last=Johnson |first=Paul |publisher=Eminent Lives |date=2005 |quote=In London, George III questioned the American-born painter Benjamin West what Washington would do now he had won the war. 'Oh,' said West, 'they say he will return to his farm.' 'If he does that,' said the king, 'he will be the greatest man in the world.' |isbn=0-06-075365-X |publisher=HarperCollins |page=78 }}</ref>
|
||||
|
||||
He presided over the [[Philadelphia Convention]] that drafted the [[United States Constitution]] in 1787 because of general dissatisfaction with the [[Articles of Confederation]]. Washington became President of the United States in 1789 and established many of the customs and usages of the [[Federal government of the United States|new government's]] executive department. He sought to create a nation capable of surviving in a world torn asunder by war between Britain and France. His unilateral [[Proclamation of Neutrality]] of 1793 provided a basis for [[United States non-interventionism|avoiding any involvement in foreign conflicts]]. He supported plans to build a strong [[federal government|central government]] by funding the [[Government debt|national debt]], implementing an [[Taxation in the United States|effective tax system]], and creating a [[national bank]]. Washington avoided the temptation of war and began a decade of peace with Britain via the [[Jay Treaty]] in 1795; he used his prestige to get it ratified over intense opposition from the [[Democratic-Republican Party|Jeffersonians]]. Although never officially joining the [[Federalist Party]], he supported its programs and was its inspirational leader. Washington's [[George Washington's Farewell Address|farewell address]] was a primer on republican virtue and a stern warning against partisanship, sectionalism, and involvement in foreign wars.
|
||||
|
||||
Washington was awarded the very first [[Congressional Gold Medal]] with the [[Thanks of Congress]].<ref>[http://www.gutenberg.org/ebooks/21880 Loubat, J. F. and Jacquemart, Jules, Illustrator, ''The Medallic History of the United States of America 1776-1876''.]</ref>
|
||||
|
||||
Washington died in 1799, and the funeral oration delivered by [[Henry Lee III|Henry Lee]] stated that of all Americans, he was "first in war, first in peace, and first in the hearts of his countrymen."<ref name="LeeEulogy">[[Henry Lee III|Henry Lee]]'s eulogy to George Washington, December 26, 1799. {{cite book|last=Safire|first=William|authorlink=William Safire|title=Lend Me Your Ears: Great Speeches in History|year=2004|publisher=[[W. W. Norton & Company]]|location=New York|isbn=0-393-05931-6|pages=185–186}}</ref> Washington has been consistently ranked by scholars as one of the [[Historical rankings of United States Presidents|greatest U.S. Presidents]].
|
||||
|
||||
==Early life and education==
|
||||
{{main|George Washington's early life}}
|
||||
[[Image:Gwstatue waterford.jpg|thumb|left|upright|Washington presents message at [[Fort Le Boeuf]] in 1753]]
|
||||
George Washington was born on {{OldStyleDateDY|February 22,|1732|February 11, 1731}}<ref name="Engber" /><ref name="calendar" /><ref name="family" /> the first son of [[Augustine Washington]] and his second wife, [[Mary Ball Washington]], on the family's [[George Washington Birthplace National Monument|Pope's Creek Estate]] near present-day [[Colonial Beach, Virginia|Colonial Beach]] in [[Westmoreland County, Virginia]]. Moving to [[Ferry Farm]] in [[Stafford County, Virginia|Stafford County]] at age six, George was educated in the home by his father and older brother.<ref name="GEN WASHINGTON">{{cite book
|
||||
|last=Bell
|
||||
|first=William Gardner
|
||||
|title=Commanding Generals and Chiefs of Staff: 1775-2005; Portraits & Biographical Sketches of the United States Army's Senior Officer
|
||||
|url=http://www.history.army.mil/books/CG&CSA/CG-TOC.htm
|
||||
|accessdate=2009-03-04
|
||||
|date=1983
|
||||
|publisher=Center of Military History – United States Army
|
||||
|isbn=0–16–072376–0
|
||||
|id=CMH Pub 70–14
|
||||
|pages=52 & 66}}</ref> The growth of tobacco as a commodity in Virginia could be measured by the number of slaves imported to cultivate it. When Washington was born, the population of the colony was 50 percent black, mostly enslaved [[Africans]] and [[African Americans]].<ref>[http://www.nps.gov/archive/gewa/bowden&history.htm "Slavery at Popes Creek Plantation"], George Washington Birthplace National Monument, National Park Service, accessed 15 Apr 2009</ref>
|
||||
|
||||
In his youth, Washington worked as a [[Surveying|surveyor]], and acquired what would become invaluable knowledge of the terrain around his native [[Colony of Virginia|Colony]] of [[History of Virginia|Virginia]].<ref>At the time Virginia included [[West Virginia]] and the upper [[Ohio River|Ohio Valley]] area around present day [[Pittsburgh]].</ref>
|
||||
|
||||
==Career==
|
||||
Washington embarked upon a career as a planter, which historians defined as those who held 20 or more slaves. In 1748 he was invited to help survey [[Thomas Fairfax, 6th Lord Fairfax of Cameron|Lord Fairfax's]] lands west of the [[Blue Ridge Mountains|Blue Ridge]]. In 1749, he was appointed to his first public office, surveyor of newly created [[Culpeper County, Virginia|Culpeper County]].<ref name="GEN WASHINGTON"/><ref>"[http://memory.loc.gov/ammem/gmdhtml/gwmaps.html Washington As Public Land Surveyor: Boyhood and Beginnings]" George Washington: Surveyor and Mapmaker. American Memory. Library of Congress. Retrieved on May 17, 2007.</ref> Through his half-brother, [[Lawrence Washington (1718–1752)|Lawrence Washington]], he became interested in the [[Ohio Company]], which aimed to exploit Western lands. In 1751, George and his half-brother traveled to [[Barbados]], staying at Bush Hill House,<ref>[http://research.history.org/Archaeological_Research/Research_Articles/ThemeCompCol/Barbados.cfm Bush Hill House] - Colonial Williamsburg Research Division</ref> hoping for an improvement in Lawrence's [[tuberculosis]]. This was the only time George Washington traveled outside what is now the United States.<ref>{{cite web |url=http://www.georgewashingtonbarbados.org/ |title=George Washington House Restoration Project in Barbados |accessdate=2008-01-21 }}</ref> After Lawrence's death in 1752, George inherited part of his estate and took over some of Lawrence's duties as [[adjutant]] of the colony.<ref>[http://memory.loc.gov/learn/lessons/gw/leader.html "George Washington: Making of a Military Leader]", ''American Memory'', Library of Congress. Retrieved on May 17, 2007</ref>
|
||||
|
||||
Washington was appointed a district [[adjutant general]] in the [[Virginia militia]] in 1752,<ref name="GEN WASHINGTON"/> which appointed him Major Washington at the age of 20. He was charged with training the [[militia]] in the quarter assigned to him.<ref>Sparks, Jared (1839). [http://books.google.com/books?id=dBQOAAAAIAAJ&pg=RA1-PA17 ''The Life of George Washington''], Boston: Ferdinand Andrews. p. 17. Digitized by Google. Retrieved on May 17, 2007.</ref> At age 21, in [[Fredericksburg, Virginia|Fredericksburg]], Washington became a [[Master Mason]] in the organization of [[Freemasonry|Freemasons]], a [[fraternity|fraternal organization]] that was a lifelong influence.<ref>Tabbert, Mark A. (January 29, 2007). "[http://www.freemasons-freemasonry.com/tabbert1.html A Masonic Memorial to a Virtuous Man]". Pietre-Stones Review of Freemasonry. Retrieved on May 17, 2007.</ref><ref>Washington Daylight Lodge #14 (2006). "[http://www.washingtondaylight.org/news/GW-Birthday-Speech.pdf Commemoration of George Washington’s Birthday]". Retrieved on August 21, 2007.</ref>
|
||||
|
||||
In December 1753, Washington was asked by Governor [[Robert Dinwiddie]] of Virginia to carry a British ultimatum to the French on the [[Ohio]] frontier.<ref name="GEN WASHINGTON"/> Washington assessed French military strength and intentions, and delivered the message to the French at [[Fort Le Boeuf]] in present day [[Waterford, Pennsylvania]]. The message, which went unheeded, called for the French to abandon their development of the Ohio country. The two colonial powers were heading toward worldwide conflict. Washington's report on the affair was widely read on both sides of the Atlantic.
|
||||
|
||||
==French and Indian War (Seven Years War)==
|
||||
{{main|George Washington in the French and Indian War}}
|
||||
{{Campaign
|
||||
|name=George Washington and [[French and Indian War|The French and Indian War]]</center>
|
||||
|raw_name=Campaignbox French and Indian War
|
||||
|battles=[[Battle of Jumonville Glen|Jumonville Glen]] – [[Battle of the Great Meadows|Great Meadows]] - [[Braddock expedition|Monongahela]] - [[Battle of Fort Duquesne|Fort Duquesne]]
|
||||
}}
|
||||
[[Image:Washington 1772.jpg|thumb|right|The earliest known portrait of Washington, painted in 1772 by [[Charles Willson Peale]], showing Washington in uniform as colonel of the Virginia Regiment.]]
|
||||
In 1754, Dinwiddie commissioned Washington a [[Lieutenant Colonel|lieutenant colonel]] and ordered him to lead an expedition to [[Fort Duquesne]] to drive out the French.<ref name="GEN WASHINGTON"/> With his [[Native Americans in the United States|American Indian]] allies led by [[Tanacharison]], Washington and his troops [[Battle of Jumonville Glen|ambushed a French scouting party]] of some 30 men, led by [[Joseph Coulon de Jumonville]].<ref>Fred Anderson, ''Crucible of War'' (Vintage Books, 2001), p. 6.</ref> Washington and his troops were [[Battle of Fort Necessity|overwhelmed at Fort Necessity]] by a larger and better positioned French and Indian force. The terms of surrender included a statement that Washington had assassinated Jumonville after the ambush. Washington could not read French, and, unaware of what it said, signed his name.<ref name="lengel48">Lengel p.48</ref> Released by the French, Washington returned to Virginia, where he was cleared of blame for the defeat, but resigned because he did not like the new arrangement of the Virginia Militia.<ref name="lengel48"/>
|
||||
|
||||
In 1755, Washington was an aide to British General [[Edward Braddock]] on the ill-fated [[Braddock expedition|Monongahela expedition]].<ref name="GEN WASHINGTON"/> This was a major effort to retake the Ohio Country. While Braddock was killed and the expedition ended in disaster, Washington distinguished himself as the Hero of the Monongahela.<ref>On British attitudes see John Shy, ''Numerous and Armed: Reflections on the Military Struggle for American Independence'' (1990) p. 39; Douglas Edward Leach. ''Roots of Conflict: British Armed Forces and Colonial Americans, 1677–1763'' (1986) p. 106; and John Ferling. ''Setting the World Ablaze: Washington, Adams, Jefferson, and the American Revolution'' (2002) p. 65</ref> While Washington's role during the battle has been debated, biographer [[Joseph Ellis]] asserts that Washington rode back and forth across the battlefield, rallying the remnant of the British and Virginian forces to a retreat.<ref>[[Joseph J. Ellis|Ellis, Joseph J.]] ''[[His Excellency: George Washington]]''. (2004) ISBN 1-4000-4031-0.</ref> Subsequent to this action, Washington was given a difficult frontier command in the Virginia mountains, and was rewarded by being promoted to [[colonel]] and named commander of all Virginia forces.<ref name="GEN WASHINGTON"/>
|
||||
|
||||
In 1758, Washington participated as a [[Brigadier General|brigadier general]] in the [[John Forbes (British Army officer)|Forbes expedition]] that prompted French evacuation of [[Fort Duquesne]], and British establishment of [[Pittsburgh]].<ref name="GEN WASHINGTON"/> Later that year, Washington resigned from active military service and spent the next sixteen years as a Virginia planter and politician.<ref>For negative treatments of Washington's excessive ambition and military blunders, see Bernhard Knollenberg, ''George Washington: The Virginia Period, 1732–1775'' (1964) and Thomas A. Lewis, ''For King and Country: The Maturing of George Washington, 1748–1760'' (1992).</ref>
|
||||
|
||||
==Between the wars==
|
||||
[[Image:Martha Dandridge Custis.jpg|thumb|A mezzotint of [[Martha Washington|Martha Dandridge Custis]], based on a 1757 portrait by [[John Wollaston (painter)|John Wollaston]].]]
|
||||
|
||||
On [[January 6]], [[1759]], Washington married the widow [[Martha Washington|Martha Dandridge Custis]]. Surviving letters suggest that he may have been in love at the time with [[Sally Fairfax]], the wife of a friend. Some historians believe George and Martha were distantly related.
|
||||
|
||||
Nevertheless, George and Martha made a good marriage, and together raised her two children from her previous marriage, [[John Parke Custis]] and Martha Parke Custis, affectionately called "Jackie" and "Patsy" by the family. Later the Washingtons raised two of Mrs. Washington's grandchildren, [[Eleanor Parke Custis Lewis|Eleanor Parke Custis]] and [[George Washington Parke Custis]]. George and Martha never had any children together—his earlier bout with smallpox followed, possibly, by tuberculosis may have made him sterile. The newlywed couple moved to Mount Vernon, where he took up the life of a planter and political figure.<ref>John K. Amory, M.D., "George Washington’s infertility: Why was the father of our country never a father?", ''Fertility and Sterility'', Vol. 81, No. 3, March 2004. [http://www.asrm.org/Professionals/Fertility&Sterility/georgewashington.pdf (online, PDF format)]</ref>
|
||||
|
||||
Washington's marriage to Martha, a wealthy widow, greatly increased his property holdings and social standing. He acquired one-third of the 18,000 acre (73 km²) Custis estate upon his marriage, and managed the remainder on behalf of Martha's children. He frequently purchased additional land in his own name. In addition, he was granted land in what is now [[West Virginia]] as a bounty for his service in the French and Indian War. By 1775, Washington had doubled the size of Mount Vernon to {{convert|6500|acre|km2|0}}, and had increased the slave population there to more than 100 persons. As a respected military hero and large landowner, he held local office and was elected to the Virginia provincial legislature, the [[House of Burgesses]], beginning in 1758.<ref>"Acreage, slaves, and social standing", Joseph Ellis, ''His Excellency, George Washington'', pp. 41–42, 48.</ref>
|
||||
[[Image:Mtvernon1.jpg|thumb|left|Washington enlarged the mansion at [[Mount Vernon]] after his marriage.]]
|
||||
|
||||
Washington lived an aristocratic lifestyle—fox hunting was a favorite leisure activity. Like most Virginia planters, he imported luxuries and other goods from England and paid for them by exporting his tobacco crop. Extravagant spending and the unpredictability of the tobacco market meant that many Virginia planters of Washington's day were losing money. ([[Thomas Jefferson]], for example, would die deeply in debt.)
|
||||
|
||||
Washington began to pull himself out of debt by diversification. By 1766, he had switched Mount Vernon's primary cash crop from tobacco to wheat, a crop which could be sold in America, and diversified operations to include flour milling, fishing, horse breeding, spinning, and weaving. Patsy Custis's tragic death in 1773 from epilepsy enabled Washington to pay off his British creditors, since half of her inheritance passed to him.<ref>Fox hunting: Ellis p. 44. Mount Vernon economy: John Ferling, ''The First of Men'', pp. 66–67; Ellis pp. 50–53; Bruce A. Ragsdale, "George Washington, the British Tobacco Trade, and Economic Opportunity in Pre-Revolutionary Virginia", in Don Higginbotham, ed., ''George Washington Reconsidered'', pp. 67–93.</ref>
|
||||
|
||||
During these years, Washington concentrated on his business activities and remained somewhat aloof from politics. Although he expressed opposition to the [[Stamp Act 1765|1765 Stamp Act]], the first direct tax on the colonies, he did not take a leading role in the growing colonial resistance until after protests of the [[Townshend Acts]] (enacted in 1767) had become widespread. In May 1769, Washington introduced a proposal drafted by his friend [[George Mason]], which called for Virginia to boycott English goods until the Acts were repealed. Parliament repealed the Townshend Acts in 1770, and, for Washington at least, the crisis had passed. However, Washington regarded the passage of the [[Intolerable Acts]] in 1774 as "an Invasion of our Rights and Privileges". In July 1774, he chaired the meeting at which the "[[Fairfax Resolves]]" were adopted, which called for, among other things, the convening of a [[Continental Congress]]. In August, Washington attended the [[Virginia Conventions|First Virginia Convention]], where he was selected as a delegate to the [[First Continental Congress]].<ref>Washington, quoted in Ferling, p. 99.</ref>
|
||||
|
||||
==American Revolution==
|
||||
{{main|George Washington in the American Revolution}}
|
||||
{{Campaign
|
||||
|name=George Washington and [[American Revolutionary War|The American Revolutionary War]]</center>
|
||||
|raw_name=Campaignbox French and Indian War
|
||||
|battles=[[Siege of Boston|Boston]] – [[Battle of Long Island|Long Island]] - [[Battle of Kip's Bay|Kip's Bay]] - [[Battle of Harlem Heights|Harlem Heights]] -[[Battle of White Plains|White Plains]] - [[Battle of Fort Washington|Fort Washington]] - [[Battle of Trenton|Trenton]] - [[Battle of the Assunpink Creek|Assunpink Creek]] - [[Battle of Princeton|Princeton]] - [[Battle of Brandywine|Brandywine]] - [[Battle of Germantown|Germantown]] - [[Battle of White Marsh|White Marsh]] - [[Battle of Monmouth|Monmouth]] - [[Siege of Yorktown|Yorktown]]
|
||||
}}
|
||||
[[Image:Portrait of George Washington.jpeg|thumb|right|upright|Portrait of George Washington in military uniform, painted by [[Rembrandt Peale]].]]
|
||||
After [[Battles of Lexington and Concord|fighting broke out]] in April 1775, Washington appeared at the [[Second Continental Congress]] in military uniform, signaling that he was prepared for war. Washington had the prestige, the military experience, the charisma and military bearing, the reputation of being a strong patriot, and he was supported by the South, especially Virginia. Although he did not explicitly seek the office of commander and even claimed that he was not equal to it, there was no serious competition. Congress created the [[Continental Army]] on June 14, 1775; the next day, on the nomination of John Adams of [[Massachusetts]], Washington was appointed [[Major General]] and elected by Congress to be [[Commander-in-chief]].<ref name="GEN WASHINGTON"/>
|
||||
|
||||
Washington assumed command of the Continental Army in the field at [[Cambridge, Massachusetts]] in July 1775,<ref name="GEN WASHINGTON"/> during the ongoing [[siege of Boston]]. Realizing his army's desperate shortage of gunpowder, Washington asked for new sources. British arsenals were raided (including some in the [[Caribbean]]) and some manufacturing was attempted; a barely adequate supply (about 2.5 million pounds) was obtained by the end of 1776, mostly from France.<ref>Orlando W. Stephenson, "The Supply of Gunpowder in 1776," ''American Historical Review'', Vol. 30, No. 2 (January 1925), pp. 271–281 in JSTOR</ref> Washington reorganized the army during the long standoff, and forced the British to withdraw by putting artillery on [[Fortification of Dorchester Heights|Dorchester Heights]] overlooking the city. The British [[Evacuation Day (Massachusetts)|evacuated Boston]] and Washington moved his army to [[New York City]].
|
||||
|
||||
Although negative toward the patriots in the Continental Congress, British newspapers routinely praised Washington's personal character and qualities as a military commander.<ref>Bickham, Troy O. "Sympathizing with Sedition? George Washington, the British Press, and British Attitudes During the American War of Independence." ''William and Mary Quarterly'' 2002 59(1): 101–122. ISSN 0043-5597 [http://historycooperative.press.uiuc.edu/cgi-bin/justtop.cgi?act=justtop&url=http://www.historycooperative.org/journals/wm/59.1/bickham.html Fulltext online in History Cooperative]</ref> Moreover, both sides of the aisle in Parliament found the American general's courage, endurance, and attentiveness to the welfare of his troops worthy of approbation and examples of the virtues they and most {{Who|date=May 2009}} other Britons found wanting in their own commanders.{{Fact|date=May 2009}} Washington's refusal to become involved in politics buttressed his reputation as a man fully committed to the military mission at hand and above the factional fray.
|
||||
|
||||
In August 1776, British General [[William Howe, 5th Viscount Howe|William Howe]] launched a massive naval and land campaign designed to seize New York and offer a negotiated settlement. The Continental Army under Washington engaged the enemy for the first time as an army of the newly declared independent United States at the [[Battle of Long Island]], the largest battle of the entire war. This and several other British victories sent Washington scrambling out of New York and across [[New Jersey]], leaving the future of the Continental Army in doubt. On the night of December 25, 1776, Washington staged a [[Battle of Trenton|counterattack]], leading the American forces [[Washington's crossing of the Delaware River|across the Delaware River]] to capture nearly 1,000 [[Hessian (soldiers)|Hessian]]s in [[Trenton, New Jersey]]. Washington followed up his victory at Trenton with another [[Battle of Princeton|one at Princeton]] in early January. These winter victories quickly raised the morale of the army, secured Washington's position as Commander, and inspired young men to join the army.{{Fact|date=June 2009}}
|
||||
|
||||
British forces defeated Washington's troops in the [[Battle of Brandywine]] on September 11, 1777. Howe outmaneuvered Washington and marched into Philadelphia unopposed on September 26. Washington's army [[Battle of Germantown|unsuccessfully attacked]] the British garrison at [[Germantown, Philadelphia, Pennsylvania|Germantown]] in early October. Meanwhile, Burgoyne, out of reach from help from Howe, was trapped and forced to [[Battles of Saratoga|surrender his entire army]] at [[Saratoga, New York]]. France responded to Burgoyne's defeat by entering the war, openly allying with America and turning the Revolutionary War into a major worldwide war. Washington's loss of Philadelphia prompted some members of Congress to discuss removing Washington from command. This [[Conway Cabal|attempt]] failed after Washington's supporters rallied behind him.<ref>Fleming, T: "Washington's Secret War: the Hidden History of Valley Forge.", Smithsonian Books, 2005</ref>
|
||||
|
||||
Washington's army camped at [[Valley Forge]] in December 1777, staying there for the next six months. Over the winter, 2,500 men of the 10,000-strong force died from disease and exposure. The next spring, however, the army emerged from Valley Forge in good order, thanks in part to a full-scale training program supervised by [[Friedrich Wilhelm von Steuben|Baron von Steuben]], a veteran of the Prussian general staff. The British evacuated Philadelphia to New York in 1778 but Washington [[Battle of Monmouth|attacked them at Monmouth]] and drove them from the battlefield. Afterwards, the British continued to head towards New York. Washington moved his army outside of New York.
|
||||
|
||||
In the summer of 1779 at Washington's direction, [[Sullivan Expedition|General John Sullivan]] carried out a decisive [[scorched earth]] campaign that destroyed at least forty [[Iroquois]] villages throughout present-day central and upstate New York in retaliation for Iroquois and Tory attacks against American settlements earlier in the war. Washington delivered the final blow to the British in 1781, after a [[Battle of the Chesapeake|French naval victory]] allowed American and French forces to trap a British army in Virginia. The [[siege of Yorktown|surrender at Yorktown]] on October 17, 1781 marked the end of most fighting. Though known for his successes in the war and of his life that followed, Washington suffered many defeats before achieving victory.
|
||||
|
||||
[[Image:General George Washington Resigning his Commission.jpg|thumb|left|Depiction by [[John Trumbull]] of Washington resigning his commission as [[commander-in-chief]].]]
|
||||
In March 1783, Washington used his influence to disperse a [[Newburgh Conspiracy|group of Army officers]] who had threatened to confront Congress regarding their back pay. By the [[Treaty of Paris (1783)|Treaty of Paris]] (signed that September), Great Britain recognized the independence of the United States. Washington disbanded his army and, on November 2, gave an eloquent farewell address to his soldiers.<ref>[http://memory.loc.gov/cgi-bin/ampage?collId=mgw3&fileName=mgw3b/gwpage016.db&recNum=347 George Washington Papers 1741–1799: Series 3b Varick Transcripts], ''American Memory'', Library of Congress, Accessed May 22, 2006.</ref>
|
||||
|
||||
On November 25, the [[Evacuation Day (New York)|British evacuated New York City]], and Washington and the governor took possession. At [[Fraunces Tavern]] on December 4, Washington formally bade his officers farewell and on December 23, 1783, he resigned his commission as commander-in-chief, emulating the [[Cincinnatus|Roman general Cincinnatus]]. He was an exemplar of the republican ideal of citizen leadership who rejected power. During this period, the United States was governed without a President under the [[Articles of Confederation]], the forerunner to the [[United States Constitution|Constitution]].
|
||||
|
||||
Washington's retirement to Mount Vernon was short-lived. He made an exploratory trip to the western frontier in 1784,<ref name="GEN WASHINGTON"/> was persuaded to attend the Constitutional Convention in [[Philadelphia]] in the summer of 1787, and was unanimously elected president of the Convention. He participated little in the debates involved (though he did vote for or against the various articles), but his high prestige maintained collegiality and kept the delegates at their labors. The delegates designed the presidency with Washington in mind, and allowed him to define the office once elected. After the Convention, his support convinced many, including the Virginia legislature, to vote for ratification; the new [[United States Constitution|Constitution]] was ratified by all 13 states.
|
||||
|
||||
==Presidency==
|
||||
{{main|Presidency of George Washington}}
|
||||
|
||||
[[Image:George Washington 1795.jpg|left|thumb|upright|Portrait by [[Gilbert Stuart]], 1795]]
|
||||
The [[Electoral College (United States)|Electoral College]] elected Washington unanimously in [[United States presidential election, 1789|1789]], and again in the [[United States presidential election, 1792|1792 election]]; he remains the only president to receive 100% of the electoral votes. At his inauguration, he insisted on having Barbados Rum served.<ref>Frost, Doug (January 6, 2005). "[http://www.sfgate.com/cgi-bin/article.cgi?file=/c/a/2005/01/06/WIGMQAL3K21.DTL Rum makers distill unsavory history into fresh products]". San Francisco Chronicle.</ref> [[John Adams]] was elected [[Vice President of the United States|vice president]]. Washington took the [[Oath of office of the President of the United States|oath of office]] as the [[George Washington 1789 presidential inauguration|first President under the Constitution]] for the United States of America on April 30, 1789 at [[Federal Hall]] in New York City although, at first, he had not wanted the position.<ref name="Morison">{{cite book|last=Morison|first=Samuel Eliot|title=The Oxford History of the American People, Vol. 2|publisher=Meridian|year=1972|chapter=Washington's First Administration: 1789–1793}}</ref>
|
||||
|
||||
The [[1st United States Congress]] voted to pay Washington a salary of $25,000 a year—a large sum in 1789. Washington, already wealthy, declined the salary, since he valued his image as a selfless public servant. At the urging of Congress, however, he ultimately accepted the payment, to avoid setting a precedent whereby the presidency would be perceived as limited only to independently wealthy individuals who could serve without any salary. Washington attended carefully to the pomp and ceremony of office, making sure that the titles and trappings were suitably republican and never emulated European royal courts. To that end, he preferred the title "Mr. President" to the more majestic names suggested.<ref>[http://revwar.blogspot.com/2008/07/george-washington-part-5-of-5.html My Crazy RevWar Life: George Washington - Part 5 of 5<!-- Bot generated title -->]</ref>
|
||||
|
||||
Washington proved an able administrator. An excellent delegator and judge of talent and character, he held regular cabinet meetings to debate issues before making a final decision. In handling routine tasks, he was "systematic, orderly, energetic, solicitous of the opinion of others but decisive, intent upon general goals and the consistency of particular actions with them."<ref> Leonard D. White, ''The Federalists: A Study in Administrative History'' (1948)</ref>
|
||||
|
||||
Washington reluctantly served a [[George Washington 1793 presidential inauguration|second term]] as president. He refused to run for a third, establishing the customary policy of a maximum of two terms for a president which later became law by the [[Twenty-second Amendment to the United States Constitution|22nd Amendment to the Constitution]].<ref>After [[Franklin D. Roosevelt|Franklin Delano Roosevelt]] was elected to an unprecedented four terms, the two-term limit was formally integrated into the Federal Constitution by the 22nd Amendment.</ref>
|
||||
|
||||
===Domestic issues===
|
||||
Washington was not a member of any political party and hoped that they would not be formed, fearing conflict and stagnation. His closest advisors formed two factions, setting the framework for the future [[First Party System]]. Secretary of Treasury [[Alexander Hamilton]] had bold plans to establish the national credit and build a financially powerful nation, and formed the basis of the [[Federalist Party (United States)|Federalist Party]]. Secretary of State [[Thomas Jefferson]], founder of the [[Democratic-Republican Party|Jeffersonian Republicans]], strenuously opposed Hamilton's agenda, but Washington favored Hamilton over Jefferson.
|
||||
|
||||
The [[Residence Act|Residence Act of 1790]], which Washington signed, authorized the President to select the specific location of the permanent seat of the government, which would be located along the Potomac River. The Act authorized the President to appoint three commissioners to survey and acquire property for this seat. [[History of Washington, D.C.#Founding|Washington personally oversaw this effort]] throughout his term in office. In 1791, the commissioners named the permanent seat of government "The City of Washington in the Territory of Columbia" to honor Washington. In 1800, the Territory of Columbia became the [[District of Columbia]] when the federal government moved to the site in accordance with the provisions of the Residence Act.<ref>[http://books.google.com/books?id=5Q81AAAAIAAJ&printsec=titlepage&source=gbs_summary_r&cad=0#PPR1,M1 Crew, Harvey W., Webb, William Bensing, Wooldridge, John, ''Centennial History of the City of Washington, D.C.'', United Brethren Publishing House, Dayton, Ohio, 1892], [http://books.google.com/books?id=5Q81AAAAIAAJ&printsec=titlepage&source=gbs_summary_r&cad=0#PPA87,M1 Chapter IV. "Permanent Capital Site Selected", p. 87] ''in'' [http://books.google.com/books Google Books]. Accessed May 7, 2009.</ref><ref>[http://memory.loc.gov/cgi-bin/ampage?collId=llsl&fileName=001/llsl001.db&recNum=253 Text of Residence Act] ''in'' "[http://memory.loc.gov "American Memory" in official website of the U.S. Library of Congress] Accessed April 15, 2009.</ref>
|
||||
|
||||
In 1791, Congress imposed an [[excise]] on distilled [[Distilled beverage|spirits]], which led to protests in frontier districts, especially Pennsylvania. By 1794, after Washington ordered the protesters to appear in [[United States district court|U.S. district court]], the protests turned into full-scale riots known as the [[Whiskey Rebellion]]. The federal army was too small to be used, so Washington invoked the [[Militia Act of 1792]] to summon the militias of Pennsylvania, Virginia, and several other states. The governors sent the troops and Washington took command, marching into the rebellious districts.<ref>{{cite web |last=Hoover |first=Michael |url=http://www.ttb.gov/public_info/whisky_rebellion.shtml |title=The Whiskey Rebellion |accessdate=2007-10-19 |date= |publisher=[[Alcohol and Tobacco Tax and Trade Bureau|United States Alcohol and Tobacco Tax and Trade Bureau]]}}</ref> There was no fighting, but Washington's forceful action proved the new government could protect itself. It also was one of only two times that a sitting President would personally command the military in the field. These events marked the first time under the new constitution that the federal government used strong military force to exert authority over the states and citizens.
|
||||
|
||||
===Foreign affairs===
|
||||
[[Image:George Washington P1190516.jpg|thumb|upright|Statue of Washington in [[Paris]], [[France]]]]
|
||||
In 1793, the [[French Revolution|revolutionary government of France]] sent diplomat [[Edmond-Charles Genêt]], called "Citizen Genêt," to America. Genêt issued [[letter of marque|letters of marque and reprisal]] to American ships so they could capture British merchant ships. He attempted to turn popular sentiment towards American involvement in the [[French Revolutionary Wars|French war against Britain]] by creating a network of [[Democratic-Republican Societies]] in major cities. Washington rejected this interference in domestic affairs, demanded the French government recall Genêt, and denounced his societies.
|
||||
|
||||
Hamilton and Washington designed the [[Jay Treaty]] to normalize trade relations with Britain, remove them from western forts, and resolve financial debts left over from the Revolution. [[John Jay]] negotiated and signed the treaty on November 19, 1794. The Jeffersonians supported France and strongly attacked the treaty. Washington and Hamilton, however, mobilized public opinion and won ratification by the Senate by emphasizing Washington's support. The British agreed to depart their forts around the [[Great Lakes]], the Canadian-U.S. boundary was adjusted, numerous pre-Revolutionary debts were liquidated, and the British opened their West Indies colonies to American trade. Most importantly, the treaty delayed war with Britain and instead brought a decade of prosperous trade with that country. This angered the French and became a central issue in political debates.
|
||||
|
||||
===Farewell Address===
|
||||
[[George Washington's Farewell Address|Washington's Farewell Address]] (issued as a public letter in 1796) was one of the most influential statements of American political values.<ref> Matthew Spalding, ''The Command of its own Fortunes: Reconsidering Washington's Farewell address," in William D. Pederson, Mark J. Rozell, Ethan M. Fishman, eds. ''George Washington'' (2001) ch 2; Virginia Arbery, "Washington's Farewell Address and the Form of the American Regime." in Gary L. Gregg II and Matthew Spalding, eds. ''George Washington and the American Political Tradition.'' 1999 pp. 199–216.</ref>
|
||||
Drafted primarily by Washington himself, with help from Hamilton, it gives advice on the necessity and importance of national union, the value of the Constitution and the rule of law, the evils of political parties, and the proper virtues of a republican people. While he declined suggested versions<ref>[http://www.loc.gov/exhibits/religion/rel06.html Library of Congress - see Farewell Address section]</ref> that would have included statements that there could be no morality without religion, he called morality "a necessary spring of popular government". He said, "Whatever may be conceded to the influence of refined education on minds of peculiar structure, reason and experience both forbid us to expect that national morality can prevail in exclusion of religious principle."<ref>"[http://www.loc.gov/exhibits/religion/rel06.html Religion and the Federal Government]". Religion and the Founding of the American Republic. Library of Congress Exhibition. Retrieved on May 17, 2007.</ref>
|
||||
|
||||
Washington's public political address warned against foreign influence in domestic affairs and American meddling in European affairs. He warned against bitter partisanship in domestic politics and called for men to move beyond partisanship and serve the common good. He warned against 'permanent alliances with any portion of the foreign world' "<ref>"[http://avalon.law.yale.edu/18th_century/washing.asp Washington's Farewell Address, 1796]"</ref> , saying the United States must concentrate primarily on American interests. He counseled friendship and commerce with all nations, but warned against involvement in European wars and entering into long-term "entangling" alliances. The address quickly set American values regarding religion and foreign affairs.
|
||||
|
||||
==Retirement and death==
|
||||
After retiring from the presidency in March 1797, Washington returned to Mount Vernon with a profound sense of relief. He devoted much time to [[farming]].
|
||||
|
||||
On July 4, 1798, Washington was commissioned by President [[John Adams]] to be [[Lieutenant General]] and [[Commander-in-chief]] of the armies raised or to be raised for service in a prospective war with France. He served as the [[Commanding General of the United States Army|senior officer of the United States Army]] between July 13, 1798 and December 14, 1799. He participated in the planning for a Provisional Army to meet any emergency that might arise, but did not take the field.<ref name="GEN WASHINGTON"/><ref name="WORLD BOOK 1969">{{cite book |comment=This reference is only for the July 4, 1798 date of the commissioning as a "Lieutenant General and Commander-in-chief of the armies raised or to be raised." (note this source notes that GW was commissioned while the CMH reference uses "appointed". The quote is slightly different in that this source has "of the armies raised" while the CMH reference uses "of all armies raised") |title=The World Book Encyclopedia |edition=1969 |volume=W*X*Y*Z |date=1969 |origyear=1917 |publisher=Field Enterprises Educational Corporation |oclc= |doi= |bibcode= |id=LOC 69-10030 |page=84a}}</ref>
|
||||
|
||||
On December 12, 1799, Washington spent several hours inspecting his farms on horseback, in snow and later hail and freezing rain. He sat down to dine that evening without changing his wet clothes. The next morning, he awoke with a bad cold, fever, and a throat infection called [[peritonsillar abscess|quinsy]] that turned into acute [[laryngitis]] and [[pneumonia]]. Washington died on the evening of December 14, 1799, at his home aged 67, while attended by Dr. [[James Craik]], one of his closest friends, Dr. [[Gustavus Richard Brown]], Dr. [[Elisha C. Dick]], and [[Tobias Lear V]], Washington's personal secretary. Lear would record the account in his journal, writing that Washington's last words were "''<nowiki>'</nowiki>Tis well.''"
|
||||
|
||||
Modern doctors believe that Washington died largely because of his treatment, which included [[Mercury(I) chloride|calomel]] and [[bloodletting]], resulting in a combination of [[shock (circulatory)|shock]] from the loss of five pints of blood, as well as [[asphyxia]] and [[dehydration]].<ref>{{cite web |last=Vadakan, M.D. |first=Vibul V. |title=A Physician Looks At The Death of Washington |work=Early America Review |publisher=Archiving Early America |date=Winter/Spring 2005 |url=http://www.earlyamerica.com/review/2005_winter_spring/washingtons_death.htm|accessdate=2008-02-17 }}</ref> Washington's remains were buried at Mount Vernon. To protect their privacy, Martha Washington burned the correspondence between her husband and herself following his death. Only three letters between the couple have survived.
|
||||
|
||||
Throughout the world men and women were saddened by Washington's death. [[Napoleon I of France|Napoleon]] ordered ten days of mourning throughout France and in the United States thousands wore mourning clothes for months.<ref name="WORLD BOOK 1969"/><ref>http://www.washingtondaylight.org/news/GW-Birthday-Speech.pdf</ref> On December 18, 1799, a funeral was held at Mount Vernon.<ref>{{cite web| url=http://gwpapers.virginia.edu/project/exhibit/mourning/funeral.html| title=The Funeral| work=The Papers of George Washington| publisher=University of Virginia }}</ref>
|
||||
|
||||
==Administration, Cabinet and Supreme Court appointments==
|
||||
{{Col-begin}}
|
||||
|
||||
{{Col-1-of-3}}
|
||||
{{Infobox U.S. Cabinet |align=left |clear=yes |Name=Washington
|
||||
|President=George Washington |President start=1789 |President end=1797
|
||||
|Vice President=[[John Adams]] |Vice President start=1789 |Vice President end=1797
|
||||
|State=[[Thomas Jefferson]] |State start=1790 |State end=1793
|
||||
|State 2=[[Edmund Randolph]] |State start 2=1794 |State end 2=1795
|
||||
|State 3=[[Timothy Pickering]] |State start 3=1795 |State end 3=1797
|
||||
|Treasury=[[Alexander Hamilton]] |Treasury start=1789 |Treasury end=1795
|
||||
|Treasury 2=[[Oliver Wolcott, Jr.]] |Treasury start 2=1795 |Treasury end 2=1797
|
||||
|War=[[Henry Knox]] |War start=1789 |War end=1794
|
||||
|War 2=[[Timothy Pickering]] |War start 2=1794 |War end 2=1795
|
||||
|War 3=[[James McHenry]] |War start 3=1796 |War end 3=1797
|
||||
|Justice=[[Edmund Randolph]] |Justice start=1789 |Justice end=1794
|
||||
|Justice 2=[[William Bradford (Attorney General)|William Bradford]] |Justice start 2=1794 |Justice end 2=1795
|
||||
|Justice 3=[[Charles Lee (Attorney General)|Charles Lee]] |Justice start 3=1795 |Justice end 3=1797
|
||||
}}
|
||||
|
||||
{{Col-2-of-3}}
|
||||
<u>'''[[Chief Justice of the United States|Chief Justice]]'''</u>
|
||||
* [[John Jay]] - 1789
|
||||
* [[John Rutledge]] - 1795
|
||||
* [[William Cushing]] - 1796; declined
|
||||
* [[Oliver Ellsworth]] - 1796
|
||||
|
||||
<u>'''[[Associate Justice of the Supreme Court of the United States|Associate Justice]]'''</u>
|
||||
* [[John Rutledge]] - 1789
|
||||
* [[William Cushing]] - 1789
|
||||
* [[James Wilson]] - 1789
|
||||
* [[Robert H. Harrison]] - 1789; declined
|
||||
* [[John Blair]] - 1789
|
||||
* [[James Iredell]] - 1790
|
||||
* [[Thomas Johnson (Maryland)|Thomas Johnson]] - 1792
|
||||
* [[William Paterson (judge)|William Paterson]] - 1793
|
||||
* [[Samuel Chase]] - 1796
|
||||
|
||||
During his tenure as President, Washington appointed more Justices to the [[Supreme Court of the United States]] (10) than any other president succeeding him.
|
||||
|
||||
'''Original states joining the Union''':</u>
|
||||
* [[North Carolina]] - 1789
|
||||
* [[Rhode Island]] - 1790
|
||||
|
||||
'''New states admitted to the Union''':</u>
|
||||
* [[Vermont]] - 1791
|
||||
* [[Kentucky]] - 1792
|
||||
* [[Tennessee]] - 1796
|
||||
|
||||
{{Col-3-of-3}}
|
||||
[[Image:Washington (3).jpg|thumb|center|Portrait of George Washington by [[Gilbert Stuart]]]]
|
||||
|
||||
{{col-end}}
|
||||
|
||||
==Legacy==
|
||||
{{main|George Washington's legacy|Cultural depictions of George Washington}}
|
||||
Congressman Henry Lee, a Revolutionary War comrade and father of the Civil War general Robert E. Lee, famously eulogized Washington as follows:
|
||||
:First in war, first in peace, and first in the hearts of his countrymen, he was second to none in humble and enduring scenes of private life. Pious, just, humane, temperate, and sincere; uniform, dignified, and commanding; his example was as edifying to all around him as were the effects of that example lasting…Correct throughout, vice shuddered in his presence and virtue always felt his fostering hand. The purity of his private character gave effulgence to his public virtues…Such was the man for whom our nation mourns.<ref name="LeeEulogy"/>
|
||||
|
||||
Lee's words set the standard by which Washington's overwhelming reputation was impressed upon the American memory. Washington set many precedents for the national government and the presidency in particular.
|
||||
|
||||
As early as 1778, Washington was lauded as the "[[Father of the Nation|Father of His Country]]."<ref>He has gained fame around the world as a quintessential example of a benevolent national founder. Gordon Wood concludes that the greatest act in his life was his resignation as commander of the armies—an act that stunned aristocratic Europe. Gordon Wood, ''The Radicalism of the American Revolution'' (1992), pp 105–6; Edmund Morgan, ''The Genius of George Washington'' (1980), pp 12–13; Sarah J. Purcell, ''Sealed With Blood: War, Sacrifice, and Memory in Revolutionary America'' (2002) p. 97; Don Higginbotham, ''George Washington'' (2004); Ellis, 2004. The earliest known image in which Washington is identified as such is on the cover of the circa 1778 [[Pennsylvania Dutch|Pennsylvania German]] almanac (Lancaster: Gedruckt bey Francis Bailey).</ref>
|
||||
|
||||
During the [[United States Bicentennial]] year, George Washington was posthumously appointed to the grade of [[General of the Armies| General of the Armies of the United States]] by the congressional joint resolution [[s:Public Law 94-479|Public Law 94-479]] of January 19, 1976, approved by President [[Gerald Ford]] on October 11, 1976, and formalized in Department of the Army [[s:Order 31-3|Order 31-3]] of March 13, 1978 with an effective appointment date of July 4, 1976.<ref name="GEN WASHINGTON"/> This restored Washington's position as the highest ranking military officer in U.S. history.
|
||||
|
||||
===Monuments and memorials===
|
||||
Today, Washington's face and image are often used as national symbols of the United States, along with the icons such as the flag and great seal. Perhaps the most prominent commemoration of his legacy is the use of his image on the [[United States one-dollar bill|one-dollar bill]] and the [[Quarter (United States coin)|quarter-dollar coin]]. Washington, together with [[Theodore Roosevelt]], [[Thomas Jefferson]], and [[Abraham Lincoln]], is depicted in stone at the [[Mount Rushmore|Mount Rushmore Memorial]]. The [[Washington Monument]], one of the most well-known American landmarks, was built in his honor. The [[George Washington Masonic National Memorial]] in Alexandria, Virginia, constructed entirely with voluntary contributions from members of the [[Freemasonry|Masonic]] Fraternity, was also built in his honor.<ref>[http://www.gwmemorial.org/ Welcome to the George Washington Masonic Memorial<!-- Bot generated title -->]</ref>
|
||||
|
||||
Many things have been [[List of places named for George Washington|named in honor of Washington]]. Washington's name became that of the nation's capital, [[Washington, D.C.]], only one of two capitals across the globe to be named after an American president (the other is [[Monrovia, Liberia|Monrovia]], [[Liberia]]). The [[Washington|State of Washington]] is the only state to be named after an American ([[Henrietta Maria of France|Maryland]], [[Virginia#Virginia Colony: 1607–1776|Virginia]], [[Province of Carolina|the Carolinas]], and [[Georgia (U.S. state)#History|Georgia]] are all named in honor of British monarchs). [[The George Washington University|George Washington University]] and [[Washington University in St. Louis]] were named for him, as was [[Washington and Lee University]] (once Washington Academy), which was renamed due to Washington’s large endowment in 1796. Countless American cities and towns feature a Washington Street among their thoroughfares.
|
||||
|
||||
The [[Confederate Seal]] prominently featured George Washington on horseback, in the same position as a statue of him in [[Richmond, Virginia]].
|
||||
|
||||
===Washington and slavery===
|
||||
{{main|George Washington and slavery}}
|
||||
|
||||
The slave trade continued throughout George Washington’s life. On the death of his father in 1743, the 11-year-old inherited 10 slaves. At the time of his marriage to Martha Custis in 1759, he personally owned at least 36 (and the widow's third of her first husband's estate brought at least 85 "dower slaves" to Mount Vernon). Using his wife's great wealth he bought land, tripling the size of the plantation, and additional slaves to farm it. By 1774 he paid taxes on 135 slaves (this does not include the "dowers"). The last record of a slave purchase by him was in 1772, although he later received some slaves in repayment of debts.<ref>Fritz Hirschfeld, ''George Washington and Slavery: A Documentary Portrayal'', University of Missouri, 1997, pp. 11-12</ref>
|
||||
|
||||
Before the American Revolution, Washington expressed no moral reservations about slavery, but in 1786, Washington wrote to Robert Morris that "there is not a man living who wishes more sincerely than I do, to see a plan adopted for the abolition of slavery."<ref>Letter of April 12, 1786, in W. B. Allen, ed., George Washington: A Collection (Indianapolis: Library Classics, 1989), 319.</ref> In 1778 he wrote to his manager at Mount Vernon that he wished "to get quit of negroes." Maintaining a large, and increasingly elderly, slave population at Mount Vernon was not economically profitable. Washington could not legally sell the "dower slaves", however, and because these slaves had long intermarried with his own slaves, he could not sell his slaves without breaking up families.<ref>Slave raffle linked to Washington's reassessment of slavery: Wiencek, pp. 135–36, 178–88. Washington's decision to stop selling slaves: Hirschfeld, p. 16. Influence of war and Wheatley: Wiencek, ch 6. Dilemma of selling slaves: Wiencek, p. 230; Ellis, pp. 164–7; Hirschfeld, pp. 27–29.</ref>
|
||||
|
||||
As president, Washington brought seven slaves to New York City in 1789 to work in the first presidential household{{ndash}} [[Oney Judge]], Moll, Giles, Paris, Austin, [[Christopher Sheels]], and [[William Lee (valet)|William Lee]]. Following the transfer of the national capital to Philadelphia in 1790, he brought nine slaves to work in the [[President's House (Philadelphia, Pennsylvania)|President's House]]{{ndash}} [[Oney Judge]], Moll, Giles, Paris, Austin, [[Christopher Sheels]], [[Hercules (chef)|Hercules]], Richmond, and Joe (Richardson).<ref>[http://www.ushistory.org/presidentshouse/slaves/index.htm Biographical sketches of the 9]</ref> Oney Judge and Hercules escaped to freedom from Philadelphia, and there were foiled escape attempts from Mount Vernon by Richmond and Christopher Sheels.
|
||||
|
||||
[[Pennsylvania]] had begun an abolition of slavery in 1780, and prohibited non-residents from holding slaves in the state longer than six months. If held beyond that period, the state's Gradual Abolition Law<ref>[http://www.ushistory.org/presidentshouse/history/gradual.htm Pennsylvania's Gradual Abolition Law (1780)]
|
||||
</ref> gave those slaves the power to free themselves. Washington argued (privately) that his presence in Pennsylvania was solely a consequence of Philadelphia's being the temporary seat of the federal government, and that the state law should not apply to him. On the advice of his attorney general, [[Edmund Randolph]], he systematically rotated the President's House slaves in and out of the state to prevent their establishing a six-month continuous residency. This rotation was itself a violation of the Pennsylvania law, but the President's actions were not challenged.
|
||||
|
||||
The [[Fugitive Slave Act of 1793]]<ref>[http://www.ushistory.org/presidentshouse/history/slaveact1793.htm The Fugitive Slave Act of 1793]</ref> established the legal mechanism by which a slaveholder could recover his property, a right guaranteed by the [[Fugitive Slave Clause]] of the U.S. Constitution (Article IV, Section 2). Passed overwhelmingly by Congress and signed into law by Washington, the 1793 Act made assisting an escaped slave a federal crime, overruled all state and local laws giving escaped slaves sanctuary, and allowed slavecatchers into every U.S. state and territory.
|
||||
|
||||
Washington was the only prominent, slaveholding Founding Father who succeeded in emancipating his slaves. His actions were influenced by his close relationship with [[Marquis de La Fayette]]. He did not free his slaves in his lifetime, however, but included a provision in his will to free his slaves upon the death of his wife. At the time of his death, there were 317 slaves at Mount Vernon{{ndash}} 123 owned by Washington, 154 "dower slaves," and 40 rented from a neighbor.<ref>[http://gwpapers.virginia.edu/documents/will/slavelist.html 1799 Mount Vernon Slave Census]</ref>
|
||||
|
||||
Martha Washington bequeathed the one slave she owned outright{{ndash}} Elisha{{ndash}} to her grandson [[George Washington Parke Custis]]. Following her death in 1802, the dower slaves were inherited by her grandchildren.
|
||||
|
||||
It has been argued that Washington did not speak out publicly against slavery, because he did not wish to create a split in the new republic, with an issue that was sensitive and divisive.<ref>Twohig, "That Species of Property", pp. 127–28.</ref> Even if Washington had opposed the Fugitive Slave Act of 1793, his veto probably would have been overridden. (The Senate vote was not recorded, but the House passed it overwhelmingly, 47 to 8.)<ref>[http://www.ushistory.org/presidentshouse/slaves/numbers.htm Slavery by the Numbers]</ref>
|
||||
|
||||
{{Gallery
|
||||
|title=Cultural depictions of George Washington
|
||||
|lines=4
|
||||
|Image:Federal Hall NYC 27.JPG|The statue of Washington outside [[Federal Hall]] in [[New York City]], looking on [[Wall Street]].
|
||||
|File:Mount Rushmore2.jpg|Construction on the George Washington portrait at [[Mount Rushmore]], c. 1932.
|
||||
|Image:2006 Quarter Proof.png|Washington is commemorated on the [[Quarter (United States coin)|quarter]].
|
||||
|Image:George Washigton Presidential $1 Coin obverse.png|Washington is also commemorated on some [[dollar coin (United States)|dollar coins]].
|
||||
}}
|
||||
|
||||
==Religious beliefs==
|
||||
{{main|George Washington and religion}}
|
||||
Washington was [[baptism|baptized]] into the [[Church of England]].<ref>Family Bible entry http://www.nps.gov/history/history/online_books/hh/26/hh26f.htm</ref><ref>Image of page from family Bible http://gwpapers.virginia.edu/project/faq/bible.html</ref> In 1765, when the Church of England was still the [[state religion]],<ref>[http://www.history.org/Almanack/life/religion/religiondfn.cfm Colonial Williamsburg website] has several articles on religion in colonial Virginia</ref> he served on the [[vestry]] (lay council) for his local church. Throughout his life, he spoke of the value of righteousness, and of seeking and offering thanks for the "blessings of Heaven."
|
||||
|
||||
In a letter to George Mason in 1785, Washington wrote that he was not among those alarmed by a bill "making people pay towards the support of that [religion] which they profess," but felt that it was "impolitic" to pass such a measure, and wished it had never been proposed, believing that it would disturb public tranquility.<ref>{{cite web|url=http://memory.loc.gov/mss/mgw/mgw2/012/2440242.jpg|title=George Washington to George Mason, October 3, 1785, LS|publisher=Library of Congress: American Memory|accessdate=2006-09-05}}</ref>
|
||||
|
||||
His adopted daughter, Nelly Custis Lewis, stated: "I have heard her [Nelly's mother, Eleanor Calvert Custis, who resided in Mount Vernon for two years] say that General Washington always received the sacrament with my grandmother [Martha Washington] before the revolution."<ref>[http://www.ushistory.org/valleyforge/youasked/060.htm ushistory.org] [[Eleanor Parke Custis Lewis]]' letter written to [[Jared Sparks]], 1833</ref> After the revolution, Washington frequently accompanied his wife to Christian church services; however, there is no record of his ever taking communion, and he would regularly leave services before communion—with the other non-communicants (as was the custom of the day), until, after being admonished by a rector, he ceased attending at all on communion Sundays.<ref>{{cite web|title=Annals of the American Pulpit|volume=Vol. v|pages=p 394|first=Rev. Wm. B.|last=Sprague|url=http://books.google.ca/books?id=_xISAAAAYAAJ&pg=PA394&dq=sprague+annals+abercrombie+washington}}</ref><ref>{{cite web|url=http://query.nytimes.com/mem/archive-free/pdf?_r=1&res=9404E1DA1138E033A25751C0A9679C94649FD7CF&oref=slogin|title=article reprinted from ''Episcopal Recorder''|date=1885-01-02|first=Rev. E.D.|last=Neill|format=PDF|publisher=NY Times|pages=p 3|length=510 words}}</ref>
|
||||
Prior to communion, believers are admonished to take stock of their spiritual lives and not to participate in the ceremony unless he finds himself in the will of God.<ref name=Steiner>{{cite web|url=http://www.infidels.org/library/historical/franklin_steiner/presidents.html#1|title=''The Religious Beliefs of Our Presidents''|first=Franklin|last=Steiner|publisher=Internet Infidels}}</ref><ref>[http://www.ushistory.org/valleyforge/youasked/060.htm] [[Eleanor Parke Custis Lewis]]' letter written to [[Jared Sparks]], 1833</ref>
|
||||
Historians and biographers continue to debate the degree to which he can be counted as a Christian, and the degree to which he was a [[deist]].
|
||||
|
||||
He was an early supporter of [[religious toleration]] and [[freedom of religion]]. In 1775, he ordered that his troops not show [[anti-Catholic]] sentiments by burning the pope in [[effigy]] on [[Guy Fawkes Night]]. When hiring workmen for Mount Vernon, he wrote to his agent, "If they be good workmen, they may be from Asia, Africa, or Europe; they may be [[Mohammedan]]s, Jews, or Christians of any sect, or they may be Atheists."<ref name=Steiner/><ref>
|
||||
{{cite book |first=Paul F |last=Boller |title=George Washington & Religion |year=1963|page=118}}
|
||||
letter to Tench Tilghman asking him to secure a carpenter and a bricklayer for his Mount Vernon estate, March 24, 1784</ref> In 1790, he wrote a response to a letter from the [[Touro Synagogue]], in which he said that as long as people remain good citizens, their faith does not matter. This was a relief to the Jewish community of the United States, since the Jews had been either expelled or discriminated against in many European countries.
|
||||
:...the Government of the United States ... gives to bigotry no sanction, to persecution no assistance. ... May the children of the Stock of Abraham, who dwell in this land, continue to merit and enjoy the good will of the other Inhabitants; while every one shall sit in safety under his own vine and figtree, and there shall be none to make him afraid. May the father of all mercies scatter light and not darkness in our paths, and make us all in our several vocations useful here, and in his own due time and way everlastingly happy.
|
||||
|
||||
The [[United States Bill of Rights]] was in the process of being ratified at the time.
|
||||
|
||||
==Personal life==
|
||||
In addition to Martha's biological family noted above, George Washington had a close relationship with his nephew and heir [[Bushrod Washington]], son of George's younger brother [[John Augustine Washington]]. Bushrod became an Associate Justice on the [[US Supreme Court]] after George's death.
|
||||
|
||||
As a young man, Washington had red hair.<ref>{{cite web|url=http://gwpapers.virginia.edu/articles/news/chicago.html|title=Taking a New Look at George Washington|accessdate=2007-09-28|last=Homans|first=Charles|date=2004-10-06|work=The Papers of George Washington: Washington in the News|publisher=Alderman Library, University of Virginia}}</ref><ref>{{citation|url= |title=Unmasking George Washington|accessdate=2007-09-28|last=Ross|first=John F|date=October 2005|year=2005|publisher=Smithsonian Magazine}}</ref> A popular myth is that he wore a wig, as was the fashion among some at the time. Washington did not wear a wig; instead he powdered his hair,<ref>{{cite web|url=http://www.mountvernon.org/visit/plan/index.cfm/pid/446/|title=George Washington's Mount Vernon: Answers|accessdate=2006-06-30}}</ref> as represented in several portraits, including the well-known unfinished [[Gilbert Stuart]] depiction.<ref>{{cite web|url=http://www.npg.si.edu/cexh/stuart/athen1.htm|title=Smithsonian National Picture Gallery: George Washington (the Athenaeum portrait)|accessdate=2006-06-30|author=Gilbert Stuart}}</ref>
|
||||
|
||||
Washington suffered from problems with his teeth throughout his life. He lost his first tooth when he was twenty-two and had only one left by the time he became President.<ref name="teeth">[[John Lloyd (writer)|Lloyd, J]] & [[John Mitchinson|Mitchinson, J]]: ''[[The Book of General Ignorance]]''. Faber & Faber, 2006.</ref> According to [[John Adams]], he lost them because he used them to crack Brazil nuts. Modern historians suggest the [[mercury(II) oxide|mercury oxide]] which he was given to treat illnesses such as [[smallpox]] and [[malaria]] probably contributed to the loss.<ref name=teeth/> He had several sets of false teeth made, four of them by a dentist named John Greenwood.<ref name="teeth"/> Contrary to popular belief, none of the sets were made from wood. The set made when he became President was carved from hippopotamus and elephant ivory, held together with gold springs.<ref name="teeth"/><ref>{{cite web|url=http://www.americanrevolution.org/dental.html|title=George Washington - A Dental Victim|accessdate=2006-06-30|author=Barbara Glover}}</ref> The hippo ivory was used for the plate, into which real human teeth and also bits of horses' and donkeys' teeth were inserted.<ref name="teeth"/> Dental problems left Washington in constant discomfort, for which he took [[laudanum]]. This distress may be apparent in many of the portraits painted while he was still in office, including the one still used on the $1 bill.<ref name="teeth"/>
|
||||
|
||||
One of the most enduring myths about George Washington involves his chopping down his father's cherry tree and, when asked about it, using the famous line "I cannot tell a lie, I did it with my little hatchet." In fact, there is no evidence that this ever occurred.<ref>{{cite web|url=http://www.class.uidaho.edu/ngier/305/foundfathers.htm|title=Religious Liberalism and the Founding Fathers|author=Nicholas F. Gier, University of Idaho, Moscow, Idaho|date=1980 and 2005|accessdate=2007-12-11}}</ref> It, along with the story of Washington throwing a silver dollar across the [[Potomac River]], was part of a book of mythic stories authored by [[Parson Weems|Mason Weems]] that made Washington a legendary figure beyond his wartime and presidential achievements.
|
||||
|
||||
==See also==
|
||||
{{Wikipedia-Books}}
|
||||
*[[American Revolution]]
|
||||
*[[List of federal judges appointed by George Washington]]
|
||||
*[[Military career of George Washington]]
|
||||
*[[Town Destroyer]], a nickname given to Washington by the [[Iroquois]]
|
||||
*[[Betty Washington Lewis]], his sister
|
||||
|
||||
==References: biographies==
|
||||
<div class="references-small">
|
||||
*Buchanan, John. ''The Road to Valley Forge: How Washington Built the Army That Won the Revolution'' (2004). 368 pp.
|
||||
*Burns, James MacGregor and Dunn, Susan. ''George Washington.'' Times, 2004. 185 pp. explore leadership style
|
||||
*Cunliffe, Marcus. ''George Washington: Man and Monument'' (1958), explores both the biography and the myth
|
||||
*Grizzard, Frank E., Jr. ''George! A Guide to All Things Washington.'' Buena Vista and Charlottesville, VA: Mariner Publishing. 2005. ISBN 0-9768238-0-2. Grizzard is a leading scholar of Washington.
|
||||
*Hirschfeld, Fritz. ''George Washington and Slavery: A Documentary Portrayal''. University of Missouri Press, 1997.
|
||||
*[[Joseph J. Ellis|Ellis, Joseph J.]] ''[[His Excellency: George Washington]]''. (2004) ISBN 1-4000-4031-0. Acclaimed interpretation of Washington's career.
|
||||
*Elkins, Stanley M. and Eric McKitrick. ''The Age of Federalism.'' (1994) the leading scholarly history of the 1790s.
|
||||
*Ferling, John E. ''The First of Men: A Life of George Washington'' (1989). Biography from a leading scholar.
|
||||
*Fischer, David Hackett. ''Washington's Crossing.'' (2004), prize-winning military history focused on 1775–1776.
|
||||
*Flexner, James Thomas. ''Washington: The Indispensable Man.'' (1974). ISBN 0-316-28616-8 (1994 reissue). Single-volume condensation of Flexner's popular four-volume biography.
|
||||
*[[Douglas S. Freeman|Freeman, Douglas S.]] ''George Washington: A Biography''. 7 volumes, 1948–1957. The standard scholarly biography, winner of the Pulitzer Prize. A single-volume abridgement by Richard Harwell appeared in 1968
|
||||
*Grizzard, Frank E., Jr. ''George Washington: A Biographical Companion.'' ABC-CLIO, 2002. 436 pp. Comprehensive encyclopedia by leading scholar
|
||||
*Grizzard, Frank E., Jr. ''The Ways of Providence: Religion and George Washington.'' Buena Vista and Charlottesville, VA: Mariner Publishing. 2005. ISBN 0-9768238-1-0.
|
||||
*Higginbotham, Don, ed. ''George Washington Reconsidered''. University Press of Virginia, (2001). 336 pp of essays by scholars
|
||||
*Higginbotham, Don. ''George Washington: Uniting a Nation.'' Rowman & Littlefield, (2002). 175 pp.
|
||||
*Hofstra, Warren R., ed. ''George Washington and the Virginia Backcountry''. Madison House, 1998. Essays on Washington's formative years.
|
||||
*Lengel, Edward G. ''General George Washington: A Military Life.'' New York: Random House, 2005. ISBN 1-4000-6081-8.
|
||||
*Lodge, Henry Cabot. ''George Washington,'' 2 vols. (1889), [http://www.gutenberg.org/etext/12652 vol 1 at Gutenberg]; [http://www.gutenberg.org/etext/12653 vol 2 at Gutenberg]
|
||||
*McDonald, Forrest. ''The Presidency of George Washington''. 1988. Intellectual history showing Washington as exemplar of republicanism.
|
||||
*[[Richard Norton Smith|Smith, Richard Norton]] ''Patriarch: George Washington and the New American Nation'' Focuses on last 10 years of Washington's life.
|
||||
*Spalding, Matthew. "George Washington's Farewell Address." ''The Wilson Quarterly'' v20#4 (Autumn 1996) pp: 65+.
|
||||
*Stritof, Sheri and Bob. "George and Martha Washington" http://marriage.about.com/od/presidentialmarriages/p/gwashington.htm
|
||||
*Wiencek, Henry. ''An Imperfect God: George Washington, His Slaves, and the Creation of America''. (2003).
|
||||
</div>
|
||||
|
||||
==Further reading==
|
||||
{{see|George Washington bibliography}}
|
||||
|
||||
==Notes==
|
||||
{{reflist|2}}
|
||||
<references />
|
||||
|
||||
==External links==
|
||||
{{Spoken Wikipedia-2|2008-05-28|George_Washington_part_1.ogg|George_Washington_part_2.ogg}}
|
||||
{{sisterlinks|George Washington}}
|
||||
*{{gutenberg author|id=George+Washington+(1732-1799) | name=George Washington}}
|
||||
*[http://etext.lib.virginia.edu/washington/ George Washington Resources] from the [[University of Virginia]]
|
||||
*[http://www.mountvernon.org/ George Washington's Mount Vernon Estate & Gardens]
|
||||
*[http://millercenter.org/index.php/academic/americanpresident/washington George Washington] from the [[Miller Center of Public Affairs]], University of Virginia
|
||||
*[http://www.loc.gov/rr/program/bib/ourdocs/commission.html Washington's Commission as Commander in Chief] from the [[Library of Congress]]
|
||||
*[http://www.nps.gov/gewa/ George Washington Birthplace National Monument] from the [[National Park Service]]
|
||||
|
||||
{{s-start}}
|
||||
{{s-mil}}
|
||||
{{s-bef|before=Position created}}
|
||||
{{s-ttl|title=[[Commanding General of the United States Army|Continental Army General and Commander In Chief]]|years=June 15, 1775–December 23, 1783}}
|
||||
{{s-aft|after=Maj. Gen. [[Henry Knox]]<br />(Senior Officer of the US Army)}}
|
||||
{{s-bef|before=Brig. [[James Wilkinson]]}}
|
||||
{{s-ttl|title=[[Commanding General of the United States Army|Senior Officer of the United States Army]]|years=July 13, 1798–December 14, 1799}}
|
||||
{{s-aft|after=Maj. Gen. [[Alexander Hamilton]]}}
|
||||
{{s-off}}
|
||||
{{s-bef|before=Position created}}
|
||||
{{s-ttl|title=[[President of the United States]]|years=April 30, 1789–March 4, 1797}}
|
||||
{{s-aft|after=[[John Adams]]}}
|
||||
{{s-hon}}
|
||||
{{s-new}}
|
||||
{{s-ttl|title=[[oldest living United States president|Oldest U.S. President still living]]|years=April 30, 1789{{ndash}} December 14, 1799}}
|
||||
{{s-aft|after=[[John Adams]]}}
|
||||
{{s-aca}}
|
||||
{{succession box | title=Chancellor of [[The College of William & Mary]] | before=[[Richard Terrick]] | after=[[John Tyler]]<br> | years=1788–1799}}
|
||||
{{s-end}}
|
||||
{{GeorgeWashington}}
|
||||
{{US Presidents}}
|
||||
{{United States Constitution signatories}}
|
||||
{{Washington cabinet}}
|
||||
{{US Army Chiefs of Staff}}
|
||||
{{Washington family}}
|
||||
|
||||
{{Persondata
|
||||
|NAME = Washington, George
|
||||
|ALTERNATIVE NAMES =
|
||||
|SHORT DESCRIPTION = 1st President of the United States, Commander in Chief of the Continental Army
|
||||
|DATE OF BIRTH = {{birth date|1732|2|22|mf=y}}
|
||||
|PLACE OF BIRTH = [[Colonial Beach, Virginia]], [[United States of America]]
|
||||
|DATE OF DEATH = {{death date|1799|12|14|mf=y}}
|
||||
|PLACE OF DEATH = [[Mount Vernon (plantation)]], [[Mount Vernon, Virginia]], United States of America
|
||||
}}
|
||||
[[Category:American Episcopalians]]
|
||||
[[Category:American farmers]]
|
||||
[[Category:1732 births]]
|
||||
[[Category:1799 deaths]]
|
||||
[[Category:American foreign policy writers]]
|
||||
[[Category:British colonial army officers]]
|
||||
[[Category:Chancellors of the College of William and Mary]]
|
||||
[[Category:College of William and Mary alumni]]
|
||||
[[Category:Congressional Gold Medal recipients]]
|
||||
[[Category:Continental Army generals]]
|
||||
[[Category:Continental Army officers from Virginia]]
|
||||
[[Category:Continental Congressmen from Virginia]]
|
||||
[[Category:George Washington| ]]
|
||||
[[Category:House of Burgesses members]]
|
||||
[[Category:People of Virginia in the French and Indian War]]
|
||||
[[Category:People of Virginia in the American Revolution]]
|
||||
[[Category:Presidents of the United States]]
|
||||
[[Category:Recipients of a posthumous promotion]]
|
||||
[[Category:Signers of the United States Constitution]]
|
||||
[[Category:United States presidential candidates, 1789]]
|
||||
[[Category:United States presidential candidates, 1792]]
|
||||
[[Category:United States presidential candidates, 1796]]
|
||||
[[Category:Virginia colonial people]]
|
||||
[[Category:Washington College alumni]]
|
||||
[[Category:Washington family]]
|
||||
[[Category:American planters]]
|
||||
[[Category:English Americans]]
|
||||
{{lifetime|1732|1799|Washington, George}}
|
||||
|
||||
{{Link FA|bg}}
|
||||
{{Link FA|dv}}
|
||||
[[af:George Washington]]
|
||||
[[am:ጆርጅ ዋሽንግተን]]
|
||||
[[ang:George Washington]]
|
||||
[[ar:جورج واشنطن]]
|
||||
[[arc:ܓܘܪܓ ܘܐܫܝܢܓܛܘܢ]]
|
||||
[[ast:George Washington]]
|
||||
[[az:Corc Vaşinqton]]
|
||||
[[bn:জর্জ ওয়াশিংটন]]
|
||||
[[zh-min-nan:George Washington]]
|
||||
[[ba:Джордж Вашингтон]]
|
||||
[[be:Джордж Вашынгтон]]
|
||||
[[be-x-old:Джордж Вашынгтон]]
|
||||
[[bar:George Washington]]
|
||||
[[bs:George Washington]]
|
||||
[[br:George Washington]]
|
||||
[[bg:Джордж Вашингтон]]
|
||||
[[ca:George Washington]]
|
||||
[[ceb:George Washington]]
|
||||
[[cs:George Washington]]
|
||||
[[co:George Washington]]
|
||||
[[cy:George Washington]]
|
||||
[[da:George Washington]]
|
||||
[[de:George Washington]]
|
||||
[[dv:ޖޯޖް ވޮޝިންގޓަން]]
|
||||
[[et:George Washington]]
|
||||
[[el:Τζωρτζ Ουάσινγκτων]]
|
||||
[[es:George Washington]]
|
||||
[[eo:George Washington]]
|
||||
[[eu:George Washington]]
|
||||
[[fa:جورج واشنگتن]]
|
||||
[[fo:George Washington]]
|
||||
[[fr:George Washington]]
|
||||
[[fy:George Washington]]
|
||||
[[ga:George Washington]]
|
||||
[[gd:Seòras Washington]]
|
||||
[[gl:George Washington]]
|
||||
[[gan:喬治·華盛頓]]
|
||||
[[ko:조지 워싱턴]]
|
||||
[[hy:Ջորջ Վաշինգտոն]]
|
||||
[[hi:जार्ज वाशिंगटन]]
|
||||
[[hr:George Washington]]
|
||||
[[io:George Washington]]
|
||||
[[id:George Washington]]
|
||||
[[is:George Washington]]
|
||||
[[it:George Washington]]
|
||||
[[he:ג'ורג' וושינגטון]]
|
||||
[[jv:George Washington]]
|
||||
[[kn:ಜಾರ್ಜ್ ವಾಷಿಂಗ್ಟನ್]]
|
||||
[[pam:George Washington]]
|
||||
[[ka:ჯორჯ ვაშინგტონი]]
|
||||
[[sw:George Washington]]
|
||||
[[ku:George Washington]]
|
||||
[[la:Georgius Washingtonius]]
|
||||
[[lv:Džordžs Vašingtons]]
|
||||
[[lb:George Washington]]
|
||||
[[lt:George Washington]]
|
||||
[[hu:George Washington]]
|
||||
[[mk:Џорџ Вашингтон]]
|
||||
[[mg:George Washington]]
|
||||
[[ml:ജോര്ജ് വാഷിംഗ്ടണ്]]
|
||||
[[mr:जॉर्ज वॉशिंग्टन]]
|
||||
[[arz:جورج واشينطون]]
|
||||
[[ms:George Washington]]
|
||||
[[nah:George Washington]]
|
||||
[[nl:George Washington (president)]]
|
||||
[[ja:ジョージ・ワシントン]]
|
||||
[[no:George Washington]]
|
||||
[[nn:George Washington]]
|
||||
[[oc:George Washington]]
|
||||
[[uz:George Washington]]
|
||||
[[pap:George Washington]]
|
||||
[[nds:George Washington]]
|
||||
[[pl:George Washington]]
|
||||
[[pt:George Washington]]
|
||||
[[ksh:George Washington]]
|
||||
[[ro:George Washington]]
|
||||
[[qu:George Washington]]
|
||||
[[ru:Вашингтон, Джордж]]
|
||||
[[sa:जार्ज वाशिंगटन]]
|
||||
[[sco:George Washington]]
|
||||
[[sq:George Washington]]
|
||||
[[scn:George Washington]]
|
||||
[[simple:George Washington]]
|
||||
[[sk:George Washington]]
|
||||
[[sl:George Washington]]
|
||||
[[sr:Џорџ Вашингтон]]
|
||||
[[sh:George Washington]]
|
||||
[[fi:George Washington]]
|
||||
[[sv:George Washington]]
|
||||
[[tl:George Washington]]
|
||||
[[ta:ஜார்ஜ் வாஷிங்டன்]]
|
||||
[[th:จอร์จ วอชิงตัน]]
|
||||
[[tg:Ҷорҷ Вашингтон]]
|
||||
[[tr:George Washington]]
|
||||
[[uk:Джордж Вашингтон]]
|
||||
[[ur:جارج واشنگٹن]]
|
||||
[[vi:George Washington]]
|
||||
[[zh-classical:華盛頓]]
|
||||
[[yi:דזשארזש וואשינגטאן]]
|
||||
[[bat-smg:Džuordžos Vašėngtuons]]
|
||||
[[zh:乔治·华盛顿]]
|
15
vendor/plugins/wikicloth/sample_documents/images.wiki
vendored
Normal file
15
vendor/plugins/wikicloth/sample_documents/images.wiki
vendored
Normal file
|
@ -0,0 +1,15 @@
|
|||
[[Image:wiki.png]]
|
||||
|
||||
[[Image:wiki.png|Wikipedia, The Free Encyclopedia.]]
|
||||
|
||||
[[Image:wiki.png|frame|Wikipedia Encyclopedia]]
|
||||
|
||||
[[Image:wiki.png|thumb|Wikipedia Encyclopedia]]
|
||||
|
||||
[[Image:wiki.png|right|Wikipedia Encyclopedia]]
|
||||
|
||||
[[Image:wiki.png|30 px]]
|
||||
|
||||
[[:Image:wiki.png]]
|
||||
|
||||
|
421
vendor/plugins/wikicloth/sample_documents/lists.wiki
vendored
Normal file
421
vendor/plugins/wikicloth/sample_documents/lists.wiki
vendored
Normal file
|
@ -0,0 +1,421 @@
|
|||
This page deals with creating lists in Mediawiki.
|
||||
|
||||
== List basics ==
|
||||
|
||||
[[MediaWiki]] offers three types of lists. '''Ordered lists''', '''unordered lists''', and '''definition lists'''. In the following sections, ordered lists are used for examples. Unordered lists would give corresponding results.
|
||||
|
||||
{|border="1" width="79%"
|
||||
!wikitext!!rendering
|
||||
|-
|
||||
|
|
||||
* Lists are easy to do:
|
||||
** start every line
|
||||
* with a star
|
||||
** more stars mean
|
||||
*** deeper levels
|
||||
||
|
||||
* Lists are easy to do:
|
||||
** start every line
|
||||
* with a star
|
||||
** more stars mean
|
||||
*** deeper levels
|
||||
|-
|
||||
|
|
||||
*A newline
|
||||
*in a list
|
||||
marks the end of the list.
|
||||
Of course
|
||||
*you can
|
||||
*start again.
|
||||
|
|
||||
*A newline
|
||||
*in a list
|
||||
marks the end of the list.
|
||||
Of course
|
||||
*you can
|
||||
*start again.
|
||||
|-
|
||||
|
|
||||
# Numbered lists are good
|
||||
## very organized
|
||||
## easy to follow
|
||||
|
|
||||
# Numbered lists are good
|
||||
## very organized
|
||||
## easy to follow
|
||||
|-
|
||||
|
|
||||
* You can also
|
||||
**break lines
|
||||
**like this
|
||||
|
|
||||
* You can also
|
||||
**break lines
|
||||
**like this
|
||||
|-
|
||||
|
|
||||
; Definition lists
|
||||
; item : definition
|
||||
; semicolon plus term
|
||||
: colon plus definition
|
||||
|
|
||||
; Definition lists
|
||||
; item : definition
|
||||
; semicolon plus term
|
||||
: colon plus definition
|
||||
|-
|
||||
|
|
||||
* Or create mixed lists
|
||||
*# and nest them
|
||||
*#* like this
|
||||
*#*; definitions
|
||||
*#*: work:
|
||||
*#*; apple
|
||||
*#*; banana
|
||||
*#*: fruits
|
||||
|
|
||||
* Or create mixed lists
|
||||
*# and nest them
|
||||
*#* like this
|
||||
*#*; definitions
|
||||
*#*: work:
|
||||
*#*; apple
|
||||
*#*; banana
|
||||
*#*: fruits
|
||||
|}{{-}}
|
||||
|
||||
== Paragraphs in lists ==
|
||||
|
||||
For simplicity, list items in wiki markup cannot be longer than a paragraph. A following blank line will end the list and reset the counter on ordered lists. Separating unordered list items usually has no noticeable effects.
|
||||
|
||||
Paragraphs can be forced in lists by using HTML tags. Two line break symbols, <code><nowiki><br><br></nowiki></code>, will create the desired effect. So will enclosing all but the first paragraph with <code><nowiki><p>...</p></nowiki></code>
|
||||
|
||||
For a list with items of more than one paragraph long, adding a blank line between items may be necessary to avoid confusion.
|
||||
|
||||
*lists
|
||||
**ordered lists
|
||||
**unordered lists
|
||||
***definition lists
|
||||
|
||||
==Continuing a list item after a sub-item==
|
||||
|
||||
In HTML, a list item may contain several sublists, not necessarily adjacent; thus there may be parts of the list item not only before the first sublist, but also between sublists, and after the last one; however, in wiki-syntax, sublists follow the same rules as sections of a page: the only possible part of the list item not in sublists is before the first sublist.
|
||||
|
||||
In the case of an unnumbered first-level list in wikitext code this limitation can be overcome by splitting the list into multiple lists; indented text between the partial lists may visually serve as part of a list item after a sublist; however, this may give, depending on CSS, a blank line before and after each list, in which case, for uniformity, every first-level list item could be made a separate list.
|
||||
|
||||
Numbered lists illustrate that what should look like one list may, for the software, consist of multiple lists; unnumbered lists give a corresponding result, except that the problem of restarting with 1 is not applicable.
|
||||
|
||||
{| style="border:1px;border-spacing:1px;background-color:black;" cellpadding="5"
|
||||
|- style="background-color:white;"
|
||||
|
|
||||
<nowiki>
|
||||
<ol>
|
||||
<li>list item A1
|
||||
<ol>
|
||||
<li>list item B1</li>
|
||||
<li>list item B2</li>
|
||||
</ol>continuing list item A1
|
||||
</li>
|
||||
<li>list item A2</li>
|
||||
</ol></nowiki>
|
||||
| <ol>
|
||||
<li>list item A1
|
||||
<ol>
|
||||
<li>list item B1</li>
|
||||
<li>list item B2</li>
|
||||
</ol>continuing list item A1
|
||||
</li>
|
||||
<li>list item A2</li>
|
||||
</ol>
|
||||
|- style="background-color:#E0E0E0;font-weight:bold;text-align:center;"
|
||||
| colspan="2" | vs.
|
||||
|- style="background-color:white;"
|
||||
|
|
||||
#list item A1
|
||||
##list item B1
|
||||
##list item B2
|
||||
#:continuing list item A1
|
||||
#list item A2
|
||||
|
|
||||
#list item A1
|
||||
##list item B1
|
||||
##list item B2
|
||||
#:continuing list item A1
|
||||
#list item A2
|
||||
|}
|
||||
|
||||
One level deeper, with a sublist item continuing after a sub-sublist, one gets even more blank lines; however, the continuation of the first-level list is not affected:
|
||||
<pre>
|
||||
#list item A1
|
||||
##list item B1
|
||||
###list item C1
|
||||
##:continuing list item B1
|
||||
##list item B2
|
||||
#list item A2
|
||||
</pre>
|
||||
gives
|
||||
#list item A1
|
||||
##list item B1
|
||||
###list item C1
|
||||
##:continuing list item B1
|
||||
##list item B2
|
||||
#list item A2
|
||||
|
||||
See also {{tim|List demo}} and [[Help:Section#Subdivisions in general|subdivisions]].
|
||||
|
||||
== Changing the list type ==
|
||||
|
||||
The list type (which type of marker appears before the list item) can be changed in CSS by setting the [http://www.w3.org/TR/REC-CSS2/generate.html#lists list-style-type] property:
|
||||
|
||||
{|border="1" width="79%"
|
||||
!wikitext!!rendering
|
||||
|-
|
||||
|
|
||||
<nowiki>
|
||||
<ol style="list-style-type:lower-roman">
|
||||
<li>About the author</li>
|
||||
<li>Foreword to the first edition</li>
|
||||
<li>Foreword to the second edition</li>
|
||||
</ol></nowiki>
|
||||
|<ol style="list-style-type:lower-roman">
|
||||
<li>About the author</li>
|
||||
<li>Foreword to the first edition</li>
|
||||
<li>Foreword to the second edition</li>
|
||||
</ol>
|
||||
|-
|
||||
|}
|
||||
|
||||
==Extra indentation of lists==
|
||||
In a numbered list in a large font, some browsers do not show more than two digits, unless extra indentation is applied (if there are multiple columns: for each column). This can be done with CSS:
|
||||
ol { margin-left: 2cm}
|
||||
or alternatively, like below.
|
||||
|
||||
{|border=1
|
||||
!wikitext!!rendering
|
||||
! style="width: 40%" | comments
|
||||
|-
|
||||
|
|
||||
<nowiki>
|
||||
:#abc
|
||||
:#def
|
||||
:#ghi
|
||||
</nowiki>
|
||||
|
|
||||
:#abc
|
||||
:#def
|
||||
:#ghi
|
||||
| A list of one or more lines starting with a colon creates a [http://www.w3.org/TR/html4/struct/lists.html#edef-DL definition list] without definition terms, and with the items as definition descriptions, hence indented. However, if the colons are in front of the codes "*" or "#" of an unordered or ordered list, the list is treated as one definition description, so the whole list is indented.
|
||||
|-
|
||||
|
|
||||
<nowiki>
|
||||
<ul>
|
||||
<ol>
|
||||
<li>abc</li>
|
||||
<li>def</li>
|
||||
<li>ghi</li>
|
||||
</ol>
|
||||
</ul>
|
||||
</nowiki>
|
||||
|
|
||||
<ul>
|
||||
<ol>
|
||||
<li>abc</li>
|
||||
<li>def</li>
|
||||
<li>ghi</li>
|
||||
</ol>
|
||||
</ul>
|
||||
| MediaWiki translates an unordered list (ul) without any list items (li) into a div with a <code>style="margin-left: 2em"</code>, causing indentation of the contents. This is '''the most versatile method''', as it allows starting with a number other than 1, see below.
|
||||
|
||||
|-
|
||||
|
|
||||
<nowiki>
|
||||
<ul>
|
||||
#abc
|
||||
#def
|
||||
#ghi
|
||||
</ul>
|
||||
</nowiki>
|
||||
|
|
||||
<ul>
|
||||
#abc
|
||||
#def
|
||||
#ghi
|
||||
</ul>
|
||||
|Like above, with the content of the "unordered list without any list items", which itself is an ordered list, expressed with # codes. The HTML produced, and hence the rendering, is the same. This is the '''recommended''' method when not starting with a number other than 1.
|
||||
|
||||
|}
|
||||
|
||||
To demonstrate that all three methods show all digits of 3-digit numbers, see [[m:Help:List demo|List demo]].
|
||||
|
||||
==Specifying a starting value==
|
||||
Specifying a starting value is only possible with HTML syntax.
|
||||
(W3C has deprecated the <code>start</code> and <code>value</code> attributes as used below in HTML 4.01 and XHTML 1.0. But as of 2007, no popular web browsers implement CSS counters, which were to replace these attributes. Wikimedia projects use XHTML Transitional, which contains the deprecated attributes.)
|
||||
|
||||
<pre>
|
||||
<ol start="9">
|
||||
<li>Amsterdam</li>
|
||||
<li>Rotterdam</li>
|
||||
<li>The Hague</li>
|
||||
</ol>
|
||||
</pre>
|
||||
gives
|
||||
<ol start="9">
|
||||
<li>Amsterdam</li>
|
||||
<li>Rotterdam</li>
|
||||
<li>The Hague</li>
|
||||
</ol>
|
||||
|
||||
Or:
|
||||
<pre>
|
||||
<ol>
|
||||
<li value="9">Amsterdam</li>
|
||||
<li value="8">Rotterdam</li>
|
||||
<li value="7">The Hague</li>
|
||||
</ol>
|
||||
</pre>
|
||||
gives
|
||||
<ol>
|
||||
<li value="9">Amsterdam</li>
|
||||
<li value="8">Rotterdam</li>
|
||||
<li value="7">The Hague</li>
|
||||
</ol>
|
||||
|
||||
==Comparison with a table==
|
||||
Apart from providing automatic numbering, the numbered list also aligns the contents of the items, comparable with using table syntax:
|
||||
<pre>
|
||||
{|
|
||||
|-
|
||||
| align=right | 9.||Amsterdam
|
||||
|-
|
||||
| align=right | 10.||Rotterdam
|
||||
|-
|
||||
| align=right | 11.||The Hague
|
||||
|}
|
||||
</pre>
|
||||
gives
|
||||
{|
|
||||
|-
|
||||
| align=right | 9.||Amsterdam
|
||||
|-
|
||||
| align=right | 10.||Rotterdam
|
||||
|-
|
||||
| align=right | 11.||The Hague
|
||||
|}
|
||||
|
||||
This non-automatic numbering has the advantage that if a text refers to the numbers, insertion or deletion of an item does not disturb the correspondence.
|
||||
|
||||
==Multi-column bulleted list==
|
||||
<pre>
|
||||
{|
|
||||
|
|
||||
*1
|
||||
*2
|
||||
|
|
||||
*3
|
||||
*4
|
||||
|}
|
||||
</pre>
|
||||
gives:
|
||||
{|
|
||||
|
|
||||
*1
|
||||
*2
|
||||
|
|
||||
*3
|
||||
*4
|
||||
|}
|
||||
|
||||
==Multi-column numbered list==
|
||||
Specifying a starting value is useful for a numbered list with multiple columns, to avoid restarting from one in each column. As mentioned above, this is only possible with HTML-syntax (for the first column either wiki-syntax or HTML-syntax can be used).
|
||||
|
||||
In combination with the extra indentation explained in the previous section:
|
||||
<pre>
|
||||
{| valign="top"
|
||||
|-
|
||||
|<ul><ol start="125"><li>a<li>bb<li>ccc</ol></ul>
|
||||
|<ul><ol start="128"><li>ddd<li>ee<li>f</ol></ul>
|
||||
|}
|
||||
</pre>
|
||||
|
||||
gives
|
||||
|
||||
{| valign="top"
|
||||
|-
|
||||
|<ul><ol start="125"><li>a<li>bb<li>ccc</ol></ul>
|
||||
|<ul><ol start="128"><li>ddd<li>ee<li>f</ol></ul>
|
||||
|}
|
||||
|
||||
Using {{tim|multi-column numbered list}} the computation of the starting values can be automated, and only the first starting value and the number of items in each column except the last has to be specified. Adding an item to, or removing an item from a column requires adjusting only one number, the number of items in that column, instead of changing the starting numbers for all subsequent columns.
|
||||
|
||||
<pre>{{Multi-column numbered list|125|a<li>bb<li>ccc|3|<li>ddd<li>ee<li>f}}</pre>
|
||||
|
||||
gives
|
||||
|
||||
{{Multi-column numbered list|125|a<li>bb<li>ccc|3|<li>ddd<li>ee<li>f}}
|
||||
|
||||
<pre>{{Multi-column numbered list|lst=lower-alpha|125|a<li>bb<li>ccc|3|<li>ddd<li>ee|2|<li>f}}</pre>
|
||||
|
||||
gives
|
||||
|
||||
{{Multi-column numbered list|lst=lower-alpha|125|a<li>bb<li>ccc|3|<li>ddd<li>ee|2|<li>f}}
|
||||
|
||||
<pre>{{Multi-column numbered list|lst=lower-roman|125|a<li>bb<li>ccc|3|<li>ddd<li>ee|2|<li>f}}</pre>
|
||||
|
||||
gives
|
||||
|
||||
{{Multi-column numbered list|lst=lower-roman|125|a<li>bb<li>ccc|3|<li>ddd<li>ee|2|<li>f}}
|
||||
|
||||
<pre>{{Multi-column numbered list|lst=disc|125|a<li>bb<li>ccc|3|<li>ddd<li>ee|2|<li>f}}</pre>
|
||||
|
||||
gives
|
||||
|
||||
{{Multi-column numbered list|lst=disc|125|a<li>bb<li>ccc|3|<li>ddd<li>ee|2|<li>f}}
|
||||
|
||||
Note that the starting values of each column (125, +3, +2) have no effect when the disc list type is used.
|
||||
|
||||
==Streamlined style or horizontal style==
|
||||
It is also possible to present short lists using very basic formatting, such as:
|
||||
|
||||
<nowiki>''Title of list:''</nowiki> example 1, example 2, example 3
|
||||
|
||||
''Title of list:'' example 1, example 2, example 3
|
||||
|
||||
This style requires less space on the page, and is preferred if there are only a few entries in the list, it can be read easily, and a direct edit point is not required. The list items should start with a lowercase letter unless they are proper nouns.
|
||||
|
||||
==Tables==
|
||||
A one-column table is very similar to a list, but it allows sorting. If the wikitext itself is already sorted with the same sortkey, this advantage does not apply.
|
||||
A multiple-column table allows sorting on any column.
|
||||
|
||||
See also .
|
||||
|
||||
==Changing unordered lists to ordered ones==
|
||||
With the CSS
|
||||
ul { list-style: decimal }
|
||||
unordered lists are changed to ordered ones. This applies (as far as the CSS selector does not restrict this) to all ul-lists in the HTML source code:
|
||||
*those produced with *
|
||||
*those with <nowiki><ul></nowiki> in the wikitext
|
||||
*those produced by the system
|
||||
|
||||
Since each special page, like other pages, has a class based on the pagename, one can separately specify for each type whether the lists should be ordered, see [[Help:User contributions#User styles]] and [[Help:What links here#User styles]].
|
||||
|
||||
However, it does not seem possible to make all page history lists ordered (unless one makes ''all'' lists ordered), because the class name is based on the page for which the history is viewed.
|
||||
|
||||
==See also==
|
||||
*[[mw:Extension:Sort2]]: creates a list with list code only at the start and end, not per item; allows easy change of list type; sorts list
|
||||
|
||||
==Wikipedia-specific help==
|
||||
|
||||
* [[Wikipedia:Lists]] - For suggested styles of lists.''
|
||||
* {{tn|·}} and {{tn|•}} - Dots and bullets for horizontal link lists, such as in [[Template:Navbox|navboxes]], which look like lists, but do not use HTML list mark-up.
|
||||
**{{tl|flatlist}} - for a more semantically-correct and accessible way of marking up such lists.
|
||||
* [[Wikipedia:Line break handling]] - Covers among other things how to properly handle the line wrapping in horizontal link lists.
|
||||
|
||||
[[Category:Wikipedia help]]
|
||||
|
||||
[[ar:مساعدة:قوائم]]
|
||||
[[de:Hilfe:Listen]]
|
||||
[[dsb:Pomoc:Lisćina]]
|
||||
[[es:Ayuda:Listas]]
|
||||
[[hsb:Pomoc:Lisćina]]
|
||||
[[it:Aiuto:Liste]]
|
||||
|
68
vendor/plugins/wikicloth/sample_documents/pipe_trick.wiki
vendored
Normal file
68
vendor/plugins/wikicloth/sample_documents/pipe_trick.wiki
vendored
Normal file
|
@ -0,0 +1,68 @@
|
|||
The '''pipe trick''' is a way (or really several ways) to create links without having to type a lot of extra text. The advantage is that you are less likely to make a mistake when you type less. It's also easier for others to edit it. To create the [[pipe character]] ("|") press (SHIFT + BACKSLASH ["\"]) on English-layout and some other keyboards.
|
||||
When you place a [[Vertical bar|pipe character]] ("'''|'''") after an [[Wikipedia:What is an article?|article]] title which ends with a [[Bracket#Parentheses ( )|parenthesized]] term or contains a [[comma (punctuation)|comma]] or [[Colon (punctuation)|colon]], the [[wiki software]] transforms what you entered. The non-parenthesized part of the article title is used as the visible part of the link. This does not work in edit summaries, and in certain other cases (listed below).
|
||||
|
||||
==Examples==
|
||||
This may be hard to follow, so please see the examples:
|
||||
|
||||
{| class="wikitable"
|
||||
|-
|
||||
!| Type this
|
||||
!| Generates this when you "Save page"
|
||||
!| Appears as
|
||||
|-
|
||||
! colspan="3" style="text-align: left;" | Article titles
|
||||
|-
|
||||
|| <code><nowiki>[[g (factor)|]]</nowiki></code> || <code><nowiki>[[g (factor)|g]]</nowiki></code> || [[g (factor)|g]]
|
||||
|-
|
||||
|| <code><nowiki>[[Boston, Massachusetts|]]</nowiki></code> || <code><nowiki>[[Boston, Massachusetts|Boston]]</nowiki></code> || [[Boston, Massachusetts|Boston]]
|
||||
|-
|
||||
|| <code><nowiki>[[The Lord of the Rings: The Fellowship of the Ring (video game)|]]</nowiki></code> || <code><nowiki>[[The Lord of the Rings: The Fellowship of the Ring (video game)|The Fellowship of the Ring]]</nowiki></code> || [[The Lord of the Rings: The Fellowship of the Ring (video game)|The Fellowship of the Ring]]
|
||||
|-
|
||||
! colspan="3" style="text-align: left;" | Redirection
|
||||
|-
|
||||
|| <code><nowiki>[[Bush (43)|]]</nowiki></code> || <code><nowiki>[[Bush (43)|Bush]]</nowiki></code> || [[Bush (43)|Bush]]
|
||||
|-
|
||||
|| <code><nowiki>[[Bush (41)|]]</nowiki></code> || <code><nowiki>[[Bush (41)|Bush]]</nowiki></code> || [[Bush (41)|Bush]]
|
||||
|-
|
||||
! colspan="3" style="text-align: left;" | Normal titles
|
||||
|-
|
||||
|| <code><nowiki>[[Wikipedia:Help|]]</nowiki></code> || <code><nowiki>[[Wikipedia:Help|Help]]</nowiki></code> || [[Wikipedia:Help|Help]]
|
||||
|-
|
||||
! colspan="3" style="text-align: left;" | Users
|
||||
|-
|
||||
|| <code><nowiki>[[User:Example|]]</nowiki></code> || <code><nowiki>[[User:Example|Example]]</nowiki></code> || [[User:Example|Example]]
|
||||
|-
|
||||
|}
|
||||
|
||||
==Where it does not work==
|
||||
===Cite.php <ref> footnotes===
|
||||
<!-- The pipe trick auto-converts, for example, <nowiki>[[Roger Taylor (author)|]]</nowiki> to <nowiki>[[Roger Taylor (author)|Roger Taylor]]</nowiki> -->
|
||||
|
||||
The trick does not work when enclosing between [[wikipedia:footnotes|"ref" tags]]. <code><nowiki><ref>[[Roger Taylor (author)|]]</ref></nowiki></code><ref>[[Roger Taylor (author)|]]</ref> renders in the references list (generated by the <nowiki><references/></nowiki> tag) as:
|
||||
|
||||
<references/>
|
||||
===Edit summaries===
|
||||
<!-- The pipe trick auto-converts, for example, <nowiki>[[WP:SAND|]]</nowiki> to [[WP:SAND|SAND]] -->
|
||||
|
||||
The trick does not work in edit summaries. <code><nowiki>/* Edit summaries and the pipe trick */ as tested in [[WP:SAND|]]</nowiki></code> renders in the edit history as:
|
||||
|
||||
<span class="comment">(<span class="autocomment">[[#Edit summaries and the pipe trick|→]]Edit summaries and the pipe trick:</span> as tested in [[WP:SAND]])</span>
|
||||
|
||||
== Slash trick ==
|
||||
You can achieve the same effect for subpages by adding a slash: <code><nowiki>[[/subpage/]]</nowiki></code> generates the same output as <code><nowiki>[[/subpage|subpage]]</nowiki></code>. Unlike the pipe trick, though, it will not be transformed in the [[wikitext]].
|
||||
|
||||
This trick only works in namespaces where <code><nowiki>[[/subpage]]</nowiki></code> would.
|
||||
|
||||
== Reverse pipe trick ==
|
||||
Typing <tt><nowiki>[[|Agonizer]]</nowiki></tt> on, for example, [[Agonist (disambiguation)]] will cause the link to be expanded to <tt>[[[[Agonizer (disambiguation)]]|Agonizer]]</tt>; similarly on a page with a name containing a comma. Using the reverse pipe trick on a page that has no parentheses or comma in its name is unproductive; the pipe character is automatically removed.
|
||||
|
||||
==Try it!==
|
||||
The best way to understand this is to try it yourself in the [[Wikipedia:Sandbox|sandbox]]. Use one of the examples under "Type this" above, save the page, then immediately edit it again. You'll see the transformation, and it should be clearer exactly what happened.
|
||||
|
||||
==See also==
|
||||
* [[Help:Magic]]
|
||||
* [[Help:Piped link]]
|
||||
* [[m:Help:Piped link]]
|
||||
|
||||
[[Category:Wikipedia features|{{PAGENAME}}]]
|
||||
|
55
vendor/plugins/wikicloth/sample_documents/random.wiki
vendored
Normal file
55
vendor/plugins/wikicloth/sample_documents/random.wiki
vendored
Normal file
|
@ -0,0 +1,55 @@
|
|||
<!-- TEST
|
||||
|
||||
-->----
|
||||
|
||||
|
||||
{{ date }}
|
||||
|
||||
<ref>test</ref>
|
||||
|
||||
<ref name="test">another reference</ref>
|
||||
|
||||
<ref name="test" />
|
||||
|
||||
<references />
|
||||
|
||||
== TEST ==
|
||||
|
||||
---hello world---
|
||||
|
||||
_hello world_
|
||||
|
||||
{|
|
||||
|+ Hello World
|
||||
| ABBA
|
||||
| BANK
|
||||
|-
|
||||
| CAT
|
||||
| DOG
|
||||
|}
|
||||
|
||||
{| style="foo||"
|
||||
! x !! 1 !! 2 !! 3
|
||||
|-
|
||||
! 1
|
||||
| style="boo" | 1 || 2 || 3
|
||||
|- style="blah"
|
||||
! 2
|
||||
| 2 || 4 || 6
|
||||
|-
|
||||
! 3
|
||||
| 3 || [ http://www.google.com/ GOOGLE ] || 9
|
||||
|-
|
||||
! 4
|
||||
| 4 || 8 || 12
|
||||
|-
|
||||
! 5
|
||||
| 5 || 10 || 15
|
||||
|}
|
||||
|
||||
''whats up foo'' or '''maybe''' you just want some of '''''this'''''
|
||||
[ http://www.youtube.com/ {{PAGENAME}} ]
|
||||
|
||||
<nowiki>hello {{ BOO }} world</nowiki>
|
||||
|
||||
{{#if: {{PAGENAME}} | sucka foo | {{ BLA |1=foo|bla}} }}
|
312
vendor/plugins/wikicloth/sample_documents/tv.wiki
vendored
Normal file
312
vendor/plugins/wikicloth/sample_documents/tv.wiki
vendored
Normal file
|
@ -0,0 +1,312 @@
|
|||
{{refimprove|date=September 2008}}
|
||||
{{pp-semi|small=yes}}
|
||||
{{otheruses}}
|
||||
{{redir|TV}}
|
||||
{{Infobox Product
|
||||
|title = Television
|
||||
|image = [[Image:Braun HF 1.jpg|Center|180px|]]
|
||||
|caption =
|
||||
|inventor = [[John Logie Baird]]
|
||||
|launch year = 1928
|
||||
|company =
|
||||
|available = Worldwide
|
||||
}}
|
||||
'''Television''' ('''TV''') is a widely used [[telecommunication]] [[mass-media|medium]] for transmitting and receiving moving [[images]], either [[monochrome|monochromatic]] ("black and white") or [[color]], usually accompanied by [[sound]]. "Television" may also refer specifically to a [[television set]], [[television program]]ming or [[Transmission (telecommunications)|television transmission]]. The word is derived from mixed [[Latin]] and [[Greek language|Greek]] roots, meaning "far sight": Greek ''tele'' ({{polytonic|τ{{Unicode|ῆ}}λε}}), far, and Latin ''visio'', sight (from ''video, vis-'' to see, or to view in the first person).
|
||||
|
||||
[[History of television#Broadcast television|Commercially available since the late 1930s]], the television set has become a common communications receiver in homes, businesses and institutions, particularly as a source of [[entertainment]] and news. Since the 1970s the availability of [[Videotape|video cassettes]], [[laserdiscs]], [[DVD-Video|DVDs]] and now [[Blu-ray]] discs, have resulted in the television set frequently being used for viewing recorded as well as broadcast material.
|
||||
|
||||
Although other forms such as [[closed-circuit television]] are in use, the most common usage of the medium is for [[broadcast television]], which was modeled on the existing [[radio broadcasting]] systems developed in the 1920s, and uses high-powered radio-frequency transmitters to [[broadcasting|broadcast]] the television signal to individual TV receivers.
|
||||
|
||||
Broadcast TV is typically disseminated via [[radio]] transmissions in the 7-1000 [[megahertz]]-range of the [[FM radio|FM]] frequency band<ref>[http://www.csgnetwork.com/tvfreqtable.html]</ref>. Signals are now often transmitted with [[stereo]] and/or [[surround sound]] in many countries. Until the 2000s broadcast TV programs were generally recorded and transmitted as an [[analog recording|analog]] signal, but in recent years public and commercial broadcasters have been progressively introducing [[digital television]] broadcasting technology.
|
||||
|
||||
A standard television set comprises multiple internal [[electronic circuit]]s, including those for [[Tuner (electronics)|receiving]] and decoding [[broadcast]] [[signals]]. A visual [[display device]] which lacks a tuner is properly called a [[video monitor|monitor]], rather than a television. A television system may use different technical standards such as [[digital television]] (DTV) and [[high-definition television]] (HDTV). Television systems are also used for surveillance, industrial process control, and guiding of weapons, in places where direct observation is difficult or dangerous.
|
||||
|
||||
[[Amateur television]] (HAM TV or ATV) is also used for experimentation, pleasure and public service events by [[amateur radio]] operators. HAM TV stations were on the air in many cities before commercial TV stations came on the air -
|
||||
see http://www.earlytelevision.org/1940_home_camera.html for more info.
|
||||
|
||||
==History==
|
||||
{{main|History of television}}
|
||||
[[File:Bbc broadcasting house front.jpg|thumb|right|[[BBC Broadcasting House]]. The [[BBC]] is the largest and oldest broadcaster in the world.<ref>{{cite web |title=BBC website: ''About the BBC - What is the BBC'' |url=http://www.bbc.co.uk/info/purpose/what.shtml |accessdate=2008-06-14}}</ref>]]
|
||||
|
||||
In its early stages of development, television employed a combination of [[optics|optical]], mechanical and [[electronics|electronic]] technologies to capture, transmit and display a visual image. By the late 1920s, however, those employing only optical and electronic technologies were being explored. All modern television systems rely on the latter, although the knowledge gained from the work on mechanical-dependent systems was crucial in the development of fully electronic television.
|
||||
|
||||
The first time images were transmitted electrically were via early mechanical [[Fax#History|fax]] machines, including the [[pantelegraph]], developed in the late 1800s. The concept of electrically-powered transmission of television images in motion, was first sketched in 1878 as the [[telephonoscope]], shortly after the invention of the [[telephone]]. At the time, it was imagined by early science fiction authors, that someday that [[light]] could be transmitted over wires, as sounds were.{{fact|date=January 2009}}
|
||||
|
||||
The idea of using [[scanning]] to transmit images was put to actual practical use in 1881 in the pantelegraph, through the use of a [[pendulum]]-based scanning mechanism. From this period forward, scanning in one form or another, has been used in nearly every image transmission technology to date, including television. This is the concept of "[[rasterization]]", the process of converting a visual image into a stream of electrical pulses.{{fact|date=January 2009}}
|
||||
|
||||
In 1884 [[Paul Gottlieb Nipkow]], a 20-year old university student in Germany, patented the first electromechanical television system which employed a [[Nipkow disk|scanning disk]], a spinning disk with a series of holes spiraling toward the center, for rasterization. The holes were spaced at equal [[angle|angular]] intervals such that in a single rotation the disk would allow light to pass through each hole and onto a light-sensitive [[selenium]] sensor which produced the electrical pulses. As an image was focused on the rotating disk, each hole captured a horizontal "slice" of the whole image, in a scanning fashion.{{fact|date=January 2009}}
|
||||
|
||||
Nipkow's design would not be practical until advances in [[amplifier]] [[vacuum tube|tube]] technology became available in 1907. Even then the device was only useful for transmitting still "[[halftone]]" images - represented by equally spaced dots of varying size - over telegraph or telephone lines. Later designs would use a rotating mirror-drum scanner to capture the image and a [[cathode ray tube]] (CRT) as a display device, but moving images were still not possible, due to the poor sensitivity of the [[selenium]] sensors.{{fact|date=January 2009}}
|
||||
|
||||
Scottish inventor [[John Logie Baird]] demonstrated the transmission of moving silhouette images in [[London]] in 1925, and of moving, [[monochrome|monochromatic]] images in 1926. Baird's scanning disk produced an image of 30 lines resolution, just enough to discern a human face, from a double spiral of [[lense]]s.{{fact|date=January 2009}}. Remarkably, in 1927 Baird also invented the world's first [[video recording]] system, "Phonovision" -- by modulating the output signal of his TV camera down to the audio range he was able to capture the signal on a 10-inch wax audio disc using conventional audio recording technology. A handful of Baird's 'Phonovision' recordings survive and these were finally decoded and rendered into viewable images in the 1990s using modern digital signal-processing technology<ref>[http://www.tvdawn.com/ World's First TV Recordings]</ref>.
|
||||
|
||||
In 1926, [[Hungary|Hungarian]] engineer [[Kálmán Tihanyi]] invented the entirely electronic camera tube and entirely electronic display and the transmitting and receiving system.<ref>{{cite web | title = Hungary - [[Kálmán Tihanyi|Kálmán Tihanyi's]] 1926 Patent Application 'Radioskop' | work = Memory of the World | publisher = [[UNESCO|United Nations Educational, Scientific and Cultural Organization (UNESCO)]] | url = http://portal.unesco.org/ci/en/ev.php-URL_ID=23240&URL_DO=DO_TOPIC&URL_SECTION=201.html| accessdate = 2008-02-22}}</ref><ref name=US2133123>United States Patent Office, Patent No. 2,133,123, Oct. 11, 1938.</ref><ref name=US2158259>United States Patent Office, Patent No. 2,158,259, May 16, 1939</ref><ref>{{cite web|url=http://www.bairdtelevision.com/zworykin.html |title=Vladimir Kosma Zworykin, 1889-1982 |publisher=Bairdtelevision.com |date= |accessdate=2009-04-17}}</ref>
|
||||
|
||||
By 1927, Russian inventor [[Léon Theremin]] developed a mirror drum-based television system which used [[interlacing]] to achieve an image resolution of 100 lines.{{fact|date=January 2009}}
|
||||
|
||||
Also in 1927, [[Herbert E. Ives]] of [[Bell Labs]] transmitted moving images from a 50-[[aperture]] disk producing 16 frames per minute over a [[cable]] from [[Washington, DC]] to [[New York City]], and via [[radio]] from [[Whippany, New Jersey]]. Ives used viewing screens as large as 24 by 30 inches (60 by 75 [[centimeter]]s). His subjects included Secretary of Commerce [[Herbert Hoover]].{{fact|date=January 2009}}
|
||||
|
||||
In 1928, [[Philo Farnsworth]] made the world's first working television system with electronic scanning of both the pickup and display devices, which he first demonstrated to news media on 1 September 1928, televising a motion picture film.{{fact|date=January 2009}}
|
||||
|
||||
The first practical use of television was in Germany. Regular television broadcasts began in Germany in 1929 and in 1936 the [[Olympic]] games in Berlin were broadcast to television stations in Berlin and Leipzig where the public could view the games live.<ref>{{cite web|url=http://www.tvhistory.tv |title=TV History |publisher=Gadgetrepublic |date=2009-05-01 |accessdate=2009-05-01}}</ref>
|
||||
|
||||
In 1936, [[Kálmán Tihanyi]] described the principle of [[Plasma display|Plasma Television]], the first flat panel.<ref>http://ewh.ieee.org/r2/johnstown/downloads/20090217_IEEE_JST_Trivia_Answers.pdf</ref> <ref>http://www.scitech.mtesz.hu/52tihanyi/flat-panel_tv_en.pdf</ref><ref>{{cite web|url=http://www.gadgetrepublic.com/news/item/202/ |title=Gadget News and Reviews - News - Item |publisher=Gadgetrepublic |date=2009-01-26 |accessdate=2009-04-17}}</ref>
|
||||
|
||||
==Geographical usage==
|
||||
[[Image:TV-introduction-world-map.svg|350px|thumb|Television introduction by country
|
||||
{{legend|#ff0000|1930 to 1939}}
|
||||
{{legend|#ff5400|1940 to 1949}}
|
||||
{{legend|#ffa800|1950 to 1959}}
|
||||
{{legend|#ffff00|1960 to 1969}}
|
||||
{{legend|#a8ff00|1970 to 1979}}
|
||||
{{legend|#54ff00|1980 to 1989}}
|
||||
{{legend|#00ff00|1990 to 1999}}
|
||||
{{legend|Grey|No data}}
|
||||
]]
|
||||
{{main|Geographical usage of television}}
|
||||
*[[Timeline of the introduction of television in countries]]
|
||||
|
||||
==Content==
|
||||
===Programming===
|
||||
{{seealso|Category:Television genres}}
|
||||
Getting TV programming shown to the public can happen in many different ways. After production the next step is to market and deliver the product to whatever markets are open to using it. This typically happens on two levels:
|
||||
|
||||
#'''Original Run''' or '''First Run''' – a producer creates a program of one or multiple episodes and shows it on a station or network which has either paid for the production itself or to which a license has been granted by the producers to do the same.
|
||||
#'''[[Television syndication|Syndication]]''' – this is the terminology rather broadly used to describe secondary programming usages (beyond original run). It includes secondary runs in the country of first issue, but also international usage which may or may not be managed by the originating producer. In many cases other companies, [[TV stations]] or individuals are engaged to do the syndication work, in other words to sell the product into the markets they are allowed to sell into by contract from the copyright holders, in most cases the producers.
|
||||
|
||||
First run programming is increasing on subscription services outside the U.S., but few domestically produced programs are syndicated on domestic [[Free-to-air|FTA]] elsewhere. This practice is increasing however, generally on digital-only FTA channels, or with subscriber-only first run material appearing on FTA.
|
||||
|
||||
Unlike the U.S., repeat FTA screenings of a FTA network program almost only occur on that network. Also, [[Affiliate]]s rarely buy or produce non-network programming that is not centred around local events.
|
||||
|
||||
===Funding===
|
||||
{{globalize|section}}
|
||||
[[Image:TV users.svg|thumb|400px|right|Television sets per 1000 people of the world {{legend|#10547C|1000+}}
|
||||
{{legend|#1674AB|500-1000}}
|
||||
{{legend|#1B8BCF|300-500}}
|
||||
{{legend|#3CA6E6|200-300}}
|
||||
{{legend|#70BEED|100-200}}
|
||||
{{legend|#9DD2F2|50-100}}
|
||||
{{legend|#CCE8F9|0-50}}
|
||||
{{legend|Grey|No data}}]]
|
||||
|
||||
Around the globe, broadcast television is financed by either government, advertising, licensing (a form of tax), subscription or any combination of these. To protect revenues, subscription TV channels are usually encrypted to ensure that only subscription payers receive the decryption codes to see the signal. Non-encrypted channels are known as '''Free to Air''' or '''FTA'''.
|
||||
|
||||
====Advertising====
|
||||
Television's broad reach makes it a powerful and attractive medium for [[advertiser]]s. Many television networks and stations sell blocks of broadcast time to advertisers ("sponsors") in order to fund their programming.
|
||||
|
||||
=====United States=====
|
||||
Since inception in the U.S. in 1940, [[television commercial|TV commercials]] have become one of the most effective, persuasive, and popular method of selling products of many sorts, especially consumer goods. U.S. [[advertising]] rates are determined primarily by [[Nielsen Ratings]]. The time of the day and popularity of the channel determine how much a television commercial can cost. For example, the highly popular [[American Idol]] can cost approximately $750,000 for a thirty second block of commercial time; while the same amount of time for the [[FIFA World Cup|World Cup]] and the [[Super Bowl]] can cost several million dollars.
|
||||
|
||||
In recent years, the paid program or [[infomercial]] has become common, usually in lengths of 30 minutes or one hour. Some drug companies and other businesses have even created "news" items for broadcast, known in the industry as [[video news release]]s, paying [[program director]]s to use them.<ref>[[Jon Stewart]] of "[[The Daily Show]]" was mock-outraged at this, saying, "That's what we do!", and calling it a new form of television, "infoganda".</ref>
|
||||
|
||||
Some TV programs also weave advertisements into their shows, a practice begun in film and known as [[product placement]]. For example, a character could be drinking a certain kind of soda, going to a particular chain restaurant, or driving a certain make of car. (This is sometimes very subtle, where shows have vehicles provided by manufacturers for low cost, rather than wrangling them.) Sometimes a specific brand or trade mark, or music from a certain artist or group, is used. (This excludes guest appearances by artists, who perform on the show.)
|
||||
|
||||
=====United Kingdom=====
|
||||
The TV regulator oversees TV advertising in the United Kingdom. Its restrictions have applied since the early days of commercially funded TV. Despite this, an early TV mogul, [[Lew Grade]], likened the broadcasting licence as being a "licence to print money". Restrictions mean that the big three national commercial TV channels: [[ITV]], [[Channel 4]], and [[Five (TV channel)|Five]] can show an average of only seven minutes of advertising per hour (eight minutes in the peak period). Other broadcasters must average no more than nine minutes (twelve in the peak). This means that many imported TV shows from the US have unnatural breaks where the UK company has edited out the breaks intended for US advertising. Advertisements must not be inserted in the course of certain specific proscribed types of programs which last less than half an hour in scheduled duration, this list includes any news or current affairs program, documentaries, and programs for children. Nor may advertisements be carried in a program designed and broadcast for reception in schools or in any religious service or other devotional program, or during a formal Royal ceremony or occasion. There also must be clear demarcations in time between the programs and the advertisements.
|
||||
|
||||
The [[BBC]], being strictly non-commercial is not allowed to show advertisements on television in the UK, although it has many advertising-funded channels abroad. The majority of its budget comes from TV licencing (see below) and the sale of content to other broadcasters.
|
||||
|
||||
====Taxation or license====
|
||||
Television services in some countries may be funded by a [[television licence]], a form of taxation which means advertising plays a lesser role or no role at all. For example, some channels may carry no advertising at all and some very little, including:
|
||||
* [[Australia]] ([[Australian Broadcasting Corporation|ABC]])
|
||||
* [[Norway]] ([[NRK]])
|
||||
* [[Sweden]] ([[Sveriges Television|SVT]])
|
||||
* [[United Kingdom]] ([[BBC]])
|
||||
|
||||
The [[BBC]] carries no advertising on its UK channels and is funded by an annual licence paid by all households owning a television. This licence fee is set by government, but the BBC is not answerable to or controlled by government and is therefore genuinely independent.
|
||||
|
||||
The two main BBC TV channels are watched by almost 90 percent of the population each week and overall have 27 per cent share of total viewing.<ref>{{cite web|url=http://www.barb.co.uk/viewingsummary/weekreports.cfm?report=multichannel&requesttimeout=500&flag=viewingsummary |title=viewing statistics in UK |publisher=Barb.co.uk |date= |accessdate=2009-04-17}}</ref> This in spite of the fact that 85% of homes are multichannel, with 42% of these having access to 200 free to air channels via satellite and another 43% having access to 30 or more channels via [[Freeview (United Kingdom)|Freeview]].<ref>[http://www.ofcom.org.uk/research/tv/reports/dtv/dtv_2007_q3/dtvq307.pdf OFCOM quarterly survey]</ref> The licence that funds the seven advertising-free BBC TV channels currently costs £139.50 a year (about US$215) irrespective of the number of TV sets owned. When the same sporting event has been presented on both BBC and commercial channels, the BBC always attracts the lion's share of the audience, indicating viewers prefer to watch TV uninterrupted by advertising.
|
||||
|
||||
The [[Australian Broadcasting Corporation]] (ABC) carries no advertising (except for the ABC Shop) as it is banned under law [http://www.comlaw.gov.au/ComLaw/Legislation/ActCompilation1.nsf/all/search/8B104AA963F8AB9FCA25718D002260DC ABC Act 1983]. The ABC receives its funding from the Australian Government every three years. In the 2006/07 Federal Budget the ABC received Au$822.67 Million<ref>http://www.abc.net.au/corp/pubs/documents/budget2006-07.pdf</ref> this covers most of the ABC funding commitments and, as with the BBC, also funds radio channels, transmitters and the ABC web sites. The ABC also receives funds from its many ABC Shops across Australia.
|
||||
|
||||
In [[France]] government-funded channels do carry advertisements yet those who own television sets have to pay an annual tax ("la redevance audiovisuelle").<ref>[http://www.minefi.gouv.fr/paca/minefi_relais_sociaux/impots/fiche21.html Ministry of Finance]</ref>
|
||||
|
||||
====Subscription====
|
||||
Some TV channels are partly funded from subscriptions and therefore the signals are encrypted during broadcast to ensure that only paying subscribers have access to the decryption codes. Most subscription services are also funded by advertising.
|
||||
|
||||
===Genres===
|
||||
Television [[genre]]s include a broad range of programming types that entertain, inform, and educate viewers. The most expensive entertainment genres to produce are usually drama and dramatic miniseries. However, other genres, such as historical Western genres, may also have high production costs.
|
||||
|
||||
Popular entertainment genres include action-oriented shows such as police, crime, detective dramas, horror, or thriller shows. As well, there are also other variants of the drama genre, such as medical dramas and daytime soap operas. Science fiction shows can fall into either the drama or action category, depending on whether they emphasize philosophical questions or high adventure. Comedy is a popular genre which includes [[situation comedy]] (sitcom) and animated shows for the adult demographic such as ''[[Family Guy]]''.
|
||||
|
||||
The least expensive forms of entertainment programming are game shows, talk shows, variety shows, and reality TV. Game shows show contestants answering questions and solving puzzles to win prizes. Talk shows feature interviews with film, television and music celebrities and public figures. Variety shows feature a range of musical performers and other entertainers such as comedians and magicians introduced by a host or Master of Ceremonies. There is some crossover between some talk shows and variety shows, because leading talk shows often feature performances by bands, singers, comedians, and other performers in between the interview segments.
|
||||
''Reality TV'' shows "regular" people (''i.e.'', not [[actors]]) who are facing unusual challenges or experiences, ranging from arrest by police officers (''[[COPS]]'') to weight loss (''[[The Biggest Loser]]''). A variant version of reality shows depicts celebrities doing mundane activities such as going about their everyday life (''[[Snoop Dogg's Father Hood]]'') or doing manual labour (''[[Simple Life]]'').
|
||||
|
||||
==Social aspects==
|
||||
{{main|Social aspects of television}}
|
||||
Television has played a pivotal role in the socialization of the 20th and 21st centuries. There are many [[social aspects of television]] that can be addressed, including:
|
||||
<div style="-moz-column-count:4; column-count:4;">
|
||||
*[[Social aspects of television#Alleged dangers|Alleged dangers]]
|
||||
*[[Social aspects of television#Educational advantages|Educational advantages]]
|
||||
*[[Social aspects of television#Gender and television|Gender and television]]
|
||||
*[[Social aspects of television#Negative effects|Negative effects]]
|
||||
*[[Social aspects of television#Politics and television|Politics and television]]
|
||||
*[[Social aspects of television#Positive effects|Positive effects]]
|
||||
*[[Social aspects of television#Propaganda delivery|Propaganda delivery]]
|
||||
*[[Social aspects of television#Socializing children|Socializing children]]
|
||||
*[[Social aspects of television#Suitability for audience|Suitability for audience]]
|
||||
*[[Social aspects of television#Technology trends|Technology trends]]
|
||||
</div>
|
||||
|
||||
==Environmental aspects==
|
||||
[[Image:2005 Austria 25 Euro 50 Years Television back.jpg|upright|thumb|[[Euro gold and silver commemorative coins (Austria)#2005 coinage|The 50 years of Television commemorative coin]]]]
|
||||
With high [[lead]] content in [[cathode ray tube|CRTs]], and the rapid diffusion of new, flat-panel display technologies, some of which ([[LCD]]s) use lamps containing [[mercury (element)|mercury]], there is growing concern about [[electronic waste]] from discarded televisions. Related [[occupational health]] concerns exist, as well, for disassemblers removing copper wiring and other materials from CRTs. Further environmental concerns related to television design and use relate to the devices' increasing [[electrical energy]] requirements.<ref>{{cite web |url=http://www.energysavingtrust.org.uk/uploads/documents/aboutest/Riseofthemachines.pdf |publisher=Energy Saving Trust |title=The Rise of the Machines: A Review of Energy Using Products in the Home from the 1970s to Today |date=July 3, 2006 |format=PDF |accessdate=2007-08-31}}</ref>
|
||||
|
||||
==In numismatics==
|
||||
Television has had such an impact in today's life, that it has been the main motif for numerous collectors' coins and medals. One of the most recent ones is the [[Euro gold and silver commemorative coins (Austria)#2005 coinage|Austrian 50 years of Television commemorative coin]] minted in March 9, 2005. The obverse of the coin shows a "test pattern", while the reverse shows several milestones in the history of television.
|
||||
|
||||
==References==
|
||||
{{reflist|2}}
|
||||
<references />
|
||||
|
||||
==See also==
|
||||
{{Portal|Television|Television icon.png}}
|
||||
* [[Broadcast-safe]]
|
||||
* [[Handheld television]]
|
||||
* [[How television works]]
|
||||
* [[Information-action ratio]]
|
||||
* [[Internet television]]
|
||||
* [[List of countries by number of television broadcast stations]]
|
||||
* [[List of television manufacturers]]
|
||||
* [[List of years in television]]
|
||||
* [[Media psychology]]
|
||||
* [[Technology of television]]
|
||||
|
||||
==Further reading==
|
||||
* Albert Abramson, ''The History of Television, 1942 to 2000'', Jefferson, NC, and London, McFarland, 2003, ISBN 0786412208.
|
||||
* [[Pierre Bourdieu]], ''On Television'', The New Press, 2001.
|
||||
* Tim Brooks and Earle March, ''The Complete Guide to Prime Time Network and Cable TV Shows'', 8th ed., Ballantine, 2002.
|
||||
* [[Jacques Derrida]] and [[Bernard Stiegler]], ''Echographies of Television'', Polity Press, 2002.
|
||||
* David E. Fisher and Marshall J. Fisher, ''Tube: the Invention of Television'', Counterpoint, Washington, DC, 1996, ISBN 1887178171.
|
||||
* [[Steven Berlin Johnson|Steven Johnson]], ''Everything Bad is Good for You: How Today's Popular Culture Is Actually Making Us Smarter'', New York, Riverhead (Penguin), 2005, 2006, ISBN 1594481946.
|
||||
* [[Jerry Mander]], ''Four Arguments for the Elimination of Television'', Perennial, 1978.
|
||||
* Jerry Mander, ''In the Absence of the Sacred'', Sierra Club Books, 1992, ISBN 0871565099.
|
||||
* [[Neil Postman]], ''[[Amusing Ourselves to Death]]: Public Discourse in the Age of Show Business'', New York, Penguin US, 1985, ISBN 0670804541.
|
||||
* Evan I. Schwartz, ''The Last Lone Inventor: A Tale of Genius, Deceit, and the Birth of Television'', New York, Harper Paperbacks, 2003, ISBN 0060935596.
|
||||
* Beretta E. Smith-Shomade, ''Shaded Lives: African-American Women and Television'', Rutgers University Press, 2002.
|
||||
* Alan Taylor, ''We, the Media: Pedagogic Intrusions into US Mainstream Film and Television News Broadcasting Rhetoric'', Peter Lang, 2005, ISBN 3631518528.
|
||||
|
||||
==External links==
|
||||
{{sisterlinks}}
|
||||
* [http://www.sciencetech.technomuses.ca/english/collection/television.cfm A History of Television] at the [[Canada Science and Technology Museum]]
|
||||
* [http://www.museum.tv/archives/etv/index.html The Encyclopedia of Television] at the [[Museum of Broadcast Communications]]
|
||||
* [http://www.nhk.or.jp/strl/aboutstrl/evolution-of-tv-en/index-e.html The Evolution of TV, A Brief History of TV Technology in Japan] [[NHK]]
|
||||
* [http://www.tvhistory.tv/ Television's History — The First 75 Years]
|
||||
* [http://radiostationworld.com/directory/television_standards/default.asp Worldwide Television Standards]
|
||||
|
||||
{{Video formats}}
|
||||
|
||||
[[Category:Television| ]]
|
||||
[[Category:Video hardware]]
|
||||
[[Category:Media formats]]
|
||||
[[Category:Performing arts]]
|
||||
[[Category:Scottish inventions]]
|
||||
|
||||
[[af:Televisie]]
|
||||
[[am:ቴሌቪዥን]]
|
||||
[[ang:Feorrsīen]]
|
||||
[[ar:تلفاز]]
|
||||
[[ast:Televisión]]
|
||||
[[gn:Ta'angambyry]]
|
||||
[[az:تلویزیون]]
|
||||
[[zh-min-nan:Tiān-sī]]
|
||||
[[map-bms:Televisi]]
|
||||
[[be:Тэлебачанне]]
|
||||
[[be-x-old:Тэлебачаньне]]
|
||||
[[bs:Televizija]]
|
||||
[[br:Skinwel]]
|
||||
[[bg:Телевизия]]
|
||||
[[ca:Televisió]]
|
||||
[[cs:Televizor]]
|
||||
[[cy:Teledu]]
|
||||
[[da:Tv]]
|
||||
[[pdc:Guckbax]]
|
||||
[[de:Fernsehen]]
|
||||
[[et:Televisioon]]
|
||||
[[el:Τηλεόραση]]
|
||||
[[eml:Televisiån]]
|
||||
[[es:Televisión]]
|
||||
[[eo:Televido]]
|
||||
[[eu:Telebista]]
|
||||
[[fa:تلویزیون]]
|
||||
[[fr:Télévision]]
|
||||
[[fy:Televyzje]]
|
||||
[[ga:Teilifís]]
|
||||
[[gd:Telebhisean]]
|
||||
[[gl:Televisión]]
|
||||
[[ki:Terebiceni]]
|
||||
[[hak:Thien-sṳ]]
|
||||
[[ko:텔레비전]]
|
||||
[[hy:Հեռատեսիլ]]
|
||||
[[hi:दूरदर्शन]]
|
||||
[[hr:Televizija]]
|
||||
[[io:Televiziono]]
|
||||
[[id:Televisi]]
|
||||
[[ia:Television]]
|
||||
[[is:Sjónvarp]]
|
||||
[[it:Televisione]]
|
||||
[[he:טלוויזיה]]
|
||||
[[kn:ದೂರದರ್ಶನ]]
|
||||
[[ka:ტელევიზია]]
|
||||
[[ky:Телекөрсөтүү]]
|
||||
[[sw:Televisheni]]
|
||||
[[ku:Televîzyon]]
|
||||
[[lad:Television]]
|
||||
[[la:Televisio]]
|
||||
[[lv:Televīzija]]
|
||||
[[lb:Televisioun]]
|
||||
[[lt:Televizija]]
|
||||
[[hu:Televízió]]
|
||||
[[mk:Телевизија]]
|
||||
[[ml:ടെലിവിഷന്]]
|
||||
[[mr:दूरचित्रवाणी]]
|
||||
[[arz:تليفزيون]]
|
||||
[[ms:Televisyen]]
|
||||
[[nl:Televisie]]
|
||||
[[nds-nl:Tillevisie]]
|
||||
[[ne:टेलिभिजन]]
|
||||
[[ja:テレビ]]
|
||||
[[no:Fjernsyn]]
|
||||
[[nn:Fjernsyn]]
|
||||
[[nrm:Télévision]]
|
||||
[[nov:Televisione]]
|
||||
[[oc:Television]]
|
||||
[[uz:Televideniye]]
|
||||
[[nds:Feernseher]]
|
||||
[[pl:Telewizja]]
|
||||
[[pt:Televisão]]
|
||||
[[ro:Televiziune]]
|
||||
[[qu:Ñawikaruy]]
|
||||
[[ru:Телевидение]]
|
||||
[[sm:Televise]]
|
||||
[[sa:दूरदर्शन]]
|
||||
[[sco:Televeesion]]
|
||||
[[sq:Televizioni]]
|
||||
[[scn:Televisioni]]
|
||||
[[si:රූපවාහිනිය]]
|
||||
[[simple:Television]]
|
||||
[[sk:Televízia]]
|
||||
[[sl:Televizija]]
|
||||
[[sr:Телевизија]]
|
||||
[[su:Televisi]]
|
||||
[[fi:Televisio]]
|
||||
[[sv:Television]]
|
||||
[[tl:Telebisyon]]
|
||||
[[ta:தொலைக்காட்சி]]
|
||||
[[kab:Tiliẓri]]
|
||||
[[te:దూరదర్శిని]]
|
||||
[[th:โทรทัศน์]]
|
||||
[[tr:Televizyon]]
|
||||
[[uk:Телебачення]]
|
||||
[[ur:بعید نُما]]
|
||||
[[vec:Tełevixion]]
|
||||
[[vi:Truyền hình]]
|
||||
[[fiu-vro:Televis'uun]]
|
||||
[[wa:Televuzion]]
|
||||
[[war:Telebisyon]]
|
||||
[[wuu:电视机]]
|
||||
[[yi:טעלעוויזיע]]
|
||||
[[zh-yue:電視]]
|
||||
[[diq:Televizyon]]
|
||||
[[bat-smg:Televėzėjė]]
|
||||
[[zh:电视]]
|
BIN
vendor/plugins/wikicloth/sample_documents/wiki.png
vendored
Normal file
BIN
vendor/plugins/wikicloth/sample_documents/wiki.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 16 KiB |
410
vendor/plugins/wikicloth/sample_documents/wiki_tables.wiki
vendored
Normal file
410
vendor/plugins/wikicloth/sample_documents/wiki_tables.wiki
vendored
Normal file
|
@ -0,0 +1,410 @@
|
|||
'''Tables''' may be authored in wiki pages using either XHTML table elements directly, or using wikicode formatting to define the table. XHTML table elements and their use are well described on various web pages and will not be discussed here. The benefit of wikicode is that the table is constructed of character symbols which tend to make it easier to perceive the table structure in the article editing view compared to XHTML table elements.
|
||||
|
||||
As a general rule, it is best to avoid using a table unless you need one. Table markup often complicates page editing.
|
||||
|
||||
== Wiki table markup summary ==
|
||||
{|cellpadding="5" cellspacing="0" border="1" width="60%"
|
||||
|
|
||||
<nowiki>{|</nowiki>
|
||||
| '''table start'''
|
||||
|-
|
||||
|
|
||||
<nowiki>|+</nowiki>
|
||||
| table '''caption,''' ''optional;'' only between '''table start''' and first '''table row'''
|
||||
|-
|
||||
|
|
||||
<nowiki>|-</nowiki>
|
||||
| '''table row,''' ''optional on first row'' -- wiki engine assumes the first row
|
||||
|-
|
||||
|
|
||||
<nowiki>!</nowiki>
|
||||
| '''table header''' cell, ''optional.'' Consecutive '''table header''' cells may be added on same line separated by double marks (<code>!!</code>) or start on new lines, each with its own single mark (<code>!</code>).
|
||||
|-
|
||||
|
|
||||
<nowiki>|</nowiki>
|
||||
| '''table data''' cell, ''required!'' Consecutive '''table data''' cells may be added on same line separated by double marks (<code><nowiki>||</nowiki></code>) or start on new lines, each with its own single mark (<code><nowiki>|</nowiki></code>).
|
||||
|-
|
||||
|
|
||||
<nowiki>|}</nowiki>
|
||||
| '''table end'''
|
||||
|}
|
||||
*The above marks must '''start on a new line''' except the double <code>||</code> and <code>!!</code> for optionally adding consecutive cells to a line. However, blank spaces at the beginning of a line are ignored.
|
||||
*'''XHTML attributes.''' Each mark, except table end, optionally accepts one or more XHTML attributes. Attributes must be on the same line as the mark. Separate attributes from each other with a single space.
|
||||
**Cells and caption (<code>|</code> or <code>||</code>, <code>!</code> or <code>!!</code>, and <code>|+</code>) hold content. So separate any attributes from content with a single pipe (<code>|</code>). Cell content may follow on same line or on following lines.
|
||||
**Table and row marks (<code>{|</code> and <code>|-</code>) do not directly hold content. Do ''not'' add pipe (<code>|</code>) after their optional attributes. If you erroneously add a pipe after attributes for the table mark or row mark the parser will delete it ''and'' your final attribute if it was touching the erroneous pipe!
|
||||
*'''Content''' may (a) follow its cell mark on the same line after any optional XHTML attributes or (b) on lines below the cell mark. Content that uses wiki markup that itself needs to start on a new line, such as lists, headings, or nested tables, must be on its own new line.
|
||||
|
||||
==Basics==
|
||||
The following table lacks borders and good spacing but shows the simplest wiki markup table structure.
|
||||
|
||||
{| cellspacing="0" border="1"
|
||||
!style="width:50%"|You type
|
||||
!style="width:50%"|You get
|
||||
|-
|
||||
|
|
||||
<pre>
|
||||
{|
|
||||
|Orange
|
||||
|Apple
|
||||
|-
|
||||
|Bread
|
||||
|Pie
|
||||
|-
|
||||
|Butter
|
||||
|Ice cream
|
||||
|}
|
||||
</pre>
|
||||
|
|
||||
{|
|
||||
|Orange
|
||||
|Apple
|
||||
|-
|
||||
|Bread
|
||||
|Pie
|
||||
|-
|
||||
|Butter
|
||||
|Ice cream
|
||||
|}
|
||||
|}
|
||||
|
||||
The cells in the same row can be listed on one line separated by <code>||</code>.
|
||||
|
||||
Extra spaces within cells in the wiki markup, as in the wiki markup below, do not affect the actual table rendering.
|
||||
|
||||
{| cellspacing="0" border="1"
|
||||
!style="width:50%"|You type
|
||||
!style="width:50%"|You get
|
||||
|-
|
||||
|
|
||||
<pre>
|
||||
{|
|
||||
| Orange || Apple || more
|
||||
|-
|
||||
| Bread || Pie || more
|
||||
|-
|
||||
| Butter || Ice cream || and more
|
||||
|}
|
||||
</pre>
|
||||
|
|
||||
{|
|
||||
| Orange || Apple || more
|
||||
|-
|
||||
| Bread || Pie || more
|
||||
|-
|
||||
| Butter || Ice cream || and more
|
||||
|}
|
||||
|}
|
||||
|
||||
=== Table headers ===
|
||||
Table headers can be created by using "<code>!</code>" instead of "<code>|</code>". Headers usually show up bold and centered by default.
|
||||
|
||||
{| cellspacing="0" border="1"
|
||||
!style="width:50%"|You type
|
||||
!style="width:50%"|You get
|
||||
|-
|
||||
|
|
||||
<pre>
|
||||
{|
|
||||
! Item
|
||||
! Amount
|
||||
! Cost
|
||||
|-
|
||||
|Orange
|
||||
|10
|
||||
|7.00
|
||||
|-
|
||||
|Bread
|
||||
|4
|
||||
|3.00
|
||||
|-
|
||||
|Butter
|
||||
|1
|
||||
|5.00
|
||||
|-
|
||||
!Total
|
||||
|
|
||||
|15.00
|
||||
|}
|
||||
</pre>
|
||||
|
|
||||
{|
|
||||
! Item
|
||||
! Amount
|
||||
! Cost
|
||||
|-
|
||||
|Orange
|
||||
|10
|
||||
|7.00
|
||||
|-
|
||||
|Bread
|
||||
|4
|
||||
|3.00
|
||||
|-
|
||||
|Butter
|
||||
|1
|
||||
|5.00
|
||||
|-
|
||||
!Total
|
||||
|
|
||||
|15.00
|
||||
|}
|
||||
|}
|
||||
|
||||
===Caption===
|
||||
A '''table caption''' can be added to the top of any table as follows.
|
||||
|
||||
{| cellspacing="0" border="1"
|
||||
!style="width:50%"|You type
|
||||
!style="width:50%"|You get
|
||||
|-
|
||||
|
|
||||
<pre>
|
||||
{|
|
||||
|+Food complements
|
||||
|-
|
||||
|Orange
|
||||
|Apple
|
||||
|-
|
||||
|Bread
|
||||
|Pie
|
||||
|-
|
||||
|Butter
|
||||
|Ice cream
|
||||
|}
|
||||
</pre>
|
||||
|
|
||||
{|
|
||||
|+ Food complements
|
||||
|-
|
||||
|Orange
|
||||
|Apple
|
||||
|-
|
||||
|Bread
|
||||
|Pie
|
||||
|-
|
||||
|Butter
|
||||
|Ice cream
|
||||
|}
|
||||
|}
|
||||
|
||||
== XHTML attributes ==
|
||||
You can add XHTML attributes to tables. For the authoriative source on these, see [http://www.w3.org/TR/REC-html40/struct/tables.html the W3C's HTML 4.01 Specification page on tables].
|
||||
|
||||
=== Attributes on tables ===
|
||||
Placing attributes after the table start tag (<code>{|</code>) applies attributes to the entire table.
|
||||
|
||||
{| cellspacing="0" border="1"
|
||||
!style="width:50%"|You type
|
||||
!style="width:50%"|You get
|
||||
|-
|
||||
|
|
||||
<pre>
|
||||
{| border="1"
|
||||
|Orange
|
||||
|Apple
|
||||
|12,333.00
|
||||
|-
|
||||
|Bread
|
||||
|Pie
|
||||
|500.00
|
||||
|-
|
||||
|Butter
|
||||
|Ice cream
|
||||
|1.00
|
||||
|}
|
||||
</pre>
|
||||
|
|
||||
{| border="1"
|
||||
|Orange
|
||||
|Apple
|
||||
|12,333.00
|
||||
|-
|
||||
|Bread
|
||||
|Pie
|
||||
|500.00
|
||||
|-
|
||||
|Butter
|
||||
|Ice cream
|
||||
|1.00
|
||||
|}
|
||||
|}
|
||||
|
||||
=== Attributes on cells ===
|
||||
You can put attributes on individual '''cells'''. For example, numbers may look better aligned right.
|
||||
|
||||
{| cellspacing="0" border="1"
|
||||
!style="width:50%"|You type
|
||||
!style="width:50%"|You get
|
||||
|-
|
||||
|
|
||||
<pre>
|
||||
{| border="1"
|
||||
|Orange
|
||||
|Apple
|
||||
|align="right" | 12,333.00
|
||||
|-
|
||||
|Bread
|
||||
|Pie
|
||||
|align="right" | 500.00
|
||||
|-
|
||||
|Butter
|
||||
|Ice cream
|
||||
|align="right" | 1.00
|
||||
|}
|
||||
</pre>
|
||||
|
|
||||
{| border="1"
|
||||
|Orange
|
||||
|Apple
|
||||
|align="right"|12,333.00
|
||||
|-
|
||||
|Bread
|
||||
|Pie
|
||||
|align="right"|500.00
|
||||
|-
|
||||
|Butter
|
||||
|Ice cream
|
||||
|align="right"|1.00
|
||||
|}
|
||||
|}
|
||||
|
||||
You can also use '''cell''' attributes when you are listing multiple '''cells''' on a single line. Note that the '''cells''' are separated by <code>||</code>, and within each '''cell''' the attribute(s) and value are separated by <code>|</code>.
|
||||
|
||||
{| cellspacing="0" border="1"
|
||||
!style="width:50%"|You type
|
||||
!style="width:50%"|You get
|
||||
|-
|
||||
|
|
||||
<pre>
|
||||
{| border="1"
|
||||
| Orange || Apple || align="right" | 12,333.00
|
||||
|-
|
||||
| Bread || Pie || align="right" | 500.00
|
||||
|-
|
||||
| Butter || Ice cream || align="right" | 1.00
|
||||
|}
|
||||
</pre>
|
||||
|
|
||||
{| border="1"
|
||||
| Orange || Apple || align="right" | 12,333.00
|
||||
|-
|
||||
| Bread || Pie || align="right" | 500.00
|
||||
|-
|
||||
| Butter || Ice cream || align="right" | 1.00
|
||||
|}
|
||||
|}
|
||||
|
||||
===Attributes on rows===
|
||||
You can put attributes on individual '''rows''', too.
|
||||
|
||||
{| cellspacing="0" border="1"
|
||||
!style="width:50%"|You type
|
||||
!style="width:50%"|You get
|
||||
|-
|
||||
|
|
||||
<pre>
|
||||
{| border="1"
|
||||
|Orange
|
||||
|Apple
|
||||
|align="right"|12,333.00
|
||||
|-
|
||||
|Bread
|
||||
|Pie
|
||||
|align="right"|500.00
|
||||
|- style="font-style:italic; color:green;"
|
||||
|Butter
|
||||
|Ice cream
|
||||
|align="right"|1.00
|
||||
|}
|
||||
</pre>
|
||||
|
|
||||
{| border="1"
|
||||
|Orange
|
||||
|Apple
|
||||
|align="right"|12,333.00
|
||||
|-
|
||||
|Bread
|
||||
|Pie
|
||||
|align="right"|500.00
|
||||
|- style="font-style:italic; color:green;"
|
||||
|Butter
|
||||
|Ice cream
|
||||
|align="right"|1.00
|
||||
|}
|
||||
|}
|
||||
|
||||
===With HTML attributes and CSS styles===
|
||||
CSS style attributes can be added with or without other HTML attributes.
|
||||
|
||||
{| cellspacing="0" border="1"
|
||||
!style="width:50%"|You type
|
||||
!style="width:50%"|You get
|
||||
|-
|
||||
|
|
||||
<pre style="white-space:-moz-pre-wrap; white-space:-pre-wrap; white-space:-o-pre-wrap; white-space:pre-wrap; word-wrap:break-word; word-break:break-all;">
|
||||
{| style="color:green; background-color:#ffffcc;" cellpadding="20" cellspacing="0" border="1"
|
||||
|Orange
|
||||
|Apple
|
||||
|-
|
||||
|Bread
|
||||
|Pie
|
||||
|-
|
||||
|Butter
|
||||
|Ice cream
|
||||
|}
|
||||
</pre>
|
||||
|
|
||||
{| style="color:green; background-color:#ffffcc;" cellpadding="20" cellspacing="0" border="1"
|
||||
|Orange
|
||||
|Apple
|
||||
|-
|
||||
|Bread
|
||||
|Pie
|
||||
|-
|
||||
|Butter
|
||||
|Ice cream
|
||||
|}
|
||||
|}
|
||||
|
||||
'''Attributes''' can be added to the caption and headers as follows.
|
||||
|
||||
{| cellspacing="0" border="1"
|
||||
!style="width:50%"|You type
|
||||
!style="width:50%"|You get
|
||||
|-
|
||||
|
|
||||
<pre style="white-space:-moz-pre-wrap; white-space:-pre-wrap; white-space:-o-pre-wrap; white-space:pre-wrap; word-wrap:break-word; word-break:break-all;">
|
||||
{| border="1" cellpadding="20" cellspacing="0"
|
||||
|+ align="bottom" style="color:#e76700;" |''Food complements''
|
||||
|-
|
||||
|Orange
|
||||
|Apple
|
||||
|-
|
||||
|Bread
|
||||
|Pie
|
||||
|-
|
||||
|Butter
|
||||
|Ice cream
|
||||
|}
|
||||
</pre>
|
||||
|
|
||||
{| border="1" cellpadding="20" cellspacing="0"
|
||||
|+ align="bottom" style="color:#e76700;" |''Food complements''
|
||||
|-
|
||||
|Orange
|
||||
|Apple
|
||||
|-
|
||||
|Bread
|
||||
|Pie
|
||||
|-
|
||||
|Butter
|
||||
|Ice cream
|
||||
|}
|
||||
|}
|
||||
|
||||
==Caveats==
|
||||
===Negative numbers===
|
||||
If you start a cell on a new line with a negative number with a minus sign (or a parameter that evaluates to a negative number), your table can get broken, because the characters <code>|-</code> will be parsed as the wiki markup for table row, not table cell. To avoid this, insert a space before the value (<code>| -6</code>) or use in-line cell markup (<code>|| -6</code>).
|
||||
===CSS vs Attributes===
|
||||
Table borders specified through CSS rather then the border attribute will render incorrectly in a small subset of text browsers.
|
||||
|
0
vendor/plugins/wikicloth/tasks/wikicloth_tasks.rake
vendored
Normal file
0
vendor/plugins/wikicloth/tasks/wikicloth_tasks.rake
vendored
Normal file
3
vendor/plugins/wikicloth/test/test_helper.rb
vendored
Normal file
3
vendor/plugins/wikicloth/test/test_helper.rb
vendored
Normal file
|
@ -0,0 +1,3 @@
|
|||
equire 'rubygems'
|
||||
require 'active_support'
|
||||
require 'active_support/test_case'
|
8
vendor/plugins/wikicloth/test/wiki_cloth_test.rb
vendored
Normal file
8
vendor/plugins/wikicloth/test/wiki_cloth_test.rb
vendored
Normal file
|
@ -0,0 +1,8 @@
|
|||
require 'test_helper'
|
||||
|
||||
class WikiClothTest < ActiveSupport::TestCase
|
||||
# Replace this with your real tests.
|
||||
test "the truth" do
|
||||
assert true
|
||||
end
|
||||
end
|
0
vendor/plugins/wikicloth/uninstall.rb
vendored
Normal file
0
vendor/plugins/wikicloth/uninstall.rb
vendored
Normal file
Loading…
Reference in a new issue