+
+
+ Blog
+Pretty much anything I feel like writing.
+
+
+About
+A litte about me.
+(my lisp code)- * The lang-cl class identifies the language as common lisp. - * This file supports the following language extensions: - * lang-cl - Common Lisp - * lang-el - Emacs Lisp - * lang-lisp - Lisp - * lang-scm - Scheme - * - * - * I used http://www.informatik.uni-freiburg.de/~thiemann/haskell/haskell98-report-html/syntax-iso.html - * as the basis, but ignore the way the ncomment production nests since this - * makes the lexical grammar irregular. It might be possible to support - * ncomments using the lookbehind filter. - * - * - * @author mikesamuel@gmail.com - */ - -PR.registerLangHandler( - PR.createSimpleLexer( - [ - // Whitespace - // whitechar -> newline | vertab | space | tab | uniWhite - // newline -> return linefeed | return | linefeed | formfeed - [PR.PR_PLAIN, /^[\t\n\x0B\x0C\r ]+/, null, '\t\n\x0B\x0C\r '], - // Single line double and single-quoted strings. - // char -> ' (graphic<' | \> | space | escape<\&>) ' - // string -> " {graphic<" | \> | space | escape | gap}" - // escape -> \ ( charesc | ascii | decimal | o octal - // | x hexadecimal ) - // charesc -> a | b | f | n | r | t | v | \ | " | ' | & - [PR.PR_STRING, /^\"(?:[^\"\\\n\x0C\r]|\\[\s\S])*(?:\"|$)/, - null, '"'], - [PR.PR_STRING, /^\'(?:[^\'\\\n\x0C\r]|\\[^&])\'?/, - null, "'"], - // decimal -> digit{digit} - // octal -> octit{octit} - // hexadecimal -> hexit{hexit} - // integer -> decimal - // | 0o octal | 0O octal - // | 0x hexadecimal | 0X hexadecimal - // float -> decimal . decimal [exponent] - // | decimal exponent - // exponent -> (e | E) [+ | -] decimal - [PR.PR_LITERAL, - /^(?:0o[0-7]+|0x[\da-f]+|\d+(?:\.\d+)?(?:e[+\-]?\d+)?)/i, - null, '0123456789'] - ], - [ - // Haskell does not have a regular lexical grammar due to the nested - // ncomment. - // comment -> dashes [ any
(my lisp code)- * The lang-cl class identifies the language as common lisp. - * This file supports the following language extensions: - * lang-cl - Common Lisp - * lang-el - Emacs Lisp - * lang-lisp - Lisp - * lang-scm - Scheme - * - * - * I used http://www.devincook.com/goldparser/doc/meta-language/grammar-LISP.htm - * as the basis, but added line comments that start with ; and changed the atom - * production to disallow unquoted semicolons. - * - * "Name" = 'LISP' - * "Author" = 'John McCarthy' - * "Version" = 'Minimal' - * "About" = 'LISP is an abstract language that organizes ALL' - * | 'data around "lists".' - * - * "Start Symbol" = [s-Expression] - * - * {Atom Char} = {Printable} - {Whitespace} - [()"\''] - * - * Atom = ( {Atom Char} | '\'{Printable} )+ - * - * [s-Expression] ::= [Quote] Atom - * | [Quote] '(' [Series] ')' - * | [Quote] '(' [s-Expression] '.' [s-Expression] ')' - * - * [Series] ::= [s-Expression] [Series] - * | - * - * [Quote] ::= '' !Quote = do not evaluate - * | - * - * - * I used Practical Common Lisp as - * the basis for the reserved word list. - * - * - * @author mikesamuel@gmail.com - */ - -PR.registerLangHandler( - PR.createSimpleLexer( - [ - ['opn', /^\(/, null, '('], - ['clo', /^\)/, null, ')'], - // A line comment that starts with ; - [PR.PR_COMMENT, /^;[^\r\n]*/, null, ';'], - // Whitespace - [PR.PR_PLAIN, /^[\t\n\r \xA0]+/, null, '\t\n\r \xA0'], - // A double quoted, possibly multi-line, string. - [PR.PR_STRING, /^\"(?:[^\"\\]|\\[\s\S])*(?:\"|$)/, null, '"'] - ], - [ - [PR.PR_KEYWORD, /^(?:block|c[ad]+r|catch|con[ds]|def(?:ine|un)|do|eq|eql|equal|equalp|eval-when|flet|format|go|if|labels|lambda|let|load-time-value|locally|macrolet|multiple-value-call|nil|progn|progv|quote|require|return-from|setq|symbol-macrolet|t|tagbody|the|throw|unwind)\b/, null], - [PR.PR_LITERAL, - /^[+\-]?(?:0x[0-9a-f]+|\d+\/\d+|(?:\.\d+|\d+(?:\.\d*)?)(?:[ed][+\-]?\d+)?)/i], - // A single quote possibly followed by a word that optionally ends with - // = ! or ?. - [PR.PR_LITERAL, - /^\'(?:-*(?:\w|\\[\x21-\x7e])(?:[\w-]*|\\[\x21-\x7e])[=!?]?)?/], - // A word that optionally ends with = ! or ?. - [PR.PR_PLAIN, - /^-*(?:[a-z_]|\\[\x21-\x7e])(?:[\w-]*|\\[\x21-\x7e])[=!?]?/i], - // A printable non-space non-special character - [PR.PR_PUNCTUATION, /^[^\w\t\n\r \xA0()\"\\\';]+/] - ]), - ['cl', 'el', 'lisp', 'scm']); diff --git a/src/lang-lua.js b/src/lang-lua.js deleted file mode 100644 index 68bb30b..0000000 --- a/src/lang-lua.js +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (C) 2008 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - - - -/** - * @fileoverview - * Registers a language handler for Lua. - * - * - * To use, include prettify.js and this file in your HTML page. - * Then put your code in an HTML tag like - *
(my Lua code)- * - * - * I used http://www.lua.org/manual/5.1/manual.html#2.1 - * Because of the long-bracket concept used in strings and comments, Lua does - * not have a regular lexical grammar, but luckily it fits within the space - * of irregular grammars supported by javascript regular expressions. - * - * @author mikesamuel@gmail.com - */ - -PR.registerLangHandler( - PR.createSimpleLexer( - [ - // Whitespace - [PR.PR_PLAIN, /^[\t\n\r \xA0]+/, null, '\t\n\r \xA0'], - // A double or single quoted, possibly multi-line, string. - [PR.PR_STRING, /^(?:\"(?:[^\"\\]|\\[\s\S])*(?:\"|$)|\'(?:[^\'\\]|\\[\s\S])*(?:\'|$))/, null, '"\''] - ], - [ - // A comment is either a line comment that starts with two dashes, or - // two dashes preceding a long bracketed block. - [PR.PR_COMMENT, /^--(?:\[(=*)\[[\s\S]*?(?:\]\1\]|$)|[^\r\n]*)/], - // A long bracketed block not preceded by -- is a string. - [PR.PR_STRING, /^\[(=*)\[[\s\S]*?(?:\]\1\]|$)/], - [PR.PR_KEYWORD, /^(?:and|break|do|else|elseif|end|false|for|function|if|in|local|nil|not|or|repeat|return|then|true|until|while)\b/, null], - // A number is a hex integer literal, a decimal real literal, or in - // scientific notation. - [PR.PR_LITERAL, - /^[+-]?(?:0x[\da-f]+|(?:(?:\.\d+|\d+(?:\.\d*)?)(?:e[+\-]?\d+)?))/i], - // An identifier - [PR.PR_PLAIN, /^[a-z_]\w*/i], - // A run of punctuation - [PR.PR_PUNCTUATION, /^[^\w\t\n\r \xA0][^\w\t\n\r \xA0\"\'\-\+=]*/] - ]), - ['lua']); diff --git a/src/lang-ml.js b/src/lang-ml.js deleted file mode 100644 index c5a3db7..0000000 --- a/src/lang-ml.js +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (C) 2008 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - - - -/** - * @fileoverview - * Registers a language handler for OCaml, SML, F# and similar languages. - * - * Based on the lexical grammar at - * http://research.microsoft.com/fsharp/manual/spec2.aspx#_Toc202383715 - * - * @author mikesamuel@gmail.com - */ - -PR.registerLangHandler( - PR.createSimpleLexer( - [ - // Whitespace is made up of spaces, tabs and newline characters. - [PR.PR_PLAIN, /^[\t\n\r \xA0]+/, null, '\t\n\r \xA0'], - // #if ident/#else/#endif directives delimit conditional compilation - // sections - [PR.PR_COMMENT, - /^#(?:if[\t\n\r \xA0]+(?:[a-z_$][\w\']*|``[^\r\n\t`]*(?:``|$))|else|endif|light)/i, - null, '#'], - // A double or single quoted, possibly multi-line, string. - // F# allows escaped newlines in strings. - [PR.PR_STRING, /^(?:\"(?:[^\"\\]|\\[\s\S])*(?:\"|$)|\'(?:[^\'\\]|\\[\s\S])*(?:\'|$))/, null, '"\''] - ], - [ - // Block comments are delimited by (* and *) and may be - // nested. Single-line comments begin with // and extend to - // the end of a line. - // TODO: (*...*) comments can be nested. This does not handle that. - [PR.PR_COMMENT, /^(?:\/\/[^\r\n]*|\(\*[\s\S]*?\*\))/], - [PR.PR_KEYWORD, /^(?:abstract|and|as|assert|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|if|in|inherit|inline|interface|internal|lazy|let|match|member|module|mutable|namespace|new|null|of|open|or|override|private|public|rec|return|static|struct|then|to|true|try|type|upcast|use|val|void|when|while|with|yield|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|global|include|method|mixin|object|parallel|process|protected|pure|sealed|trait|virtual|volatile)\b/], - // A number is a hex integer literal, a decimal real literal, or in - // scientific notation. - [PR.PR_LITERAL, - /^[+\-]?(?:0x[\da-f]+|(?:(?:\.\d+|\d+(?:\.\d*)?)(?:e[+\-]?\d+)?))/i], - [PR.PR_PLAIN, /^(?:[a-z_]\w*[!?#]?|``[^\r\n\t`]*(?:``|$))/i], - // A printable non-space non-special character - [PR.PR_PUNCTUATION, /^[^\t\n\r \xA0\"\'\w]+/] - ]), - ['fs', 'ml']); diff --git a/src/lang-nasm.js b/src/lang-nasm.js deleted file mode 100644 index 965ead6..0000000 --- a/src/lang-nasm.js +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (C) 2009 Onno Hommes. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - - -/** - * @fileoverview - * Registers a language handler for the AGC/AEA Assembly Language as described - * at http://virtualagc.googlecode.com - *
- * This file could be used by goodle code to allow syntax highlight for - * Virtual AGC SVN repository or if you don't want to commonize - * the header for the agc/aea html assembly listing. - * - * @author ohommes@alumni.cmu.edu - */ - -PR.registerLangHandler( - PR.createSimpleLexer( - [ - // A line comment that starts with ; - [PR.PR_COMMENT, /^;[^\r\n]*/, null, ';'], - // Whitespace - [PR.PR_PLAIN, /^[\t\n\r \xA0]+/, null, '\t\n\r \xA0'] - ], - [ - [PR.PR_KEYWORD, /^\[[\w\s]+\]/], - [PR.PR_KEYWORD, /^\%\w+/], - [PR.PR_KEYWORD, - /^\b(align|cli|sti|mov|equ|dd|dw|times|or|lgdt|xor|invlpg|add|pusha|push|call|jmp|popa|pop|int|ret)\b/], - [PR.PR_TYPE, - /^\b(eax|ax|ah|al|ebx|bx|bh|bl|ecx|cx|ch|cl|edx|dx|dh|dl|esi|edi|ebp|eip|esp|eflags|cs|ds|es|fs|gs|ss|cr0|cr1|cr2|cr3|cr4)\b/], - [PR.PR_DECLARATION, /^#.*/, null, '#'], - [PR.PR_LITERAL, /^0x[0-9A-F]*/], - [PR.PR_LITERAL, /^\d+/] - - ]), - ['nasm', 'asm', 'as', 's']); diff --git a/src/lang-proto.js b/src/lang-proto.js deleted file mode 100644 index d6531fd..0000000 --- a/src/lang-proto.js +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (C) 2006 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - - -/** - * @fileoverview - * Registers a language handler for Protocol Buffers as described at - * http://code.google.com/p/protobuf/. - * - * Based on the lexical grammar at - * http://research.microsoft.com/fsharp/manual/spec2.aspx#_Toc202383715 - * - * @author mikesamuel@gmail.com - */ - -PR.registerLangHandler(PR.sourceDecorator({ - keywords: ( - 'bool bytes default double enum extend extensions false fixed32 ' - + 'fixed64 float group import int32 int64 max message option ' - + 'optional package repeated required returns rpc service ' - + 'sfixed32 sfixed64 sint32 sint64 string syntax to true uint32 ' - + 'uint64'), - cStyleComments: true - }), ['proto']); diff --git a/src/lang-scala.js b/src/lang-scala.js deleted file mode 100644 index e0d675a..0000000 --- a/src/lang-scala.js +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright (C) 2010 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - - -/** - * @fileoverview - * Registers a language handler for Scala. - * - * Derived from http://lampsvn.epfl.ch/svn-repos/scala/scala-documentation/trunk/src/reference/SyntaxSummary.tex - * - * @author mikesamuel@gmail.com - */ - -PR.registerLangHandler( - PR.createSimpleLexer( - [ - // Whitespace - [PR.PR_PLAIN, /^[\t\n\r \xA0]+/, null, '\t\n\r \xA0'], - // A double or single quoted string - // or a triple double-quoted multi-line string. - [PR.PR_STRING, - /^(?:"(?:(?:""(?:""?(?!")|[^\\"]|\\.)*"{0,3})|(?:[^"\r\n\\]|\\.)*"?))/, - null, '"'], - [PR.PR_LITERAL, /^`(?:[^\r\n\\`]|\\.)*`?/, null, '`'], - [PR.PR_PUNCTUATION, /^[!#%&()*+,\-:;<=>?@\[\\\]^{|}~]+/, null, - '!#%&()*+,-:;<=>?@[\\]^{|}~'] - ], - [ - // A symbol literal is a single quote followed by an identifier with no - // single quote following - // A character literal has single quotes on either side - [PR.PR_STRING, /^'(?:[^\r\n\\']|\\(?:'|[^\r\n']+))'/], - [PR.PR_LITERAL, /^'[a-zA-Z_$][\w$]*(?!['$\w])/], - [PR.PR_KEYWORD, /^(?:abstract|case|catch|class|def|do|else|extends|final|finally|for|forSome|if|implicit|import|lazy|match|new|object|override|package|private|protected|requires|return|sealed|super|throw|trait|try|type|val|var|while|with|yield)\b/], - [PR.PR_LITERAL, /^(?:true|false|null|this)\b/], - [PR.PR_LITERAL, /^(?:(?:0(?:[0-7]+|X[0-9A-F]+))L?|(?:(?:0|[1-9][0-9]*)(?:(?:\.[0-9]+)?(?:E[+\-]?[0-9]+)?F?|L?))|\\.[0-9]+(?:E[+\-]?[0-9]+)?F?)/i], - // Treat upper camel case identifiers as types. - [PR.PR_TYPE, /^[$_]*[A-Z][_$A-Z0-9]*[a-z][\w$]*/], - [PR.PR_PLAIN, /^[$a-zA-Z_][\w$]*/], - [PR.PR_COMMENT, /^\/(?:\/.*|\*(?:\/|\**[^*/])*(?:\*+\/?)?)/], - [PR.PR_PUNCTUATION, /^(?:\.+|\/)/] - ]), - ['scala']); diff --git a/src/lang-sql.js b/src/lang-sql.js deleted file mode 100644 index 7a58097..0000000 --- a/src/lang-sql.js +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (C) 2008 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - - - -/** - * @fileoverview - * Registers a language handler for SQL. - * - * - * To use, include prettify.js and this file in your HTML page. - * Then put your code in an HTML tag like - *
(my SQL code)- * - * - * http://savage.net.au/SQL/sql-99.bnf.html is the basis for the grammar, and - * http://msdn.microsoft.com/en-us/library/aa238507(SQL.80).aspx as the basis - * for the keyword list. - * - * @author mikesamuel@gmail.com - */ - -PR.registerLangHandler( - PR.createSimpleLexer( - [ - // Whitespace - [PR.PR_PLAIN, /^[\t\n\r \xA0]+/, null, '\t\n\r \xA0'], - // A double or single quoted, possibly multi-line, string. - [PR.PR_STRING, /^(?:"(?:[^\"\\]|\\.)*"|'(?:[^\'\\]|\\.)*')/, null, - '"\''] - ], - [ - // A comment is either a line comment that starts with two dashes, or - // two dashes preceding a long bracketed block. - [PR.PR_COMMENT, /^(?:--[^\r\n]*|\/\*[\s\S]*?(?:\*\/|$))/], - [PR.PR_KEYWORD, /^(?:ADD|ALL|ALTER|AND|ANY|AS|ASC|AUTHORIZATION|BACKUP|BEGIN|BETWEEN|BREAK|BROWSE|BULK|BY|CASCADE|CASE|CHECK|CHECKPOINT|CLOSE|CLUSTERED|COALESCE|COLLATE|COLUMN|COMMIT|COMPUTE|CONSTRAINT|CONTAINS|CONTAINSTABLE|CONTINUE|CONVERT|CREATE|CROSS|CURRENT|CURRENT_DATE|CURRENT_TIME|CURRENT_TIMESTAMP|CURRENT_USER|CURSOR|DATABASE|DBCC|DEALLOCATE|DECLARE|DEFAULT|DELETE|DENY|DESC|DISK|DISTINCT|DISTRIBUTED|DOUBLE|DROP|DUMMY|DUMP|ELSE|END|ERRLVL|ESCAPE|EXCEPT|EXEC|EXECUTE|EXISTS|EXIT|FETCH|FILE|FILLFACTOR|FOR|FOREIGN|FREETEXT|FREETEXTTABLE|FROM|FULL|FUNCTION|GOTO|GRANT|GROUP|HAVING|HOLDLOCK|IDENTITY|IDENTITYCOL|IDENTITY_INSERT|IF|IN|INDEX|INNER|INSERT|INTERSECT|INTO|IS|JOIN|KEY|KILL|LEFT|LIKE|LINENO|LOAD|NATIONAL|NOCHECK|NONCLUSTERED|NOT|NULL|NULLIF|OF|OFF|OFFSETS|ON|OPEN|OPENDATASOURCE|OPENQUERY|OPENROWSET|OPENXML|OPTION|OR|ORDER|OUTER|OVER|PERCENT|PLAN|PRECISION|PRIMARY|PRINT|PROC|PROCEDURE|PUBLIC|RAISERROR|READ|READTEXT|RECONFIGURE|REFERENCES|REPLICATION|RESTORE|RESTRICT|RETURN|REVOKE|RIGHT|ROLLBACK|ROWCOUNT|ROWGUIDCOL|RULE|SAVE|SCHEMA|SELECT|SESSION_USER|SET|SETUSER|SHUTDOWN|SOME|STATISTICS|SYSTEM_USER|TABLE|TEXTSIZE|THEN|TO|TOP|TRAN|TRANSACTION|TRIGGER|TRUNCATE|TSEQUAL|UNION|UNIQUE|UPDATE|UPDATETEXT|USE|USER|VALUES|VARYING|VIEW|WAITFOR|WHEN|WHERE|WHILE|WITH|WRITETEXT)(?=[^\w-]|$)/i, null], - // A number is a hex integer literal, a decimal real literal, or in - // scientific notation. - [PR.PR_LITERAL, - /^[+-]?(?:0x[\da-f]+|(?:(?:\.\d+|\d+(?:\.\d*)?)(?:e[+\-]?\d+)?))/i], - // An identifier - [PR.PR_PLAIN, /^[a-z_][\w-]*/i], - // A run of punctuation - [PR.PR_PUNCTUATION, /^[^\w\t\n\r \xA0\"\'][^\w\t\n\r \xA0+\-\"\']*/] - ]), - ['sql']); diff --git a/src/lang-tex.js b/src/lang-tex.js deleted file mode 100644 index 57d0ac4..0000000 --- a/src/lang-tex.js +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (C) 2011 Martin S. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @fileoverview - * Support for tex highlighting as discussed on - * meta.tex.stackexchange.com. - * - * @author Martin S. - */ - -PR.registerLangHandler( - PR.createSimpleLexer( - [ - // whitespace - [PR.PR_PLAIN, /^[\t\n\r \xA0]+/, null, '\t\n\r \xA0'], - // all comments begin with '%' - [PR.PR_COMMENT, /^%[^\r\n]*/, null, '%'] - ], - [ - //[PR.PR_DECLARATION, /^\\([egx]?def|(new|renew|provide)(command|environment))\b/], - // any command starting with a \ and contains - // either only letters (a-z,A-Z), '@' (internal macros) - [PR.PR_KEYWORD, /^\\[a-zA-Z@]+/], - // or contains only one character - [PR.PR_KEYWORD, /^\\./], - // Highlight dollar for math mode and ampersam for tabular - [PR.PR_TYPE, /^[$&]/], - // numeric measurement values with attached units - [PR.PR_LITERAL, - /[+-]?(?:\.\d+|\d+(?:\.\d*)?)(cm|em|ex|in|pc|pt|bp|mm)/i], - // punctuation usually occurring within commands - [PR.PR_PUNCTUATION, /^[{}()\[\]=]+/] - ]), - ['latex', 'tex']); diff --git a/src/lang-vb.js b/src/lang-vb.js deleted file mode 100644 index a38db45..0000000 --- a/src/lang-vb.js +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (C) 2009 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - - - -/** - * @fileoverview - * Registers a language handler for various flavors of basic. - * - * - * To use, include prettify.js and this file in your HTML page. - * Then put your code in an HTML tag like - * - * - * - * http://msdn.microsoft.com/en-us/library/aa711638(VS.71).aspx defines the - * visual basic grammar lexical grammar. - * - * @author mikesamuel@gmail.com - */ - -PR.registerLangHandler( - PR.createSimpleLexer( - [ - // Whitespace - [PR.PR_PLAIN, /^[\t\n\r \xA0\u2028\u2029]+/, null, '\t\n\r \xA0\u2028\u2029'], - // A double quoted string with quotes escaped by doubling them. - // A single character can be suffixed with C. - [PR.PR_STRING, /^(?:[\"\u201C\u201D](?:[^\"\u201C\u201D]|[\"\u201C\u201D]{2})(?:[\"\u201C\u201D]c|$)|[\"\u201C\u201D](?:[^\"\u201C\u201D]|[\"\u201C\u201D]{2})*(?:[\"\u201C\u201D]|$))/i, null, - '"\u201C\u201D'], - // A comment starts with a single quote and runs until the end of the - // line. - [PR.PR_COMMENT, /^[\'\u2018\u2019][^\r\n\u2028\u2029]*/, null, '\'\u2018\u2019'] - ], - [ - [PR.PR_KEYWORD, /^(?:AddHandler|AddressOf|Alias|And|AndAlso|Ansi|As|Assembly|Auto|Boolean|ByRef|Byte|ByVal|Call|Case|Catch|CBool|CByte|CChar|CDate|CDbl|CDec|Char|CInt|Class|CLng|CObj|Const|CShort|CSng|CStr|CType|Date|Decimal|Declare|Default|Delegate|Dim|DirectCast|Do|Double|Each|Else|ElseIf|End|EndIf|Enum|Erase|Error|Event|Exit|Finally|For|Friend|Function|Get|GetType|GoSub|GoTo|Handles|If|Implements|Imports|In|Inherits|Integer|Interface|Is|Let|Lib|Like|Long|Loop|Me|Mod|Module|MustInherit|MustOverride|MyBase|MyClass|Namespace|New|Next|Not|NotInheritable|NotOverridable|Object|On|Option|Optional|Or|OrElse|Overloads|Overridable|Overrides|ParamArray|Preserve|Private|Property|Protected|Public|RaiseEvent|ReadOnly|ReDim|RemoveHandler|Resume|Return|Select|Set|Shadows|Shared|Short|Single|Static|Step|Stop|String|Structure|Sub|SyncLock|Then|Throw|To|Try|TypeOf|Unicode|Until|Variant|Wend|When|While|With|WithEvents|WriteOnly|Xor|EndIf|GoSub|Let|Variant|Wend)\b/i, null], - // A second comment form - [PR.PR_COMMENT, /^REM[^\r\n\u2028\u2029]*/i], - // A boolean, numeric, or date literal. - [PR.PR_LITERAL, - /^(?:True\b|False\b|Nothing\b|\d+(?:E[+\-]?\d+[FRD]?|[FRDSIL])?|(?:&H[0-9A-F]+|&O[0-7]+)[SIL]?|\d*\.\d+(?:E[+\-]?\d+)?[FRD]?|#\s+(?:\d+[\-\/]\d+[\-\/]\d+(?:\s+\d+:\d+(?::\d+)?(\s*(?:AM|PM))?)?|\d+:\d+(?::\d+)?(\s*(?:AM|PM))?)\s+#)/i], - // An identifier? - [PR.PR_PLAIN, /^(?:(?:[a-z]|_\w)\w*|\[(?:[a-z]|_\w)\w*\])/i], - // A run of punctuation - [PR.PR_PUNCTUATION, - /^[^\w\t\n\r \"\'\[\]\xA0\u2018\u2019\u201C\u201D\u2028\u2029]+/], - // Square brackets - [PR.PR_PUNCTUATION, /^(?:\[|\])/] - ]), - ['vb', 'vbs']); diff --git a/src/lang-vhdl.js b/src/lang-vhdl.js deleted file mode 100644 index 9c4921c..0000000 --- a/src/lang-vhdl.js +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @fileoverview - * Registers a language handler for VHDL '93. - * - * Based on the lexical grammar and keywords at - * http://www.iis.ee.ethz.ch/~zimmi/download/vhdl93_syntax.html - * - * @author benoit@ryder.fr - */ - -PR.registerLangHandler( - PR.createSimpleLexer( - [ - // Whitespace - [PR.PR_PLAIN, /^[\t\n\r \xA0]+/, null, '\t\n\r \xA0'] - ], - [ - // String, character or bit string - [PR.PR_STRING, /^(?:[BOX]?"(?:[^\"]|"")*"|'.')/i], - // Comment, from two dashes until end of line. - [PR.PR_COMMENT, /^--[^\r\n]*/], - [PR.PR_KEYWORD, /^(?:abs|access|after|alias|all|and|architecture|array|assert|attribute|begin|block|body|buffer|bus|case|component|configuration|constant|disconnect|downto|else|elsif|end|entity|exit|file|for|function|generate|generic|group|guarded|if|impure|in|inertial|inout|is|label|library|linkage|literal|loop|map|mod|nand|new|next|nor|not|null|of|on|open|or|others|out|package|port|postponed|procedure|process|pure|range|record|register|reject|rem|report|return|rol|ror|select|severity|shared|signal|sla|sll|sra|srl|subtype|then|to|transport|type|unaffected|units|until|use|variable|wait|when|while|with|xnor|xor)(?=[^\w-]|$)/i, null], - // Type, predefined or standard - [PR.PR_TYPE, /^(?:bit|bit_vector|character|boolean|integer|real|time|string|severity_level|positive|natural|signed|unsigned|line|text|std_u?logic(?:_vector)?)(?=[^\w-]|$)/i, null], - // Predefined attributes - [PR.PR_TYPE, /^\'(?:ACTIVE|ASCENDING|BASE|DELAYED|DRIVING|DRIVING_VALUE|EVENT|HIGH|IMAGE|INSTANCE_NAME|LAST_ACTIVE|LAST_EVENT|LAST_VALUE|LEFT|LEFTOF|LENGTH|LOW|PATH_NAME|POS|PRED|QUIET|RANGE|REVERSE_RANGE|RIGHT|RIGHTOF|SIMPLE_NAME|STABLE|SUCC|TRANSACTION|VAL|VALUE)(?=[^\w-]|$)/i, null], - // Number, decimal or based literal - [PR.PR_LITERAL, /^\d+(?:_\d+)*(?:#[\w\\.]+#(?:[+\-]?\d+(?:_\d+)*)?|(?:\.\d+(?:_\d+)*)?(?:E[+\-]?\d+(?:_\d+)*)?)/i], - // Identifier, basic or extended - [PR.PR_PLAIN, /^(?:[a-z]\w*|\\[^\\]*\\)/i], - // Punctuation - [PR.PR_PUNCTUATION, /^[^\w\t\n\r \xA0\"\'][^\w\t\n\r \xA0\-\"\']*/] - ]), - ['vhdl', 'vhd']); diff --git a/src/lang-wiki.js b/src/lang-wiki.js deleted file mode 100644 index d4aa350..0000000 --- a/src/lang-wiki.js +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (C) 2009 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - - -/** - * @fileoverview - * Registers a language handler for Wiki pages. - * - * Based on WikiSyntax at http://code.google.com/p/support/wiki/WikiSyntax - * - * @author mikesamuel@gmail.com - */ - -PR.registerLangHandler( - PR.createSimpleLexer( - [ - // Whitespace - [PR.PR_PLAIN, /^[\t \xA0a-gi-z0-9]+/, null, - '\t \xA0abcdefgijklmnopqrstuvwxyz0123456789'], - // Wiki formatting - [PR.PR_PUNCTUATION, /^[=*~\^\[\]]+/, null, '=*~^[]'] - ], - [ - // Meta-info like #summary, #labels, etc. - ['lang-wiki.meta', /(?:^^|\r\n?|\n)(#[a-z]+)\b/], - // A WikiWord - [PR.PR_LITERAL, /^(?:[A-Z][a-z][a-z0-9]+[A-Z][a-z][a-zA-Z0-9]+)\b/ - ], - // A preformatted block in an unknown language - ['lang-', /^\{\{\{([\s\S]+?)\}\}\}/], - // A block of source code in an unknown language - ['lang-', /^`([^\r\n`]+)`/], - // An inline URL. - [PR.PR_STRING, - /^https?:\/\/[^\/?#\s]*(?:\/[^?#\s]*)?(?:\?[^#\s]*)?(?:#\S*)?/i], - [PR.PR_PLAIN, /^(?:\r\n|[\s\S])[^#=*~^A-Zh\{`\[\r\n]*/] - ]), - ['wiki']); - -PR.registerLangHandler( - PR.createSimpleLexer([[PR.PR_KEYWORD, /^#[a-z]+/i, null, '#']], []), - ['wiki.meta']); diff --git a/src/lang-yaml.js b/src/lang-yaml.js deleted file mode 100644 index 271139f..0000000 --- a/src/lang-yaml.js +++ /dev/null @@ -1,27 +0,0 @@ -// Contributed by ribrdb @ code.google.com - -/** - * @fileoverview - * Registers a language handler for YAML. - * - * @author ribrdb - */ - -PR.registerLangHandler( - PR.createSimpleLexer( - [ - [PR.PR_PUNCTUATION, /^[:|>?]+/, null, ':|>?'], - [PR.PR_DECLARATION, /^%(?:YAML|TAG)[^#\r\n]+/, null, '%'], - [PR.PR_TYPE, /^[&]\S+/, null, '&'], - [PR.PR_TYPE, /^!\S*/, null, '!'], - [PR.PR_STRING, /^"(?:[^\\"]|\\.)*(?:"|$)/, null, '"'], - [PR.PR_STRING, /^'(?:[^']|'')*(?:'|$)/, null, "'"], - [PR.PR_COMMENT, /^#[^\r\n]*/, null, '#'], - [PR.PR_PLAIN, /^\s+/, null, ' \t\r\n'] - ], - [ - [PR.PR_DECLARATION, /^(?:---|\.\.\.)(?:[\r\n]|$)/], - [PR.PR_PUNCTUATION, /^-/], - [PR.PR_KEYWORD, /^\w+:[ \r\n]/], - [PR.PR_PLAIN, /^\w+/] - ]), ['yaml', 'yml']); diff --git a/src/openid.php b/src/openid.php deleted file mode 100644 index 19e5e7d..0000000 --- a/src/openid.php +++ /dev/null @@ -1,765 +0,0 @@ - - * $openid = new LightOpenID; - * $openid->identity = 'ID supplied by user'; - * header('Location: ' . $openid->authUrl()); - * - * The provider then sends various parameters via GET, one of them is openid_mode. - * Step two is verification: - *
- * if ($this->data['openid_mode']) {
- * $openid = new LightOpenID;
- * echo $openid->validate() ? 'Logged in.' : 'Failed';
- * }
- *
- *
- * Optionally, you can set $returnUrl and $realm (or $trustRoot, which is an alias).
- * The default values for those are:
- * $openid->realm = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
- * $openid->returnUrl = $openid->realm . $_SERVER['REQUEST_URI'];
- * If you don't know their meaning, refer to any openid tutorial, or specification. Or just guess.
- *
- * AX and SREG extensions are supported.
- * To use them, specify $openid->required and/or $openid->optional before calling $openid->authUrl().
- * These are arrays, with values being AX schema paths (the 'path' part of the URL).
- * For example:
- * $openid->required = array('namePerson/friendly', 'contact/email');
- * $openid->optional = array('namePerson/first');
- * If the server supports only SREG or OpenID 1.1, these are automaticaly
- * mapped to SREG names, so that user doesn't have to know anything about the server.
- *
- * To get the values, use $openid->getAttributes().
- *
- *
- * The library requires PHP >= 5.1.2 with curl or http/https stream wrappers enabled.
- * @author Mewp
- * @copyright Copyright (c) 2010, Mewp
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- */
-class LightOpenID
-{
- public $returnUrl
- , $required = array()
- , $optional = array()
- , $verify_peer = null
- , $capath = null
- , $cainfo = null;
- private $identity, $claimed_id;
- protected $server, $version, $trustRoot, $aliases, $identifier_select = false
- , $ax = false, $sreg = false, $data, $setup_url = null;
- static protected $ax_to_sreg = array(
- 'namePerson/friendly' => 'nickname',
- 'contact/email' => 'email',
- 'namePerson' => 'fullname',
- 'birthDate' => 'dob',
- 'person/gender' => 'gender',
- 'contact/postalCode/home' => 'postcode',
- 'contact/country/home' => 'country',
- 'pref/language' => 'language',
- 'pref/timezone' => 'timezone',
- 'namePerson/first' => 'firstname',
- 'namePerson/last' => 'lastname',
- );
-
- function __construct()
- {
- $this->trustRoot = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
- $uri = rtrim(preg_replace('#((?<=\?)|&)openid\.[^&]+#', '', $_SERVER['REQUEST_URI']), '?');
- $this->returnUrl = $this->trustRoot . $uri;
-
- $this->data = $_POST + $_GET; # OPs may send data as POST or GET.
-
- if(!function_exists('curl_init') && !in_array('https', stream_get_wrappers())) {
- throw new ErrorException('You must have either https wrappers or curl enabled.');
- }
- }
-
- function __set($name, $value)
- {
- switch ($name) {
- case 'identity':
- if (strlen($value = trim((String) $value))) {
- if (preg_match('#^xri:/*#i', $value, $m)) {
- $value = substr($value, strlen($m[0]));
- } elseif (!preg_match('/^(?:[=@+\$!\(]|https?:)/i', $value)) {
- $value = "http://$value";
- }
- if (preg_match('#^https?://[^/]+$#i', $value, $m)) {
- $value .= '/';
- }
- }
- $this->$name = $this->claimed_id = $value;
- break;
- case 'trustRoot':
- case 'realm':
- $this->trustRoot = trim($value);
- }
- }
-
- function __get($name)
- {
- switch ($name) {
- case 'identity':
- # We return claimed_id instead of identity,
- # because the developer should see the claimed identifier,
- # i.e. what he set as identity, not the op-local identifier (which is what we verify)
- return $this->claimed_id;
- case 'trustRoot':
- case 'realm':
- return $this->trustRoot;
- case 'mode':
- return empty($this->data['openid_mode']) ? null : $this->data['openid_mode'];
- }
- }
-
- /**
- * Checks if the server specified in the url exists.
- *
- * @param $url url to check
- * @return true, if the server exists; false otherwise
- */
- function hostExists($url)
- {
- if (strpos($url, '/') === false) {
- $server = $url;
- } else {
- $server = @parse_url($url, PHP_URL_HOST);
- }
-
- if (!$server) {
- return false;
- }
-
- return !!gethostbynamel($server);
- }
-
- protected function request_curl($url, $method='GET', $params=array())
- {
- $params = http_build_query($params, '', '&');
- $curl = curl_init($url . ($method == 'GET' && $params ? '?' . $params : ''));
- curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
- curl_setopt($curl, CURLOPT_HEADER, false);
- curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
- curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($curl, CURLOPT_HTTPHEADER, array('Accept: application/xrds+xml, */*'));
-
- if($this->verify_peer !== null) {
- curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
- if($this->capath) {
- curl_setopt($curl, CURLOPT_CAPATH, $this->capath);
- }
-
- if($this->cainfo) {
- curl_setopt($curl, CURLOPT_CAINFO, $this->cainfo);
- }
- }
-
- if ($method == 'POST') {
- curl_setopt($curl, CURLOPT_POST, true);
- curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
- } elseif ($method == 'HEAD') {
- curl_setopt($curl, CURLOPT_HEADER, true);
- curl_setopt($curl, CURLOPT_NOBODY, true);
- } else {
- curl_setopt($curl, CURLOPT_HTTPGET, true);
- }
- $response = curl_exec($curl);
-
- if($method == 'HEAD') {
- $headers = array();
- foreach(explode("\n", $response) as $header) {
- $pos = strpos($header,':');
- $name = strtolower(trim(substr($header, 0, $pos)));
- $headers[$name] = trim(substr($header, $pos+1));
- }
-
- # Updating claimed_id in case of redirections.
- $effective_url = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL);
- if($effective_url != $url) {
- $this->identity = $this->claimed_id = $effective_url;
- }
-
- return $headers;
- }
-
- if (curl_errno($curl)) {
- throw new ErrorException(curl_error($curl), curl_errno($curl));
- }
-
- return $response;
- }
-
- protected function request_streams($url, $method='GET', $params=array())
- {
- if(!$this->hostExists($url)) {
- throw new ErrorException('Invalid request.');
- }
-
- $params = http_build_query($params, '', '&');
- switch($method) {
- case 'GET':
- $opts = array(
- 'http' => array(
- 'method' => 'GET',
- 'header' => 'Accept: application/xrds+xml, */*',
- 'ignore_errors' => true,
- )
- );
- $url = $url . ($params ? '?' . $params : '');
- break;
- case 'POST':
- $opts = array(
- 'http' => array(
- 'method' => 'POST',
- 'header' => 'Content-type: application/x-www-form-urlencoded',
- 'content' => $params,
- 'ignore_errors' => true,
- )
- );
- break;
- case 'HEAD':
- # We want to send a HEAD request,
- # but since get_headers doesn't accept $context parameter,
- # we have to change the defaults.
- $default = stream_context_get_options(stream_context_get_default());
- stream_context_get_default(
- array('http' => array(
- 'method' => 'HEAD',
- 'header' => 'Accept: application/xrds+xml, */*',
- 'ignore_errors' => true,
- ))
- );
-
- $url = $url . ($params ? '?' . $params : '');
- $headers_tmp = get_headers ($url);
- if(!$headers_tmp) {
- return array();
- }
-
- # Parsing headers.
- $headers = array();
- foreach($headers_tmp as $header) {
- $pos = strpos($header,':');
- $name = strtolower(trim(substr($header, 0, $pos)));
- $headers[$name] = trim(substr($header, $pos+1));
-
- # Following possible redirections. The point is just to have
- # claimed_id change with them, because get_headers() will
- # follow redirections automatically.
- # We ignore redirections with relative paths.
- # If any known provider uses them, file a bug report.
- if($name == 'location') {
- if(strpos($headers[$name], 'http') === 0) {
- $this->identity = $this->claimed_id = $headers[$name];
- } elseif($headers[$name][0] == '/') {
- $parsed_url = parse_url($this->claimed_id);
- $this->identity =
- $this->claimed_id = $parsed_url['scheme'] . '://'
- . $parsed_url['host']
- . $headers[$name];
- }
- }
- }
-
- # And restore them.
- stream_context_get_default($default);
- return $headers;
- }
-
- if($this->verify_peer) {
- $opts += array('ssl' => array(
- 'verify_peer' => true,
- 'capath' => $this->capath,
- 'cafile' => $this->cainfo,
- ));
- }
-
- $context = stream_context_create ($opts);
-
- return file_get_contents($url, false, $context);
- }
-
- protected function request($url, $method='GET', $params=array())
- {
- if(function_exists('curl_init') && !ini_get('safe_mode') && !ini_get('open_basedir')) {
- return $this->request_curl($url, $method, $params);
- }
- return $this->request_streams($url, $method, $params);
- }
-
- protected function build_url($url, $parts)
- {
- if (isset($url['query'], $parts['query'])) {
- $parts['query'] = $url['query'] . '&' . $parts['query'];
- }
-
- $url = $parts + $url;
- $url = $url['scheme'] . '://'
- . (empty($url['username'])?''
- :(empty($url['password'])? "{$url['username']}@"
- :"{$url['username']}:{$url['password']}@"))
- . $url['host']
- . (empty($url['port'])?'':":{$url['port']}")
- . (empty($url['path'])?'':$url['path'])
- . (empty($url['query'])?'':"?{$url['query']}")
- . (empty($url['fragment'])?'':"#{$url['fragment']}");
- return $url;
- }
-
- /**
- * Helper function used to scan for / tags and extract information
- * from them
- */
- protected function htmlTag($content, $tag, $attrName, $attrValue, $valueName)
- {
- preg_match_all("#<{$tag}[^>]*$attrName=['\"].*?$attrValue.*?['\"][^>]*$valueName=['\"](.+?)['\"][^>]*/?>#i", $content, $matches1);
- preg_match_all("#<{$tag}[^>]*$valueName=['\"](.+?)['\"][^>]*$attrName=['\"].*?$attrValue.*?['\"][^>]*/?>#i", $content, $matches2);
-
- $result = array_merge($matches1[1], $matches2[1]);
- return empty($result)?false:$result[0];
- }
-
- /**
- * Performs Yadis and HTML discovery. Normally not used.
- * @param $url Identity URL.
- * @return String OP Endpoint (i.e. OpenID provider address).
- * @throws ErrorException
- */
- function discover($url)
- {
- if (!$url) throw new ErrorException('No identity supplied.');
- # Use xri.net proxy to resolve i-name identities
- if (!preg_match('#^https?:#', $url)) {
- $url = "https://xri.net/$url";
- }
-
- # We save the original url in case of Yadis discovery failure.
- # It can happen when we'll be lead to an XRDS document
- # which does not have any OpenID2 services.
- $originalUrl = $url;
-
- # A flag to disable yadis discovery in case of failure in headers.
- $yadis = true;
-
- # We'll jump a maximum of 5 times, to avoid endless redirections.
- for ($i = 0; $i < 5; $i ++) {
- if ($yadis) {
- $headers = $this->request($url, 'HEAD');
-
- $next = false;
- if (isset($headers['x-xrds-location'])) {
- $url = $this->build_url(parse_url($url), parse_url(trim($headers['x-xrds-location'])));
- $next = true;
- }
-
- if (isset($headers['content-type'])
- && (strpos($headers['content-type'], 'application/xrds+xml') !== false
- || strpos($headers['content-type'], 'text/xml') !== false)
- ) {
- # Apparently, some providers return XRDS documents as text/html.
- # While it is against the spec, allowing this here shouldn't break
- # compatibility with anything.
- # ---
- # Found an XRDS document, now let's find the server, and optionally delegate.
- $content = $this->request($url, 'GET');
-
- preg_match_all('#- * For a fairly comprehensive set of languages see the - * README - * file that came with this source. At a minimum, the lexer should work on a - * number of languages including C and friends, Java, Python, Bash, SQL, HTML, - * XML, CSS, Javascript, and Makefiles. It works passably on Ruby, PHP and Awk - * and a subset of Perl, but, because of commenting conventions, doesn't work on - * Smalltalk, Lisp-like, or CAML-like languages without an explicit lang class. - *
- * Usage:
} and {@code } tags in your source with
- * {@code class=prettyprint.}
- * You can also use the (html deprecated) {@code } tag, but the pretty
- * printer needs to do more substantial DOM manipulations to support that, so
- * some css styles may not be preserved.
- * </ol>
- * That's it. I wanted to keep the API as simple as possible, so there's no
- * need to specify which language the code is in, but if you wish, you can add
- * another class to the {@code <pre>} or {@code <code>} element to specify the
- * language, as in {@code <pre class="prettyprint lang-java">}. Any class that
- * starts with "lang-" followed by a file extension, specifies the file type.
- * See the "lang-*.js" files in this directory for code that implements
- * per-language file handlers.
- * <p>
- * Change log:<br>
- * cbeust, 2006/08/22
- * <blockquote>
- * Java annotations (start with "@") are now captured as literals ("lit")
- * </blockquote>
- * @requires console
- */
-
-// JSLint declarations
-/*global console, document, navigator, setTimeout, window */
-
-/**
- * Split {@code prettyPrint} into multiple timeouts so as not to interfere with
- * UI events.
- * If set to {@code false}, {@code prettyPrint()} is synchronous.
- */
-window['PR_SHOULD_USE_CONTINUATION'] = true;
-
-/** the number of characters between tab columns */
-window['PR_TAB_WIDTH'] = 2;
-
-/** Contains functions for creating and registering new language handlers.
- * @type {Object}
- */
-window['PR']
-
-/** Pretty print a chunk of code.
- *
- * @param {string} sourceCodeHtml code as html
- * @return {string} code as html, but prettier
- */
- = window['prettyPrintOne']
-/** Find all the {@code <pre>} and {@code <code>} tags in the DOM with
- * {@code class=prettyprint} and prettify them.
- * @param {Function?} opt_whenDone if specified, called when the last entry
- * has been finished.
- */
- = window['prettyPrint'] = void 0;
-
-
-(function () {
- // Keyword lists for various languages.
- var FLOW_CONTROL_KEYWORDS =
- "break continue do else for if return while ";
- var C_KEYWORDS = FLOW_CONTROL_KEYWORDS + "auto case char const default " +
- "double enum extern float goto int long register short signed sizeof " +
- "static struct switch typedef union unsigned void volatile uint8_t uint16_t uint32_t ";
- var COMMON_KEYWORDS = C_KEYWORDS + "catch class delete false import " +
- "new operator private protected public this throw true try typeof ";
- var CPP_KEYWORDS = COMMON_KEYWORDS + "alignof align_union asm axiom bool " +
- "concept concept_map const_cast constexpr decltype " +
- "dynamic_cast explicit export friend inline late_check " +
- "mutable namespace nullptr reinterpret_cast static_assert static_cast " +
- "template typeid typename using virtual wchar_t where ";
- var JAVA_KEYWORDS = COMMON_KEYWORDS +
- "abstract boolean byte extends final finally implements import " +
- "instanceof null native package strictfp super synchronized throws " +
- "transient ";
- var CSHARP_KEYWORDS = JAVA_KEYWORDS +
- "as base by checked decimal delegate descending dynamic event " +
- "fixed foreach from group implicit in interface internal into is lock " +
- "object out override orderby params partial readonly ref sbyte sealed " +
- "stackalloc string select uint ulong unchecked unsafe ushort var ";
- var COFFEE_KEYWORDS = "all and by catch class else extends false finally " +
- "for if in is isnt loop new no not null of off on or return super then " +
- "true try unless until when while yes ";
- var JSCRIPT_KEYWORDS = COMMON_KEYWORDS +
- "debugger eval export function get null set undefined var with " +
- "Infinity NaN ";
- var PERL_KEYWORDS = "caller delete die do dump elsif eval exit foreach for " +
- "goto if import last local my next no our print package redo require " +
- "sub undef unless until use wantarray while BEGIN END ";
- var PYTHON_KEYWORDS = FLOW_CONTROL_KEYWORDS + "and as assert class def del " +
- "elif except exec finally from global import in is lambda " +
- "nonlocal not or pass print raise try with yield " +
- "False True None ";
- var RUBY_KEYWORDS = FLOW_CONTROL_KEYWORDS + "alias and begin case class def" +
- " defined elsif end ensure false in module next nil not or redo rescue " +
- "retry self super then true undef unless until when yield BEGIN END ";
- var SH_KEYWORDS = FLOW_CONTROL_KEYWORDS + "case done elif esac eval fi " +
- "function in local set then until ";
- var ALL_KEYWORDS = (
- CPP_KEYWORDS + CSHARP_KEYWORDS + JSCRIPT_KEYWORDS + PERL_KEYWORDS +
- PYTHON_KEYWORDS + RUBY_KEYWORDS + SH_KEYWORDS);
- var ALL_TYPES = "signed unsigned char int short long float double extern const volatile uint8_t int8_t uint16_t int16_t uint32_t int32_t union struct typedef void";
-
- // token style names. correspond to css classes
- /** token style for a string literal */
- var PR_STRING = 'str';
- /** token style for a keyword */
- var PR_KEYWORD = 'kwd';
- /** token style for a comment */
- var PR_COMMENT = 'com';
- /** token style for a type */
- var PR_TYPE = 'typ';
- /** token style for a literal value. e.g. 1, null, true. */
- var PR_LITERAL = 'lit';
- /** token style for a punctuation string. */
- var PR_PUNCTUATION = 'pun';
- /** token style for a punctuation string. */
- var PR_PLAIN = 'pln';
-
- /** token style for an sgml tag. */
- var PR_TAG = 'tag';
- /** token style for a markup declaration such as a DOCTYPE. */
- var PR_DECLARATION = 'dec';
- /** token style for embedded source. */
- var PR_SOURCE = 'src';
- /** token style for an sgml attribute name. */
- var PR_ATTRIB_NAME = 'atn';
- /** token style for an sgml attribute value. */
- var PR_ATTRIB_VALUE = 'atv';
-
- /**
- * A class that indicates a section of markup that is not code, e.g. to allow
- * embedding of line numbers within code listings.
- */
- var PR_NOCODE = 'nocode';
-
- /** A set of tokens that can precede a regular expression literal in
- * javascript.
- * http://www.mozilla.org/js/language/js20/rationale/syntax.html has the full
- * list, but I've removed ones that might be problematic when seen in
- * languages that don't support regular expression literals.
- *
- * <p>Specifically, I've removed any keywords that can't precede a regexp
- * literal in a syntactically legal javascript program, and I've removed the
- * "in" keyword since it's not a keyword in many languages, and might be used
- * as a count of inches.
- *
- * <p>The link a above does not accurately describe EcmaScript rules since
- * it fails to distinguish between (a=++/b/i) and (a++/b/i) but it works
- * very well in practice.
- *
- * @private
- */
- var REGEXP_PRECEDER_PATTERN = function () {
- var preceders = [
- "!", "!=", "!==", "#", "%", "%=", "&", "&&", "&&=",
- "&=", "(", "*", "*=", /* "+", */ "+=", ",", /* "-", */ "-=",
- "->", /*".", "..", "...", handled below */ "/", "/=", ":", "::", ";",
- "<", "<<", "<<=", "<=", "=", "==", "===", ">",
- ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[",
- "^", "^=", "^^", "^^=", "{", "|", "|=", "||",
- "||=", "~" /* handles =~ and !~ */,
- "break", "case", "continue", "delete",
- "do", "else", "finally", "instanceof",
- "return", "throw", "try", "typeof"
- ];
- var pattern = '(?:^^|[+-]';
- for (var i = 0; i < preceders.length; ++i) {
- pattern += '|' + preceders[i].replace(/([^=<>:&a-z])/g, '\\$1');
- }
- pattern += ')\\s*'; // matches at end, and matches empty string
- return pattern;
- // CAVEAT: this does not properly handle the case where a regular
- // expression immediately follows another since a regular expression may
- // have flags for case-sensitivity and the like. Having regexp tokens
- // adjacent is not valid in any language I'm aware of, so I'm punting.
- // TODO: maybe style special characters inside a regexp as punctuation.
- }();
-
-
- /**
- * Given a group of {@link RegExp}s, returns a {@code RegExp} that globally
- * matches the union of the sets of strings matched by the input RegExp.
- * Since it matches globally, if the input strings have a start-of-input
- * anchor (/^.../), it is ignored for the purposes of unioning.
- * @param {Array.<RegExp>} regexs non multiline, non-global regexs.
- * @return {RegExp} a global regex.
- */
- function combinePrefixPatterns(regexs) {
- var capturedGroupIndex = 0;
-
- var needToFoldCase = false;
- var ignoreCase = false;
- for (var i = 0, n = regexs.length; i < n; ++i) {
- var regex = regexs[i];
- if (regex.ignoreCase) {
- ignoreCase = true;
- } else if (/[a-z]/i.test(regex.source.replace(
- /\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\[^ux]/gi, ''))) {
- needToFoldCase = true;
- ignoreCase = false;
- break;
- }
- }
-
- function decodeEscape(charsetPart) {
- if (charsetPart.charAt(0) !== '\\') { return charsetPart.charCodeAt(0); }
- switch (charsetPart.charAt(1)) {
- case 'b': return 8;
- case 't': return 9;
- case 'n': return 0xa;
- case 'v': return 0xb;
- case 'f': return 0xc;
- case 'r': return 0xd;
- case 'u': case 'x':
- return parseInt(charsetPart.substring(2), 16)
- || charsetPart.charCodeAt(1);
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7':
- return parseInt(charsetPart.substring(1), 8);
- default: return charsetPart.charCodeAt(1);
- }
- }
-
- function encodeEscape(charCode) {
- if (charCode < 0x20) {
- return (charCode < 0x10 ? '\\x0' : '\\x') + charCode.toString(16);
- }
- var ch = String.fromCharCode(charCode);
- if (ch === '\\' || ch === '-' || ch === '[' || ch === ']') {
- ch = '\\' + ch;
- }
- return ch;
- }
-
- function caseFoldCharset(charSet) {
- var charsetParts = charSet.substring(1, charSet.length - 1).match(
- new RegExp(
- '\\\\u[0-9A-Fa-f]{4}'
- + '|\\\\x[0-9A-Fa-f]{2}'
- + '|\\\\[0-3][0-7]{0,2}'
- + '|\\\\[0-7]{1,2}'
- + '|\\\\[\\s\\S]'
- + '|-'
- + '|[^-\\\\]',
- 'g'));
- var groups = [];
- var ranges = [];
- var inverse = charsetParts[0] === '^';
- for (var i = inverse ? 1 : 0, n = charsetParts.length; i < n; ++i) {
- var p = charsetParts[i];
- switch (p) {
- case '\\B': case '\\b':
- case '\\D': case '\\d':
- case '\\S': case '\\s':
- case '\\W': case '\\w':
- groups.push(p);
- continue;
- }
- var start = decodeEscape(p);
- var end;
- if (i + 2 < n && '-' === charsetParts[i + 1]) {
- end = decodeEscape(charsetParts[i + 2]);
- i += 2;
- } else {
- end = start;
- }
- ranges.push([start, end]);
- // If the range might intersect letters, then expand it.
- if (!(end < 65 || start > 122)) {
- if (!(end < 65 || start > 90)) {
- ranges.push([Math.max(65, start) | 32, Math.min(end, 90) | 32]);
- }
- if (!(end < 97 || start > 122)) {
- ranges.push([Math.max(97, start) & ~32, Math.min(end, 122) & ~32]);
- }
- }
- }
-
- // [[1, 10], [3, 4], [8, 12], [14, 14], [16, 16], [17, 17]]
- // -> [[1, 12], [14, 14], [16, 17]]
- ranges.sort(function (a, b) { return (a[0] - b[0]) || (b[1] - a[1]); });
- var consolidatedRanges = [];
- var lastRange = [NaN, NaN];
- for (var i = 0; i < ranges.length; ++i) {
- var range = ranges[i];
- if (range[0] <= lastRange[1] + 1) {
- lastRange[1] = Math.max(lastRange[1], range[1]);
- } else {
- consolidatedRanges.push(lastRange = range);
- }
- }
-
- var out = ['['];
- if (inverse) { out.push('^'); }
- out.push.apply(out, groups);
- for (var i = 0; i < consolidatedRanges.length; ++i) {
- var range = consolidatedRanges[i];
- out.push(encodeEscape(range[0]));
- if (range[1] > range[0]) {
- if (range[1] + 1 > range[0]) { out.push('-'); }
- out.push(encodeEscape(range[1]));
- }
- }
- out.push(']');
- return out.join('');
- }
-
- function allowAnywhereFoldCaseAndRenumberGroups(regex) {
- // Split into character sets, escape sequences, punctuation strings
- // like ('(', '(?:', ')', '^'), and runs of characters that do not
- // include any of the above.
- var parts = regex.source.match(
- new RegExp(
- '(?:'
- + '\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]' // a character set
- + '|\\\\u[A-Fa-f0-9]{4}' // a unicode escape
- + '|\\\\x[A-Fa-f0-9]{2}' // a hex escape
- + '|\\\\[0-9]+' // a back-reference or octal escape
- + '|\\\\[^ux0-9]' // other escape sequence
- + '|\\(\\?[:!=]' // start of a non-capturing group
- + '|[\\(\\)\\^]' // start/emd of a group, or line start
- + '|[^\\x5B\\x5C\\(\\)\\^]+' // run of other characters
- + ')',
- 'g'));
- var n = parts.length;
-
- // Maps captured group numbers to the number they will occupy in
- // the output or to -1 if that has not been determined, or to
- // undefined if they need not be capturing in the output.
- var capturedGroups = [];
-
- // Walk over and identify back references to build the capturedGroups
- // mapping.
- for (var i = 0, groupIndex = 0; i < n; ++i) {
- var p = parts[i];
- if (p === '(') {
- // groups are 1-indexed, so max group index is count of '('
- ++groupIndex;
- } else if ('\\' === p.charAt(0)) {
- var decimalValue = +p.substring(1);
- if (decimalValue && decimalValue <= groupIndex) {
- capturedGroups[decimalValue] = -1;
- }
- }
- }
-
- // Renumber groups and reduce capturing groups to non-capturing groups
- // where possible.
- for (var i = 1; i < capturedGroups.length; ++i) {
- if (-1 === capturedGroups[i]) {
- capturedGroups[i] = ++capturedGroupIndex;
- }
- }
- for (var i = 0, groupIndex = 0; i < n; ++i) {
- var p = parts[i];
- if (p === '(') {
- ++groupIndex;
- if (capturedGroups[groupIndex] === undefined) {
- parts[i] = '(?:';
- }
- } else if ('\\' === p.charAt(0)) {
- var decimalValue = +p.substring(1);
- if (decimalValue && decimalValue <= groupIndex) {
- parts[i] = '\\' + capturedGroups[groupIndex];
- }
- }
- }
-
- // Remove any prefix anchors so that the output will match anywhere.
- // ^^ really does mean an anchored match though.
- for (var i = 0, groupIndex = 0; i < n; ++i) {
- if ('^' === parts[i] && '^' !== parts[i + 1]) { parts[i] = ''; }
- }
-
- // Expand letters to groups to handle mixing of case-sensitive and
- // case-insensitive patterns if necessary.
- if (regex.ignoreCase && needToFoldCase) {
- for (var i = 0; i < n; ++i) {
- var p = parts[i];
- var ch0 = p.charAt(0);
- if (p.length >= 2 && ch0 === '[') {
- parts[i] = caseFoldCharset(p);
- } else if (ch0 !== '\\') {
- // TODO: handle letters in numeric escapes.
- parts[i] = p.replace(
- /[a-zA-Z]/g,
- function (ch) {
- var cc = ch.charCodeAt(0);
- return '[' + String.fromCharCode(cc & ~32, cc | 32) + ']';
- });
- }
- }
- }
-
- return parts.join('');
- }
-
- var rewritten = [];
- for (var i = 0, n = regexs.length; i < n; ++i) {
- var regex = regexs[i];
- if (regex.global || regex.multiline) { throw new Error('' + regex); }
- rewritten.push(
- '(?:' + allowAnywhereFoldCaseAndRenumberGroups(regex) + ')');
- }
-
- return new RegExp(rewritten.join('|'), ignoreCase ? 'gi' : 'g');
- }
-
-
- /**
- * Split markup into a string of source code and an array mapping ranges in
- * that string to the text nodes in which they appear.
- *
- * <p>
- * The HTML DOM structure:</p>
- * <pre>
- * (Element "p"
- * (Element "b"
- * (Text "print ")) ; #1
- * (Text "'Hello '") ; #2
- * (Element "br") ; #3
- * (Text " + 'World';")) ; #4
- * </pre>
- * <p>
- * corresponds to the HTML
- * {@code <p><b>print </b>'Hello '<br> + 'World';</p>}.</p>
- *
- * <p>
- * It will produce the output:</p>
- * <pre>
- * {
- * source: "print 'Hello '\n + 'World';",
- * // 1 2
- * // 012345678901234 5678901234567
- * spans: [0, #1, 6, #2, 14, #3, 15, #4]
- * }
- * </pre>
- * <p>
- * where #1 is a reference to the {@code "print "} text node above, and so
- * on for the other text nodes.
- * </p>
- *
- * <p>
- * The {@code} spans array is an array of pairs. Even elements are the start
- * indices of substrings, and odd elements are the text nodes (or BR elements)
- * that contain the text for those substrings.
- * Substrings continue until the next index or the end of the source.
- * </p>
- *
- * @param {Node} node an HTML DOM subtree containing source-code.
- * @return {Object} source code and the text nodes in which they occur.
- */
- function extractSourceSpans(node) {
- var nocode = /(?:^|\s)nocode(?:\s|$)/;
-
- var chunks = [];
- var length = 0;
- var spans = [];
- var k = 0;
-
- var whitespace;
- if (node.currentStyle) {
- whitespace = node.currentStyle.whiteSpace;
- } else if (window.getComputedStyle) {
- whitespace = document.defaultView.getComputedStyle(node, null)
- .getPropertyValue('white-space');
- }
- var isPreformatted = whitespace && 'pre' === whitespace.substring(0, 3);
-
- function walk(node) {
- switch (node.nodeType) {
- case 1: // Element
- if (nocode.test(node.className)) { return; }
- for (var child = node.firstChild; child; child = child.nextSibling) {
- walk(child);
- }
- var nodeName = node.nodeName;
- if ('BR' === nodeName || 'LI' === nodeName) {
- chunks[k] = '\n';
- spans[k << 1] = length++;
- spans[(k++ << 1) | 1] = node;
- }
- break;
- case 3: case 4: // Text
- var text = node.nodeValue;
- if (text.length) {
- if (!isPreformatted) {
- text = text.replace(/[ \t\r\n]+/g, ' ');
- } else {
- text = text.replace(/\r\n?/g, '\n'); // Normalize newlines.
- }
- // TODO: handle tabs here?
- chunks[k] = text;
- spans[k << 1] = length;
- length += text.length;
- spans[(k++ << 1) | 1] = node;
- }
- break;
- }
- }
-
- walk(node);
-
- return {
- source: chunks.join('').replace(/\n$/, ''),
- spans: spans
- };
- }
-
-
- /**
- * Apply the given language handler to sourceCode and add the resulting
- * decorations to out.
- * @param {number} basePos the index of sourceCode within the chunk of source
- * whose decorations are already present on out.
- */
- function appendDecorations(basePos, sourceCode, langHandler, out) {
- if (!sourceCode) { return; }
- var job = {
- source: sourceCode,
- basePos: basePos
- };
- langHandler(job);
- out.push.apply(out, job.decorations);
- }
-
- /** Given triples of [style, pattern, context] returns a lexing function,
- * The lexing function interprets the patterns to find token boundaries and
- * returns a decoration list of the form
- * [index_0, style_0, index_1, style_1, ..., index_n, style_n]
- * where index_n is an index into the sourceCode, and style_n is a style
- * constant like PR_PLAIN. index_n-1 <= index_n, and style_n-1 applies to
- * all characters in sourceCode[index_n-1:index_n].
- *
- * The stylePatterns is a list whose elements have the form
- * [style : string, pattern : RegExp, DEPRECATED, shortcut : string].
- *
- * Style is a style constant like PR_PLAIN, or can be a string of the
- * form 'lang-FOO', where FOO is a language extension describing the
- * language of the portion of the token in $1 after pattern executes.
- * E.g., if style is 'lang-lisp', and group 1 contains the text
- * '(hello (world))', then that portion of the token will be passed to the
- * registered lisp handler for formatting.
- * The text before and after group 1 will be restyled using this decorator
- * so decorators should take care that this doesn't result in infinite
- * recursion. For example, the HTML lexer rule for SCRIPT elements looks
- * something like ['lang-js', /<[s]cript>(.+?)<\/script>/]. This may match
- * '<script>foo()<\/script>', which would cause the current decorator to
- * be called with '<script>' which would not match the same rule since
- * group 1 must not be empty, so it would be instead styled as PR_TAG by
- * the generic tag rule. The handler registered for the 'js' extension would
- * then be called with 'foo()', and finally, the current decorator would
- * be called with '<\/script>' which would not match the original rule and
- * so the generic tag rule would identify it as a tag.
- *
- * Pattern must only match prefixes, and if it matches a prefix, then that
- * match is considered a token with the same style.
- *
- * Context is applied to the last non-whitespace, non-comment token
- * recognized.
- *
- * Shortcut is an optional string of characters, any of which, if the first
- * character, gurantee that this pattern and only this pattern matches.
- *
- * @param {Array} shortcutStylePatterns patterns that always start with
- * a known character. Must have a shortcut string.
- * @param {Array} fallthroughStylePatterns patterns that will be tried in
- * order if the shortcut ones fail. May have shortcuts.
- *
- * @return {function (Object)} a
- * function that takes source code and returns a list of decorations.
- */
- function createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns) {
- var shortcuts = {};
- var tokenizer;
- (function () {
- var allPatterns = shortcutStylePatterns.concat(fallthroughStylePatterns);
- var allRegexs = [];
- var regexKeys = {};
- for (var i = 0, n = allPatterns.length; i < n; ++i) {
- var patternParts = allPatterns[i];
- var shortcutChars = patternParts[3];
- if (shortcutChars) {
- for (var c = shortcutChars.length; --c >= 0;) {
- shortcuts[shortcutChars.charAt(c)] = patternParts;
- }
- }
- var regex = patternParts[1];
- var k = '' + regex;
- if (!regexKeys.hasOwnProperty(k)) {
- allRegexs.push(regex);
- regexKeys[k] = null;
- }
- }
- allRegexs.push(/[\0-\uffff]/);
- tokenizer = combinePrefixPatterns(allRegexs);
- })();
-
- var nPatterns = fallthroughStylePatterns.length;
- var notWs = /\S/;
-
- /**
- * Lexes job.source and produces an output array job.decorations of style
- * classes preceded by the position at which they start in job.source in
- * order.
- *
- * @param {Object} job an object like {@code
- * source: {string} sourceText plain text,
- * basePos: {int} position of job.source in the larger chunk of
- * sourceCode.
- * }
- */
- var decorate = function (job) {
- var sourceCode = job.source, basePos = job.basePos;
- /** Even entries are positions in source in ascending order. Odd enties
- * are style markers (e.g., PR_COMMENT) that run from that position until
- * the end.
- * @type {Array.<number|string>}
- */
- var decorations = [basePos, PR_PLAIN];
- var pos = 0; // index into sourceCode
- var tokens = sourceCode.match(tokenizer) || [];
- var styleCache = {};
-
- for (var ti = 0, nTokens = tokens.length; ti < nTokens; ++ti) {
- var token = tokens[ti];
- var style = styleCache[token];
- var match = void 0;
-
- var isEmbedded;
- if (typeof style === 'string') {
- isEmbedded = false;
- } else {
- var patternParts = shortcuts[token.charAt(0)];
- if (patternParts) {
- match = token.match(patternParts[1]);
- style = patternParts[0];
- } else {
- for (var i = 0; i < nPatterns; ++i) {
- patternParts = fallthroughStylePatterns[i];
- match = token.match(patternParts[1]);
- if (match) {
- style = patternParts[0];
- break;
- }
- }
-
- if (!match) { // make sure that we make progress
- style = PR_PLAIN;
- }
- }
-
- isEmbedded = style.length >= 5 && 'lang-' === style.substring(0, 5);
- if (isEmbedded && !(match && typeof match[1] === 'string')) {
- isEmbedded = false;
- style = PR_SOURCE;
- }
-
- if (!isEmbedded) { styleCache[token] = style; }
- }
-
- var tokenStart = pos;
- pos += token.length;
-
- if (!isEmbedded) {
- decorations.push(basePos + tokenStart, style);
- } else { // Treat group 1 as an embedded block of source code.
- var embeddedSource = match[1];
- var embeddedSourceStart = token.indexOf(embeddedSource);
- var embeddedSourceEnd = embeddedSourceStart + embeddedSource.length;
- if (match[2]) {
- // If embeddedSource can be blank, then it would match at the
- // beginning which would cause us to infinitely recurse on the
- // entire token, so we catch the right context in match[2].
- embeddedSourceEnd = token.length - match[2].length;
- embeddedSourceStart = embeddedSourceEnd - embeddedSource.length;
- }
- var lang = style.substring(5);
- // Decorate the left of the embedded source
- appendDecorations(
- basePos + tokenStart,
- token.substring(0, embeddedSourceStart),
- decorate, decorations);
- // Decorate the embedded source
- appendDecorations(
- basePos + tokenStart + embeddedSourceStart,
- embeddedSource,
- langHandlerForExtension(lang, embeddedSource),
- decorations);
- // Decorate the right of the embedded section
- appendDecorations(
- basePos + tokenStart + embeddedSourceEnd,
- token.substring(embeddedSourceEnd),
- decorate, decorations);
- }
- }
- job.decorations = decorations;
- };
- return decorate;
- }
-
- /** returns a function that produces a list of decorations from source text.
- *
- * This code treats ", ', and ` as string delimiters, and \ as a string
- * escape. It does not recognize perl's qq() style strings.
- * It has no special handling for double delimiter escapes as in basic, or
- * the tripled delimiters used in python, but should work on those regardless
- * although in those cases a single string literal may be broken up into
- * multiple adjacent string literals.
- *
- * It recognizes C, C++, and shell style comments.
- *
- * @param {Object} options a set of optional parameters.
- * @return {function (Object)} a function that examines the source code
- * in the input job and builds the decoration list.
- */
- function sourceDecorator(options) {
- var shortcutStylePatterns = [], fallthroughStylePatterns = [];
- if (options['tripleQuotedStrings']) {
- // '''multi-line-string''', 'single-line-string', and double-quoted
- shortcutStylePatterns.push(
- [PR_STRING, /^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,
- null, '\'"']);
- } else if (options['multiLineStrings']) {
- // 'multi-line-string', "multi-line-string"
- shortcutStylePatterns.push(
- [PR_STRING, /^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,
- null, '\'"`']);
- } else {
- // 'single-line-string', "single-line-string"
- shortcutStylePatterns.push(
- [PR_STRING,
- /^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,
- null, '"\'']);
- }
- if (options['verbatimStrings']) {
- // verbatim-string-literal production from the C# grammar. See issue 93.
- fallthroughStylePatterns.push(
- [PR_STRING, /^@\"(?:[^\"]|\"\")*(?:\"|$)/, null]);
- }
- var hc = options['hashComments'];
- if (hc) {
- if (options['cStyleComments']) {
- if (hc > 1) { // multiline hash comments
- shortcutStylePatterns.push(
- [PR_COMMENT, /^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/, null, '#']);
- } else {
- // Stop C preprocessor declarations at an unclosed open comment
- shortcutStylePatterns.push(
- [PR_COMMENT, /^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\r\n]*)/,
- null, '#']);
- }
- fallthroughStylePatterns.push(
- [PR_STRING,
- /^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,
- null]);
- } else {
- shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']);
- }
- }
- if (options['cStyleComments']) {
- fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]);
- fallthroughStylePatterns.push(
- [PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]);
- }
- if (options['regexLiterals']) {
- var REGEX_LITERAL = (
- // A regular expression literal starts with a slash that is
- // not followed by * or / so that it is not confused with
- // comments.
- '/(?=[^/*])'
- // and then contains any number of raw characters,
- + '(?:[^/\\x5B\\x5C]'
- // escape sequences (\x5C),
- + '|\\x5C[\\s\\S]'
- // or non-nesting character sets (\x5B\x5D);
- + '|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+'
- // finally closed by a /.
- + '/');
- fallthroughStylePatterns.push(
- ['lang-regex',
- new RegExp('^' + REGEXP_PRECEDER_PATTERN + '(' + REGEX_LITERAL + ')')
- ]);
- }
-
- if(options['types']) {
- var types = options['types'].replace(/^\s+|\s+$/g, '');
- if (types.length) {
- fallthroughStylePatterns.push(
- [PR_TYPE,
- new RegExp('^(?:' + types.replace(/\s+/g, '|') + ')\\b'), null]);
- }
- }
- if(options['decl']) {
- fallthroughStylePatterns.push(
- // [PR_DECLARATION, /^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/, null, '#']);
- [PR_DECLARATION, /^#/, null, '#']);
- }
- var keywords = options['keywords'].replace(/^\s+|\s+$/g, '');
- if (keywords.length) {
- fallthroughStylePatterns.push(
- [PR_KEYWORD,
- new RegExp('^(?:' + keywords.replace(/\s+/g, '|') + ')\\b'), null]);
- }
-
- shortcutStylePatterns.push([PR_PLAIN, /^\s+/, null, ' \r\n\t\xA0']);
- fallthroughStylePatterns.push(
- // TODO(mikesamuel): recognize non-latin letters and numerals in idents
- // [PR_TYPE, /^@?[A-Z]+[a-z][A-Za-z_$@0-9]*/, null],
- [PR_LITERAL, /^@[a-z_$][a-z_$@0-9]*/i, null],
- [PR_PLAIN, /^[a-z_$][a-z_$@0-9]*/i, null],
- [PR_LITERAL,
- new RegExp(
- '^(?:'
- // A hex number
- + '0x[a-f0-9]+'
- // or an octal or decimal number,
- + '|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)'
- // possibly in scientific notation
- + '(?:e[+\\-]?\\d+)?'
- + ')'
- // with an optional modifier like UL for unsigned long
- + '[a-z]*', 'i'),
- null, '0123456789'],
- // Don't treat escaped quotes in bash as starting strings. See issue 144.
- [PR_PLAIN, /^\\[\s\S]?/, null],
- [PR_PUNCTUATION, /^.[^\s\w\.$@\'\"\`\/\#\\]*/, null]);
-
- return createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns);
- }
-
- var decorateSource = sourceDecorator({
- 'keywords': ALL_KEYWORDS,
- 'types': ALL_TYPES,
- 'hashComments': true,
- 'cStyleComments': true,
- 'multiLineStrings': true,
- 'regexLiterals': true
- });
-
- /**
- * Given a DOM subtree, wraps it in a list, and puts each line into its own
- * list item.
- *
- * @param {Node} node modified in place. Its content is pulled into an
- * HTMLOListElement, and each line is moved into a separate list item.
- * This requires cloning elements, so the input might not have unique
- * IDs after numbering.
- */
- function numberLines(node, opt_startLineNum) {
- var nocode = /(?:^|\s)nocode(?:\s|$)/;
- var lineBreak = /\r\n?|\n/;
-
- var document = node.ownerDocument;
-
- var whitespace;
- if (node.currentStyle) {
- whitespace = node.currentStyle.whiteSpace;
- } else if (window.getComputedStyle) {
- whitespace = document.defaultView.getComputedStyle(node, null)
- .getPropertyValue('white-space');
- }
- // If it's preformatted, then we need to split lines on line breaks
- // in addition to <BR>s.
- var isPreformatted = whitespace && 'pre' === whitespace.substring(0, 3);
-
- var li = document.createElement('LI');
- while (node.firstChild) {
- li.appendChild(node.firstChild);
- }
- // An array of lines. We split below, so this is initialized to one
- // un-split line.
- var listItems = [li];
-
- function walk(node) {
- switch (node.nodeType) {
- case 1: // Element
- if (nocode.test(node.className)) { break; }
- if ('BR' === node.nodeName) {
- breakAfter(node);
- // Discard the <BR> since it is now flush against a </LI>.
- if (node.parentNode) {
- node.parentNode.removeChild(node);
- }
- } else {
- for (var child = node.firstChild; child; child = child.nextSibling) {
- walk(child);
- }
- }
- break;
- case 3: case 4: // Text
- if (isPreformatted) {
- var text = node.nodeValue;
- var match = text.match(lineBreak);
- if (match) {
- var firstLine = text.substring(0, match.index);
- node.nodeValue = firstLine;
- var tail = text.substring(match.index + match[0].length);
- if (tail) {
- var parent = node.parentNode;
- parent.insertBefore(
- document.createTextNode(tail), node.nextSibling);
- }
- breakAfter(node);
- if (!firstLine) {
- // Don't leave blank text nodes in the DOM.
- node.parentNode.removeChild(node);
- }
- }
- }
- break;
- }
- }
-
- // Split a line after the given node.
- function breakAfter(lineEndNode) {
- // If there's nothing to the right, then we can skip ending the line
- // here, and move root-wards since splitting just before an end-tag
- // would require us to create a bunch of empty copies.
- while (!lineEndNode.nextSibling) {
- lineEndNode = lineEndNode.parentNode;
- if (!lineEndNode) { return; }
- }
-
- function breakLeftOf(limit, copy) {
- // Clone shallowly if this node needs to be on both sides of the break.
- var rightSide = copy ? limit.cloneNode(false) : limit;
- var parent = limit.parentNode;
- if (parent) {
- // We clone the parent chain.
- // This helps us resurrect important styling elements that cross lines.
- // E.g. in <i>Foo<br>Bar</i>
- // should be rewritten to <li><i>Foo</i></li><li><i>Bar</i></li>.
- var parentClone = breakLeftOf(parent, 1);
- // Move the clone and everything to the right of the original
- // onto the cloned parent.
- var next = limit.nextSibling;
- parentClone.appendChild(rightSide);
- for (var sibling = next; sibling; sibling = next) {
- next = sibling.nextSibling;
- parentClone.appendChild(sibling);
- }
- }
- return rightSide;
- }
-
- var copiedListItem = breakLeftOf(lineEndNode.nextSibling, 0);
-
- // Walk the parent chain until we reach an unattached LI.
- for (var parent;
- // Check nodeType since IE invents document fragments.
- (parent = copiedListItem.parentNode) && parent.nodeType === 1;) {
- copiedListItem = parent;
- }
- // Put it on the list of lines for later processing.
- listItems.push(copiedListItem);
- }
-
- // Split lines while there are lines left to split.
- for (var i = 0; // Number of lines that have been split so far.
- i < listItems.length; // length updated by breakAfter calls.
- ++i) {
- walk(listItems[i]);
- }
-
- // Make sure numeric indices show correctly.
- if (opt_startLineNum === (opt_startLineNum|0)) {
- listItems[0].setAttribute('value', opt_startLineNum);
- }
-
- var ol = document.createElement('OL');
- ol.className = 'linenums';
- var offset = Math.max(0, ((opt_startLineNum - 1 /* zero index */)) | 0) || 0;
- for (var i = 0, n = listItems.length; i < n; ++i) {
- li = listItems[i];
- // Stick a class on the LIs so that stylesheets can
- // color odd/even rows, or any other row pattern that
- // is co-prime with 10.
- li.className = 'L' + ((i + offset) % 10);
- if (!li.firstChild) {
- li.appendChild(document.createTextNode('\xA0'));
- }
- ol.appendChild(li);
- }
-
- node.appendChild(ol);
- }
-
- /**
- * Breaks {@code job.source} around style boundaries in {@code job.decorations}
- * and modifies {@code job.sourceNode} in place.
- * @param {Object} job like <pre>{
- * source: {string} source as plain text,
- * spans: {Array.<number|Node>} alternating span start indices into source
- * and the text node or element (e.g. {@code <BR>}) corresponding to that
- * span.
- * decorations: {Array.<number|string} an array of style classes preceded
- * by the position at which they start in job.source in order
- * }</pre>
- * @private
- */
- function recombineTagsAndDecorations(job) {
- var isIE = /\bMSIE\b/.test(navigator.userAgent);
- var newlineRe = /\n/g;
-
- var source = job.source;
- var sourceLength = source.length;
- // Index into source after the last code-unit recombined.
- var sourceIndex = 0;
-
- var spans = job.spans;
- var nSpans = spans.length;
- // Index into spans after the last span which ends at or before sourceIndex.
- var spanIndex = 0;
-
- var decorations = job.decorations;
- var nDecorations = decorations.length;
- // Index into decorations after the last decoration which ends at or before sourceIndex.
- var decorationIndex = 0;
-
- // Simplify decorations.
- var decPos = 0;
- for (var i = 0; i < nDecorations;) {
- // Skip over any zero-length decorations.
- var startPos = decorations[i];
- var start = i;
- while (start + 2 < nDecorations && decorations[start + 2] === startPos) {
- start += 2;
- }
- // Conflate all adjacent decorations that use the same style.
- var startDec = decorations[start + 1];
- var end = start + 2;
- while (end + 2 <= nDecorations
- && (decorations[end + 1] === startDec
- || decorations[end] === decorations[end + 2])) {
- end += 2;
- }
- decorations[decPos++] = startPos;
- decorations[decPos++] = startDec;
- i = end;
- }
-
- // Strip any zero-length decoration at the end.
- if (decPos && decorations[decPos - 2] === sourceLength) { decPos -= 2; }
- nDecorations = decorations.length = decPos;
-
- var decoration = null;
- while (spanIndex < nSpans) {
- var spanStart = spans[spanIndex];
- var spanEnd = spans[spanIndex + 2] || sourceLength;
-
- var decStart = decorations[decorationIndex];
- var decEnd = decorations[decorationIndex + 2] || sourceLength;
-
- var end = Math.min(spanEnd, decEnd);
-
- var textNode = spans[spanIndex + 1];
- if (textNode.nodeType !== 1) { // Don't muck with <BR>s or <LI>s
- var styledText = source.substring(sourceIndex, end);
- // This may seem bizarre, and it is. Emitting LF on IE causes the
- // code to display with spaces instead of line breaks.
- // Emitting Windows standard issue linebreaks (CRLF) causes a blank
- // space to appear at the beginning of every line but the first.
- // Emitting an old Mac OS 9 line separator makes everything spiffy.
- if (isIE) { styledText = styledText.replace(newlineRe, '\r'); }
- textNode.nodeValue = styledText;
- var document = textNode.ownerDocument;
- var span = document.createElement('SPAN');
- span.className = decorations[decorationIndex + 1];
- var parentNode = textNode.parentNode;
- parentNode.replaceChild(span, textNode);
- span.appendChild(textNode);
- if (sourceIndex < spanEnd) { // Split off a text node.
- spans[spanIndex + 1] = textNode
- // TODO: Possibly optimize by using '' if there's no flicker.
- = document.createTextNode(source.substring(end, spanEnd));
- parentNode.insertBefore(textNode, span.nextSibling);
- }
- }
-
- sourceIndex = end;
-
- if (sourceIndex >= spanEnd) {
- spanIndex += 2;
- }
- if (sourceIndex >= decEnd) {
- decorationIndex += 2;
- }
- }
- }
-
-
- /** Maps language-specific file extensions to handlers. */
- var langHandlerRegistry = {};
- /** Register a language handler for the given file extensions.
- * @param {function (Object)} handler a function from source code to a list
- * of decorations. Takes a single argument job which describes the
- * state of the computation. The single parameter has the form
- * {@code {
- * source: {string} as plain text.
- * decorations: {Array.<number|string>} an array of style classes
- * preceded by the position at which they start in
- * job.source in order.
- * The language handler should assigned this field.
- * basePos: {int} the position of source in the larger source chunk.
- * All positions in the output decorations array are relative
- * to the larger source chunk.
- * } }
- * @param {Array.<string>} fileExtensions
- */
- function registerLangHandler(handler, fileExtensions) {
- for (var i = fileExtensions.length; --i >= 0;) {
- var ext = fileExtensions[i];
- if (!langHandlerRegistry.hasOwnProperty(ext)) {
- langHandlerRegistry[ext] = handler;
- } else if ('console' in window) {
- console['warn']('cannot override language handler %s', ext);
- }
- }
- }
- function langHandlerForExtension(extension, source) {
- if (!(extension && langHandlerRegistry.hasOwnProperty(extension))) {
- // Treat it as markup if the first non whitespace character is a < and
- // the last non-whitespace character is a >.
- extension = /^\s*</.test(source)
- ? 'default-markup'
- : 'default-code';
- }
- return langHandlerRegistry[extension];
- }
- registerLangHandler(decorateSource, ['default-code']);
- registerLangHandler(
- createSimpleLexer(
- [],
- [
- [PR_PLAIN, /^[^<?]+/],
- [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/],
- [PR_COMMENT, /^<\!--[\s\S]*?(?:-\->|$)/],
- // Unescaped content in an unknown language
- ['lang-', /^<\?([\s\S]+?)(?:\?>|$)/],
- ['lang-', /^<%([\s\S]+?)(?:%>|$)/],
- [PR_PUNCTUATION, /^(?:<[%?]|[%?]>)/],
- ['lang-', /^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],
- // Unescaped content in javascript. (Or possibly vbscript).
- ['lang-js', /^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],
- // Contains unescaped stylesheet content
- ['lang-css', /^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],
- ['lang-in.tag', /^(<\/?[a-z][^<>]*>)/i]
- ]),
- ['default-markup', 'htm', 'html', 'mxml', 'xhtml', 'xml', 'xsl']);
- registerLangHandler(
- createSimpleLexer(
- [
- [PR_PLAIN, /^[\s]+/, null, ' \t\r\n'],
- [PR_ATTRIB_VALUE, /^(?:\"[^\"]*\"?|\'[^\']*\'?)/, null, '\"\'']
- ],
- [
- [PR_TAG, /^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],
- [PR_ATTRIB_NAME, /^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],
- ['lang-uq.val', /^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],
- [PR_PUNCTUATION, /^[=<>\/]+/],
- ['lang-js', /^on\w+\s*=\s*\"([^\"]+)\"/i],
- ['lang-js', /^on\w+\s*=\s*\'([^\']+)\'/i],
- ['lang-js', /^on\w+\s*=\s*([^\"\'>\s]+)/i],
- ['lang-css', /^style\s*=\s*\"([^\"]+)\"/i],
- ['lang-css', /^style\s*=\s*\'([^\']+)\'/i],
- ['lang-css', /^style\s*=\s*([^\"\'>\s]+)/i]
- ]),
- ['in.tag']);
- registerLangHandler(
- createSimpleLexer([], [[PR_ATTRIB_VALUE, /^[\s\S]+/]]), ['uq.val']);
- registerLangHandler(sourceDecorator({
- 'keywords': CPP_KEYWORDS,
- 'types': ALL_TYPES,
- 'decl': true,
- 'hashComments': true,
- 'cStyleComments': true
- }), ['c', 'cc', 'cpp', 'cxx', 'cyc', 'm']);
- registerLangHandler(sourceDecorator({
- 'keywords': 'null true false'
- }), ['json']);
- registerLangHandler(sourceDecorator({
- 'keywords': CSHARP_KEYWORDS,
- 'hashComments': true,
- 'cStyleComments': true,
- 'verbatimStrings': true
- }), ['cs']);
- registerLangHandler(sourceDecorator({
- 'keywords': JAVA_KEYWORDS,
- 'cStyleComments': true
- }), ['java']);
- registerLangHandler(sourceDecorator({
- 'keywords': SH_KEYWORDS,
- 'hashComments': true,
- 'multiLineStrings': true
- }), ['bsh', 'csh', 'sh']);
- registerLangHandler(sourceDecorator({
- 'keywords': PYTHON_KEYWORDS,
- 'hashComments': true,
- 'multiLineStrings': true,
- 'tripleQuotedStrings': true
- }), ['cv', 'py']);
- registerLangHandler(sourceDecorator({
- 'keywords': PERL_KEYWORDS,
- 'hashComments': true,
- 'multiLineStrings': true,
- 'regexLiterals': true
- }), ['perl', 'pl', 'pm']);
- registerLangHandler(sourceDecorator({
- 'keywords': RUBY_KEYWORDS,
- 'hashComments': true,
- 'multiLineStrings': true,
- 'regexLiterals': true
- }), ['rb']);
- registerLangHandler(sourceDecorator({
- 'keywords': JSCRIPT_KEYWORDS,
- 'cStyleComments': true,
- 'regexLiterals': true
- }), ['js']);
- registerLangHandler(sourceDecorator({
- 'keywords': COFFEE_KEYWORDS,
- 'hashComments': 3, // ### style block comments
- 'cStyleComments': true,
- 'multilineStrings': true,
- 'tripleQuotedStrings': true,
- 'regexLiterals': true
- }), ['coffee']);
- registerLangHandler(createSimpleLexer([], [[PR_STRING, /^[\s\S]+/]]), ['regex']);
-
- function applyDecorator(job) {
- var opt_langExtension = job.langExtension;
-
- try {
- // Extract tags, and convert the source code to plain text.
- var sourceAndSpans = extractSourceSpans(job.sourceNode);
- /** Plain text. @type {string} */
- var source = sourceAndSpans.source;
- job.source = source;
- job.spans = sourceAndSpans.spans;
- job.basePos = 0;
-
- // Apply the appropriate language handler
- langHandlerForExtension(opt_langExtension, source)(job);
-
- // Integrate the decorations and tags back into the source code,
- // modifying the sourceNode in place.
- recombineTagsAndDecorations(job);
- } catch (e) {
- if ('console' in window) {
- console['log'](e && e['stack'] ? e['stack'] : e);
- }
- }
- }
-
- /**
- * @param sourceCodeHtml {string} The HTML to pretty print.
- * @param opt_langExtension {string} The language name to use.
- * Typically, a filename extension like 'cpp' or 'java'.
- * @param opt_numberLines {number|boolean} True to number lines,
- * or the 1-indexed number of the first line in sourceCodeHtml.
- */
- function prettyPrintOne(sourceCodeHtml, opt_langExtension, opt_numberLines) {
- var container = document.createElement('PRE');
- // This could cause images to load and onload listeners to fire.
- // E.g. <img onerror="alert(1337)" src="nosuchimage.png">.
- // We assume that the inner HTML is from a trusted source.
- container.innerHTML = sourceCodeHtml;
- if (opt_numberLines) {
- numberLines(container, opt_numberLines);
- }
-
- var job = {
- langExtension: opt_langExtension,
- numberLines: opt_numberLines,
- sourceNode: container
- };
- applyDecorator(job);
- return container.innerHTML;
- }
-
- function prettyPrint(opt_whenDone) {
- function byTagName(tn) { return document.getElementsByTagName(tn); }
- // fetch a list of nodes to rewrite
- var codeSegments = [byTagName('pre'), byTagName('code'), byTagName('xmp')];
- var elements = [];
- for (var i = 0; i < codeSegments.length; ++i) {
- for (var j = 0, n = codeSegments[i].length; j < n; ++j) {
- elements.push(codeSegments[i][j]);
- }
- }
- codeSegments = null;
-
- var clock = Date;
- if (!clock['now']) {
- clock = { 'now': function () { return (new Date).getTime(); } };
- }
-
- // The loop is broken into a series of continuations to make sure that we
- // don't make the browser unresponsive when rewriting a large page.
- var k = 0;
- var prettyPrintingJob;
-
- function doWork() {
- var endTime = (window['PR_SHOULD_USE_CONTINUATION'] ?
- clock.now() + 250 /* ms */ :
- Infinity);
- for (; k < elements.length && clock.now() < endTime; k++) {
- var cs = elements[k];
- if (cs.className && cs.className.indexOf('prettyprint') >= 0) {
- // If the classes includes a language extensions, use it.
- // Language extensions can be specified like
- // <pre class="prettyprint lang-cpp">
- // the language extension "cpp" is used to find a language handler as
- // passed to PR.registerLangHandler.
- var langExtension = cs.className.match(/\blang-(\w+)\b/);
- if (langExtension) { langExtension = langExtension[1]; }
-
- // make sure this is not nested in an already prettified element
- var nested = false;
- for (var p = cs.parentNode; p; p = p.parentNode) {
- if ((p.tagName === 'pre' || p.tagName === 'code' ||
- p.tagName === 'xmp') &&
- p.className && p.className.indexOf('prettyprint') >= 0) {
- nested = true;
- break;
- }
- }
- if (!nested) {
- // Look for a class like linenums or linenums:<n> where <n> is the
- // 1-indexed number of the first line.
- var lineNums = cs.className.match(/\blinenums\b(?::(\d+))?/);
- lineNums = lineNums
- ? lineNums[1] && lineNums[1].length ? +lineNums[1] : true
- : false;
- if (lineNums) { numberLines(cs, lineNums); }
-
- // do the pretty printing
- prettyPrintingJob = {
- langExtension: langExtension,
- sourceNode: cs,
- numberLines: lineNums
- };
- applyDecorator(prettyPrintingJob);
- }
- }
- }
- if (k < elements.length) {
- // finish up in a continuation
- setTimeout(doWork, 250);
- } else if (opt_whenDone) {
- opt_whenDone();
- }
- }
-
- doWork();
- }
-
- window['prettyPrintOne'] = prettyPrintOne;
- window['prettyPrint'] = prettyPrint;
- window['PR'] = {
- 'createSimpleLexer': createSimpleLexer,
- 'registerLangHandler': registerLangHandler,
- 'sourceDecorator': sourceDecorator,
- 'PR_ATTRIB_NAME': PR_ATTRIB_NAME,
- 'PR_ATTRIB_VALUE': PR_ATTRIB_VALUE,
- 'PR_COMMENT': PR_COMMENT,
- 'PR_DECLARATION': PR_DECLARATION,
- 'PR_KEYWORD': PR_KEYWORD,
- 'PR_LITERAL': PR_LITERAL,
- 'PR_NOCODE': PR_NOCODE,
- 'PR_PLAIN': PR_PLAIN,
- 'PR_PUNCTUATION': PR_PUNCTUATION,
- 'PR_SOURCE': PR_SOURCE,
- 'PR_STRING': PR_STRING,
- 'PR_TAG': PR_TAG,
- 'PR_TYPE': PR_TYPE
- };
-})();
diff --git a/src/solarized.css b/src/solarized.css
deleted file mode 100644
index 8a6b748..0000000
--- a/src/solarized.css
+++ /dev/null
@@ -1,53 +0,0 @@
-div pre , .prettyprint {
- color: #839496;
- background-color: #002b36;
-}
-
-.prettyprint .pln {
- color: inherit;
-}
-
-.prettyprint .str,
-.prettyprint .lit,
-.prettyprint .atv {
- color: #2aa198;
-}
-
-.prettyprint .kwd {
- /* color: #268bd2; */
- color: #859900;
-}
-
-.prettyprint .com {
- color: #586e75;
- font-style: italic;
-}
-
-.prettyprint .dec {
- color: #cb4b16;
-}
-
-.prettyprint .typ {
- color: #b58900;
-}
-
-.prettyprint .pun {
- color: inherit;
-}
-
-.prettyprint .opn {
- color: inherit;
-}
-
-.prettyprint .clo {
- color: inherit;
-}
-
-.prettyprint .tag {
- color: #268bd2;
- font-weight: bold;
-}
-
-.prettyprint .atn {
- color: inherit;
-}
diff --git a/src/sunburst.css b/src/sunburst.css
deleted file mode 100644
index 03b040b..0000000
--- a/src/sunburst.css
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Pretty printing styles. Used with prettify.js. */
-/* Vim sunburst theme by David Leibovic */
-
-pre .str, code .str { color: #65B042; } /* string - green */
-pre .kwd, code .kwd { color: #E28964; } /* keyword - dark pink */
-pre .com, code .com { color: #AEAEAE; font-style: italic; } /* comment - gray */
-pre .typ, code .typ { color: #89bdff; } /* type - light blue */
-pre .lit, code .lit { color: #3387CC; } /* literal - blue */
-pre .pun, code .pun { color: #fff; } /* punctuation - white */
-pre .pln, code .pln { color: #fff; } /* plaintext - white */
-pre .tag, code .tag { color: #89bdff; } /* html/xml tag - light blue */
-pre .atn, code .atn { color: #bdb76b; } /* html/xml attribute name - khaki */
-pre .atv, code .atv { color: #65B042; } /* html/xml attribute value - green */
-pre .dec, code .dec { color: #3387CC; } /* decimal - blue */
-
-pre.prettyprint, code.prettyprint{
- background-color: #000;
- -moz-border-radius: 8px;
- -webkit-border-radius: 8px;
- -o-border-radius: 8px;
- -ms-border-radius: 8px;
- -khtml-border-radius: 8px;
- border-radius: 8px;
-}
-
-pre.prettyprint {
- width: 95%;
- margin: 1em auto;
- padding: 1em;
- clear: both
-}
-
-
-/* Specify class=linenums on a pre to get line numbering */
-ol.linenums { margin-top: 0; margin-bottom: 0; color: #AEAEAE; } /* IE indents via margin-left */
-li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8 { list-style-type: none }
-/* Alternate shading for lines */
-li.L1,li.L3,li.L5,li.L7,li.L9 { }
-
-@media print {
- pre .str, code .str { color: #060; }
- pre .kwd, code .kwd { color: #006; font-weight: bold; }
- pre .com, code .com { color: #600; font-style: italic; }
- pre .typ, code .typ { color: #404; font-weight: bold; }
- pre .lit, code .lit { color: #044; }
- pre .pun, code .pun { color: #440; }
- pre .pln, code .pln { color: #000; }
- pre .tag, code .tag { color: #006; font-weight: bold; }
- pre .atn, code .atn { color: #404; }
- pre .atv, code .atv { color: #060; }
-}
diff --git a/src/favicon.ico b/static/favicon.ico
similarity index 100%
rename from src/favicon.ico
rename to static/favicon.ico
diff --git a/media/2013.pdf b/static/media/2013.pdf
similarity index 100%
rename from media/2013.pdf
rename to static/media/2013.pdf
diff --git a/media/img/bad_clock.png b/static/media/img/bad_clock.png
similarity index 100%
rename from media/img/bad_clock.png
rename to static/media/img/bad_clock.png
diff --git a/media/img/bad_clock_signal1.png b/static/media/img/bad_clock_signal1.png
similarity index 100%
rename from media/img/bad_clock_signal1.png
rename to static/media/img/bad_clock_signal1.png
diff --git a/media/img/bad_clock_signal2.png b/static/media/img/bad_clock_signal2.png
similarity index 100%
rename from media/img/bad_clock_signal2.png
rename to static/media/img/bad_clock_signal2.png
diff --git a/media/img/debug_print.png b/static/media/img/debug_print.png
similarity index 100%
rename from media/img/debug_print.png
rename to static/media/img/debug_print.png
diff --git a/media/img/debug_print_full.png b/static/media/img/debug_print_full.png
similarity index 100%
rename from media/img/debug_print_full.png
rename to static/media/img/debug_print_full.png
diff --git a/media/img/good_clock.png b/static/media/img/good_clock.png
similarity index 100%
rename from media/img/good_clock.png
rename to static/media/img/good_clock.png
diff --git a/media/img/good_clock_circuit.png b/static/media/img/good_clock_circuit.png
similarity index 100%
rename from media/img/good_clock_circuit.png
rename to static/media/img/good_clock_circuit.png
diff --git a/media/img/good_clock_signal.png b/static/media/img/good_clock_signal.png
similarity index 100%
rename from media/img/good_clock_signal.png
rename to static/media/img/good_clock_signal.png
diff --git a/media/img/ico_external.gif b/static/media/img/ico_external.gif
similarity index 100%
rename from media/img/ico_external.gif
rename to static/media/img/ico_external.gif
diff --git a/media/img/mini_project_arduino_breadboard1.png b/static/media/img/mini_project_arduino_breadboard1.png
similarity index 100%
rename from media/img/mini_project_arduino_breadboard1.png
rename to static/media/img/mini_project_arduino_breadboard1.png
diff --git a/media/img/mini_project_arduino_breadboard2.png b/static/media/img/mini_project_arduino_breadboard2.png
similarity index 100%
rename from media/img/mini_project_arduino_breadboard2.png
rename to static/media/img/mini_project_arduino_breadboard2.png
diff --git a/media/img/mini_project_arduino_breadboard3.png b/static/media/img/mini_project_arduino_breadboard3.png
similarity index 100%
rename from media/img/mini_project_arduino_breadboard3.png
rename to static/media/img/mini_project_arduino_breadboard3.png
diff --git a/media/img/mini_project_arduino_breadboard4.png b/static/media/img/mini_project_arduino_breadboard4.png
similarity index 100%
rename from media/img/mini_project_arduino_breadboard4.png
rename to static/media/img/mini_project_arduino_breadboard4.png
diff --git a/media/img/mini_project_headset_adapter.png b/static/media/img/mini_project_headset_adapter.png
similarity index 100%
rename from media/img/mini_project_headset_adapter.png
rename to static/media/img/mini_project_headset_adapter.png
diff --git a/media/img/osdev_build_env.png b/static/media/img/osdev_build_env.png
similarity index 100%
rename from media/img/osdev_build_env.png
rename to static/media/img/osdev_build_env.png
diff --git a/media/img/osdev_build_env_full.png b/static/media/img/osdev_build_env_full.png
similarity index 100%
rename from media/img/osdev_build_env_full.png
rename to static/media/img/osdev_build_env_full.png
diff --git a/media/img/pmm1.png b/static/media/img/pmm1.png
similarity index 100%
rename from media/img/pmm1.png
rename to static/media/img/pmm1.png
diff --git a/media/img/pmm1b.png b/static/media/img/pmm1b.png
similarity index 100%
rename from media/img/pmm1b.png
rename to static/media/img/pmm1b.png
diff --git a/media/img/pmm2.png b/static/media/img/pmm2.png
similarity index 100%
rename from media/img/pmm2.png
rename to static/media/img/pmm2.png
diff --git a/media/img/pmm2b.png b/static/media/img/pmm2b.png
similarity index 100%
rename from media/img/pmm2b.png
rename to static/media/img/pmm2b.png
diff --git a/media/img/pmm3.png b/static/media/img/pmm3.png
similarity index 100%
rename from media/img/pmm3.png
rename to static/media/img/pmm3.png
diff --git a/media/img/pmm3b.png b/static/media/img/pmm3b.png
similarity index 100%
rename from media/img/pmm3b.png
rename to static/media/img/pmm3b.png
diff --git a/media/img/procmm1.png b/static/media/img/procmm1.png
similarity index 100%
rename from media/img/procmm1.png
rename to static/media/img/procmm1.png
diff --git a/media/img/procmm2.png b/static/media/img/procmm2.png
similarity index 100%
rename from media/img/procmm2.png
rename to static/media/img/procmm2.png
diff --git a/media/img/procmm3.png b/static/media/img/procmm3.png
similarity index 100%
rename from media/img/procmm3.png
rename to static/media/img/procmm3.png
diff --git a/media/img/procmm4.png b/static/media/img/procmm4.png
similarity index 100%
rename from media/img/procmm4.png
rename to static/media/img/procmm4.png
diff --git a/media/img/provbrev.jpg b/static/media/img/provbrev.jpg
similarity index 100%
rename from media/img/provbrev.jpg
rename to static/media/img/provbrev.jpg
diff --git a/media/img/thomas.png b/static/media/img/thomas.png
similarity index 100%
rename from media/img/thomas.png
rename to static/media/img/thomas.png
diff --git a/media/img/vmm1.png b/static/media/img/vmm1.png
similarity index 100%
rename from media/img/vmm1.png
rename to static/media/img/vmm1.png
diff --git a/media/img/vmm1b.png b/static/media/img/vmm1b.png
similarity index 100%
rename from media/img/vmm1b.png
rename to static/media/img/vmm1b.png
diff --git a/media/img/vmm2.png b/static/media/img/vmm2.png
similarity index 100%
rename from media/img/vmm2.png
rename to static/media/img/vmm2.png
diff --git a/media/img/vmm2b.png b/static/media/img/vmm2b.png
similarity index 100%
rename from media/img/vmm2b.png
rename to static/media/img/vmm2b.png
diff --git a/media/img/vmm3.png b/static/media/img/vmm3.png
similarity index 100%
rename from media/img/vmm3.png
rename to static/media/img/vmm3.png
diff --git a/media/img/vmm3b.png b/static/media/img/vmm3b.png
similarity index 100%
rename from media/img/vmm3b.png
rename to static/media/img/vmm3b.png
diff --git a/media/img/z80-tester-clab.png b/static/media/img/z80-tester-clab.png
similarity index 100%
rename from media/img/z80-tester-clab.png
rename to static/media/img/z80-tester-clab.png
diff --git a/media/img/z80_pinout.png b/static/media/img/z80_pinout.png
similarity index 100%
rename from media/img/z80_pinout.png
rename to static/media/img/z80_pinout.png
diff --git a/media/img/z80_pinout2.png b/static/media/img/z80_pinout2.png
similarity index 100%
rename from media/img/z80_pinout2.png
rename to static/media/img/z80_pinout2.png
diff --git a/media/img/z80_running1.png b/static/media/img/z80_running1.png
similarity index 100%
rename from media/img/z80_running1.png
rename to static/media/img/z80_running1.png
diff --git a/media/img/z80_running2.png b/static/media/img/z80_running2.png
similarity index 100%
rename from media/img/z80_running2.png
rename to static/media/img/z80_running2.png
diff --git a/media/img/z80_running3.png b/static/media/img/z80_running3.png
similarity index 100%
rename from media/img/z80_running3.png
rename to static/media/img/z80_running3.png
diff --git a/media/img/z80_tester.png b/static/media/img/z80_tester.png
similarity index 100%
rename from media/img/z80_tester.png
rename to static/media/img/z80_tester.png
diff --git a/src/.sass-cache/901ce8d2e1ebb81b0d9ec7f3a7bc68cb2ace41f6/site-solarized.scssc b/static/src/.sass-cache/901ce8d2e1ebb81b0d9ec7f3a7bc68cb2ace41f6/site-solarized.scssc
similarity index 100%
rename from src/.sass-cache/901ce8d2e1ebb81b0d9ec7f3a7bc68cb2ace41f6/site-solarized.scssc
rename to static/src/.sass-cache/901ce8d2e1ebb81b0d9ec7f3a7bc68cb2ace41f6/site-solarized.scssc
diff --git a/src/blankwin.js b/static/src/blankwin.js
similarity index 100%
rename from src/blankwin.js
rename to static/src/blankwin.js
diff --git a/src/codestyle.css b/static/src/codestyle.css
similarity index 98%
rename from src/codestyle.css
rename to static/src/codestyle.css
index 7ab42bd..f65b47f 100644
--- a/src/codestyle.css
+++ b/static/src/codestyle.css
@@ -1,3 +1,4 @@
+.codehilite pre {background-color: #002b36;}
/* Text */
.codehilite .t { color: #586e75 }
diff --git a/src/fonts/dejavuserif/DejaVuSerif-demo.html b/static/src/fonts/dejavuserif/DejaVuSerif-demo.html
similarity index 100%
rename from src/fonts/dejavuserif/DejaVuSerif-demo.html
rename to static/src/fonts/dejavuserif/DejaVuSerif-demo.html
diff --git a/src/fonts/dejavuserif/DejaVuSerif-webfont.eot b/static/src/fonts/dejavuserif/DejaVuSerif-webfont.eot
similarity index 100%
rename from src/fonts/dejavuserif/DejaVuSerif-webfont.eot
rename to static/src/fonts/dejavuserif/DejaVuSerif-webfont.eot
diff --git a/src/fonts/dejavuserif/DejaVuSerif-webfont.svg b/static/src/fonts/dejavuserif/DejaVuSerif-webfont.svg
similarity index 100%
rename from src/fonts/dejavuserif/DejaVuSerif-webfont.svg
rename to static/src/fonts/dejavuserif/DejaVuSerif-webfont.svg
diff --git a/src/fonts/dejavuserif/DejaVuSerif-webfont.ttf b/static/src/fonts/dejavuserif/DejaVuSerif-webfont.ttf
similarity index 100%
rename from src/fonts/dejavuserif/DejaVuSerif-webfont.ttf
rename to static/src/fonts/dejavuserif/DejaVuSerif-webfont.ttf
diff --git a/src/fonts/dejavuserif/DejaVuSerif-webfont.woff b/static/src/fonts/dejavuserif/DejaVuSerif-webfont.woff
similarity index 100%
rename from src/fonts/dejavuserif/DejaVuSerif-webfont.woff
rename to static/src/fonts/dejavuserif/DejaVuSerif-webfont.woff
diff --git a/src/fonts/dejavuserif/stylesheet.css b/static/src/fonts/dejavuserif/stylesheet.css
similarity index 100%
rename from src/fonts/dejavuserif/stylesheet.css
rename to static/src/fonts/dejavuserif/stylesheet.css
diff --git a/src/site-solarized.css b/static/src/site-solarized.css
similarity index 100%
rename from src/site-solarized.css
rename to static/src/site-solarized.css
diff --git a/src/site-solarized.scss b/static/src/site-solarized.scss
similarity index 100%
rename from src/site-solarized.scss
rename to static/src/site-solarized.scss
diff --git a/src/style.css b/static/src/style.css
similarity index 100%
rename from src/style.css
rename to static/src/style.css
diff --git a/templates/base.html b/templates/base.html
index e6f3853..81040bf 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,80 +1,53 @@
<!DOCTYPE html>
<html class="light red">
- <head>
- <meta http-equiv="Content-Type" content="text/html" charset="UTF-8" />
- <title>
- Thomas Lovén - {% if page %}{{ page.title }}{% endif %}
- </title>
- <link rel="stylesheet" type="text/css" href="/src/solarized.css">
- <link rel="stylesheet" type="text/css" href="/src/fonts/dejavuserif/stylesheet.css">
- <link rel="stylesheet" type="text/css" href="/src/style.css">
- <link rel="stylesheet" type="text/css" href="/src/site-solarized.css">
- <link rel="stylesheet" type="text/css" href="/src/codestyle.css">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html" charset="UTF-8" />
+ <title>
+ Thomas Lovén - {% if page %}{{ page.title }}{% endif %}
+ </title>
+ <link rel="stylesheet" type="text/css" href="/src/fonts/dejavuserif/stylesheet.css">
+ <link rel="stylesheet" type="text/css" href="/src/style.css">
+ <link rel="stylesheet" type="text/css" href="/src/site-solarized.css">
+ <link rel="stylesheet" type="text/css" href="/src/codestyle.css">
+ </head>
- <!-- <script type="text/javascript" src="/src/prettify.js"></script> -->
- <!-- <script type="text/javascript" src="/src/lang-tex.js"></script> -->
- <!-- <script type="text/javascript" src="/src/lang-nasm.js"></script> -->
- <!-- <script type="text/javascript" src="/src/lang-betyg.js"></script> -->
+ <body>
+ <div id="wrap">
+ <div id="header">
+ <div id="title">
+ <h2>ThomasLovén.com</h2>
+ </div><!--title-->
+ <div id="links">
+ <a href="/">Home</a>
+ - <a href="/blog/">Blog</a>
+ - <a href="/about/">About</a>
+ </div><!--links-->
+ </div><!--header-->
- <!-- <script type="text/x-mathjax-config"> -->
- <!-- MathJax.Hub.Config({ -->
- <!-- tex2jax: { -->
- <!-- skipTags: ["script","noscript","style","textarea","code"], -->
- <!-- ignoreClass: ".*", -->
- <!-- processClass: "latex" -->
- <!-- } -->
- <!-- }); -->
- <!-- MathJax.Hub.Queue( function() { -->
- <!-- var all = MathJax.Hub.getAllJax(), i; -->
- <!-- for(i=0; i < all.length; i += 1) { -->
- <!-- all[i].SourceElement().parentNode.className += ' has-jax'; -->
- <!-- } -->
- <!-- }); -->
- <!-- </script> -->
- <!-- <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML"></script> -->
+ <div id="contents">
+ {% block page %}
+ {% endblock page %}
- <script src="http://code.jquery.com/jquery-latest.min.js"></script>
+ </div><!--contents-->
- <script src="/src/blankwin.js" type="text/javascript"></script>
+ </div><!--wrap-->
- </head>
-
-<!-- <body onload="$('pre').not('.nopretty').not('.latex').addClass('prettyprint'); prettyPrint(); blankwin(); $('body').width($('body').width()+1).width('auto')"> -->
-<body>
-
- <div id="wrap">
- <div id="header">
- <div id="title">
- <h2>ThomasLovén.com</h2>
- </div><!--title-->
- <div id="links">
- <a href="/">Home</a>
- -
- <a href="/blog/">Blog</a>
- -
- <a href="/photos/">Photos</a>
- -
- <a href="/about/">About</a>
- </div><!--links-->
- </div><!--header-->
-
- <div id="contents">
- {% block page %}
- {% endblock page %}
-
- </div><!--contents-->
-
- </div><!--wrap-->
-
- <div id="bottom">
- © 2012
- <a href="mailto:thomasloven@gmail.com">Thomas Lovén</a>
+ <div id="bottom">
+ © 2012
+ <a href="mailto:thomasloven@gmail.com">Thomas Lovén</a>
-
- <a href="http://twitter.com/thomasloven">@thomasloven</a>
+ <a href="http://twitter.com/thomasloven">@thomasloven</a>
-
<a href="http://github.com/thomasloven">GitHub</a>
- </div><!--bottom-->
+ </div><!--bottom-->
-
-</body>
+ <script src="http://code.jquery.com/jquery-latest.min.js"></script>
+ <script src="/src/blankwin.js" type="text/javascript"></script>
+ <script>
+ blankwin();
+ $('body').width($('body').width()+1).width('auto');
+ </script>
+ {% block morescripts %}
+ {% endblock morescripts %}
+ </body>
</html>
diff --git a/templates/blog.html b/templates/blog.html
deleted file mode 100644
index ad8227f..0000000
--- a/templates/blog.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "base.html" %}
-
-{% block page %}
-<div id="categories">
- {% if title %}
- <a href="{{url_for("blog_default")}}">All</a>
- {% else %}
- All
- {% endif %}
- {% for tag in tags %}
- {% if tag == title %}
- -
- {{ tag }}
- {% else %}
- -
- <a href="{{url_for("tag", tag=tag)}}">{{ tag }}</a>
- {% endif %}
- {% endfor %}
-</div>
-<div class="content">
- <ol class="content-list">
- {% for post in posts %}
- <li class="content">
- <h3 class="postTitle"><a href="{{ post.url }}">{{ post.title }}</a></h3><p class="postDate">{{ post.datestr }}</p><p class="postSubTitle">{{ post.subtitle }}<br>
-<a href="{{ post.url }}#disqus_thread" data-disqus-identifier="{{ post.url[:-1] }}"></a></p>
- </li>
- {% endfor %}
- </ol>
-</div>
-
-<script type="text/javascript">
- /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
- var disqus_shortname = 'thomasloven'; // required: replace example with your forum shortname
-
- /* * * DON'T EDIT BELOW THIS LINE * * */
- (function () {
- var s = document.createElement('script'); s.async = true;
- s.type = 'text/javascript';
- s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
- (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
- }());
- </script>
-{% endblock page %}
diff --git a/templates/blog_listing.html b/templates/blog_listing.html
new file mode 100644
index 0000000..78d1eab
--- /dev/null
+++ b/templates/blog_listing.html
@@ -0,0 +1,43 @@
+{% extends "base.html" %}
+
+{% block page %}
+<div id="categories">
+ {% if title %}
+ <a href="{{url_for("blog_listing")}}">All</a>
+ {% else %}
+ All
+ {% endif %}
+ {% for tag in tags %}
+ {% if tag == title %}
+ - {{ tag }}
+ {% else %}
+ - <a href="{{url_for("blog_listing", tag=tag)}}">{{ tag }}</a>
+ {% endif %}
+ {% endfor %}
+</div>
+<div class="content">
+ <ol class="content-list">
+ {% for post in posts %}
+ <li class="content">
+ <h3 class="postTitle"><a href="{{ url_for("permalink",
+ path=post.url) }}">{{ post.title }}</a></h3><p class="postDate">{{ post.datestr }}</p><p class="postSubTitle">{{ post.subtitle }}<br>
+ <a href="{{ post.url }}#disqus_thread" data-disqus-identifier="{{ post.url[:-1] }}"></a></p>
+ </li>
+ {% endfor %}
+ </ol>
+</div>
+{% endblock page %}
+
+{% block morescripts %}
+<script type="text/javascript">
+var disqus_shortname = 'thomasloven';
+
+/* * * DON'T EDIT BELOW THIS LINE * * */
+(function () {
+ var s = document.createElement('script'); s.async = true;
+ s.type = 'text/javascript';
+ s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+ (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+}());
+</script>
+{% endblock morescripts %}
diff --git a/templates/blog_post.html b/templates/blog_post.html
new file mode 100644
index 0000000..b3bb200
--- /dev/null
+++ b/templates/blog_post.html
@@ -0,0 +1,28 @@
+{% extends "base.html" %}
+
+{% block page %}
+ <h1> {{ page.title }} </h1>
+ <div id="subtitle">
+ <p>{{ page.datestr }}</p>
+ </div>
+ <div id="post-text">
+ {{ page }}
+ <h2 id="comment">Comments</h2>
+ <div id="disqus_thread"></div>
+ <script type="text/javascript">
+ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+ var disqus_shortname = 'thomasloven'; // required: replace example with your forum shortname
+ var disqus_identifier = '{{ page.url[:-1] }}';
+
+ /* * * DON'T EDIT BELOW THIS LINE * * */
+ (function() {
+ var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ })();
+ </script>
+ <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+ <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+
+ </div>
+{% endblock page %}
diff --git a/templates/post.html b/templates/post.html
deleted file mode 100644
index a32e9ed..0000000
--- a/templates/post.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "base.html" %}
-
-{% block page %}
- <h1> {{ page.title }} </h1>
- <div id="subtitle">
- <p>{{ page.datestr }}</p>
- </div>
- <div id="post-text">
- {{ page }}
- <h2 id="comment">Comments</h2>
- <div id="disqus_thread"></div>
- <script type="text/javascript">
- /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
- var disqus_shortname = 'thomasloven'; // required: replace example with your forum shortname
- var disqus_identifier = '{{ page.url[:-1] }}';
-
- /* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
- dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
- })();
- </script>
- <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
- <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
-
- </div>
-{% endblock page %}