You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by sp...@apache.org on 2006/01/12 21:40:19 UTC
svn commit: r368462 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/fo/expr/ test/fotree/testcases/
Author: spepping
Date: Thu Jan 12 12:40:08 2006
New Revision: 368462
URL: http://svn.apache.org/viewcvs?rev=368462&view=rev
Log:
Allow some xsl-function calls with omitted args, patch contributed by
Gerhard Oettl, bug 38098.
Added:
xmlgraphics/fop/trunk/test/fotree/testcases/properties_omitted_propertyname.fo (with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/Function.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunction.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunction.java?rev=368462&r1=368461&r2=368462&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunction.java Thu Jan 12 12:40:08 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,6 +33,13 @@
*/
public int nbArgs() {
return 1;
+ }
+
+ /**
+ * @return true (allow padding of arglist with property name)
+ */
+ public boolean padArgsWithPropertyName() {
+ return true;
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java?rev=368462&r1=368461&r2=368462&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java Thu Jan 12 12:40:08 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2005 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,6 +34,13 @@
}
/**
+ * @return true (allow padding of arglist with property name)
+ */
+ public boolean padArgsWithPropertyName() {
+ return true;
+ }
+
+ /**
*
* @param args array of arguments, which should either be empty, or the
* first of which should contain an NCName corresponding to a property name
@@ -45,10 +52,12 @@
*/
public Property eval(Property[] args,
PropertyInfo pInfo) throws PropertyException {
+ /* uncomment when implementing
String propName = args[0].getString();
if (propName == null) {
- //TODO Determine on which property this method was called.
+ throw new PropertyException("Incorrect parameter to from-table-column function");
}
+ */
throw new PropertyException("The from-table-column() function is not implemented, yet!");
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/Function.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/Function.java?rev=368462&r1=368461&r2=368462&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/Function.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/Function.java Thu Jan 12 12:40:08 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -47,5 +47,10 @@
*/
Property eval(Property[] args,
PropertyInfo propInfo) throws PropertyException;
-}
+ /**
+ * @return if it is allowed to fill up the property list with
+ * the property name if only one arg is missing.
+ */
+ boolean padArgsWithPropertyName();
+}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java?rev=368462&r1=368461&r2=368462&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java Thu Jan 12 12:40:08 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,5 +32,10 @@
return null;
}
+ /**
+ * @return false (by default don't pad arglist with property-name)
+ */
+ public boolean padArgsWithPropertyName() {
+ return false;
+ }
}
-
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java?rev=368462&r1=368461&r2=368462&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java Thu Jan 12 12:40:08 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,6 +33,13 @@
*/
public int nbArgs() {
return 1;
+ }
+
+ /**
+ * @return true (allow padding of arglist with property name)
+ */
+ public boolean padArgsWithPropertyName() {
+ return true;
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java?rev=368462&r1=368461&r2=368462&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java Thu Jan 12 12:40:08 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,6 +33,13 @@
*/
public int nbArgs() {
return 1;
+ }
+
+ /**
+ * @return true (allow padding of arglist with property name)
+ */
+ public boolean padArgsWithPropertyName() {
+ return true;
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java?rev=368462&r1=368461&r2=368462&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java Thu Jan 12 12:40:08 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2005 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -308,7 +308,7 @@
next();
// Push new function (for function context: getPercentBase())
propInfo.pushFunction(function);
- prop = function.eval(parseArgs(function.nbArgs()), propInfo);
+ prop = function.eval(parseArgs(function), propInfo);
propInfo.popFunction();
return prop;
@@ -324,13 +324,15 @@
* Parse a comma separated list of function arguments. Each argument
* may itself be an expression. This method consumes the closing right
* parenthesis of the argument list.
- * @param nbArgs The number of arguments expected by the function.
+ * @param function The function object for which the arguments are
+ * collected.
* @return An array of Property objects representing the arguments
* found.
* @throws PropertyException If the number of arguments found isn't equal
* to the number expected.
*/
- Property[] parseArgs(int nbArgs) throws PropertyException {
+ Property[] parseArgs(Function function) throws PropertyException {
+ int nbArgs = function.nbArgs();
Property[] args = new Property[nbArgs];
Property prop;
int i = 0;
@@ -352,8 +354,12 @@
}
expectRpar();
}
+ if (i == nbArgs - 1 && function.padArgsWithPropertyName()) {
+ args[i++] = new StringProperty(propInfo.getPropertyMaker().getName());
+ }
if (nbArgs != i) {
- throw new PropertyException("Wrong number of args for function");
+ throw new PropertyException("Expected " + nbArgs
+ + ", but got " + i + " args for function");
}
return args;
}
Added: xmlgraphics/fop/trunk/test/fotree/testcases/properties_omitted_propertyname.fo
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/fotree/testcases/properties_omitted_propertyname.fo?rev=368462&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/fotree/testcases/properties_omitted_propertyname.fo (added)
+++ xmlgraphics/fop/trunk/test/fotree/testcases/properties_omitted_propertyname.fo Thu Jan 12 12:40:08 2006
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<!-- This test verifies the addition of the property name for which the
+ function is called to the parameter list of the function if the
+ last parameter is omitted. (Only for currently implemented functions).
+-->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <!-- system-font (not implemented) -->
+ <!-- inherited-property-value -->
+ <fo:block font-size="13pt">
+ Top Level Block: font-size="13pt" background-color="#00ff00"
+ <fo:block font-size="inherited-property-value() + 3pt">
+ <test:assert property="font-size" expected="16000mpt"/>
+ Nested Block: font-size="inherited-property-value() + 3pt"
+ (calculate with an inherited value)
+ </fo:block>
+ </fo:block>
+ <!-- from-parent -->
+ <fo:block font-size="24pt" background-color="#ff0000">
+ Top Level Block: font-size="24pt" background-color="#ff0000"
+ <fo:block font-size="from-parent() + 2pt"
+ background-color="from-parent()">
+ <test:assert property="font-size" expected="26000mpt"/>
+ <test:assert property="background-color" expected="#ff0000"/>
+ Nested Block:
+ font-size="from-parent() + 2pt"(inherited value and calculate)
+ background-color="from-parent()" (calculate with an inherited value)
+ </fo:block>
+ </fo:block>
+ <!-- from-nearest-specified-value -->
+ <fo:block background-color="#0000ff">
+ Top Level Block: font-size="24pt" background-color="#0000ff"
+ <fo:block>
+ <test:assert property="background-color" expected="#000000"/>
+ Nested Block: background-color=default
+ <fo:block background-color="from-nearest-specified-value()">
+ <test:assert property="background-color" expected="#0000ff"/>
+ Nested Block: background-color="from-nearest-specified-value()"
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <!-- from-table-column (not implemented) -->
+ <!-- merge-property-value (not implemented) -->
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
+
Propchange: xmlgraphics/fop/trunk/test/fotree/testcases/properties_omitted_propertyname.fo
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/fotree/testcases/properties_omitted_propertyname.fo
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org
Re: svn commit: r368462
Posted by Simon Pepping <sp...@leverkruid.nl>.
On Sat, Jan 14, 2006 at 10:45:56AM +0100, Jeremias Maerki wrote:
> Exactly.
>
> On 14.01.2006 10:38:14 Manuel Mall wrote:
> > On Sat, 14 Jan 2006 05:09 pm, Jeremias Maerki wrote:
> > > Hey, Simon is on the PMC, so he should know. Just joking. Back to
> > > business: There is a recent thread on legal-discuss that should shed
> > > some light into this:
> > > http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200601.mbo
> > >x/browser
> > >
> > > Looks like I was taking this a little too strict earlier. And it
> > > turns out that the copyright year thing will likely soon be a thing
> > > of the past anyway. HTH
> > >
> >
> > Not really as it still doesn't give us a direction what to do now.
> >
> > However, after reading the thread you pointed to and some related stuff
> > it seems to me that ATM Copyright refers to something like:
> >
> > The year of publication for that particular copyrightable work, where
> > "copyrightable" means the changes are significant enough to justify a
> > separate copyright from the original.
> >
> > This means for trivial changes (which is a subjective thing of course)
> > we shouldn't update the year, for others we should but need to leave
> > gaps for years without copyrightable additions to the work. So the svn
> > submit in question which triggered this thread is should have been
> > either:
> >
> > Copyright 1999-2004, 2006 The Apache Software Foundation.
> >
> > or:
> >
> > no change to the copyright header if the change was trivial.
> >
> > Agreed ???
That is how I understand that email thread as well. I will change the
copyright years of the files affected so as to leave out 2005, when
they did not see any (significant) change.
Simon
--
Simon Pepping
home page: http://www.leverkruid.nl
Re: svn commit: r368462
Posted by Jeremias Maerki <de...@jeremias-maerki.ch>.
Exactly.
On 14.01.2006 10:38:14 Manuel Mall wrote:
> On Sat, 14 Jan 2006 05:09 pm, Jeremias Maerki wrote:
> > Hey, Simon is on the PMC, so he should know. Just joking. Back to
> > business: There is a recent thread on legal-discuss that should shed
> > some light into this:
> > http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200601.mbo
> >x/browser
> >
> > Looks like I was taking this a little too strict earlier. And it
> > turns out that the copyright year thing will likely soon be a thing
> > of the past anyway. HTH
> >
>
> Not really as it still doesn't give us a direction what to do now.
>
> However, after reading the thread you pointed to and some related stuff
> it seems to me that ATM Copyright refers to something like:
>
> The year of publication for that particular copyrightable work, where
> "copyrightable" means the changes are significant enough to justify a
> separate copyright from the original.
>
> This means for trivial changes (which is a subjective thing of course)
> we shouldn't update the year, for others we should but need to leave
> gaps for years without copyrightable additions to the work. So the svn
> submit in question which triggered this thread is should have been
> either:
>
> Copyright 1999-2004, 2006 The Apache Software Foundation.
>
> or:
>
> no change to the copyright header if the change was trivial.
>
> Agreed ???
>
> <snip/>
>
> > Jeremias Maerki
>
> Manuel
Jeremias Maerki
Re: svn commit: r368462
Posted by Manuel Mall <mm...@arcus.com.au>.
On Sat, 14 Jan 2006 05:09 pm, Jeremias Maerki wrote:
> Hey, Simon is on the PMC, so he should know. Just joking. Back to
> business: There is a recent thread on legal-discuss that should shed
> some light into this:
> http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200601.mbo
>x/browser
>
> Looks like I was taking this a little too strict earlier. And it
> turns out that the copyright year thing will likely soon be a thing
> of the past anyway. HTH
>
Not really as it still doesn't give us a direction what to do now.
However, after reading the thread you pointed to and some related stuff
it seems to me that ATM Copyright refers to something like:
The year of publication for that particular copyrightable work, where
"copyrightable" means the changes are significant enough to justify a
separate copyright from the original.
This means for trivial changes (which is a subjective thing of course)
we shouldn't update the year, for others we should but need to leave
gaps for years without copyrightable additions to the work. So the svn
submit in question which triggered this thread is should have been
either:
Copyright 1999-2004, 2006 The Apache Software Foundation.
or:
no change to the copyright header if the change was trivial.
Agreed ???
<snip/>
> Jeremias Maerki
Manuel
Re: svn commit: r368462
Posted by Jeremias Maerki <de...@jeremias-maerki.ch>.
Hey, Simon is on the PMC, so he should know. Just joking. Back to
business: There is a recent thread on legal-discuss that should shed
some light into this:
http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200601.mbox/browser
Looks like I was taking this a little too strict earlier. And it turns
out that the copyright year thing will likely soon be a thing of the
past anyway. HTH
On 14.01.2006 01:52:31 Manuel Mall wrote:
<snip/>
> > It is quite equivocal for me. On the one hand it speaks about new
> > significant content, which would mean: leave out 2005. On the other
> > it speaks about a range of years due to the public accessibility
> > (meaning continuous publication?), which would mean: 1999-2006.
> >
>
> Simon,
>
> good point and I don't know the answer. My interpretation was to leave
> the 2005 out but I can see that leaving it in can be sensibly argued as
> well.
>
> But that's what we have our PMC for don't we?
>
> PMC please tell us committers how these ASF rules should be interpreted
> in the XMLGRAPHICS project.
Jeremias Maerki
Re: svn commit: r368462
Posted by Manuel Mall <mm...@arcus.com.au>.
On Sat, 14 Jan 2006 03:52 am, Simon Pepping wrote:
> On Fri, Jan 13, 2006 at 07:34:40AM +0800, Manuel Mall wrote:
> > On Fri, 13 Jan 2006 04:40 am, spepping@apache.org wrote:
> > > Author: spepping
> > > Date: Thu Jan 12 12:40:08 2006
> > > New Revision: 368462
> > >
> > > xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentF
> > >unct ion.java (original) +++
> > > xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentF
> > >unct ion.java Thu Jan 12 12:40:08 2006 @@ -1,5 +1,5 @@
> > > /*
> > > - * Copyright 1999-2004 The Apache Software Foundation.
> > > + * Copyright 1999-2006 The Apache Software Foundation.
> > > *
> >
> > I know this is very picky but shouldn't this be written as:
> >
> > Copyright 1999-2004, 2006 The Apache Software Foundation.
> >
> > Unless there was a change to the file in 2005 (see
> > http://www.apache.org/dev/apply-license.html)?
>
> I thought of it when I made the change, but I did not know of any
> pertinent rule.
>
> At the page you link to, I suppose you aim at this phrase:
> > Source files contributed to or developed as part of an ASF project
> > should begin with a copyright notice like
> >
> > Copyright 2004 The Apache Software Foundation.
> > or
> > Copyright 1999-2004 The Apache Software Foundation.
> > or
> > Copyright 2002,2004 The Apache Software Foundation.
> >
> > where the years given start with the first publication year of the
> > file contents (the authored expression) and include a range of
> > years for each year that new significant content (derivative work)
> > is published within the file. Since the ASF publishes its code in
> > public source code modules (CVS and Subversion), we generally want
> > to include a range of years starting with the year of origin.
>
> It is quite equivocal for me. On the one hand it speaks about new
> significant content, which would mean: leave out 2005. On the other
> it speaks about a range of years due to the public accessibility
> (meaning continuous publication?), which would mean: 1999-2006.
>
Simon,
good point and I don't know the answer. My interpretation was to leave
the 2005 out but I can see that leaving it in can be sensibly argued as
well.
But that's what we have our PMC for don't we?
PMC please tell us committers how these ASF rules should be interpreted
in the XMLGRAPHICS project.
> Simon
Manuel
Re: svn commit: r368462
Posted by Simon Pepping <sp...@leverkruid.nl>.
On Fri, Jan 13, 2006 at 07:34:40AM +0800, Manuel Mall wrote:
> On Fri, 13 Jan 2006 04:40 am, spepping@apache.org wrote:
> > Author: spepping
> > Date: Thu Jan 12 12:40:08 2006
> > New Revision: 368462
> >
> > xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunct
> >ion.java (original) +++
> > xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunct
> >ion.java Thu Jan 12 12:40:08 2006 @@ -1,5 +1,5 @@
> > /*
> > - * Copyright 1999-2004 The Apache Software Foundation.
> > + * Copyright 1999-2006 The Apache Software Foundation.
> > *
> I know this is very picky but shouldn't this be written as:
>
> Copyright 1999-2004, 2006 The Apache Software Foundation.
>
> Unless there was a change to the file in 2005 (see
> http://www.apache.org/dev/apply-license.html)?
I thought of it when I made the change, but I did not know of any
pertinent rule.
At the page you link to, I suppose you aim at this phrase:
> Source files contributed to or developed as part of an ASF project
> should begin with a copyright notice like
>
> Copyright 2004 The Apache Software Foundation.
> or
> Copyright 1999-2004 The Apache Software Foundation.
> or
> Copyright 2002,2004 The Apache Software Foundation.
>
> where the years given start with the first publication year of the
> file contents (the authored expression) and include a range of years
> for each year that new significant content (derivative work) is
> published within the file. Since the ASF publishes its code in public
> source code modules (CVS and Subversion), we generally want to include
> a range of years starting with the year of origin.
It is quite equivocal for me. On the one hand it speaks about new
significant content, which would mean: leave out 2005. On the other it
speaks about a range of years due to the public accessibility (meaning
continuous publication?), which would mean: 1999-2006.
Simon
--
Simon Pepping
home page: http://www.leverkruid.nl
Re: svn commit: r368462 - in /xmlgraphics/fop/trunk: src/java/org/apache/fop/fo/expr/ test/fotree/testcases/
Posted by Manuel Mall <mm...@arcus.com.au>.
On Fri, 13 Jan 2006 04:40 am, spepping@apache.org wrote:
> Author: spepping
> Date: Thu Jan 12 12:40:08 2006
> New Revision: 368462
>
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunct
>ion.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunct
>ion.java Thu Jan 12 12:40:08 2006 @@ -1,5 +1,5 @@
> /*
> - * Copyright 1999-2004 The Apache Software Foundation.
> + * Copyright 1999-2006 The Apache Software Foundation.
> *
I know this is very picky but shouldn't this be written as:
Copyright 1999-2004, 2006 The Apache Software Foundation.
Unless there was a change to the file in 2005 (see
http://www.apache.org/dev/apply-license.html)?
Manuel