';
+
+echo ' ';
+
+echo 'New post
+ +<% form_for(@post) do |f| %> + <%= f.error_messages %> +
+ <%= f.label :title %>
+<% a = f.text_field :title %>
+
+ <%= f.label :body %>
+<%#= f.text_area :body %>
+
+ <%= f.submit 'Create' %> +
+<% end %> + +<%= link_to 'Back', posts_path %> diff --git a/emacs.d/nxhtml/tests/in/bug400415-foo.php b/emacs.d/nxhtml/tests/in/bug400415-foo.php new file mode 100644 index 0000000..8e40934 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/bug400415-foo.php @@ -0,0 +1,9 @@ + + + + +$title
+Speak not the dread words of $incantation +lest ye invoke the $god.
+ +END_HTML + +print $skull, "\n"; +print $phfftp, "\n"; + +__END__ + +=head1 NAME + +heredoc_demo.pl - (( TODO insert brief description )) + +=head1 SYNOPSIS + + heredoc_demo.pl -[options] [arguments] + + Options: + -d debug + +=head1 OPTIONS + +=over 8 + +=item B<-d> + +Turn on debug messages. + +=back + +=head1 DESCRIPTION + +B<%= t('views.common.login') %>
+ +<% form_tag session_path do -%> +<%= label_tag(t('views.common.username')) %>
+<%= text_field_tag 'login', @login %>
<%= label_tag(t('views.common.password')) %>
+<%= password_field_tag 'password', nil %>
<%= submit_tag(t('views.common.login_verb')) %>
+<% end -%> diff --git a/emacs.d/nxhtml/tests/in/bug505726-foo.html b/emacs.d/nxhtml/tests/in/bug505726-foo.html new file mode 100644 index 0000000..c738117 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/bug505726-foo.html @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/emacs.d/nxhtml/tests/in/bug509586.ghtml b/emacs.d/nxhtml/tests/in/bug509586.ghtml new file mode 100644 index 0000000..275fd21 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/bug509586.ghtml @@ -0,0 +1,16 @@ + + + +Here are the athletes: {{ athlete_list }}.
+{% else %} +No athletes are available.
+ {% if coach_list %} +Here are the coaches: {{ coach_list }}.
+ {% endif %} +{% endif %} +{% block content %} + + {% if morning %} +Hello World!
+ {% else %} +Goodbye World!
+ {% endif %} + + {% endblock %} diff --git a/emacs.d/nxhtml/tests/in/bug546027.html b/emacs.d/nxhtml/tests/in/bug546027.html new file mode 100644 index 0000000..f0c0eac --- /dev/null +++ b/emacs.d/nxhtml/tests/in/bug546027.html @@ -0,0 +1,17 @@ + + + + ++ Some text to wrap. + Some text to wrap. + Some text to wrap. + Some text to wrap. + Some text to wrap. + Some text to wrap. + Some text to wrap. + + Some text to wrap. + Some text to wrap. + Some text to wrap. + Some text to wrap. + Some text to wrap. + Some text to wrap. + Some text to wrap. +
diff --git a/emacs.d/nxhtml/tests/in/bug556832-error-test.py b/emacs.d/nxhtml/tests/in/bug556832-error-test.py new file mode 100644 index 0000000..e998eda --- /dev/null +++ b/emacs.d/nxhtml/tests/in/bug556832-error-test.py @@ -0,0 +1,23 @@ +# -*- Python -*- + + +""" +=============== +This is a title +=============== + +This is some general description +""" + + +class SomeClass(object): + """ + This is a class description. + """ + + def __init__(self, fileName): + """The constructor.""" + pass + + def oneMethod(): + pass diff --git a/emacs.d/nxhtml/tests/in/bug557700-2.erb b/emacs.d/nxhtml/tests/in/bug557700-2.erb new file mode 100644 index 0000000..c05eec3 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/bug557700-2.erb @@ -0,0 +1,5 @@ +var x = 1; +<% @ruby_var.each do |v| %> + alert(v); + <% end %> + var y = 2; diff --git a/emacs.d/nxhtml/tests/in/bug557700-3.erb b/emacs.d/nxhtml/tests/in/bug557700-3.erb new file mode 100644 index 0000000..13d57d8 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/bug557700-3.erb @@ -0,0 +1,3 @@ +var x = 1; +var y = <%= v %>; + var z = 4; diff --git a/emacs.d/nxhtml/tests/in/bug557700-4.erb b/emacs.d/nxhtml/tests/in/bug557700-4.erb new file mode 100644 index 0000000..148e9b4 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/bug557700-4.erb @@ -0,0 +1,11 @@ +var x = 1; +for (i in l) { +alert(i); +} +<% var.each do |v| %> +alert(<%= v %>); +<% end %> +var z = 4; +for (i in l) { +alert(i); +} diff --git a/emacs.d/nxhtml/tests/in/bug557700-5.erb b/emacs.d/nxhtml/tests/in/bug557700-5.erb new file mode 100644 index 0000000..cfabef7 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/bug557700-5.erb @@ -0,0 +1,4 @@ +<% if true %> +alert(<%= v %>); +alert(<%= w %>); +<% end %> diff --git a/emacs.d/nxhtml/tests/in/bug557700-6.erb b/emacs.d/nxhtml/tests/in/bug557700-6.erb new file mode 100644 index 0000000..453f3e0 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/bug557700-6.erb @@ -0,0 +1,11 @@ +var x = "<%= x %>"; +var y = 5; + +Second line is treated as if it was a string. + +Problem with multiple lines inside ruby if: + +<% if b %> + var x = 1; +alert(1); +<% end %> diff --git a/emacs.d/nxhtml/tests/in/bug557700.erb b/emacs.d/nxhtml/tests/in/bug557700.erb new file mode 100644 index 0000000..e15c22e --- /dev/null +++ b/emacs.d/nxhtml/tests/in/bug557700.erb @@ -0,0 +1,3 @@ +var x = 1; +<%= ruby_code %> + var z = 3; diff --git a/emacs.d/nxhtml/tests/in/bug559772-TextHelper.php b/emacs.d/nxhtml/tests/in/bug559772-TextHelper.php new file mode 100644 index 0000000..0d3bffb --- /dev/null +++ b/emacs.d/nxhtml/tests/in/bug559772-TextHelper.php @@ -0,0 +1,205 @@ + + * (c) 2004 David Heinemeier Hansson + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +/** + * TextHelper. + * + * @package symfony + * @subpackage helper + * @author Fabien Potencier\\2")); // turn single newline into
+ + return '
+
<%# shadow %>
+
+ <% if live_site? %>
+ <%= render(:partial => 'shared/google_analytics') %>
+ <% end %>
+
diff --git a/emacs.d/nxhtml/tests/in/chunks-in-chunks1.php b/emacs.d/nxhtml/tests/in/chunks-in-chunks1.php
new file mode 100644
index 0000000..007bc66
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/chunks-in-chunks1.php
@@ -0,0 +1,19 @@
+$a = <<
+
+
+ This text is in the wrong place, but you have to apply a
+ schema to get it marked as invalid.
+ <%= yield %>
+
+
+
<%# container %>
+
+ <%= yield %>
+
+
+
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/csr-080710.html b/emacs.d/nxhtml/tests/in/csr-080710.html
new file mode 100644
index 0000000..be99b8b
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/csr-080710.html
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/cvd-080805-ac.php b/emacs.d/nxhtml/tests/in/cvd-080805-ac.php
new file mode 100644
index 0000000..b951c75
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/cvd-080805-ac.php
@@ -0,0 +1,21 @@
+view->assign('errors',$errors);
+ $this->view->assign('body','account_index.htm');
+echo $this->view->render('main_doc.htm');
+
+ }
+}
diff --git a/emacs.d/nxhtml/tests/in/cvd-080805-cc.php b/emacs.d/nxhtml/tests/in/cvd-080805-cc.php
new file mode 100644
index 0000000..4394387
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/cvd-080805-cc.php
@@ -0,0 +1,18 @@
+GetRequest();
+ blah, etc.
+ }
+}
+
diff --git a/emacs.d/nxhtml/tests/in/drechsler-080517-simple.xml b/emacs.d/nxhtml/tests/in/drechsler-080517-simple.xml
new file mode 100644
index 0000000..01b738d
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/drechsler-080517-simple.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/el-070424-duh.xml b/emacs.d/nxhtml/tests/in/el-070424-duh.xml
new file mode 100644
index 0000000..4e8b09a
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/el-070424-duh.xml
@@ -0,0 +1,6 @@
++
+  |
+ + | + + Dept. of Computer and + Information Science, Linköping + University | +
+ + + + + + + + + + + + |
+ + |
+
+
+
+
+
+
+ 
+ This page is not under construction. It is supposed to look like this.
+
+ TDDB64 Web Programming and InteractivityThis + course covers an overview of WWW, HTML, basic Java programming, and + advanced Java programming. The course consists of a number of + lectures, programming assignments, and a programming + project, where the students practice advanced Java and WWW + implementation techniques. + + + + + + + |
+
+
+
+ 
+
+
+
+
+
+
+
+
+ News and Notes about nXhtml
+ +-
+
+
- Thanks for testing! +
-
+
+ I want to thanks the testers, especially Hadron Quark + and Eric Lilja, for helping me by testing and pointing + out bugs and weaknesses, most related to editing of PHP. +
++ It is quite a big job trying to get rid of smaller annoying bugs and bigger ones. + In my mailbox folder for nXhtml I have more than 500 old messages currently. +
+
+
+ - The State of the Art +
-
+
+ I have more and more come to realize that there are two + main parts of nXhtml which are in quite different + degrees of maturity. The reason for the difference is + mainly that one of them, mumamo-mode, requires + very tight integration with Emacs in a way that + currently is not completely possible. Some things must + be changed in Emacs for this. There are also things to + discover in the interactions with other minor modes for + example. +
++ That said I still think mumamo-mode is mature enough for + serious use (though it sometimes conflicts with some other modules). +
++ The other part, nxhtml-mode, is more mature, + since it stands more by itself and since it builds on + the very stable nxml-mode. I would not say nxhtml-mode + is finished, but it is stable and useful. +
+
+
+ - Magic major mode selection +
-
+
+ Sometimes the major mode that Emacs opens a file in is + not what you expect. This can happen with files like PHP + files. The reason might be that magic-mode-alist have + choosen a mode based on the content of the file. The way + this is done does not take files with mixes a mix of for + example XHTML and PHP into account. +
++ You may try setting magic-mode-alist to nil if this is a + problem for you. +
++ + This is now no longer necessary since the introduction + of magic-fallback-mode-alist in CVS Emacs on 2007-05-16. + (If you have an Emacs newer than that, of course.) + +
+
+
+ - Long Red Underlines +
-
+
+ Because of a bug in Emacs 22.1 you can sometimes (at the + end of a line) get long red lines instead of just a + single underlined character. Many users (me included) + find this quite a bit disturbing. I have therefore added + a command to quickly hide/show the underlines. This is + on C-c C-w. +
++ This is particular useful for example in the case where + you edit a PHP file and are bound to get a lot of XHTML + validation errors. +
+
+
+ - Attribute values computed by PHP +
-
+
+ If you want to have attribute values computed by PHP + here is a way how to structure that to avoid breaking + completion and validation in the XHTML part unnessecary: +
++ <img src="images/linux.png" title="<?php foo("bar");?>"/> +
++ Unfortunately that still breaks XHTML validation since + < is not allowed in strings. In the long run I + believe the XML validator has to be broken up so that it + avoids parsing the string here (in PHP files). +
++ For now I have implemented a workaround. + If you are using constructs like those above then turn on nxhtml-strval-mode. + This will temporarily replace the above with +
++ <img src="images/linux.png" title="«?php foo("bar");?»"/> +
++ However on the screen you will still see the original + string and when writing to file the correct characters + will be used. +
+
+
+ - A note for PHP and its cousins +
-
+
+ The rules for a process instruction in XML, like <?php + ... ?> says that the text can contain any text except + ?>. So if you want to output that string + from PHP then break it up so it does not look as ?> in + the source file. +
++ It might be good to break up the beginning part of the + process instructions too. And please note that to use + XHTML validation or completion you should avoid using + < in strings, since it is not allowed there. +
+
+
+ - Perl Mode slow with Mumamo Mode +
-
+
+ Perl mode used with MuMaMo mode sometimes makes the + fontification slow for big files. I do not know the + reason, but I am trying to find a solution for this. If + you encounter this problem, just turn off mumamo-mode in + that buffer. +
+
+
+ - Tab width +
-
+
+ Do you have tab-width to something different than 8 + (the default)? Then please change this to 8. I have got + reports of problem with indentation when it is not 8. +
+
+
+ - Why the chunks are not compatible with mmm +
-
+
+ Some people have asked why the way to specify chunks in + mumamo-mode is not compatible with the old mmm-mode. The + answer is that I was not sure that the way used in + mmm-mode for specifying the chunks was flexible enough. +
++ And I am sure that even the way used in mumamo-mode is + not good enough for all cases, but I let it be the way + it is until I have a better understanding of the + problem. Suggestions and comments are welcome! +
+
+
+
nXhtml Changes
+ +-
+
- 0.89 +
-
+
-
+
- + Corrected autostart for nXhtml when not used together with EmacsW32. + +
+ - 0.90 +
-
+
-
+
- + Improved display of XML path. + +
- + Discontinued xmple-mode. + +
- + New major modes nxhtml-part-mode/nxml-part-mode replaces + minor mode xmlpe-mode. (While moving the code to + nxhtml-part.el I also fixed a bug in Xmple minor mode that + made Emacs take 99% of the CPU.) + +
+ - 0.91 +
-
+
-
+
- + Fixed some calls to perl which prevented uploading of + a site of you did not have perl in the same location + as me. + +
- + Glued together things so that editing PHP files works + as I intended. (This means that Emacs switches between + php-mode and nxhtml-part-mode automatically when + moving point. And that you can use completion.) + +
- + Starting working on the documentation for nXhtml. + New layout to the documentation files. + Examples with images. + +
+ - 0.92 +
-
+
-
+
- + Fixes to make the switching between php and xhtml + style editing work better. + +
+ - 0.93 +
-
+
-
+
- + Better error handling when switching to editing + embedded JavaScript and CSS. + +
- + Removed PHP spec from embedded switching since they + interfered with the automatic switching between php + and xhtml. + +
- + Gives an error message if web host is not defined in + site when trying to use View Uploaded File and + cousins. + +
- + Gives a ready message when finished uploading a single + file. + +
- + When using Mode Switching at <? ... ?> mode + switching could occur in wrong buffer. Fixed together + with some other buffer problems. + +
+ - 0.94 +
-
+
-
+
- + Add http://www.w3.org/ to the help sites for CSS. + +
- + Included a CSS mode. + +
- + Added a menu entry for bug reporting. + +
- + Renamed menu bar entry from XHTML to nXhtml for clarity. + (But nXml menu bar entry is still called XML.) + +
- + Added work around for globalized minor modes in the + cases of MLinks, XML Path and mode switching at <? ... ?>. + +
+ - 0.95 +
-
+
-
+
- + Added workaround for the problem with the first + keyboard key after automatically switching of mode at + <? ... ?>. + +
+ - 0.96 +
-
+
-
+
- + Added support for multiple major modes with mumamo.el. + +
- + More conventient handling of links. They can now be + opened in the same window, 'other window' or in a new + frame. + +
+ - 0.97 +
-
+
-
+
- + Schema was not setup after starting new page so + completion did not work. Fixed. + +
- + Added http://xhtml.com/ to help sites for XHTML. + +
- + Added the concept of XML validation headers. + These are just text parsed by the nXml validation + parser to get a start state before starting parsing a + buffer. This allows the use of the nXml completion in + buffers where there are no XML header. Such a header + is often lacking for example in PHP code since the + XHTML header is often generated dynamically. + +
- + Because of the change above nxhtml-part-mode + is no longer needed and is therefore declared + obsolete. + +
- + Corrected a bug in mlinks.el that prevented opening an + HTML link in a other window or a new frame. + +
- + Added support for JSP, eRuby and some support for perl + in mumamo.el. + +
+ - 0.98 +
-
+
-
+
- + Mumamo was not found when nXhtml was installed with + just the zip file. Corrected. (nXhtml is also + installed when you install EmacsW32.) + +
- + Enhancement to mumamo error handling when a bad mode + specifier for an embedded mode is found. + +
- + Introduced a bug for empty XHTML documents in + 0.97. Corrected. + +
- + Corrected a bug for chunks 1 character long. + +
- + There is what I consider is a bug in Emacs 22.1 in the + handling of global minor mode that are not distributed + with Emacs. If they are turned on by customization, + but loaded after Emacs have loaded the customizations + (usually in .emacs) then they are not turned on + correctly. Added work-around for this. + +
-
+ Extra XHTML Validation Header:
+
-
+
- + Extra XHTML Validation Header state was not saved when moving between chunks. Fixed. + +
- + Tried to make the concept of Extra XHTML Validation Header + more clear. Added this visually to the buffer. + +
- + Extra XHTML Validation Headers can now be turned on + automatically based on file name. + +
+ -
+ nXhtml menu:
+
-
+
- + Reorganized the nXhtml menu. + +
- + Added customization groups for help libraries to nXhtml. + +
- + Added an entry for customization of nXhtml to the menus. + +
- + Added Tidy to the menus again. + +
+ - + Corrected bug in XML Path (nxml-where) for single tags. + Other small fixes to nxhtml-where. + +
- + Documentation enhancements. + Added The Quick Guide. + +
+ - 0.99 +
-
+
-
+
- + Fixed a serious bug in the cooperation between nxhtml-mode and mumamo-mode. + +
- + Turn on mumamo-mode by file name (mumamo-global-mode). + +
-
+ Extra XHTML Validation Header:
+
-
+
- + The Extra XHTML Validation Header state were not saved when changing major mode in MuMaMo. Corrected. + +
- + Added more alternatives to the Extra XHTML Validation Header list. + This should make it easier to use completion with for example PHP. + +
- + Added default value for the Extra XHTML Validation Header. + +
- + Tried to make the use of Extra XHTML Validation Header more automatic and therefore useful. + Also tried to make it play better with setting schema file. + (There is no need normally to set schema file by hand.) + +
- + To turn this on by default customize nxhtml-global-validation-header-mode. + +
+ - + Possible to hide validation warnings without turning + on validation (which would make completion in the + XHTML part impossible). + +
-
+ Some fixes to php-mode:
+
-
+
- Using the character # for comments now works for most cases. +
- Now uses the fontification faces in a more standard way which calms down the look. +
- Initialization bug fixes. +
- Renamed php-mode-user-hook to php-mode-hook to follow standard. +
+ -
+ Indentation fixes:
+
-
+
- + Various corrections to indentation in mumamo. + +
- + Added the possibility to use TAB to indent regions + (indent-region-mode). + +
- + Warn about bad indentation in mixed PHP/HTML code + when using php-mode only. + +
+ - + Fontification now fontifies all text first in main + major mode and thereafter applies submodes. (This + avoids some problems with around a submode chunk.) + +
-
+ Reorganized the nXhtml menu:
+
-
+
- + There is now a minor mode for the nXhtml + menu. This makes it possible to easier use common + features when in buffers not in nxhtml-mode. + +
- + The nXhtml menu does not disappear when moving + into a chunk where the major mode is not + nxhtml-mode. The changes also makes it easy to + access uploading functions functions etc from + other modes than nxhtml-mode since the + nXhtml may also be shown in them. + +
- + The nXhtml menu can be turned on globally by default. + Customize nxhtml-menu-mode for that. + +
+
+ - 1.00 +
-
+
-
+
- + Reached version number 1.00 - which you maybe believe + means the bugs should be gone? Sorry, it is just that + I ran out of version numbers ;-) However it looks like + much fewer bugs at least. + +
- + Fixed problems mostly related to global turn on of different features in nXhtml. + +
-
+ Small fixes to indentation.
+
-
+
- + nxhtml-mode could get confused by php tags. + +
- + nxhtml-mode did not indent <!DOCTYPE in a sensible way. + +
- + Electric keys now works in embedded php when using mumamo-mode. + +
+ - + Tidy was very misbehaving since the output buffer was + not erased between different files. But I have got no + bug reports on this ;-) + +
- + Fixed a bug in validation that should up when using muamo-mode. + +
- + Fixed bug in <script ...> and <style ...> chunk dividing. + +
- + Added support for OpenLaszlo. + +
-
+ Corrections to mlinks-mode (visible mostly as links in
+ XHTML buffers):
+
-
+
- + Links disappeared when a new file was + opened. Corrected. + +
- + Links were not correctly updated at changes in the + buffer when mumamo-mode was used. Fixed. + +
+ - + The welcome message for nXhtml could be shown too + early sometimes when loading, before nXhtml actually + knew if it should be shown or not. Tried to fix it. + +
+ - 1.01 +
-
+
-
+
- + Reported wrong version number for nXhtml in the menus. Fixed. + +
- + If you use the zip file to install nXhtml please + notice that it has now a top level nxml. Sorry for not + having zipped it like that before! + +
- + The url links in Welcome to nXhtml was a bit + incorrect and did not work on all OS:es. Fixed. + +
- + Added customization of popup completion to the 'nxhtml + customization group so they are easier to find. + +
-
+ MuMaMo
+
-
+
- + Struggled a bit with the load sequences of the elisp + libraries used by nXhtml when using MuMaMo. + +
- + Tried to get the global turn on of mumam-mode to work + in all cases. + +
- + The screen was blinking when changing overlays after + changes in the buffer. Tried to fix this. + +
- + Minor fixes do syntax highlighting, like taking care of single ':s. + +
- + Fixes to the support for JSP and eRuby. + +
- + Made the support for perl here documents a bit better. + Large perl documents are however still quite slow when + using mumamo-mode. I do not know the reason yet. + +
- + Refontification could miss some parts when buffer + changes caused chunk division changes. Complex, + tried to fix it, but I am a bit unsure that it + always works. + +
- + Cleaned up mumamo.el a bit. + +
- + Rewrote mumamo-test.el and functions called from it in + mumamo.el a bit to make tracebacks from errors more + useful. Changed keybindings in mumamo-test.el from + global to a minor mode mumamo-test-mode. + Renamed mumamo-notest.el to mumamo-test.el. Added it + to the zipped distribution of nXhtml. + +
+ - + Fixed a bug related to links and buffer changes. + +
+ - 1.02 +
-
+
-
+
- + Fixed a refontification bug that occured after changes. + +
+ - 1.03 +
-
+
-
+
- + Added the possibility to call GIMP. + +
- + Reworked the messages for fontification errors to try + to catch an error that shows up sometimes. Tried to + avoid disturbing normal use in spite of that error. + +
- + Reverted to using a short delay before switching major + mode when moving between buffers. + +
+ - 1.04 +
-
+
-
+
- + Completion in empty buffers with a completion header + did not work. Fixed. + +
-
+ Multiple major modes:
+
-
+
- + Better error tracing for some functions. + +
- + Position was garbled when a ;-char was inserted in php-mode chunk. Fixed. + +
+ -
+ Extra XHTML Validation Header:
+
-
+
- + View File did not work correctly when an extra + XHTML validation header was used. Corrected. + +
- + Extra XHTML validation headers are no longer + turned on by default in any buffers. + +
+ - + Tried to fix a problem when using newline-and-indent. + When this was in a mode derived from C the indentation + sometimes became 0. + +
- + Added a workaround for Attribute values computed + by PHP + +
-
+ Ruby
+
-
+
- + Multiple major mode turned on by default for .rhtml files when this mode is global. + +
- + Multiple major mode is no longer turned on when rub-mode is turned on. + +
+ - + Added .nosearch to subdirectories with no elisp files. + +
- + Added support for Firefox add-on It's All Text. + +
- + Added the possibility to easily view the output of scripts on the server (if they require no parameters). + You can now do that from the nXhtml menu. + Previously only html files on the server could be viewed that way. + Image files can also be viewed this way. + +
- + Upgraded htmlize.el to version 1.34 + +
- + Added functions for unfilling. + +
- + Added keybindings and menu entries for longlines-mode, fill-paragraph and unfill-paragraph. + +
- + Added image-mode to those that are encompassed by + nxhtml-global-minor-mode so that images can be + uploaded more easily. + +
- + Added edit with GIMP and upload to the popup menu for links. + This avoids the need to load the linked files in Emacs first. + +
- + Fixed incorrect checks for mlinks-mode in menu building. + +
+
+ + + diff --git a/emacs.d/nxhtml/tests/in/eval-in-html.el b/emacs.d/nxhtml/tests/in/eval-in-html.el new file mode 100644 index 0000000..33bb9e9 Binary files /dev/null and b/emacs.d/nxhtml/tests/in/eval-in-html.el differ diff --git a/emacs.d/nxhtml/tests/in/fontif-err.html b/emacs.d/nxhtml/tests/in/fontif-err.html new file mode 100644 index 0000000..6f71efa --- /dev/null +++ b/emacs.d/nxhtml/tests/in/fontif-err.html @@ -0,0 +1,339 @@ + + + + +
+
+
+
+
+
+
+
+ nXhtml Notes and Bugs
+ +-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- I have rewritten the PHP mode switching +
-
+
+ Because of some (fair) critique I have gotten about the way mode switching between php-mode and nxhtml-mode works + I have rewritten that part. + The new mode switching also includes embedded css, javascript, eRuby and JSP. +
+
+ - A lot of bugs corrected for version 0.98 +
-
+
+ I want to thanks Hadron Quark for helping me by testing + and pointing out bugs and weaknesses, most related to + editing of PHP. I have included fixes for many of them + in version 0.98 and more may follow. +
+
+
nXhtml Changes
+ +-
+
- 0.89 +
-
+
-
+
- + Corrected autostart for nXhtml when not used together with EmacsW32. + +
+ - 0.90 +
-
+
-
+
- + Improved display of XML path. + +
- + Discontinued xmple-mode. + +
- + New major modes nxhtml-part-mode/nxml-part-mode replaces + minor mode xmlpe-mode. (While moving the code to + nxhtml-part.el I also fixed a bug in Xmple minor mode that + made Emacs take 99% of the CPU.) + +
+ - 0.91 +
-
+
-
+
- + Fixed some calls to perl which prevented uploading of + a site of you did not have perl in the same location + as me. + +
- + Glued together things so that editing PHP files works + as I intended. (This means that Emacs switches between + php-mode and nxhtml-part-mode automatically when + moving point. And that you can use completion.) + +
- + Starting working on the documentation for nXhtml. + New layout to the documentation files. + Examples with images. + +
+ - 0.92 +
-
+
-
+
- + Fixes to make the switching between php and xhtml + style editing work better. + +
+ - 0.93 +
-
+
-
+
- + Better error handling when switching to editing + embedded JavaScript and CSS. + +
- + Removed PHP spec from embedded switching since they + interfered with the automatic switching between php + and xhtml. + +
- + Gives an error message if web host is not defined in + site when trying to use View Uploaded File and + cousins. + +
- + Gives a ready message when finished uploading a single + file. + +
- + When using Mode Switching at <? ... ?> mode + switching could occur in wrong buffer. Fixed together + with some other buffer problems. + +
+ - 0.94 +
-
+
-
+
- + Add http://www.w3.org/ to the help sites for CSS. + +
- + Included a CSS mode. + +
- + Added a menu entry for bug reporting. + +
- + Renamed menu bar entry from XHTML to nXhtml for clarity. + (But nXml menu bar entry is still called XML.) + +
- + Added work around for globalized minor modes in the + cases of MLinks, XML Path and mode switching at <? ... ?>. + +
+ - 0.95 +
-
+
-
+
- + Added workaround for the problem with the first + keyboard key after automatically switching of mode at + <? ... ?>. + +
+ - 0.96 +
-
+
-
+
- + Added support for multiple major modes with mumamo.el. + +
- + More conventient handling of links. They can now be + opened in the same window, 'other window' or in a new + frame. + +
+ - 0.97 +
-
+
-
+
- + Schema was not setup after starting new page so + completion did not work. Fixed. + +
- + Added http://xhtml.com/ to help sites for XHTML. + +
- + Added the concept of XML validation headers. + These are just text parsed by the nXml validation + parser to get a start state before starting parsing a + buffer. This allows the use of the nXml completion in + buffers where there are no XML header. Such a header + is often lacking for example in PHP code since the + XHTML header is often generated dynamically. + +
- + Because of the change above nxhtml-part-mode + is no longer needed and is therefore declared + obsolete. + +
- + Corrected a bug in mlinks.el that prevented opening an + HTML link in a other window or a new frame. + +
- + Added support for JSP, eRuby and some support for perl + in mumamo.el. + +
+ - 0.98 +
-
+
-
+
- + Mumamo was not found when nXhtml was installed with + just the zip file. Corrected. (nXhtml is also + installed when you install EmacsW32.) + +
- + Enhancement to mumamo error handling when a bad mode + specifier for an embedded mode is found. + +
- + Introduced a bug for empty XHTML documents in + 0.97. Corrected. + +
- + Corrected a bug for chunks 1 character long. + +
- + There is a bug in Emacs 22 in the handling of global + minor mode that are not distributed with Emacs. If + they are turned on by customization, but loaded after + Emacs have loaded the customizations (usually in + .emacs) then they are not turned on correctly. Added + work-around for this. + +
-
+ Extra XHTML Validation Header:
+
-
+
- + Extra XHTML Validation Header state was not saved when moving between chunks. Fixed. + +
- + Tried to make the concept of Extra XHTML Validation Header + more clear. Added this visually to the buffer. + +
- + Extra XHTML Validation Headers can now be turned on + automatically based on file name. + +
+ -
+ nXhtml menu:
+
-
+
- + Reorganized the nXhtml menu. + +
- + Added customization groups for help libraries to nXhtml. + +
- + Added an entry for customization of nXhtml to the menus. + +
- + Added Tidy to the menus again. + +
+ - + Corrected bug in XML Path (nxml-where) for single tags. + Other small fixes to nxhtml-where. + +
- + Documentation enhancements. + Added The Quick Guide. + +
- + +
+ - 0.99 +
-
+
-
+
- + Corrections to indentation. + +
- + Turn on mumamo-mode by file name. + +
- + The Extra XHTML Validation Header state were not saved when changing major mode in MuMaMo. Corrected. + +
- + Added more alternatives to the Extra XHTML Validation Header list. + This should make it easier to use completion with for example PHP. + +
- + Added default value for the Extra XHTML Validation Header. + +
+
+ + + diff --git a/emacs.d/nxhtml/tests/in/fontif-err.php b/emacs.d/nxhtml/tests/in/fontif-err.php new file mode 100644 index 0000000..6f71efa --- /dev/null +++ b/emacs.d/nxhtml/tests/in/fontif-err.php @@ -0,0 +1,339 @@ + + + + +
+
+
+
+
+
+
+
+ nXhtml Notes and Bugs
+ +-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- I have rewritten the PHP mode switching +
-
+
+ Because of some (fair) critique I have gotten about the way mode switching between php-mode and nxhtml-mode works + I have rewritten that part. + The new mode switching also includes embedded css, javascript, eRuby and JSP. +
+
+ - A lot of bugs corrected for version 0.98 +
-
+
+ I want to thanks Hadron Quark for helping me by testing + and pointing out bugs and weaknesses, most related to + editing of PHP. I have included fixes for many of them + in version 0.98 and more may follow. +
+
+
nXhtml Changes
+ +-
+
- 0.89 +
-
+
-
+
- + Corrected autostart for nXhtml when not used together with EmacsW32. + +
+ - 0.90 +
-
+
-
+
- + Improved display of XML path. + +
- + Discontinued xmple-mode. + +
- + New major modes nxhtml-part-mode/nxml-part-mode replaces + minor mode xmlpe-mode. (While moving the code to + nxhtml-part.el I also fixed a bug in Xmple minor mode that + made Emacs take 99% of the CPU.) + +
+ - 0.91 +
-
+
-
+
- + Fixed some calls to perl which prevented uploading of + a site of you did not have perl in the same location + as me. + +
- + Glued together things so that editing PHP files works + as I intended. (This means that Emacs switches between + php-mode and nxhtml-part-mode automatically when + moving point. And that you can use completion.) + +
- + Starting working on the documentation for nXhtml. + New layout to the documentation files. + Examples with images. + +
+ - 0.92 +
-
+
-
+
- + Fixes to make the switching between php and xhtml + style editing work better. + +
+ - 0.93 +
-
+
-
+
- + Better error handling when switching to editing + embedded JavaScript and CSS. + +
- + Removed PHP spec from embedded switching since they + interfered with the automatic switching between php + and xhtml. + +
- + Gives an error message if web host is not defined in + site when trying to use View Uploaded File and + cousins. + +
- + Gives a ready message when finished uploading a single + file. + +
- + When using Mode Switching at <? ... ?> mode + switching could occur in wrong buffer. Fixed together + with some other buffer problems. + +
+ - 0.94 +
-
+
-
+
- + Add http://www.w3.org/ to the help sites for CSS. + +
- + Included a CSS mode. + +
- + Added a menu entry for bug reporting. + +
- + Renamed menu bar entry from XHTML to nXhtml for clarity. + (But nXml menu bar entry is still called XML.) + +
- + Added work around for globalized minor modes in the + cases of MLinks, XML Path and mode switching at <? ... ?>. + +
+ - 0.95 +
-
+
-
+
- + Added workaround for the problem with the first + keyboard key after automatically switching of mode at + <? ... ?>. + +
+ - 0.96 +
-
+
-
+
- + Added support for multiple major modes with mumamo.el. + +
- + More conventient handling of links. They can now be + opened in the same window, 'other window' or in a new + frame. + +
+ - 0.97 +
-
+
-
+
- + Schema was not setup after starting new page so + completion did not work. Fixed. + +
- + Added http://xhtml.com/ to help sites for XHTML. + +
- + Added the concept of XML validation headers. + These are just text parsed by the nXml validation + parser to get a start state before starting parsing a + buffer. This allows the use of the nXml completion in + buffers where there are no XML header. Such a header + is often lacking for example in PHP code since the + XHTML header is often generated dynamically. + +
- + Because of the change above nxhtml-part-mode + is no longer needed and is therefore declared + obsolete. + +
- + Corrected a bug in mlinks.el that prevented opening an + HTML link in a other window or a new frame. + +
- + Added support for JSP, eRuby and some support for perl + in mumamo.el. + +
+ - 0.98 +
-
+
-
+
- + Mumamo was not found when nXhtml was installed with + just the zip file. Corrected. (nXhtml is also + installed when you install EmacsW32.) + +
- + Enhancement to mumamo error handling when a bad mode + specifier for an embedded mode is found. + +
- + Introduced a bug for empty XHTML documents in + 0.97. Corrected. + +
- + Corrected a bug for chunks 1 character long. + +
- + There is a bug in Emacs 22 in the handling of global + minor mode that are not distributed with Emacs. If + they are turned on by customization, but loaded after + Emacs have loaded the customizations (usually in + .emacs) then they are not turned on correctly. Added + work-around for this. + +
-
+ Extra XHTML Validation Header:
+
-
+
- + Extra XHTML Validation Header state was not saved when moving between chunks. Fixed. + +
- + Tried to make the concept of Extra XHTML Validation Header + more clear. Added this visually to the buffer. + +
- + Extra XHTML Validation Headers can now be turned on + automatically based on file name. + +
+ -
+ nXhtml menu:
+
-
+
- + Reorganized the nXhtml menu. + +
- + Added customization groups for help libraries to nXhtml. + +
- + Added an entry for customization of nXhtml to the menus. + +
- + Added Tidy to the menus again. + +
+ - + Corrected bug in XML Path (nxml-where) for single tags. + Other small fixes to nxhtml-where. + +
- + Documentation enhancements. + Added The Quick Guide. + +
- + +
+ - 0.99 +
-
+
-
+
- + Corrections to indentation. + +
- + Turn on mumamo-mode by file name. + +
- + The Extra XHTML Validation Header state were not saved when changing major mode in MuMaMo. Corrected. + +
- + Added more alternatives to the Extra XHTML Validation Header list. + This should make it easier to use completion with for example PHP. + +
- + Added default value for the Extra XHTML Validation Header. + +
+
+ + + diff --git a/emacs.d/nxhtml/tests/in/genshi-HelloWorldPage.ghtml b/emacs.d/nxhtml/tests/in/genshi-HelloWorldPage.ghtml new file mode 100644 index 0000000..f54fc5f --- /dev/null +++ b/emacs.d/nxhtml/tests/in/genshi-HelloWorldPage.ghtml @@ -0,0 +1,10 @@ +
+
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/genshi-auto-mode.html b/emacs.d/nxhtml/tests/in/genshi-auto-mode.html
new file mode 100644
index 0000000..f54fc5f
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/genshi-auto-mode.html
@@ -0,0 +1,10 @@
+
+ Hello from hello!
+ Test ${name}
+
+
+
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/genshi.ghtml b/emacs.d/nxhtml/tests/in/genshi.ghtml
new file mode 100644
index 0000000..bf0848d
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/genshi.ghtml
@@ -0,0 +1,23 @@
+
+
+
+
+ Hello from hello!
+ Test ${name}
+
+These are some of my favorite fruits:
+-
+
- + I like ${fruit}s + +
Blah!
+%one
+ %two
+ %three Hey there
+
+%html(xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en")
+
+%a(title=@title href=href) Stuff
+%a{:title => @title, :href => href} Stuff
+
+%script(type="text/javascript"
+ src="javascripts/script_#{2 + 7}")
+
+%html{html_attrs('fr-fr')}
+
+%input{:selected => true}
+%input(selected)
+%input(selected=true)
+
+%div#things
+ %span#rice Chicken Fried
+ %p.beans{ :food => 'true' } The magical fruit
+ %h1.class.otherclass#id La La La
+
+#content .articles
+ .article.title Doogie Howser Comes Out
+ .article.date 2006-11-05
+ .article.entry
+ Neil Patrick Harris would like to dispel any rumors that he is straight
+
+%br/
+%meta{'http-equiv' => 'Content-Type', :content => 'text/html'}/
+
+%br
+%meta{'http-equiv' => 'Content-Type', :content => 'text/html'}
+
+%blockquote<
+ %div
+ Foo!
+
+%img
+%img>
+%img
+
+%img
+%pre><
+ foo
+ bar
+%img
+
+%peanutbutterjelly
+ / This is the peanutbutterjelly element
+ I like sandwiches!
+
+/
+ %p This doesn't render...
+ %div
+ %h1 Because it's commented out!
+
+/[if IE]
+ %a{ :href => 'http://www.mozilla.com/en-US/firefox/' }
+ %h1 Get Firefox
+
+%p foo
+-# This is a comment
+%p bar
+
+- foo = "hello"
+- foo << " there"
+- foo << " you!"
+%p= foo
+
+- (42...47).each do |i|
+ %p= i
+%p See, I can count!
+
+%p
+ - case 2
+ - when 1
+ = "1!"
+ - when 2
+ = "2?"
+ - when 3
+ = "3."
+
+%p This is #{h quality} cake!
+%p= "This is the #{h quality} cake!"
+
+%p
+ Look at \\#{h word} lack of backslash: \#{foo}
+ And yon presence thereof: \{foo}
+
+:javascript
+ $(document).ready(function() {
+ alert(#{@message.to_json});
+ });
+
+&= "I like cheese & crackers"
+
+= "I feel !"
+!= "I feel !"
+compiles to
+I feel <strong>!
+I feel !
+
+%p
+ :markdown
+ Textile
+ =======
+
+ Hello, *World*
+
+- flavor = "raspberry"
+#content
+ :textile
+ I *really* prefer _#{h flavor}_ jam.
diff --git a/emacs.d/nxhtml/tests/in/heredoc.php b/emacs.d/nxhtml/tests/in/heredoc.php
new file mode 100644
index 0000000..39e82e5
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/heredoc.php
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+HTMLEOF;
+echo strtolower($toprint);
+
+?>
diff --git a/emacs.d/nxhtml/tests/in/heredoc.pl b/emacs.d/nxhtml/tests/in/heredoc.pl
new file mode 100644
index 0000000..8620357
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/heredoc.pl
@@ -0,0 +1,11 @@
+$text = 'Text from a Perl string.';
+print <Here-Doc Example
+$text
+ +HTML diff --git a/emacs.d/nxhtml/tests/in/heredoc.py b/emacs.d/nxhtml/tests/in/heredoc.py new file mode 100644 index 0000000..aaa847f --- /dev/null +++ b/emacs.d/nxhtml/tests/in/heredoc.py @@ -0,0 +1,11 @@ +sender = 'Buffy the Vampire Slayer' +recipient = 'Spike' + +print("""\ +Dear %(recipient)s, + +I wish you to leave Sunnydale and never return. + +Not Quite Love, +%(sender)s +""" % locals()) diff --git a/emacs.d/nxhtml/tests/in/heredoc.rb b/emacs.d/nxhtml/tests/in/heredoc.rb new file mode 100644 index 0000000..ab7b54f --- /dev/null +++ b/emacs.d/nxhtml/tests/in/heredoc.rb @@ -0,0 +1,8 @@ +now = Time.now +puts <<-EOF + It's #{now.hour} o'clock John, where are your kids? + EOF +now = Time.now +puts <+ agile.guo + + + Last modified: Thu Sep 14 22:01:42 CST 2006 + + diff --git a/emacs.d/nxhtml/tests/in/hq-070510-test.php b/emacs.d/nxhtml/tests/in/hq-070510-test.php new file mode 100644 index 0000000..8c57717 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/hq-070510-test.php @@ -0,0 +1,12 @@ + + + +
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/hq-070510-test.php.html b/emacs.d/nxhtml/tests/in/hq-070510-test.php.html
new file mode 100644
index 0000000..57736a3
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/hq-070510-test.php.html
@@ -0,0 +1,44 @@
+
+
+
+ + +<?php +require_once("include/utils.php"); +?> + +<div class="linkcontainer"> +<?php +$_SESSION["linksfile"]="csv/links.csv"; +include("displaylinks.php"); +?> +</div> + + ++ + + diff --git a/emacs.d/nxhtml/tests/in/hq-070524-bug.php b/emacs.d/nxhtml/tests/in/hq-070524-bug.php new file mode 100644 index 0000000..24bd8e8 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/hq-070524-bug.php @@ -0,0 +1,10 @@ + diff --git a/emacs.d/nxhtml/tests/in/hq-071006-index.php b/emacs.d/nxhtml/tests/in/hq-071006-index.php new file mode 100644 index 0000000..78b60e8 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/hq-071006-index.php @@ -0,0 +1,38 @@ + + diff --git a/emacs.d/nxhtml/tests/in/html-syntactic-err-l164.html b/emacs.d/nxhtml/tests/in/html-syntactic-err-l164.html new file mode 100644 index 0000000..275ae67 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/html-syntactic-err-l164.html @@ -0,0 +1,1474 @@ + + + + +
+
+
+
+
+
+
+
+ News and Notes about nXhtml
+ +-
+
+
- Thanks for testing! +
-
+
+ I want to thanks the testers (who have been many now), + especially to my first testers Hadron Quark and Eric + Lilja, for helping me by testing and pointing out bugs + and weaknesses, most of them related to editing of PHP. +
++ Without testers all kind of problems I just can't + imagine myself would still be there in nXhtml. For + example Hadron told me once that he got the error + (wrong-type-argument stringp nil). Eh, I replied, are + you sure. Yes he was. I tried the same file as him. No + error. +
++ The error happened during fontification so the error + message above was all we had. A real black box for + me. Or perhaps black magic? After much confusion and + some hard work we finally found out what it was and I + implemented a better way to catch such errors. If Hadron + would have given up the problem would still have been + there. Some problems are just impossible to solve + without good cooperation. So, again, thanks Hadron. +
++ BTW, I will perhaps add some even better way to Emacs to + catch these errors so other can benefit from our + insights too, but that requires some time and effort + which I can't afford right now. +
+
+
+ - The State of the Art +
-
+
+ I have more and more come to realize that there are two + main parts of nXhtml which are in a bit different + degrees of maturity. The reason for the difference is + mainly that one of them, mumamo-mode, + requires very tight integration with Emacs in a way that + currently is difficult. There are also things to + discover, for example in the interactions with other + minor modes. Each minor mode actually have to be tested + with mumamo-mode. (Instruction for library authors are + in mumamo-mode.el) +
++ That said I still think mumamo-mode is + mature enough for serious use. At least the + fontification now works ok I believe. Other + parts that also depends on the major mode used, + like filling and indentation have some quirks. To + make those work more reliably in all cases a bit more + standardisation across different major modes is + needed. (It is perhaps possible to work around those + problems in mumamo-mode, but the long term benefits of + doing that are probably small.) +
++ The other part, nxhtml-mode, is more mature, + since it stands more by itself and since it builds on + the very stable nxml-mode. I would not say nxhtml-mode + is (ever) finished, but it is stable and useful. +
+
+
+ - Magic major mode selection +
-
+
+ Sometimes the major mode that Emacs opens a file in is + not what you expect. This can happen with files like PHP + files. The reason might be that magic-mode-alist have + choosen a mode based on the content of the file. The way + this is done does not take files with mixes a mix of for + example XHTML and PHP into account. +
++ You may try setting magic-mode-alist to nil if this is a + problem for you. +
++ + This is now no longer necessary since the introduction + of magic-fallback-mode-alist in CVS Emacs on 2007-05-16. + (If you have an Emacs newer than that, of course.) + +
+
+
+ - Long Red Underlines +
-
+
+ Because of a bug in Emacs 22.1 you can sometimes (at the + end of a line) get long red lines instead of just a + single underlined character. Many users (me included) + find this quite a bit disturbing. I have therefore added + a command to quickly hide/show the underlines. This is + on C-c C-w. +
++ This is particular useful for example in the case where + you edit a PHP file and are bound to get a lot of XHTML + validation errors. +
+
+
+ - Attribute values computed by PHP +
-
+
+ If you want to have attribute values computed by PHP + here is a way how to structure that to avoid breaking + completion and validation in the XHTML part unnessecary: +
++ <img src="images/linux.png" title="<?php foo("bar");?>"/> +
++ Unfortunately that still breaks XHTML validation since + < is not allowed in strings. In the long run I + believe the XML validator has to be broken up so that it + avoids parsing the string here (in PHP files). +
++ For now I have implemented a workaround. + If you are using constructs like those above then turn on nxhtml-strval-mode. + This will temporarily replace the above with +
++ <img src="images/linux.png" title="«?php foo("bar");?»"/> +
++ However on the screen you will still see the original + string and when writing to file the correct characters + will be used. +
+
+
+ - A note for PHP and its cousins +
-
+
+ The rules for a process instruction in XML, like <?php + ... ?> says that the text can contain any text except + ?>. So if you want to output that string + from PHP then break it up so it does not look as ?> in + the source file. +
++ It might be good to break up the beginning part of the + process instructions too. And please note that to use + XHTML validation or completion you should avoid using + < in strings, since it is not allowed there. +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - Tab width +
-
+
+ Do you have tab-width to something different than 8 + (the default)? Then please change this to 8. I have got + reports of problem with indentation when it is not 8. +
+
+
+ - Why the chunks are not compatible with mmm +
-
+
+ Some people have asked why the way to specify chunks in + mumamo-mode is not compatible with the old mmm-mode. The + answer is that I was not sure that the way used in + mmm-mode for specifying the chunks was flexible enough. +
++ And I am sure that even the way used in mumamo-mode is + not good enough for all cases, but I let it be the way + it is until I have a better understanding of the + problem. Suggestions and comments are welcome! +
+
+
+
nXhtml Changes
+ +
+ v0.89
+ v0.90
+ v0.91
+ v0.92
+ v0.93
+ v0.94
+ v0.95
+ v0.96
+ v0.97
+ v0.98
+ v0.99
+ v1.00
+ v1.01
+ v1.02
+ v1.03
+ v1.04
+ v1.10
+ v1.10
+ v1.10
+ v1.10
+ v1.10
+
+
+ -
+
- 0.89 +
-
+
-
+
- + Corrected autostart for nXhtml when not used together with EmacsW32. + +
+ - 0.90 +
-
+
-
+
- + Improved display of XML path. + +
- + Discontinued xmple-mode. + +
- + New major modes nxhtml-part-mode/nxml-part-mode replaces + minor mode xmlpe-mode. (While moving the code to + nxhtml-part.el I also fixed a bug in Xmple minor mode that + made Emacs take 99% of the CPU.) + +
+ - 0.91 +
-
+
-
+
- + Fixed some calls to perl which prevented uploading of + a site of you did not have perl in the same location + as me. + +
- + Glued together things so that editing PHP files works + as I intended. (This means that Emacs switches between + php-mode and nxhtml-part-mode automatically when + moving point. And that you can use completion.) + +
- + Starting working on the documentation for nXhtml. + New layout to the documentation files. + Examples with images. + +
+ - 0.92 +
-
+
-
+
- + Fixes to make the switching between php and xhtml + style editing work better. + +
+ - 0.93 +
-
+
-
+
- + Better error handling when switching to editing + embedded JavaScript and CSS. + +
- + Removed PHP spec from embedded switching since they + interfered with the automatic switching between php + and xhtml. + +
- + Gives an error message if web host is not defined in + site when trying to use View Uploaded File and + cousins. + +
- + Gives a ready message when finished uploading a single + file. + +
- + When using Mode Switching at <? ... ?> mode + switching could occur in wrong buffer. Fixed together + with some other buffer problems. + +
+ - 0.94 +
-
+
-
+
- + Add http://www.w3.org/ to the help sites for CSS. + +
- + Included a CSS mode. + +
- + Added a menu entry for bug reporting. + +
- + Renamed menu bar entry from XHTML to nXhtml for clarity. + (But nXml menu bar entry is still called XML.) + +
- + Added work around for globalized minor modes in the + cases of MLinks, XML Path and mode switching at <? ... ?>. + +
+ - 0.95 +
-
+
-
+
- + Added workaround for the problem with the first + keyboard key after automatically switching of mode at + <? ... ?>. + +
+ - 0.96 +
-
+
-
+
- + Added support for multiple major modes with mumamo.el. + +
- + More conventient handling of links. They can now be + opened in the same window, 'other window' or in a new + frame. + +
+ - 0.97 +
-
+
-
+
- + Schema was not setup after starting new page so + completion did not work. Fixed. + +
- + Added http://xhtml.com/ to help sites for XHTML. + +
- + Added the concept of fictive XML validation + headers. These are just text parsed by the nXml + validation parser to get a start state before starting + parsing a buffer. This allows the use of the nXml + completion in buffers where there are no XML header. + Such a header is often lacking for example in PHP code + since the XHTML header is often generated dynamically. + +
- + Because of the change above nxhtml-part-mode + is no longer needed and is therefore declared + obsolete. + +
- + Corrected a bug in mlinks.el that prevented opening an + HTML link in a other window or a new frame. + +
- + Added support for JSP, eRuby and some support for perl + in mumamo.el. + +
+ - 0.98 +
-
+
-
+
- + Mumamo was not found when nXhtml was installed with + just the zip file. Corrected. (nXhtml is also + installed when you install EmacsW32.) + +
- + Enhancement to mumamo error handling when a bad mode + specifier for an embedded mode is found. + +
- + Introduced a bug for empty XHTML documents in + 0.97. Corrected. + +
- + Corrected a bug for chunks 1 character long. + +
- + There is what I consider is a bug in Emacs 22.1 in the + handling of global minor mode that are not distributed + with Emacs. If they are turned on by customization, + but loaded after Emacs have loaded the customizations + (usually in .emacs) then they are not turned on + correctly. Added work-around for this. + +
-
+ Fictive XHTML Validation Header:
+
-
+
- + Fictive XHTML Validation Header state was not saved when moving between chunks. Fixed. + +
- + Tried to make the concept of Fictive XHTML Validation Header + more clear. Added this visually to the buffer. + +
- + Fictive XHTML Validation Headers can now be turned on + automatically based on file name. + +
+ -
+ nXhtml menu:
+
-
+
- + Reorganized the nXhtml menu. + +
- + Added customization groups for help libraries to nXhtml. + +
- + Added an entry for customization of nXhtml to the menus. + +
- + Added Tidy to the menus again. + +
+ - + Corrected bug in XML Path (nxml-where) for single tags. + Other small fixes to nxhtml-where. + +
- + Documentation enhancements. + Added The Quick Guide. + +
+ - 0.99 +
-
+
-
+
- + Fixed a serious bug in the cooperation between nxhtml-mode and mumamo-mode. + +
- + Turn on mumamo-mode by file name (mumamo-global-mode). + +
-
+ Fictive XHTML Validation Header:
+
-
+
- + The Fictive XHTML Validation Header state were not saved when changing major mode in MuMaMo. Corrected. + +
- + Added more alternatives to the Fictive XHTML Validation Header list. + This should make it easier to use completion with for example PHP. + +
- + Added default value for the Fictive XHTML Validation Header. + +
- + Tried to make the use of Fictive XHTML Validation Header more automatic and therefore useful. + Also tried to make it play better with setting schema file. + (There is no need normally to set schema file by hand.) + +
- + To turn this on by default customize nxhtml-global-validation-header-mode. + +
+ - + Possible to hide validation warnings without turning + on validation (which would make completion in the + XHTML part impossible). + +
-
+ Some fixes to php-mode:
+
-
+
- Using the character # for comments now works for most cases. +
- Now uses the fontification faces in a more standard way which calms down the look. +
- Initialization bug fixes. +
- Renamed php-mode-user-hook to php-mode-hook to follow standard. +
+ -
+ Indentation fixes:
+
-
+
- + Various corrections to indentation in mumamo. + +
- + Added the possibility to use TAB to indent regions + (indent-region-mode). + +
- + Warn about bad indentation in mixed PHP/HTML code + when using php-mode only. + +
+ - + Fontification now fontifies all text first in main + major mode and thereafter applies submodes. (This + avoids some problems with around a submode chunk.) + +
-
+ Reorganized the nXhtml menu:
+
-
+
- + There is now a minor mode for the nXhtml + menu. This makes it possible to easier use common + features when in buffers not in nxhtml-mode. + +
- + The nXhtml menu does not disappear when moving + into a chunk where the major mode is not + nxhtml-mode. The changes also makes it easy to + access uploading functions functions etc from + other modes than nxhtml-mode since the + nXhtml may also be shown in them. + +
- + The nXhtml menu can be turned on globally by default. + Customize nxhtml-menu-mode for that. + +
+
+ - 1.00 +
-
+
-
+
- + Reached version number 1.00 - which you maybe believe + means the bugs should be gone? Sorry, it is just that + I ran out of version numbers ;-) However it looks like + much fewer bugs at least. + +
- + Fixed problems mostly related to global turn on of different features in nXhtml. + +
-
+ Small fixes to indentation.
+
-
+
- + nxhtml-mode could get confused by php tags. + +
- + nxhtml-mode did not indent <!DOCTYPE in a sensible way. + +
- + Electric keys now works in embedded php when using mumamo-mode. + +
+ - + Tidy was very misbehaving since the output buffer was + not erased between different files. But I have got no + bug reports on this ;-) + +
- + Fixed a bug in validation that should up when using muamo-mode. + +
- + Fixed bug in <script ...> and <style ...> chunk dividing. + +
- + Added support for OpenLaszlo. + +
-
+ Corrections to mlinks-mode (visible mostly as links in
+ XHTML buffers):
+
-
+
- + Links disappeared when a new file was + opened. Corrected. + +
- + Links were not correctly updated at changes in the + buffer when mumamo-mode was used. Fixed. + +
+ - + The welcome message for nXhtml could be shown too + early sometimes when loading, before nXhtml actually + knew if it should be shown or not. Tried to fix it. + +
+ - 1.01 +
-
+
-
+
- + Reported wrong version number for nXhtml in the menus. Fixed. + +
- + If you use the zip file to install nXhtml please + notice that it has now a top level nxml. Sorry for not + having zipped it like that before! + +
- + The url links in Welcome to nXhtml was a bit + incorrect and did not work on all OS:es. Fixed. + +
- + Added customization of popup completion to the 'nxhtml + customization group so they are easier to find. + +
-
+ MuMaMo
+
-
+
- + Struggled a bit with the load sequences of the elisp + libraries used by nXhtml when using MuMaMo. + +
- + Tried to get the global turn on of mumam-mode to work + in all cases. + +
- + The screen was blinking when changing overlays after + changes in the buffer. Tried to fix this. + +
- + Minor fixes do syntax highlighting, like taking care of single ':s. + +
- + Fixes to the support for JSP and eRuby. + +
- + Made the support for perl here documents a bit better. + Large perl documents are however still quite slow when + using mumamo-mode. I do not know the reason yet. + +
- + Refontification could miss some parts when buffer + changes caused chunk division changes. Complex, + tried to fix it, but I am a bit unsure that it + always works. + +
- + Cleaned up mumamo.el a bit. + +
- + Rewrote mumamo-test.el and functions called from it in + mumamo.el a bit to make tracebacks from errors more + useful. Changed keybindings in mumamo-test.el from + global to a minor mode mumamo-test-mode. + Renamed mumamo-notest.el to mumamo-test.el. Added it + to the zipped distribution of nXhtml. + +
+ - + Fixed a bug related to links and buffer changes. + +
+ - 1.02 +
-
+
-
+
- + Fixed a refontification bug that occured after changes. + +
+ - 1.03 +
-
+
-
+
- + Added the possibility to call GIMP. + +
- + Reworked the messages for fontification errors to try + to catch an error that shows up sometimes. Tried to + avoid disturbing normal use in spite of that error. + +
- + Reverted to using a short delay before switching major + mode when moving between buffers. + +
+ - 1.04 +
-
+
-
+
- + Enhanced the documentation for nXhtml. Starting from + C-h f nxhtml-mode it should now be easier to + get an overview. + +
-
+ Bug fixes etc:
+
-
+
- + Completion on an empty page gave a faulty frameset page. Fixed. + +
- + Insert end tag did not work with a fictive + validation header. Fixed. + +
- + Insert end tag when all preceding tags where + closed gave a strange error message. Fixed. + +
- + Changed some key bindings to comply with + (info "(elisp) Key Binding Conventions") + +
- + Completion in empty buffers with a completion + header did not work. Fixed. + +
-
+ Multiple major modes:
+
-
+
- + Fixed a bug that prevented mumamo-global-mode from + beeing turned on in a file opened in + fundamental-mode. + +
- + Better error tracing for some functions, + including the call of major mode functions. + +
- + Position was garbled when a ;-char was inserted in php-mode chunk. Fixed. + +
- + A bad check for if mlinks-mode where available was fixed. + +
- + Some bugs concerning turning off mumamo-mode was fixed. + +
- + Fixed a bug in perl here doc chunks. Suddenly the + problem with slowness when using mumamo-mode in + perl buffers seems gone. (Note quite sure, but I + can't see any problems now.) + +
- + Fixed a bug in mumamo-mode when current buffer was + switched before the major mode had been set from + the current chunk. + +
- + Fixed a long standing bug in php fontification of + strings and comments. + +
- + Fixed a bug where sgml-xml-mode was not defined. + +
- + Fixed a bug related to get-text-property which + gives an error when buffer is narrowed. + +
- + Tried to refontify things outside of a narrowed part. Fixed. + +
- + Too little where refontified after changes. I hope I have fixed this. + +
+ -
+ Fictive XHTML Validation Header:
+
-
+
- + View File did not work correctly when a fictive + XHTML validation header was used. Corrected. + +
- + Fictive XHTML validation headers are no longer + turned on by default in any buffers. + +
+ -
+ Indentation:
+
-
+
- + Tried to fix a problem when using + newline-and-indent. When this was in a mode + derived from C the indentation sometimes became 0. + +
- + Speeded up the indentation of regions a bit when + using mumamo-mode. + +
- + Indentation: TAB now only indents a region if it + is visibly marked (see transient-mark-mode and + cua-mode). + +
- + Simplified the indentation code. + +
+ - + Fixed a problem where string fontification got out + of phase so that wrong parts of buffer could be + fontified as a string. + +
- + Added a workaround for Attribute values + computed by PHP + +
- + Added .nosearch to subdirectories with no elisp files. + +
- + Fixed incorrect checks for mlinks-mode in menu building. + +
- + File extensions where used in a case sensitive way + in some places. Fixed. + +
- + appmenu: Worked only in html files. Fixed. + +
- + html-site: Fixed the error Error + (html-site-current): Can't find site: + your-site-name. + +
- + Fixed a problem with longlines-mode in the support + for Firefox add-on It's All Text. (Note however + that there are some bugs in longlines-mode + itself.) Rewrote the support to be more + general. It is now in the file as-external.el, see + this file. + +
- + Fixed an encoding problem in + tidy-buffer. Output from tidy was not read + using the same coding system as tidy was using. + +
- + Fixed some problems with face definitions, possibly bugs (not sure). + +
- + Made the fontification faster when using mumamo-mode. + (It is still slower than single mode fontification of course.) + +
- + nxml-where.el: Made it aware of mumamo.el. + +
+ -
+ Menu changes:
+
-
+
- + Completion menu: Renamed to Completion and + Validation menu and reorganized a little bit to + make it more clear. + +
- + Renamed view to browse since this is + the normal emacs name for showing files in a web + browser. Also made corresponding changes to + function names. Put back the possibility to view + only the region in a web browser. + +
+ -
+ Uploading:
+
-
+
- + Added remote dired to the menus. + +
- + Fixed problems with file names starting with ~. + +
- + Fixed more problems with file names with spaces. + +
+ -
+ nxml-where:
+
-
+
- + nxml-where now uses a timeout for more smooth performance. + +
- + nxml-where can now recognizes both id and name attribute. + +
- + Hyphens are now accepted in tag names. + +
+ -
+ Ruby
+
-
+
- + Multiple major mode turned on by default for .rhtml files when this mode is global. + +
- + Multiple major mode is no longer turned on when rub-mode is turned on. + +
+ - + Added support for switching major mode dependent on if + Emacs was called as an external editor. This makes it + possible for example to switch to relevant major and + minor modes when Firefox add-on It's All Text. + +
- + Added the possibility to easily view the output of scripts on the server (if they require no parameters). + You can now do that from the nXhtml menu. + Previously only html files on the server could be viewed that way. + Image files can also be viewed this way. + +
-
+ Filling:
+
-
+
- + Added functions for unfilling. + +
- + Added keybindings and menu entries for longlines-mode, fill-paragraph and unfill-paragraph. + +
+ - + Quoting: + Added HTML quoting of & and < in text areas. Bound to C-c C-q. + +
-
+ Images:
+
-
+
- + Added image-mode to those that are encompassed by + nxhtml-global-minor-mode so that images can be + uploaded more easily. + +
- + Added edit with GIMP and upload to the popup menu for links. + This avoids the need to load the linked files in Emacs first. + +
+ - + Added nxml-untag-element. + +
- + Added a modified version of wikipedia-mode.el. Seems likely to be useful if you are doing web editing. + +
- + Added html-imenu.el + +
-
+ MuMaMo:
+
-
+
- + Removed the lighter "MuMaMo" for + mumamo-mode. Instead the active major mode now has + "/m" appended to mode-name (that is what you see + in the mode line). + +
-
+ The normal way to turn on mumamo-mode has
+ changed. There are now functions that you can use
+ in auto-mode-alist to directly set up the
+ buffer for mumamo-mode. The available functions
+ are in the
+ variable mumamo-defined-turn-on-functions.
+
+ You are not supposed to call mumamo-mode + yourself any more and mumamo-global-mode is + gone. So is also mumamo-chunk-family-by-mode and + mumamo-filenames-list. The functionality those + gave are all replaced by the new functions for + turning on mumamo mode. +
+
+ - + Added support for buffer local values in + hooks. This is necessary for example to support + minor modes that are meant to be buffer local but + not major mode specific. Instructions for authors + of this kind of minor modes are in the file + mumamo.el. + +
- + Added support for Django. + +
- + Added support for Embperl. + +
- + Added support for PHP Smarty. The {literal} + ... {/literal} construct is not supported. + This mean that you can not use <style ..> or <script ..>. + +
- + Added support for imenu for the main major mode. + Turned on this by default in nxhtml-mode. + +
- + Made the temporary replacement of the + attr="<?php ... ?>" a bit better. They are + now more visible and also still mumamo chunks + during the temporary replacement. + +
- + Added support for flymake-mode. + Maybe add support for checking chunks? + +
- + Printing: Added htmlfontify.el and + hfyview.el. These makes if possible to print a + buffer fontified with mumamo-mode on in + colors (through your web browser). There is an + example of the capabilities of htmlfontify here (made + with a little function in hfyview.el). + +
+ -
+ PHP:
+
-
+
- + Did a first merge with Aaron Hawleys fixes for php-mode.el. + +
+ - + CSS: Upgraded to Stefan's latest css-mode.el. + +
- + Fictive XHTML Validation Headers: Changed the way they + are turned on. They may now be turned on when + mumamo-mode is turned on. + +
- + Some users want to use their own patched version of + nXml. Next version of Emacs will come with + nXml. Therefore, the loading routine for nXhtml now + checks if nXml is is already loaded. Thanks to Eric + Lilja for testing this. Eric also made me aware of + that if nXhtml was placed in the site-lisp directory + tree then things did not work as I expected. I think I + have corrected that by placing a .nosearch file + at the top of the nxml tree in nXhtml. + +
- + Restructured the directories. Moved some files out of + the nxhtml subdir. Some of them went into the + util subdir (those are written by me) and some + to the new subdir related (those that are + inherited from others, maybe changed by me - most + often to work with mumamo-mode). + +
- + Changed all licenses to be GNU GPL. + +
- + Additions to tidy support: It is now possible to use + the tidy support to tidy the XHTML part of php etc. + (Thanks to Hadron for this suggestion.) + +
- + Added winsize.el which allows interactive resizing of + windows. Also added winsav.el which adds the + capability to rotate window configurations and also to + save window configuration to file. + +
- + Made nXhtml work with CVS Emacs 23.0.50.1. + +
- + Added freemind.el to the parcel. After all FreeMind + supports web publishing too so why not have the Emacs + support here ... + +
+ - 1.10 +
- + Just jumped the version number for the new release of + nXhtml. There are really significant changes in this + release, not only minor bug fixes. + +
- 1.11 +
- + Minor bug fixes to completion. Added fictive validation + header to completion alternatives when buffer is empty and + mumamo is used. + +
- 1.12 +
-
+
-
+
- + Fixed a bug in image link insertion in nxhtml-mode, thanks Niels Giesen! + +
- + Restructured, reordered and documented mumamo.el. It is now two + separate files, mumamo.el and mumamo-fun.el. + +
- + Added move by chunk to the nXhtml menu. + +
+ - 1.13 +
-
+
-
+
- + Better handling of the case when no validation header + is needed and the user tries to turn it on. + +
- + Added .phtml as php file. + +
+ - 1.14 +
-
+
-
+
- + Completion of links in XHTML was broken. Fixed, thanks + to Niels Giesen. + +
+ - 1.15 +
-
+
-
+
- + Added `mumamo-map' keymap. + +
- + Added a keymap to all multi major modes. + +
- + Some more refinement to fictive validation headers. + +
+ - 1.16 +
-
+
-
+
-
+ Mumamo:
+
-
+
-
+ Changes to indentation:
+
-
+
- + Removed indent-region-mode since that + functionality is now in indent-for-tab-command in + Emacs 22. + +
- + Removed some code that checked if indentation was 0. + +
- + Added indent-for-tab-command to mumamo-map. + +
+ -
+ Reordering and renaming:
+
-
+
- + Reordered and move some functions in mumamo.el et al. + Added new file nxhtml-mumamo.el. + +
- + Renamed define-mumamo-turn-on to + define-mumamo-multi-major-mode. + +
- + Removed the ending -turn-on from the + functions defined by the macro above. + +
- + Introduced multi major mode as a name for + the functions defined by the macro above. Those + works in many respects like major mode functions, + but they support multiple major modes in a buffer. + +
+ - + Added support for noweb as multiple major mode. + +
+ -
+ Changes to indentation:
+
+ -
+ Mumamo:
+
- 1.17 +
-
+
-
+
-
+ Mumamo:
+
-
+
- + Added support for flyspell. + +
+ - + Bug fixes to the version of find-recursive.el that + ships with nXhtml. Thanks to Cezar Halmagean. + +
- + Added tabkey2.el which tries to make it easy to use + the Tab key for completion. (You must load it and turn + on tabkey2-mode to use it.) + +
-
+ Folding:
+
-
+
- + Added nxhtml-heading-element-name-regexp as + default for nxml style folding. + +
- + Some changes to fold-dwim.el. + +
+ -
+ AppMenu:
+
-
+
- + Simplified: Removed the possibility to + automatically show minor and major mode menus. + There is now only one list, appmenu-alist. + +
- + Added menu item At Current Point for + bindings found in character and overlay keymaps at + point. Those you always forget. + +
+ -
+ Physical line:
+
-
+
- + Added physical-line.el to nXhtml. + +
- + Added new functions to move to beginning and end + of line to ourcomments-util.el that supports + physical-line.el. + +
+
+ -
+ Mumamo:
+
- 1.18 +
-
+
-
+
- + Better Tab completion in tabkey2.el. + +
+ - 1.19 +
-
+
-
+
- + Even better Tab completion in tabkey2.el. + +
+ - 1.20 +
-
+
-
+
- + Once again even better Tab completion in tabkey2.el. + +
- + Fixed bug in hiding of validation errors (they could + disappear totally). + +
- + Cleaned up menus in nXhtml. + +
+ - 1.21 +
-
+
-
+
- + Added a bit support for dired (upload, browse, browse + remote). + +
- + Fixed some strange menu problems (i hope). + +
+ - 1.22 +
-
+
-
+
- + Bug fix. + +
+ - 1.23 +
-
+
-
+
- + Bug fix. + +
+ - 1.24 +
-
+
-
+
- + Tried again to make hexcolor-mode more readable. + +
-
+ Mumamo:
+
-
+
- + Added support for hi-lock-mode. At present + it might however be very puzzling. The hilight + added by hi-lock-mode may be hidden by the + overlays used by mumamo. Tip: you can always use + the face hi-black-hb. + +
+
+ - 1.25 +
-
+
-
+
-
+ Mumamo:
+
-
+
- + Handle hi-lock-mode in a more general way + using font-lock-mode-hook. + +
+
+ -
+ Mumamo:
+
- 1.26 +
-
+
-
+
-
+ nxhtml-mode:
+
-
+
- + Removed the indent line patch for nxml-mode. + +
- + Better test for empty page during completion. + +
+ -
+ tabkey2-mode:
+
-
+
- + A lot of improvements. + +
+
+ -
+ nxhtml-mode:
+
- 1.27 +
-
+
-
+
- + Fixed a bug in html-site when comparing file + names. File names where not made unique before + comparision. + +
- + Fixed documentation and reordered code in mumamo.el + and mumamo-fun.el. + +
- + Fixed a bug in mumamo concerning indentation. The + desired indentation function replacement where not + used. + +
- + Fixed tabkey2 bugs. + +
- + Changed javascript.el indentation to make it work with + mumamo.el. + +
- + Introduced the function + mumamo-make-variable-buffer-permanent as an aid for + minor mode authors. + +
- + Made nXhtml menu available in sub-chunks. + +
- + Included a slightly changed version of Steve Yegge's + js2.el + js2-fl-mode.el with support for + jit-lock-mode. This support has some flaws and maybe + js2 is not ready for use, I am not sure. However if you want + to use this instead of Karl Landströms javascript-mode + then please customize mumamo-major-modes. + +
+
+ + + diff --git a/emacs.d/nxhtml/tests/in/ind-0-error.php b/emacs.d/nxhtml/tests/in/ind-0-error.php new file mode 100644 index 0000000..6bbdb24 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/ind-0-error.php @@ -0,0 +1,28 @@ + + + + +
+
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/java.java b/emacs.d/nxhtml/tests/in/java.java
new file mode 100644
index 0000000..8ba2940
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/java.java
@@ -0,0 +1,13 @@
+public class FirstProgram
+
+{
+
+ public static void main(String[] args)
+
+ {
+
+ System.out.println("Hey! you are going to compile and run your first Java program");
+
+ }
+
+}
diff --git a/emacs.d/nxhtml/tests/in/jcl-080802-index.html.erb b/emacs.d/nxhtml/tests/in/jcl-080802-index.html.erb
new file mode 100644
index 0000000..8478b3d
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/jcl-080802-index.html.erb
@@ -0,0 +1,16 @@
+Mensajes recibidos
++ Solo se muestran los ultimos 10 mensajes, aquà hay que añadir + paginación y ¿lógica?. +
+ diff --git a/emacs.d/nxhtml/tests/in/jcl-080802-messages_controller.rb b/emacs.d/nxhtml/tests/in/jcl-080802-messages_controller.rb new file mode 100644 index 0000000..6fb0555 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/jcl-080802-messages_controller.rb @@ -0,0 +1,57 @@ +class MessagesController < BaseController + + before_filter :enable_chat + skip_before_filter :verify_authenticity_token + + # GET /messages + # GET /messages.xml + def index + @messages = ChatMessage.to_user(current_user).last_week.all + + respond_to do |format| + format.html # index.html.erb + format.xml { render :xml => @messages } + end + end + + # GET /messages/1 + # GET /messages/1.xml + def show + @message = ChatMessage.find(params[:id]) + + respond_to do |format| + format.html # show.html.erb + format.xml { render :xml => @message } + end + end + + # POST /messages + # POST /messages.xml + def create + @message = ChatMessage.new(:receiver_id => params[:receiver_id], + :message => params[:messageText], + :sender => current_user) + + if @message.save + send_message + end + + render :nothing => true + + end + + protected + + def send_message + formatted_message = render_to_string(:partial => "message_for_chat", :object => @message) + shooter_action_for_receiver = render_to_string :update do |page| + page.call "showMessage", @message.sender.to_param, formatted_message + end + shooter_action_for_sender = render_to_string :update do |page| + page.call "showMessage", @message.receiver.to_param, formatted_message + page.call "messageTextBox.reset" + end + Meteor.shoot 'futura-chat', shooter_action_for_sender, [@message.sender.login] + Meteor.shoot 'futura-chat', shooter_action_for_receiver, [@message.receiver.login] + end +end diff --git a/emacs.d/nxhtml/tests/in/jj-081226.html b/emacs.d/nxhtml/tests/in/jj-081226.html new file mode 100644 index 0000000..9599014 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/jj-081226.html @@ -0,0 +1,26 @@ + ++ + Click me! +
+ diff --git a/emacs.d/nxhtml/tests/in/josh-091115-cancer_summary.xsl b/emacs.d/nxhtml/tests/in/josh-091115-cancer_summary.xsl new file mode 100644 index 0000000..043e9d2 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/josh-091115-cancer_summary.xsl @@ -0,0 +1,490 @@ +
+
+
+
+
+
+
+
+
+
+
+
+ 
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Clinical Data+
|
+
+ Sequencing Stats+
|
+
+
Circos Graph [toggle zoom]
+
+
+
Tier 1 SNPs + + +
+| validation status | +chromosome | +start | +reference | +variant | +gene | +amino acid change | +trv type | +
|---|---|---|---|---|---|---|---|
|
+ |
+ |||||||
| None found. |
Tier 1 Insertions
+| validation status | +chromosome | +start | +stop | +variant | +gene | +amino acid change | +trv type | +
|---|---|---|---|---|---|---|---|
|
+ |
+
+ |
+ ||||||
| None found. |
Tier 1 Deletions
+| validation status | +chromosome | +start | +stop | +reference | +gene | +amino acid change | +trv type | +
|---|---|---|---|---|---|---|---|
|
+ |
+
+ |
+ ||||||
| None found. |
Structural Variations (translocations)
+| validation status | +chromosome | +position | ++ | chromosome | +position | +
|---|---|---|---|---|---|
|
+ |
+
+ → | + +
+ |
+ |||
| None found. |
Structural Variations (insertions)
+| validation status | +chromosome | +start | +stop | +size | +
|---|---|---|---|---|
|
+ |
+
+ |
+ |||
| None found. |
Structural Variations (deletions)
+| validation status | +chromosome | +start | +stop | +size | +
|---|---|---|---|---|
|
+ |
+
+ |
+
+ |
+ ||
| None found. |
Listing People
+ +Listing People
+ +
+
+
+
+
+{% endblock %}
+
+
diff --git a/emacs.d/nxhtml/tests/in/kubica-080516-freezing-2j.html b/emacs.d/nxhtml/tests/in/kubica-080516-freezing-2j.html
new file mode 100644
index 0000000..6017ba3
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/kubica-080516-freezing-2j.html
@@ -0,0 +1,174 @@
+{% load transdigest helpers %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+| + | ||
 |
+  |
+  |
+
| + | ||
+
+
+
+
+{% endblock %}
+
+
diff --git a/emacs.d/nxhtml/tests/in/kubica-080516-freezing-3.html b/emacs.d/nxhtml/tests/in/kubica-080516-freezing-3.html
new file mode 100644
index 0000000..2026eb5
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/kubica-080516-freezing-3.html
@@ -0,0 +1,61 @@
+{% load transdigest helpers %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+| + | ||
|
+ |
+ |
+
| + | ||
+
+
+
+
+{% endblock %}
+
+
diff --git a/emacs.d/nxhtml/tests/in/kubica-080516-freezing.txt b/emacs.d/nxhtml/tests/in/kubica-080516-freezing.txt
new file mode 100644
index 0000000..dc3a6cf
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/kubica-080516-freezing.txt
@@ -0,0 +1,10 @@
+The problem seems to have to do with the { block pagestyle } thing
+below. If that is removed then the freezing does not happen.
+
+
+
+
+
+
+
+
+
+
+
+
+| + | ||
|
+ |
+ |
+
| + | ||
Below is a html chunk
+ I have not idea of how to use this yet. +
+-- This is more about "Test of org and mumamo" --
Hm, header lines are broken, why?
-- This is more about "Some subnode" --
+ Aktuellt våren 2008
+ Välkommen till dansens magiska universum!
+ Här i kalendariet kan du se vad som händer i kimprosammanhang + just nu. De arrangemang med rosa botten är utöver våra + vanliga söndags-träffar i Malmö. Vill du veta mer om de olika + verksamheterna, ta en titt under Verksamhet. + OBS! Notera att vi bytt danstid till kl 19-21! Detta + gäller endast en period nu i vår.
+
Mars +
+
+
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/nxml-indent-3.html b/emacs.d/nxhtml/tests/in/nxml-indent-3.html
new file mode 100644
index 0000000..e7c686f
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/nxml-indent-3.html
@@ -0,0 +1,134 @@
+
+
+
+
+ + Välkommen till dansens magiska universum!
+ Här i kalendariet kan du se vad som händer i kimprosammanhang + just nu. De arrangemang med rosa botten är utöver våra + vanliga söndags-träffar i Malmö. Vill du veta mer om de olika + verksamheterna, ta en titt under Verksamhet. + OBS! Notera att vi bytt danstid till kl 19-21! Detta + gäller endast en period nu i vår.
+
Mars +
|
+ Söndag 2 Mars + Nybörjarintroduktion & + Jam med Karin R och Jenny + Kl. 19-21, 30 kr. + |
+
|
+ Söndagen 9 Mars + Blind fold jam - jam med + ögonbindel! + ... med Sofi och Tove. Kl 19-21, 30 kr + På ett blind fold jam dansar man med ögonen förbundna, + för att öka känsligheten, lyssnandet och samspelet. Det + är också ett sätt att försöka komma förbi + föreställningar man (medvetet eller omedvetet) har runt + vem man väljer att dansa med. Det blir i slutändan en + spegling till en själv om de val man gör på dansgolvet, + där kroppen denna gång får bestämma i stället för + huvudet. Vi inleder som vanligt med en introduktion. + Tag gärna med egen ögonbindel! + |
+
|
+ Söndagen 16 Mars + Introduktion och + jam + 19-21, 30 kr + |
+
|
+ Söndagen 23 Mars + Ingenting här för då är vi + på NIM i Köpenhamn! + + + |
+
|
+ Söndagen den 30:e + Kort introduktion och + Livejam!! + 19-21, 50 kr + |
+
+ Aktuellt våren 2008
+ Välkommen till dansens magiska universum!
+ Här i kalendariet kan du se vad som händer i kimprosammanhang + just nu. De arrangemang med rosa botten är utöver våra + vanliga söndags-träffar i Malmö. Vill du veta mer om de olika + verksamheterna, ta en titt under Verksamhet. + OBS! Notera att vi bytt danstid till kl 19-21! Detta + gäller endast en period nu i vår.
+
Mars +
+
+
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/nxml-indent-noerr1.html b/emacs.d/nxhtml/tests/in/nxml-indent-noerr1.html
new file mode 100644
index 0000000..db82964
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/nxml-indent-noerr1.html
@@ -0,0 +1,192 @@
+
+
+
+
+ + Välkommen till dansens magiska universum!
+ Här i kalendariet kan du se vad som händer i kimprosammanhang + just nu. De arrangemang med rosa botten är utöver våra + vanliga söndags-träffar i Malmö. Vill du veta mer om de olika + verksamheterna, ta en titt under Verksamhet. + OBS! Notera att vi bytt danstid till kl 19-21! Detta + gäller endast en period nu i vår.
+
Mars +
|
+ Söndag 2 Mars + Nybörjarintroduktion & + Jam med Karin R och Jenny + Kl. 19-21, 30 kr. + |
+
|
+ Söndagen 9 Mars + Blind fold jam - jam med + ögonbindel! + ... med Sofi och Tove. Kl 19-21, 30 kr + På ett blind fold jam dansar man med ögonen förbundna, + för att öka känsligheten, lyssnandet och samspelet. Det + är också ett sätt att försöka komma förbi + föreställningar man (medvetet eller omedvetet) har runt + vem man väljer att dansa med. Det blir i slutändan en + spegling till en själv om de val man gör på dansgolvet, + där kroppen denna gång får bestämma i stället för + huvudet. Vi inleder som vanligt med en introduktion. + Tag gärna med egen ögonbindel! + |
+
|
+ Söndagen 16 Mars + Introduktion och + jam + 19-21, 30 kr + |
+
|
+ Söndagen 23 Mars + Ingenting här för då är vi + på NIM i Köpenhamn! + + + |
+
|
+ Söndagen den 30:e + Kort introduktion och + Livejam!! + 19-21, 50 kr + |
+
+ Aktuellt våren 2008
+ Välkommen till dansens magiska universum!
+ Här i kalendariet kan du se vad som händer i kimprosammanhang + just nu. De arrangemang med rosa botten är utöver våra + vanliga söndags-träffar i Malmö. Vill du veta mer om de olika + verksamheterna, ta en titt under Verksamhet. + OBS! Notera att vi bytt danstid till kl 19-21! Detta + gäller endast en period nu i vår.
+
Mars +
+
+
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/nxml-indent.el b/emacs.d/nxhtml/tests/in/nxml-indent.el
new file mode 100644
index 0000000..fc17d1b
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/nxml-indent.el
@@ -0,0 +1 @@
+(nxml-scan-element-backward 6407 nil 2407)
diff --git a/emacs.d/nxhtml/tests/in/nxml-indent.html b/emacs.d/nxhtml/tests/in/nxml-indent.html
new file mode 100644
index 0000000..db82964
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/nxml-indent.html
@@ -0,0 +1,192 @@
+
+
+
+
+ + Välkommen till dansens magiska universum!
+ Här i kalendariet kan du se vad som händer i kimprosammanhang + just nu. De arrangemang med rosa botten är utöver våra + vanliga söndags-träffar i Malmö. Vill du veta mer om de olika + verksamheterna, ta en titt under Verksamhet. + OBS! Notera att vi bytt danstid till kl 19-21! Detta + gäller endast en period nu i vår.
+
Mars +
|
+ Söndag 2 Mars + Nybörjarintroduktion & + Jam med Karin R och Jenny + Kl. 19-21, 30 kr. + |
+
|
+ Söndagen 9 Mars + Blind fold jam - jam med + ögonbindel! + ... med Sofi och Tove. Kl 19-21, 30 kr + På ett blind fold jam dansar man med ögonen förbundna, + för att öka känsligheten, lyssnandet och samspelet. Det + är också ett sätt att försöka komma förbi + föreställningar man (medvetet eller omedvetet) har runt + vem man väljer att dansa med. Det blir i slutändan en + spegling till en själv om de val man gör på dansgolvet, + där kroppen denna gång får bestämma i stället för + huvudet. Vi inleder som vanligt med en introduktion. + Tag gärna med egen ögonbindel! + |
+
|
+ Söndagen 16 Mars + Introduktion och + jam + 19-21, 30 kr + |
+
|
+ Söndagen 23 Mars + Ingenting här för då är vi + på NIM i Köpenhamn! + + + |
+
|
+ Söndagen den 30:e + Kort introduktion och + Livejam!! + 19-21, 50 kr + |
+
+ Aktuellt våren 2008
+ Välkommen till dansens magiska universum!
+ Här i kalendariet kan du se vad som händer i kimprosammanhang + just nu. De arrangemang med rosa botten är utöver våra + vanliga söndags-träffar i Malmö. Vill du veta mer om de olika + verksamheterna, ta en titt under Verksamhet. + OBS! Notera att vi bytt danstid till kl 19-21! Detta + gäller endast en period nu i vår.
+
Mars +
+
+
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/only-html.html b/emacs.d/nxhtml/tests/in/only-html.html
new file mode 100644
index 0000000..7b297dd
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/only-html.html
@@ -0,0 +1,11 @@
+
+
+
+
+ + Välkommen till dansens magiska universum!
+ Här i kalendariet kan du se vad som händer i kimprosammanhang + just nu. De arrangemang med rosa botten är utöver våra + vanliga söndags-träffar i Malmö. Vill du veta mer om de olika + verksamheterna, ta en titt under Verksamhet. + OBS! Notera att vi bytt danstid till kl 19-21! Detta + gäller endast en period nu i vår.
+
Mars +
|
+ Söndag 2 Mars + Nybörjarintroduktion & + Jam med Karin R och Jenny + Kl. 19-21, 30 kr. + |
+
|
+ Söndagen 9 Mars + Blind fold jam - jam med + ögonbindel! + ... med Sofi och Tove. Kl 19-21, 30 kr + På ett blind fold jam dansar man med ögonen förbundna, + för att öka känsligheten, lyssnandet och samspelet. Det + är också ett sätt att försöka komma förbi + föreställningar man (medvetet eller omedvetet) har runt + vem man väljer att dansa med. Det blir i slutändan en + spegling till en själv om de val man gör på dansgolvet, + där kroppen denna gång får bestämma i stället för + huvudet. Vi inleder som vanligt med en introduktion. + Tag gärna med egen ögonbindel! + |
+
|
+ Söndagen 16 Mars + Introduktion och + jam + 19-21, 30 kr + |
+
|
+ Söndagen 23 Mars + Ingenting här för då är vi + på NIM i Köpenhamn! + + + |
+
|
+ Söndagen den 30:e + Kort introduktion och + Livejam!! + 19-21, 50 kr + |
+
| +{{ muzikant.name }} + +{% comment %} +something else +{% if muzikant.nemamezeru %}*{% endif %} {% endcomment %} + + | ++ +{{ muzikant.genre|rjust|lower }} + + | +
The current time is {{ my_current_time }}.
+ + diff --git a/emacs.d/nxhtml/tests/in/php-parseable.php b/emacs.d/nxhtml/tests/in/php-parseable.php new file mode 100644 index 0000000..590e4f6 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/php-parseable.php @@ -0,0 +1,11 @@ + + + + +
+
|
+
| + + | +
+ + |
+ + + | +||||
| Pir | +Ant | +Tre | +Ket | +Pen | +Šeš | +Sek | +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/rgr-080307.php b/emacs.d/nxhtml/tests/in/rgr-080307.php
new file mode 100644
index 0000000..0cc4616
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/rgr-080307.php
@@ -0,0 +1,2 @@
+
+
+
+
+
+
+
+
+ + +
+
+ 
+
+
+
+
+
+
+
+
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/rgr-080308-header-2.php b/emacs.d/nxhtml/tests/in/rgr-080308-header-2.php
new file mode 100644
index 0000000..e53ee01
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/rgr-080308-header-2.php
@@ -0,0 +1,56 @@
+
+
+'; ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
";
+ }
+
+ include("address.php");
+ include("sportpreview.php");
+
+ ?>
+
+
+ 
+
+
+
+
+ 
+
+
+
+
+
+
+
+ ';
+ echoMessage("admin.demo");
+ echo "
diff --git a/emacs.d/nxhtml/tests/in/rgr-080308-header.php b/emacs.d/nxhtml/tests/in/rgr-080308-header.php
new file mode 100644
index 0000000..e53ee01
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/rgr-080308-header.php
@@ -0,0 +1,56 @@
+
+
+'; ?>
+
+
+
+
+
+
+
+
+
+
+ <?php echoMessage("website.title")?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
";
+ }
+
+ include("address.php");
+ include("sportpreview.php");
+
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ';
+ echoMessage("admin.demo");
+ echo "
diff --git a/emacs.d/nxhtml/tests/in/rgr-080308-indexbody.php b/emacs.d/nxhtml/tests/in/rgr-080308-indexbody.php
new file mode 100644
index 0000000..0384b4d
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/rgr-080308-indexbody.php
@@ -0,0 +1,57 @@
+
+
+
+<?php echoMessage("website.title")?>
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/rr-090524-header.php b/emacs.d/nxhtml/tests/in/rr-090524-header.php
new file mode 100644
index 0000000..e966036
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/rr-090524-header.php
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
| + + | +
+
+
+
+
+
+ ';
+ createNavigationLinks("navlinks",1);
+ echo '';
+ echo '
';
+ }
+
+ if(isDemo()){
+ echo '';
+ echoMessage("admin.demo");
+ echo "
";
+ }
+
+ ?>
+
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/rr-090923-header.php b/emacs.d/nxhtml/tests/in/rr-090923-header.php
new file mode 100644
index 0000000..7f739eb
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/rr-090923-header.php
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+
+
+
+
+ <?php echo getMessage("website.title");?>
+
+
+
+ 0 && !adminMode())
+ echo '';
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
test + +
+
diff --git a/emacs.d/nxhtml/tests/in/sd-080803-test.php b/emacs.d/nxhtml/tests/in/sd-080803-test.php
new file mode 100644
index 0000000..e44ccc6
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/sd-080803-test.php
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/senny-091118.htm b/emacs.d/nxhtml/tests/in/senny-091118.htm
new file mode 100644
index 0000000..dda2fe3
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/senny-091118.htm
@@ -0,0 +1,247 @@
+
+
+
+PostFinance - Home
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+News and Notes about nXhtml
+
+
+ News and Notes about nXhtml
+
+
+
+
+
+
+ ';
+ echoMessage("admin.demo");
+ echo "
";
+ }
+ if(adminMode()){
+ echo '';
+ createNavigationLinks("navlinks",1);
+ echo '';
+ echo '
';
+ }
+ ?>
+
+
+ ';
+ echoMessage("website.title");
+ echo '
';
+ }
+ ?>
+
diff --git a/emacs.d/nxhtml/tests/in/rr-address-090304.php b/emacs.d/nxhtml/tests/in/rr-address-090304.php
new file mode 100644
index 0000000..34cbe25
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/rr-address-090304.php
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/emacs.d/nxhtml/tests/in/rr-address-nxhtml.err b/emacs.d/nxhtml/tests/in/rr-address-nxhtml.err
new file mode 100644
index 0000000..f06b0a0
Binary files /dev/null and b/emacs.d/nxhtml/tests/in/rr-address-nxhtml.err differ
diff --git a/emacs.d/nxhtml/tests/in/rr-min8.php b/emacs.d/nxhtml/tests/in/rr-min8.php
new file mode 100644
index 0000000..bf464f1
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/rr-min8.php
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/ryan-091104-literal.tpl b/emacs.d/nxhtml/tests/in/ryan-091104-literal.tpl
new file mode 100644
index 0000000..64c9d26
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/ryan-091104-literal.tpl
@@ -0,0 +1,148 @@
+{include file="library/header.tpl"}
+
+{* comment *}
+
+{literal}
+
+
+
+{/literal}
+
+{if $containers|@count }
+
+
+{else}
+ {t}There are no widgets on this day{/t}
+{/if}
+
+{literal}
+
+test + +
Paragraph
+{/literal} + +{include file="library/footer.tpl"} diff --git a/emacs.d/nxhtml/tests/in/ryan-091111-wrong-side.tpl b/emacs.d/nxhtml/tests/in/ryan-091111-wrong-side.tpl new file mode 100644 index 0000000..51164a8 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/ryan-091111-wrong-side.tpl @@ -0,0 +1,18 @@ + diff --git a/emacs.d/nxhtml/tests/in/schemas.xml b/emacs.d/nxhtml/tests/in/schemas.xml new file mode 100644 index 0000000..09b0bac --- /dev/null +++ b/emacs.d/nxhtml/tests/in/schemas.xml @@ -0,0 +1,3 @@ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/emacs.d/nxhtml/tests/in/sheit-2007-12-26.php b/emacs.d/nxhtml/tests/in/sheit-2007-12-26.php
new file mode 100644
index 0000000..8aa97cc
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/sheit-2007-12-26.php
@@ -0,0 +1,9 @@
+name = $name;
+ }
+?>
diff --git a/emacs.d/nxhtml/tests/in/short-tags.php b/emacs.d/nxhtml/tests/in/short-tags.php
new file mode 100644
index 0000000..a297e03
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/short-tags.php
@@ -0,0 +1,3 @@
+,
+ instead of
+,
diff --git a/emacs.d/nxhtml/tests/in/single-question-sign.html b/emacs.d/nxhtml/tests/in/single-question-sign.html
new file mode 100644
index 0000000..bb7d6fc
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/single-question-sign.html
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+ Navigation of PostFinance.ch
+-
+
- + Navigation + +
- + Content + +
- + E-Finance + +
- + Sitemap + +
Surpassing support
+ + + + +Language, tools and important links
+ + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+ E-finance login
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Business customers
+
+
+ Everything you need
for your business finances.
+
+
+
+
+
+ Related content
+E-Services
Hello, my name is <% response.name %>.
diff --git a/emacs.d/nxhtml/tests/in/string-bug.php b/emacs.d/nxhtml/tests/in/string-bug.php new file mode 100644 index 0000000..3b25c9f --- /dev/null +++ b/emacs.d/nxhtml/tests/in/string-bug.php @@ -0,0 +1 @@ + diff --git a/emacs.d/nxhtml/tests/in/style=.html b/emacs.d/nxhtml/tests/in/style=.html new file mode 100644 index 0000000..e005fad --- /dev/null +++ b/emacs.d/nxhtml/tests/in/style=.html @@ -0,0 +1,12 @@ + + + + ++
+ + diff --git a/emacs.d/nxhtml/tests/in/style=string-font.html b/emacs.d/nxhtml/tests/in/style=string-font.html new file mode 100644 index 0000000..e5dd87d --- /dev/null +++ b/emacs.d/nxhtml/tests/in/style=string-font.html @@ -0,0 +1,18 @@ + + + + +Thanks for testing!
+ +The State of the Art
+ + + diff --git a/emacs.d/nxhtml/tests/in/svg.svg b/emacs.d/nxhtml/tests/in/svg.svg new file mode 100644 index 0000000..1b24f33 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/svg.svg @@ -0,0 +1 @@ +something diff --git a/emacs.d/nxhtml/tests/in/temp2.php b/emacs.d/nxhtml/tests/in/temp2.php new file mode 100644 index 0000000..34271ba --- /dev/null +++ b/emacs.d/nxhtml/tests/in/temp2.php @@ -0,0 +1,48 @@ +'; +?> + + + + diff --git a/emacs.d/nxhtml/tests/in/temp3.html b/emacs.d/nxhtml/tests/in/temp3.html new file mode 100644 index 0000000..276b754 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/temp3.html @@ -0,0 +1,44 @@ + + + + +
+
+
+ setQuery( "SELECT * FROM #__hp_prop_types AS t" + . "\nWHERE t.published='1'" + . "\nORDER BY t.ordering ASC"); + $types = $database->loadObjectList(); + + foreach($types AS $t) { ?> + name ?> ( id) ?>) + setQuery( "SELECT id FROM #__hp_properties AS p" + . "\nWHERE p.type=".$type_id); + return $database->getNumRows(); + } +} + + +?> diff --git a/emacs.d/nxhtml/tests/in/zero-pi.html b/emacs.d/nxhtml/tests/in/zero-pi.html new file mode 100644 index 0000000..6bb247c --- /dev/null +++ b/emacs.d/nxhtml/tests/in/zero-pi.html @@ -0,0 +1,11 @@ + + + + +
+
+
+
";
+ }
+ else
+ {
+ echo "News and Notes about nXhtml
+ +-
+
+
- Thanks for testing! +
-
diff --git a/emacs.d/nxhtml/tests/in/test-only-nxml.my-xhtml b/emacs.d/nxhtml/tests/in/test-only-nxml.my-xhtml
new file mode 100644
index 0000000..2f9398c
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/test-only-nxml.my-xhtml
@@ -0,0 +1,38 @@
+
+
diff --git a/emacs.d/nxhtml/tests/in/test.tt b/emacs.d/nxhtml/tests/in/test.tt
new file mode 100644
index 0000000..01ff84a
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/test.tt
@@ -0,0 +1,11 @@
+[% IF blah %]
+
+[%# test GET ]
+ # comment
+[% test %] and [% test %]
+
+[% test % test %]
+
+[%+ test -%]
+
+[% BLOCK %]
diff --git a/emacs.d/nxhtml/tests/in/tut1.jsp b/emacs.d/nxhtml/tests/in/tut1.jsp
new file mode 100644
index 0000000..e921950
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/tut1.jsp
@@ -0,0 +1,5 @@
+
+
+ Hello! The time is now <%= new java.util.Date() %>
+
+
diff --git a/emacs.d/nxhtml/tests/in/utf8-problem.el b/emacs.d/nxhtml/tests/in/utf8-problem.el
new file mode 100644
index 0000000..c5e8b32
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/utf8-problem.el
@@ -0,0 +1,7 @@
+
+(defvar utf8-problem
+ "\\(?:^\\|[[:space:]]\\)\\(?:href\\|src\\)[[:space:]]*=[[:space:]]*\"\\([^<«\"]*\\)\"")
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
diff --git a/emacs.d/nxhtml/tests/in/wiki-080606-indent.php b/emacs.d/nxhtml/tests/in/wiki-080606-indent.php
new file mode 100644
index 0000000..0776f03
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/wiki-080606-indent.php
@@ -0,0 +1,18 @@
+var1 = 5;
+ }
+}
\ No newline at end of file
diff --git a/emacs.d/nxhtml/tests/in/wiki-080708-ind-problem.rhtml b/emacs.d/nxhtml/tests/in/wiki-080708-ind-problem.rhtml
new file mode 100644
index 0000000..d51d116
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/wiki-080708-ind-problem.rhtml
@@ -0,0 +1,5 @@
+<%= t("Hola") %>
+ <%= ink_to name, target %>
+ <% if quiero do %>
+ <%= do_something_nifty(with_me) %>
+ <% end %>
diff --git a/emacs.d/nxhtml/tests/in/wiki-090804-js.html b/emacs.d/nxhtml/tests/in/wiki-090804-js.html
new file mode 100644
index 0000000..2762ed9
--- /dev/null
+++ b/emacs.d/nxhtml/tests/in/wiki-090804-js.html
@@ -0,0 +1,32 @@
+
+
+
+
+
+ + + + + +some stuff + some other stuff
+ + + +EOTHTML; + +?> + + diff --git a/emacs.d/nxhtml/tests/in/wiki-2008-01-30.rhtml b/emacs.d/nxhtml/tests/in/wiki-2008-01-30.rhtml new file mode 100644 index 0000000..5eefdc7 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/wiki-2008-01-30.rhtml @@ -0,0 +1 @@ +diff --git a/emacs.d/nxhtml/tests/in/wiki-comments.php b/emacs.d/nxhtml/tests/in/wiki-comments.php new file mode 100644 index 0000000..0581443 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/wiki-comments.php @@ -0,0 +1,20 @@ + diff --git a/emacs.d/nxhtml/tests/in/wiki-strange-hili-080629.html b/emacs.d/nxhtml/tests/in/wiki-strange-hili-080629.html new file mode 100644 index 0000000..9f8c202 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/wiki-strange-hili-080629.html @@ -0,0 +1,5 @@ + + +red + + diff --git a/emacs.d/nxhtml/tests/in/xml-as-string.php b/emacs.d/nxhtml/tests/in/xml-as-string.php new file mode 100644 index 0000000..e779a5c --- /dev/null +++ b/emacs.d/nxhtml/tests/in/xml-as-string.php @@ -0,0 +1,54 @@ +'; ?> + + + ++ + "._HPAVL_DESDE."Lab 2 - Layout Control - Task 2 - XHTML/CSS version + + + + diff --git a/emacs.d/nxhtml/tests/in/ygne-2008-02-07-hotproperty.html.php b/emacs.d/nxhtml/tests/in/ygne-2008-02-07-hotproperty.html.php new file mode 100644 index 0000000..1802272 --- /dev/null +++ b/emacs.d/nxhtml/tests/in/ygne-2008-02-07-hotproperty.html.php @@ -0,0 +1,1967 @@ + + **/ + +defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' ); + +class hotproperty_HTML { + + /*** + * Include CSS file + ***/ + function include_CSS() { + global $hp_css; + ?> + + ++ + ++ + + setPageTitle( _HP_COM_TITLE );?> + + + ++ + ++ +++++ +
+ + 0 ){ + hotproperty_HTML::show_fp_Featured($featured, $featured_fields_caption, $featured_total); + echo '
'; + } + + if ($hp_fp_show_search) { + hotproperty_HTML::show_Search($types); + echo '
'; + } + + hotproperty_HTML::show_Types($types, $types_hotproperty, $types_total);*/ + } + + /*** + * Featured Listing + ***/ + function show_fp_Featured(&$prop, &$caption, $featured_total) { + global $hp_fp_featured_count, $Itemid; + ?> ++ ++ ++ ++
+ $hp_fp_featured_count) { + echo ""._HP_MOREFEATURED.""; + } ?> ++ ++ ++ id]->total > 0) { + ?> +++ id&Itemid=$Itemid"); ?>">name ."(".$types_total[$t->id]->total.")"; ?>+ +
++ desc; ?> ++-
+ id] AS $t_hp) {
+ if ($t_hp->name <> "" && $t_hp->id <> "") {
+ ?>
+
- id&Itemid=$Itemid"); ?>">name; ?> + +
+ ++ setPageTitle( _HP_SEARCH_ADV_TITLE ); + ?> + + ++ ++++ + setPageTitle( _HP_SEARCH_ADV_TITLE ); + ?> + + setPageTitle( _HP_SEARCH_ADV_TITLE ); + ?> ++ + +++ ++
+++ + setPageTitle( _HP_SEARCH_RESULT_TITLE ); + + # Using Built in SEF feature in Mambo + /* + if ( !isset($custom404) && $mosConfig_sef ) { + + $onclickCmd = "document.location.href= '$mosConfig_live_site/component/option,com_hotproperty/task,search/Itemid,$Itemid/type,' + document.searchfrm.type.options[document.searchfrm.type.selectedIndex].value + '/search,' + encodeURI(document.searchfrm.hp_search.value) + '/'"; + + } elseif ( $mosConfig_sef && isset($custom404) && !empty($sufix) ) { + + global $custom_comp, $hp_default_limit_search; + $hotproperty = "hotproperty"; + if (in_array("hotproperty", $custom_comp)) { + $hotproperty = array_search($component_name, $custom_comp); + } + + $onclickCmd = "document.location.href='" . $hotproperty . "/" . _HP_SEF_SEARCH . "/' + document.searchfrm.type.options[document.searchfrm.type.selectedIndex].value + '/".$hp_default_limit_search."/0/" . "' + encodeURI(document.searchfrm.hp_search.value)"; + + } else { + + # Using SEF advance or no SEF at all + $onclickCmd = "document.location.href='" . sefRelToAbs("index.php?option=com_hotproperty&task=search&Itemid=$Itemid&type=' + document.searchfrm.type.options[document.searchfrm.type.selectedIndex].value + '&search=' + encodeURI(document.searchfrm.hp_search.value)"); + } + */ + ?> +writePagesCounter(); ?>+
+ writePagesLinks('index.php?option=com_hotproperty&task=asearch&Itemid='.$Itemid.'&search_id='.$search_id); ?> ++ ++ ++ ++
+++ + setPageTitle( $type->name ); + ?> +writePagesCounter(); ?>+
+ writePagesLinks('index.php?option=com_hotproperty&task=search&Itemid='.$Itemid.'&type='.$searchString->type.'&search='.$searchString->search); ?> ++ ++ setPageTitle( _HP_FEATURED ); + ?> +">name; ?>+ + ++ ++ ++ + writeLimitBox('index.php?option=com_hotproperty&task=viewtype&id='.$prop[0]->typeid.'&sort='.$sortby_sort.'&order='.$sortby_order.'&Itemid='.$Itemid); ?> ++ ++ + | + + + | + + + caption)) { ?> + caption; ?> | + + + caption)) { ?> + caption; ?> | + + + caption)) { ?> + caption; ?> | + + + caption)) { ?> + caption; ?> | + + + caption)) { ?> + caption; ?> | + + + caption)) { ?> + caption; ?> | + + + caption)) { ?> + caption; ?> | + + + caption)) { ?> + caption; ?> | + + ++ ++ ++ + + +++ +writePagesCounter(); ?>+ writePagesLinks('index.php?option=com_hotproperty&task=viewtype&id='.$prop[0]->typeid.'&sort='.$sortby_sort.'&order='.$sortby_order.'&Itemid='.$Itemid); ?> ++ ++ setPageTitle( $company[0]->name ); + ?> + + ++ ++
+++writePagesCounter(); ?>+
+ writePagesLinks('index.php?option=com_hotproperty&task=viewfeatured'); ?> ++ ++
+ +› name; ?>++ ++ +
+++ + setPageTitle( $agent->name ); + ?> + + + +writePagesCounter(); ?>+
+ writePagesLinks('index.php?option=com_hotproperty&task=viewco&id='.$company[0]->id); ?> ++ ++
+ +› name; ?>+ + +
+ + + + + +
+ setPageTitle( _HP_CO_CONTACT .' - '.$company[0]->name ); + + ?> + ++ ++
+ ++ id) ?> ++ + setPageTitle( _HP_VIEW_AGENT_CONTACT .' - '.$agent[0]->name ); + ?> + + +++ id) ?> ++ + appendMetaTag( 'description', $prop[0]->metadesc ); + $mainframe->appendMetaTag( 'keywords', $prop[0]->metakey ); + $mainframe->setPageTitle( $prop[0]->name ); + if ($pop == '') $pop = 0; + ?> + + + ++ ++ ++ ++ +
+
+ + + + + + + + + +'; + + + // Name (Titulo) + echo ''.$p->name.'.'; + + // Referencia propia + echo ''; + echo ' › '._OFER_REF.": "; + if ($p->id <> "") echo $p->id.".'; + + + // Type (Tipo de oferta) + echo '
"; else echo _OFER_NO_DEF; + echo ''; + if (!$caption['type']->hideCaption) + echo ' › '.$caption['type']->caption.": "; + echo $p->type.".'; + + // Tipo_Alojamiento + echo '
"; + echo ''; + if (!$caption['Tipo_Alojamiento']->hideCaption) + echo ' › '.$caption['Tipo_Alojamiento']->caption.": "; + if ($p->Tipo_Alojamiento<>"") echo $p->Tipo_Alojamiento.".'; + + // Address y postcode (Dirección y CP) + echo '
"; else echo _OFER_NO_DEF; + echo ''; + if (!$caption['address']->hideCaption) + echo ' › '.$caption['address']->caption.": "; + if ($p->address<>"") echo $p->address." ".$p->postcode."'; + + + // Barrio + if ( $p->Barrio <> "") + { + echo '
"; else echo _OFER_NO_DEF; + echo ''; + if (!$caption['Barrio']->hideCaption) + echo ' › '.$caption['Barrio']->caption.": "; + echo $p->Barrio; + echo ''; + } + + // Suburb y State (Población y Provincia) + echo ''; + if (!$caption['suburb']->hideCaption) + echo ' › '.$caption['suburb']->caption.": "; + if ($p->suburb<>"") echo $p->suburb." (".$p->state.")"."'; + + // Precio + if ($p->typeid == 2) // Venta + { + echo '
"; else echo _OFER_NO_DEF; + echo ''; + if (!$caption['price']->hideCaption) + echo ' › '.$caption['price']->caption.": "; + if ($p->price<>"") echo number_format($p->price,2,',','.')." ".$caption['price']->append_text."'; + } + + + // Num_plazas + if ($p->typeid == 1) // Alquiler + { + echo '
"; else echo _OFER_NO_DEF; + echo ''; + if (!$caption['Num_plazas']->hideCaption) + echo ' › '.$caption['Num_plazas']->caption.": "; + if ($p->Num_plazas<>"") echo $p->Num_plazas.".'; + } + + // Numero_dormitorios + echo '
"; else echo _OFER_NO_DEF; + echo ''; + if ($p->typeid == 1) // Alquiler + { + if (!$caption['Numero_dormitorios']->hideCaption) + { + echo ' › '.$caption['Numero_dormitorios']->caption.": "; + } + } + else + echo ' › Nº habitaciones: '; + + if ($p->Numero_dormitorios<>"") echo $p->Numero_dormitorios.".'; + + + // Cuartos_banio_con_duchas + echo '
"; else echo _OFER_NO_DEF; + echo ''; + if (!$caption['Cuartos_banio_con_duchas']->hideCaption) + echo ' › '.$caption['Cuartos_banio_con_duchas']->caption.": "; + if ($p->Cuartos_banio_con_duchas<>"") echo $p->Cuartos_banio_con_duchas.". "; else echo _OFER_NO_DEF." "; + + // Aseos + if ($p->Aseos <> "") + { + if (!$caption['Aseos']->hideCaption) + echo ' › '.$caption['Aseos']->caption.": "; + if ($p->Aseos<>"") echo $p->Aseos.".'; + + // Dispone + echo '
"; else echo _OFER_NO_DEF; + } + echo ''; + if (!$caption['Dispone']->hideCaption) + echo ' › '.$caption['Dispone']->caption.": "; + if ($p->Dispone<>"") echo str_replace("|",", ",$p->Dispone).".'; ?> + +
"; else echo _OFER_NO_DEF; + echo '++ + +++ +CaracterÃsticas del inmueble+ typeid == 2) // Venta + { + echo ''; + if (!$caption['AnioConstruccion']->hideCaption) + echo ' › '.$caption['AnioConstruccion']->caption.": "; + if ($p->AnioConstruccion <> "") echo $p->AnioConstruccion.". "; else echo _OFER_NO_DEF; + if (!$caption['UltimaReforma']->hideCaption) + echo ' › '.$caption['UltimaReforma']->caption.": "; + if ($p->UltimaReforma <> "") echo $p->UltimaReforma.". "; else echo _OFER_NO_DEF; + echo ''; + } + + // Metros construidos + echo ''; + if ($p->typeid == 2) // Venta + { + if (!$caption['MetrosConstruidos']->hideCaption) + echo ' › '.$caption['MetrosConstruidos']->caption.": "; + if ($p->MetrosConstruidos <> "") echo $p->MetrosConstruidos." ".$caption['Superficie_habitable']->append_text.". "; else echo _OFER_NO_DEF; + } + + if (!$caption['Superficie_habitable']->hideCaption) + echo ' › '.$caption['Superficie_habitable']->caption.": "; + echo $p->Superficie_habitable." ".$caption['Superficie_habitable']->append_text.". "; + + // Superficie_parcela + if ($p->Superficie_parcela <> "") + { + if (!$caption['Superficie_parcela']->hideCaption) + echo ' › '.$caption['Superficie_parcela']->caption.": "; + echo $p->Superficie_parcela." ".$caption['Superficie_parcela']->append_text."."; + } + echo "'; + + + if ($p->Camas_dobles <> 0 || $p->Camas_individuales <> 0 || $p->Camas_supletorias <> 0 || $p->Camas_litera <> 0) + echo '
"; + echo ''; + + + if ($p->typeid == 1) // Alquiler + { + // Camas_dobles + if ($p->Camas_dobles <> 0) + { + if (!$caption['Camas_dobles']->hideCaption) + echo ' › '.$caption['Camas_dobles']->caption.": "; + echo $p->Camas_dobles.". "; + } + + // Camas_individuales + if ($p->Camas_individuales <> 0) + { + if (!$caption['Camas_individuales']->hideCaption) + echo ' › '.$caption['Camas_individuales']->caption.": "; + echo $p->Camas_individuales.". "; + } + + // Camas_supletorias + if ($p->Camas_supletorias <> 0) + { + if (!$caption['Camas_supletorias']->hideCaption) + echo ' › '.$caption['Camas_supletorias']->caption.": "; + echo $p->Camas_supletorias.". "; + } + + // Camas_litera + if ($p->Camas_litera <> 0) + { + if (!$caption['Camas_litera']->hideCaption) + echo ' › '.$caption['Camas_litera']->caption.": "; + echo $p->Camas_litera.". "; + } + if ($p->Camas_dobles <> 0 || $p->Camas_individuales <> 0 || $p->Camas_supletorias <> 0 || $p->Camas_litera <> 0) + { + echo ""; + } + + // Sofa_cama_individual + if ($p->Sofa_cama_individual<>"" && $p->Sofa_cama_individual<>"") + { + echo '
"; + echo "'; + // Sofa_cama_individual + if ( $p->Sofa_cama_individual <> "") + { + if (!$caption['Sofa_cama_individual']->hideCaption) + echo ' › '.$caption['Sofa_cama_individual']->caption.": "; + echo $p->Sofa_cama_individual.". "; + } + + // Sofa_cama_doble + if ( $p->Sofa_cama_doble <> "") + { + if (!$caption['Sofa_cama_doble']->hideCaption) + echo ' › '.$caption['Sofa_cama_doble']->caption.": "; + echo $p->Sofa_cama_doble.". "; + } + echo ""; + } + + // Superficie_terraza_solarium + if ($p->Superficie_terraza_solarium <> "") + { + echo ''; + if (!$caption['Superficie_terraza_solarium']->hideCaption) + echo ' › '.$caption['Superficie_terraza_solarium']->caption.": "; + echo $p->Superficie_terraza_solarium." ".$caption['Superficie_terraza_solarium']->append_text."."; + } + } + // Enseres + echo '
"; + echo "'; + if (!$caption['Enseres']->hideCaption) + echo ' › '.$caption['Enseres']->caption.": "; + echo str_replace("|",", ",$p->Enseres).".'; + + // Animales + if ($p->typeid == 1) // Alquiler + { + echo '
"; + echo ''; + if (!$caption['Animales']->hideCaption) + echo ' › '.$caption['Animales']->caption.": "; + echo $p->Animales.".'; + } + + + // *** CaracterÃsticas de la zona ** + echo '
"; + echo 'CaracterÃsticas de la zona'; + + // Zona + echo ''; + if (!$caption['Zona']->hideCaption) + echo ' › '.$caption['Zona']->caption.": "; + echo str_replace("|",", ",$p->Zona).".'; + + // ActividadesDeportivas + if ($p->typeid == 1) // Alquiler + { + if($caption['ActividadesDeportivas'] != '') + { + echo '
"; + echo ''; + if (!$caption['ActividadesDeportivas']->hideCaption) + echo ' › '.$caption['ActividadesDeportivas']->caption.": "; + echo str_replace("|",", ",$p->ActividadesDeportivas).".'; + } + } + + // Distancia_a_la_playa + echo '
"; + echo ''; + if ($p->Distancia_a_la_playa <> "") + { + if (!$caption['Distancia_a_la_playa']->hideCaption) + echo ' › '.$caption['Distancia_a_la_playa']->caption.": "; + echo $p->Distancia_a_la_playa." ".$caption['Distancia_a_la_playa']->append_text.".'; + + if ($p->A_minutos_andando <> "") + { + echo '
"; + } + echo ''; + echo ''; + if (!$caption['A_minutos_andando']->hideCaption) + echo ' › '.$caption['A_minutos_andando']->caption.' '; + echo $p->A_minutos_andando." ".$caption['A_minutos_andando']->append_text." "; + if (!$caption['de_andando']->hideCaption) + echo ' '.$caption['de_andando']->caption.' '; + echo $p->de_andando.".'; + } + + if ($p->A_minutos_coche <> "") + { + echo '
"; + echo ''; + echo ''; + if (!$caption['A_minutos_coche']->hideCaption) + echo ' › '.$caption['A_minutos_coche']->caption.' '; + echo $p->A_minutos_coche." ".$caption['A_minutos_coche']->append_text." "; + if (!$caption['de_coche']->hideCaption) + echo ' '.$caption['de_coche']->caption.' '; + echo $p->de_coche.".'; + echo '
"; + echo '
'; + } + + // *** Descripción detallada *** + echo ''.$caption['full_text']->caption.''; + echo ''; + echo ''; + + // *** Disponibilidad *** + if ($p->typeid == 1 && $num_periodos > 0) // Alquiler + { + echo ''; + echo $p->full_text; + echo ''; + echo ''.$caption['intro_text']->caption.''; + echo ''; ?> + +++ + ++
+ + +›++ ++ + +
+›++ id,$prop[0]->name,$prop[0]->typeid); ?> ++ ++ + ++ ++ photo)) { ?> +++ "viewagent") { ?> + id&Itemid=$Itemid"); ?>"> ++ ++ + +
+++ "viewagent") { ?>id&Itemid=$Itemid"); ?>">name; ?>name; ?> +++ user == $my->id && $agent->user > 0 && $my->id > 0) { ?> +++ " title="">+ + + + email) && $agent->user != $my->id) { ; ?> + + + + + + + + +
+
+
+ + desc)) { ?> +desc; ?>+ + + mobile)) { ?> + : mobile; ?>.
+ disp_mov_from)) { ?> + de disp_mov_from); ?> a disp_mov_to); ?> de disp_mov_from_hora; ?> a disp_mov_to_hora; ?>.
+ + + fijo)) { ?> + : fijo; ?>. +
+ disp_fijo_from)) { ?> + de disp_fijo_from); ?> a disp_fijo_to); ?> de disp_fijo_from_hora; ?> a disp_fijo_to_hora; ?>.
+ + + + + idiomas_hablados)) { ?> + : idiomas_hablados) ?>. +
+ ++ photo)) { ?> +++ +++ ++++ + "viewco") { ?>id&Itemid=$Itemid"); ?>">name; ?>name; + } ?> ++
++ address)!="") { + echo "$co->address+
"; + } + if ((trim($co->suburb)!="") && (trim($co->state)!="") && (trim($co->postcode)!="")) { + echo "$co->suburb, $co->state, $co->postcode
"; + } elseif ((trim($co->suburb)!="") && (trim($co->state)!="")) { + echo "$co->suburb, $co->state
"; + } elseif ((trim($co->suburb)!="") && (trim($co->postcode)!="")) { + echo "$co->suburb, $co->postcode
"; + } elseif ((trim($co->state)!="") && (trim($co->postcode)!="")) { + echo "$co->state, $co->postcode
"; + } elseif ((trim($co->state)!="")) { + echo "$co->state
"; + } elseif ((trim($co->suburb)!="")) { + echo "$co->suburb
"; + } elseif ((trim($co->postcode)!="")) { + echo "$co->postcode
"; + } + if (trim($co->country)!="") { + echo "$co->country
"; + } + ?>+ user == $my->id && $agent->user > 0 && $my->id > 0) { ?> + + " title="">+
+
+
+ email) ) { ; ?>
+ id&Itemid=$Itemid"); ?>">
+ +
+++ idiomas_hablados)) { ?> + : idiomas_hablados) ?>. +
+ + + telephone)) { ?> + : telephone; ?>. +
+ disp_fijo_from)) { ?> + disp_fijo_from); ?> a disp_fijo_to); ?> de disp_fijo_from_hora; ?> a disp_fijo_to_hora; ?>.
+ + + + + mobile)) { ?> + : mobile; ?>
+ disp_mov_from)) { ?> + disp_mov_from); ?> a disp_mov_to); ?> de disp_mov_from_hora; ?> a disp_mov_to_hora; ?>.
+ + + + website)) { ?> + website; ?>
+ + desc)) { ?> + + desc; ?> + +
+ + +
+ "agent" && $subject <> "property" && $subject <> "company") return false; + ?> + + + +<?php echo $mosConfig_sitename; ?> :: <?php echo $title; ?> + + + +
+ +
+
+ + + + + ++ ++ thumb <> '') { + $thumb_imgsize = GetImageSize ($mosConfig_absolute_path.$hp_imgdir_thumb.$p->thumb); + } else { + $thumb_imgsize = GetImageSize ($mosConfig_absolute_path.$hp_imgdir_thumb.$hp_img_noimage_thumb); + } + ?> +++ ++ + + +++ +'; + + echo '+ user == $my->id && $p->user > 0 && $my->id > 0) { ?> + + id&Itemid=$Itemid"); ?>" title="">+
+
+
+ '; + // Población + if (!$caption['suburb']->hideCaption) + echo ''.$caption['suburb']->caption.": "; + echo $p->suburb.".
"; + // Provincia + if (!$caption['state']->hideCaption) + echo ''.$caption['state']->caption.": "; + echo $p->state.".
"; + + // Barrio + if (!$p->Barrio=="") + { + if (!$caption['Barrio']->hideCaption) + + echo ''.$caption['Barrio']->caption.": "; + echo $p->Barrio.".
"; + } + + + // Nº plazas + if ($p->typeid == 1 && $p->Num_plazas != "") + { + if (!$caption['Num_plazas']->hideCaption) + echo ''.$caption['Num_plazas']->caption.": "; + echo $p->Num_plazas.".
"; + } + + // Metros construidos + if ($p->MetrosConstruidos != "") // Venta + { + if (!$caption['MetrosConstruidos']->hideCaption) + echo ''.$caption['MetrosConstruidos']->caption.": "; + echo $p->MetrosConstruidos." ".$caption['MetrosConstruidos']->append_text.".
"; + } + + // Año construccion + if ($p->AnioConstruccion != "") // Venta + { + if (!$caption['AnioConstruccion']->hideCaption) + echo ''.$caption['AnioConstruccion']->caption.": "; + echo $p->AnioConstruccion."
"; + } + + // Número de dormitorios + if ($p->Numero_dormitorios != "") // Alquiler + { + if (!$caption['Numero_dormitorios']->hideCaption) + echo ''.$caption['Numero_dormitorios']->caption.": "; + echo $p->Numero_dormitorios.".
"; + } + + // Precio + if ($p->price != "0") // Venta + { + if (!$caption['price']->hideCaption) + echo ''.$caption['price']->caption.": "; + echo number_format($p->price,2,',','.')." ".$caption['price']->append_text."
"; + } + + echo ''; + // Cuartos de baño + if (!$caption['Cuartos_banio_con_duchas']->hideCaption) + echo ''.$caption['Cuartos_banio_con_duchas']->caption.": "; + if ($p->Cuartos_banio_con_duchas <> "") + echo $p->Cuartos_banio_con_duchas.". "; + else + echo _OFER_NINGUNO." "; + // Aseos + if (!$caption['Aseos']->hideCaption) + echo ''.$caption['Aseos']->caption.": "; + + if ($p->Aseos <> "") + echo $p->Aseos.".'; + ?> + '; + // Resumen + # echo $p->Resumen."
"; + else + echo _OFER_NINGUNO."
"; + // Dispone + if (!$caption['Dispone']->hideCaption) + echo ''.$caption['Dispone']->caption.": "; + + echo str_replace("|",", ",$p->Dispone).".
"; + echo '
"; + + + /* Antiguo código que escupÃÂa los campos */ + /*foreach($p as $key => $value) { + if ( array_key_exists($key,$caption) && ($caption[$key]->name <> 'name' && $caption[$key]->name <> 'thumb' && $caption[$key]->name <> 'thumb_title' && $caption[$key]->name <> '' && $value <> "") ) + # Replace '|' with a comma for checkbox and select multiple fields + if ($caption[$key]->field_type == "checkbox" || $caption[$key]->field_type == "selectmultiple") { + if (!$caption[$key]->hideCaption) echo ''.$caption[$key]->caption.": "; + echo str_replace("|",", ",$value).".
"; + # Web Link + } elseif ($caption[$key]->field_type == "link") { + + // Evaluate mambot style data + $value = str_replace( '{property_id}', $p->id, $value ); + $value = str_replace( '{type_id}', $p->typeid, $value ); + $value = str_replace( '{agent_id}', $p->agentid, $value ); + $value = str_replace( '{company_id}', $p->companyid, $value ); + $value = str_replace( '{Itemid}', $Itemid, $value ); + + if (!$caption[$key]->hideCaption) { + ?>caption; ?>: prefix_text; + $link = explode("|",$value); + if (count($link) == 1 && ( substr(trim($link[0]),0,4) == "http" || substr(trim($link[0]),0,5) == "index" ) ) { + ?>href=""> 1 && ( substr(trim($link[1]),0,4) == "http" || substr(trim($link[1]),0,5) == "index" ) ) { + ?>href="">prefix_text."
"; + + } else { + # Do not display agent field when viewing agent's properties + # Do not display type field when viewing type's properties + if ( !($key == "agent" && $task == "viewagent") && !($key =="type" && $task == "viewtype") ) { + # Show agent link + if ($key == "agent") { + if (!$caption[$key]->hideCaption) { + ?>caption; ?>: agentid&Itemid=$Itemid"); ?>">prefix_text.$value.$caption[$key]->append_text; ?>
hideCaption) { + ?>caption; ?>: companyid."&Itemid=$Itemid"); ?>"> prefix_text.$value.$caption[$key]->append_text; ?>
hideCaption) { + ?>caption; ?>: typeid."&Itemid=$Itemid"); ?>"> prefix_text.$value.$caption[$key]->append_text; ?>
hideCaption) { + ?>caption; ?>:prefix_text.$hp_currency." ".number_format($value, $hp_dec_point, $hp_dec_string, ($hp_thousand_sep) ? $hp_thousand_string:'').$caption[$key]->append_text; ?>
hideCaption) { + echo ''.$caption[$key]->caption.": "; + } + echo $caption[$key]->prefix_text + . ( ($value == '1') ? _CMN_YES : _CMN_NO ) + . $caption[$key]->append_text + . "
"; + # Else, show normal 'caption: value' + } else { + if (!$caption[$key]->hideCaption) { + echo ''.$caption[$key]->caption.": "; + } + echo $caption[$key]->prefix_text + . ( ($key=="price") ? $hp_currency." " : "" ) + . $value + . $caption[$key]->append_text + . "
"; + } + } + } + }*/ + + ?> +
"._HPAVL_HASTA."
";
+ }
+ ?>
+
+
+
+
+
+
+
+ + setQuery( "SELECT * FROM #__hp_prop_types AS t" + . "\nWHERE t.published='1'" + . "\nORDER BY t.ordering ASC"); + $types = $database->loadObjectList(); + + foreach($types AS $t) { ?> + name ?> ( id) ?>) + setQuery( "SELECT id FROM #__hp_properties AS p" + . "\nWHERE p.type=".$type_id); + return $database->getNumRows(); + } +} + + +?> diff --git a/emacs.d/nxhtml/tests/in/zero-pi.html b/emacs.d/nxhtml/tests/in/zero-pi.html new file mode 100644 index 0000000..6bb247c --- /dev/null +++ b/emacs.d/nxhtml/tests/in/zero-pi.html @@ -0,0 +1,11 @@ + + + + +
+This is HTML, so the following has no special meaning:
+/**
+ * Fake comment
+ *
+ * @param whatever Foo
+ *
+ * @return bar
+ */
+
--
cgit v1.3-2-g0d8e