svn commit: r1779338 - /forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
Author: sjur
Date: Wed Jan 18 15:03:58 2017
New Revision: 1779338
URL: http://svn.apache.org/viewvc?rev=1779338&view=rev
Log:
Removed the border completely, applied a short transparency gradient to create
an effect of the text fading away before disappearing under the header.
Modified:
forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
Modified: forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css?rev=1779338&r1=1779337&r2=1779338&view=diff
==
--- forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css (original)
+++ forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css Wed Jan 18
15:03:58 2017
@@ -129,7 +129,15 @@ table, th, td {
#top .header {
background-color: rgba(255, 255, 255, 0.0);
-border-color: rgba(255, 255, 255, 0.0);
+border-style: none;
+background-image: linear-gradient(to bottom, rgba(255, 255, 255, 1),
+ rgba(255, 255, 255, 1),
+ rgba(255, 255, 255, 1),
+ rgba(255, 255, 255, 1),
+ rgba(255, 255, 255, 1),
+ rgba(255, 255, 255, 1),
+ rgba(255, 255, 255, 1),
+ rgba(255, 255, 255, 0));
/*float: left;
width: 100%;
background: url("images/header_white_line.gif") repeat-x bottom;*/
svn commit: r1778649 - in /forrest/trunk/main/webapp/skins/fleece-dev: css/screen.css xslt/html/site-to-xhtml.xsl
Author: sjur
Date: Fri Jan 13 18:33:12 2017
New Revision: 1778649
URL: http://svn.apache.org/viewvc?rev=1778649&view=rev
Log:
Made the navbar/tabs fixed on top - makes for a better user experience when the
context isn’t lost on scrolling.
Modified:
forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl
Modified: forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css?rev=1778649&r1=1778648&r2=1778649&view=diff
==
--- forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css (original)
+++ forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css Fri Jan 13
18:33:12 2017
@@ -128,6 +128,8 @@ table, th, td {
}
#top .header {
+background-color: rgba(255, 255, 255, 0.0);
+border-color: rgba(255, 255, 255, 0.0);
/*float: left;
width: 100%;
background: url("images/header_white_line.gif") repeat-x bottom;*/
@@ -296,6 +298,7 @@ html>body #top .searchbox {
*border-top: solid #4C6C8F 15px;
*/
#main {
+padding-top: 125px;
/*position: relative;
background: white;
clear:both;*/
Modified: forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl?rev=1778649&r1=1778648&r2=1778649&view=diff
==
--- forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl
(original)
+++ forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl Fri
Jan 13 18:33:12 2017
@@ -111,7 +111,7 @@ footer, searchbar, css etc. As input, i
header
-
+
start Tabs
svn commit: r1760518 - /forrest/trunk/main/webapp/WEB-INF/jtidy.properties
Author: sjur Date: Tue Sep 13 10:09:32 2016 New Revision: 1760518 URL: http://svn.apache.org/viewvc?rev=1760518&view=rev Log: [BUGFIX] jtidy charset string for UTF-8 is ‘utf8’, not ‘utf-8’. Fixes wrong rendering of html source docs with non-ASCII content. Modified: forrest/trunk/main/webapp/WEB-INF/jtidy.properties Modified: forrest/trunk/main/webapp/WEB-INF/jtidy.properties URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/jtidy.properties?rev=1760518&r1=1760517&r2=1760518&view=diff == --- forrest/trunk/main/webapp/WEB-INF/jtidy.properties (original) +++ forrest/trunk/main/webapp/WEB-INF/jtidy.properties Tue Sep 13 10:09:32 2016 @@ -27,7 +27,7 @@ quote-ampersand=yes break-before-br=yes uppercase-tags=no uppercase-attributes=no -char-encoding=utf-8 +char-encoding=utf8 # Suppress Tidy-Header in files generated from HTML-Sources tidy-mark=no
svn commit: r1760495 - /forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl
Author: sjur Date: Tue Sep 13 08:50:07 2016 New Revision: 1760495 URL: http://svn.apache.org/viewvc?rev=1760495&view=rev Log: Retain width and height attributes of the img element when converting html to forrest doc format. Modified: forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl Modified: forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl?rev=1760495&r1=1760494&r2=1760495&view=diff == --- forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl Tue Sep 13 08:50:07 2016 @@ -151,10 +151,10 @@ - + - +
svn commit: r1759752 - /forrest/trunk/main/webapp/skins/fleece-dev/css/basic.css
Author: sjur
Date: Thu Sep 8 07:09:50 2016
New Revision: 1759752
URL: http://svn.apache.org/viewvc?rev=1759752&view=rev
Log:
Indent the dd element in the fleece skin.
Modified:
forrest/trunk/main/webapp/skins/fleece-dev/css/basic.css
Modified: forrest/trunk/main/webapp/skins/fleece-dev/css/basic.css
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/css/basic.css?rev=1759752&r1=1759751&r2=1759752&view=diff
==
--- forrest/trunk/main/webapp/skins/fleece-dev/css/basic.css (original)
+++ forrest/trunk/main/webapp/skins/fleece-dev/css/basic.css Thu Sep 8
07:09:50 2016
@@ -192,3 +192,7 @@ p {
font-size: 110%;
background: #F6F6F6;
}
+
+#content dd {
+margin-left: 2em;
+}
svn commit: r1759203 - in /forrest/trunk/main/webapp: locationmap-skins.xml resources.xmap sitemap.xmap
Author: sjur Date: Mon Sep 5 07:19:30 2016 New Revision: 1759203 URL: http://svn.apache.org/viewvc?rev=1759203&view=rev Log: Bare-bones support for css.map files used in bootstrat (ie the fleece skin). At leas this stops the browser from complaining about 404 on these files. Modified: forrest/trunk/main/webapp/locationmap-skins.xml forrest/trunk/main/webapp/resources.xmap forrest/trunk/main/webapp/sitemap.xmap Modified: forrest/trunk/main/webapp/locationmap-skins.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-skins.xml?rev=1759203&r1=1759202&r2=1759203&view=diff == --- forrest/trunk/main/webapp/locationmap-skins.xml (original) +++ forrest/trunk/main/webapp/locationmap-skins.xml Mon Sep 5 07:19:30 2016 @@ -50,6 +50,13 @@ + + + + + + + Modified: forrest/trunk/main/webapp/resources.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources.xmap?rev=1759203&r1=1759202&r2=1759203&view=diff == --- forrest/trunk/main/webapp/resources.xmap (original) +++ forrest/trunk/main/webapp/resources.xmap Mon Sep 5 07:19:30 2016 @@ -160,6 +160,10 @@ $Revision: 1.13 $ + + + + Modified: forrest/trunk/main/webapp/sitemap.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/sitemap.xmap?rev=1759203&r1=1759202&r2=1759203&view=diff == --- forrest/trunk/main/webapp/sitemap.xmap (original) +++ forrest/trunk/main/webapp/sitemap.xmap Mon Sep 5 07:19:30 2016 @@ -496,7 +496,9 @@ $Revision: 1.12 $ + + @@ -513,6 +515,7 @@ $Revision: 1.12 $ + @@ -604,6 +607,9 @@ $Revision: 1.12 $ + + +
svn commit: r1751925 - /forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v08-2.dtd
Author: sjur Date: Fri Jul 8 15:30:01 2016 New Revision: 1751925 URL: http://svn.apache.org/viewvc?rev=1751925&view=rev Log: The previous commit accidentally made the host-logo element obligatory, thereby potentially invalidating existing sites. Reverted. Modified: forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v08-2.dtd Modified: forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v08-2.dtd URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v08-2.dtd?rev=1751925&r1=1751924&r2=1751925&view=diff == --- forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v08-2.dtd (original) +++ forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v08-2.dtd Fri Jul 8 15:30:01 2016 @@ -56,7 +56,7 @@ NOTES: group-name?, group-description?, group-url?, group-logo, group-logo-width?, group-logo-height?, host-description?, host-url?, - host-logo, host-logo-width?, host-logo-height?, + host-logo?, host-logo-width?, host-logo-height?, favicon-url?, disable-copyright-footer?, year?, vendor?, copyright-link?, trademark-statement?, trail?, toc?, headings?, feedback?, motd?,
svn commit: r1751779 - /forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl
Author: sjur Date: Thu Jul 7 10:36:53 2016 New Revision: 1751779 URL: http://svn.apache.org/viewvc?rev=1751779&view=rev Log: Utilised bootstrap utility classes to hide some of the menu area items on small screens. Modified: forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl Modified: forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl?rev=1751779&r1=1751778&r2=1751779&view=diff == --- forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl (original) +++ forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl Thu Jul 7 10:36:53 2016 @@ -387,7 +387,7 @@ footer, searchbar, css etc. As input, i end search - + menu - inner @@ -398,8 +398,8 @@ footer, searchbar, css etc. As input, i start group logo - - + + @@ -412,7 +412,7 @@ footer, searchbar, css etc. As input, i - +
svn commit: r1751776 - /forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl
Author: sjur Date: Thu Jul 7 10:08:36 2016 New Revision: 1751776 URL: http://svn.apache.org/viewvc?rev=1751776&view=rev Log: Added some basic breadcrumb bootstrap styling, but a lot of forrest processing is still going on that is a bit redundant. Also added a div around the non-menu part of the sidebar below the menu, to be able to address all of it at once (e.g. to hide it all in one go on narrow screens). Whitespace changes. Modified: forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl Modified: forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl?rev=1751776&r1=1751775&r2=1751776&view=diff == --- forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl (original) +++ forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl Thu Jul 7 10:08:36 2016 @@ -104,12 +104,12 @@ footer, searchbar, css etc. As input, i topstrip with logos and search box breadcrumbs org location - + header start Tabs @@ -340,7 +340,8 @@ footer, searchbar, css etc. As input, i http://validator.w3.org/check/referer";> - + http://jigsaw.w3.org/css-validator/check/referer";> @@ -354,18 +355,22 @@ footer, searchbar, css etc. As input, i Search box: only location for the fleece skin start Search -Search the site with +Search the site with Lucene search - + - + @@ -390,8 +395,9 @@ footer, searchbar, css etc. As input, i -start group logo - + +start group logo + @@ -405,7 +411,7 @@ footer, searchbar, css etc. As input, i - + @@ -418,7 +424,7 @@ footer, searchbar, css etc. As input, i - + Copyright © @@ -451,9 +457,9 @@ footer, searchbar, css etc. As input, i -end group logo -credits in alternative location - +end group logo +credits in alternative location + @@ -524,11 +530,11 @@ footer, searchbar, css etc. As input, i - - -credits in alternative location #2 -alternative credits - + + +credits in alternative location #2 +alternative credits + @@ -555,6 +561,7 @@ footer, searchbar, css etc. As input, i + end Menu
svn commit: r1751678 - /forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
Author: sjur
Date: Wed Jul 6 12:52:44 2016
New Revision: 1751678
URL: http://svn.apache.org/viewvc?rev=1751678&view=rev
Log:
Reverted a change from earlier today - it was based on a misunderstanding.
Modified:
forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
Modified: forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css?rev=1751678&r1=1751677&r2=1751678&view=diff
==
--- forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css (original)
+++ forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css Wed Jul 6
12:52:44 2016
@@ -104,11 +104,6 @@ table, th, td {
border: 1px solid #ccc;
}
-li > table.ForrestTable {
-margin-left: 2.5em;
-width: 90%;
-}
-
/**
* Page Header
*/
svn commit: r1751676 - /forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
Author: sjur
Date: Wed Jul 6 12:43:28 2016
New Revision: 1751676
URL: http://svn.apache.org/viewvc?rev=1751676&view=rev
Log:
Proper margin of level2tabs when on small screens.
Modified:
forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
Modified: forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css?rev=1751676&r1=1751675&r2=1751676&view=diff
==
--- forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css (original)
+++ forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css Wed Jul 6
12:43:28 2016
@@ -290,6 +290,13 @@ html>body #top .searchbox {
margin-left: 6px;*/
}
+@media only screen and (max-width : 767px) {
+#level2tabs li {
+margin-left: 14px;
+margin-right: 14px;
+}
+}
+
/*
*border-top: solid #4C6C8F 15px;
*/
svn commit: r1751666 - in /forrest/trunk: LICENSE.txt main/webapp/skins/fleece-dev/LICENSE main/webapp/skins/fleece-dev/NOTICE
Author: sjur Date: Wed Jul 6 12:09:03 2016 New Revision: 1751666 URL: http://svn.apache.org/viewvc?rev=1751666&view=rev Log: Added license info for components used by the fleece skin to the top level LICENSE.txt file, and removed the LICENSE and NOTICE files within the fleece-dev dir. Removed: forrest/trunk/main/webapp/skins/fleece-dev/LICENSE forrest/trunk/main/webapp/skins/fleece-dev/NOTICE Modified: forrest/trunk/LICENSE.txt Modified: forrest/trunk/LICENSE.txt URL: http://svn.apache.org/viewvc/forrest/trunk/LICENSE.txt?rev=1751666&r1=1751665&r2=1751666&view=diff == --- forrest/trunk/LICENSE.txt (original) +++ forrest/trunk/LICENSE.txt Wed Jul 6 12:09:03 2016 @@ -367,6 +367,13 @@ license: tools/eclipse/plugins/org.apach license: lib/core/concurrent-1.3.4.jar.license.txt +These supporting products are licensed: The MIT License +license: main/webapp/skins/fleece-dev/licenses/bootstrap-3.3.6.license.txt +license: main/webapp/skins/fleece-dev/licenses/glyphicons.license.txt +license: main/webapp/skins/fleece-dev/licenses/jquery-1.11.1.license.txt +license: main/webapp/skins/fleece-dev/licenses/normalize-3.0.3.license.txt + + Others not yet classified ... lib/core/oreilly.permission.txt
svn commit: r1751665 - in /forrest/trunk/main/webapp/skins/fleece-dev/licenses: bootstrap-3.3.6.license.txt bootstrap.MIT glyphicons.MIT glyphicons.license.txt jquery-1.11.1.license.txt jquery.MIT nor
Author: sjur
Date: Wed Jul 6 12:05:56 2016
New Revision: 1751665
URL: http://svn.apache.org/viewvc?rev=1751665&view=rev
Log:
Renamed licenses according to forrest conventions. At the same time fixed the
content of the jquery license (the previous version just contained a http error
message).
Added:
forrest/trunk/main/webapp/skins/fleece-dev/licenses/bootstrap-3.3.6.license.txt
- copied unchanged from r1751648,
forrest/trunk/main/webapp/skins/fleece-dev/licenses/bootstrap.MIT
forrest/trunk/main/webapp/skins/fleece-dev/licenses/glyphicons.license.txt
- copied unchanged from r1751648,
forrest/trunk/main/webapp/skins/fleece-dev/licenses/glyphicons.MIT
forrest/trunk/main/webapp/skins/fleece-dev/licenses/jquery-1.11.1.license.txt
- copied, changed from r1751648,
forrest/trunk/main/webapp/skins/fleece-dev/licenses/jquery.MIT
forrest/trunk/main/webapp/skins/fleece-dev/licenses/normalize-3.0.3.license.txt
- copied unchanged from r1751648,
forrest/trunk/main/webapp/skins/fleece-dev/licenses/normalize.MIT
Removed:
forrest/trunk/main/webapp/skins/fleece-dev/licenses/bootstrap.MIT
forrest/trunk/main/webapp/skins/fleece-dev/licenses/glyphicons.MIT
forrest/trunk/main/webapp/skins/fleece-dev/licenses/jquery.MIT
forrest/trunk/main/webapp/skins/fleece-dev/licenses/normalize.MIT
Copied:
forrest/trunk/main/webapp/skins/fleece-dev/licenses/jquery-1.11.1.license.txt
(from r1751648, forrest/trunk/main/webapp/skins/fleece-dev/licenses/jquery.MIT)
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/licenses/jquery-1.11.1.license.txt?p2=forrest/trunk/main/webapp/skins/fleece-dev/licenses/jquery-1.11.1.license.txt&p1=forrest/trunk/main/webapp/skins/fleece-dev/licenses/jquery.MIT&r1=1751648&r2=1751665&rev=1751665&view=diff
==
--- forrest/trunk/main/webapp/skins/fleece-dev/licenses/jquery.MIT (original)
+++
forrest/trunk/main/webapp/skins/fleece-dev/licenses/jquery-1.11.1.license.txt
Wed Jul 6 12:05:56 2016
@@ -1 +1,36 @@
-{"error":"Not Found"}
\ No newline at end of file
+Copyright jQuery Foundation and other contributors, https://jquery.org/
+
+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/jquery/jquery
+
+The following license applies to all parts of this software except as
+documented below:
+
+
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+All files located in the node_modules and external directories are
+externally maintained libraries used by this software which have their
+own licenses; we recommend you read them, as their terms may differ from
+the terms above.
svn commit: r1751656 - /forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/sample.xml
Author: sjur Date: Wed Jul 6 11:22:15 2016 New Revision: 1751656 URL: http://svn.apache.org/viewvc?rev=1751656&view=rev Log: Added more subsections, both to test rendering using the fleece skin, and to demonstrate the capability for new users. Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/sample.xml Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/sample.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/sample.xml?rev=1751656&r1=1751655&r2=1751656&view=diff == --- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/sample.xml (original) +++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/sample.xml Wed Jul 6 11:22:15 2016 @@ -258,6 +258,24 @@ Which contains a subsection (2.1). + +Section 2.1.1 + + Which contains one more subsection (2.1.1). + + + Section 2.1.1.1 + +Which contains one more subsection (2.1.1.1). + + +Section 2.1.1.1.1 + + Which contains one more subsection (2.1.1.1.1). + + + +
svn commit: r1751655 - in /forrest/trunk/main/webapp/skins/fleece-dev: css/screen.css xslt/html/site-to-xhtml.xsl
Author: sjur
Date: Wed Jul 6 11:12:31 2016
New Revision: 1751655
URL: http://svn.apache.org/viewvc?rev=1751655&view=rev
Log:
Better rendering of lower-level headings, and adherence to the skinconf.xsl
setting headings@type (pelt only obey this setting for level 1 and 2 sections,
not lower).
Modified:
forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl
Modified: forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css?rev=1751655&r1=1751654&r2=1751655&view=diff
==
--- forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css (original)
+++ forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css Wed Jul 6
11:12:31 2016
@@ -555,12 +555,16 @@ acronym {
box-shadow: 0 0 0.4em #E7E7E7;
}
+.underlined_10 {
+border-bottom: solid 10px #E7E7E7;
+}
+
.underlined_5 {
border-bottom: solid 5px #E7E7E7;
}
-.underlined_10 {
-border-bottom: solid 10px #E7E7E7;
+.underlined_2 {
+border-bottom: solid 2px #E7E7E7;
}
/* snail trail */
Modified: forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl?rev=1751655&r1=1751654&r2=1751655&view=diff
==
--- forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl
(original)
+++ forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl Wed
Jul 6 11:12:31 2016
@@ -296,6 +296,46 @@ footer, searchbar, css etc. As input, i
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
svn commit: r1751648 - in /forrest/trunk/main/webapp/skins/fleece-dev: LICENSE NOTICE licenses/ licenses/bootstrap.MIT licenses/glyphicons.MIT licenses/jquery.MIT licenses/normalize.MIT
Author: sjur Date: Wed Jul 6 10:15:11 2016 New Revision: 1751648 URL: http://svn.apache.org/viewvc?rev=1751648&view=rev Log: Added license info and license texts. Added: forrest/trunk/main/webapp/skins/fleece-dev/LICENSE forrest/trunk/main/webapp/skins/fleece-dev/NOTICE forrest/trunk/main/webapp/skins/fleece-dev/licenses/ forrest/trunk/main/webapp/skins/fleece-dev/licenses/bootstrap.MIT forrest/trunk/main/webapp/skins/fleece-dev/licenses/glyphicons.MIT forrest/trunk/main/webapp/skins/fleece-dev/licenses/jquery.MIT forrest/trunk/main/webapp/skins/fleece-dev/licenses/normalize.MIT Added: forrest/trunk/main/webapp/skins/fleece-dev/LICENSE URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/LICENSE?rev=1751648&view=auto == --- forrest/trunk/main/webapp/skins/fleece-dev/LICENSE (added) +++ forrest/trunk/main/webapp/skins/fleece-dev/LICENSE Wed Jul 6 10:15:11 2016 @@ -0,0 +1,213 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, pr
svn commit: r1751617 - /forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
Author: sjur
Date: Wed Jul 6 07:55:41 2016
New Revision: 1751617
URL: http://svn.apache.org/viewvc?rev=1751617&view=rev
Log:
Table rendering.
Modified:
forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
Modified: forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css?rev=1751617&r1=1751616&r2=1751617&view=diff
==
--- forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css (original)
+++ forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css Wed Jul 6
07:55:41 2016
@@ -72,32 +72,41 @@ h5 {
* table
*/
table .title {
-/*background-color: #00;*/
+background-color: #888;
}
.ForrestTable {
-/*color: #ff;
-background-color: #7099C5;
+background-color: #ccc;
width: 100%;
font-size : 100%;
-empty-cells: show;*/
+empty-cells: show;
+border-collapse: collapse;
}
table caption {
-/*padding-left: 5px;
+padding-left: 5px;
color: white;
text-align: left;
font-weight: bold;
-background-color: #00;*/
+background-color: #888;
}
.ForrestTable td {
-/*color: black;
-background-color: #f0f0ff;*/
+color: black;
+background-color: #f5f5f5;
}
.ForrestTable th {
-/*text-align: center;*/
+text-align: center;
+}
+
+table, th, td {
+border: 1px solid #ccc;
+}
+
+li > table.ForrestTable {
+margin-left: 2.5em;
+width: 90%;
}
/**
svn commit: r1751613 - /forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
Author: sjur
Date: Wed Jul 6 07:35:16 2016
New Revision: 1751613
URL: http://svn.apache.org/viewvc?rev=1751613&view=rev
Log:
Make the fleece skin obey header formatting specifications from skinconf.xsl,
colours suitable for bootstrap.
Modified:
forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
Modified: forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css?rev=1751613&r1=1751612&r2=1751613&view=diff
==
--- forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css (original)
+++ forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css Wed Jul 6
07:35:16 2016
@@ -542,15 +542,16 @@ acronym {
}
.boxed {
-/*background-color: #a5b6c6;*/
+background-color: #E7E7E7;
+box-shadow: 0 0 0.4em #E7E7E7;
}
.underlined_5 {
-/*border-bottom: solid 5px #4C6C8F;*/
+border-bottom: solid 5px #E7E7E7;
}
.underlined_10 {
-/*border-bottom: solid 10px #4C6C8F;*/
+border-bottom: solid 10px #E7E7E7;
}
/* snail trail */
svn commit: r1751608 - /forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl
Author: sjur Date: Wed Jul 6 06:54:49 2016 New Revision: 1751608 URL: http://svn.apache.org/viewvc?rev=1751608&view=rev Log: Relax the test a bit, to allow the menu sidebar to be built with search field and group logos etc even in cases where the menu is empty. Modified: forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl Modified: forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl?rev=1751608&r1=1751607&r2=1751608&view=diff == --- forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl (original) +++ forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl Wed Jul 6 06:54:49 2016 @@ -186,7 +186,7 @@ footer, searchbar, css etc. As input, i --> start Menu, mainarea - + start content
svn commit: r1751491 - /forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
Author: sjur
Date: Tue Jul 5 14:31:24 2016
New Revision: 1751491
URL: http://svn.apache.org/viewvc?rev=1751491&view=rev
Log:
With the search box out of the header, we can reinstate the margin below the
main tabs when no level2tabs are visible, by checking that the main tab element
is the only child of the header div.
Modified:
forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
Modified: forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css?rev=1751491&r1=1751490&r2=1751491&view=diff
==
--- forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css (original)
+++ forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css Tue Jul 5
14:31:24 2016
@@ -3,6 +3,10 @@
margin: 0;
}
+div.header #topmenu:only-child {
+margin-bottom: 20px;
+}
+
body {
/*margin: 0px 0px 0px 0px;
font-family: Verdana, Helvetica, sans-serif;*/
svn commit: r1751490 - /forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl
Author: sjur Date: Tue Jul 5 14:30:09 2016 New Revision: 1751490 URL: http://svn.apache.org/viewvc?rev=1751490&view=rev Log: The only location of the search bar in the fleece skin is above the menu, as part of the sidebar div. Modified: forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl Modified: forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl?rev=1751490&r1=1751489&r2=1751490&view=diff == --- forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl (original) +++ forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl Tue Jul 5 14:30:09 2016 @@ -166,38 +166,6 @@ footer, searchbar, css etc. As input, i end Subtabs - -start Search - -Search the site with - - - -Lucene search - - - - - - - - - - -http://www.google.com/search";> - - - - - - - - - - - -end search - centerstrip with menu and mainarea @@ -343,6 +311,37 @@ footer, searchbar, css etc. As input, i start Menu +Search box: only location for the fleece skin +start Search + +Search the site with + + + +Lucene search + + + + + + + + + + +http://www.google.com/search";> + + + + + + + + + + + +end search menu - inner @@ -351,40 +350,6 @@ footer, searchbar, css etc. As input, i -Search box: alternative location - -start Search - - -Search the site with - - - -Lucene search - - - - - - - - - - -http://www.google.com/search";> - - - - - - - - - - - -end search - start group logo
svn commit: r1751488 - /forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl
Author: sjur Date: Tue Jul 5 14:28:23 2016 New Revision: 1751488 URL: http://svn.apache.org/viewvc?rev=1751488&view=rev Log: Support specifying logo widths and heights in skinconf.xsl. Modified: forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl Modified: forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl?rev=1751488&r1=1751487&r2=1751488&view=diff == --- forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl (original) +++ forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl Tue Jul 5 14:28:23 2016 @@ -134,11 +134,12 @@ footer, searchbar, css etc. As input, i - + - + + @@ -394,20 +395,21 @@ footer, searchbar, css etc. As input, i - + + - - - - - - - + + + + + + +
svn commit: r1751484 - /forrest/trunk/main/template-sites/basic/src/documentation/skinconf.xml
Author: sjur Date: Tue Jul 5 14:10:05 2016 New Revision: 1751484 URL: http://svn.apache.org/viewvc?rev=1751484&view=rev Log: Add default logo height for the project logo. It is slightly larger than it used to be (50 vs earlier 30), but still not very large. I also added empty variables for sizes for the other logo images. The variables are supported by renderlogo.xsl, but not necessarily by all skins in their site-to-xhtml.xsl stylesheet. Modified: forrest/trunk/main/template-sites/basic/src/documentation/skinconf.xml Modified: forrest/trunk/main/template-sites/basic/src/documentation/skinconf.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/basic/src/documentation/skinconf.xml?rev=1751484&r1=1751483&r2=1751484&view=diff == --- forrest/trunk/main/template-sites/basic/src/documentation/skinconf.xml (original) +++ forrest/trunk/main/template-sites/basic/src/documentation/skinconf.xml Tue Jul 5 14:10:05 2016 @@ -62,6 +62,8 @@ which will be used to configure the chos MyProject Description http://example.org/myproj/ images/project.png + 50 + + +
svn commit: r1751467 - /forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
Author: sjur
Date: Tue Jul 5 13:33:43 2016
New Revision: 1751467
URL: http://svn.apache.org/viewvc?rev=1751467&view=rev
Log:
Removed gap between tabs and level2tabs, added left and right margins to
level2tabs, made the level2tabs text a bit smaller. The margin below main tabs
when no level2tabs are shown is also gone. Trying to find a way around it.
Modified:
forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
Modified: forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css?rev=1751467&r1=1751466&r2=1751467&view=diff
==
--- forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css (original)
+++ forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css Tue Jul 5
13:33:43 2016
@@ -1,3 +1,8 @@
+/* override bootstrap: */
+#topmenu {
+margin: 0;
+}
+
body {
/*margin: 0px 0px 0px 0px;
font-family: Verdana, Helvetica, sans-serif;*/
@@ -249,6 +254,9 @@ html>body #top .searchbox {
}
#level2tabs {
+margin-left: 2em;
+margin-right: 2em;
+font-size: 90%;
/*margin: 0;
float:left;
position:relative;*/
svn commit: r1751457 - /forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/group.svg
Author: sjur Date: Tue Jul 5 12:18:45 2016 New Revision: 1751457 URL: http://svn.apache.org/viewvc?rev=1751457&view=rev Log: Similar adjustments to the group svg file as to the project svg file. Modified: forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/group.svg Modified: forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/group.svg URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/group.svg?rev=1751457&r1=1751456&r2=1751457&view=diff == --- forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/group.svg (original) +++ forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/group.svg Tue Jul 5 12:18:45 2016 @@ -38,7 +38,7 @@ SVG spec (http://www.w3.org/TR/SVG/) as xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xsl:version="1.0" xmlns:for="http://apache.org/forrest"; - width="220" height="65" > + width="180" height="65" > Anteater logo @@ -75,7 +75,7 @@ SVG spec (http://www.w3.org/TR/SVG/) as - +
svn commit: r1751456 - /forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/project.svg
Author: sjur Date: Tue Jul 5 12:18:03 2016 New Revision: 1751456 URL: http://svn.apache.org/viewvc?rev=1751456&view=rev Log: Same appearance, but logic that is a bit easier to follow. Modified: forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/project.svg Modified: forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/project.svg URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/project.svg?rev=1751456&r1=1751455&r2=1751456&view=diff == --- forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/project.svg (original) +++ forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/project.svg Tue Jul 5 12:18:03 2016 @@ -73,7 +73,7 @@ SVG spec (http://www.w3.org/TR/SVG/) as - +
svn commit: r1751454 - /forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/project.svg
Author: sjur Date: Tue Jul 5 12:08:22 2016 New Revision: 1751454 URL: http://svn.apache.org/viewvc?rev=1751454&view=rev Log: Slightly better rendering of the default project logo as rendered from svg: the text is now roughly in the middle of the generated image, and the image size follows the text size instead of being hugely much wider with the text at the very right end. Modified: forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/project.svg Modified: forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/project.svg URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/project.svg?rev=1751454&r1=1751453&r2=1751454&view=diff == --- forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/project.svg (original) +++ forrest/trunk/main/template-sites/basic/src/documentation/content/xdocs/images/project.svg Tue Jul 5 12:08:22 2016 @@ -36,7 +36,7 @@ SVG spec (http://www.w3.org/TR/SVG/) as xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xsl:version="1.0" xmlns:for="http://apache.org/forrest"; - width="520" height="65" > + width="180" height="65" > Project logo @@ -73,7 +73,7 @@ SVG spec (http://www.w3.org/TR/SVG/) as - +
svn commit: r1751442 [5/6] - in /forrest/trunk/main/webapp/skins: ./ fleece-dev/ fleece-dev/css/ fleece-dev/fonts/ fleece-dev/images/ fleece-dev/scripts/ fleece-dev/xslt/ fleece-dev/xslt/fo/ fleece-de
Added: forrest/trunk/main/webapp/skins/fleece-dev/scripts/jquery.min.js
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/scripts/jquery.min.js?rev=1751442&view=auto
==
--- forrest/trunk/main/webapp/skins/fleece-dev/scripts/jquery.min.js (added)
+++ forrest/trunk/main/webapp/skins/fleece-dev/scripts/jquery.min.js Tue Jul 5
11:11:48 2016
@@ -0,0 +1,4 @@
+/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. |
jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof
module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw
new Error("jQuery requires a window with a document");return
b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var
c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return
new
m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return
b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return
d.call(this)},get:function(a){return
null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var
b=m.merge(this.constructor(),a);return
b.prevObject=this,b.context=this.context,b},each:function(a,b){return
m.each(this,a,b)},map:function(a){return
this.pushStack(m.map(this,function(b,c){return
a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,argumen
ts))},first:function(){return this.eq(0)},last:function(){return
this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return
this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return
this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var
a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof
g&&(j=g,g=arguments[h]||{},h++),"object"==typeof
g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d
in
e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void
0!==c&&(g[d]=c));return
g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw
new
Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return
null!=a&&a=
=a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var
b;for(b in a)return!1;return!0},isPlainObject:function(a){var
b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b
in a)return j.call(a,b);for(b in a);return void
0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof
a||"function"==typeof a?h[i.call(a)]||"object":typeof
a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return
a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return
a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var
d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else
for(e in a)if(d=b.apply(a[e],c),d===!1)break}else
if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d
===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return
a},trim:function(a){return
null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return
null!=a&&(r(Object(a))?m.merge(c,"string"==typeof
a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return
g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in
b&&b[c]===a)return c}return-1},merge:function(a,b){var
c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void
0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var
d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return
e},map:function(a,b,c){var
d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else
for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return
e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof
b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return
a.apply(b||this,c.concat(d.call(ar
guments)))},e.guid=a.guid=a.guid||m.guid++,e):void
0},now:function(){return+new Date},support:k}),m.each("Boolean Number String
Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object
"+b+"]"]=b.toLowerCase()});function r(a){var
b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof
b&&b>0&&b-1 in a}var s=
svn commit: r1751442 [2/6] - in /forrest/trunk/main/webapp/skins: ./ fleece-dev/ fleece-dev/css/ fleece-dev/fonts/ fleece-dev/images/ fleece-dev/scripts/ fleece-dev/xslt/ fleece-dev/xslt/fo/ fleece-de
Added: forrest/trunk/main/webapp/skins/fleece-dev/css/bootstrap.min.css.map
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/css/bootstrap.min.css.map?rev=1751442&view=auto
==
--- forrest/trunk/main/webapp/skins/fleece-dev/css/bootstrap.min.css.map (added)
+++ forrest/trunk/main/webapp/skins/fleece-dev/css/bootstrap.min.css.map Tue
Jul 5 11:11:48 2016
@@ -0,0 +1 @@
+{"version":3,"sources":["less/normalize.less","less/print.less","bootstrap.css","dist/css/bootstrap.css","less/glyphicons.less","less/scaffolding.less","less/mixins/vendor-prefixes.less","less/mixins/tab-focus.less","less/mixins/image.less","less/type.less","less/mixins/text-emphasis.less","less/mixins/background-variant.less","less/mixins/text-overflow.less","less/code.less","less/grid.less","less/mixins/grid.less","less/mixins/grid-framework.less","less/tables.less","less/mixins/table-row.less","less/forms.less","less/mixins/forms.less","less/buttons.less","less/mixins/buttons.less","less/mixins/opacity.less","less/component-animations.less","less/dropdowns.less","less/mixins/nav-divider.less","less/mixins/reset-filter.less","less/button-groups.less","less/mixins/border-radius.less","less/input-groups.less","less/navs.less","less/navbar.less","less/mixins/nav-vertical-align.less","less/utilities.less","less/breadcrumbs.less","less/pagination.less","less/mixins/pagination.less","le
ss/pager.less","less/labels.less","less/mixins/labels.less","less/badges.less","less/jumbotron.less","less/thumbnails.less","less/alerts.less","less/mixins/alerts.less","less/progress-bars.less","less/mixins/gradients.less","less/mixins/progress-bar.less","less/media.less","less/list-group.less","less/mixins/list-group.less","less/panels.less","less/mixins/panels.less","less/responsive-embed.less","less/wells.less","less/close.less","less/modals.less","less/tooltip.less","less/mixins/reset-text.less","less/popovers.less","less/carousel.less","less/mixins/clearfix.less","less/mixins/center-block.less","less/mixins/hide-text.less","less/responsive-utilities.less","less/mixins/responsive-visibility.less"],"names":[],"mappings":"4EAQA,KACE,YAAA,WACA,yBAAA,KACA,qBAAA,KAOF,KACE,OAAA,EAaF,QAAA,MAAA,QAAA,WAAA,OAAA,OAAA,OAAA,OAAA,KAAA,KAAA,IAAA,QAAA,QAaE,QAAA,MAQF,MAAA,OAAA,SAAA,MAIE,QAAA,aACA,eAAA,SAQF,sBACE,QAAA,KACA,OAAA,EAQF,SAAA,SAEE,QAAA,KAUF,EACE,iBAAA,YAQF,SAAA,QAEE,QAAA,EAUF,YAC
E,cAAA,IAAA,OAOF,EAAA,OAEE,YAAA,IAOF,IACE,WAAA,OAQF,GACE,OAAA,MAAA,EACA,UAAA,IAOF,KACE,MAAA,KACA,WAAA,KAOF,MACE,UAAA,IAOF,IAAA,IAEE,SAAA,SACA,UAAA,IACA,YAAA,EACA,eAAA,SAGF,IACE,IAAA,MAGF,IACE,OAAA,OAUF,IACE,OAAA,EAOF,eACE,SAAA,OAUF,OACE,OAAA,IAAA,KAOF,GACE,OAAA,EAAA,mBAAA,YAAA,gBAAA,YACA,WAAA,YAOF,IACE,SAAA,KAOF,KAAA,IAAA,IAAA,KAIE,YAAA,UAAA,UACA,UAAA,IAkBF,OAAA,MAAA,SAAA,OAAA,SAKE,OAAA,EACA,KAAA,QACA,MAAA,QAOF,OACE,SAAA,QAUF,OAAA,OAEE,eAAA,KAWF,OAAA,wBAAA,kBAAA,mBAIE,mBAAA,OACA,OAAA,QAOF,iBAAA,qBAEE,OAAA,QAOF,yBAAA,wBAEE,QAAA,EACA,OAAA,EAQF,MACE,YAAA,OAWF,qBAAA,kBAEE,mBAAA,WAAA,gBAAA,WAAA,WAAA,WACA,QAAA,EASF,8CAAA,8CAEE,OAAA,KAQF,mBACE,mBAAA,YACA,gBAAA,YAAA,WAAA,YAAA,mBAAA,UASF,iDAAA,8CAEE,mBAAA,KAOF,SACE,QAAA,MAAA,OAAA,MACA,OAAA,EAAA,IACA,OAAA,IAAA,MAAA,OAQF,OACE,QAAA,EACA,OAAA,EAOF,SACE,SAAA,KAQF,SACE,YAAA,IAUF,MACE,eAAA,EACA,gBAAA,SAGF,GAAA,GAEE,QAAA,uFCjUF,aA7FI,EAAA,OAAA,QAGI,MAAA,eACA,YAAA,eACA,WAAA,cAAA,mBAAA,eACA,WAAA,eAGJ,EAAA,UAEI,gBAAA,UAGJ,cACI,QAAA,KAAA,WAAA,IAGJ,kBACI
,QAAA,KAAA,YAAA,IAKJ,6BAAA,mBAEI,QAAA,GAGJ,WAAA,IAEI,OAAA,IAAA,MAAA,KC4KL,kBAAA,MDvKK,MC0KL,QAAA,mBDrKK,IE8KN,GDLC,kBAAA,MDrKK,ICwKL,UAAA,eCUD,GF5KM,GE2KN,EF1KM,QAAA,ECuKL,OAAA,ECSD,GF3KM,GCsKL,iBAAA,MD/JK,QCkKL,QAAA,KCSD,YFtKU,oBCiKT,iBAAA,eD7JK,OCgKL,OAAA,IAAA,MAAA,KD5JK,OC+JL,gBAAA,mBCSD,UFpKU,UC+JT,iBAAA,eDzJS,mBEkKV,mBDLC,OAAA,IAAA,MAAA,gBEjPD,WACA,YAAA,uBFsPD,IAAA,+CE7OC,IAAK,sDAAuD,4BAA6B,iDAAkD,gBAAiB,gDAAiD,eAAgB,+CAAgD,mBAAoB,2EAA4E,cAE7W,WACA,SAAA,SACA,IAAA,IACA,QAAA,aACA,YAAA,uBACA,WAAA,OACA,YAAA,IACA,YAAA,EAIkC,uBAAA,YAAW,wBAAA,UACX,2BAAW,QAAA,QAEX,uBDuPlC,QAAS,QCtPyB,sBFiPnC,uBEjP8C,QAAA,QACX,wBAAW,QAAA,QACX,wBAAW,QAAA,QACX,2BAAW,QAAA,QACX,yBAAW,QAAA,QACX,wBAAW,QAAA,QACX,wBAAW,QAAA,QACX,yBAAW,QAAA,QACX,wBAAW,QAAA,QACX,uBAAW,QAAA,QACX,6BAAW,QAAA,QACX,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,2BAAW,QAAA,QACX,qBAAW,QAAA,QACX,0BAAW,QAAA,QACX,qBAAW,QAAA,QACX,yBAAW,QAAA,QACX,0BAAW,QAAA,QACX,2BAAW,QAAA,QACX,sBAAW,QAAA,QACX,yBAAW,QAAA,QACX,sBAAW,QAAA,QACX,wBAAW,QAAA,QACX,uBAAW,QAAA,QACX
,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,+BAAW,QAAA,QACX,2BAAW,QAAA,QACX,yBAAW,QAAA,QACX,wBAAW,QAAA,QACX,8BAAW,QAAA,QACX,yBAAW,QAAA,QACX,0BAAW,QAAA,QACX,2BAAW,QAAA,QACX,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,6BAAW,QAAA,QACX,6BAAW,QAAA,QACX,8BAAW,QAAA,QACX,4BAAW,QAAA,QACX,yBAAW,QAAA,QACX,0BAAW,QAAA,QACX,sBAAW,QAAA,QACX,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,2BAAW,QAAA,QACX,wBAAW,QAAA,QACX,yBAAW,QAAA,QACX,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,yBAAW,QAAA,QACX,8BAAW,QAAA,QACX,6BAAW,QAAA,QACX,6BAAW,QAAA,QACX,+BAAW,QAAA,QACX,8BAAW,QAAA
svn commit: r1751442 [3/6] - in /forrest/trunk/main/webapp/skins: ./ fleece-dev/ fleece-dev/css/ fleece-dev/fonts/ fleece-dev/images/ fleece-dev/scripts/ fleece-dev/xslt/ fleece-dev/xslt/fo/ fleece-de
Added: forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.svg URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.svg?rev=1751442&view=auto == --- forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.svg (added) +++ forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.svg Tue Jul 5 11:11:48 2016 @@ -0,0 +1,288 @@ + +http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"; > +http://www.w3.org/2000/svg";> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [... 55 lines stripped ...]
svn commit: r1751442 [4/6] - in /forrest/trunk/main/webapp/skins: ./ fleece-dev/ fleece-dev/css/ fleece-dev/fonts/ fleece-dev/images/ fleece-dev/scripts/ fleece-dev/xslt/ fleece-dev/xslt/fo/ fleece-de
Added: forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.ttf URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.ttf?rev=1751442&view=auto == Binary file - no diff available. Propchange: forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.ttf -- svn:mime-type = application/octet-stream Added: forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.woff URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.woff?rev=1751442&view=auto == Binary file - no diff available. Propchange: forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.woff -- svn:mime-type = application/octet-stream Added: forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.woff2 URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.woff2?rev=1751442&view=auto == Binary file - no diff available. Propchange: forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.woff2 -- svn:mime-type = application/octet-stream Added: forrest/trunk/main/webapp/skins/fleece-dev/images/chapter.gif URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/images/chapter.gif?rev=1751442&view=auto == Binary file - no diff available. Propchange: forrest/trunk/main/webapp/skins/fleece-dev/images/chapter.gif -- svn:mime-type = application/octet-stream Added: forrest/trunk/main/webapp/skins/fleece-dev/images/chapter_open.gif URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/images/chapter_open.gif?rev=1751442&view=auto == Binary file - no diff available. Propchange: forrest/trunk/main/webapp/skins/fleece-dev/images/chapter_open.gif -- svn:mime-type = application/octet-stream Added: forrest/trunk/main/webapp/skins/fleece-dev/images/current.gif URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/images/current.gif?rev=1751442&view=auto == Binary file - no diff available. Propchange: forrest/trunk/main/webapp/skins/fleece-dev/images/current.gif -- svn:mime-type = application/octet-stream Added: forrest/trunk/main/webapp/skins/fleece-dev/images/error.png URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/images/error.png?rev=1751442&view=auto == Binary file - no diff available. Propchange: forrest/trunk/main/webapp/skins/fleece-dev/images/error.png -- svn:mime-type = application/octet-stream Added: forrest/trunk/main/webapp/skins/fleece-dev/images/header_white_line.gif URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/images/header_white_line.gif?rev=1751442&view=auto == Binary file - no diff available. Propchange: forrest/trunk/main/webapp/skins/fleece-dev/images/header_white_line.gif -- svn:mime-type = application/octet-stream Added: forrest/trunk/main/webapp/skins/fleece-dev/images/info.png URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/images/info.png?rev=1751442&view=auto == Binary file - no diff available. Propchange: forrest/trunk/main/webapp/skins/fleece-dev/images/info.png -- svn:mime-type = application/octet-stream Added: forrest/trunk/main/webapp/skins/fleece-dev/images/instruction_arrow.png URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/images/instruction_arrow.png?rev=1751442&view=auto =
svn commit: r1751442 [1/6] - in /forrest/trunk/main/webapp/skins: ./ fleece-dev/ fleece-dev/css/ fleece-dev/fonts/ fleece-dev/images/ fleece-dev/scripts/ fleece-dev/xslt/ fleece-dev/xslt/fo/ fleece-de
Author: sjur
Date: Tue Jul 5 11:11:48 2016
New Revision: 1751442
URL: http://svn.apache.org/viewvc?rev=1751442&view=rev
Log:
Added a very first, raw version of a bootstrap based skin. A lot of things are
uggly and the skin needs a lot of work, but it serves as a starting point. The
main feature of bootstrap, dynamic reflow and layout changes based on browser
window size is working as it should.
Here are the things I did:
* Downloaded:
https://github.com/twbs/bootstrap/releases/download/v3.3.6/bootstrap-3.3.6-dist.zip
* copied all dirs in the unzipped file into fleece-dev/
* renamed js/ -> scripts/ (as pr forrest conventions)
* added jquery 1.11.1 from
https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js
* removed all non-minimised versions of the bootstrap files
* added default images, forrest xslt and css files, as well as skinconf.xsl
from a private version of a bootstrap based skin (see http://divvun.no/, source
code at
https://gtsvn.uit.no/langtech/trunk/xtdoc/divvun/src/documentation/skins/sdbootstrap/)
Feedback welcome :)
Added:
forrest/trunk/main/webapp/skins/fleece-dev/
forrest/trunk/main/webapp/skins/fleece-dev/css/
forrest/trunk/main/webapp/skins/fleece-dev/css/basic.css
forrest/trunk/main/webapp/skins/fleece-dev/css/bootstrap-theme.min.css
forrest/trunk/main/webapp/skins/fleece-dev/css/bootstrap-theme.min.css.map
forrest/trunk/main/webapp/skins/fleece-dev/css/bootstrap.min.css
forrest/trunk/main/webapp/skins/fleece-dev/css/bootstrap.min.css.map
forrest/trunk/main/webapp/skins/fleece-dev/css/print.css
forrest/trunk/main/webapp/skins/fleece-dev/css/profile.css.xslt
forrest/trunk/main/webapp/skins/fleece-dev/css/screen.css
forrest/trunk/main/webapp/skins/fleece-dev/fonts/
forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.eot
(with props)
forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.svg
forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.ttf
(with props)
forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.woff
(with props)
forrest/trunk/main/webapp/skins/fleece-dev/fonts/glyphicons-halflings-regular.woff2
(with props)
forrest/trunk/main/webapp/skins/fleece-dev/images/
forrest/trunk/main/webapp/skins/fleece-dev/images/chapter.gif (with props)
forrest/trunk/main/webapp/skins/fleece-dev/images/chapter_open.gif (with
props)
forrest/trunk/main/webapp/skins/fleece-dev/images/current.gif (with props)
forrest/trunk/main/webapp/skins/fleece-dev/images/error.png (with props)
forrest/trunk/main/webapp/skins/fleece-dev/images/header_white_line.gif
(with props)
forrest/trunk/main/webapp/skins/fleece-dev/images/info.png (with props)
forrest/trunk/main/webapp/skins/fleece-dev/images/instruction_arrow.png
(with props)
forrest/trunk/main/webapp/skins/fleece-dev/images/label.gif (with props)
forrest/trunk/main/webapp/skins/fleece-dev/images/page.gif (with props)
forrest/trunk/main/webapp/skins/fleece-dev/images/pdfdoc.gif (with props)
forrest/trunk/main/webapp/skins/fleece-dev/images/printer.gif (with props)
forrest/trunk/main/webapp/skins/fleece-dev/images/success.png (with props)
forrest/trunk/main/webapp/skins/fleece-dev/images/warning.png (with props)
forrest/trunk/main/webapp/skins/fleece-dev/images/xmldoc.gif (with props)
forrest/trunk/main/webapp/skins/fleece-dev/scripts/
forrest/trunk/main/webapp/skins/fleece-dev/scripts/bootstrap.min.js
forrest/trunk/main/webapp/skins/fleece-dev/scripts/jquery.min.js
forrest/trunk/main/webapp/skins/fleece-dev/skinconf.xsl
forrest/trunk/main/webapp/skins/fleece-dev/xslt/
forrest/trunk/main/webapp/skins/fleece-dev/xslt/fo/
forrest/trunk/main/webapp/skins/fleece-dev/xslt/fo/document-to-fo.xsl
forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/
forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/book-to-menu.xsl
forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/document-to-html.xsl
forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl
forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/tab-to-menu.xsl
Modified:
forrest/trunk/main/webapp/skins/new-skin-names.txt
Added: forrest/trunk/main/webapp/skins/fleece-dev/css/basic.css
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/css/basic.css?rev=1751442&view=auto
==
--- forrest/trunk/main/webapp/skins/fleece-dev/css/basic.css (added)
+++ forrest/trunk/main/webapp/skins/fleece-dev/css/basic.css Tue Jul 5
11:11:48 2016
@@ -0,0 +1,194 @@
+/**
+ * General
+ */
+
+img {
+/*border: 0;*/
+}
+
+#content table {
+/*border: 0;
+width: 100%;*/
+}
+/*Hack to get IE to render the table at 100%*/
+* html #content table { margin
svn commit: r1751442 [6/6] - in /forrest/trunk/main/webapp/skins: ./ fleece-dev/ fleece-dev/css/ fleece-dev/fonts/ fleece-dev/images/ fleece-dev/scripts/ fleece-dev/xslt/ fleece-dev/xslt/fo/ fleece-de
Added: forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl?rev=1751442&view=auto == --- forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl (added) +++ forrest/trunk/main/webapp/skins/fleece-dev/xslt/html/site-to-xhtml.xsl Tue Jul 5 11:11:48 2016 @@ -0,0 +1,796 @@ + + +http://www.w3.org/1999/XSL/Transform"; xmlns:i18n="http://apache.org/cocoon/i18n/2.1"; exclude-result-prefixes="i18n"> + + + + +html lang="en" xml:lang="en" + +HTML-head + +Bootstrap-specific meta tags: + + +generator meta +Add some Forrest-specific metadata + +Add any metadata from the documents + + + +title + + + + + + + + + ( + +) + + + + + + + ( + +) + + + + + + + +stylesheets + + + + + +Javascripts + + + +favicon + + + + + + + + +HTML-body + + +ndeSetTextSize(); + +Site structure ++=+ +| topstrip | ++=+ +| | +| centerstrip | +| | +| | ++=+ +| bottomstrip | ++=+ + +topstrip with logos and search box + +breadcrumbs org location + +header + +start Tabs + + + +start Project Logo + + + +true + + +false + + + + + +projectlogoA1 + + + + + + + + + + + + + + + + + +end Project Logo + + + + + +end Tabs + + +start Subtabs + + + + +
svn commit: r1657751 - /forrest/trunk/main/webapp/skins/common/xslt/html/tab-to-menu.xsl
Author: sjur Date: Fri Feb 6 07:31:32 2015 New Revision: 1657751 URL: http://svn.apache.org/r1657751 Log: Fixed a bug in level2 tabs where multiple tabs where highlighted at the same time when using @id for tab association/identification. Now only the relevant tab is highlighted. The new code is parallel to the level1 code a few lines above. Tested locally, and it seems to work as intended. I could not find any bug reports on this issue, although FOR-127 and FOR-128 might be related. Those are very old bug reports though, and likely outdated by now. Modified: forrest/trunk/main/webapp/skins/common/xslt/html/tab-to-menu.xsl Modified: forrest/trunk/main/webapp/skins/common/xslt/html/tab-to-menu.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/common/xslt/html/tab-to-menu.xsl?rev=1657751&r1=1657750&r2=1657751&view=diff == --- forrest/trunk/main/webapp/skins/common/xslt/html/tab-to-menu.xsl (original) +++ forrest/trunk/main/webapp/skins/common/xslt/html/tab-to-menu.xsl Fri Feb 6 07:31:32 2015 @@ -164,7 +164,7 @@ which is then merged by site-to-xhtml.xs - +
svn commit: r1657748 - in /forrest/trunk/tools/xxe: README.txt common_config.xml document-v10.xxe document-v20.xxe toolBar.xml
Author: sjur Date: Fri Feb 6 07:08:25 2015 New Revision: 1657748 URL: http://svn.apache.org/r1657748 Log: Updates to the xxe tool to make it compatible with version 4.x of Xmlmind XML Editor. These changes have been lingering around on my harddisk for a long time, and are by now more or less irrelevant: XXE is now at version 6.x, and from version 5.x onwards the free edition is no more. But if anyone is still using version 4, or is using any of the paid versions, this might still be valuable. No guarantee for the usability of the code with newer versions of XXE though. It worked with version 4, but it has not been tested with newer versions of XXE. Modified: forrest/trunk/tools/xxe/README.txt forrest/trunk/tools/xxe/common_config.xml forrest/trunk/tools/xxe/document-v10.xxe forrest/trunk/tools/xxe/document-v20.xxe forrest/trunk/tools/xxe/toolBar.xml Modified: forrest/trunk/tools/xxe/README.txt URL: http://svn.apache.org/viewvc/forrest/trunk/tools/xxe/README.txt?rev=1657748&r1=1657747&r2=1657748&view=diff == --- forrest/trunk/tools/xxe/README.txt (original) +++ forrest/trunk/tools/xxe/README.txt Fri Feb 6 07:08:25 2015 @@ -27,7 +27,8 @@ questions to XXE support or mailing list Requirements: = -* XXE 3.0p1+ (version 1.3 of the tool works with XXE version 2.5p3 - 3.0) +* XXE 4.x (version 1.4 of the tool works with XXE version 4.0 > 3.0, and + version 1.3 of the tool works with XXE version 2.5p3 - 3.0) * Forrest 0.5+ @@ -45,11 +46,7 @@ Upgrading Installing == -* Extract into the XXE application config directory (e.g. D:\Program Files\XMLmind_XML_Editor\config) - OR -* Extract into your XXE user directory (e.g. ~/.xxe/addon/config) (only for version 1.3+ of this config) - For version 1.3+ of this tool, this is the recommended installation location, as it permits upgrading XXE without having to reinstall the tool - NOTE: This location is new for XXE 2.10, and is not tested with earlier releases! +Follow the instructions on http://www.xmlmind.com/xmleditor/addons.shtml#manual_install Developer Instructions @@ -66,6 +63,11 @@ folder in the XXE 'addon' folder. Run th History === +1.5: + +- Updated the tool to work with XXE 4.x + NOTE: This change is backwards INCOMPATIBLE, therefore the tool now requires XXE 4.x + 1.4: - Updated the tool to work with XXE 3.0p1 (FOR-779). Modified: forrest/trunk/tools/xxe/common_config.xml URL: http://svn.apache.org/viewvc/forrest/trunk/tools/xxe/common_config.xml?rev=1657748&r1=1657747&r2=1657748&view=diff == --- forrest/trunk/tools/xxe/common_config.xml (original) +++ forrest/trunk/tools/xxe/common_config.xml Fri Feb 6 07:08:25 2015 @@ -1,11 +1,11 @@ http://www.xmlmind.com/xmleditor/schema/configuration - xsd/configuration.xsd" + ../xxe_config_pack/config/xsd/configuration.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://www.xmlmind.com/xmleditor/schema/configuration"; xmlns:cfg="http://www.xmlmind.com/xmleditor/schema/configuration";> + + + @@ -43,6 +46,7 @@ + @@ -55,27 +59,34 @@ + - - - + + + + + + + + + @@ -87,6 +98,7 @@ + @@ -98,35 +110,40 @@ - + + - + + + + - + - -com.xmlmind.xmleditapp.xhtml.table.TableColumn - - -com.xmlmind.xmleditapp.xhtml.table.TableRow + + +com.xmlmind.xmleditext.xhtml.table.HTMLTableEdit - - + + + + + @@ -134,36 +151,32 @@ command="add" parameter="after[implicitElement] #template(table,tableUnheaded)" /> - - - + + + - - - + + + + + Modified: forrest/trunk/tools/xxe/document-v10.xxe URL: http://svn.apache.org/viewvc/forrest/trunk/tools/xxe/document-v10.xxe?rev=1657748&r1=1657747&r2=1657748&view=diff == --- forrest/trunk/tools/xxe/document-v10.xxe (original) +++ forrest/trunk/tools/xxe/document-v10.xxe Fri Feb 6 07:08:25 2015 @@ -1,11 +1,11 @@ http://www.xmlmind.com/xmleditor/schema/configuration - xsd/configuration.xsd" + ../xxe_config_pack/config/xsd/configuration.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
svn commit: r1644001 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/css/pelt.screen.css
Author: sjur
Date: Tue Dec 9 08:58:17 2014
New Revision: 1644001
URL: http://svn.apache.org/r1644001
Log:
Slight simplification of the css, whitespace change for increased readability.
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/css/pelt.screen.css
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/css/pelt.screen.css
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/css/pelt.screen.css?rev=1644001&r1=1644000&r2=1644001&view=diff
==
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/css/pelt.screen.css
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/css/pelt.screen.css
Tue Dec 9 08:58:17 2014
@@ -16,7 +16,8 @@
*/
body {
-margin: 0px 0px 0px 0px; font-family: Verdana, Helvetica, sans-serif;
+margin: 0px ;
+font-family: Verdana, Helvetica, sans-serif;
background-color: #FF;
color: #00;
}
svn commit: r1641622 - in /forrest/trunk/main/webapp/skins: coat/xslt/html/site-to-xhtml.xsl pelt/xslt/html/site-to-xhtml.xsl scales/xslt/html/site-to-xhtml.xsl
Author: sjur
Date: Tue Nov 25 14:07:42 2014
New Revision: 1641622
URL: http://svn.apache.org/r1641622
Log:
Better support for i18n for the search box and its placeholder text. Also
improved the same for the font resize buttons.
Modified:
forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl
forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl
forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl
Modified: forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl?rev=1641622&r1=1641621&r2=1641622&view=diff
==
--- forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl Tue Nov 25
14:07:42 2014
@@ -200,8 +200,8 @@ footer, searchbar, css etc. As input, i
-
-
+
+
@@ -211,8 +211,8 @@ footer, searchbar, css etc. As input, i
http://www.google.com/search";>
-
-
+
+
@@ -416,8 +416,8 @@ footer, searchbar, css etc. As input, i
-
-
+
+
@@ -427,8 +427,8 @@ footer, searchbar, css etc. As input, i
http://www.google.com/search";>
-
-
+
+
@@ -698,9 +698,9 @@ if (VERSION > 3) {
Font size:
-
-
-
+
+
+
Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl?rev=1641622&r1=1641621&r2=1641622&view=diff
==
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl Tue Nov 25
14:07:42 2014
@@ -198,17 +198,16 @@ footer, searchbar, css etc. As input, i
|start Search
+
-
- Search the site with
-
-
+Search the site with
-
-
+
+
@@ -218,8 +217,8 @@ footer, searchbar, css etc. As input, i
http://www.google.com/search";>
-
-
+
+
@@ -459,11 +458,10 @@ document.write("]]>Last Publ
+
-
-Search the site with
-
-
-
+Search the site with
+
@@ -479,7 +477,7 @@ document.write("]]>Last Publ
http://www.google.com/search";>
-
+
@@ -749,10 +747,10 @@ if (VERSION > 3) {
-Font size:
-
-
-
+Font size:
+
+
+
Modified: forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl?rev=1641622&r1=1641621&r2=1641622&view=diff
==
--- forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl
(original)
+++ forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.
svn commit: r1624977 - /forrest/trunk/
Author: sjur Date: Mon Sep 15 09:09:58 2014 New Revision: 1624977 URL: http://svn.apache.org/r1624977 Log: svn:ignore the build directory. Modified: forrest/trunk/ (props changed) Propchange: forrest/trunk/ -- --- svn:ignore (original) +++ svn:ignore Mon Sep 15 09:09:58 2014 @@ -2,3 +2,4 @@ deploy.svn.settings .classpath .project *.iml +build
svn commit: r1624976 - in /forrest/trunk: plugins/ plugins/org.apache.forrest.plugin.output.pdf/ site-author/ tools/forrestbar/ whiteboard/plugins/ whiteboard/plugins/org.apache.forrest.plugin.interna
Author: sjur Date: Mon Sep 15 09:08:23 2014 New Revision: 1624976 URL: http://svn.apache.org/r1624976 Log: svn:ignore the build directory. Modified: forrest/trunk/plugins/ (props changed) forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/ (props changed) forrest/trunk/site-author/ (props changed) forrest/trunk/tools/forrestbar/ (props changed) forrest/trunk/whiteboard/plugins/ (props changed) forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/ (props changed) Propchange: forrest/trunk/plugins/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 15 09:08:23 2014 @@ -0,0 +1 @@ +build Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 15 09:08:23 2014 @@ -0,0 +1 @@ +build Propchange: forrest/trunk/site-author/ -- --- svn:ignore (original) +++ svn:ignore Mon Sep 15 09:08:23 2014 @@ -1,2 +1,3 @@ work logs +build Propchange: forrest/trunk/tools/forrestbar/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 15 09:08:23 2014 @@ -0,0 +1 @@ +build Propchange: forrest/trunk/whiteboard/plugins/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 15 09:08:23 2014 @@ -0,0 +1 @@ +build Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 15 09:08:23 2014 @@ -0,0 +1 @@ +build
svn commit: r1624975 - in /forrest/trunk: plugins/org.apache.forrest.plugin.input.OpenOffice.org/ plugins/org.apache.forrest.plugin.input.dtdx/ plugins/org.apache.forrest.plugin.input.projectInfo/ plu
Author: sjur Date: Mon Sep 15 09:07:01 2014 New Revision: 1624975 URL: http://svn.apache.org/r1624975 Log: svn:ignore the build directory. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/ (props changed) forrest/trunk/plugins/org.apache.forrest.plugin.input.dtdx/ (props changed) forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/ (props changed) forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/ (props changed) forrest/trunk/plugins/org.apache.forrest.plugin.output.POD/ (props changed) forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/ (props changed) forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/ (props changed) forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/ (props changed) forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/ (props changed) forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/ (props changed) Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 15 09:07:01 2014 @@ -0,0 +1 @@ +build Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.input.dtdx/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 15 09:07:01 2014 @@ -0,0 +1 @@ +build Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 15 09:07:01 2014 @@ -0,0 +1 @@ +build Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 15 09:07:01 2014 @@ -0,0 +1 @@ +build Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.output.POD/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 15 09:07:01 2014 @@ -0,0 +1 @@ +build Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.output.Text/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 15 09:07:01 2014 @@ -0,0 +1 @@ +build Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.glossary/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 15 09:07:01 2014 @@ -0,0 +1 @@ +build Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 15 09:07:01 2014 @@ -0,0 +1 @@ +build Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 15 09:07:01 2014 @@ -0,0 +1 @@ +build Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 15 09:07:01 2014 @@ -0,0 +1 @@ +build
svn commit: r1438208 - /forrest/trunk/main/webapp/resources.xmap
Author: sjur Date: Thu Jan 24 21:38:25 2013 New Revision: 1438208 URL: http://svn.apache.org/viewvc?rev=1438208&view=rev Log: Javascript now served (at least from our sitemap) as text/javascript. Modified: forrest/trunk/main/webapp/resources.xmap Modified: forrest/trunk/main/webapp/resources.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources.xmap?rev=1438208&r1=1438207&r2=1438208&view=diff == --- forrest/trunk/main/webapp/resources.xmap (original) +++ forrest/trunk/main/webapp/resources.xmap Thu Jan 24 21:38:25 2013 @@ -133,11 +133,11 @@ $Revision: 1.13 $ - + - +
svn commit: r1438174 - /forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl
Author: sjur Date: Thu Jan 24 20:44:17 2013 New Revision: 1438174 URL: http://svn.apache.org/viewvc?rev=1438174&view=rev Log: Simplified the identity template. Content is equivalent. Modified: forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl Modified: forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl?rev=1438174&r1=1438173&r2=1438174&view=diff == --- forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl Thu Jan 24 20:44:17 2013 @@ -280,9 +280,9 @@ - + - +
svn commit: r1438171 - in /forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki: resources/chaperon/grammars/wiki.grm resources/chaperon/stylesheets/wiki2xdoc.xsl status.xml
Author: sjur Date: Thu Jan 24 20:40:31 2013 New Revision: 1438171 URL: http://svn.apache.org/viewvc?rev=1438171&view=rev Log: Some small changes to allow for colons in table titles. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm?rev=1438171&r1=1438170&r2=1438171&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm Thu Jan 24 20:40:31 2013 @@ -241,7 +241,8 @@ tablehead ; tabletitle - : tabletitleitem textblock + : tabletitleitem textblock deftermdefstart + | tabletitleitem textblock ; tablerows Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl?rev=1438171&r1=1438170&r2=1438171&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl Thu Jan 24 20:40:31 2013 @@ -201,7 +201,8 @@ - + + Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=1438171&r1=1438170&r2=1438171&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Thu Jan 24 20:40:31 2013 @@ -24,6 +24,9 @@ +Some small changes to allow for colons in table titles. + + Allow more items as (the first) symbol(s) within inline elements.
svn commit: r1435901 - in /forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki: resources/chaperon/grammars/wiki.grm resources/chaperon/stylesheets/wiki2xdoc.xsl status.xml
Author: sjur Date: Sun Jan 20 17:47:17 2013 New Revision: 1435901 URL: http://svn.apache.org/viewvc?rev=1435901&view=rev Log: Removed unneccessary block of reserved characters inside em, strong and code elements. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm?rev=1435901&r1=1435900&r2=1435901&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm Sun Jan 20 17:47:17 2013 @@ -307,15 +307,30 @@ termtextblock ; emblock - : emitem text emitem + : emitem plaintextblock emitem ; strongblock - : strongitem text strongitem + : strongitem plaintextblock strongitem ; codeblock - : codeopenitem text codecloseitem + : codeopenitem plaintextblock codecloseitem + ; + +plaintextblock + : plaintextitems plaintextblock + | plaintextitems + ; + +plaintextitems + : text + | deftermstart + | deftermdefstart + | tablecolumnitem + | subsubtitleitem + | bulleted1item + | numbered1item ; deflist Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl?rev=1435901&r1=1435900&r2=1435901&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl Sun Jan 20 17:47:17 2013 @@ -321,15 +321,15 @@ - + - + - + Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=1435901&r1=1435900&r2=1435901&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Sun Jan 20 17:47:17 2013 @@ -23,6 +23,10 @@ + +Removed unneccessary block of reserved characters inside em, strong and +code elements. + The list of cases for when NOT to add a space after a text segment was incomplete, thus several constructs contained spaces not in the original
svn commit: r1435515 - in /forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki: resources/chaperon/stylesheets/wiki2xdoc.xsl status.xml
Author: sjur Date: Sat Jan 19 10:17:42 2013 New Revision: 1435515 URL: http://svn.apache.org/viewvc?rev=1435515&view=rev Log: Renamed template name to make its purpose clearer. Added a number of other tests for when a space should NOT be added after a text segment. It should be fairly complete now (but only for the Latin script). Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl?rev=1435515&r1=1435514&r2=1435515&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl Sat Jan 19 10:17:42 2013 @@ -65,8 +65,10 @@ - + + @@ -208,7 +229,7 @@ - + @@ -244,7 +265,7 @@ - + @@ -301,15 +322,15 @@ - + - + - + Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=1435515&r1=1435514&r2=1435515&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Sat Jan 19 10:17:42 2013 @@ -24,6 +24,12 @@ +The list of cases for when NOT to add a space after a text segment was +incomplete, thus several constructs contained spaces not in the original +input. Now fixed for all common punctuation in the Latin script. The +list can easily be extended if need be. + + Corrected a regression introduced in the previous fix.
svn commit: r1435387 - /forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml
Author: sjur Date: Fri Jan 18 22:42:40 2013 New Revision: 1435387 URL: http://svn.apache.org/viewvc?rev=1435387&view=rev Log: Status update. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=1435387&r1=1435386&r2=1435387&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Fri Jan 18 22:42:40 2013 @@ -23,6 +23,9 @@ + +Corrected a regression introduced in the previous fix. + Made i18n support in the wiki plugin configurable, by way of an xml configuration file. The default is false.
svn commit: r1435381 - in /forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon: grammars/wiki.grm stylesheets/wiki2xdoc.xsl
Author: sjur Date: Fri Jan 18 22:36:06 2013 New Revision: 1435381 URL: http://svn.apache.org/viewvc?rev=1435381&view=rev Log: The recent changes introduced one regression - linebreaks triggered new paragraphs where they shouldn't. Now newlines in the middle of a paragraph doesn't introduce a new paragaph anymore, and everything else seems to be the same. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm?rev=1435381&r1=1435380&r2=1435381&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm Fri Jan 18 22:36:06 2013 @@ -133,18 +133,18 @@ subsubsection ; title - : titleitem textsequence - | titleitem textsequence hardbreak + : titleitem limitedtextsequence + | titleitem limitedtextsequence hardbreak ; subtitle - : subtitleitem textsequence - | subtitleitem textsequence hardbreak + : subtitleitem limitedtextsequence + | subtitleitem limitedtextsequence hardbreak ; subsubtitle - : subsubtitleitem textsequence - | subsubtitleitem textsequence hardbreak + : subsubtitleitem limitedtextsequence + | subsubtitleitem limitedtextsequence hardbreak ; paragraphs @@ -259,15 +259,23 @@ tablecolumn ; limitedtextsequence - : textblock break limitedtextsequence - | textblock limitedtextsequence - | textblock + : limitedtextblock limitedtextsequence + | limitedtextblock ; +limitedtextblock + : link + | anchor + | strongblock + | emblock + | text + | codeblock + | deftermdefstart + | break + ; + textsequence - : textblock textsequence softbreak - | textblock textsequence - | textblock softbreak + : textblock textsequence | textblock ; @@ -280,6 +288,7 @@ textblock | codeblock | deftermdefstart | break + | softbreak ; termtextsequence Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl?rev=1435381&r1=1435380&r2=1435381&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl Fri Jan 18 22:36:06 2013 @@ -134,19 +134,19 @@ - + - + - + @@ -191,7 +191,7 @@ -
svn commit: r1435066 - in /forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki: default.plugin.properties.xml input.xmap status.xml
Author: sjur Date: Fri Jan 18 10:14:40 2013 New Revision: 1435066 URL: http://svn.apache.org/viewvc?rev=1435066&view=rev Log: Made i18n support in the wiki plugin configurable, by way of an xml configuration file. The default is false. Commit of some code changes I have had locally for years - literally! Forrest has been in use all the time, so there should be no big issues connected to this new feature. Added: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/default.plugin.properties.xml (with props) Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Added: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/default.plugin.properties.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/default.plugin.properties.xml?rev=1435066&view=auto == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/default.plugin.properties.xml (added) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/default.plugin.properties.xml Fri Jan 18 10:14:40 2013 @@ -0,0 +1,24 @@ + + + + + + Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/default.plugin.properties.xml -- svn:eol-style = native Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap?rev=1435066&r1=1435065&r2=1435066&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap Fri Jan 18 10:14:40 2013 @@ -35,57 +35,104 @@ + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + + - + + - + + Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=1435066&r1=1435065&r2=1435066&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Fri Jan 18 10:14:40 2013 @@ -23,6 +23,10 @@ + +Made i18n support in the wiki plugin configurable, by way of an xml +configuration file. The default is false. + Added support for definition list constructs (;Term:definition). Fixed numerous spacing bugs: extra or missing spaces after inline elements.
svn commit: r1435063 - in /forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki: resources/chaperon/grammars/wiki.grm resources/chaperon/stylesheets/wiki2xdoc.xsl status.xml
Author: sjur
Date: Fri Jan 18 09:54:19 2013
New Revision: 1435063
URL: http://svn.apache.org/viewvc?rev=1435063&view=rev
Log:
A number of changes:
* Added support for definition list constructs (;Term:definition).
* Fixed numerous spacing bugs: extra or missing spaces after inline elements.
* Improved support for inline formatting and breaks, especially in tables.
* Fixed processing of no-link constructs: [[text] should be
rendered as [text], earlier it was rendered as
[[text].
The plugin should now support all relevant http://www.jspwiki.org/wiki/TextFormattingRules";>jspwiki markup.
As part of the changes, I also added whitespace to the grammar and the xsl, to
make them more readable. I also added comments to the xsl.
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm?rev=1435063&r1=1435062&r2=1435063&view=diff
==
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm
(original)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm
Fri Jan 18 09:54:19 2013
@@ -33,19 +33,30 @@
%token source "\{\{\{ (\}{0,2}[^\}])* \}\}\}";
+%token text "([^\ \t\n\r\[\{\}\|\*\\\-_!#';:]
+ | _[^_\n\r]
+ | \{[^\{\n\r]
+ | \}[^\}\n\r]
+ | '[^'\n\r]
+ | \[\[
+ | \\[^\\\n\r]
+ | \-{1,3}[^\-\n\r]?)
+ ([^\n\r\[\{\}\|\\\-_':]
+ | _[^_\n\r]
+ | \{[^\{\n\r]
+ | \}[^\}\n\r]
+ | '[^'\n\r]
+ | \[\[
+ | \\[^\\\n\r]
+ | \-{1,3}[^\-\n\r]?
+ | \|[^\|\ \t])*";
+
%token anchor "\[( [^\[\|\]]* \| )? # [^\[\|\]]* \]";
%token link "\[( [^\[\|\]]* \| )? [^\[\|\]]* \]";
-%token text "([^\ \t\n\r\[\{\}\|\*\\\-_!#'] | _[^_\n\r] | \{[^\{\n\r] |
\}[^\}\n\r] | '[^'\n\r]
- | \[\[ | \\[^\\\n\r] |
\-{1,3}[^\-\n\r]?)
- ([^\n\r\[\{\}\|\\\-_'] | _[^_\n\r] | \{[^\{\n\r] |
\}[^\}\n\r] | '[^'\n\r]
- | \[\[ | \\[^\\\n\r] |
\-{1,3}[^\-\n\r]? | \|[^\|\ \t])*";
-
-%right softbreak "\r(\n?) | \n";
-
-%right break "";
-
+%right break "";
+%right softbreak "\r(\n?) | \n";
%right hardbreak "(\r(\n?) | \n) ([\ \t]* (\r(\n?) | \n))+";
%token bulleted1item "\*";
@@ -56,6 +67,9 @@
%token numbered2item "##";
%token numbered3item "###";
+%right deftermstart "\;";
+%token deftermdefstart "\:";
+
%ignore "[\ \t]+";
%start document;
@@ -143,6 +157,7 @@ paragraphs
paragraph
: bulletedlist1
| numberedlist1
+ | deflist
| textsequence
| line
| source %prec softbreak
@@ -240,24 +255,45 @@ tablecolumns
;
tablecolumn
- : tablecolumnitem textblock
+ : tablecolumnitem limitedtextsequence
;
-textsequence
- : textsequence textblock softbreak
- | textsequence textblock
+limitedtextsequence
+ : textblock break limitedtextsequence
+ | textblock limitedtextsequence
+ | textblock
+ ;
+
+textsequence
+ : textblock textsequence softbreak
+ | textblock textsequence
| textblock softbreak
| textblock
- | textsequence textblock break
- | textblock break
;
textblock
: link
| anchor
- | strongblock
- | emblock
- | text
+ | strongblock
+ | emblock
+ | text
+ | codeblock
+ | deftermdefstart
+ | break
+ ;
+
+termtextsequence
+ : termtextblock break termtextsequence
+ | termtextblock termtextsequence
+ | termtextblock
+ ;
+
+termtextblock
+ : link
+ | anchor
+ | strongblock
+ | emblock
+ | text
| codeblock
;
@@ -273,8 +309,22 @@ codeblock
: codeopenitem text codecloseitem
;
-/*
-deflistblock
- : defliststart text deflistnext
+deflist
+ : defentry deflist %prec PLUS
+ | defentry
+ ;
+
+defentry
+ : deflistterm deflistdef
+ ;
+
+deflistterm
+ : deftermstart termtextsequence
+ | deftermstart
+ ;
+
+deflistdef
+ : deftermdefstart textsequence
+ | deftermdefstart softbreak
+ | deftermdefstart
;
-*/
Modified:
forrest/trunk/plugins/org.apache.forrest.p
svn commit: r1433459 - /forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml
Author: sjur Date: Tue Jan 15 15:37:13 2013 New Revision: 1433459 URL: http://svn.apache.org/viewvc?rev=1433459&view=rev Log: Corrected the reference to the project-specific resources. Earlier they didn't work, which made it impossible to override the plugin-specified files. Now it should be possible to override. It works for me, at least. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml?rev=1433459&r1=1433458&r2=1433459&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml Tue Jan 15 15:37:13 2013 @@ -31,19 +31,19 @@ - + - + - +
svn propchange: r1058405 - svn:log
Author: sjur Revision: 1058405 Modified property: svn:log Modified: svn:log at Thu Jan 13 07:42:54 2011 -- --- svn:log (original) +++ svn:log Thu Jan 13 07:42:54 2011 @@ -1 +1 @@ -Added standalone 'validate-site' build target to validate the project status changes file. +Added standalone 'validate-status' build target to validate the project status changes file.
svn commit: r998805 - in /forrest/trunk/tools/xxe/css: common.css document1x.css document2x.css
Author: sjur Date: Mon Sep 20 06:57:10 2010 New Revision: 998805 URL: http://svn.apache.org/viewvc?rev=998805&view=rev Log: Correct mime type as svn property. This will allow the files to be properly served when browsing the repository using a web browser. Modified: forrest/trunk/tools/xxe/css/common.css (props changed) forrest/trunk/tools/xxe/css/document1x.css (props changed) forrest/trunk/tools/xxe/css/document2x.css (props changed) Propchange: forrest/trunk/tools/xxe/css/common.css -- svn:mime-type = text/css Propchange: forrest/trunk/tools/xxe/css/document1x.css -- svn:mime-type = text/css Propchange: forrest/trunk/tools/xxe/css/document2x.css -- svn:mime-type = text/css
svn commit: r957159 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/NOTICE.txt
Author: sjur Date: Wed Jun 23 11:14:28 2010 New Revision: 957159 URL: http://svn.apache.org/viewvc?rev=957159&view=rev Log: test - please ignore. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/NOTICE.txt Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/NOTICE.txt URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/NOTICE.txt?rev=957159&r1=957158&r2=957159&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/NOTICE.txt (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/NOTICE.txt Wed Jun 23 11:14:28 2010 @@ -10,4 +10,3 @@ The purpose of this NOTICE.txt file is t required by the copyright owner and their license. Some of the accompanying products have an attribution requirement, so see below. Other accompanying products do not require attribution, so are not listed. -
svn commit: r957158 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/NOTICE.txt
Author: sjur Date: Wed Jun 23 11:13:53 2010 New Revision: 957158 URL: http://svn.apache.org/viewvc?rev=957158&view=rev Log: test - please ignore. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/NOTICE.txt Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/NOTICE.txt URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/NOTICE.txt?rev=957158&r1=957157&r2=957158&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/NOTICE.txt (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/NOTICE.txt Wed Jun 23 11:13:53 2010 @@ -10,3 +10,4 @@ The purpose of this NOTICE.txt file is t required by the copyright owner and their license. Some of the accompanying products have an attribution requirement, so see below. Other accompanying products do not require attribution, so are not listed. +
svn commit: r888789 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-version.contract.xml
Author: sjur Date: Wed Dec 9 12:49:25 2009 New Revision: 888789 URL: http://svn.apache.org/viewvc?rev=888789&view=rev Log: FO contract to add document version info based on $Revision tag. Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-version.contract.xml (with props) Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-version.contract.xml URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-version.contract.xml?rev=888789&view=auto == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-version.contract.xml (added) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-version.contract.xml Wed Dec 9 12:49:25 2009 @@ -0,0 +1,74 @@ + + +http://apache.org/cocoon/i18n/2.1"; + xmlns:forrest="http://apache.org/forrest/templates/1.0"; + name="content-version"> + + + content-version will output the version of the document. + + + + + + http://apache.org/forrest/templates/1.0"; +name="content-version" inputFormat="xsl"> +http://www.w3.org/1999/XSL/Transform"; + xmlns:fo="http://www.w3.org/1999/XSL/Format"; + version="1.0"> + + + + + + + + + + + + + + + + + + + + + + + Version + + + + + + + + + + + + Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-version.contract.xml -- svn:eol-style = native
svn commit: r831227 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs: Meeting_2009-10-21.jspwiki memos/Meeting_2009-10-21.jspwiki
Author: sjur Date: Fri Oct 30 08:44:01 2009 New Revision: 831227 URL: http://svn.apache.org/viewvc?rev=831227&view=rev Log: Converted files to ISO Latin 1, to avoid strange UTF-8 sequences in non-UTF-8 environments. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/Meeting_2009-10-21.jspwiki forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/memos/Meeting_2009-10-21.jspwiki Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/Meeting_2009-10-21.jspwiki URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/Meeting_2009-10-21.jspwiki?rev=831227&r1=831226&r2=831227&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/Meeting_2009-10-21.jspwiki (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/Meeting_2009-10-21.jspwiki Fri Oct 30 08:44:01 2009 @@ -7,12 +7,12 @@ !!!Tasks !!Joe -[iCal tasks|Tasks_2009-10-21_Joe.ics]Â - click this link to download the +[iCal tasks|Tasks_2009-10-21_Joe.ics] - click this link to download the following tasks as iCal entries. * move default deadline into a property * extend the conventions for todo items to include an explicit deadline * allow more flexible naming conventions for the meeting documents and the related iCal file * this task also contains a URL - [iCal info|http://en.wikipedia.org/wiki/ICalendar]Â - it should be rendered + [iCal info|http://en.wikipedia.org/wiki/ICalendar] - it should be rendered properly in your iCal client Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/memos/Meeting_2009-10-21.jspwiki URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/memos/Meeting_2009-10-21.jspwiki?rev=831227&r1=831226&r2=831227&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/memos/Meeting_2009-10-21.jspwiki (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/memos/Meeting_2009-10-21.jspwiki Fri Oct 30 08:44:01 2009 @@ -7,12 +7,12 @@ !!!Tasks !!Joe -[iCal tasks|Tasks_2009-10-21_Joe.ics]Â - click this link to download the +[iCal tasks|Tasks_2009-10-21_Joe.ics] - click this link to download the following tasks as iCal entries. * move default deadline into a property * extend the conventions for todo items to include an explicit deadline * allow more flexible naming conventions for the meeting documents and the related iCal file * this task also contains a URL - [iCal info|http://en.wikipedia.org/wiki/ICalendar]Â - it should be rendered + [iCal info|http://en.wikipedia.org/wiki/ICalendar] - it should be rendered properly in your iCal client
svn commit: r830461 - /forrest/trunk/whiteboard/plugins/whiteboard-plugins.xml
Author: sjur Date: Wed Oct 28 08:28:13 2009 New Revision: 830461 URL: http://svn.apache.org/viewvc?rev=830461&view=rev Log: Support for the iCal plugin. OOo plugin in a more logical place. Modified: forrest/trunk/whiteboard/plugins/whiteboard-plugins.xml Modified: forrest/trunk/whiteboard/plugins/whiteboard-plugins.xml URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/whiteboard-plugins.xml?rev=830461&r1=830460&r2=830461&view=diff == --- forrest/trunk/whiteboard/plugins/whiteboard-plugins.xml (original) +++ forrest/trunk/whiteboard/plugins/whiteboard-plugins.xml Wed Oct 28 08:28:13 2009 @@ -313,7 +313,33 @@ 0.8 - + + http://forrest.apache.org/pluginDocs/plugins_0_90/org.apache.forrest.plugin.output.OOo/"; +url="http://forrest.apache.org/plugins/"; +version="0.1"> + + Creates OpenOffice 2.4+ .odt output from forrest xdoc. + +0.9 + + + http://forrest.apache.org/pluginDocs/plugins_0_90/org.apache.forrest.plugin.output.iCal/"; +url="http://forrest.apache.org/plugins/"; +version="0.1"> + + Creates iCal .ics files from forrest xdoc. + +0.9 + + + + 0.8 - - http://forrest.apache.org/pluginDocs/plugins_0_90/org.apache.forrest.plugin.output.OOo/"; -url="http://forrest.apache.org/plugins/"; -version="0.1"> - - Creates OpenOffice 2.4+ .odt output from forrest xdoc. - -0.9 -
svn commit: r830460 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/
Author: sjur Date: Wed Oct 28 08:25:38 2009 New Revision: 830460 URL: http://svn.apache.org/viewvc?rev=830460&view=rev Log: Ignore the build directory. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/ (props changed) Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/ -- --- svn:ignore (added) +++ svn:ignore Wed Oct 28 08:25:38 2009 @@ -0,0 +1 @@ +build
svn commit: r830459 [2/2] - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal: ./ resources/ resources/stylesheets/ src/ src/documentation/ src/documentation/classes/ src/docu
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/status.xml -- svn:eol-style = native
svn commit: r830327 - in /forrest/trunk/main/webapp/resources/stylesheets/exslt/date/functions/add: ./ date.add.template.xsl
Author: sjur Date: Tue Oct 27 20:23:38 2009 New Revision: 830327 URL: http://svn.apache.org/viewvc?rev=830327&view=rev Log: EXSLT extension function needed for iCal output plugin. Added: forrest/trunk/main/webapp/resources/stylesheets/exslt/date/functions/add/ forrest/trunk/main/webapp/resources/stylesheets/exslt/date/functions/add/date.add.template.xsl Added: forrest/trunk/main/webapp/resources/stylesheets/exslt/date/functions/add/date.add.template.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/exslt/date/functions/add/date.add.template.xsl?rev=830327&view=auto == --- forrest/trunk/main/webapp/resources/stylesheets/exslt/date/functions/add/date.add.template.xsl (added) +++ forrest/trunk/main/webapp/resources/stylesheets/exslt/date/functions/add/date.add.template.xsl Tue Oct 27 20:23:38 2009 @@ -0,0 +1,397 @@ + +http://www.w3.org/1999/XSL/Transform"; +xmlns:date="http://exslt.org/dates-and-times"; +extension-element-prefixes="date"> + + + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31 + + + + + + + + + + + + + + + + + + + + Z + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + 0 + + + + + + + + + + + + 0 + + + + + + 0 + + + + + + + + + + + 0 + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + 1 + + + + + + + + + + 0 + + + + + + 0 + + + + + +
svn commit: r810991 - /forrest/trunk/main/webapp/resources/stylesheets/exslt/README.txt
Author: sjur Date: Thu Sep 3 15:29:49 2009 New Revision: 810991 URL: http://svn.apache.org/viewvc?rev=810991&view=rev Log: Forgot to state that the stylesheets should not be edited, rather changes should be contributed back to exslt.org and Forrest then updated. Modified: forrest/trunk/main/webapp/resources/stylesheets/exslt/README.txt Modified: forrest/trunk/main/webapp/resources/stylesheets/exslt/README.txt URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/exslt/README.txt?rev=810991&r1=810990&r2=810991&view=diff == --- forrest/trunk/main/webapp/resources/stylesheets/exslt/README.txt (original) +++ forrest/trunk/main/webapp/resources/stylesheets/exslt/README.txt Thu Sep 3 15:29:49 2009 @@ -4,3 +4,5 @@ (Note that adding all exslt stylesheets to Forrest is too large.) In the various Forrest plugins, use our "locationmap" techniques to refer to the relevant stylesheet. + +Please note that these stylesheets should not be edited, rather contribute changes to exslt.org and update the copies found in Forrest.
svn commit: r810990 - in /forrest/trunk/main/webapp/resources/stylesheets/exslt: ./ README.txt
Author: sjur Date: Thu Sep 3 15:24:29 2009 New Revision: 810990 URL: http://svn.apache.org/viewvc?rev=810990&view=rev Log: Added an exslt directory + Readme file, cf https://issues.apache.org/jira/browse/FOR-1176. Added: forrest/trunk/main/webapp/resources/stylesheets/exslt/ forrest/trunk/main/webapp/resources/stylesheets/exslt/README.txt (with props) Added: forrest/trunk/main/webapp/resources/stylesheets/exslt/README.txt URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/exslt/README.txt?rev=810990&view=auto == --- forrest/trunk/main/webapp/resources/stylesheets/exslt/README.txt (added) +++ forrest/trunk/main/webapp/resources/stylesheets/exslt/README.txt Thu Sep 3 15:24:29 2009 @@ -0,0 +1,6 @@ +This directory is meant to hold XSL extensions from exslt.org, cf https://issues.apache.org/jira/browse/FOR-1176 + +For each stylesheet that we want to use, add it "as-is" to this directory, using a sub-directory structure patterned on the directories from all-exslt.zip +(Note that adding all exslt stylesheets to Forrest is too large.) + +In the various Forrest plugins, use our "locationmap" techniques to refer to the relevant stylesheet. Propchange: forrest/trunk/main/webapp/resources/stylesheets/exslt/README.txt -- svn:eol-style = native
svn commit: r696971 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml
Author: sjur Date: Fri Sep 19 01:18:37 2008 New Revision: 696971 URL: http://svn.apache.org/viewvc?rev=696971&view=rev Log: The file's encoding is UTF-8 (cf. the xml prolog), so no reason to make the non-ASCII chars unreadable by using numeric character references. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml?rev=696971&r1=696970&r2=696971&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml Fri Sep 19 01:18:37 2008 @@ -87,7 +87,7 @@ 2002 ACME http://ACME.org - Tous droits réservés. + Tous droits réservés.
svn commit: r696624 - in /forrest/trunk/whiteboard/multipleSites: master/forrest.properties subsite-secondSeed/forrest.properties subsite-seed/forrest.properties
Author: sjur Date: Thu Sep 18 03:45:07 2008 New Revision: 696624 URL: http://svn.apache.org/viewvc?rev=696624&view=rev Log: ,, changed to , Modified: forrest/trunk/whiteboard/multipleSites/master/forrest.properties forrest/trunk/whiteboard/multipleSites/subsite-secondSeed/forrest.properties forrest/trunk/whiteboard/multipleSites/subsite-seed/forrest.properties Modified: forrest/trunk/whiteboard/multipleSites/master/forrest.properties URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/multipleSites/master/forrest.properties?rev=696624&r1=696623&r2=696624&view=diff == --- forrest/trunk/whiteboard/multipleSites/master/forrest.properties (original) +++ forrest/trunk/whiteboard/multipleSites/master/forrest.properties Thu Sep 18 03:45:07 2008 @@ -19,7 +19,7 @@ # See the full set of default properties in a 'forrest seed-sample' site. # Copy properties from there as needed. ## -project.required.plugins=org.apache.forrest.plugin.output.pdf,,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core +project.required.plugins=org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core # codename: Dispatcher # Add the following plugins to project.required.plugins: #org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core Modified: forrest/trunk/whiteboard/multipleSites/subsite-secondSeed/forrest.properties URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/multipleSites/subsite-secondSeed/forrest.properties?rev=696624&r1=696623&r2=696624&view=diff == --- forrest/trunk/whiteboard/multipleSites/subsite-secondSeed/forrest.properties (original) +++ forrest/trunk/whiteboard/multipleSites/subsite-secondSeed/forrest.properties Thu Sep 18 03:45:07 2008 @@ -138,7 +138,7 @@ # a production environment it is recommended that you specify a known working # version. # Run "forrest available-plugins" for a list of plug-ins currently available. -project.required.plugins=org.apache.forrest.plugin.output.pdf,,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core +project.required.plugins=org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core # codename: Dispatcher # Add the following plugins to project.required.plugins: Modified: forrest/trunk/whiteboard/multipleSites/subsite-seed/forrest.properties URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/multipleSites/subsite-seed/forrest.properties?rev=696624&r1=696623&r2=696624&view=diff == --- forrest/trunk/whiteboard/multipleSites/subsite-seed/forrest.properties (original) +++ forrest/trunk/whiteboard/multipleSites/subsite-seed/forrest.properties Thu Sep 18 03:45:07 2008 @@ -138,7 +138,7 @@ # a production environment it is recommended that you specify a known working # version. # Run "forrest available-plugins" for a list of plug-ins currently available. -project.required.plugins=org.apache.forrest.plugin.output.pdf,,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core +project.required.plugins=org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core # codename: Dispatcher # Add the following plugins to project.required.plugins:
svn commit: r696284 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft
Author: sjur Date: Wed Sep 17 06:09:30 2008 New Revision: 696284 URL: http://svn.apache.org/viewvc?rev=696284&view=rev Log: Moved the $rootFontFamily to a higher position in the XML tree, to avoid a warning. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft?rev=696284&r1=696283&r2=696284&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft Wed Sep 17 06:09:30 2008 @@ -151,8 +151,10 @@ - + + +
svn commit: r694460 - in /forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets: document-to-fo.xsl helper-commonElements.xsl helper-pdfoutline.xsl
Author: sjur Date: Thu Sep 11 13:26:36 2008 New Revision: 694460 URL: http://svn.apache.org/viewvc?rev=694460&view=rev Log: Reverted the previous commit - something was broken. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-pdfoutline.xsl Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl?rev=694460&r1=694459&r2=694460&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl Thu Sep 11 13:26:36 2008 @@ -19,8 +19,6 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; xmlns:prop="http://apache.org/forrest/properties/1.0"; -xmlns:i18n="http://apache.org/cocoon/i18n/2.1"; -exclude-result-prefixes="i18n" version="1.0"> - - NOTICE: + NOTICE: - Version + Version @@ -639,7 +636,7 @@ font-size="smaller"> - by by @@ -661,9 +658,7 @@ id="__toc__"> - - Table of contents - +Table of contents http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl?rev=694460&r1=694459&r2=694460&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl Thu Sep 11 13:26:36 2008 @@ -15,12 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://www.w3.org/1999/XSL/Transform"; -xmlns:fo="http://www.w3.org/1999/XSL/Format"; -xmlns:i18n="http://apache.org/cocoon/i18n/2.1"; -exclude-result-prefixes="i18n" -version="1.0"> +http://www.w3.org/1999/XSL/Transform"; + xmlns:fo="http://www.w3.org/1999/XSL/Format"; version="1.0"> @@ -288,10 +284,7 @@ - - - Warning: - +Warning: @@ -330,9 +323,7 @@ - - Note: - +Note: @@ -366,8 +357,7 @@ keep-with-next.within-column="always"> - - FIXME ( + FIXME ( ): - -Table + Table Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-pdfoutline.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-pdfoutline.xsl?rev=694460&r1=694459&r2=694460&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-pdfoutline.xsl (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-pdfoutline.xsl Thu Sep 11 13:26:36 2008 @@ -18,8 +18,6 @@ http://www.w3.org/1999/XSL/Transform"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; -xmlns:i18n="http://apache.org/cocoon/i18n/2.1"; -exclude-result-prefixes="i18n" version="1.0"> - Table of contents + Table of contents
svn commit: r694242 - in /forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets: document-to-fo.xsl helper-commonElements.xsl helper-pdfoutline.xsl
Author: sjur Date: Thu Sep 11 06:16:57 2008 New Revision: 694242 URL: http://svn.apache.org/viewvc?rev=694242&view=rev Log: Added i18n of strings in the FO processing. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-pdfoutline.xsl Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl?rev=694242&r1=694241&r2=694242&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl Thu Sep 11 06:16:57 2008 @@ -19,6 +19,8 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; xmlns:prop="http://apache.org/forrest/properties/1.0"; +xmlns:i18n="http://apache.org/cocoon/i18n/2.1"; +exclude-result-prefixes="i18n" version="1.0"> - NOTICE: + + NOTICE: - Version + Version @@ -636,7 +639,7 @@ font-size="smaller"> - by by @@ -658,7 +661,9 @@ id="__toc__"> -Table of contents + + Table of contents + http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl?rev=694242&r1=694241&r2=694242&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl Thu Sep 11 06:16:57 2008 @@ -15,8 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://www.w3.org/1999/XSL/Transform"; - xmlns:fo="http://www.w3.org/1999/XSL/Format"; version="1.0"> +http://www.w3.org/1999/XSL/Transform"; +xmlns:fo="http://www.w3.org/1999/XSL/Format"; +xmlns:i18n="http://apache.org/cocoon/i18n/2.1"; +exclude-result-prefixes="i18n" +version="1.0"> @@ -284,7 +288,10 @@ -Warning: + + + Warning: + @@ -323,7 +330,9 @@ -Note: + + Note: + @@ -357,7 +366,8 @@ keep-with-next.within-column="always"> - FIXME ( + + FIXME ( ): - Table + +Table Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-pdfoutline.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-pdfoutline.xsl?rev=694242&r1=694241&r2=694242&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-pdfoutline.xsl (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-pdfoutline.xsl Thu Sep 11 06:16:57 2008 @@ -18,6 +18,8 @@ http://www.w3.org/1999/XSL/Transform"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; +xmlns:i18n="http://apache.org/cocoon/i18n/2.1"; +exclude-result-prefixes="i18n" version="1.0"> - Table of contents + Table of contents
svn commit: r694241 - in /forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations: OutputPDFMessages_en.xml OutputPDFMessages_nb.xml OutputPDFMessages_nn.xml OutputPDFMessage
Author: sjur Date: Thu Sep 11 06:15:30 2008 New Revision: 694241 URL: http://svn.apache.org/viewvc?rev=694241&view=rev Log: Added two missing string translations. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_en.xml forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nb.xml forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nn.xml forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_se.xml forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_smj.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_en.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_en.xml?rev=694241&r1=694240&r2=694241&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_en.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_en.xml Thu Sep 11 06:15:30 2008 @@ -17,8 +17,10 @@ --> NOTICE: + Version by Note: + Warning: FIXME Table Table of contents Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nb.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nb.xml?rev=694241&r1=694240&r2=694241&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nb.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nb.xml Thu Sep 11 06:15:30 2008 @@ -17,8 +17,10 @@ --> MERKNAD: + Versjon av Merk: + Advarsel: FIKSMEG Tabell Innhold Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nn.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nn.xml?rev=694241&r1=694240&r2=694241&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nn.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nn.xml Thu Sep 11 06:15:30 2008 @@ -17,8 +17,10 @@ --> MERKNAD: + Versjon av Merk: + à tvaring: FIKSMEG Tabell Innhald Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_se.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_se.xml?rev=694241&r1=694240&r2=694241&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_se.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_se.xml Thu Sep 11 06:15:30 2008 @@ -17,8 +17,10 @@ --> FUOMÃÅ : + VerÅ¡uvdna Äállán Notáhtta: + Várut: DIVUMU Tabealla Sisdoallu Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_smj.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_smj.xml?rev=694241&r1=694240&r2=694241&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_smj.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_smj.xml Thu Sep 11 06:15:30 2008 @@ -17,8 +17,10 @@ --> HUOM: + VersjÃ¥vnnÃ¥ Tjállám Notáhtta + Várri: DIVOMUV Tabælla Sisanedus
svn commit: r694215 - /forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap
Author: sjur Date: Thu Sep 11 04:04:00 2008 New Revision: 694215 URL: http://svn.apache.org/viewvc?rev=694215&view=rev Log: Added i18n processing for the PDF plugin. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap?rev=694215&r1=694214&r2=694215&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap Thu Sep 11 04:04:00 2008 @@ -27,6 +27,13 @@ ]> http://apache.org/cocoon/sitemap/1.0";> + + + + + + + &pdf-config-file; @@ -35,6 +42,7 @@ + @@ -59,8 +67,8 @@ + - @@ -68,15 +76,22 @@ + + + + + + +
svn commit: r694214 - /forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/locationmap.xml
Author: sjur
Date: Thu Sep 11 04:03:10 2008
New Revision: 694214
URL: http://svn.apache.org/viewvc?rev=694214&view=rev
Log:
Added LM match for plugin translations.
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/locationmap.xml
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/locationmap.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/locationmap.xml?rev=694214&r1=694213&r2=694214&view=diff
==
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/locationmap.xml
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/locationmap.xml
Thu Sep 11 04:03:10 2008
@@ -42,5 +42,9 @@
src="{forrest:forrest.plugins}/org.apache.forrest.plugin.output.pdf/resources/stylesheets/{1}-to-{2}.xsl"/>
+
+
+
+
svn commit: r694213 - in /forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations: ./ OutputPDFMessages_en.xml OutputPDFMessages_nb.xml OutputPDFMessages_nn.xml OutputPDFMess
Author: sjur
Date: Thu Sep 11 04:02:34 2008
New Revision: 694213
URL: http://svn.apache.org/viewvc?rev=694213&view=rev
Log:
PDF plugin translations. So far only English from the standard set of Forrest
languages (de, fr, es missing), but a number of other languages added instead:)
These are not yet used, and there can be strings missing in the catalogue files.
Added:
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_en.xml
(with props)
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nb.xml
(with props)
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nn.xml
(with props)
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_se.xml
(with props)
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_smj.xml
(with props)
Added:
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_en.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_en.xml?rev=694213&view=auto
==
---
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_en.xml
(added)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_en.xml
Thu Sep 11 04:02:34 2008
@@ -0,0 +1,27 @@
+
+
+
+ NOTICE:
+ by
+ Note:
+ FIXME
+ Table
+ Table of contents
+ Page {0}
+ Page {0} of {1}
+
Propchange:
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_en.xml
--
svn:eol-style = native
Added:
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nb.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nb.xml?rev=694213&view=auto
==
---
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nb.xml
(added)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nb.xml
Thu Sep 11 04:02:34 2008
@@ -0,0 +1,27 @@
+
+
+
+ MERKNAD:
+ av
+ Merk:
+ FIKSMEG
+ Tabell
+ Innhold
+ Side {0}
+ Side {0} av {1}
+
Propchange:
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nb.xml
--
svn:eol-style = native
Added:
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nn.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nn.xml?rev=694213&view=auto
==
---
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nn.xml
(added)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nn.xml
Thu Sep 11 04:02:34 2008
@@ -0,0 +1,27 @@
+
+
+
+ MERKNAD:
+ av
+ Merk:
+ FIKSMEG
+ Tabell
+ Innhald
+ Side {0}
+ Side {0} av {1}
+
Propchange:
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_nn.xml
--
svn:eol-style = native
Added:
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_se.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_se.xml?rev=694213&view=auto
==
---
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_se.xml
(added)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_se.xml
Thu Sep 11 04:02:34 2008
@@ -0,0 +1,27 @@
+
+
+
+ FUOMÃÅ :
+ Äállán
+ Notáhtta:
+ DIVUMU
+ Tabealla
+ Sisdoallu
+ Siidu {0}
+ Siidu {0} {1} siiddus
+
Propchange:
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/translations/OutputPDFMessages_se.xml
--
svn:eol-style = native
Added:
f
svn commit: r694212 - /forrest/trunk/main/webapp/locationmap-i18n.xml
Author: sjur Date: Thu Sep 11 03:59:34 2008 New Revision: 694212 URL: http://svn.apache.org/viewvc?rev=694212&view=rev Log: Adding translations fallback to core. Modified: forrest/trunk/main/webapp/locationmap-i18n.xml Modified: forrest/trunk/main/webapp/locationmap-i18n.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-i18n.xml?rev=694212&r1=694211&r2=694212&view=diff == --- forrest/trunk/main/webapp/locationmap-i18n.xml (original) +++ forrest/trunk/main/webapp/locationmap-i18n.xml Thu Sep 11 03:59:34 2008 @@ -31,6 +31,7 @@ +
svn commit: r694203 - /forrest/trunk/main/webapp/sitemap.xmap
Author: sjur Date: Thu Sep 11 03:08:40 2008 New Revision: 694203 URL: http://svn.apache.org/viewvc?rev=694203&view=rev Log: LM lookup of translations. Modified: forrest/trunk/main/webapp/sitemap.xmap Modified: forrest/trunk/main/webapp/sitemap.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/sitemap.xmap?rev=694203&r1=694202&r2=694203&view=diff == --- forrest/trunk/main/webapp/sitemap.xmap (original) +++ forrest/trunk/main/webapp/sitemap.xmap Thu Sep 11 03:08:40 2008 @@ -123,7 +123,7 @@ - + true
svn commit: r692434 - /forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml
Author: sjur Date: Fri Sep 5 06:05:40 2008 New Revision: 692434 URL: http://svn.apache.org/viewvc?rev=692434&view=rev Log: Added the new properties to the example code. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml?rev=692434&r1=692433&r2=692434&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml Fri Sep 5 06:05:40 2008 @@ -116,18 +116,21 @@ text type, add one or more of the following properties to your forrest.properties.xml file: - <property name="output.pdf.fontFamily.rootFontFamily" value="serif" /> + <property name="output.pdf.fontFamily.rootFontFamily" value="serif" /> <property name="output.pdf.fontFamily.headerFooterFontFamily" value="sans-serif" /> <property name="output.pdf.fontFamily.documentTitleFontFamily" value="sans-serif" /> <property name="output.pdf.fontFamily.versionFontFamily" value="sans-serif" /> <property name="output.pdf.fontFamily.authorsFontFamily" value="sans-serif" /> <property name="output.pdf.fontFamily.TOCTitleFontFamily" value="sans-serif" /> + <property name="output.pdf.fontFamily.TOCFontFamily" value="serif" /> <property name="output.pdf.fontFamily.sectionTitleFontFamily" value="sans-serif" /> - <property name="output.pdf.fontFamily.sourceFontFamily" value="monospace" /> - <property name="output.pdf.fontFamily.codeFontFamily" value="monospace" /> + <property name="output.pdf.fontFamily.sourceFontFamily" value="monospace" /> + <property name="output.pdf.fontFamily.codeFontFamily" value="monospace" /> <property name="output.pdf.fontFamily.warningTitleFontFamily" value="sans-serif" /> <property name="output.pdf.fontFamily.noteTitleFontFamily" value="sans-serif" /> - <property name="output.pdf.fontFamily.fixmeTitleFontFamily" value="sans-serif" /> + <property name="output.pdf.fontFamily.fixmeTitleFontFamily" value="sans-serif" /> + <property name="output.pdf.fontFamily.abstractFontFamily" value="serif" /> + <property name="output.pdf.fontFamily.noticeFontFamily" value="serif" /> The given values are defaults, and should be replaced with what you want. If you want, you can further specify the font family for
svn commit: r692432 - /forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl
Author: sjur
Date: Fri Sep 5 06:01:34 2008
New Revision: 692432
URL: http://svn.apache.org/viewvc?rev=692432&view=rev
Log:
Bringing the skin-based FO transformation in line with the dispatcher variants
by adding the font-family attribute, and at the same time adding support for
user-specification of the font family for two more content categories:
* notice
* TOC
Also adjusted some measurements to be identical to the dispatcher variants.
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl?rev=692432&r1=692431&r2=692432&view=diff
==
---
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl
(original)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl
Fri Sep 5 06:01:34 2008
@@ -214,6 +214,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -222,6 +238,14 @@
+
+
+
+
+
+
+
+
@@ -301,7 +325,8 @@
match="/">
http://www.w3.org/1999/XSL/Format";
-font-family="{$rootFontFamily}" font-size="12pt">
+font-family="{$rootFontFamily}"
+font-size="12pt">
@@ -558,8 +585,10 @@
match="notice">
- Version
+ Version
@@ -625,13 +654,19 @@
space-after="0.5em"
space-before="1em"
text-align="justify"
+ width="7.5in"
id="__toc__">
Table of contents
-
+
page
svn commit: r692431 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft
Author: sjur
Date: Fri Sep 5 05:58:14 2008
New Revision: 692431
URL: http://svn.apache.org/viewvc?rev=692431&view=rev
Log:
Bringing this contract in line with the skins-based pdf generation by adding
the font-family attribute, and at the same time adding support for
user-specification of the font family.
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft?rev=692431&r1=692430&r2=692431&view=diff
==
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft
Fri Sep 5 05:58:14 2008
@@ -50,6 +50,42 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:fo="http://www.w3.org/1999/XSL/Format";
version="1.0">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -57,7 +93,8 @@
+ flow-name="first-footer"
+ font-family="{$firstFooterFontFamily}">
+ flow-name="even-footer"
+ font-family="{$evenFooterFontFamily}">
+ flow-name="odd-footer"
+ font-family="{$oddFooterFontFamily}">
svn commit: r692428 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml
Author: sjur Date: Fri Sep 5 05:51:45 2008 New Revision: 692428 URL: http://svn.apache.org/viewvc?rev=692428&view=rev Log: The double-sided specification is now also given to the header and footer templates. The ugly thing is that the specification is repeated three times, and is hard-coded in the panel. It should really be taken from a property. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml?rev=692428&r1=692427&r2=692428&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml Fri Sep 5 05:51:45 2008 @@ -54,7 +54,9 @@ - + +false + true 1/1 +false
svn commit: r692427 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft
Author: sjur Date: Fri Sep 5 05:49:46 2008 New Revision: 692427 URL: http://svn.apache.org/viewvc?rev=692427&view=rev Log: The double-sided specification is now brought in from the panel. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft?rev=692427&r1=692426&r2=692427&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft Fri Sep 5 05:49:46 2008 @@ -62,11 +62,7 @@ - - - +
svn commit: r692425 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft
Author: sjur Date: Fri Sep 5 05:44:24 2008 New Revision: 692425 URL: http://svn.apache.org/viewvc?rev=692425&view=rev Log: Whitespace only. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft?rev=692425&r1=692424&r2=692425&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft Fri Sep 5 05:44:24 2008 @@ -56,9 +56,12 @@ - - + + @@ -69,18 +72,24 @@ - - + + end - - + +
svn commit: r692424 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft
Author: sjur Date: Fri Sep 5 05:39:02 2008 New Revision: 692424 URL: http://svn.apache.org/viewvc?rev=692424&view=rev Log: Bringing this contract in line with the skins-based pdf generation by adding the font-family attribute, and at the same time adding support for user-specification of the font family. Also, the framework for controlling header placement according to double/single-sided is in place (copied from skins), although the actual toggling does not work, because the needed variable isn't available. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft?rev=692424&r1=692423&r2=692424&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft Fri Sep 5 05:39:02 2008 @@ -35,18 +35,65 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; version="1.0"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - + + + +start + + +end + +
svn commit: r692413 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft
Author: sjur Date: Fri Sep 5 04:26:26 2008 New Revision: 692413 URL: http://svn.apache.org/viewvc?rev=692413&view=rev Log: Bringing this contract in line with the skins-based pdf generation by adding the font-family attribute, and at the same time adding support for user-specification of the font family. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft?rev=692413&r1=692412&r2=692413&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft Fri Sep 5 04:26:26 2008 @@ -35,6 +35,16 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; version="1.0"> + + + + + + + + + + @@ -46,6 +56,7 @@
svn commit: r692410 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft
Author: sjur Date: Fri Sep 5 04:05:53 2008 New Revision: 692410 URL: http://svn.apache.org/viewvc?rev=692410&view=rev Log: Whitespace only. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft?rev=692410&r1=692409&r2=692410&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft Fri Sep 5 04:05:53 2008 @@ -43,7 +43,12 @@ - +
svn commit: r692404 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft
Author: sjur Date: Fri Sep 5 03:17:42 2008 New Revision: 692404 URL: http://svn.apache.org/viewvc?rev=692404&view=rev Log: Now also the TOC itself can get a user-specified font-family. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft?rev=692404&r1=692403&r2=692404&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft Fri Sep 5 03:17:42 2008 @@ -44,6 +44,7 @@ version="1.0"> + @@ -52,6 +53,14 @@ + + + + + + + + @@ -71,8 +80,13 @@ Table of contents - + page
svn commit: r692402 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft
Author: sjur Date: Fri Sep 5 03:00:39 2008 New Revision: 692402 URL: http://svn.apache.org/viewvc?rev=692402&view=rev Log: Added support for user-specification of the font family. At the same time bringing this contract in line with the skins-based pdf generation by changing some metrics from pt to em, and by adding @id. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft?rev=692402&r1=692401&r2=692402&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft Fri Sep 5 03:00:39 2008 @@ -42,6 +42,16 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; version="1.0"> + + + + + + + + + + @@ -49,13 +59,14 @@ + width="7.5in" + id="__toc__"> Table of contents
svn commit: r692401 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft
Author: sjur Date: Fri Sep 5 02:52:05 2008 New Revision: 692401 URL: http://svn.apache.org/viewvc?rev=692401&view=rev Log: Whitespace only. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft?rev=692401&r1=692400&r2=692401&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft Fri Sep 5 02:52:05 2008 @@ -48,8 +48,13 @@ -
svn commit: r692400 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft
Author: sjur Date: Fri Sep 5 02:46:27 2008 New Revision: 692400 URL: http://svn.apache.org/viewvc?rev=692400&view=rev Log: Added support for user-specification of the font family. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft?rev=692400&r1=692399&r2=692400&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft Fri Sep 5 02:46:27 2008 @@ -34,6 +34,16 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; version="1.0"> + + + + + + + + + + @@ -41,7 +51,7 @@
svn commit: r692399 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft
Author: sjur Date: Fri Sep 5 02:45:43 2008 New Revision: 692399 URL: http://svn.apache.org/viewvc?rev=692399&view=rev Log: Whitespace only. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft?rev=692399&r1=692398&r2=692399&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft Fri Sep 5 02:45:43 2008 @@ -95,46 +95,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
svn commit: r692398 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft
Author: sjur Date: Fri Sep 5 02:40:00 2008 New Revision: 692398 URL: http://svn.apache.org/viewvc?rev=692398&view=rev Log: Bringing this contract in line with the skins-based pdf generation by adding the font-family attribute, and at the same time adding support for user-specification of the font family. Also changed some metrics from pt to em/relative, as in the skins-based document-to-fo.xsl. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft?rev=692398&r1=692397&r2=692398&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft Fri Sep 5 02:40:00 2008 @@ -35,15 +35,26 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; version="1.0"> + + + + + + + + + + +font-size="smaller"> by
svn commit: r692397 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft
Author: sjur
Date: Fri Sep 5 02:37:31 2008
New Revision: 692397
URL: http://svn.apache.org/viewvc?rev=692397&view=rev
Log:
Added support for user-specification of the font family.
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft?rev=692397&r1=692396&r2=692397&view=diff
==
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft
Fri Sep 5 02:37:31 2008
@@ -34,6 +34,16 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:fo="http://www.w3.org/1999/XSL/Format";
version="1.0">
+
+
+
+
+
+
+
+
+
+
@@ -44,7 +54,7 @@
space-before="20pt"
space-after="25pt"
width="7.5in"
- font-family="serif"
+ font-family="{$abstractFontFamily}"
font-style="italic">
svn commit: r692396 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft
Author: sjur Date: Fri Sep 5 02:31:56 2008 New Revision: 692396 URL: http://svn.apache.org/viewvc?rev=692396&view=rev Log: Whitespace changes + one description rephrasing. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft?rev=692396&r1=692395&r2=692396&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft Fri Sep 5 02:31:56 2008 @@ -21,7 +21,7 @@ name="content-authors"> - content-authors will output the authors of the content. + content-authors will output the authors of the document. @@ -40,7 +40,10 @@ - + by
svn commit: r692368 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft
Author: sjur Date: Fri Sep 5 00:40:44 2008 New Revision: 692368 URL: http://svn.apache.org/viewvc?rev=692368&view=rev Log: Whitespace changes + one description rephrasing. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft?rev=692368&r1=692367&r2=692368&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft Fri Sep 5 00:40:44 2008 @@ -21,7 +21,7 @@ name="content-abstract"> - content-abstract will output the abstract of the content. + content-abstract will output the abstract of the document. @@ -38,8 +38,13 @@ -
svn commit: r691591 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft
Author: sjur Date: Wed Sep 3 05:49:16 2008 New Revision: 691591 URL: http://svn.apache.org/viewvc?rev=691591&view=rev Log: Whitespace changes. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft?rev=691591&r1=691590&r2=691591&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft Wed Sep 3 05:49:16 2008 @@ -39,8 +39,15 @@ -
svn commit: r691590 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft
Author: sjur Date: Wed Sep 3 05:42:30 2008 New Revision: 691590 URL: http://svn.apache.org/viewvc?rev=691590&view=rev Log: Basic font-family selection according to the new properties do now work for simple documents, which means that at least some pdf files are generated using dispatcher. More contracts must be checked and updated before we can conclude that PDF generation in dispatcher is working properly again. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft?rev=691590&r1=691589&r2=691590&view=diff == --- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft Wed Sep 3 05:42:30 2008 @@ -81,12 +81,60 @@ select="$config/show-external-urls"/> - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
svn commit: r691528 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/
Author: sjur Date: Wed Sep 3 00:27:33 2008 New Revision: 691528 URL: http://svn.apache.org/viewvc?rev=691528&view=rev Log: Ignore build directory. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/ (props changed) Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/ -- --- svn:ignore (added) +++ svn:ignore Wed Sep 3 00:27:33 2008 @@ -0,0 +1 @@ +build
svn commit: r691523 - /forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml
Author: sjur Date: Tue Sep 2 23:25:47 2008 New Revision: 691523 URL: http://svn.apache.org/viewvc?rev=691523&view=rev Log: Added the latest enhancement to the status document. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=691523&r1=691522&r2=691523&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Tue Sep 2 23:25:47 2008 @@ -17,11 +17,17 @@ --> + + +Added handling of localised content in wiki format, that is, filenames following the +filename.locale.wiki format, where each locale variant +contains a localised version of the content. + Added handling of Google Code wiki format. See sample.
svn commit: r691518 - /forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap
Author: sjur Date: Tue Sep 2 22:35:58 2008 New Revision: 691518 URL: http://svn.apache.org/viewvc?rev=691518&view=rev Log: Added i18n matching to the source file lookup, thus allowing l10n of page content for wiki-format pages: somedoc.en.jspwiki somedoc.es.jspwiki etc can be used to serve localised content using the simple markup format of wikis. Also added some comments. We have used this setup for jspwiki for months at our site, so should work without problems. But it is not tested for the other wiki formats. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap?rev=691518&r1=691517&r2=691518&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap Tue Sep 2 22:35:58 2008 @@ -35,57 +35,68 @@ + - + + - + + + - + + - + + + - + + - + + - + + - + +
svn commit: r691243 - /forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml
Author: sjur Date: Tue Sep 2 06:35:54 2008 New Revision: 691243 URL: http://svn.apache.org/viewvc?rev=691243&view=rev Log: Added the latest changes to the status.xml file. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml?rev=691243&r1=691242&r2=691243&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml Tue Sep 2 06:35:54 2008 @@ -53,6 +53,19 @@ date="not-released"> Updated plugin documentation to cover the new +properties settable by the user,and how to actually set +them. + Made font family specifications available for +user changes without changing the plugin code. +
svn commit: r691242 - /forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml
Author: sjur Date: Tue Sep 2 06:31:42 2008 New Revision: 691242 URL: http://svn.apache.org/viewvc?rev=691242&view=rev Log: Added Sjur Moshagen to the Dev list. Whitespace changes. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml?rev=691242&r1=691241&r2=691242&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml Tue Sep 2 06:31:42 2008 @@ -18,6 +18,7 @@ + @@ -50,14 +51,21 @@ - -Added support for "sub" and "sup" tags. - - -Various bugfixes and improvements for the fo stylesheets. See notes in FOR-1072. - + Added support for "sub" and "sup" +tags. + Various bugfixes and improvements for the fo +stylesheets. See notes in FOR-1072.
svn commit: r691232 - /forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml
Author: sjur Date: Tue Sep 2 06:08:27 2008 New Revision: 691232 URL: http://svn.apache.org/viewvc?rev=691232&view=rev Log: Updated the plugin documentation to provide info about the new settable properties. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml?rev=691232&r1=691231&r2=691232&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml Tue Sep 2 06:08:27 2008 @@ -24,10 +24,11 @@ Apache Forrest - org.apache.forrest.plugin.output.pdf Plugin -This plugin enables any Forrest page to be output as a PDF document. +This plugin (hereafter just called the PDF plugin) enables any +Forrest page to be output as a PDF document. -To use it simply request a page with the pdf extension +To use it simply request a page with the pdf extension. By default this plugin is included in a new Forrest project. You will @@ -35,5 +36,150 @@ page, this will, of course, link to the PDF version of that page. + + + Configuration options + + The PDF plugin can be configured in several ways: + + +font family configuration + +other presentation changes: page size, copyright notes, etc. + +i18n configuarion, which is actually two subtopics: +font family configuration + +l10n of label text + + + + Each of these points will be covered in separate sections below. + + + + Font Family Configuration + + The font family can be specifed in different steps of granularity. As + of version 0.4 of the PDF plugin, all of the configuration can be done + on a per project basis. There is no need to touch the plugin itself, as + it used to be. + + +Preparations + +If you want to change the actual font family, not only where to use +the generic serif, sans-serif and +monospace families, then you also need to take these +preparatory steps: + + + Follow the instructions at http://cocoon.apache.org/2.1/userdocs/pdf-serializer.html";>http://cocoon.apache.org/2.1/userdocs/pdf-serializer.html + to create a font configuration file and font metrics files at + $PROJECT_HOME/src/documentation/resources/fonts (you + may have to create the fonts folder). + + Specify the absolute path to the font configuration file you + created in step 1 as the value of the entity + &pdf-config-file; in the project entity file. The + file is located at: + $PROJECT_HOME/src/documentation/resources/schema/symbols-project-v10.ent. + The result should look something like:<!ENTITY pdf-config-file "/Users/foo/forrestproject/src/documentation/resources/fonts/config.xml">(the + above would work for a user named foo on a typical + MacOS X system - adapt to your local OS as needed, but the path + needs to be absolute) + + Finally, add the necessary configuration options to your + forrest.properties.xml file, as described below. + + + + +Font family overrides/specifications + +For the easiest type of changing the font family, add the following +lines to your forrest.properties.xml file: + + <property name="output.pdf.fontFamily.serif" value="serif"/> + <property name="output.pdf.fontFamily.sansSerif" value="sans-serif"/> + <property name="output.pdf.fontFamily.monospace" value="monospace"/> + +and replace the default values above with your preferred font +family, e.g. DejaVuSans, etc. Using these properties, you +will change the font family of whole classes of text types at once. If +you need proper i18n support for your language (more below) in the pdf +files, this is usually the easiest way to go - just replace the +generic families with your chosen font families. + +If you need to override or specify the font family for a certain +text type, add one or more of the following properties to your +forrest.properties.xml file: + + <property name="output.pdf.fontFamily.rootFontFamily"
svn commit: r691220 - in /forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf: ./ resources/stylesheets/
Author: sjur Date: Tue Sep 2 05:50:20 2008 New Revision: 691220 URL: http://svn.apache.org/viewvc?rev=691220&view=rev Log: Main commit to move all configuration and properties of the pdf output plugin FROM the plugin itself INTO the user/project space. There are two separate (sets of) properties now being exposed to the outside world: * the reference to the pdf-config file used to tell FOP where to find custom font description files * the actual font specifications for the XSL transformation to the FO format (used as input to the fo-to-pdf rendering) Every single place in the XSL stylesheets with a font family specification is now specifyable by the user on a per-project basis. More details to come soon in updated plugin documentation. Added: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-footerinfo.xsl - copied unchanged from r688179, forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/footerinfo.xsl Removed: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/footerinfo.xsl Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap?rev=691220&r1=691219&r2=691220&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap Tue Sep 2 05:50:20 2008 @@ -15,10 +15,22 @@ See the License for the specific language governing permissions and limitations under the License. --> + + %symbols-project; + + %symbols-core; +]> http://apache.org/cocoon/sitemap/1.0";> - + + &pdf-config-file; + @@ -31,6 +43,7 @@ + @@ -38,12 +51,9 @@ - + - - - - + Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl?rev=691220&r1=691219&r2=691220&view=diff == --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl Tue Sep 2 05:50:20 2008 @@ -18,10 +18,14 @@ http://www.w3.org/1999/XSL/Transform"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; +xmlns:prop="http://apache.org/forrest/properties/1.0"; version="1.0"> + - - - - + + + + + + serif + + + + + + + + sans-serif + + + + + + + + monospace + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +href="lm://pdf.transform.helper.pdfoutline" /> +href="lm://pdf.transform.helper.footerinfo" /> +href="lm://pdf.transform.helper.pageNumber"
